Repository: jclouds-karaf
Updated Branches:
  refs/heads/rem-cloudsigma 19b24f034 -> d32534661 (forced update)


JCLOUDS-692: Removing CloudSigma v1 features

Follow-on from jclouds/jclouds commit f7aea987


Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/59eda397
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/59eda397
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/59eda397

Branch: refs/heads/rem-cloudsigma
Commit: 59eda397b7574f0602d1311bf356148b347eb67d
Parents: 8515635
Author: Andrew Phillips <[email protected]>
Authored: Fri Oct 10 14:37:58 2014 -0400
Committer: Andrew Phillips <[email protected]>
Committed: Sun Oct 12 14:46:30 2014 -0400

----------------------------------------------------------------------
 feature/pom.xml                                       |  2 --
 feature/src/main/resources/feature.xml                | 14 --------------
 .../karaf/itests/MiscFeaturesInstallationTest.java    |  5 -----
 3 files changed, 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/59eda397/feature/pom.xml
----------------------------------------------------------------------
diff --git a/feature/pom.xml b/feature/pom.xml
index 1a2d5ca..ba0e4da 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -139,8 +139,6 @@ limitations under the License.
                 <feature>jclouds-rackspace-clouddns-uk</feature>
                 <feature>jclouds-rackspace-cloudblockstorage-us</feature>
                 <feature>jclouds-rackspace-cloudblockstorage-uk</feature>
-                <feature>jclouds-cloudsigma-zrh</feature>
-                <feature>jclouds-cloudsigma-lvs</feature>
                 <feature>jclouds-elastichosts-lon-b</feature>
                 <feature>jclouds-elastichosts-lon-p</feature>
                 <feature>jclouds-elastichosts-sat-p</feature>

http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/59eda397/feature/src/main/resources/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/resources/feature.xml 
b/feature/src/main/resources/feature.xml
index 54d9714..aea715b 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -308,20 +308,6 @@ limitations under the License.
         
<bundle>mvn:org.apache.jclouds.provider/rackspace-cloudblockstorage-uk/${jclouds.version}</bundle>
     </feature>
 
-    <feature name='jclouds-cloudsigma-zrh' description='CloudSigma ZRH' 
version='${project.version}' resolver='(obr)'>
-        <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle 
dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        
<bundle>mvn:org.apache.jclouds.api/cloudsigma/${jclouds.version}</bundle>
-        
<bundle>mvn:org.apache.jclouds.provider/cloudsigma-zrh/${jclouds.version}</bundle>
-    </feature>
-
-    <feature name='jclouds-cloudsigma-lvs' description='CloudSigma ZRH' 
version='${project.version}' resolver='(obr)'>
-        <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle 
dependency='true'>mvn:org.apache.jclouds.common/openstack-common/${jclouds.version}</bundle>
-        
<bundle>mvn:org.apache.jclouds.api/cloudsigma/${jclouds.version}</bundle>
-        
<bundle>mvn:org.apache.jclouds.provider/cloudsigma-lvs/${jclouds.version}</bundle>
-    </feature>
-
     <feature name='jclouds-elastichosts-lon-b' description='Elastichosts 
Bluesquare London' version='${project.version}' resolver='(obr)'>
         <feature version='${project.version}'>jclouds-compute</feature>
         <bundle 
dependency='true'>mvn:org.apache.jclouds.api/elasticstack/${jclouds.version}</bundle>

http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/59eda397/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 d8af937..3804a5b 100644
--- 
a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
+++ 
b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
@@ -61,11 +61,6 @@ public class MiscFeaturesInstallationTest extends 
JcloudsFeaturesTestSupport {
     }
 
     @Test
-    public void testCloudSigmaZrhFeature() throws Exception {
-        installAndCheckFeature("jclouds-cloudsigma-zrh");
-    }
-
-    @Test
     public void testGoGridFeature() throws Exception {
         installAndCheckFeature("jclouds-gogrid");
     }

Reply via email to