From 1a4fae97ce401c87113042f22afb44cd2822de63 Mon Sep 17 00:00:00 2001
From: Andrew Phillips <demobox1@yahoo.co.uk>
Date: Thu, 16 May 2013 10:55:27 -0400
Subject: [PATCH] JCLOUDS-51: Changing default feature package from org.jclouds
-> org.apache.jclouds See JCLOUDS-18
---
.../org/jclouds/karaf/itests/JcloudsFeaturesTestSupport.java | 2 +-
.../test/java/org/jclouds/karaf/itests/ObrResolverTest.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
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 @@
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";
/**
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 void tearDown() {
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 void testJcloudsKarafServicesResolution() throws Exception {
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 void testJcloudsKarafCommandsResolution() throws Exception {
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);
--
1.8.1.6