Updated Branches:
refs/heads/1.6.x 61aa70100 -> c128143d1
[JCLOUDS-14] Add jclouds-management support
Conflicts:
feature/src/main/resources/feature.xml
pom.xml
services/pom.xml
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/c128143d
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/tree/c128143d
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/diff/c128143d
Branch: refs/heads/1.6.x
Commit: c128143d134e098a92d8afe0ba037d2615b5d94f
Parents: 61aa701
Author: Ioannis Canellos <[email protected]>
Authored: Fri May 10 12:27:48 2013 +0300
Committer: Ioannis Canellos <[email protected]>
Committed: Tue May 21 22:37:52 2013 +0300
----------------------------------------------------------------------
feature/src/main/resources/feature.xml | 11 +++++++++++
.../karaf/itests/MiscFeaturesInstallationTest.java | 5 +++++
pom.xml | 5 +++++
services/pom.xml | 4 ++++
.../services/internal/BlobStoreServiceFactory.java | 4 +++-
.../services/internal/ComputeServiceFactory.java | 4 +++-
6 files changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/c128143d/feature/src/main/resources/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/resources/feature.xml
b/feature/src/main/resources/feature.xml
index 76e1fd3..4a29491 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -45,6 +45,16 @@ limitations under the License.
<bundle>mvn:org.apache.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.apache.jclouds.labs.representations/representations-core/${jclouds.version}</bundle>
+
<bundle>mvn:org.apache.jclouds.labs.representations/representations-codec/${jclouds.version}</bundle>
+
<bundle>mvn:org.apache.jclouds.labs.management/management-core/${jclouds.version}</bundle>
+
<bundle>mvn:org.apache.jclouds.labs.management/management-blobstore/${jclouds.version}</bundle>
+
<bundle>mvn:org.apache.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>
@@ -430,6 +440,7 @@ limitations under the License.
<configfile
finalname="/etc/org.apache.jclouds.credentials.cfg">mvn:org.apache.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/c128143d/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 84e2747..4a2c021 100644
---
a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
+++
b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
@@ -41,6 +41,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/c128143d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b4c70cc..24ef433 100644
--- a/pom.xml
+++ b/pom.xml
@@ -546,6 +546,11 @@ limitations under the License.
<artifactId>chef</artifactId>
<version>${jclouds.chef.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.labs.management</groupId>
+ <artifactId>management-core</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
<!-- Karaf Dependencies -->
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/c128143d/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index 953a838..e08cd28 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -60,6 +60,10 @@ limitations under the License.
<artifactId>jclouds-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.jclouds.labs.management</groupId>
+ <artifactId>management-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-blobstore</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/c128143d/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 c2b2583..4aee2ff 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
@@ -30,6 +30,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;
@@ -112,7 +114,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/c128143d/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 ef5f0af..2e83d9b 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
@@ -32,6 +32,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;
@@ -159,7 +161,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));
