Updated Branches: refs/heads/1.6.x bc556a9bb -> c7b3868fd
JCLOUDS-51: Changing default feature package from org.jclouds -> org.apache.jclouds See JCLOUDS-18 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/c7b3868f Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/tree/c7b3868f Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/diff/c7b3868f Branch: refs/heads/1.6.x Commit: c7b3868fde8784ca93c40067d9b5349761ce844c Parents: bc556a9 Author: Andrew Phillips <[email protected]> Authored: Thu May 16 10:55:27 2013 -0400 Committer: Andrew Phillips <[email protected]> Committed: Thu May 16 18:04:11 2013 -0400 ---------------------------------------------------------------------- .../karaf/itests/JcloudsFeaturesTestSupport.java | 2 +- .../org/jclouds/karaf/itests/ObrResolverTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/c7b3868f/itests/src/test/java/org/jclouds/karaf/itests/JcloudsFeaturesTestSupport.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/JcloudsFeaturesTestSupport.java b/itests/src/test/java/org/jclouds/karaf/itests/JcloudsFeaturesTestSupport.java index 434c793..a34e594 100644 --- a/itests/src/test/java/org/jclouds/karaf/itests/JcloudsFeaturesTestSupport.java +++ b/itests/src/test/java/org/jclouds/karaf/itests/JcloudsFeaturesTestSupport.java @@ -31,7 +31,7 @@ import org.ops4j.pax.exam.junit.Configuration; public class JcloudsFeaturesTestSupport extends JcloudsKarafTestSupport { - public static final String JCLOUDS_FEATURE_FORMAT = "mvn:org.jclouds.karaf/jclouds-karaf/%s/xml/features"; + public static final String JCLOUDS_FEATURE_FORMAT = "mvn:org.apache.jclouds.karaf/jclouds-karaf/%s/xml/features"; public static final String JCLOUDS_FEATURE_VERSION_PROPERTY = "jclouds.feature.version"; /** http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/c7b3868f/itests/src/test/java/org/jclouds/karaf/itests/ObrResolverTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/ObrResolverTest.java b/itests/src/test/java/org/jclouds/karaf/itests/ObrResolverTest.java index 2d85ed5..a18bfe1 100644 --- a/itests/src/test/java/org/jclouds/karaf/itests/ObrResolverTest.java +++ b/itests/src/test/java/org/jclouds/karaf/itests/ObrResolverTest.java @@ -53,7 +53,7 @@ public class ObrResolverTest extends JcloudsFeaturesTestSupport { public void testJcloudsKarafServicesResolution() throws Exception { installAndCheckFeature("obr"); installAndCheckFeature("jclouds-services"); - String jcloudsServicesBundles = executeCommand("osgi:list -s | grep -i -c org.jclouds.karaf.services"); + String jcloudsServicesBundles = executeCommand("osgi:list -s | grep -i -c org.apache.jclouds.karaf.services"); assertNotNull(jcloudsServicesBundles); int jcloudsServicesBundlesCount = Integer.parseInt(jcloudsServicesBundles.trim()); assertEquals("Expected only one jclouds-services bundle", 1, jcloudsServicesBundlesCount); @@ -67,12 +67,12 @@ public class ObrResolverTest extends JcloudsFeaturesTestSupport { public void testJcloudsKarafCommandsResolution() throws Exception { installAndCheckFeature("obr"); installAndCheckFeature("jclouds-commands"); - String jcloudsCommandsBundles = executeCommand("osgi:list -s | grep -i -c org.jclouds.karaf.commands"); + String jcloudsCommandsBundles = executeCommand("osgi:list -s | grep -i -c org.apache.jclouds.karaf.commands"); assertNotNull(jcloudsCommandsBundles); int jcloudsCommandsBundlesCount = Integer.parseInt(jcloudsCommandsBundles.trim()); assertEquals("Expected one jclouds-commands bundle", 1, jcloudsCommandsBundlesCount); - String jcloudsServicesBundles = executeCommand("osgi:list -s | grep -i -c org.jclouds.karaf.services"); + String jcloudsServicesBundles = executeCommand("osgi:list -s | grep -i -c org.apache.jclouds.karaf.services"); assertNotNull(jcloudsServicesBundles); int jcloudsServicesBundlesCount = Integer.parseInt(jcloudsServicesBundles.trim()); assertEquals("Expected one jclouds-services bundle", 1, jcloudsServicesBundlesCount); @@ -86,12 +86,12 @@ public class ObrResolverTest extends JcloudsFeaturesTestSupport { public void testJcloudsKarafChefResolution() throws Exception { installAndCheckFeature("obr"); installAndCheckFeature("jclouds-chef"); - String jcloudsChefCommandsBundles = executeCommand("osgi:list -s | grep -i -c org.jclouds.karaf.chef.commands"); + String jcloudsChefCommandsBundles = executeCommand("osgi:list -s | grep -i -c org.apache.jclouds.karaf.chef.commands"); assertNotNull(jcloudsChefCommandsBundles); int jcloudsCommandsBundlesCount = Integer.parseInt(jcloudsChefCommandsBundles.trim()); assertEquals("Expected one chef commands bundle", 1, jcloudsCommandsBundlesCount); - String jcloudsChefServicesBundles = executeCommand("osgi:list -s | grep -i -c org.jclouds.karaf.chef.services"); + String jcloudsChefServicesBundles = executeCommand("osgi:list -s | grep -i -c org.apache.jclouds.karaf.chef.services"); assertNotNull(jcloudsChefServicesBundles); int jcloudsServicesBundlesCount = Integer.parseInt(jcloudsChefServicesBundles.trim()); assertEquals("Expected one chef services bundle", 1, jcloudsServicesBundlesCount);
