Updated Branches: refs/heads/master 8e4f6bc9f -> 4b9db8612
[JCLOUDS-14] Add jclouds-management support Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/commit/4b9db861 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/tree/4b9db861 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/diff/4b9db861 Branch: refs/heads/master Commit: 4b9db86128c98d218449fe3024965335b68585d3 Parents: 8e4f6bc Author: Ioannis Canellos <[email protected]> Authored: Fri May 10 12:27:48 2013 +0300 Committer: Ioannis Canellos <[email protected]> Committed: Fri May 10 12:27:48 2013 +0300 ---------------------------------------------------------------------- feature/src/main/resources/feature.xml | 13 +++++++++++++ .../karaf/itests/MiscFeaturesInstallationTest.java | 5 +++++ pom.xml | 2 +- services/pom.xml | 6 ++++++ .../services/internal/BlobStoreServiceFactory.java | 4 +++- .../services/internal/ComputeServiceFactory.java | 4 +++- 6 files changed, 31 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/4b9db861/feature/src/main/resources/feature.xml ---------------------------------------------------------------------- diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml index dc01554..d037b12 100644 --- a/feature/src/main/resources/feature.xml +++ b/feature/src/main/resources/feature.xml @@ -24,6 +24,7 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle> <bundle>mvn:com.google.inject/guice/${guice.version}</bundle> <bundle>mvn:com.google.inject.extensions/guice-assistedinject/${guice.version}</bundle> + <bundle>mvn:com.google.inject.extensions/guice-multibindings/${guice.version}</bundle> <bundle>mvn:org.99soft.guice/rocoto/${rocoto.version}</bundle> </feature> @@ -43,10 +44,21 @@ <feature name='jclouds-compute' description='JClouds Compute' version='${project.version}' resolver='(obr)'> <feature version='${project.version}'>jclouds</feature> + <bundle dependency='true'>mvn:org.jclouds.driver/jclouds-log4j/${jclouds.version}</bundle> <bundle dependency='true'>mvn:org.jclouds/jclouds-scriptbuilder/${jclouds.version}</bundle> <bundle>mvn:org.jclouds/jclouds-compute/${jclouds.version}</bundle> </feature> + <feature name='jclouds-management' description='JClouds Management' version='${project.version}' resolver='(obr)'> + <feature version='${project.version}'>jclouds-compute</feature> + <feature version='${project.version}'>jclouds-blobstore</feature> + <bundle>mvn:org.jclouds.labs.representations/representations-core/${jclouds.version}</bundle> + <bundle>mvn:org.jclouds.labs.representations/representations-codec/${jclouds.version}</bundle> + <bundle>mvn:org.jclouds.labs.management/management-core/${jclouds.version}</bundle> + <bundle>mvn:org.jclouds.labs.management/management-blobstore/${jclouds.version}</bundle> + <bundle>mvn:org.jclouds.labs.management/management-compute/${jclouds.version}</bundle> + </feature> + <!-- APIS --> <feature name='jclouds-api-filesystem' description='JClouds - API - FileSystem' version='${project.version}' resolver='(obr)'> <feature version='${project.version}'>jclouds-blobstore</feature> @@ -432,6 +444,7 @@ <configfile finalname="/etc/org.jclouds.credentials.cfg">mvn:org.jclouds.karaf/jclouds-karaf/${project.version}/cfg/credentials</configfile> <feature version='${project.version}'>jclouds-compute</feature> <feature version='${project.version}'>jclouds-blobstore</feature> + <feature version='${project.version}'>jclouds-management</feature> <bundle dependency='true'>mvn:net.schmizz/sshj/${sshj.version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib.bundle.version}</bundle> <bundle dependency='true'>mvn:org.bouncycastle/bcpkix-jdk15on/${bcprov.version}</bundle> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/4b9db861/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java index 0d35d98..964d51d 100644 --- a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java +++ b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java @@ -43,6 +43,11 @@ public class MiscFeaturesInstallationTest extends JcloudsFeaturesTestSupport { } @Test + public void testManagementFeature() throws Exception { + installAndCheckFeature("jclouds-management"); + } + + @Test public void testBasicFeaturesInstallation() throws Exception { installAndCheckFeature("jclouds-commands"); } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/4b9db861/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f46859b..abf2418 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ <httpcore.version>4.1</httpcore.version> <java-xmlbuilder.bundle.version>0.3_1</java-xmlbuilder.bundle.version> <javax.inject.bundle.version>1_1</javax.inject.bundle.version> - <jclouds.version>${project.version}</jclouds.version> + <jclouds.version>1.7.0-SNAPSHOT</jclouds.version> <jclouds.chef.version>${project.version}</jclouds.chef.version> <jersey.version>1.11</jersey.version> <jersey.bundle.version>1.11_1</jersey.bundle.version> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/4b9db861/services/pom.xml ---------------------------------------------------------------------- diff --git a/services/pom.xml b/services/pom.xml index db8db2a..cec88db 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -66,6 +66,12 @@ <artifactId>jclouds-blobstore</artifactId> </dependency> <dependency> + <groupId>org.jclouds.labs.management</groupId> + <artifactId>management-core</artifactId> + <version>${jclouds.version}</version> + </dependency> + + <dependency> <groupId>org.jclouds.driver</groupId> <artifactId>jclouds-log4j</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/4b9db861/services/src/main/java/org/jclouds/karaf/services/internal/BlobStoreServiceFactory.java ---------------------------------------------------------------------- diff --git a/services/src/main/java/org/jclouds/karaf/services/internal/BlobStoreServiceFactory.java b/services/src/main/java/org/jclouds/karaf/services/internal/BlobStoreServiceFactory.java index e288728..687a834 100644 --- a/services/src/main/java/org/jclouds/karaf/services/internal/BlobStoreServiceFactory.java +++ b/services/src/main/java/org/jclouds/karaf/services/internal/BlobStoreServiceFactory.java @@ -32,6 +32,8 @@ import org.jclouds.karaf.core.Constants; import org.jclouds.karaf.services.InvalidConfigurationException; import org.jclouds.karaf.services.ServiceFactorySupport; import org.jclouds.logging.log4j.config.Log4JLoggingModule; +import org.jclouds.management.config.ManagementLifecycle; +import org.jclouds.management.internal.BaseManagementContext; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.ProviderPredicates; import org.osgi.framework.BundleContext; @@ -114,7 +116,7 @@ public class BlobStoreServiceFactory extends ServiceFactorySupport { builder = builder.endpoint(endpoint); } context = builder.name(id).credentials(identity, credential) - .modules(ImmutableSet.<Module>of(new Log4JLoggingModule())) + .modules(ImmutableSet.<Module>of(new Log4JLoggingModule(), new ManagementLifecycle(BaseManagementContext.INSTANCE))) .overrides(props) .build(BlobStoreContext.class); http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/4b9db861/services/src/main/java/org/jclouds/karaf/services/internal/ComputeServiceFactory.java ---------------------------------------------------------------------- diff --git a/services/src/main/java/org/jclouds/karaf/services/internal/ComputeServiceFactory.java b/services/src/main/java/org/jclouds/karaf/services/internal/ComputeServiceFactory.java index 8206285..208c466 100644 --- a/services/src/main/java/org/jclouds/karaf/services/internal/ComputeServiceFactory.java +++ b/services/src/main/java/org/jclouds/karaf/services/internal/ComputeServiceFactory.java @@ -34,6 +34,8 @@ import org.jclouds.karaf.core.CredentialStore; import org.jclouds.karaf.services.InvalidConfigurationException; import org.jclouds.karaf.services.ServiceFactorySupport; import org.jclouds.logging.log4j.config.Log4JLoggingModule; +import org.jclouds.management.config.ManagementLifecycle; +import org.jclouds.management.internal.BaseManagementContext; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.ProviderPredicates; import org.jclouds.sshj.config.SshjSshClientModule; @@ -161,7 +163,7 @@ public class ComputeServiceFactory extends ServiceFactorySupport { builder = builder.endpoint(endpoint); } - builder = builder.name(id).modules(ImmutableSet.<Module>of(new Log4JLoggingModule(), new SshjSshClientModule())); + builder = builder.name(id).modules(ImmutableSet.<Module>of(new Log4JLoggingModule(), new SshjSshClientModule(), new ManagementLifecycle(BaseManagementContext.INSTANCE))); if (credentialStore != null) { builder = builder.modules(ImmutableSet.<Module>of(credentialStore));
