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/19 22:06:34 UTC
svn commit: r1458515 - in /karaf/cellar/trunk: ./ bundle/ cloud/ config/
core/ dosgi/ event/ features/ hazelcast/ itests/
itests/src/test/java/org/apache/karaf/cellar/itests/ management/ manual/
obr/ samples/camel-hazelcast-app/consumer/ samples/camel-...
Author: anierbeck
Date: Tue Mar 19 21:06:33 2013
New Revision: 1458515
URL: http://svn.apache.org/r1458515
Log:
[KARAF-2111] - Cellar should use karaf-pax-exam
---
also added svn:ignore for .classpath
Modified:
karaf/cellar/trunk/bundle/ (props changed)
karaf/cellar/trunk/cloud/ (props changed)
karaf/cellar/trunk/config/ (props changed)
karaf/cellar/trunk/core/ (props changed)
karaf/cellar/trunk/dosgi/ (props changed)
karaf/cellar/trunk/event/ (props changed)
karaf/cellar/trunk/features/ (props changed)
karaf/cellar/trunk/hazelcast/ (props changed)
karaf/cellar/trunk/itests/pom.xml
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarBundleTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java
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/CellarEventTest.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/CellarGroupsTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarObrTest.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
karaf/cellar/trunk/management/ (props changed)
karaf/cellar/trunk/manual/ (props changed)
karaf/cellar/trunk/obr/ (props changed)
karaf/cellar/trunk/pom.xml
karaf/cellar/trunk/samples/camel-hazelcast-app/consumer/ (props changed)
karaf/cellar/trunk/samples/camel-hazelcast-app/producer/ (props changed)
karaf/cellar/trunk/samples/dosgi-greeter/api/ (props changed)
karaf/cellar/trunk/samples/dosgi-greeter/client/ (props changed)
karaf/cellar/trunk/samples/dosgi-greeter/service/ (props changed)
karaf/cellar/trunk/samples/hazelcast-app/ (props changed)
karaf/cellar/trunk/shell/ (props changed)
karaf/cellar/trunk/utils/ (props changed)
karaf/cellar/trunk/webconsole/ (props changed)
Propchange: karaf/cellar/trunk/bundle/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@ target
.settings
.project
+
+.classpath
Propchange: karaf/cellar/trunk/cloud/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@ target
.settings
.project
+
+.classpath
Propchange: karaf/cellar/trunk/config/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@ target
.settings
.project
+
+.classpath
Propchange: karaf/cellar/trunk/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -5,3 +5,5 @@ bin
target
.project
+
+.classpath
Propchange: karaf/cellar/trunk/dosgi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@ target
.settings
.project
+
+.classpath
Propchange: karaf/cellar/trunk/event/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@
target
.project
+
+.classpath
Propchange: karaf/cellar/trunk/features/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@ target
.settings
.project
+
+.classpath
Propchange: karaf/cellar/trunk/hazelcast/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@ target
.settings
.project
+
+.classpath
Modified: karaf/cellar/trunk/itests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/pom.xml?rev=1458515&r1=1458514&r2=1458515&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/pom.xml (original)
+++ karaf/cellar/trunk/itests/pom.xml Tue Mar 19 21:06:33 2013
@@ -62,8 +62,9 @@
</dependency>
<dependency>
- <groupId>org.openengsb.labs.paxexam.karaf</groupId>
- <artifactId>paxexam-karaf-container</artifactId>
+ <groupId>org.apache.karaf.tooling.exam</groupId>
+ <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
+ <version>3.0.0.RC1</version>
<scope>test</scope>
</dependency>
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarBundleTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarBundleTest.java?rev=1458515&r1=1458514&r2=1458515&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarBundleTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarBundleTest.java Tue Mar 19 21:06:33 2013
@@ -13,27 +13,26 @@
*/
package org.apache.karaf.cellar.itests;
+import static org.junit.Assert.assertNotNull;
+
import org.apache.karaf.cellar.core.ClusterManager;
+import org.apache.karaf.features.FeaturesService;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-import static org.junit.Assert.assertNotNull;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
-
@RunWith(JUnit4TestRunner.class)
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class CellarBundleTest extends CellarTestSupport {
@Test
public void testCellarBundleModule() throws Exception {
+ FeaturesService featuresService = getOsgiService(FeaturesService.class);
+ assertNotNull(featuresService);
+
installCellar();
Thread.sleep(DEFAULT_TIMEOUT);
ClusterManager clusterManager = getOsgiService(ClusterManager.class);
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java?rev=1458515&r1=1458514&r2=1458515&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java Tue Mar 19 21:06:33 2013
@@ -13,6 +13,9 @@
*/
package org.apache.karaf.cellar.itests;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.Set;
import org.apache.karaf.cellar.core.ClusterManager;
@@ -20,17 +23,10 @@ import org.apache.karaf.cellar.core.Node
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-import static org.junit.Assert.*;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
-
@RunWith(JUnit4TestRunner.class)
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class CellarChildNodesTest extends CellarTestSupport {
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=1458515&r1=1458514&r2=1458515&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 21:06:33 2013
@@ -13,21 +13,18 @@
*/
package org.apache.karaf.cellar.itests;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import org.apache.karaf.cellar.core.ClusterManager;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-import static org.junit.Assert.*;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
-
@RunWith(JUnit4TestRunner.class)
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class CellarConfigurationTest extends CellarTestSupport {
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarEventTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarEventTest.java?rev=1458515&r1=1458514&r2=1458515&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarEventTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarEventTest.java Tue Mar 19 21:06:33 2013
@@ -13,6 +13,8 @@
*/
package org.apache.karaf.cellar.itests;
+import static org.junit.Assert.assertNotNull;
+
import org.apache.karaf.cellar.core.ClusterManager;
import org.junit.After;
import org.junit.Test;
@@ -21,8 +23,6 @@ import org.ops4j.pax.exam.junit.ExamReac
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-import static org.junit.Assert.assertNotNull;
-
@RunWith(JUnit4TestRunner.class)
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class CellarEventTest extends CellarTestSupport {
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=1458515&r1=1458514&r2=1458515&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 21:06:33 2013
@@ -13,25 +13,20 @@
*/
package org.apache.karaf.cellar.itests;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Set;
+
import org.apache.karaf.cellar.core.ClusterManager;
import org.apache.karaf.cellar.core.Node;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-import java.util.Set;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
-
@RunWith(JUnit4TestRunner.class)
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class CellarFeaturesTest extends CellarTestSupport {
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java?rev=1458515&r1=1458514&r2=1458515&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java Tue Mar 19 21:06:33 2013
@@ -13,6 +13,10 @@
*/
package org.apache.karaf.cellar.itests;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.Set;
import org.apache.karaf.cellar.core.ClusterManager;
@@ -22,20 +26,10 @@ import org.apache.karaf.cellar.core.Node
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
-
@RunWith(JUnit4TestRunner.class)
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class CellarGroupsTest extends CellarTestSupport {
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java?rev=1458515&r1=1458514&r2=1458515&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java Tue Mar 19 21:06:33 2013
@@ -13,19 +13,15 @@
*/
package org.apache.karaf.cellar.itests;
+import static org.junit.Assert.assertNotNull;
+
import org.apache.karaf.cellar.core.ClusterManager;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-
-import static org.junit.Assert.assertNotNull;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-
@RunWith(JUnit4TestRunner.class)
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class CellarInstallationTest extends CellarTestSupport {
Modified: karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarObrTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarObrTest.java?rev=1458515&r1=1458514&r2=1458515&view=diff
==============================================================================
--- karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarObrTest.java (original)
+++ karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarObrTest.java Tue Mar 19 21:06:33 2013
@@ -13,21 +13,16 @@
*/
package org.apache.karaf.cellar.itests;
+import static org.junit.Assert.assertNotNull;
+
import org.apache.karaf.cellar.core.ClusterManager;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-import static org.junit.Assert.assertNotNull;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
-
@RunWith(JUnit4TestRunner.class)
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class CellarObrTest extends CellarTestSupport {
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=1458515&r1=1458514&r2=1458515&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 21:06:33 2013
@@ -13,6 +13,9 @@
*/
package org.apache.karaf.cellar.itests;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.Set;
import org.apache.karaf.cellar.core.ClusterManager;
@@ -20,20 +23,10 @@ import org.apache.karaf.cellar.core.Node
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
-
@RunWith(JUnit4TestRunner.class)
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class CellarSampleCamelHazelcastTest extends CellarTestSupport {
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=1458515&r1=1458514&r2=1458515&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 21:06:33 2013
@@ -13,6 +13,10 @@
*/
package org.apache.karaf.cellar.itests;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.Set;
import org.apache.karaf.cellar.core.ClusterManager;
@@ -20,21 +24,10 @@ import org.apache.karaf.cellar.core.Node
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.debugConfiguration;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
-
@RunWith(JUnit4TestRunner.class)
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class CellarSampleDosgiGreeterTest extends CellarTestSupport {
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=1458515&r1=1458514&r2=1458515&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 21:06:33 2013
@@ -13,29 +13,47 @@
*/
package org.apache.karaf.cellar.itests;
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.CommandSession;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
-import org.ops4j.pax.exam.MavenUtils;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.TestProbeBuilder;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.ProbeBuilder;
-import org.osgi.framework.*;
-import org.osgi.util.tracker.ServiceTracker;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.editConfigurationFileExtend;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel;
+import static org.ops4j.pax.exam.CoreOptions.maven;
-import javax.inject.Inject;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
import java.net.DatagramSocket;
import java.net.ServerSocket;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.*;
-import static org.ops4j.pax.exam.CoreOptions.maven;
+import javax.inject.Inject;
+
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.karaf.tooling.exam.options.LogLevelOption;
+import org.ops4j.pax.exam.MavenUtils;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.TestProbeBuilder;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.junit.ProbeBuilder;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Filter;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
public class CellarTestSupport {
@@ -90,8 +108,8 @@ public class CellarTestSupport {
* Installs the Cellar feature
*/
protected void installCellar() {
- System.err.println(executeCommand("feature:url-add " + System.getProperty("cellar.feature.url")));
- System.err.println(executeCommand("feature:url-list"));
+ System.err.println(executeCommand("feature:repo-add " + System.getProperty("cellar.feature.url")));
+ System.err.println(executeCommand("feature:repo-list"));
System.err.println(executeCommand("feature:list"));
executeCommand("feature:install cellar");
}
Propchange: karaf/cellar/trunk/management/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@ target
.settings
.project
+
+.classpath
Propchange: karaf/cellar/trunk/manual/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@
target
.project
+
+.classpath
Propchange: karaf/cellar/trunk/obr/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@ target
.settings
.project
+
+.classpath
Modified: karaf/cellar/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/pom.xml?rev=1458515&r1=1458514&r2=1458515&view=diff
==============================================================================
--- karaf/cellar/trunk/pom.xml (original)
+++ karaf/cellar/trunk/pom.xml Tue Mar 19 21:06:33 2013
@@ -49,7 +49,7 @@
<osgi.version>4.3.1</osgi.version>
<osgi.compendium.version>4.3.1</osgi.compendium.version>
<pax.exam.version>2.6.0</pax.exam.version>
- <pax.exam.karaf.version>0.4.0</pax.exam.karaf.version>
+ <pax.exam.karaf.version>3.0.0.RC1</pax.exam.karaf.version>
<servlet.api.version>2.5</servlet.api.version>
<slf4j.version>1.7.2</slf4j.version>
</properties>
@@ -320,8 +320,8 @@
<version>${pax.exam.version}</version>
</dependency>
<dependency>
- <groupId>org.openengsb.labs.paxexam.karaf</groupId>
- <artifactId>paxexam-karaf-container</artifactId>
+ <groupId>org.apache.karaf.tooling.exam</groupId>
+ <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
<version>${pax.exam.karaf.version}</version>
<scope>test</scope>
</dependency>
@@ -498,7 +498,7 @@
<configuration>
<target>
<copy file="NOTICE" todir="target/maven-shared-archive-resources/META-INF"
- failonerror="false" overwrite="true"/>
+ failonerror="false" overwrite="true" />
</target>
</configuration>
<goals>
Propchange: karaf/cellar/trunk/samples/camel-hazelcast-app/consumer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@
target
.project
+
+.classpath
Propchange: karaf/cellar/trunk/samples/camel-hazelcast-app/producer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@
target
.project
+
+.classpath
Propchange: karaf/cellar/trunk/samples/dosgi-greeter/api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@ target
.settings
.project
+
+.classpath
Propchange: karaf/cellar/trunk/samples/dosgi-greeter/client/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@ target
.settings
.project
+
+.classpath
Propchange: karaf/cellar/trunk/samples/dosgi-greeter/service/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@ target
.settings
.project
+
+.classpath
Propchange: karaf/cellar/trunk/samples/hazelcast-app/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@
target
.project
+
+.classpath
Propchange: karaf/cellar/trunk/shell/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@
target
.project
+
+.classpath
Propchange: karaf/cellar/trunk/utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@ target
.settings
.project
+
+.classpath
Propchange: karaf/cellar/trunk/webconsole/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 19 21:06:33 2013
@@ -3,3 +3,5 @@ target
.settings
.project
+
+.classpath