Updated Branches:
  refs/heads/remove-sonatype-ext f4a11ad5b -> a0dfeb1c7 (forced update)


Removing Terremark


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

Branch: refs/heads/remove-sonatype-ext
Commit: 381cd215ddb436cc94fa8f1cf36b69601cb02eb6
Parents: fb1734e
Author: Andrew Bayer <[email protected]>
Authored: Tue Dec 17 11:00:20 2013 -0800
Committer: Andrew Bayer <[email protected]>
Committed: Tue Dec 17 11:00:43 2013 -0800

----------------------------------------------------------------------
 feature/src/main/resources/feature.xml                | 14 --------------
 .../karaf/itests/MiscFeaturesInstallationTest.java    | 10 ----------
 2 files changed, 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/381cd215/feature/src/main/resources/feature.xml
----------------------------------------------------------------------
diff --git a/feature/src/main/resources/feature.xml 
b/feature/src/main/resources/feature.xml
index edf55a9..5e1e908 100644
--- a/feature/src/main/resources/feature.xml
+++ b/feature/src/main/resources/feature.xml
@@ -424,20 +424,6 @@ limitations under the License.
         
<bundle>mvn:org.apache.jclouds.provider/softlayer/${jclouds.version}</bundle>
     </feature>
 
-    <feature name='jclouds-trmk-ecloud' description='Terremark Enterprise 
Cloud' version='${project.version}' resolver='(obr)'>
-        <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-xmlbuilder/${java-xmlbuilder.bundle.version}</bundle>
-        
<bundle>mvn:org.apache.jclouds.common/trmk-common/${jclouds.version}</bundle>
-        
<bundle>mvn:org.apache.jclouds.provider/trmk-ecloud/${jclouds.version}</bundle>
-    </feature>
-
-    <feature name='jclouds-trmk-vcloudexpress' description='Terremark vCloud 
Express' version='${project.version}' resolver='(obr)'>
-        <feature version='${project.version}'>jclouds-compute</feature>
-        <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-xmlbuilder/${java-xmlbuilder.bundle.version}</bundle>
-        
<bundle>mvn:org.apache.jclouds.common/trmk-common/${jclouds.version}</bundle>
-        
<bundle>mvn:org.apache.jclouds.provider/trmk-vcloudexpress/${jclouds.version}</bundle>
-    </feature>
-
     <feature name="jclouds-services" description="OSGi Service Factories for 
jclouds" version="${project.version}" resolver="(obr)">
         <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>

http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/381cd215/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 4a2c021..26e2dd9 100644
--- 
a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
+++ 
b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
@@ -108,16 +108,6 @@ public class MiscFeaturesInstallationTest extends 
JcloudsFeaturesTestSupport {
     }
 
     @Test
-    public void testTrmkVcloudExpressFeature() throws Exception {
-        installAndCheckFeature("jclouds-trmk-vcloudexpress");
-    }
-
-    @Test
-    public void testTrmkEcloudFeature() throws Exception {
-        installAndCheckFeature("jclouds-trmk-ecloud");
-    }
-
-    @Test
     public void testAzureBlobFeature() throws Exception {
         installAndCheckFeature("jclouds-azureblob");
     }

Reply via email to