aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tjwat...@apache.org
Subject svn commit: r1606837 [18/27] - in /aries/branches/subsystemsR6: ./ application/ application/application-api/ application/application-bundle/ application/application-converters/ application/application-default-local-platform/ application/application-dep...
Date Mon, 30 Jun 2014 16:55:06 GMT
Modified: aries/branches/subsystemsR6/samples/blog/blog-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/samples/blog/blog-itests/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/samples/blog/blog-itests/pom.xml (original)
+++ aries/branches/subsystemsR6/samples/blog/blog-itests/pom.xml Mon Jun 30 16:54:57 2014
@@ -29,14 +29,19 @@
     <description>
         Integration test for the blog sample
     </description>
+    
+    <properties>
+        <exam.version>3.4.0</exam.version>
+        <url.version>1.6.0</url.version>
+        <swissbox.version>1.7.0</swissbox.version>
+    </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
+   		<dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>3.8.0.v20120529-1548</version>
         </dependency>
-
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
@@ -44,12 +49,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
             <scope>test</scope>
@@ -70,6 +69,7 @@
         <dependency>
             <groupId>org.apache.aries.testsupport</groupId>
             <artifactId>org.apache.aries.testsupport.unit</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
@@ -124,70 +124,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam</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>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit-extender-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.ops4j.pax.runner</groupId>
-            <artifactId>pax-runner-no-jcl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.ops4j.pax.swissbox</groupId>
-            <artifactId>pax-swissbox-tinybundles</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-mvn</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
             <scope>test</scope>
@@ -203,32 +139,48 @@
 		<dependency>
 			<groupId>org.eclipse.equinox</groupId>
 			<artifactId>cm</artifactId>
+            <version>3.2.0-v20070116</version>
             <scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.osgi</groupId>
 			<artifactId>services</artifactId>
+            <version>3.1.200-v20070605</version>
             <scope>test</scope>
 		</dependency>
-
-		<dependency>
+		
+	    <dependency>
+        	<groupId>org.apache.xbean</groupId>
+        	<artifactId>xbean-asm4-shaded</artifactId>
+        	<version>3.16</version>
+        </dependency>
+        <dependency>
+        	<groupId>org.apache.xbean</groupId>
+        	<artifactId>xbean-finder-shaded</artifactId>
+        	<version>3.16</version>
+        </dependency>
+	   	<dependency>
 			<groupId>org.ops4j.pax.web</groupId>
 			<artifactId>pax-web-extender-war</artifactId>
+			<version>3.0.0</version>
             <scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.web</groupId>
 			<artifactId>pax-web-jetty-bundle</artifactId>
+			<version>3.1.0</version>
             <scope>test</scope>
 		</dependency>
+		
 
+<!-- 
 		<dependency>
 			<groupId>org.ops4j.pax.web</groupId>
 			<artifactId>pax-web-jsp</artifactId>
             <scope>test</scope>
 		</dependency>
-
+ -->
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
@@ -404,7 +356,6 @@
 		<dependency>
       		<groupId>org.apache.aries.quiesce</groupId>
       		<artifactId>org.apache.aries.quiesce.manager</artifactId>
-      		<version>1.0.0</version>
       		<scope>test</scope>
 		</dependency>
 		
@@ -413,40 +364,95 @@
             <artifactId>org.apache.aries.application.resolver.obr</artifactId>
             <scope>test</scope>
         </dependency>
+        
+        <!-- pax exam -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam</artifactId>
+            <version>${exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-container-native</artifactId>
+            <version>${exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit4</artifactId>
+            <version>${exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-link-mvn</artifactId>
+            <version>${exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-aether</artifactId>
+            <version>${url.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>0.9.29</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>0.9.29</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.tinybundles</groupId>
+            <artifactId>tinybundles</artifactId>
+            <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>org.osgi.core</artifactId>
+                    <groupId>org.osgi</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
 	</dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>pertest</forkMode>
-                    <excludes>
-                        <exclude>**/*$*</exclude>
-                        <exclude>**/Abstract*.java</exclude>
-                    </excludes>
-                    <includes>
-                        <include>**/Test*.java</include>
-                        <include>**/*Test.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>maven-paxexam-plugin</artifactId>
+			<plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>depends-maven-plugin</artifactId>
+                <version>1.2</version>
                 <executions>
                     <execution>
-                        <id>generate-config</id>
+                        <id>generate-depends-file</id>
                         <goals>
                             <goal>generate-depends-file</goal>
                         </goals>
-                        <configuration>
-                            <outputFile>${project.build.directory}/test-classes/META-INF/maven/dependencies.properties</outputFile>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkMode>pertest</forkMode>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -464,6 +470,7 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
+                            <forkMode>pertest</forkMode>
                             <!--
                                 when the local repo location has been specified, we need to pass
                                 on this information to PAX mvn url
@@ -476,4 +483,28 @@
         </profile>
     </profiles>
 
+    <dependencyManagement>
+    	<dependencies>
+    		<dependency>
+    			<groupId>org.ops4j.pax.swissbox</groupId>
+    			<artifactId>pax-swissbox-core</artifactId>
+    			<version>${swissbox.version}</version>
+    		</dependency>
+    		<dependency>
+    			<groupId>org.ops4j.pax.swissbox</groupId>
+    			<artifactId>pax-swissbox-tracker</artifactId>
+    			<version>${swissbox.version}</version>
+    		</dependency>
+    		<dependency>
+    			<groupId>org.ops4j.pax.swissbox</groupId>
+    			<artifactId>pax-swissbox-extender</artifactId>
+    			<version>${swissbox.version}</version>
+    		</dependency>
+    		<dependency>
+    			<groupId>org.ops4j.pax.swissbox</groupId>
+    			<artifactId>pax-swissbox-optional-jcl</artifactId>
+    			<version>${swissbox.version}</version>
+    		</dependency>
+    	</dependencies>
+    </dependencyManagement>
 </project>

Modified: aries/branches/subsystemsR6/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java (original)
+++ aries/branches/subsystemsR6/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java Mon Jun 30 16:54:57 2014
@@ -18,160 +18,34 @@
  */
 package org.apache.aries.samples.blog.itests;
 
-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.bootDelegationPackages;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
-import static org.apache.aries.itest.ExtraOptions.testOptions;
+import static org.ops4j.pax.exam.CoreOptions.maven;
 
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.apache.aries.application.management.AriesApplication;
 import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationManager;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.osgi.framework.Bundle;
-@RunWith(JUnit4TestRunner.class)
-public class JdbcBlogSampleWithEbaTest extends AbstractIntegrationTest {
+import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
+
+public class JdbcBlogSampleWithEbaTest extends AbstractBlogIntegrationTest {
 
     @Test
     public void test() throws Exception {
-
-        waitForStart();
-      
-        URL urlToEba = getUrlToEba("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.jdbc.eba");
-
-        AriesApplicationManager manager = getOsgiService(AriesApplicationManager.class);
-        AriesApplication app = manager.createApplication(urlToEba);
-        AriesApplicationContext ctx = manager.install(app);
-        ctx.start();
+        MavenArtifactUrlReference eba = maven()
+        		.groupId("org.apache.aries.samples.blog")
+        		.artifactId("org.apache.aries.samples.blog.jdbc.eba")
+        		.versionAsInProject()
+        		.type("eba");
+        AriesApplicationContext ctx = installEba(eba);
 
 		/* Check that the Blog Sample bundles are present an started */
-        Bundle bapi = getInstalledBundle("org.apache.aries.samples.blog.api");
-        assertNotNull(bapi);
-		assertEquals(Bundle.ACTIVE, bapi.getState());
-
-        Bundle bweb = getInstalledBundle("org.apache.aries.samples.blog.web");
-        assertNotNull(bweb);
-
-        Bundle bbiz = getInstalledBundle("org.apache.aries.samples.blog.biz");
-        assertNotNull(bbiz);
-		assertEquals(Bundle.ACTIVE, bbiz.getState());
-
-        Bundle bper = getInstalledBundle("org.apache.aries.samples.blog.persistence.jdbc");
-        assertNotNull(bper);
-		assertEquals(Bundle.ACTIVE, bper.getState());
-
-        /* Require services from biz and persistence - wait for them to register */
-        waitForServices(bbiz, "org.apache.aries.samples.blog.api.BloggingService");
-        waitForServices(bper, "org.apache.aries.samples.blog.api.persistence.BlogPersistenceService");
-
-       /*Check that they haven't timed out trying to register*/
-    	assertTrue("No services registered for " + bbiz.getSymbolicName(), isServiceRegistered(bbiz));
-    	assertTrue("No services registered for " + bper.getSymbolicName(), isServiceRegistered(bper));
-
-		/*Check what services are registered - uncomment for additional debug */
-		/*
-    	listBundleServices(bbiz);
-    	listBundleServices(bper);
-
-    	System.out.println("In test and trying to get connection....");
-		*/
-        HttpURLConnection conn = makeConnection("http://localhost:8080/blog/ViewBlog");
-        String response = getHTTPResponse(conn);
-		/* Uncomment for additional debug */
-		/*
-        System.out.println("ZZZZZ " + response);
-        System.out.println("ZZZZZ " + conn.getResponseCode());
-        System.out.println("ZZZZZ " + HttpURLConnection.HTTP_OK);
-		*/
+        assertBundleStarted("org.apache.aries.samples.blog.api");
+        assertBundleStarted("org.apache.aries.samples.blog.web");
+        assertBundleStarted("org.apache.aries.samples.blog.biz");
+        assertBundleStarted("org.apache.aries.samples.blog.persistence.jdbc");
 
-        assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode());
-
-        assertTrue("The response did not contain the expected content",
-                response.contains("Blog home"));
+        assertBlogServicesStarted();
+        checkBlogWebAccess();
 
         ctx.stop();
         manager.uninstall(ctx);
     }
 
-    @org.ops4j.pax.exam.junit.Configuration
-    public static Option[] configuration() {
-    	Option[] options = testOptions(
-                bootDelegationPackages("javax.transaction",
-                        "javax.transaction.*"),
-                vmOption("-Dorg.osgi.framework.system.packages=javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbean,javax.management.monitor,javax.management.openmbean,javax.management.relation,javax.management.remote,javax.management.remote.rmi,javax.management.timer,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net,javax.net.ssl,javax.print,javax.print.attribute,javax.print.attribute.standard,javax.print.event,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.script,javax.security.auth,javax.security.auth.callback,
 javax.security.auth.kerberos,javax.security.auth.login,javax.security.auth.spi,javax.security.auth.x500,javax.security.cert,javax.security.sasl,javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi,javax.sql,javax.sql.rowset,javax.sql.rowset.serial,javax.sql.rowset.spi,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.plaf.multi,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.text.html.parser,javax.swing.text.rtf,javax.swing.tree,javax.swing.undo,javax.tools,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,javax.xml.datatype,javax.xml.namespace,ja
 vax.xml.parsers,javax.xml.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.xpath,org.ietf.jgss,org.omg.CORBA,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA.TypeCodePackage,org.omg.CORBA.portable,org.omg.CORBA_2_3,org.omg.CORBA_2_3.portable,org.omg.CosNaming,org.omg.CosNaming.NamingContextExtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.Dynamic,org.omg.DynamicAny,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage,org.omg.IOP,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage,org.omg.Messaging,org.omg.PortableInterceptor,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.PortableServer,org.omg.PortableServer.CurrentPackage,org.omg.PortableServer.P
 OAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.ServantLocatorPackage,org.omg.PortableServer.portable,org.omg.SendingContext,org.omg.stub.java.rmi,org.w3c.dom,org.w3c.dom.bootstrap,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.html,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,javax.transaction;partial=true;mandatory:=partial,javax.transaction.xa;partial=true;mandatory:=partial"),
-                // Log
-                mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
-                mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
-                // Felix mvn url handler - do we need this?
-                mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
-                // this is how you set the default log level when using pax
-                // logging (logProfile)
-                systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level")
-                        .value("DEBUG"),
-
-                // Bundles
-                mavenBundle("org.eclipse.equinox", "cm"),
-                mavenBundle("org.eclipse.osgi", "services"),
-
-                mavenBundle("org.ops4j.pax.web", "pax-web-extender-war"),
-                mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle"),
-                mavenBundle("org.ops4j.pax.web", "pax-web-jsp"),
-                mavenBundle("org.apache.derby", "derby"),
-                mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),
-
-                mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
-                mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
-                mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
-                mavenBundle("org.apache.geronimo.components", "geronimo-transaction"),
-                mavenBundle("org.apache.openjpa", "openjpa"),
-                mavenBundle("commons-lang", "commons-lang"),
-                mavenBundle("commons-collections", "commons-collections"),
-                mavenBundle("commons-pool", "commons-pool"),
-                mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp"),
-                mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ),
-                mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
-                mavenBundle("org.apache.aries", "org.apache.aries.util" ),
-                mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi" ),
-                mavenBundle("org.apache.felix", "org.apache.felix.fileinstall" ),
-                mavenBundle("org.apache.aries.application", "org.apache.aries.application.install" ),
-                mavenBundle("org.apache.aries.application", "org.apache.aries.application.api" ),
-                mavenBundle("org.apache.aries.application", "org.apache.aries.application.management" ),
-                mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime" ),
-                mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils" ),
-                mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
-                mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
-                mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
-                mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
-                mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
-                mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api" ),
-                mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container" ),
-                mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.blueprint.aries" ),
-                mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container.context" ),
-                mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager" ),
-                mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint" ),
-                mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers" ),
-                mavenBundle("org.ow2.asm", "asm-all" ),
-                /* For debugging, uncomment the next two lines  */
-                /*vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"),
-                waitForFrameworkStartup(),  
-*/
-                /* For debugging, add these imports:
-                import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
-                import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
-                */
-                equinox().version("3.5.0")
-        );
-        return options;
-    }
-
 }

Modified: aries/branches/subsystemsR6/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java (original)
+++ aries/branches/subsystemsR6/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java Mon Jun 30 16:54:57 2014
@@ -18,171 +18,36 @@
  */
 package org.apache.aries.samples.blog.itests;
 
-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.bootDelegationPackages;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
-import static org.apache.aries.itest.ExtraOptions.testOptions;
+import static org.ops4j.pax.exam.CoreOptions.maven;
 
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.apache.aries.application.management.AriesApplication;
 import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationManager;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.osgi.framework.Bundle;
-
-
-
-@RunWith(JUnit4TestRunner.class)
-public class JpaBlogSampleWithEbaTest extends AbstractIntegrationTest {
-
-    @Test
-    public void test() throws Exception {
-	
-      waitForStart();
-      
-	/* Install and start the blog eba */
-	URL urlToEba = getUrlToEba("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.jpa.eba");
-	AriesApplicationManager manager = getOsgiService(AriesApplicationManager.class);
-	AriesApplication app = manager.createApplication(urlToEba);
-	AriesApplicationContext ctx = manager.install(app);
-	ctx.start();
-
-    /* Find and check all the blog sample bundles */
-
-	Bundle bapi = getInstalledBundle("org.apache.aries.samples.blog.api");
-    assertNotNull(bapi);
-	assertEquals(Bundle.ACTIVE, bapi.getState());
-
-	Bundle bweb = getInstalledBundle("org.apache.aries.samples.blog.web");
-    assertNotNull(bweb);
-	assertEquals(Bundle.ACTIVE, bweb.getState());
-
-	Bundle bbiz = getInstalledBundle("org.apache.aries.samples.blog.biz");
-    assertNotNull(bbiz);
-	assertEquals(Bundle.ACTIVE, bbiz.getState());
-
-	Bundle bper = getInstalledBundle("org.apache.aries.samples.blog.persistence.jpa");
-    assertNotNull(bper);
-	assertEquals(Bundle.ACTIVE, bper.getState());
- 
-    /* Datasource and transaction manager services are used by the blog sample */
-	Bundle bds = getInstalledBundle("org.apache.aries.samples.blog.datasource");
-	Bundle txs = getInstalledBundle("org.apache.aries.transaction.manager");
-
-    /*Wait for all the required services to be registered */
-    waitForServices(bbiz, "org.apache.aries.samples.blog.api.BloggingService");
-    waitForServices(bper, "org.apache.aries.samples.blog.api.persistence.BlogPersistenceService");
-    waitForServices(bds, "javax.sql.XADataSource");
-    waitForServices(txs, "javax.transaction.TransactionManager");
-
-
-    /*Check that they haven't timed out trying to register*/
-	assertTrue("No services registered for " + bbiz.getSymbolicName(), isServiceRegistered(bbiz));
-	assertTrue("No services registered for " + bper.getSymbolicName(), isServiceRegistered(bper));
-	assertTrue("No services registered for " + bds.getSymbolicName(), isServiceRegistered(bds));
-	assertTrue("No services registered for " + txs.getSymbolicName(), isServiceRegistered(txs));
-
-	/*Check what services are registered - uncomment for additional debug */
-	/*
-	listBundleServices(bbiz);
-	listBundleServices(bper);
-	listBundleServices(bds);
-	listBundleServices(txs);
-    
-	System.out.println("In test and trying to get connection....");
-	*/
-
-	HttpURLConnection conn = makeConnection("http://localhost:8080/blog/ViewBlog");
-    String response = getHTTPResponse(conn);
-
-	/* Uncomment for additional debug */
-	/*
-	System.out.println("ZZZZZ " + response);
-    System.out.println("ZZZZZ " + conn.getResponseCode());
-    System.out.println("ZZZZZ " + HttpURLConnection.HTTP_OK);
-	*/
-
-
-    assertEquals(HttpURLConnection.HTTP_OK,
-        conn.getResponseCode());
-
-    assertTrue("The response did not contain the expected content", response.contains("Blog home"));
-	ctx.stop();
-    manager.uninstall(ctx);
-
-    }
-
-
-    @org.ops4j.pax.exam.junit.Configuration
-    public static Option[] configuration() {
-        Option[] options = testOptions(
-bootDelegationPackages("javax.transaction", "javax.transaction.*"),
-			vmOption("-Dorg.osgi.framework.system.packages=javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbean,javax.management.monitor,javax.management.openmbean,javax.management.relation,javax.management.remote,javax.management.remote.rmi,javax.management.timer,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net,javax.net.ssl,javax.print,javax.print.attribute,javax.print.attribute.standard,javax.print.event,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.script,javax.security.auth,javax.security.auth.callback,javax.securit
 y.auth.kerberos,javax.security.auth.login,javax.security.auth.spi,javax.security.auth.x500,javax.security.cert,javax.security.sasl,javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi,javax.sql,javax.sql.rowset,javax.sql.rowset.serial,javax.sql.rowset.spi,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.plaf.multi,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.text.html.parser,javax.swing.text.rtf,javax.swing.tree,javax.swing.undo,javax.tools,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,javax.xml.datatype,javax.xml.namespace,javax.xml.parse
 rs,javax.xml.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.xpath,org.ietf.jgss,org.omg.CORBA,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA.TypeCodePackage,org.omg.CORBA.portable,org.omg.CORBA_2_3,org.omg.CORBA_2_3.portable,org.omg.CosNaming,org.omg.CosNaming.NamingContextExtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.Dynamic,org.omg.DynamicAny,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage,org.omg.IOP,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage,org.omg.Messaging,org.omg.PortableInterceptor,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.PortableServer,org.omg.PortableServer.CurrentPackage,org.omg.PortableServer.POAManagerPack
 age,org.omg.PortableServer.POAPackage,org.omg.PortableServer.ServantLocatorPackage,org.omg.PortableServer.portable,org.omg.SendingContext,org.omg.stub.java.rmi,org.w3c.dom,org.w3c.dom.bootstrap,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.html,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,javax.transaction;partial=true;mandatory:=partial,javax.transaction.xa;partial=true;mandatory:=partial"),
-            // Log
-            mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
-            mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
-            // Felix mvn url handler - do we need this?
-            mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
-
-            // this is how you set the default log level when using pax logging (logProfile)
-            systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
-
-            // Bundles
-            mavenBundle("org.eclipse.equinox", "cm"),
-            mavenBundle("org.eclipse.osgi", "services"),
-
-            mavenBundle("org.ops4j.pax.web", "pax-web-extender-war"),
-            mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle"),
-            mavenBundle("org.ops4j.pax.web", "pax-web-jsp"),
-            mavenBundle("org.apache.derby", "derby"),
-            mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),
-
-            mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
-            mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
-            mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
-            mavenBundle("org.apache.geronimo.components", "geronimo-transaction"),
-            mavenBundle("org.apache.openjpa", "openjpa"),
-            mavenBundle("commons-lang", "commons-lang"),
-            mavenBundle("commons-collections", "commons-collections"),
-            mavenBundle("commons-pool", "commons-pool"),
-            mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp"),
-            mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ),
-            mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
-            mavenBundle("org.apache.aries", "org.apache.aries.util" ),
-            mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi" ),
-            mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
-            mavenBundle("org.apache.felix", "org.apache.felix.fileinstall" ),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.install" ),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.api" ),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.management" ),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime" ),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils" ),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
-            mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api" ),
-            mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container" ),
-            mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.blueprint.aries" ),
-            mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container.context" ),
-            mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager" ),
-            mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint" ),
-            mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers" ),
-            mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.datasource" ),
-            mavenBundle("org.ow2.asm", "asm-all" ),
-            equinox().version("3.5.0")
-        );
-        return options;
-    }
+import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
+
+public class JpaBlogSampleWithEbaTest extends AbstractBlogIntegrationTest {
+
+	@Test
+	public void test() throws Exception {
+		MavenArtifactUrlReference eba = maven()
+				.groupId("org.apache.aries.samples.blog")
+				.artifactId("org.apache.aries.samples.blog.jpa.eba")
+				.versionAsInProject()
+				.type("eba");
+		AriesApplicationContext ctx = installEba(eba);
+
+		/* Find and check all the blog sample bundles */
+		assertBundleStarted("org.apache.aries.samples.blog.api");
+		assertBundleStarted("org.apache.aries.samples.blog.web");
+		assertBundleStarted("org.apache.aries.samples.blog.biz");
+		assertBundleStarted("org.apache.aries.samples.blog.persistence.jpa");
+		assertBundleStarted("org.apache.aries.samples.blog.datasource");
+		assertBundleStarted("org.apache.aries.transaction.manager");
+
+		assertBlogServicesStarted();
+		checkBlogWebAccess();
+		
+		ctx.stop();
+		manager.uninstall(ctx);
+	}
 
 }

Modified: aries/branches/subsystemsR6/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java (original)
+++ aries/branches/subsystemsR6/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java Mon Jun 30 16:54:57 2014
@@ -18,236 +18,80 @@
  */
 package org.apache.aries.samples.blog.itests;
 
-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.bootDelegationPackages;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
-import static org.apache.aries.itest.ExtraOptions.testOptions;
-
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
 
-import org.apache.aries.application.management.AriesApplication;
+import java.util.Arrays;
+import java.util.Collections;
+
+import javax.inject.Inject;
+
 import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationManager;
 import org.apache.aries.quiesce.manager.QuiesceManager;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
 import org.osgi.framework.Bundle;
 
 
+public class QuiesceBlogSampleWithEbaTest extends AbstractBlogIntegrationTest {
+	@Inject
+	QuiesceManager quiesceMgr;
+
+	@Test
+	public void test() throws Exception {
+		resolveBundles();
+		MavenArtifactUrlReference eba = CoreOptions.maven()
+				.groupId("org.apache.aries.samples.blog")
+				.artifactId("org.apache.aries.samples.blog.jpa.eba")
+				.versionAsInProject()
+				.type("eba");
+		AriesApplicationContext ctx = installEba(eba);
+
+		/* Find and check all the blog sample bundles */
+		Bundle bapi = assertBundleStarted("org.apache.aries.samples.blog.api");
+		Bundle bweb = assertBundleStarted("org.apache.aries.samples.blog.web");
+		Bundle bbiz = assertBundleStarted("org.apache.aries.samples.blog.biz");
+		Bundle bper = assertBundleStarted("org.apache.aries.samples.blog.persistence.jpa");
+		Bundle bds = assertBundleStarted("org.apache.aries.samples.blog.datasource");
+		Bundle txs = assertBundleStarted("org.apache.aries.transaction.manager");
+
+		assertBlogServicesStarted();
+		checkBlogWebAccess();
+
+		//So Blog is working properly, let's quiesce it, we would expect to get a JPA and a Blueprint 
+		//participant
+		quiesceMgr.quiesce(500, Collections.singletonList(bapi));
+		Thread.sleep(1000);
+
+		// Blog api bundle should now be stopped, but others should still be running
+		assertResolved(bapi);
+		assertActive(bweb);
+		assertActive(bbiz);
+		assertActive(bper);
+
+		quiesceMgr.quiesce(500, Arrays.asList(bapi, bweb, bbiz, bper));
+		Thread.sleep(1000);
+
+		// All blog bundles should now be stopped
+		assertResolved(bapi);
+		assertResolved(bweb);
+		assertResolved(bbiz);
+		assertResolved(bper);
+
+		// Check we can start them again after quiesce and everything works as before
+		bapi.start();
+		bweb.start();
+		bbiz.start();
+		bper.start();
+
+		assertBlogServicesStarted();
+		assertBlogServicesStarted();
+		System.out.println("Checking if blog works again after restart");
+		checkBlogWebAccess();
 
-@RunWith(JUnit4TestRunner.class)
-public class QuiesceBlogSampleWithEbaTest extends AbstractIntegrationTest {
+		ctx.stop();
+		manager.uninstall(ctx);
 
-    @Test
-    public void test() throws Exception {
-	
-      waitForStart();
-      
-	/* Install and start the blog eba */
-	URL urlToEba = getUrlToEba("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.jpa.eba");
-	AriesApplicationManager manager = getOsgiService(AriesApplicationManager.class);
-	AriesApplication app = manager.createApplication(urlToEba);
-	AriesApplicationContext ctx = manager.install(app);
-	ctx.start();
-
-    /* Find and check all the blog sample bundles */
-
-	Bundle bapi = getInstalledBundle("org.apache.aries.samples.blog.api");
-    assertNotNull(bapi);
-	assertEquals(bapi.ACTIVE, bapi.getState());
-
-	Bundle bweb = getInstalledBundle("org.apache.aries.samples.blog.web");
-    assertNotNull(bweb);
-	assertEquals(bweb.ACTIVE, bweb.getState());
-
-	Bundle bbiz = getInstalledBundle("org.apache.aries.samples.blog.biz");
-    assertNotNull(bbiz);
-	assertEquals(bbiz.ACTIVE, bbiz.getState());
-
-	Bundle bper = getInstalledBundle("org.apache.aries.samples.blog.persistence.jpa");
-    assertNotNull(bper);
-	assertEquals(bper.ACTIVE, bper.getState());
- 
-    /* Datasource and transaction manager services are used by the blog sample */
-	Bundle bds = getInstalledBundle("org.apache.aries.samples.blog.datasource");
-	Bundle txs = getInstalledBundle("org.apache.aries.transaction.manager");
-
-    /*Wait for all the required services to be registered */
-    waitForServices(bbiz, "org.apache.aries.samples.blog.api.BloggingService");
-    waitForServices(bper, "org.apache.aries.samples.blog.api.persistence.BlogPersistenceService");
-    waitForServices(bds, "javax.sql.XADataSource");
-    waitForServices(txs, "javax.transaction.TransactionManager");
-
-
-    /*Check that they haven't timed out trying to register*/
-	assertTrue("No services reistered for " + bbiz.getSymbolicName(), isServiceRegistered(bbiz));
-	assertTrue("No services reistered for " + bper.getSymbolicName(), isServiceRegistered(bper));
-	assertTrue("No services reistered for " + bds.getSymbolicName(), isServiceRegistered(bds));
-	assertTrue("No services reistered for " + txs.getSymbolicName(), isServiceRegistered(txs));
-
-	/*Check what services are registered - uncomment for additional debug */
-	/*
-	listBundleServices(bbiz);
-	listBundleServices(bper);
-	listBundleServices(bds);
-	listBundleServices(txs);
-    
-	System.out.println("In test and trying to get connection....");
-	*/
-
-	HttpURLConnection conn = makeConnection("http://localhost:8080/blog/ViewBlog");
-    String response = getHTTPResponse(conn);
-
-	/* Uncomment for additional debug */
-	/*
-	System.out.println("ZZZZZ " + response);
-    System.out.println("ZZZZZ " + conn.getResponseCode());
-    System.out.println("ZZZZZ " + HttpURLConnection.HTTP_OK);
-	*/
-
-
-    assertEquals(HttpURLConnection.HTTP_OK,
-        conn.getResponseCode());
-
-    assertTrue("The response did not contain the expected content", response.contains("Blog home"));
-    
-    
-    //So Blog is working properly, let's quiesce it, we would expect to get a JPA and a Blueprint 
-    //participant
-    
-    QuiesceManager quiesceMgr = getOsgiService(QuiesceManager.class);
-    List<Bundle> bundleList = new ArrayList<Bundle>();
-    bundleList.add(bapi);
-    quiesceMgr.quiesce(500,bundleList);
-    Thread.sleep(1000);
-    
-    //blog api bundle should now be stopped, but others should still be running
-    assertTrue("Blog api bundle should have been quiesced, but it's state is "+bapi.getState(), bapi.getState() != bapi.ACTIVE);
-	assertEquals(bweb.ACTIVE, bweb.getState());
-	assertEquals(bbiz.ACTIVE, bbiz.getState());
-	assertEquals(bper.ACTIVE, bper.getState());
-	
-	bundleList.add(bweb);
-	bundleList.add(bbiz);
-	bundleList.add(bper);
-	
-	quiesceMgr.quiesce(500,bundleList);
-    Thread.sleep(1000);
-    
-    //all blog bundles should now be stopped
-    assertTrue("Blog api bundle should have been quiesced, but it's state is "+bapi.getState(), bapi.getState() != bapi.ACTIVE);
-    assertTrue("Blog web bundle should have been quiesced, but it's state is "+bweb.getState(), bweb.getState() != bweb.ACTIVE);
-    assertTrue("Blog biz bundle should have been quiesced, but it's state is "+bbiz.getState(), bbiz.getState() != bbiz.ACTIVE);
-    assertTrue("Blog persistence bundle should have been quiesced, but it's state is "+bper.getState(), bper.getState() != bper.ACTIVE);
-    
-    //check we can start them again after quiesce and everything works as before
-    bapi.start();
-    bweb.start();
-    bbiz.start();
-    bper.start();
-
-    /*Wait for all the required services to be registered */
-    waitForServices(bbiz, "org.apache.aries.samples.blog.api.BloggingService");
-    waitForServices(bper, "org.apache.aries.samples.blog.api.persistence.BlogPersistenceService");
-    waitForServices(bds, "javax.sql.XADataSource");
-    waitForServices(txs, "javax.transaction.TransactionManager");
-
-
-    /*Check that they haven't timed out trying to register*/
-	assertTrue("No services reistered for " + bbiz.getSymbolicName(), isServiceRegistered(bbiz));
-	assertTrue("No services reistered for " + bper.getSymbolicName(), isServiceRegistered(bper));
-	assertTrue("No services reistered for " + bds.getSymbolicName(), isServiceRegistered(bds));
-	assertTrue("No services reistered for " + txs.getSymbolicName(), isServiceRegistered(txs));
-    
-	conn = makeConnection("http://localhost:8080/blog/ViewBlog");
-    response = getHTTPResponse(conn);
-
-    assertEquals(HttpURLConnection.HTTP_OK,
-        conn.getResponseCode());
-
-    assertTrue("The response did not contain the expected content", response.contains("Blog home"));
-    
-	ctx.stop();
-    manager.uninstall(ctx);
-
-    }
-
-
-    @org.ops4j.pax.exam.junit.Configuration
-    public static Option[] configuration() {
-        Option[] options = testOptions(
-bootDelegationPackages("javax.transaction", "javax.transaction.*"),
-			vmOption("-Dorg.osgi.framework.system.packages=javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbean,javax.management.monitor,javax.management.openmbean,javax.management.relation,javax.management.remote,javax.management.remote.rmi,javax.management.timer,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net,javax.net.ssl,javax.print,javax.print.attribute,javax.print.attribute.standard,javax.print.event,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.script,javax.security.auth,javax.security.auth.callback,javax.securit
 y.auth.kerberos,javax.security.auth.login,javax.security.auth.spi,javax.security.auth.x500,javax.security.cert,javax.security.sasl,javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi,javax.sql,javax.sql.rowset,javax.sql.rowset.serial,javax.sql.rowset.spi,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.plaf.multi,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.text.html.parser,javax.swing.text.rtf,javax.swing.tree,javax.swing.undo,javax.tools,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,javax.xml.datatype,javax.xml.namespace,javax.xml.parse
 rs,javax.xml.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.xpath,org.ietf.jgss,org.omg.CORBA,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA.TypeCodePackage,org.omg.CORBA.portable,org.omg.CORBA_2_3,org.omg.CORBA_2_3.portable,org.omg.CosNaming,org.omg.CosNaming.NamingContextExtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.Dynamic,org.omg.DynamicAny,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage,org.omg.IOP,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage,org.omg.Messaging,org.omg.PortableInterceptor,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.PortableServer,org.omg.PortableServer.CurrentPackage,org.omg.PortableServer.POAManagerPack
 age,org.omg.PortableServer.POAPackage,org.omg.PortableServer.ServantLocatorPackage,org.omg.PortableServer.portable,org.omg.SendingContext,org.omg.stub.java.rmi,org.w3c.dom,org.w3c.dom.bootstrap,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.html,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,javax.transaction;partial=true;mandatory:=partial,javax.transaction.xa;partial=true;mandatory:=partial"),
-            // Log
-            mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
-            mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
-            // Felix mvn url handler - do we need this?
-            mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
-
-            // this is how you set the default log level when using pax logging (logProfile)
-            systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
-
-            // Bundles
-            mavenBundle("org.eclipse.equinox", "cm"),
-            mavenBundle("org.eclipse.osgi", "services"),
-
-            mavenBundle("org.ops4j.pax.web", "pax-web-extender-war"),
-            mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle"),
-            mavenBundle("org.ops4j.pax.web", "pax-web-jsp"),
-            mavenBundle("org.apache.derby", "derby"),
-            mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),
-
-            mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
-            mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
-            mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
-            mavenBundle("org.apache.geronimo.components", "geronimo-transaction"),
-            mavenBundle("org.apache.openjpa", "openjpa"),
-            mavenBundle("commons-lang", "commons-lang"),
-            mavenBundle("commons-collections", "commons-collections"),
-            mavenBundle("commons-pool", "commons-pool"),
-            mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp"),
-            mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api"),
-            mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager"),
-            mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ),
-            mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
-            mavenBundle("org.apache.aries", "org.apache.aries.util" ),
-            mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi" ),
-            mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
-            mavenBundle("org.apache.felix", "org.apache.felix.fileinstall" ),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.install" ),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.api" ),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.management" ),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform"),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime" ),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils" ),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
-            mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api" ),
-            mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container" ),
-            mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.blueprint.aries" ),
-            mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container.context" ),
-            mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager" ),
-            mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint" ),
-            mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers" ),
-            mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.datasource" ),
-
-            
-            mavenBundle("org.ow2.asm", "asm-all" ),
-            equinox().version("3.5.0")
-
-        );
-        return options;
-    }
+	}
 
 }

Modified: aries/branches/subsystemsR6/samples/blueprint/helloworld/helloworld-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/samples/blueprint/helloworld/helloworld-assembly/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/samples/blueprint/helloworld/helloworld-assembly/pom.xml (original)
+++ aries/branches/subsystemsR6/samples/blueprint/helloworld/helloworld-assembly/pom.xml Mon Jun 30 16:54:57 2014
@@ -33,16 +33,19 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.equinox</groupId>
             <artifactId>cm</artifactId>
+            <version>3.2.0-v20070116</version>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.osgi</groupId>
             <artifactId>services</artifactId>
+            <version>3.1.200-v20070605</version>
         </dependency>
 
         <dependency>

Modified: aries/branches/subsystemsR6/samples/blueprint/helloworld/helloworld-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/samples/blueprint/helloworld/helloworld-itests/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/samples/blueprint/helloworld/helloworld-itests/pom.xml (original)
+++ aries/branches/subsystemsR6/samples/blueprint/helloworld/helloworld-itests/pom.xml Mon Jun 30 16:54:57 2014
@@ -47,6 +47,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
             <scope>provided</scope>
         </dependency>
 
@@ -90,35 +91,41 @@
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
+            <version>1.2.4</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-junit</artifactId>
+            <version>1.2.4</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-default</artifactId>
+            <version>1.2.4</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-junit-extender-impl</artifactId>
+            <version>1.2.4</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.runner</groupId>
             <artifactId>pax-runner-no-jcl</artifactId>
+            <version>1.4.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.swissbox</groupId>
             <artifactId>pax-swissbox-tinybundles</artifactId>
+            <version>1.2.0</version>
         </dependency>
 
         <dependency>
@@ -148,6 +155,7 @@
         <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-mvn</artifactId>
+            <version>1.3.5</version>
             <scope>test</scope>
         </dependency>
 
@@ -164,17 +172,19 @@
             <scope>test</scope>
         </dependency>
 
-		<dependency>
-			<groupId>org.eclipse.equinox</groupId>
-			<artifactId>cm</artifactId>
-            <scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
-			<artifactId>services</artifactId>
-            <scope>test</scope>
-		</dependency>
+	<dependency>
+             <groupId>org.eclipse.equinox</groupId>
+	     <artifactId>cm</artifactId>
+             <version>3.2.0-v20070116</version>
+             <scope>test</scope>
+	</dependency>
+
+	<dependency>
+	     <groupId>org.eclipse.osgi</groupId>
+	     <artifactId>services</artifactId>
+             <version>3.1.200-v20070605</version>
+             <scope>test</scope>
+	</dependency>
 
 	</dependencies>
 

Modified: aries/branches/subsystemsR6/samples/blueprint/idverifier/idverifier-client/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/samples/blueprint/idverifier/idverifier-client/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/samples/blueprint/idverifier/idverifier-client/pom.xml (original)
+++ aries/branches/subsystemsR6/samples/blueprint/idverifier/idverifier-client/pom.xml Mon Jun 30 16:54:57 2014
@@ -33,6 +33,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/branches/subsystemsR6/samples/blueprint/idverifier/idverifier-server/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/samples/blueprint/idverifier/idverifier-server/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/samples/blueprint/idverifier/idverifier-server/pom.xml (original)
+++ aries/branches/subsystemsR6/samples/blueprint/idverifier/idverifier-server/pom.xml Mon Jun 30 16:54:57 2014
@@ -51,6 +51,7 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>osgi</artifactId>
+            <version>3.5.0.v20090520</version>
             <scope>provided</scope>
         </dependency>
        <dependency>

Modified: aries/branches/subsystemsR6/samples/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/samples/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/samples/pom.xml (original)
+++ aries/branches/subsystemsR6/samples/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,37 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-       http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
-    
-    <modelVersion>4.0.0</modelVersion>
-    
+
     <groupId>org.apache.aries.samples</groupId>
     <version>1.0.1-SNAPSHOT</version>
     <artifactId>samples</artifactId>
     <name>Apache Aries Samples</name>
     <packaging>pom</packaging>
-  
+
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/samples</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/samples</developerConnection>
@@ -96,7 +98,7 @@
         <ariesJpaBlueprintAriesVersion>1.0.0</ariesJpaBlueprintAriesVersion>
         <ariesJpaContainerVersion>1.0.0</ariesJpaContainerVersion>
         <ariesJpaContainerContextVersion>1.0.0</ariesJpaContainerContextVersion>
-        
+
         <!-- Aries Proxy Versions -->
         <ariesProxyApiVersion>1.0.0</ariesProxyApiVersion>
         <ariesProxyVersion>1.0.0</ariesProxyVersion>
@@ -105,7 +107,7 @@
         <!-- Aries Quiesce Versions -->
         <ariesQuiesceApiVersion>1.0.0</ariesQuiesceApiVersion>
         <ariesQuiesceManagerVersion>1.0.0</ariesQuiesceManagerVersion>
-        
+
 
         <!-- Aries Testsupport Versions -->
         <ariesTestsupportUnitVersion>1.0.0</ariesTestsupportUnitVersion>
@@ -122,8 +124,6 @@
         <!-- Aries Web Versions -->
         <ariesWebVersion>1.0.0</ariesWebVersion>
 
-
-
         <!-- External Dependencies -->
         <cmVersion>3.2.0-v20070116</cmVersion>
         <servicesVersion>3.1.200-v20070605</servicesVersion>
@@ -160,14 +160,13 @@
         <serpVersion>1.13.1</serpVersion>
         <javaxServletVersion>1.2</javaxServletVersion>
 
-        <twitter4jVersion>2.0.8</twitter4jVersion>
+        <twitter4jVersion>2.0.10</twitter4jVersion>
 
         <aries.javadoc.exclude.packages>*</aries.javadoc.exclude.packages>
     </properties>
-    
+
     <dependencyManagement>
         <dependencies>
-            <!-- ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -->
             <!-- External project dependencies -->
             <dependency>
                 <groupId>asm</groupId>
@@ -310,15 +309,13 @@
                 <artifactId>org.apache.felix.bundlerepository</artifactId>
                 <version>${felixBundlerepositoryVersion}</version>
             </dependency>
-             
+
             <dependency>
                 <groupId>net.homeip.yusuke</groupId>
                 <artifactId>twitter4j</artifactId>
                 <version>${twitter4jVersion}</version>
             </dependency>
 
-
-            <!-- ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -->
             <!-- other aries subproject dependency management -->
             <!--application-->
             <dependency>
@@ -541,7 +538,7 @@
                 <artifactId>org.apache.aries.proxy.impl</artifactId>
                 <version>${ariesProxyImplVersion}</version>
             </dependency>
-            <!-- quiesce -->      
+            <!-- quiesce -->
             <dependency>
                 <groupId>org.apache.aries.quiesce</groupId>
                 <artifactId>org.apache.aries.quiesce.api</artifactId>
@@ -558,7 +555,7 @@
                 <artifactId>org.apache.aries.testsupport.unit</artifactId>
                 <version>${ariesTestsupportUnitVersion}</version>
             </dependency>
-            <!-- transaction -->      
+            <!-- transaction -->
             <dependency>
                 <groupId>org.apache.aries.transaction</groupId>
                 <artifactId>org.apache.aries.transaction.blueprint</artifactId>
@@ -591,7 +588,7 @@
                 <artifactId>org.apache.aries.web.urlhandler</artifactId>
                 <version>${ariesWebVersion}</version>
             </dependency>
-            <!-- ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -->
+
             <!-- internal samples dependencies -->
             <dependency>
                 <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/branches/subsystemsR6/samples/twitter/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/samples/twitter/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/samples/twitter/pom.xml (original)
+++ aries/branches/subsystemsR6/samples/twitter/pom.xml Mon Jun 30 16:54:57 2014
@@ -29,6 +29,10 @@
     <artifactId>twitter</artifactId>
     <packaging>pom</packaging>
     
+    <properties>
+    	<aries.skip.version.check>true</aries.skip.version.check>
+    </properties>
+    
     <dependencyManagement>
         <dependencies>
             <dependency>

Modified: aries/branches/subsystemsR6/samples/twitter/twitter-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/samples/twitter/twitter-bundle/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/samples/twitter/twitter-bundle/pom.xml (original)
+++ aries/branches/subsystemsR6/samples/twitter/twitter-bundle/pom.xml Mon Jun 30 16:54:57 2014
@@ -57,9 +57,10 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
 					<instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Activator>org.apache.aries.sample.twitter.TwitterQuery</Bundle-Activator>
-                        <Private-Package>org.apache.aries.sample.twitter</Private-Package>
+                                             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                                             <Bundle-Activator>org.apache.aries.sample.twitter.TwitterQuery</Bundle-Activator>
+                                             <Private-Package>org.apache.aries.sample.twitter</Private-Package>
+                                             <Import-Package>org.osgi.framework;version="[1.5,2)",*</Import-Package>
 					</instructions>
 				</configuration> 
 			</plugin>

Modified: aries/branches/subsystemsR6/samples/twitter/twitter-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/samples/twitter/twitter-itests/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/samples/twitter/twitter-itests/pom.xml (original)
+++ aries/branches/subsystemsR6/samples/twitter/twitter-itests/pom.xml Mon Jun 30 16:54:57 2014
@@ -32,18 +32,18 @@
         Integration tests for the Twitter sample
     </description>
     
+    <properties>
+        <exam.version>3.4.0</exam.version>
+        <url.version>1.6.0</url.version>
+        <swissbox.version>1.7.0</swissbox.version>
+    </properties>
+    
     <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>test</scope>
+  		<dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>3.8.0.v20120529-1548</version>
         </dependency>
-
-		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>org.apache.felix.configadmin</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.aries</groupId>
 			<artifactId>org.apache.aries.util</artifactId>
@@ -57,7 +57,6 @@
 		<dependency>
 			<groupId>org.apache.aries.proxy</groupId>
 			<artifactId>org.apache.aries.proxy</artifactId>
-			<version>1.0.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -66,36 +65,6 @@
             <version>4.0</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.logging</groupId>
-			<artifactId>pax-logging-api</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.logging</groupId>
-			<artifactId>pax-logging-service</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.exam</groupId>
-			<artifactId>pax-exam</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>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.url</groupId>
-			<artifactId>pax-url-mvn</artifactId>
-            <scope>test</scope>
-		</dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.bundlerepository</artifactId>
@@ -111,10 +80,10 @@
             <artifactId>org.apache.aries.application.utils</artifactId>
             <scope>test</scope>
         </dependency>
-        
         <dependency>
             <groupId>org.apache.aries.testsupport</groupId>
             <artifactId>org.apache.aries.testsupport.unit</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
@@ -123,49 +92,41 @@
             <artifactId>org.apache.aries.application.runtime.itest.interfaces</artifactId>
             <scope>test</scope>
         </dependency>
-        
         <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.management</artifactId>
             <scope>test</scope>
         </dependency>
-        
         <dependency>
         	<groupId>org.apache.aries.application</groupId>
         	<artifactId>org.apache.aries.application.runtime.framework</artifactId>
         	<scope>test</scope>
         </dependency>
-        
         <dependency>
         	<groupId>org.apache.aries.application</groupId>
         	<artifactId>org.apache.aries.application.runtime.framework.management</artifactId>
         	<scope>test</scope>
         </dependency>
-        
         <dependency>
         	<groupId>org.apache.aries.application</groupId>
         	<artifactId>org.apache.aries.application.runtime.repository</artifactId>
         	<scope>test</scope>
         </dependency>
-        
         <dependency>
         	<groupId>org.apache.aries.application</groupId>
         	<artifactId>org.apache.aries.application.runtime.isolated</artifactId>
         	<scope>test</scope>
         </dependency>
-        
         <dependency>
         	<groupId>org.apache.aries.application</groupId>
         	<artifactId>org.apache.aries.application.runtime</artifactId>
         	<scope>test</scope>
         </dependency>
-        
         <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.resolver.obr</artifactId>
             <scope>test</scope>
         </dependency>
-       
         <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.resolver.noop</artifactId>
@@ -187,12 +148,6 @@
         	<scope>test</scope>
         </dependency>
         <dependency>
-        	<groupId>org.eclipse</groupId>
-        	<artifactId>osgi</artifactId>
-        	<type>jar</type>
-        	<scope>test</scope>
-        </dependency>
-        <dependency>
           <groupId>org.apache.aries.samples.twitter</groupId>
           <artifactId>org.apache.aries.samples.twitter.eba</artifactId>
           <scope>test</scope>
@@ -201,16 +156,86 @@
         <dependency>
             <groupId>org.apache.aries.samples.twitter</groupId>
             <artifactId>org.apache.aries.samples.twitter.twitter4j</artifactId>
+            <exclusions>
+            	<exclusion>
+            		<artifactId>nlog4j</artifactId>
+            		<groupId>org.slf4j</groupId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.samples.twitter</groupId>
             <artifactId>org.apache.aries.samples.twitter.bundle</artifactId>
         </dependency>
+        
+        <!-- pax exam -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam</artifactId>
+            <version>${exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-container-native</artifactId>
+            <version>${exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit4</artifactId>
+            <version>${exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-link-mvn</artifactId>
+            <version>${exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-aether</artifactId>
+            <version>${url.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>0.9.29</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>0.9.29</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.tinybundles</groupId>
+            <artifactId>tinybundles</artifactId>
+            <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>org.osgi.core</artifactId>
+                    <groupId>org.osgi</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
+			<plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>
                 <version>1.2</version>
@@ -220,9 +245,6 @@
                         <goals>
                             <goal>generate-depends-file</goal>
                         </goals>
-                        <configuration>
-                            <outputFile>${project.build.directory}/test-classes/META-INF/maven/dependencies.properties</outputFile>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -231,14 +253,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <forkMode>pertest</forkMode>
-                    <excludes>
-                        <exclude>**/*$*</exclude>
-                        <exclude>**/Abstract*.java</exclude>
-                    </excludes>
-                    <includes>
-                        <include>**/Test*.java</include>
-                        <include>**/*Test.java</include>
-                    </includes>
                 </configuration>
             </plugin>
         </plugins>
@@ -258,6 +272,7 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
+                            <forkMode>pertest</forkMode>
                             <!--
                                 when the local repo location has been specified, we need to pass
                                 on this information to PAX mvn url



Mime
View raw message