Return-Path: X-Original-To: apmail-ace-commits-archive@www.apache.org Delivered-To: apmail-ace-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8465D9E24 for ; Thu, 7 Jun 2012 13:39:26 +0000 (UTC) Received: (qmail 53986 invoked by uid 500); 7 Jun 2012 13:39:25 -0000 Delivered-To: apmail-ace-commits-archive@ace.apache.org Received: (qmail 53807 invoked by uid 500); 7 Jun 2012 13:39:25 -0000 Mailing-List: contact commits-help@ace.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ace.apache.org Delivered-To: mailing list commits@ace.apache.org Received: (qmail 53777 invoked by uid 99); 7 Jun 2012 13:39:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2012 13:39:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2012 13:39:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A3BE623889D5 for ; Thu, 7 Jun 2012 13:38:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@ace.apache.org From: jawi@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120607133856.A3BE623889D5@eris.apache.org> 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 @@ org.ops4j.pax.exam - pax-exam + pax-exam-junit4 test - - org.ops4j.pax.exam - pax-exam-junit - test - - - org.ops4j.pax.exam - pax-exam-container-default + + org.ops4j.pax.exam + pax-exam-container-paxrunner + test + + + org.ops4j.pax.runner + pax-runner-no-jcl + test + + + org.ops4j.pax.exam + pax-exam-link-assembly + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + test + + + org.ops4j.pax.url + pax-url-aether + test + + + org.ops4j.pax.url + pax-url-wrap + test + + + javax.inject + javax.inject + 1 + test + + + + org.apache.felix + org.apache.felix.framework + test + + + + org.slf4j + slf4j-simple + 1.5.11 test @@ -342,6 +381,43 @@ + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.ops4j.pax.exam + + + maven-paxexam-plugin + + + [1.2.3,) + + + + generate-depends-file + + + + + + + + + + + + + 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 @@ 1.2.8 3.0.0 0.9.1-SNAPSHOT - 1.2.8 - 3.0.8 - 2.3.4 + 1.2.14 + 3.2.2 + 2.3.7 1.0.4 1.0.4 - 1.4.2 + 1.4.3 2.2.0 - 4.4 + 4.10 2.0.2 2.3.0 1.8.1 4.2.0 4.2.0 - 1.2.3 - 1.7.5 - 1.2.0 + 2.4.0 + 1.2.4 + 1.4.0 + 1.3.1 + 1.7.6 0.7.2 2.4 2.5 @@ -280,7 +282,7 @@ org.ops4j.pax.exam maven-paxexam-plugin - ${pax.exam.version} + ${pax.exam.plugin.version} org.apache.maven.plugins @@ -752,24 +754,49 @@ org.ops4j.pax.exam - pax-exam-container-default + pax-exam-container-paxrunner ${pax.exam.version} org.ops4j.pax.exam - pax-exam-junit + pax-exam-junit4 ${pax.exam.version} - - org.ops4j.pax.runner - pax-runner - ${pax.runner.version} - - - org.ops4j.pax.swissbox - pax-swissbox-tinybundles - ${pax.swissbox.version} - + + org.ops4j.pax.exam + pax-exam-link-mvn + ${pax.exam.version} + + + org.ops4j.pax.exam + pax-exam-link-assembly + ${pax.exam.version} + + + org.ops4j.pax.url + pax-url-aether + ${pax.url.aether.version} + + + org.ops4j.pax.url + pax-url-wrap + ${pax.url.aether.version} + + + org.ops4j.pax.swissbox + pax-swissbox-tinybundles + ${pax.swissbox.version} + + + org.ops4j.pax.runner + pax-runner + ${pax.runner.version} + + + org.ops4j.pax.runner + pax-runner-no-jcl + ${pax.runner.version} + org.ops4j.pax.web pax-web-extender-war