Made demos inherit from demo aggregator, removed inherited deps and corrected artifact naming

This commit is contained in:
Andrew Phillips 2011-05-21 06:49:57 -04:00
parent 1ea619f211
commit 6c9ca419f6
3 changed files with 29 additions and 68 deletions

View File

@ -25,10 +25,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.jclouds</groupId> <groupId>org.jclouds</groupId>
<artifactId>jclouds-tools-project</artifactId> <artifactId>jclouds-demos-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>jclouds-getpath</artifactId> <artifactId>jclouds-demo-getpath</artifactId>
<name>jclouds getpath</name> <name>jclouds getpath</name>
<description>jclouds blobstore tool that downloads a container path to a local directory</description> <description>jclouds blobstore tool that downloads a container path to a local directory</description>
<properties> <properties>
@ -43,18 +43,6 @@
<artifactId>jclouds-allblobstore</artifactId> <artifactId>jclouds-allblobstore</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
<artifactId>jclouds-log4j</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

View File

@ -24,13 +24,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.jclouds</groupId> <groupId>org.jclouds</groupId>
<artifactId>jclouds-project</artifactId> <artifactId>jclouds-demos-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../project/pom.xml</relativePath>
</parent> </parent>
<groupId>org.jclouds.examples</groupId> <artifactId>jclouds-demo-googleappengine</artifactId>
<version>1.0-SNAPSHOT</version>
<artifactId>jclouds-googleappengine-example</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>JClouds Sample for Google App Engine</name> <name>JClouds Sample for Google App Engine</name>
<description>JClouds Sample for Google App Engine</description> <description>JClouds Sample for Google App Engine</description>
@ -122,7 +119,7 @@
<artifactId>appengine-tools-sdk</artifactId> <artifactId>appengine-tools-sdk</artifactId>
<version>1.4.3</version> <version>1.4.3</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${env.APPENGINE_HOME}/lib/appengine-tools-api.jar</systemPath> <systemPath>${appengine.home}/lib/appengine-tools-api.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

View File

@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.jclouds</groupId> <groupId>org.jclouds</groupId>
<artifactId>jclouds-project</artifactId> <artifactId>jclouds-demos-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../../project/pom.xml</relativePath>
</parent> </parent>
<artifactId>s3-perftest</artifactId> <artifactId>jclouds-demo-perftest</artifactId>
<name>jclouds Performance test verses Amazon SDK implementation</name> <name>jclouds Performance test verses Amazon SDK implementation</name>
<description>Performance test verses Amazon SDK implementation</description> <description>Performance test verses Amazon SDK implementation</description>
<properties> <properties>
<test.aws-s3.loopcount>100</test.aws-s3.loopcount> <test.aws-s3.loopcount>100</test.aws-s3.loopcount>
<test.aws-s3.identity>${test.aws.identity}</test.aws-s3.identity> <test.aws-s3.identity>${test.aws.identity}</test.aws-s3.identity>
@ -36,19 +36,7 @@
<jclouds.version>1.0-SNAPSHOT</jclouds.version> <jclouds.version>1.0-SNAPSHOT</jclouds.version>
<gae.version>1.4.3</gae.version> <gae.version>1.4.3</gae.version>
</properties> </properties>
<!-- bootstrapping: need to fetch the project POM -->
<repositories>
<repository>
<id>jclouds-sona-snapshots-nexus</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jclouds.provider</groupId> <groupId>org.jclouds.provider</groupId>
@ -70,11 +58,6 @@
<artifactId>jclouds-enterprise</artifactId> <artifactId>jclouds-enterprise</artifactId>
<version>${jclouds.version}</version> <version>${jclouds.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
<artifactId>jclouds-log4j</artifactId>
<version>${jclouds.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.jclouds.driver</groupId> <groupId>org.jclouds.driver</groupId>
<artifactId>jclouds-apachehc</artifactId> <artifactId>jclouds-apachehc</artifactId>
@ -90,14 +73,7 @@
<artifactId>appengine-tools-sdk</artifactId> <artifactId>appengine-tools-sdk</artifactId>
<version>${gae.version}</version> <version>${gae.version}</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${env.APPENGINE_HOME}/lib/appengine-tools-api.jar</systemPath> <systemPath>${appengine.home}/lib/appengine-tools-api.jar</systemPath>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
<version>${jclouds.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jclouds</groupId> <groupId>org.jclouds</groupId>
@ -126,7 +102,7 @@
<artifactId>appengine-tools-sdk</artifactId> <artifactId>appengine-tools-sdk</artifactId>
<version>${gae.version}</version> <version>${gae.version}</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${env.APPENGINE_HOME}/lib/appengine-tools-api.jar</systemPath> <systemPath>${appengine.home}/lib/appengine-tools-api.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>