You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/11/20 20:32:29 UTC
svn commit: r1204223 - in /karaf/cellar/branches/cellar-2.2.x: ./
assembly/src/main/resources/ itests/ itests/src/ itests/src/test/
itests/src/test/java/ itests/src/test/java/org/
itests/src/test/java/org/apache/ itests/src/test/java/org/apache/karaf/ ...
Author: iocanel
Date: Sun Nov 20 19:32:28 2011
New Revision: 1204223
URL: http://svn.apache.org/viewvc?rev=1204223&view=rev
Log:
Merged from trunk
[KARAF-1026] Added integration tests for installation, multiple instances and basic group actions. [from revision 1204209]
Added:
karaf/cellar/branches/cellar-2.2.x/itests/
- copied from r1204209, karaf/cellar/trunk/itests/
karaf/cellar/branches/cellar-2.2.x/itests/pom.xml
- copied unchanged from r1204209, karaf/cellar/trunk/itests/pom.xml
karaf/cellar/branches/cellar-2.2.x/itests/src/
- copied from r1204209, karaf/cellar/trunk/itests/src/
karaf/cellar/branches/cellar-2.2.x/itests/src/test/
- copied from r1204209, karaf/cellar/trunk/itests/src/test/
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/
- copied from r1204209, karaf/cellar/trunk/itests/src/test/java/
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/
- copied from r1204209, karaf/cellar/trunk/itests/src/test/java/org/
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/
- copied from r1204209, karaf/cellar/trunk/itests/src/test/java/org/apache/
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/
- copied from r1204209, karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/
- copied from r1204209, karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/
- copied from r1204209, karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java
- copied unchanged from r1204209, karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarChildNodesTest.java
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java
- copied unchanged from r1204209, karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarGroupsTest.java
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java
- copied unchanged from r1204209, karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarInstallationTest.java
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
- copied unchanged from r1204209, karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
Modified:
karaf/cellar/branches/cellar-2.2.x/ (props changed)
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg
karaf/cellar/branches/cellar-2.2.x/pom.xml
Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 20 19:32:28 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321,1162327,1162356-1162357,1162390,1162397,1162399,1164077,1164523,1164989,1164994,1166403,1166434,1181287,1186085,1202090,1202105,1202108,1202111,1203975,1204173,1204184
+/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321,1162327,1162356-1162357,1162390,1162397,1162399,1164077,1164523,1164989,1164994,1166403,1166434,1181287,1186085,1202090,1202105,1202108,1202111,1203975,1204173,1204184,1204209
Modified: karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg?rev=1204223&r1=1204222&r2=1204223&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg (original)
+++ karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg Sun Nov 20 19:32:28 2011
@@ -11,8 +11,8 @@ default.features.blacklist.outbound=cell
default.features.sync=true
default.features.repositories.sync=true
-default.bundle.whitelist.inbound=
-default.bundle.whitelist.outbound=
+default.bundle.whitelist.inbound=none
+default.bundle.whitelist.outbound=none
default.bundle.sync=false
default.obr.urls.sync=true
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=1204223&r1=1204222&r2=1204223&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/pom.xml Sun Nov 20 19:32:28 2011
@@ -38,7 +38,7 @@
<felix.bundlerepository.version>1.6.6</felix.bundlerepository.version>
<felix.configadmin.version>1.2.8</felix.configadmin.version>
<felix.webconsole.version>3.1.8</felix.webconsole.version>
- <hazelcast.version>1.9.4</hazelcast.version>
+ <hazelcast.version>1.9.4.3</hazelcast.version>
<jclouds.version>1.2.1</jclouds.version>
<jclouds.karaf.version>1.2.1_1</jclouds.karaf.version>
<joda-time.version>1.6.2</joda-time.version>
@@ -46,7 +46,9 @@
<junit.bundle.version>4.7_3</junit.bundle.version>
<karaf.version>2.2.2</karaf.version>
<osgi.version>4.2.0</osgi.version>
- <pax.url.version>1.3.4</pax.url.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.3.5</pax.url.version>
<servlet.api.version>2.5</servlet.api.version>
<slf4j.version>1.6.1</slf4j.version>
</properties>
@@ -65,6 +67,7 @@
<module>management</module>
<module>webconsole</module>
<module>assembly</module>
+ <module>itests</module>
<module>samples</module>
</modules>
@@ -279,6 +282,11 @@
<artifactId>pax-url-mvn</artifactId>
<version>${pax.url.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <version>${pax.url.version}</version>
+ </dependency>
<!-- Testing -->
<dependency>
@@ -293,6 +301,19 @@
<artifactId>easymock</artifactId>
<version>${easymock.version}</version>
</dependency>
+
+ <!-- Pax Exam -->
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>${pax.exam.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openengsb.labs.paxexam.karaf</groupId>
+ <artifactId>paxexam-karaf-container</artifactId>
+ <version>${pax.exam.karaf.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>