ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1347615 - in /ace/trunk: ace-integrationtests/ ace-integrationtests/src/test/java/org/apache/ace/it/ ace-integrationtests/src/test/java/org/apache/ace/it/authentication/ ace-integrationtests/src/test/java/org/apache/ace/it/deployment/ ace-...
Date Thu, 07 Jun 2012 13:38:55 GMT
Author: jawi
Date: Thu Jun  7 13:38:54 2012
New Revision: 1347615

URL: http://svn.apache.org/viewvc?rev=1347615&view=rev
Log:
Upgraded the itests to the latest versions of PAX-exam, allowing newer versions of Felix to
be used in the itests.

Modified:
    ace/trunk/ace-integrationtests/pom.xml
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/ExampleTest.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/IntegrationTestBase.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/authentication/LogAuthenticationTest.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/authentication/ObrAuthenticationTest.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/http/ServletConfiguratorIntegrationTest.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repository/RepositoryTest.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repositoryadmin/RepositoryAdminTest.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/AssemblyConfigure.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java
    ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java
    ace/trunk/pom/pom.xml

Modified: ace/trunk/ace-integrationtests/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/pom.xml?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/pom.xml (original)
+++ ace/trunk/ace-integrationtests/pom.xml Thu Jun  7 13:38:54 2012
@@ -41,17 +41,56 @@
     <dependencies>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam</artifactId>
+            <artifactId>pax-exam-junit4</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-container-default</artifactId>
+		<dependency>
+		    <groupId>org.ops4j.pax.exam</groupId>
+		    <artifactId>pax-exam-container-paxrunner</artifactId>
+		    <scope>test</scope>
+		</dependency>
+		<dependency>
+		    <groupId>org.ops4j.pax.runner</groupId>
+		    <artifactId>pax-runner-no-jcl</artifactId>
+		    <scope>test</scope>
+		</dependency>
+		<dependency>
+		    <groupId>org.ops4j.pax.exam</groupId>
+		    <artifactId>pax-exam-link-assembly</artifactId>
+		    <scope>test</scope>
+		</dependency>
+		<dependency>
+		    <groupId>org.ops4j.pax.exam</groupId>
+		    <artifactId>pax-exam-link-mvn</artifactId>
+		    <scope>test</scope>
+		</dependency>
+		<dependency>
+		    <groupId>org.ops4j.pax.url</groupId>
+		    <artifactId>pax-url-aether</artifactId>
+		    <scope>test</scope>
+		</dependency>
+		<dependency>
+		    <groupId>org.ops4j.pax.url</groupId>
+		    <artifactId>pax-url-wrap</artifactId>
+		    <scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.inject</groupId>
+			<artifactId>javax.inject</artifactId>
+			<version>1</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+		    <scope>test</scope>
+		</dependency>
+            
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.5.11</version>
             <scope>test</scope>
         </dependency>
 
@@ -342,6 +381,43 @@
                 </configuration>
             </plugin>
         </plugins>
+        <pluginManagement>
+        	<plugins>
+        		<!--This plugin's configuration is used to store Eclipse m2e settings only.
It has no influence on the Maven build itself.-->
+        		<plugin>
+        			<groupId>org.eclipse.m2e</groupId>
+        			<artifactId>lifecycle-mapping</artifactId>
+        			<version>1.0.0</version>
+        			<configuration>
+        				<lifecycleMappingMetadata>
+        					<pluginExecutions>
+        						<pluginExecution>
+        							<pluginExecutionFilter>
+        								<groupId>
+        									org.ops4j.pax.exam
+        								</groupId>
+        								<artifactId>
+        									maven-paxexam-plugin
+        								</artifactId>
+        								<versionRange>
+        									[1.2.3,)
+        								</versionRange>
+        								<goals>
+        									<goal>
+        										generate-depends-file
+        									</goal>
+        								</goals>
+        							</pluginExecutionFilter>
+        							<action>
+        								<ignore></ignore>
+        							</action>
+        						</pluginExecution>
+        					</pluginExecutions>
+        				</lifecycleMappingMetadata>
+        			</configuration>
+        		</plugin>
+        	</plugins>
+        </pluginManagement>
     </build>
 
 </project>

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/ExampleTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/ExampleTest.java?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/ExampleTest.java (original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/ExampleTest.java Thu Jun
 7 13:38:54 2012
@@ -18,6 +18,14 @@
  */
 package org.apache.ace.it;
 
+import static org.junit.Assert.assertEquals;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.*;
+
+import java.io.IOException;
+
+import org.apache.ace.it.Options.Felix;
+import org.apache.ace.it.Options.Osgi;
 import org.apache.felix.dm.Component;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,13 +34,6 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.service.packageadmin.PackageAdmin;
 
-import java.io.IOException;
-
-import static org.apache.ace.it.Options.*;
-import static org.junit.Assert.assertEquals;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.provision;
-
 /**
  * This class serves as a minimal example of our integration tests. Also, if this test fails,
something is likely
  * wrong with the environment
@@ -44,6 +45,7 @@ public class ExampleTest extends Integra
     public Option[] configuration() {
         return options(
             // you can add additional directives, e.g. systemProperty or VMOptions here
+            junitBundles(),
             provision(
                 Osgi.compendium(),
                 Felix.dependencyManager()

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/IntegrationTestBase.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/IntegrationTestBase.java?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/IntegrationTestBase.java
(original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/IntegrationTestBase.java
Thu Jun  7 13:38:54 2012
@@ -18,15 +18,9 @@
  */
 package org.apache.ace.it;
 
-import org.apache.felix.dm.*;
-import org.junit.Before;
-import org.ops4j.pax.exam.Inject;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.util.tracker.ServiceTracker;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.ace.test.utils.Util.properties;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -36,9 +30,20 @@ import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.apache.ace.test.utils.Util.properties;
-import static org.junit.Assert.fail;
+import javax.inject.Inject;
+
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.ComponentDependencyDeclaration;
+import org.apache.felix.dm.ComponentStateListener;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.ServiceDependency;
+import org.junit.Before;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.util.tracker.ServiceTracker;
 
 /**
  * Base class for integration tests. There is no technical reason to use this, but it might
make

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java (original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/Options.java Thu Jun  7
13:38:54 2012
@@ -19,9 +19,9 @@
 package org.apache.ace.it;
 
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.options.VMOption;
 import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
 import org.ops4j.pax.exam.options.WrappedUrlProvisionOption;
+import org.ops4j.pax.exam.options.extra.VMOption;
 
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/authentication/LogAuthenticationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/authentication/LogAuthenticationTest.java?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/authentication/LogAuthenticationTest.java
(original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/authentication/LogAuthenticationTest.java
Thu Jun  7 13:38:54 2012
@@ -21,6 +21,7 @@ package org.apache.ace.it.authentication
 import static org.apache.ace.it.Options.jetty;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.provision;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
@@ -54,9 +55,9 @@ import org.apache.felix.dm.Component;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.options.CleanCachesOption;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.options.extra.CleanCachesOption;
 import org.osgi.framework.Constants;
 import org.osgi.service.http.HttpService;
 import org.osgi.service.useradmin.UserAdmin;
@@ -89,6 +90,7 @@ public class LogAuthenticationTest exten
         return options(
             systemProperty("org.osgi.service.http.port").value("" + TestConstants.PORT),
             new CleanCachesOption(),
+            junitBundles(),
             provision(
                 // Misc bundles...
                 Osgi.compendium(),

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/authentication/ObrAuthenticationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/authentication/ObrAuthenticationTest.java?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/authentication/ObrAuthenticationTest.java
(original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/authentication/ObrAuthenticationTest.java
Thu Jun  7 13:38:54 2012
@@ -23,6 +23,7 @@ import static org.apache.ace.it.Options.
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.provision;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
@@ -55,9 +56,9 @@ import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.options.CleanCachesOption;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.options.extra.CleanCachesOption;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.useradmin.UserAdmin;
@@ -88,6 +89,7 @@ public class ObrAuthenticationTest exten
         return options(
             systemProperty("org.osgi.service.http.port").value("" + TestConstants.PORT),
             new CleanCachesOption(),
+            junitBundles(),
             provision(
                 // Misc bundles...
                 Osgi.compendium(),

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/deployment/DeploymentIntegrationTest.java?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
(original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
Thu Jun  7 13:38:54 2012
@@ -19,6 +19,7 @@
 package org.apache.ace.it.deployment;
 
 import static org.apache.ace.it.Options.jetty;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.maven;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.provision;
@@ -54,8 +55,8 @@ import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.options.VMOption;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.options.extra.VMOption;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.BundleListener;
@@ -77,6 +78,7 @@ public class DeploymentIntegrationTest e
         return options(
             systemProperty("org.osgi.service.http.port").value("" + TestConstants.PORT),
             new VMOption("-ea"),
+            junitBundles(),
             provision(
                 wrappedBundle(maven("org.apache.ace", "org.apache.ace.deployment.provider.base")),
// necessary since we use an impl class here...
                 Ace.util(),

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/http/ServletConfiguratorIntegrationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/http/ServletConfiguratorIntegrationTest.java?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/http/ServletConfiguratorIntegrationTest.java
(original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/http/ServletConfiguratorIntegrationTest.java
Thu Jun  7 13:38:54 2012
@@ -19,6 +19,7 @@
 package org.apache.ace.it.http;
 
 import static org.apache.ace.it.Options.jetty;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.provision;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
@@ -44,9 +45,9 @@ import org.apache.felix.dm.Component;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.options.VMOption;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.options.extra.VMOption;
 import org.osgi.service.http.HttpService;
 
 @RunWith(JUnit4TestRunner.class)
@@ -57,6 +58,7 @@ public class ServletConfiguratorIntegrat
         return options(
             systemProperty("org.osgi.service.http.port").value("" + TestConstants.PORT),
             new VMOption("-ea"),
+            junitBundles(),
             provision(
                 Osgi.compendium(),
                 Felix.dependencyManager(),

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java
(original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/log/LogIntegrationTest.java
Thu Jun  7 13:38:54 2012
@@ -18,6 +18,20 @@
  */
 package org.apache.ace.it.log;
 
+import static org.apache.ace.it.Options.jetty;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.provision;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
 import org.apache.ace.discovery.property.constants.DiscoveryConstants;
 import org.apache.ace.http.listener.constants.HttpConstants;
 import org.apache.ace.identification.property.constants.IdentificationConstants;
@@ -34,23 +48,12 @@ import org.apache.felix.dm.Component;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.options.VMOption;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.options.extra.VMOption;
 import org.osgi.framework.Constants;
 import org.osgi.service.http.HttpService;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.ace.it.Options.jetty;
-import static org.ops4j.pax.exam.CoreOptions.*;
-
 /**
  * Integration tests for the audit log. Both a server and a target are setup
  * on the same machine. The audit log is run and we check if it is indeed
@@ -63,6 +66,7 @@ public class LogIntegrationTest extends 
         return options(
             systemProperty("org.osgi.service.http.port").value("" + TestConstants.PORT),
             new VMOption("-ea"),
+            junitBundles(),
             provision(
                 Osgi.compendium(),
                 Felix.dependencyManager(),

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repository/RepositoryTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repository/RepositoryTest.java?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repository/RepositoryTest.java
(original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repository/RepositoryTest.java
Thu Jun  7 13:38:54 2012
@@ -19,6 +19,7 @@
 package org.apache.ace.it.repository;
 
 import static org.apache.ace.it.Options.jetty;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.provision;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
@@ -48,8 +49,8 @@ import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.options.VMOption;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.options.extra.VMOption;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
@@ -68,6 +69,7 @@ public class RepositoryTest extends Inte
         return options(
             systemProperty("org.osgi.service.http.port").value("" + TestConstants.PORT),
             new VMOption("-ea"),
+            junitBundles(),
             provision(
                 Osgi.compendium(),
                 Felix.dependencyManager(),

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repositoryadmin/RepositoryAdminTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repositoryadmin/RepositoryAdminTest.java?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repositoryadmin/RepositoryAdminTest.java
(original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/repositoryadmin/RepositoryAdminTest.java
Thu Jun  7 13:38:54 2012
@@ -28,6 +28,7 @@ import static org.apache.ace.client.repo
 import static org.apache.ace.client.repository.stateful.StatefulTargetObject.TOPIC_STATUS_CHANGED;
 import static org.apache.ace.client.repository.stateful.StatefulTargetObject.UNKNOWN_VERSION;
 import static org.apache.ace.it.Options.jetty;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.provision;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
@@ -112,9 +113,9 @@ import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.options.CleanCachesOption;
-import org.ops4j.pax.exam.container.def.options.VMOption;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.options.extra.CleanCachesOption;
+import org.ops4j.pax.exam.options.extra.VMOption;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
@@ -136,6 +137,7 @@ public class RepositoryAdminTest extends
             systemProperty("org.osgi.service.http.port").value("" + TestConstants.PORT),
             new VMOption("-ea"),
             new CleanCachesOption(),
+            junitBundles(),
             provision(
                 Osgi.compendium(),
                 Felix.dependencyManager(),

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/AssemblyConfigure.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/AssemblyConfigure.java?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/AssemblyConfigure.java
(original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/AssemblyConfigure.java
Thu Jun  7 13:38:54 2012
@@ -27,7 +27,6 @@ import java.util.zip.ZipInputStream;
 import org.ops4j.pax.exam.Option;
 
 import static org.ops4j.pax.exam.CoreOptions.*;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.*;
 
 /**
  * @author Toni Menzel

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java
(original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/server/MinimalGatewayTest.java
Thu Jun  7 13:38:54 2012
@@ -20,15 +20,17 @@ package org.apache.ace.it.server;
 
 import static junit.framework.Assert.fail;
 import static org.ops4j.pax.exam.CoreOptions.felix;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Inject;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@@ -49,7 +51,7 @@ public class MinimalGatewayTest
 
         return combine(
             options(
-                felix().version( "3.0.2" )
+                felix().version( "3.2.2" )
             ),
             // TODO avoid to use hard coded version
             AssemblyConfigure.get( "ace-target", "mvn:org.apache.ace/org.apache.ace.target.devgateway/0.8.1-SNAPSHOT/zip/distribution"
)

Modified: ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java
(original)
+++ ace/trunk/ace-integrationtests/src/test/java/org/apache/ace/it/useradminconfigurator/ConfiguratorTest.java
Thu Jun  7 13:38:54 2012
@@ -21,6 +21,7 @@ package org.apache.ace.it.useradminconfi
 import static org.apache.ace.it.Options.jetty;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.maven;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.provision;
@@ -55,6 +56,7 @@ public class ConfiguratorTest extends In
     public Option[] configuration() {
         return options(
             systemProperty("org.osgi.service.http.port").value("" + TestConstants.PORT),
+            junitBundles(),
             provision(
                 wrappedBundle(maven("org.apache.ace", "org.apache.ace.util")).overwriteManifest(WrappedUrlProvisionOption.OverwriteMode.FULL),
// we do this because we need access to some test classes that aren't exported
                 Osgi.compendium(),

Modified: ace/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/pom/pom.xml?rev=1347615&r1=1347614&r2=1347615&view=diff
==============================================================================
--- ace/trunk/pom/pom.xml (original)
+++ ace/trunk/pom/pom.xml Thu Jun  7 13:38:54 2012
@@ -142,22 +142,24 @@
         <felix.configadmin.version>1.2.8</felix.configadmin.version>
         <felix.dependencymanager.version>3.0.0</felix.dependencymanager.version>
         <felix.deploymentadmin.version>0.9.1-SNAPSHOT</felix.deploymentadmin.version>
-        <felix.eventadmin.version>1.2.8</felix.eventadmin.version>
-        <felix.framework.version>3.0.8</felix.framework.version>
-        <felix.maven-bundle-plugin.version>2.3.4</felix.maven-bundle-plugin.version>
+        <felix.eventadmin.version>1.2.14</felix.eventadmin.version>
+        <felix.framework.version>3.2.2</felix.framework.version>
+        <felix.maven-bundle-plugin.version>2.3.7</felix.maven-bundle-plugin.version>
         <felix.metatype.version>1.0.4</felix.metatype.version>
         <felix.prefs.version>1.0.4</felix.prefs.version>
-        <felix.shell.version>1.4.2</felix.shell.version>
+        <felix.shell.version>1.4.3</felix.shell.version>
         <felix.http.version>2.2.0</felix.http.version>
-        <junit.version>4.4</junit.version>
+        <junit.version>4.10</junit.version>
         <knopflerfish.version>2.0.2</knopflerfish.version>
         <kxml2.version>2.3.0</kxml2.version>
         <mockito.version>1.8.1</mockito.version>
         <osgi.compendium.version>4.2.0</osgi.compendium.version>
         <osgi.core.version>4.2.0</osgi.core.version>
-        <pax.exam.version>1.2.3</pax.exam.version>
-        <pax.runner.version>1.7.5</pax.runner.version>
-        <pax.swissbox.version>1.2.0</pax.swissbox.version>
+        <pax.exam.version>2.4.0</pax.exam.version>
+        <pax.exam.plugin.version>1.2.4</pax.exam.plugin.version>
+        <pax.url.aether.version>1.4.0</pax.url.aether.version>
+        <pax.swissbox.version>1.3.1</pax.swissbox.version>
+        <pax.runner.version>1.7.6</pax.runner.version>
         <pax.web.version>0.7.2</pax.web.version>
         <servlet-api.version>2.4</servlet-api.version>
         <surefire.testng.version>2.5</surefire.testng.version>
@@ -280,7 +282,7 @@
                 <plugin>
                     <groupId>org.ops4j.pax.exam</groupId>
                     <artifactId>maven-paxexam-plugin</artifactId>
-                    <version>${pax.exam.version}</version>
+                    <version>${pax.exam.plugin.version}</version>
                 </plugin>
                 <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
@@ -752,24 +754,49 @@
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-container-default</artifactId>
+                <artifactId>pax-exam-container-paxrunner</artifactId>
                 <version>${pax.exam.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-junit</artifactId>
+                <artifactId>pax-exam-junit4</artifactId>
                 <version>${pax.exam.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.runner</groupId>
-                <artifactId>pax-runner</artifactId>
-                <version>${pax.runner.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.swissbox</groupId>
-                <artifactId>pax-swissbox-tinybundles</artifactId>
-                <version>${pax.swissbox.version}</version>
-            </dependency>
+			<dependency>
+			    <groupId>org.ops4j.pax.exam</groupId>
+			    <artifactId>pax-exam-link-mvn</artifactId>
+			    <version>${pax.exam.version}</version>
+			</dependency>
+			<dependency>
+			    <groupId>org.ops4j.pax.exam</groupId>
+			    <artifactId>pax-exam-link-assembly</artifactId>
+			    <version>${pax.exam.version}</version>
+			</dependency>
+			<dependency>
+			    <groupId>org.ops4j.pax.url</groupId>
+			    <artifactId>pax-url-aether</artifactId>
+			    <version>${pax.url.aether.version}</version>
+			</dependency>
+			<dependency>
+			    <groupId>org.ops4j.pax.url</groupId>
+			    <artifactId>pax-url-wrap</artifactId>
+			    <version>${pax.url.aether.version}</version>
+			</dependency>
+	        <dependency>
+	            <groupId>org.ops4j.pax.swissbox</groupId>
+	            <artifactId>pax-swissbox-tinybundles</artifactId>
+	            <version>${pax.swissbox.version}</version>
+	        </dependency>
+	        <dependency>
+				<groupId>org.ops4j.pax.runner</groupId>
+				<artifactId>pax-runner</artifactId>
+				<version>${pax.runner.version}</version>
+			</dependency>
+	        <dependency>
+				<groupId>org.ops4j.pax.runner</groupId>
+				<artifactId>pax-runner-no-jcl</artifactId>
+				<version>${pax.runner.version}</version>
+			</dependency>
             <dependency>
                 <groupId>org.ops4j.pax.web</groupId>
                 <artifactId>pax-web-extender-war</artifactId>



Mime
View raw message