You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/05/14 16:47:39 UTC
svn commit: r1338232 - in /karaf/cellar/branches/cellar-2.2.x:
itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java
itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
pom.xml
Author: jbonofre
Date: Mon May 14 14:47:38 2012
New Revision: 1338232
URL: http://svn.apache.org/viewvc?rev=1338232&view=rev
Log:
[KARAF-1474] Update itests versioning
Modified:
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
karaf/cellar/branches/cellar-2.2.x/pom.xml
Modified: karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java?rev=1338232&r1=1338231&r2=1338232&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarFeaturesTest.java Mon May 14 14:47:38 2012
@@ -56,28 +56,28 @@ public class CellarFeaturesTest extends
//Test feature sync - install
System.err.println(executeCommand("features:install eventadmin"));
- Thread.sleep(5000);
+ Thread.sleep(2000);
eventadminFeatureStatus = executeCommand("admin: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);
+ Thread.sleep(2000);
eventadminFeatureStatus = executeCommand("admin: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);
+ Thread.sleep(2000);
eventadminFeatureStatus = executeCommand("admin: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);
+ Thread.sleep(2000);
eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(UNINSTALLED));
@@ -85,7 +85,7 @@ public class CellarFeaturesTest extends
//Test feature command - install - before a node joins
System.err.println(executeCommand("cluster:feature-install testgroup eventadmin"));
System.err.println(executeCommand("cluster:group-set testgroup " + getNodeIdOfChild("child1")));
- Thread.sleep(5000);
+ Thread.sleep(2000);
eventadminFeatureStatus = executeCommand("admin:connect child1 features:list | grep eventadmin");
System.err.println(eventadminFeatureStatus);
assertTrue(eventadminFeatureStatus.startsWith(INSTALLED));
Modified: karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java?rev=1338232&r1=1338231&r2=1338232&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java Mon May 14 14:47:38 2012
@@ -67,28 +67,6 @@ public class CellarTestSupport {
}
/**
- * This method configures Hazelcast TcpIp discovery for a given number of memebers.
- * This configuration is required, when working with karaf instances.
- *
- * @param members
- */
- protected void configureLocalDiscovery(int members) {
- // TODO use the hazelcast config
- StringBuilder membersBuilder = new StringBuilder();
- membersBuilder.append("config:propset tcpIpMembers ");
- membersBuilder.append("localhost:5701");
- for (int i = 1; i < members; i++) {
- membersBuilder.append(",").append("localhost:").append(String.valueOf(5701 + i));
- }
-
- String editCmd = "config:edit org.apache.karaf.cellar.instance";
- String propsetCmd = membersBuilder.toString();
- String updateCmd = "config:update";
-
- executeCommands(editCmd, propsetCmd, updateCmd);
- }
-
- /**
* Installs the Cellar feature
*/
protected void installCellar() {
Modified: karaf/cellar/branches/cellar-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/pom.xml?rev=1338232&r1=1338231&r2=1338232&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/pom.xml Mon May 14 14:47:38 2012
@@ -44,11 +44,11 @@
<joda-time.version>1.6.2</joda-time.version>
<junit.version>4.7</junit.version>
<junit.bundle.version>4.7_3</junit.bundle.version>
- <karaf.version>2.2.6</karaf.version>
+ <karaf.version>2.2.7</karaf.version>
<osgi.version>4.2.0</osgi.version>
- <pax.exam.version>2.3.0.M1</pax.exam.version>
- <pax.exam.karaf.version>0.4.0</pax.exam.karaf.version>
- <pax.url.version>1.2.8</pax.url.version>
+ <pax.exam.version>2.3.1</pax.exam.version>
+ <pax.exam.karaf.version>0.5.3</pax.exam.karaf.version>
+ <pax.url.version>1.3.5</pax.url.version>
<servlet.api.version>2.5</servlet.api.version>
<slf4j.version>1.6.4</slf4j.version>
</properties>