diff --git a/atmos/dependencies-descriptor.xml b/atmos/dependencies-descriptor.xml new file mode 100644 index 0000000000..f54e4b39cf --- /dev/null +++ b/atmos/dependencies-descriptor.xml @@ -0,0 +1,39 @@ + + + + dependencies + + dir + + false + + + runtime + false + false + + + diff --git a/atmos/pom.xml b/atmos/pom.xml index 9f43d749d6..7fc8a08eaa 100644 --- a/atmos/pom.xml +++ b/atmos/pom.xml @@ -73,4 +73,25 @@ test + + + + + maven-assembly-plugin + + + package + + single + + + + dependencies-descriptor.xml + + + + + + + diff --git a/aws/core/dependencies-descriptor.xml b/aws/core/dependencies-descriptor.xml new file mode 100644 index 0000000000..f54e4b39cf --- /dev/null +++ b/aws/core/dependencies-descriptor.xml @@ -0,0 +1,39 @@ + + + + dependencies + + dir + + false + + + runtime + false + false + + + diff --git a/aws/core/pom.xml b/aws/core/pom.xml index 82c89a419e..10280e5689 100644 --- a/aws/core/pom.xml +++ b/aws/core/pom.xml @@ -32,7 +32,6 @@ jclouds-aws-project 1.0-SNAPSHOT - org.jclouds jclouds-aws jclouds Amazon AWS Components Core jclouds Core components to access Amazon AWS @@ -43,4 +42,44 @@ http://jclouds.googlecode.com/svn/trunk + + + ${project.groupId} + jclouds-blobstore + ${project.version} + + + com.jamesmurty.utils + java-xmlbuilder + 0.3 + + + ${project.groupId} + jclouds-blobstore + ${project.version} + test-jar + test + + + + + + + maven-assembly-plugin + + + package + + single + + + + dependencies-descriptor.xml + + + + + + + diff --git a/aws/extensions/jets3t/README.txt b/aws/extensions/jets3t/README.txt index 7820d1402b..168b9e3712 100644 --- a/aws/extensions/jets3t/README.txt +++ b/aws/extensions/jets3t/README.txt @@ -23,7 +23,7 @@ ==== # # A JetS3t (http://jets3t.s3.amazonaws.com/) S3Service implementation using -# jclouds. +# jclouds. Can be used on Google App Engine. # # Expects jets3t to be present on your application's classpath. # diff --git a/aws/extensions/jets3t/pom.xml b/aws/extensions/jets3t/pom.xml index d73625ce2a..db6a789716 100644 --- a/aws/extensions/jets3t/pom.xml +++ b/aws/extensions/jets3t/pom.xml @@ -49,10 +49,5 @@ 0.7.1 provided - - ${project.groupId} - jclouds-gae - ${project.version} - diff --git a/aws/extensions/pom.xml b/aws/extensions/pom.xml index f7530680a3..31b66493f3 100644 --- a/aws/extensions/pom.xml +++ b/aws/extensions/pom.xml @@ -26,19 +26,19 @@ ==================================================================== --> + 4.0.0 jclouds-aws-project org.jclouds 1.0-SNAPSHOT - ../pom.xml - 4.0.0 jclouds-aws-extensions-project pom jclouds AWS extensions aggregator jets3t + ${project.groupId} @@ -47,11 +47,10 @@ ${project.groupId} - jclouds-aws + jclouds-blobstore ${project.version} test-jar test - + - diff --git a/aws/perftest/pom.xml b/aws/perftest/pom.xml index 35f13911ef..06ca41ec07 100644 --- a/aws/perftest/pom.xml +++ b/aws/perftest/pom.xml @@ -34,53 +34,48 @@ affiliates. --> - - jclouds-aws-project - org.jclouds - 1.0-SNAPSHOT - ../pom.xml - - 4.0.0 - jclouds-aws-perftest - jclouds Performance test verses Amazon samples implementation - jar - - Performance test verses Amazon samples implementation - - - - ${project.groupId} - jclouds-joda - ${project.version} - - - ${project.groupId} - jclouds-bouncycastle - ${project.version} - - - ${project.groupId} - jclouds-aws - ${project.version} - - - ${project.groupId} - jclouds-aws - ${project.version} - test-jar - test - - - ${project.groupId} - jclouds-httpnio - ${project.version} - - - ${project.groupId} - jclouds-gae - ${project.version} - - + 4.0.0 + + org.jclouds + jclouds-aws-project + 1.0-SNAPSHOT + + jclouds-aws-perftest + jclouds Performance test verses Amazon samples implementation + Performance test verses Amazon samples implementation + + + + ${project.groupId} + jclouds-joda + ${project.version} + + + ${project.groupId} + jclouds-bouncycastle + ${project.version} + + + ${project.groupId} + jclouds-aws + ${project.version} + + + net.java.dev.jets3t + jets3t + 0.7.1 + + + ${project.groupId} + jclouds-httpnio + ${project.version} + + + ${project.groupId} + jclouds-gae + ${project.version} + + com.google.appengine appengine-api-stubs @@ -112,37 +107,39 @@ 1.2 test - - - net.java.dev.jets3t - jets3t - 0.7.1 - - - - - scm:svn:http://jclouds.googlecode.com/svn/trunk - scm:svn:https://jclouds.googlecode.com/svn/trunk - http://jclouds.googlecode.com/svn/trunk - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - 1 - - - - - - + + + ${project.groupId} + jclouds-aws + ${project.version} + test-jar + test + + + + + scm:svn:http://jclouds.googlecode.com/svn/trunk + scm:svn:https://jclouds.googlecode.com/svn/trunk + http://jclouds.googlecode.com/svn/trunk + + + + + + maven-surefire-plugin + + + integration + integration-test + + test + + + 1 + + + + + + diff --git a/azure/dependencies-descriptor.xml b/azure/dependencies-descriptor.xml new file mode 100644 index 0000000000..f54e4b39cf --- /dev/null +++ b/azure/dependencies-descriptor.xml @@ -0,0 +1,39 @@ + + + + dependencies + + dir + + false + + + runtime + false + false + + + diff --git a/azure/pom.xml b/azure/pom.xml index 6a37e25f13..5d9af0d444 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -83,4 +83,25 @@ test + + + + + maven-assembly-plugin + + + package + + single + + + + dependencies-descriptor.xml + + + + + + + diff --git a/extensions/bouncycastle/dependencies-descriptor.xml b/extensions/bouncycastle/dependencies-descriptor.xml new file mode 100644 index 0000000000..01998597c1 --- /dev/null +++ b/extensions/bouncycastle/dependencies-descriptor.xml @@ -0,0 +1,42 @@ + + + + dependencies + + dir + + false + + + runtime + false + false + + org.jclouds:jclouds-core + + + + diff --git a/extensions/bouncycastle/pom.xml b/extensions/bouncycastle/pom.xml index 0fc1f9a26c..35a025019f 100644 --- a/extensions/bouncycastle/pom.xml +++ b/extensions/bouncycastle/pom.xml @@ -43,4 +43,25 @@ 1.44 + + + + + maven-assembly-plugin + + + package + + single + + + + dependencies-descriptor.xml + + + + + + + diff --git a/extensions/httpnio/dependencies-descriptor.xml b/extensions/httpnio/dependencies-descriptor.xml new file mode 100644 index 0000000000..336d8bf676 --- /dev/null +++ b/extensions/httpnio/dependencies-descriptor.xml @@ -0,0 +1,42 @@ + + + + dependencies + + dir + + false + + + runtime + false + false + + org.jclouds:jclouds-core + + + + diff --git a/extensions/httpnio/pom.xml b/extensions/httpnio/pom.xml index d867bf4c93..4fcd854582 100644 --- a/extensions/httpnio/pom.xml +++ b/extensions/httpnio/pom.xml @@ -43,16 +43,36 @@ - - org.mortbay.jetty - jetty - test - org.apache.httpcomponents httpcore-nio 4.1-alpha1 + + org.mortbay.jetty + jetty + test + - + + + + + maven-assembly-plugin + + + package + + single + + + + dependencies-descriptor.xml + + + + + + + diff --git a/extensions/joda/dependencies-descriptor.xml b/extensions/joda/dependencies-descriptor.xml new file mode 100644 index 0000000000..336d8bf676 --- /dev/null +++ b/extensions/joda/dependencies-descriptor.xml @@ -0,0 +1,42 @@ + + + + dependencies + + dir + + false + + + runtime + false + false + + org.jclouds:jclouds-core + + + + diff --git a/extensions/joda/pom.xml b/extensions/joda/pom.xml index a5ac528bde..f37ef02ce3 100644 --- a/extensions/joda/pom.xml +++ b/extensions/joda/pom.xml @@ -43,4 +43,25 @@ 1.6 + + + + + maven-assembly-plugin + + + package + + single + + + + dependencies-descriptor.xml + + + + + + + diff --git a/extensions/ssh/jsch/dependencies-descriptor.xml b/extensions/ssh/jsch/dependencies-descriptor.xml new file mode 100644 index 0000000000..f54e4b39cf --- /dev/null +++ b/extensions/ssh/jsch/dependencies-descriptor.xml @@ -0,0 +1,39 @@ + + + + dependencies + + dir + + false + + + runtime + false + false + + + diff --git a/extensions/ssh/jsch/pom.xml b/extensions/ssh/jsch/pom.xml index 5c643aceac..875f378cb3 100755 --- a/extensions/ssh/jsch/pom.xml +++ b/extensions/ssh/jsch/pom.xml @@ -47,4 +47,25 @@ 1.4 + + + + + maven-assembly-plugin + + + package + + single + + + + dependencies-descriptor.xml + + + + + + + diff --git a/mezeo/pcs2/core/dependencies-descriptor.xml b/mezeo/pcs2/core/dependencies-descriptor.xml new file mode 100644 index 0000000000..f54e4b39cf --- /dev/null +++ b/mezeo/pcs2/core/dependencies-descriptor.xml @@ -0,0 +1,39 @@ + + + + dependencies + + dir + + false + + + runtime + false + false + + + diff --git a/mezeo/pcs2/core/pom.xml b/mezeo/pcs2/core/pom.xml index 6142a83c89..27555523b9 100644 --- a/mezeo/pcs2/core/pom.xml +++ b/mezeo/pcs2/core/pom.xml @@ -42,4 +42,39 @@ http://jclouds.googlecode.com/svn/trunk/mezo/pcs2/core + + + ${project.groupId} + jclouds-blobstore + ${project.version} + + + ${project.groupId} + jclouds-blobstore + ${project.version} + test-jar + test + + + + + + + maven-assembly-plugin + + + package + + single + + + + dependencies-descriptor.xml + + + + + + + diff --git a/mezeo/pom.xml b/mezeo/pom.xml index 06031f2c16..3fb09552e5 100644 --- a/mezeo/pom.xml +++ b/mezeo/pom.xml @@ -40,18 +40,6 @@ pcs2 - - ${project.groupId} - jclouds-blobstore - ${project.version} - - - ${project.groupId} - jclouds-blobstore - ${project.version} - test-jar - test - ${project.groupId} jclouds-core diff --git a/nirvanix/pom.xml b/nirvanix/pom.xml index 85f5c605fe..b57c34f44b 100644 --- a/nirvanix/pom.xml +++ b/nirvanix/pom.xml @@ -42,16 +42,9 @@ ${project.groupId} - jclouds-blobstore + jclouds-core ${project.version} - - - ${project.groupId} - jclouds-blobstore - ${project.version} - test-jar - test - + ${project.groupId} jclouds-core diff --git a/nirvanix/sdn/core/dependencies-descriptor.xml b/nirvanix/sdn/core/dependencies-descriptor.xml new file mode 100644 index 0000000000..f54e4b39cf --- /dev/null +++ b/nirvanix/sdn/core/dependencies-descriptor.xml @@ -0,0 +1,39 @@ + + + + dependencies + + dir + + false + + + runtime + false + false + + + diff --git a/nirvanix/sdn/core/pom.xml b/nirvanix/sdn/core/pom.xml index 5856e0f182..8a6a49a064 100644 --- a/nirvanix/sdn/core/pom.xml +++ b/nirvanix/sdn/core/pom.xml @@ -42,4 +42,39 @@ http://jclouds.googlecode.com/svn/trunk/mezo/sdn/core + + + ${project.groupId} + jclouds-blobstore + ${project.version} + + + ${project.groupId} + jclouds-blobstore + ${project.version} + test-jar + test + + + + + + + maven-assembly-plugin + + + package + + single + + + + dependencies-descriptor.xml + + + + + + + diff --git a/package-descriptor.xml b/package-descriptor.xml index 73bbabb134..58d45dd4ed 100644 --- a/package-descriptor.xml +++ b/package-descriptor.xml @@ -33,6 +33,10 @@ @@ -84,22 +81,22 @@ jclouds-core-${project.version}-jar-with-dependencies.jar - lib + core/lib core/target/jclouds-core-${project.version}-dependencies.dir - lib + core/lib core/target jclouds-core-${project.version}-sources.jar - src + core/src core/target/apidocs - docs + core/docs @@ -110,6 +107,10 @@ providers/atmos/lib + + atmos/target/jclouds-atmos-${project.version}-dependencies.dir + providers/atmos/lib + atmos/target @@ -131,31 +132,62 @@ - aws/target + aws/core/target jclouds-aws-${project.version}.jar providers/aws/lib - aws/target + aws/core/target/jclouds-aws-${project.version}-dependencies.dir + providers/aws/lib + + + aws/core/target jclouds-aws-${project.version}-sources.jar providers/aws/src - aws/target/apidocs + aws/core/target/apidocs providers/aws/docs - aws + aws/core README.txt providers/aws - + + + + aws/extensions/jets3t/target + + jclouds-jets3t-${project.version}.jar + + providers/aws/extensions/jets3t/lib + + + aws/extensions/jets3t/target + + jclouds-jets3t-${project.version}-sources.jar + + providers/aws/extensions/jets3t/src + + + aws/extensions/jets3t/target/apidocs + providers/aws/extensions/jets3t/docs + + + aws/extensions/jets3t + + README.txt + + providers/aws/extensions/jets3t + + azure/target @@ -164,6 +196,10 @@ providers/azure/lib + + azure/target/jclouds-azure-${project.version}-dependencies.dir + providers/azure/lib + azure/target @@ -185,25 +221,25 @@ - hostingdotcom/target + vcloud/hostingdotcom/target jclouds-hostingdotcom-${project.version}.jar providers/hostingdotcom/lib - hostingdotcom/target + vcloud/hostingdotcom/target jclouds-hostingdotcom-${project.version}-sources.jar providers/hostingdotcom/src - hostingdotcom/target/apidocs + vcloud/hostingdotcom/target/apidocs providers/hostingdotcom/docs - hostingdotcom + vcloud/hostingdotcom README.txt @@ -218,6 +254,10 @@ providers/mezeo/lib + + mezeo/pcs2/target/jclouds-pcs2-${project.version}-dependencies.dir + providers/pcs2/lib + mezeo/pcs2/target @@ -245,6 +285,10 @@ providers/nirvanix/lib + + nirvanix/sdn/target/jclouds-nirvanix-${project.version}-dependencies.dir + providers/nirvanix/lib + nirvanix/sdn/target @@ -272,6 +316,10 @@ providers/rackspace/lib + + rackspace/target/jclouds-rackspace-${project.version}-dependencies.dir + providers/rackspace/lib + rackspace/target @@ -407,6 +455,10 @@ extensions/bouncycastle/lib + + extensions/bouncycastle/target/jclouds-bouncycastle-${project.version}-dependencies.dir + extensions/bouncycastle/lib + extensions/bouncycastle/target @@ -461,6 +513,10 @@ extensions/joda/lib + + extensions/joda/target/jclouds-joda-${project.version}-dependencies.dir + extensions/joda/lib + extensions/joda/target @@ -488,6 +544,10 @@ extensions/httpnio/lib + + extensions/httpnio/target/jclouds-httpnio-${project.version}-dependencies.dir + extensions/httpnio/lib + extensions/httpnio/target @@ -515,6 +575,10 @@ extensions/ssh/jsch/lib + + extensions/jsch/target/jclouds-jsch-${project.version}-dependencies.dir + extensions/ssh/jsch/lib + extensions/jsch/target @@ -561,51 +625,7 @@ extensions/log4j - - - aws/extensions/jets3t/target - - jclouds-jets3t-${project.version}.jar - - extensions/aws/jets3t/lib - - - aws/extensions/jets3t/target - - jclouds-jets3t-${project.version}-sources.jar - - extensions/aws/jets3t/src - - - aws/extensions/jets3t/target/apidocs - extensions/aws/jets3t/docs - - - aws/extensions/jets3t - - README.txt - - extensions/aws/jets3t - - - - - tools - - - **/.settings - **/.settings/** - **/.project - **/.classpath - **/target - **/target/** - **/.svnignore - - pom.xml - - samples - + demos + + dependencies + + dir + + false + + + runtime + false + false + + + diff --git a/rackspace/pom.xml b/rackspace/pom.xml index f21e760d93..138dc18bce 100644 --- a/rackspace/pom.xml +++ b/rackspace/pom.xml @@ -79,4 +79,25 @@ test + + + + + maven-assembly-plugin + + + package + + single + + + + dependencies-descriptor.xml + + + + + + + diff --git a/vcloud/hostingdotcom/README.txt b/vcloud/hostingdotcom/README.txt index 0a10e120c3..611ac5e074 100644 --- a/vcloud/hostingdotcom/README.txt +++ b/vcloud/hostingdotcom/README.txt @@ -24,6 +24,8 @@ # # The jclouds provider for Hosting.com's vCloud Express (http://www.hosting.com/vcloudexpress/) platform. # +# Requires the jclouds-vcloud JAR to be on the classpath. +# # TODO: Implementation status. # TODO: Supported features. # TODO: Usage example. \ No newline at end of file diff --git a/vcloud/hostingdotcom/pom.xml b/vcloud/hostingdotcom/pom.xml index e404026353..27e7a804e2 100755 --- a/vcloud/hostingdotcom/pom.xml +++ b/vcloud/hostingdotcom/pom.xml @@ -52,13 +52,13 @@ ${project.groupId} jclouds-vcloud ${project.version} - test-jar - test ${project.groupId} jclouds-vcloud ${project.version} + test-jar + test diff --git a/vcloud/terremark/README.txt b/vcloud/terremark/README.txt index 287307e71f..9549846e04 100644 --- a/vcloud/terremark/README.txt +++ b/vcloud/terremark/README.txt @@ -24,6 +24,8 @@ # # The jclouds provider for Terremark's vCloud Express (http://vcloudexpress.terremark.com/) platform. # +# Requires the jclouds-vcloud JAR to be on the classpath. +# # TODO: Implementation status. # TODO: Supported features. # See http://code.google.com/p/jclouds/wiki/QuickStartTerremark for example usage. \ No newline at end of file diff --git a/vcloud/terremark/pom.xml b/vcloud/terremark/pom.xml index ad8c15cf96..6cbd326e34 100755 --- a/vcloud/terremark/pom.xml +++ b/vcloud/terremark/pom.xml @@ -51,13 +51,13 @@ ${project.groupId} jclouds-vcloud ${project.version} - test-jar - test ${project.groupId} jclouds-vcloud ${project.version} + test-jar + test