You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2013/03/20 00:40:13 UTC
svn commit: r1458571 - in /karaf/cellar/trunk:
bundle/src/main/resources/OSGI-INF/blueprint/
config/src/main/resources/OSGI-INF/blueprint/
event/src/main/resources/OSGI-INF/blueprint/
features/src/main/resources/OSGI-INF/blueprint/ itests/src/test/java...
Author: anierbeck
Date: Tue Mar 19 23:40:13 2013
New Revision: 1458571
URL: http://svn.apache.org/r1458571
Log:
[KARAF-1474] - Fix Cellar itests
----
some more ...
Modified:
karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/cellar/trunk/event/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarConfigurationTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
Modified: karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1458571&r1=1458570&r2=1458571&view=diff
==============================================================================
--- karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Mar 19 23:40:13 2013
@@ -13,7 +13,10 @@
~ limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint default-availability="mandatory"
+ xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0
+ http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
<!-- Local Bundle Listener -->
<bean id="bundleListener" class="org.apache.karaf.cellar.bundle.LocalBundleListener" init-method="init"
@@ -52,7 +55,7 @@
<!-- Cluster Core Services -->
<reference id="clusterManager" interface="org.apache.karaf.cellar.core.ClusterManager"/>
- <reference id="groupManager" interface="org.apache.karaf.cellar.core.GroupManager"/>
+ <reference id="groupManager" interface="org.apache.karaf.cellar.core.GroupManager" />
<reference id="configurationAdmin" interface="org.osgi.service.cm.ConfigurationAdmin"/>
<reference id="eventProducer" interface="org.apache.karaf.cellar.core.event.EventProducer"/>
Modified: karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1458571&r1=1458570&r2=1458571&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Mar 19 23:40:13 2013
@@ -13,9 +13,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+<blueprint default-availability="mandatory"
+ xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
- xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
+ xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
+ xsi:schemaLocation="
+ http://www.osgi.org/xmlns/blueprint/v1.0.0
+ http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+ http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0
+ http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.0.0.xsd
+ http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0
+ http://aries.apache.org/schemas/blueprint-ext/blueprint-ext.xsd
+ ">
<!-- Local Configuration Listener -->
<bean id="configurationListener" class="org.apache.karaf.cellar.config.LocalConfigurationListener" init-method="init"
Modified: karaf/cellar/trunk/event/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/event/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1458571&r1=1458570&r2=1458571&view=diff
==============================================================================
--- karaf/cellar/trunk/event/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/trunk/event/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Mar 19 23:40:13 2013
@@ -13,7 +13,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint default-availability="mandatory"
+ xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0
+ http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
<!-- Local Event Listener -->
<bean id="localEventListener" class="org.apache.karaf.cellar.event.LocalEventListener" init-method="init" destroy-method="destroy">
Modified: karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1458571&r1=1458570&r2=1458571&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/blueprint.xml Tue Mar 19 23:40:13 2013
@@ -12,7 +12,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint default-availability="mandatory"
+ xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0
+ http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
<!-- Local Features Listener -->
<bean id="featuresListener" class="org.apache.karaf.cellar.features.LocalFeaturesListener" init-method="init"
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarConfigurationTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarConfigurationTest.java?rev=1458571&r1=1458570&r2=1458571&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarConfigurationTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarConfigurationTest.java Tue Mar 19 23:40:13 2013
@@ -42,23 +42,23 @@ public class CellarConfigurationTest ext
String node1 = getNodeIdOfChild("child1");
String node2 = getNodeIdOfChild("child2");
- System.err.println(executeCommand("admin:list"));
+ System.err.println(executeCommand("instance:list"));
- String properties = executeCommand("admin:connect child1 config:proplist --pid " + TESTPID);
+ String properties = executeCommand("instance:connect child1 config:proplist --pid " + TESTPID);
System.err.println(properties);
assertFalse((properties.contains("myKey")));
//Test configuration sync - add property
System.err.println(executeCommand("config:propset --pid " + TESTPID + " myKey myValue"));
Thread.sleep(5000);
- properties = executeCommand("admin:connect child1 config:proplist --pid " + TESTPID);
+ properties = executeCommand("instance:connect child1 config:proplist --pid " + TESTPID);
System.err.println(properties);
assertTrue(properties.contains("myKey = myValue"));
//Test configuration sync - remove property
System.err.println(executeCommand("config:propdel --pid " + TESTPID + " myKey"));
Thread.sleep(5000);
- properties = executeCommand("admin:connect child1 config:proplist --pid " + TESTPID);
+ properties = executeCommand("instance:connect child1 config:proplist --pid " + TESTPID);
System.err.println(properties);
assertFalse(properties.contains("myKey"));
@@ -66,11 +66,11 @@ public class CellarConfigurationTest ext
//Test configuration sync - add property - join later
System.err.println(executeCommand("cluster:group-set new-grp " + node1));
Thread.sleep(5000);
- System.err.println(executeCommand("admin:connect child1 config:propset --pid " + TESTPID + " myKey2 myValue2"));
- properties = executeCommand("admin:connect child1 config:proplist --pid " + TESTPID);
+ System.err.println(executeCommand("instance:connect child1 config:propset --pid " + TESTPID + " myKey2 myValue2"));
+ properties = executeCommand("instance:connect child1 config:proplist --pid " + TESTPID);
Thread.sleep(5000);
System.err.println(executeCommand("cluster:group-set new-grp " + node2));
- properties = executeCommand("admin:connect child2 config:proplist --pid " + TESTPID);
+ properties = executeCommand("instance:connect child2 config:proplist --pid " + TESTPID);
System.err.println(properties);
assertTrue(properties.contains("myKey2 = myValue2"));
}
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java?rev=1458571&r1=1458570&r2=1458571&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java Tue Mar 19 23:40:13 2013
@@ -42,37 +42,37 @@ public class CellarFeaturesTest extends
ClusterManager clusterManager = getOsgiService(ClusterManager.class);
assertNotNull(clusterManager);
- System.err.println(executeCommand("admin:list"));
+ System.err.println(executeCommand("instance:list"));
- String eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
+ String eventadminFeatureStatus = executeCommand("instance:connect child1 features:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(UNINSTALLED));
//Test feature sync - install
System.err.println(executeCommand("features:install eventadmin"));
Thread.sleep(5000);
- eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
+ eventadminFeatureStatus = executeCommand("instance:connect child1 features:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(INSTALLED));
//Test feature sync - uninstall
System.err.println(executeCommand("features:uninstall eventadmin"));
Thread.sleep(5000);
- eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
+ eventadminFeatureStatus = executeCommand("instance:connect child1 features:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(UNINSTALLED));
//Test feature command - install
System.err.println(executeCommand("cluster:feature-install default eventadmin"));
Thread.sleep(5000);
- eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
+ eventadminFeatureStatus = executeCommand("instance:connect child1 features:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(INSTALLED));
//Test feature command - uninstall
System.err.println(executeCommand("cluster:feature-uninstall default eventadmin"));
Thread.sleep(5000);
- eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
+ eventadminFeatureStatus = executeCommand("instance:connect child1 features:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(UNINSTALLED));
@@ -80,7 +80,7 @@ public class CellarFeaturesTest extends
System.err.println(executeCommand("cluster:feature-install testgroup eventadmin"));
System.err.println(executeCommand("cluster:group-set testgroup " + getNodeIdOfChild("child1")));
Thread.sleep(5000);
- eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
+ eventadminFeatureStatus = executeCommand("instance:connect child1 features:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(INSTALLED));
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java?rev=1458571&r1=1458570&r2=1458571&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleCamelHazelcastTest.java Tue Mar 19 23:40:13 2013
@@ -42,7 +42,7 @@ public class CellarSampleCamelHazelcastT
System.err.println(executeCommand("feature:add-url mvn:org.apache.karaf.cellar.samples/camel-hazelcast-app/3.0.0-SNAPSHOT/xml/features"));
- System.err.println(executeCommand("admin:list"));
+ System.err.println(executeCommand("instance:list"));
System.err.println(executeCommand("cluster:node-list"));
Node localNode = clusterManager.getNode();
@@ -69,12 +69,12 @@ public class CellarSampleCamelHazelcastT
System.err.println(executeCommand("osgi:list"));
System.err.println(executeCommand("cluster:group-list"));
- System.err.println(executeCommand("admin:connect child2 osgi:list -t 0"));
+ System.err.println(executeCommand("instance:connect child2 osgi:list -t 0"));
Thread.sleep(20000);
- String output1 = executeCommand("admin:connect child1 log:display | grep \"Hallo Cellar\"");
+ String output1 = executeCommand("instance:connect child1 log:display | grep \"Hallo Cellar\"");
System.err.println(output1);
- String output2 = executeCommand("admin:connect child2 log:display | grep \"Hallo Cellar\"");
+ String output2 = executeCommand("instance:connect child2 log:display | grep \"Hallo Cellar\"");
System.err.println(output2);
assertTrue("Expected at least 1 lines", 1 <= countOutputEntires(output1));
assertTrue("Expected at least 1 lines", 1 <= countOutputEntires(output2));
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java?rev=1458571&r1=1458570&r2=1458571&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarSampleDosgiGreeterTest.java Tue Mar 19 23:40:13 2013
@@ -43,7 +43,7 @@ public class CellarSampleDosgiGreeterTes
System.err.println(executeCommand("features:addurl mvn:org.apache.karaf.cellar.samples/dosgi-greeter/3.0.0-SNAPSHOT/xml/features"));
- System.err.println(executeCommand("admin:list"));
+ System.err.println(executeCommand("instance:list"));
System.err.println(executeCommand("cluster:node-list"));
Node localNode = clusterManager.getNode();
@@ -77,7 +77,7 @@ public class CellarSampleDosgiGreeterTes
Thread.sleep(10000);
Thread.sleep(10000);
System.err.println(executeCommand("cluster:group-list"));
- System.err.println(executeCommand("admin:connect child2 osgi:list -t 0"));
+ System.err.println(executeCommand("instance:connect child2 osgi:list -t 0"));
System.err.println(executeCommand("cluster:list-services"));
greetOutput = executeCommand("dosgi-greeter:greet Hi 10");
System.err.println(greetOutput);
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java?rev=1458571&r1=1458570&r2=1458571&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java Tue Mar 19 23:40:13 2013
@@ -168,7 +168,7 @@ public class CellarTestSupport {
*/
protected String getNodeIdOfChild(String name) {
String node;
- String nodesList = executeCommand("admin:connect " + name + " cluster:node-list | grep \\\\*", COMMAND_TIMEOUT, true);
+ String nodesList = executeCommand("instance:connect " + name + " cluster:node-list | grep \\\\*", COMMAND_TIMEOUT, true);
int stop = nodesList.indexOf(']');
node = nodesList.substring(0, stop);
int start = node.lastIndexOf('[');