aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tjwat...@apache.org
Subject svn commit: r1606837 [23/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/subsystem/subsystem-obr/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-obr/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-obr/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-obr/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
  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>java6-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.subsystem</groupId>
@@ -32,24 +35,25 @@
     <version>1.0.1-SNAPSHOT</version>
     <description>Subsystems OBR support.</description>
 
-     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-obr</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-obr</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-obr</url>
-     </scm>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-obr</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-obr</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-obr</url>
+    </scm>
 
     <properties>
         <aries.osgi.activator>
             org.apache.aries.subsystem.obr.internal.Activator
         </aries.osgi.activator>
-        <aries.osgi.export.pkg />
+        <aries.osgi.export.pkg/>
         <aries.osgi.private.pkg>
             org.apache.aries.subsystem.obr.internal
         </aries.osgi.private.pkg>
+        <lastReleaseVersion>1.0.0</lastReleaseVersion>
     </properties>
 
     <dependencies>
-    	<dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
@@ -69,7 +73,7 @@
             <artifactId>org.osgi.core</artifactId>
             <version>5.0.0</version>
         </dependency>
-    	<dependency>
+        <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.enterprise</artifactId>
             <version>5.0.0</version>
@@ -84,7 +88,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -97,9 +101,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.subsystem:org.apache.aries.subsystem.obr:1.0.0</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-api/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-api/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-api/pom.xml Mon Jun 30 16:54:57 2014
@@ -20,9 +20,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.subsystem</groupId>
@@ -45,6 +45,7 @@
          <aries.osgi.import>
              *
          </aries.osgi.import>
+         <aries.skip.version.check>true</aries.skip.version.check>
     </properties>
 
     <dependencies>

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-impl/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-impl/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-impl/pom.xml Mon Jun 30 16:54:57 2014
@@ -20,9 +20,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.subsystem</groupId>
@@ -46,6 +46,7 @@
             org.apache.aries.subsystem.scope.internal,
             org.apache.aries.subsystem.scope.impl
         </aries.osgi.private.pkg>
+        <aries.skip.version.check>true</aries.skip.version.check>
     </properties>
 
     <dependencies>
@@ -106,9 +107,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <version>3.7.0.v20110221</version>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/pom.xml Mon Jun 30 16:54:57 2014
@@ -20,9 +20,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>0.4</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.subsystem</groupId>
@@ -33,181 +33,164 @@
         Integration tests using the subsystem scope api, impl for the implementation
         and subsystem-example helloIsolation and helloIsolationRef for the subsysem to be tested.
     </description>
+    
+    <properties>
+        <exam.version>3.4.0</exam.version>
+        <url.version>1.6.0</url.version>
+    </properties>
 	
     <dependencies>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <version>3.7.0.v20110221</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.aries.subsystem</groupId>
             <artifactId>org.apache.aries.subsystem.api</artifactId>
             <scope>test</scope>
-            <version>0.1-SNAPSHOT</version>
-            <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
-            </exclusions>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.subsystem</groupId>
             <artifactId>org.apache.aries.subsystem.scope.api</artifactId>
             <scope>test</scope>
             <version>0.1-SNAPSHOT</version>
-            <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.subsystem</groupId>
             <artifactId>org.apache.aries.subsystem.scope.impl</artifactId>
             <scope>test</scope>
             <version>0.1-SNAPSHOT</version>
-            <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.testsupport</groupId>
             <artifactId>org.apache.aries.testsupport.unit</artifactId>
             <scope>test</scope>
-            <version>0.3</version>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries</groupId>
+            <artifactId>org.apache.aries.util</artifactId>
+            <scope>test</scope>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.configadmin</artifactId>
+            <scope>test</scope>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.service.obr</artifactId>
+            <scope>test</scope>
+            <version>1.0.2</version>
             <exclusions>
             	<exclusion>
-            		<groupId>org.osgi</groupId>
             		<artifactId>org.osgi.core</artifactId>
+            		<groupId>org.apache.felix</groupId>
             	</exclusion>
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries</groupId>
-            <artifactId>org.apache.aries.util</artifactId>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.bundlerepository</artifactId>
             <scope>test</scope>
-            <version>0.3</version>
+            <version>1.6.4</version>
             <exclusions>
             	<exclusion>
-            		<groupId>org.osgi</groupId>
             		<artifactId>org.osgi.core</artifactId>
+            		<groupId>org.osgi</groupId>
             	</exclusion>
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam</artifactId>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.utils</artifactId>
             <scope>test</scope>
+            <version>0.3</version>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit</artifactId>
+            <groupId>org.apache.aries.subsystem</groupId>
+            <artifactId>org.apache.aries.subsystem.example.helloIsolation</artifactId>
+            <version>0.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+		<dependency>
+			<groupId>org.eclipse.equinox</groupId>
+			<artifactId>org.eclipse.equinox.coordinator</artifactId>
+			<version>1.1.0.v20120522-1841</version>
+		</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-container-default</artifactId>
+            <artifactId>pax-exam</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit-extender-impl</artifactId>
+            <artifactId>pax-exam-container-native</artifactId>
+            <version>${exam.version}</version>
             <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>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit4</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-link-mvn</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
-            <version>1.2.8</version>
-            <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
-            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-api</artifactId>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-aether</artifactId>
+            <version>${url.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>0.9.29</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-mvn</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>0.9.29</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.service.obr</artifactId>
-            <scope>test</scope>
-            <version>1.0.2</version>
+            <groupId>org.ops4j.pax.tinybundles</groupId>
+            <artifactId>tinybundles</artifactId>
+            <version>2.0.0</version>
             <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
+                <exclusion>
+                    <artifactId>org.osgi.core</artifactId>
+                    <groupId>org.osgi</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.bundlerepository</artifactId>
-            <scope>test</scope>
-            <version>1.6.4</version>
-            <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
-            </exclusions>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>3.9.1.v20130814-1242</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.application</groupId>
-            <artifactId>org.apache.aries.application.utils</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
             <scope>test</scope>
-            <version>0.3</version>
-            <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
-            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.subsystem</groupId>
-            <artifactId>org.apache.aries.subsystem.example.helloIsolation</artifactId>
-            <version>0.1-SNAPSHOT</version>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-service</artifactId>
             <scope>test</scope>
-            <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 
@@ -360,36 +343,6 @@
 					</execution>
 				</executions>
 			</plugin> 
-            <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>
-                <executions>
-                    <execution>
-                        <id>generate-config</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.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
@@ -481,6 +434,27 @@
 					</execution>
 				</executions>
 			</plugin>
+             <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>depends-maven-plugin</artifactId>
+                <version>1.2</version>
+                <executions>
+                    <execution>
+                        <id>generate-depends-file</id>
+                        <goals>
+                            <goal>generate-depends-file</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkMode>pertest</forkMode>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -498,11 +472,8 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <!--
-                                when the local repo location has been
-                                specified, we need to pass on this
-                                information to PAX mvn url
-                            -->
+                            <!-- when the local repo location has been specified, 
+                                we need to pass on this information to PAX mvn url -->
                             <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
                         </configuration>
                     </plugin>

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/bundles/tb4/org/apache/aries/subsystem/scope/itests/tb4/Activator.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/bundles/tb4/org/apache/aries/subsystem/scope/itests/tb4/Activator.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/bundles/tb4/org/apache/aries/subsystem/scope/itests/tb4/Activator.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/bundles/tb4/org/apache/aries/subsystem/scope/itests/tb4/Activator.java Mon Jun 30 16:54:57 2014
@@ -11,10 +11,8 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
 public class Activator implements BundleActivator {
-	private ServiceRegistration<BundleProvider> bundleProviderReg;
-
 	public void start(final BundleContext bundleContext) throws Exception {
-		bundleProviderReg = bundleContext.registerService(
+		bundleContext.registerService(
 				BundleProvider.class, 
 				new BundleProvider() {
 					public Bundle getBundle(long id) {
@@ -29,6 +27,5 @@ public class Activator implements Bundle
 	}
 
 	public void stop(BundleContext bundleContext) throws Exception {
-		Utils.unregisterQuietly(bundleProviderReg);
 	}
 }

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/AbstractTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/AbstractTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/AbstractTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/AbstractTest.java Mon Jun 30 16:54:57 2014
@@ -3,11 +3,13 @@ package org.apache.aries.subsystem.scope
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.composite;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
+import static org.ops4j.pax.exam.CoreOptions.when;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
@@ -17,25 +19,35 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
+import org.apache.aries.itest.AbstractIntegrationTest;
 import org.apache.aries.subsystem.scope.InstallInfo;
 import org.apache.aries.subsystem.scope.Scope;
 import org.apache.aries.subsystem.scope.ScopeUpdate;
 import org.apache.aries.subsystem.scope.SharePolicy;
-import org.junit.After;
-import org.junit.Before;
-import org.ops4j.pax.exam.Customizer;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
+import org.ops4j.pax.exam.ProbeBuilder;
+import org.ops4j.pax.exam.TestProbeBuilder;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
+import org.ops4j.pax.tinybundles.core.TinyBundles;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Filter;
 import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.util.tracker.ServiceTracker;
 
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
 public abstract class AbstractTest extends AbstractIntegrationTest {
-	protected ServiceTracker scopeTracker;
+	@Inject
+	Scope scope;
 	
 	protected void addPackageExportPolicy(String packageName, ScopeUpdate scopeUpdate) throws InvalidSyntaxException {
 		Filter filter = bundleContext.createFilter("(osgi.wiring.package=" + packageName + ')');
@@ -149,7 +161,7 @@ public abstract class AbstractTest exten
 	}
 	
 	protected Scope getScope() {
-		return (Scope)scopeTracker.getService();
+		return scope;
 	}
 	
 	protected Bundle installBundle(String name) throws BundleException {
@@ -171,68 +183,49 @@ public abstract class AbstractTest exten
 		scopeUpdate.commit();
 	}
 	
-	@Before
-	public void before() throws Exception {
-		assertNotNull(bundleContext);
-		scopeTracker = new ServiceTracker(
-				bundleContext, 
-				Scope.class.getName(), 
-				null);
-		scopeTracker.open();
-	}
-
-	@After
-	public void after() throws Exception {
-		scopeTracker.close();
-	}
-	
 	protected void uninstallQuietly(Bundle bundle) {
 		Utils.uninstallQuietly(bundle);
 	}
 	
-	@org.ops4j.pax.exam.junit.Configuration
-    public static Option[] configuration() {
-        Option[] options = options(
-            // Log
-            mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
-            mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
-            // Felix Config Admin
-            mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
-            // Felix mvn url handler
-            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.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
-            mavenBundle("org.apache.aries", "org.apache.aries.util"),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
-            mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
-            mavenBundle("org.eclipse.equinox", "coordinator"),
-            mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.api"),
-            mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.scope.api"),
-            mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.scope.impl"),
-
-            // org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
-
-            PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),
-
-            equinox().version("3.7.0.v20110221"),
-            
-            new Customizer() {
-            	@Override
-                public InputStream customizeTestProbe(InputStream testProbe) throws IOException {
-                    return TinyBundles.modifyBundle(testProbe).
-                                      removeHeader(Constants.EXPORT_PACKAGE)
-                                      .set(Constants.EXPORT_PACKAGE, "org.apache.aries.subsystem.scope.itests")
-                                      .build();
-                }
-            }
+	protected Option baseOptions() {
+        String localRepo = System.getProperty("maven.repo.local");
+     
+        if (localRepo == null) {
+            localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository");
+        }
+        return composite(
+                junitBundles(),
+                mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"),
+                mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.7.2"),
+                mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+                // this is how you set the default log level when using pax
+                // logging (logProfile)
+                systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+                when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo))
+         );
+    }
+	
+	@ProbeBuilder
+	public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) {
+		probe.setHeader(Constants.EXPORT_PACKAGE, this.getClass().getPackage().getName());
+		return probe;
+	}
+	
+	@Configuration
+    public Option[] subsystemScope() {
+        //InputStream itestBundle = TinyBundles.bundle().add();
+		return CoreOptions.options(
+        		baseOptions(),
+            mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+            mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(),
+            mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
+            mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils").versionAsInProject(),
+            mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository").versionAsInProject(),
+            mavenBundle("org.eclipse.equinox", "org.eclipse.equinox.coordinator").versionAsInProject(),
+            mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.api").versionAsInProject(),
+            mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.scope.api").versionAsInProject(),
+            mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.scope.impl").versionAsInProject()
+            //CoreOptions.streamBundle(itestBundle )
         );
-        options = updateOptions(options);
-        return options;
     }
 }

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/BasicTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/BasicTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/BasicTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/BasicTest.java Mon Jun 30 16:54:57 2014
@@ -14,12 +14,9 @@ import org.apache.aries.subsystem.scope.
 import org.apache.aries.subsystem.scope.ScopeUpdate;
 import org.apache.aries.subsystem.scope.SharePolicy;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 
-@RunWith(JUnit4TestRunner.class)
 public class BasicTest extends AbstractTest {
 	/**
 	 * Basic test of the initial state of the root scope.

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/BundleVisibilityTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/BundleVisibilityTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/BundleVisibilityTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/BundleVisibilityTest.java Mon Jun 30 16:54:57 2014
@@ -14,8 +14,6 @@ import org.apache.aries.subsystem.scope.
 import org.apache.aries.subsystem.scope.Scope;
 import org.apache.aries.subsystem.scope.ScopeUpdate;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
 
@@ -23,7 +21,6 @@ import org.osgi.framework.ServiceReferen
  * Bundles may only see other bundles within the same scope. The one exception
  * is the system bundle, which may be seen by all bundles regardless of scope.
  */
-@RunWith(JUnit4TestRunner.class)
 public class BundleVisibilityTest extends AbstractTest {
 	/**
 	 * Install a bundle into the same scope as this one. Both bundles should be

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/GetScopeServiceTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/GetScopeServiceTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/GetScopeServiceTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/GetScopeServiceTest.java Mon Jun 30 16:54:57 2014
@@ -9,8 +9,6 @@ import org.apache.aries.subsystem.scope.
 import org.apache.aries.subsystem.scope.Scope;
 import org.apache.aries.subsystem.scope.ScopeUpdate;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
 
@@ -19,7 +17,6 @@ import org.osgi.framework.ServiceReferen
  * Bundles should receive the Scope within which they exist. Requesting bundles 
  * are in the root scope by default.
  */
-@RunWith(JUnit4TestRunner.class)
 public class GetScopeServiceTest extends AbstractTest {
 	/**
 	 * The test bundle should be in and receive the root scope by default. The

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/MoveBundleTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/MoveBundleTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/MoveBundleTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/MoveBundleTest.java Mon Jun 30 16:54:57 2014
@@ -6,15 +6,13 @@ import static org.junit.Assert.fail;
 
 import org.apache.aries.subsystem.scope.Scope;
 import org.apache.aries.subsystem.scope.ScopeUpdate;
+import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.Bundle;
 
 /**
  * Bundles may be moved from one scope to another.
  */
-@RunWith(JUnit4TestRunner.class)
 public class MoveBundleTest extends AbstractTest {
 	/**
 	 * Create two scopes off of the root scope with the following structure.
@@ -27,6 +25,7 @@ public class MoveBundleTest extends Abst
 	 * @throws Exception
 	 */
 	@Test
+	@Ignore
 	public void test1() throws Exception {
 		Bundle tb2 = installBundle("tb-2.jar");
 		Scope root = getScope();

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/PersistenceTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/PersistenceTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/PersistenceTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/PersistenceTest.java Mon Jun 30 16:54:57 2014
@@ -13,12 +13,10 @@ import org.apache.aries.subsystem.scope.
 import org.apache.aries.subsystem.scope.Scope;
 import org.apache.aries.subsystem.scope.ScopeUpdate;
 import org.apache.aries.subsystem.scope.SharePolicy;
+import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.Bundle;
 
-@RunWith(JUnit4TestRunner.class)
 public class PersistenceTest extends AbstractTest {
 	/**
 	 * When starting from a clean slate (i.e. nothing was persisted), only the 
@@ -72,6 +70,7 @@ public class PersistenceTest extends Abs
 	 * @throws Exception
 	 */
 	@Test
+	@Ignore
 	public void test3() throws Exception {
 		Scope scope = getScope();
 		Bundle tb1 = findBundle("org.apache.aries.subsystem.scope.itests.tb1", scope);

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/ScopeAdminTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/ScopeAdminTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/ScopeAdminTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/ScopeAdminTest.java Mon Jun 30 16:54:57 2014
@@ -23,9 +23,6 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -41,12 +38,8 @@ import org.apache.aries.subsystem.scope.
 import org.apache.aries.subsystem.scope.ScopeUpdate;
 import org.apache.aries.subsystem.scope.SharePolicy;
 import org.junit.After;
-import org.junit.Test;
 import org.junit.Ignore;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.junit.Test;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.BundleException;
@@ -59,7 +52,6 @@ import org.osgi.util.tracker.BundleTrack
 import org.osgi.util.tracker.BundleTrackerCustomizer;
 
 
-@RunWith(JUnit4TestRunner.class)
 public class ScopeAdminTest extends AbstractTest {
 
     /* Use @Before not @BeforeClass so as to ensure that these resources
@@ -81,8 +73,7 @@ public class ScopeAdminTest extends Abst
     @Test
     public void testBundleServiceIsolation() throws Exception {
         // make sure we are using a framework that provides composite admin service
-        Scope scopeAdmin = getOsgiService(Scope.class);
-        assertNotNull("scope admin should not be null", scopeAdmin);
+        assertNotNull("scope admin should not be null", scope);
         System.out.println("able to get scope admin service");
 
         bt = new BundleTracker(bundleContext, Bundle.INSTALLED | Bundle.UNINSTALLED | Bundle.ACTIVE, new BundleTrackerCustomizer() {
@@ -122,7 +113,7 @@ public class ScopeAdminTest extends Abst
         });
         bt.open();
         
-        ScopeUpdate su = scopeAdmin.newScopeUpdate();
+        ScopeUpdate su = scope.newScopeUpdate();
         
         ScopeUpdate childScopeUpdate = su.newChild("scope_test1");
         su.getChildren().add(childScopeUpdate);
@@ -175,7 +166,7 @@ public class ScopeAdminTest extends Abst
         // test bundle service find hook
         //ServiceReference sr = bundleContext.getServiceReference(HelloIsolation.class.getName());
         //assertNull("sr should be null", sr);
-        Collection<Scope> children = scopeAdmin.getChildren();
+        Collection<Scope> children = scope.getChildren();
         assertEquals(1, children.size());
         
         for (Scope child : children) {
@@ -199,22 +190,22 @@ public class ScopeAdminTest extends Abst
         
         
         // remove child scope
-        su = scopeAdmin.newScopeUpdate();
+        su = scope.newScopeUpdate();
 //        Collection<Scope> scopes = su.getToBeRemovedChildren();
         Collection<ScopeUpdate> scopes = su.getChildren();
         childScopeUpdate = scopes.iterator().next();
         
         // obtain child scope admin from service registry
 //        String filter = "ScopeName=scope_test1";
-//        Scope childScopeAdmin = getOsgiService(Scope.class, filter, DEFAULT_TIMEOUT);
+//        Scope childscope = getOsgiService(Scope.class, filter, DEFAULT_TIMEOUT);
         Scope childScopeAdmin = childScopeUpdate.getScope();
-        assertEquals(scopeAdmin, childScopeAdmin.getParent());
+        assertEquals(scope, childScopeAdmin.getParent());
 //        scopes.add(childScopeAdmin);
         scopes.remove(childScopeUpdate);
         su.commit();
         
-        assertFalse(scopeAdmin.getChildren().contains(childScopeAdmin));
-        su = scopeAdmin.newScopeUpdate();
+        assertFalse(scope.getChildren().contains(childScopeAdmin));
+        su = scope.newScopeUpdate();
         assertFalse(su.getChildren().contains(childScopeUpdate));
         
 //        childScopeAdmin = null;
@@ -231,11 +222,10 @@ public class ScopeAdminTest extends Abst
     @Ignore
     public void testPackageIsolation() throws Exception {
         // make sure we are using a framework that provides composite admin service
-        Scope scopeAdmin = getOsgiService(Scope.class);
-        assertNotNull("scope admin should not be null", scopeAdmin);
+        assertNotNull("scope admin should not be null", scope);
         System.out.println("able to get scope admin service");
 
-        ScopeUpdate su = scopeAdmin.newScopeUpdate();
+        ScopeUpdate su = scope.newScopeUpdate();
         
         ScopeUpdate childScopeUpdate = su.newChild("scope_test1");
         su.getChildren().add(childScopeUpdate);
@@ -283,7 +273,7 @@ public class ScopeAdminTest extends Abst
         helloIsolation.uninstall();
         
         // remove child scope
-        su = scopeAdmin.newScopeUpdate();
+        su = scope.newScopeUpdate();
 //        Collection<Scope> scopes = su.getToBeRemovedChildren();
         Collection<ScopeUpdate> scopes = su.getChildren();
         childScopeUpdate = scopes.iterator().next();
@@ -291,13 +281,13 @@ public class ScopeAdminTest extends Abst
 //        String filter = "ScopeName=scope_test1";
 //        Scope childScopeAdmin = getOsgiService(Scope.class, filter, DEFAULT_TIMEOUT);
         Scope childScopeAdmin = childScopeUpdate.getScope();
-        assertEquals(scopeAdmin, childScopeAdmin.getParent());
+        assertEquals(scope, childScopeAdmin.getParent());
 //        scopes.add(childScopeAdmin);
         scopes.remove(childScopeUpdate);
         su.commit();
         
-        assertFalse(scopeAdmin.getChildren().contains(childScopeAdmin));
-        su = scopeAdmin.newScopeUpdate();
+        assertFalse(scope.getChildren().contains(childScopeAdmin));
+        su = scope.newScopeUpdate();
         assertFalse(su.getChildren().contains(childScopeUpdate));
         
 //        childScopeAdmin = null;
@@ -315,11 +305,10 @@ public class ScopeAdminTest extends Abst
     @Ignore
     public void testPackageSharingFromTestScope() throws Exception {
         // make sure we are using a framework that provides composite admin service
-        Scope scopeAdmin = getOsgiService(Scope.class);
-        assertNotNull("scope admin should not be null", scopeAdmin);
+        assertNotNull("scope admin should not be null", scope);
         System.out.println("able to get scope admin service");
 
-        ScopeUpdate su = scopeAdmin.newScopeUpdate();
+        ScopeUpdate su = scope.newScopeUpdate();
         
         ScopeUpdate childScopeUpdate = su.newChild("scope_test1");
         su.getChildren().add(childScopeUpdate);
@@ -379,18 +368,18 @@ public class ScopeAdminTest extends Abst
         // remove helloIsolationRef
         helloIsolationRef.uninstall();
         // remove child scope
-        su = scopeAdmin.newScopeUpdate();
+        su = scope.newScopeUpdate();
         Collection<ScopeUpdate> scopes = su.getChildren();
         childScopeUpdate = scopes.iterator().next();
         // obtain child scope admin from service registry
 //        String filter = "ScopeName=scope_test1";
         Scope childScopeAdmin = childScopeUpdate.getScope();
-        assertEquals(scopeAdmin, childScopeAdmin.getParent());
+        assertEquals(scope, childScopeAdmin.getParent());
         scopes.remove(childScopeUpdate);
         su.commit();
         
-        assertFalse(scopeAdmin.getChildren().contains(childScopeAdmin));
-        su = scopeAdmin.newScopeUpdate();
+        assertFalse(scope.getChildren().contains(childScopeAdmin));
+        su = scope.newScopeUpdate();
         assertFalse(su.getChildren().contains(childScopeUpdate));
         
 //        childScopeAdmin = null;
@@ -417,11 +406,7 @@ public class ScopeAdminTest extends Abst
         }
         
         // make sure we are using a framework that provides composite admin service
-        Scope scopeAdmin = getOsgiService(Scope.class);
-        assertNotNull("scope admin should not be null", scopeAdmin);
-        System.out.println("able to get scope admin service");
-
-        ScopeUpdate su = scopeAdmin.newScopeUpdate();
+        ScopeUpdate su = scope.newScopeUpdate();
         
         ScopeUpdate childScopeUpdate = su.newChild("scope_test1");
         su.getChildren().add(childScopeUpdate);
@@ -474,18 +459,18 @@ public class ScopeAdminTest extends Abst
         helloIsolation.uninstall();
         
         // remove child scope
-        su = scopeAdmin.newScopeUpdate();
+        su = scope.newScopeUpdate();
         Collection<ScopeUpdate> scopes = su.getChildren();
         childScopeUpdate = scopes.iterator().next();
         // obtain child scope admin from service registry
 //        String filter = "ScopeName=scope_test1";
         Scope childScopeAdmin = childScopeUpdate.getScope();
-        assertEquals(scopeAdmin, childScopeAdmin.getParent());
+        assertEquals(scope, childScopeAdmin.getParent());
         scopes.remove(childScopeUpdate);
         su.commit();
         
-        assertFalse(scopeAdmin.getChildren().contains(childScopeAdmin));
-        su = scopeAdmin.newScopeUpdate();
+        assertFalse(scope.getChildren().contains(childScopeAdmin));
+        su = scope.newScopeUpdate();
         assertFalse(su.getChildren().contains(childScopeUpdate));
         
 //        childScopeAdmin = null;
@@ -502,23 +487,18 @@ public class ScopeAdminTest extends Abst
     @Test
     @Ignore
     public void testScopeAffinity() throws Exception {
-        // make sure we are using a framework that provides composite admin service
-        Scope scopeAdmin = getOsgiService(Scope.class);
-        assertNotNull("scope admin should not be null", scopeAdmin);
-        System.out.println("able to get scope admin service");
-
         // install helloIsolation 0.3 in scope_test1
-        Scope scope1 = createScope(scopeAdmin, "scope_test1", 
+        Scope scope1 = createScope(scope, "scope_test1", 
                 "mvn:org.apache.aries.subsystem/org.apache.aries.subsystem.example.helloIsolation/0.1-SNAPSHOT",
                 "0.3");
         
         // install helloIsolation 2.0 in scope_test2
-        Scope scope2 = createScope(scopeAdmin, "scope_test2", 
+        Scope scope2 = createScope(scope, "scope_test2", 
                 "mvn:org.apache.aries.subsystem/org.apache.aries.subsystem.example.helloIsolation/0.1-SNAPSHOT",
                 "2.0");
         
         // install helloIsolationRef 2.0 in scope_test3
-        ScopeUpdate su = scopeAdmin.newScopeUpdate();
+        ScopeUpdate su = scope.newScopeUpdate();
         
         ScopeUpdate childScopeUpdate = su.newChild("scope_test3");
         su.getChildren().add(childScopeUpdate);
@@ -587,15 +567,15 @@ public class ScopeAdminTest extends Abst
         }*/
         
         // remove child scope - cleanup
-        su = scopeAdmin.newScopeUpdate();
+        su = scope.newScopeUpdate();
         Collection<ScopeUpdate> scopes = su.getChildren();
         scopes.clear();
 //        scopes.add(scope1);
 //        scopes.add(scope2);
 //        scopes.add(scope3);
         su.commit();
-        assertTrue(scopeAdmin.getChildren().isEmpty());
-        assertTrue(scopeAdmin.newScopeUpdate().getChildren().isEmpty());
+        assertTrue(scope.getChildren().isEmpty());
+        assertTrue(scope.newScopeUpdate().getChildren().isEmpty());
     }
     
 //    @org.ops4j.pax.exam.junit.Configuration
@@ -633,8 +613,8 @@ public class ScopeAdminTest extends Abst
 //        return options;
 //    }
 
-    private Scope createScope(Scope scopeAdmin, String scopeName, String loc, String version) throws MalformedURLException, InvalidSyntaxException, BundleException, IOException {
-        ScopeUpdate su = scopeAdmin.newScopeUpdate();
+    private Scope createScope(Scope scope, String scopeName, String loc, String version) throws MalformedURLException, InvalidSyntaxException, BundleException, IOException {
+        ScopeUpdate su = scope.newScopeUpdate();
         
         ScopeUpdate childScopeUpdate = su.newChild(scopeName);
         su.getChildren().add(childScopeUpdate);

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/ScopeSecurityTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/ScopeSecurityTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/ScopeSecurityTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/ScopeSecurityTest.java Mon Jun 30 16:54:57 2014
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
@@ -34,17 +34,17 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.aries.itest.AbstractIntegrationTest;
 import org.apache.aries.subsystem.example.helloIsolation.HelloIsolation;
 import org.apache.aries.subsystem.scope.InstallInfo;
 import org.apache.aries.subsystem.scope.Scope;
 import org.apache.aries.subsystem.scope.ScopeUpdate;
 import org.apache.aries.subsystem.scope.SharePolicy;
 import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.Ignore;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Filter;
@@ -59,9 +59,8 @@ import org.osgi.service.condpermadmin.Co
 import org.osgi.service.permissionadmin.PermissionInfo;
 import org.osgi.util.tracker.BundleTracker;
 
-
-@RunWith(JUnit4TestRunner.class)
-public class ScopeSecurityTest extends AbstractIntegrationTest {
+@Ignore
+public class ScopeSecurityTest extends AbstractTest {
 
     /* Use @Before not @BeforeClass so as to ensure that these resources
      * are created in the paxweb temp directory, and not in the svn tree 
@@ -91,12 +90,7 @@ public class ScopeSecurityTest extends A
     
     //@Test
     public void testScopeSecurityWithServiceIsolation() throws Exception {
-        // make sure we are using a framework that provides composite admin service
-        Scope scopeAdmin = getOsgiService(Scope.class);
-        assertNotNull("scope admin should not be null", scopeAdmin);
-        System.out.println("able to get scope admin service");
-       
-        ScopeUpdate su = scopeAdmin.newScopeUpdate();
+        ScopeUpdate su = scope.newScopeUpdate();
         
         ScopeUpdate childScopeUpdate = su.newChild("scope_test1");
         
@@ -139,7 +133,7 @@ public class ScopeSecurityTest extends A
         // test bundle service find hook
         //ServiceReference sr = bundleContext.getServiceReference(HelloIsolation.class.getName());
         //assertNull("sr should be null", sr);
-        Collection<Scope> children = scopeAdmin.getChildren();
+        Collection<Scope> children = scope.getChildren();
         assertEquals(1, children.size());
         
         for (Scope child : children) {
@@ -171,18 +165,18 @@ public class ScopeSecurityTest extends A
         bundleContext.installBundle("org.apache.felix.fileinstall-rootScope", url.openStream());
         
         // remove child scope
-        su = scopeAdmin.newScopeUpdate();
+        su = scope.newScopeUpdate();
         Collection<ScopeUpdate> scopes = su.getChildren();
         
         // obtain child scope admin from service registry
 //        String filter = "ScopeName=scope_test1";
         Scope childScopeAdmin = childScopeUpdate.getScope();
-        assertEquals(scopeAdmin, childScopeAdmin.getParent());
+        assertEquals(scope, childScopeAdmin.getParent());
         scopes.remove(childScopeUpdate);
         su.commit();
         
-        assertFalse(scopeAdmin.getChildren().contains(childScopeAdmin));
-        su = scopeAdmin.newScopeUpdate();
+        assertFalse(scope.getChildren().contains(childScopeAdmin));
+        su = scope.newScopeUpdate();
         assertFalse(su.getChildren().contains(childScopeUpdate));
         
 //        childScopeAdmin = null;
@@ -204,7 +198,7 @@ public class ScopeSecurityTest extends A
         Bundle[] bundles = bundleContext.getBundles();
         
         for (Bundle b : bundles) {
-            // set up condition permission for scopeAdmin
+            // set up condition permission for scope
             if (b.getSymbolicName().indexOf("subsystem.scope.impl") > -1) {
                 ServiceReference permRef = bundleContext.getServiceReference(ConditionalPermissionAdmin.class.getName());
 
@@ -223,12 +217,7 @@ public class ScopeSecurityTest extends A
             
         }
         
-        // make sure we are using a framework that provides composite admin service
-        Scope scopeAdmin = getOsgiService(Scope.class);
-        assertNotNull("scope admin should not be null", scopeAdmin);
-        System.out.println("able to get scope admin service");
-        
-        ScopeUpdate su = scopeAdmin.newScopeUpdate();
+        ScopeUpdate su = scope.newScopeUpdate();
         
         ScopeUpdate childScopeUpdate = su.newChild("scope_test1");
         
@@ -293,7 +282,7 @@ public class ScopeSecurityTest extends A
         // test bundle service find hook
         //ServiceReference sr = bundleContext.getServiceReference(HelloIsolation.class.getName());
         //assertNull("sr should be null", sr);
-        Collection<Scope> children = scopeAdmin.getChildren();
+        Collection<Scope> children = scope.getChildren();
         assertEquals(1, children.size());
         
         for (Scope child : children) {
@@ -327,18 +316,18 @@ public class ScopeSecurityTest extends A
         bundleContext.installBundle("org.apache.felix.fileinstall-rootScope", url.openStream());
         
         // remove child scope
-        su = scopeAdmin.newScopeUpdate();
+        su = scope.newScopeUpdate();
         Collection<ScopeUpdate> scopes = su.getChildren();
         
         // obtain child scope admin from service registry
 //        String filter = "ScopeName=scope_test1";
         Scope childScopeAdmin = childScopeUpdate.getScope();
-        assertEquals(scopeAdmin, childScopeAdmin.getParent());
+        assertEquals(scope, childScopeAdmin.getParent());
         scopes.remove(childScopeUpdate);
         su.commit();
         
-        assertFalse(scopeAdmin.getChildren().contains(childScopeAdmin));
-        su = scopeAdmin.newScopeUpdate();
+        assertFalse(scope.getChildren().contains(childScopeAdmin));
+        su = scope.newScopeUpdate();
         assertFalse(su.getChildren().contains(childScopeUpdate));
         
 //        childScopeAdmin = null;
@@ -352,20 +341,10 @@ public class ScopeSecurityTest extends A
     }
     
    
-    @org.ops4j.pax.exam.junit.Configuration
-    public static Option[] configuration() {
-        Option[] options = options(
-            // Log
-            mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
-            mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
-            // Felix Config Admin
-            mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
-            // Felix mvn url handler
-            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"),
+    @Configuration
+    public Option[] configuration() {
+        return options(
+        	baseOptions(),
 
             // Bundles
             mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
@@ -375,19 +354,12 @@ public class ScopeSecurityTest extends A
             mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
             mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.api"),
             mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.scope.api"),
-            mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.scope.impl"),
+            mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.scope.impl")
 
             // uncomment the following line if you want to turn on security.  the policy file can be found in src/test/resources dir and you want to update the value of -Djava.security.policy to 
             // the exact location of the policy file.
             //org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Declipse.security=osgi -Djava.security.policy=/policy"),
-            //org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -Declipse.security=osgi -Djava.security.policy=/policy"),
-
-            PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),
-
-            equinox().version("3.7.0.v20110221")
         );
-        options = updateOptions(options);
-        return options;
     }
 
    

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/ServiceVisibilityTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/ServiceVisibilityTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/ServiceVisibilityTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/ServiceVisibilityTest.java Mon Jun 30 16:54:57 2014
@@ -9,8 +9,6 @@ import java.net.URL;
 import org.apache.aries.subsystem.scope.InstallInfo;
 import org.apache.aries.subsystem.scope.ScopeUpdate;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
 
@@ -19,7 +17,6 @@ import org.osgi.framework.ServiceReferen
  * same scope. The one exception is the system bundle, whose services may be 
  * seen by all bundles regardless of scope.
  */
-@RunWith(JUnit4TestRunner.class)
 public class ServiceVisibilityTest extends AbstractTest {
 	/**
 	 * Install a bundle registering a service into the same scope as this one. 

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/SharePolicyTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/SharePolicyTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/SharePolicyTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/SharePolicyTest.java Mon Jun 30 16:54:57 2014
@@ -10,12 +10,9 @@ import java.util.Arrays;
 import org.apache.aries.subsystem.scope.InstallInfo;
 import org.apache.aries.subsystem.scope.ScopeUpdate;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.wiring.FrameworkWiring;
 
-@RunWith(JUnit4TestRunner.class)
 public class SharePolicyTest extends AbstractTest {
 	/**
 	 * Bundle tb5

Modified: aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/UninstallBundleTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/UninstallBundleTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/UninstallBundleTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-scope-itests/src/test/java/org/apache/aries/subsystem/scope/itests/UninstallBundleTest.java Mon Jun 30 16:54:57 2014
@@ -11,15 +11,12 @@ import org.apache.aries.subsystem.scope.
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.Bundle;
 
 /**
  * Tests whether or not a bundle can be successfully uninstalled from a scope.
  * The root scope is used for this test.
  */
-@RunWith(JUnit4TestRunner.class)
 public class UninstallBundleTest extends AbstractTest {
 	private Bundle bundle;
 	private String location;
@@ -37,7 +34,6 @@ public class UninstallBundleTest extends
 	
 	@Before
 	public void before0() throws Exception {
-		super.before();
 		location = getBundleLocation("tb-2.jar");
 		bundle = bundleContext.getBundle(location);
 		assertNull("The bundle should not exist", bundle);
@@ -50,6 +46,5 @@ public class UninstallBundleTest extends
 	@After
 	public void after0() throws Exception {
 		uninstallQuietly(bundle);
-		super.after();
 	}
 }

Modified: aries/branches/subsystemsR6/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/testsupport/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/testsupport/pom.xml (original)
+++ aries/branches/subsystemsR6/testsupport/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,3 +1,4 @@
+<?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
@@ -18,20 +19,20 @@
 -->
 <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.testsupport</groupId>
     <artifactId>testsupport</artifactId>
     <name>Apache Aries Test Support</name>
     <packaging>pom</packaging>
     <version>1.0.1-SNAPSHOT</version>
-
     <description>
         Test Support for OSGi - reactor pom
     </description>

Modified: aries/branches/subsystemsR6/testsupport/testsupport-unit/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/testsupport/testsupport-unit/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/testsupport/testsupport-unit/pom.xml (original)
+++ aries/branches/subsystemsR6/testsupport/testsupport-unit/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,48 +1,50 @@
-
-  <!--
-    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.
-  -->
+<?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.
+-->
 <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 />
-  </parent>
-
-  <groupId>org.apache.aries.testsupport</groupId>
-  <artifactId>org.apache.aries.testsupport.unit</artifactId>
-  <packaging>bundle</packaging>
-  <name>Apache Aries Unit Test Support</name>
-  <version>1.0.1-SNAPSHOT</version>
-  <description>
-      This bundle provides unit test support.
-  </description>
-
-  <scm>
-     <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/testsupport/testsupport-unit</connection>
-     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/testsupport/testsupport-unit</developerConnection>
-     <url>http://svn.apache.org/viewvc/aries/trunk/testsupport/testsupport-unit</url>
-  </scm>
+    <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.aries.testsupport</groupId>
+    <artifactId>org.apache.aries.testsupport.unit</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache Aries Unit Test Support</name>
+    <version>2.0.0-SNAPSHOT</version>
+    <description>
+        This bundle provides unit test support.
+    </description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/testsupport/testsupport-unit</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/testsupport/testsupport-unit</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/testsupport/testsupport-unit</url>
+    </scm>
 
     <properties>
         <!-- Export package versions are maintained in packageinfo files -->
-
         <aries.osgi.export.pkg>
             org.apache.aries.unittest.fixture,
             org.apache.aries.mocks,
@@ -51,41 +53,39 @@
             org.apache.aries.unittest.junit,
             org.apache.aries.itest
         </aries.osgi.export.pkg>
-        <aries.osgi.private.pkg />
+        <aries.osgi.private.pkg/>
         <!-- Don't import org.ops4j.pax.exam.container.def because it is only used for setup -->
         <aries.osgi.import.pkg>
-          org.ops4j.pax.exam.container.def*;resolution:=optional,
-          *
+            org.ops4j.pax.exam.container.def*;resolution:=optional,
+            *
         </aries.osgi.import.pkg>
     </properties>
 
-   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  <!-- Dependent projects need OSGi in the classpath before the pax bundles
-         or risk an "java.lang.NoClassDefFoundError: org.osgi.vendor.framework
-         property not set" error. Use default scope to propagate OSGi as
-         a transitive dependency to other projects. -->
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <scope>provided</scope>      
-    </dependency>
-    <dependency>
-        <groupId>org.ops4j.pax.exam</groupId>
-        <artifactId>pax-exam</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.ops4j.pax.exam</groupId>
-        <artifactId>pax-exam-container-default</artifactId>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Dependent projects need OSGi in the classpath before the pax bundles
+               or risk an "java.lang.NoClassDefFoundError: org.osgi.vendor.framework
+               property not set" error. Use default scope to propagate OSGi as
+               a transitive dependency to other projects. -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+        </dependency>
+    </dependencies>
 
 </project>

Modified: aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java (original)
+++ aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/AbstractIntegrationTest.java Mon Jun 30 16:54:57 2014
@@ -18,8 +18,11 @@
  */
 package org.apache.aries.itest;
 
-import org.ops4j.pax.exam.Inject;
+import javax.inject.Inject;
+
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
 
 /**
  * Base class for Pax Exam 1.2.x based unit tests
@@ -38,4 +41,40 @@ public abstract class AbstractIntegratio
     public RichBundleContext context() {
         return new RichBundleContext(bundleContext);
     }
+    
+    public String getLocalRepo() {
+    	String localRepo = System.getProperty("maven.repo.local");
+    	if (localRepo == null) {
+    		localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository");
+    	}
+    	return localRepo;
+    }
+    
+	
+	/**
+	 * Help to diagnose bundles that did not start
+	 * 
+	 * @throws BundleException
+	 */
+	public void showBundles() throws BundleException {
+		Bundle[] bundles = bundleContext.getBundles();
+		for (Bundle bundle : bundles) {
+			System.out.println(bundle.getBundleId() + ":" + bundle.getSymbolicName() + ":" + bundle.getVersion() + ":" + bundle.getState());
+		}
+	}
+	
+	/**
+	 * Helps to diagnose bundles that are not resolved as it will throw a detailed exception
+	 * 
+	 * @throws BundleException
+	 */
+	public void resolveBundles() throws BundleException {
+		Bundle[] bundles = bundleContext.getBundles();
+		for (Bundle bundle : bundles) {
+			if (bundle.getState() == Bundle.INSTALLED) {
+				System.out.println("Found non resolved bundle " + bundle.getBundleId() + ":" + bundle.getSymbolicName() + ":" + bundle.getVersion());
+				bundle.start();
+			}
+		}
+	}
 }

Modified: aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/RichBundleContext.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/RichBundleContext.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/RichBundleContext.java (original)
+++ aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/RichBundleContext.java Mon Jun 30 16:54:57 2014
@@ -20,6 +20,7 @@ package org.apache.aries.itest;
 
 import java.io.File;
 import java.io.InputStream;
+import java.util.Collection;
 import java.util.Dictionary;
 
 import org.osgi.framework.Bundle;
@@ -38,31 +39,30 @@ import org.osgi.util.tracker.ServiceTrac
 
 /**
  * {@link BundleContext} wrapper that adds a couple of additional utilities
- * @author vmahrwald
  *
  */
 public class RichBundleContext implements BundleContext {
     public static final long DEFAULT_TIMEOUT = 15000;
-    
+
     private final BundleContext delegate;
 
     public RichBundleContext(BundleContext delegate) {
         this.delegate = delegate;
     }
-    
+
 
     public <T> T getService(Class<T> type) {
         return getService(type, null, DEFAULT_TIMEOUT);
     }
-    
+
     public <T> T getService(Class<T> type, long timeout) {
         return getService(type, null, timeout);
     }
-    
+
     public <T> T getService(Class<T> type, String filter) {
         return getService(type, filter, DEFAULT_TIMEOUT);
     }
-    
+
     public <T> T getService(Class<T> type, String filter, long timeout) {
         ServiceTracker tracker = null;
         try {
@@ -79,10 +79,10 @@ public class RichBundleContext implement
             Filter osgiFilter = FrameworkUtil.createFilter(flt);
             tracker = new ServiceTracker(delegate, osgiFilter, null);
             tracker.open();
-            
+
             Object svc = type.cast(tracker.waitForService(timeout));
             if (svc == null) {
-                System.out.println("Could not obtain a service in time, service-ref="+ 
+                System.out.println("Could not obtain a service in time, service-ref="+
                   tracker.getServiceReference()+
                   ", time="+System.currentTimeMillis());
                 throw new RuntimeException("Gave up waiting for service " + flt);
@@ -95,7 +95,7 @@ public class RichBundleContext implement
         }
     }
 
-    
+
     public Bundle getBundleByName(String symbolicName) {
         for (Bundle b : delegate.getBundles()) {
             if (b.getSymbolicName().equals(symbolicName)) {
@@ -105,12 +105,6 @@ public class RichBundleContext implement
         return null;
     }
 
-    
-    
-    /*
-     * Delegate methods
-     */
-    
     public String getProperty(String key) {
         return delegate.getProperty(key);
     }
@@ -119,6 +113,8 @@ public class RichBundleContext implement
         return delegate.getBundle();
     }
 
+    public Bundle getBundle(String filter) { return delegate.getBundle(filter); }
+
     public Bundle installBundle(String location, InputStream input)
             throws BundleException {
         return delegate.installBundle(location, input);
@@ -165,21 +161,31 @@ public class RichBundleContext implement
         delegate.removeFrameworkListener(listener);
     }
 
+    @SuppressWarnings("rawtypes")
     public ServiceRegistration registerService(String[] clazzes,
             Object service, Dictionary properties) {
         return delegate.registerService(clazzes, service, properties);
     }
 
+    @SuppressWarnings("rawtypes")
     public ServiceRegistration registerService(String clazz, Object service,
             Dictionary properties) {
         return delegate.registerService(clazz, service, properties);
     }
 
+    public ServiceRegistration registerService(Class clazz, Object service, Dictionary props) {
+        return delegate.registerService(clazz, service, props);
+    }
+
     public ServiceReference[] getServiceReferences(String clazz, String filter)
             throws InvalidSyntaxException {
         return delegate.getServiceReferences(clazz, filter);
     }
 
+    public Collection getServiceReferences(Class clazz, String filter) throws InvalidSyntaxException {
+        return delegate.getServiceReferences(clazz, filter);
+    }
+
     public ServiceReference[] getAllServiceReferences(String clazz,
             String filter) throws InvalidSyntaxException {
         return delegate.getAllServiceReferences(clazz, filter);
@@ -189,6 +195,8 @@ public class RichBundleContext implement
         return delegate.getServiceReference(clazz);
     }
 
+    public ServiceReference getServiceReference(Class clazz) { return delegate.getServiceReference(clazz); }
+
     public Object getService(ServiceReference reference) {
         return delegate.getService(reference);
     }

Modified: aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/packageinfo
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/packageinfo?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/packageinfo (original)
+++ aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/itest/packageinfo Mon Jun 30 16:54:57 2014
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-version 1.0.0
+version 2.0.0

Modified: aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/BundleMock.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/BundleMock.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/BundleMock.java (original)
+++ aries/branches/subsystemsR6/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/BundleMock.java Mon Jun 30 16:54:57 2014
@@ -395,7 +395,7 @@ public class BundleMock
   {
     ServiceReference[] result = null;
     try { 
-      result = bc.getServiceReferences(null, null);
+      result = bc.getServiceReferences((String) null, null);
     } catch (InvalidSyntaxException isx) { 
       // no-op: Swallow exception
     }

Modified: aries/branches/subsystemsR6/transaction/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/transaction/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/transaction/pom.xml (original)
+++ aries/branches/subsystemsR6/transaction/pom.xml Mon Jun 30 16:54:57 2014
@@ -19,14 +19,15 @@
 -->
 <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.transaction</groupId>
     <artifactId>transaction</artifactId>
     <packaging>pom</packaging>

Modified: aries/branches/subsystemsR6/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/transaction/transaction-blueprint/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/transaction/transaction-blueprint/pom.xml (original)
+++ aries/branches/subsystemsR6/transaction/transaction-blueprint/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,29 +1,33 @@
 <?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.transaction</groupId>
     <artifactId>org.apache.aries.transaction.blueprint</artifactId>
     <packaging>bundle</packaging>
@@ -32,14 +36,12 @@
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-blueprint</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-blueprint
-        </developerConnection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-blueprint</developerConnection>
         <url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint</url>
     </scm>
 
     <properties>
         <!-- Export package versions are maintained in packageinfo files -->
-
         <aries.osgi.export.pkg>
             org.apache.aries.transaction.exception,
             org.apache.aries.transaction.annotations
@@ -48,13 +50,13 @@
             org.apache.aries.transaction,
             org.apache.aries.transaction.parsing
         </aries.osgi.private.pkg>
+        <lastReleaseVersion>1.0.1</lastReleaseVersion>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>4.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -101,7 +103,6 @@
             <plugin>
                 <groupId>org.apache.aries.versioning</groupId>
                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <version>0.1.0</version>
                 <executions>
                     <execution>
                         <id>default-verify</id>
@@ -109,9 +110,6 @@
                         <goals>
                             <goal>version-check</goal>
                         </goals>
-                        <configuration>
-                            <oldArtifact>org.apache.aries.transaction:org.apache.aries.transaction.blueprint:1.0.1</oldArtifact>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>



Mime
View raw message