You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/11/17 17:26:32 UTC
[1/2] jclouds-karaf git commit: Revert "[JCLOUDS-14] Add
jclouds-management support"
Repository: jclouds-karaf
Updated Branches:
refs/heads/master 6947f7a6b -> 9723e44fa
Revert "[JCLOUDS-14] Add jclouds-management support"
This reverts commit 4b9db86128c98d218449fe3024965335b68585d3 per JCLOUDS-763
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/3bc76e58
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/3bc76e58
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/3bc76e58
Branch: refs/heads/master
Commit: 3bc76e589872660a6e280abc8b2bb3c0583d9e71
Parents: 6947f7a
Author: Adrian Cole <ad...@gmail.com>
Authored: Sun Nov 16 21:46:13 2014 -0800
Committer: Adrian Cole <ad...@gmail.com>
Committed: Mon Nov 17 08:26:04 2014 -0800
----------------------------------------------------------------------
feature/pom.xml | 1 -
feature/src/main/resources/feature.xml | 11 -----------
.../karaf/itests/MiscFeaturesInstallationTest.java | 5 -----
services/pom.xml | 5 -----
.../karaf/services/internal/BlobStoreServiceFactory.java | 4 +---
.../karaf/services/internal/ComputeServiceFactory.java | 4 +---
6 files changed, 2 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/3bc76e58/feature/pom.xml
----------------------------------------------------------------------
diff --git a/feature/pom.xml b/feature/pom.xml
index 2c35748..273dd05 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -108,7 +108,6 @@ limitations under the License.
<feature>jclouds</feature>
<feature>jclouds-blobstore</feature>
<feature>jclouds-compute</feature>
- <feature>jclouds-management</feature>
<feature>jclouds-api-byon</feature>
<feature>jclouds-api-cloudsigma2</feature>
<feature>jclouds-api-cloudstack</feature>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/3bc76e58/feature/src/main/resources/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml
index c5bb06e..9a7ea6a 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -47,16 +47,6 @@ 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>
@@ -413,7 +403,6 @@ 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.jsch-agentproxy-sshj/${jsch.agentproxy.bundle.version}</bundle>
<bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.connector-factory/${jsch.agentproxy.version}</bundle>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/3bc76e58/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 711d61e..50599d4 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
@@ -40,11 +40,6 @@ 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/jclouds-karaf/blob/3bc76e58/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index 5415721..fba8761 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -63,11 +63,6 @@ limitations under the License.
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-blobstore</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.jclouds.labs.management</groupId>
- <artifactId>management-core</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/3bc76e58/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 4aee2ff..c2b2583 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,8 +30,6 @@ 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 +112,7 @@ public class BlobStoreServiceFactory extends ServiceFactorySupport {
builder = builder.endpoint(endpoint);
}
context = builder.name(id).credentials(identity, credential)
- .modules(ImmutableSet.<Module>of(new Log4JLoggingModule(), new ManagementLifecycle(BaseManagementContext.INSTANCE)))
+ .modules(ImmutableSet.<Module>of(new Log4JLoggingModule()))
.overrides(props)
.build(BlobStoreContext.class);
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/3bc76e58/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 2e83d9b..ef5f0af 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,8 +32,6 @@ 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 +159,7 @@ public class ComputeServiceFactory extends ServiceFactorySupport {
builder = builder.endpoint(endpoint);
}
- builder = builder.name(id).modules(ImmutableSet.<Module>of(new Log4JLoggingModule(), new SshjSshClientModule(), new ManagementLifecycle(BaseManagementContext.INSTANCE)));
+ builder = builder.name(id).modules(ImmutableSet.<Module>of(new Log4JLoggingModule(), new SshjSshClientModule()));
if (credentialStore != null) {
builder = builder.modules(ImmutableSet.<Module>of(credentialStore));
[2/2] jclouds-karaf git commit: Removed antique nodepool dependency,
Posted by ad...@apache.org.
Removed antique nodepool dependency,
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/9723e44f
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/9723e44f
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/9723e44f
Branch: refs/heads/master
Commit: 9723e44fa48fcaff8d5e45f714e0ec1bb1ed7f4d
Parents: 3bc76e5
Author: Adrian Cole <ad...@gmail.com>
Authored: Sun Nov 16 21:48:15 2014 -0800
Committer: Adrian Cole <ad...@gmail.com>
Committed: Mon Nov 17 08:26:18 2014 -0800
----------------------------------------------------------------------
pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/9723e44f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ecfdaa0..145cc97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -545,11 +545,6 @@ limitations under the License.
<version>${jclouds.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>nodepool</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>chef</artifactId>
<version>${jclouds.chef.version}</version>