aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tjwat...@apache.org
Subject svn commit: r1606837 [21/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-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/pom.xml (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,21 +1,31 @@
-<!-- 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">
+<?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>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>
@@ -27,13 +37,36 @@
         and subsystem-sample for the subsystem to be tested.
     </description>
 
+    <properties>
+        <exam.version>3.4.0</exam.version>
+        <url.version>1.6.0</url.version>
+    </properties>
+
     <dependencies>
-    	<dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>6.0.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>5.0.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.enterprise</artifactId>
+            <version>5.0.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-    	<dependency>
+        <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
             <scope>test</scope>
@@ -45,7 +78,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-    	<dependency>
+        <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.api</artifactId>
             <scope>test</scope>
@@ -62,10 +95,10 @@
             <artifactId>org.apache.aries.application.modeller</artifactId>
             <version>1.0.0</version>
             <exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
+                <exclusion>
+                    <groupId>org.osgi</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -80,19 +113,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
-    	<dependency>
-			<groupId>org.apache.aries.blueprint</groupId>
-			<artifactId>org.apache.aries.blueprint</artifactId>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint</artifactId>
             <version>1.0.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.aries.proxy</groupId>
-			<artifactId>org.apache.aries.proxy</artifactId>
-            <version>1.0.1</version>
-			<scope>test</scope>
-		</dependency>
-    	<dependency>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy</artifactId>
+            <version>1.0.2-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.aries.subsystem</groupId>
             <artifactId>org.apache.aries.subsystem.api</artifactId>
             <scope>test</scope>
@@ -109,11 +142,11 @@
             <artifactId>org.apache.aries.subsystem.core</artifactId>
             <scope>test</scope>
             <version>1.0.1-SNAPSHOT</version>
-			<exclusions>
-            	<exclusion>
-            		<groupId>org.osgi</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.osgi</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -126,17 +159,7 @@
             <groupId>org.apache.aries.testsupport</groupId>
             <artifactId>org.apache.aries.testsupport.unit</artifactId>
             <scope>test</scope>
-            <version>1.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-                <exclusion>
-                	<groupId>org.ops4j.pax.runner</groupId>
-            		<artifactId>pax-runner-no-jcl</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -149,9 +172,9 @@
                     <artifactId>org.osgi.core</artifactId>
                 </exclusion>
                 <exclusion>
-            		<groupId>org.apache.felix</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -165,29 +188,10 @@
                     <artifactId>org.osgi.core</artifactId>
                 </exclusion>
                 <exclusion>
-            		<groupId>org.apache.felix</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.compendium</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-        	<groupId>org.apache.felix</groupId>
-        	<artifactId>org.apache.felix.resolver</artifactId>
-        	<version>0.1.0-SNAPSHOT</version>
-        	<exclusions>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
+                    <groupId>org.apache.felix</groupId>
                     <artifactId>org.osgi.core</artifactId>
                 </exclusion>
                 <exclusion>
-            		<groupId>org.apache.felix</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
-                <exclusion>
                     <groupId>org.osgi</groupId>
                     <artifactId>org.osgi.compendium</artifactId>
                 </exclusion>
@@ -204,9 +208,9 @@
                     <artifactId>org.osgi.core</artifactId>
                 </exclusion>
                 <exclusion>
-            		<groupId>org.apache.felix</groupId>
-            		<artifactId>org.osgi.core</artifactId>
-            	</exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.osgi</groupId>
                     <artifactId>org.osgi.compendium</artifactId>
@@ -214,418 +218,433 @@
             </exclusions>
         </dependency>
         <dependency>
-        	<groupId>org.easymock</groupId>
-        	<artifactId>easymock</artifactId>
-        	<version>3.0</version>
-        	<scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>3.0</version>
             <scope>test</scope>
-            <version>6.0.0</version>
         </dependency>
-    	<dependency>
+        <dependency>
             <groupId>org.eclipse.equinox</groupId>
             <artifactId>org.eclipse.equinox.event</artifactId>
             <scope>test</scope>
             <version>1.2.200.v20120522-2049</version>
         </dependency>
+
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.enterprise</artifactId>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-all</artifactId>
+            <version>5.0.3</version>
             <scope>test</scope>
-            <version>5.0.0</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</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-container-default</artifactId>
+            <artifactId>pax-exam-container-native</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit</artifactId>
+            <artifactId>pax-exam-junit4</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-link-mvn</artifactId>
+            <version>${exam.version}</version>
             <scope>test</scope>
         </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.runner</groupId>
-            <artifactId>pax-runner-no-jcl</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>0.9.29</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-mvn</artifactId>
+            <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>org.eclipse</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>3.10.0.v20140606-1445</version>
+        </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.ow2.asm</groupId>
-            <artifactId>asm-all</artifactId>
-            <version>4.0</version>
-			<scope>test</scope>
-		</dependency>
-        
     </dependencies>
+
     <build>
         <plugins>
-        	<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3</version>
-				<executions>
-					<execution>
-						<id>core-fragment</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<archive>
-								<manifestFile>src/test/bundles/core.fragment/META-INF/MANIFEST.MF</manifestFile>
-							</archive>
-							<excludes>
-								<exclude>**/*</exclude>
-							</excludes>
-							<classesDirectory>${project.build.directory}/test-classes</classesDirectory>
-							<outputDirectory>${project.build.directory}/test-classes/core.fragment</outputDirectory>
-							<finalName>core.fragment</finalName>
-						</configuration>
-						<phase>process-test-classes</phase>
-					</execution>
-					<execution>
-						<id>tb1-application1</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<archive>
-								<manifestFile>src/test/bundles/tb1/META-INF/MANIFEST.MF</manifestFile>
-							</archive>
-							<excludes>
-								<exclude>**/*</exclude>
-							</excludes>
-							<classesDirectory>${project.build.directory}/test-classes</classesDirectory>
-							<outputDirectory>${project.build.directory}/test-classes/application1</outputDirectory>
-							<finalName>tb1</finalName>
-						</configuration>
-						<phase>process-test-classes</phase>
-					</execution>
-					<execution>
-						<id>tb1-feature1</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<archive>
-								<manifestFile>src/test/bundles/tb1/META-INF/MANIFEST.MF</manifestFile>
-							</archive>
-							<classesDirectory>${project.build.directory}/test-classes</classesDirectory>
-							<includes>
-								<include>org/apache/aries/subsystem/itests/tb1/**</include>
-							</includes>
-							<outputDirectory>${project.build.directory}/test-classes/feature1</outputDirectory>
-							<finalName>tb1</finalName>
-						</configuration>
-						<phase>process-test-classes</phase>
-					</execution>
-					<execution>
-						<id>tb2-feature2</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<archive>
-								<manifestFile>src/test/bundles/tb2/META-INF/MANIFEST.MF</manifestFile>
-							</archive>
-							<classesDirectory>${project.build.directory}/test-classes</classesDirectory>
-							<includes>
-								<include>org/apache/aries/subsystem/itests/tb2/**</include>
-								<include>org/apache/aries/subsystem/itests/tb3/**</include>
-							</includes>
-							<outputDirectory>${project.build.directory}/test-classes/feature2</outputDirectory>
-							<finalName>tb2</finalName>
-						</configuration>
-						<phase>process-test-classes</phase>
-					</execution>
-					<execution>
-						<id>tb3-feature1</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<archive>
-								<manifestFile>src/test/bundles/tb3/META-INF/MANIFEST.MF</manifestFile>
-							</archive>
-							<classesDirectory>${project.build.directory}/test-classes</classesDirectory>
-							<includes>
-								<include>org/apache/aries/subsystem/itests/tb3/**</include>
-							</includes>
-							<outputDirectory>${project.build.directory}/test-classes/feature1</outputDirectory>
-							<finalName>tb3</finalName>
-						</configuration>
-						<phase>process-test-classes</phase>
-					</execution>
-					<execution>
-						<id>tb3-feature2</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<archive>
-								<manifestFile>src/test/bundles/tb3/META-INF/MANIFEST.MF</manifestFile>
-							</archive>
-							<classesDirectory>${project.build.directory}/test-classes</classesDirectory>
-							<includes>
-								<include>org/apache/aries/subsystem/itests/tb3/**</include>
-							</includes>
-							<outputDirectory>${project.build.directory}/test-classes/feature2</outputDirectory>
-							<finalName>tb3</finalName>
-						</configuration>
-						<phase>process-test-classes</phase>
-					</execution>
-					<execution>
-						<id>tb3-feature3</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<archive>
-								<manifestFile>src/test/bundles/tb3/META-INF/MANIFEST.MF</manifestFile>
-							</archive>
-							<classesDirectory>${project.build.directory}/test-classes</classesDirectory>
-							<includes>
-								<include>org/apache/aries/subsystem/itests/tb3/**</include>
-							</includes>
-							<outputDirectory>${project.build.directory}/test-classes/feature3</outputDirectory>
-							<finalName>tb3</finalName>
-						</configuration>
-						<phase>process-test-classes</phase>
-					</execution>
-					
-					<!-- New pom for hello + related tests, part 1 -->
-					
-					<execution>
-						<id>hello-impl</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<archive>
-								<manifestFile>src/test/bundles/helloImpl/META-INF/MANIFEST.MF</manifestFile>
-							</archive>
-							<classesDirectory>${project.build.directory}/test-classes</classesDirectory>
-							<includes>
-								<include>org/apache/aries/subsystem/itests/hello/impl/**</include>
-							</includes>
-							<outputDirectory>${project.build.directory}/test-classes/hello</outputDirectory>
-							<finalName>helloImpl</finalName>
-						</configuration>
-						<phase>process-test-classes</phase>
-					</execution>
-					
-					<execution>
-						<id>dynamic-import-impl</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<archive>
-								<manifestFile>src/test/bundles/dynamicImport/META-INF/MANIFEST.MF</manifestFile>
-							</archive>
-							<classesDirectory>${project.build.directory}/test-classes</classesDirectory>
-							<includes>
-								<include>org/apache/aries/subsystem/itests/dynamicImport/**</include>
-							</includes>
-							<outputDirectory>${project.build.directory}/test-classes/dynamicImport</outputDirectory>
-							<finalName>dynamicImport</finalName>
-						</configuration>
-						<phase>process-test-classes</phase>
-					</execution>
-					
-					<!-- End of new pom for hello tests, part 1 -->
-					
-					<execution>
-						<id>basic-blueprint-application</id>
-						<goals>
-						  <goal>jar</goal>
-						</goals>
-						<configuration>
-						  <archive>
-						    <manifestFile>src/test/bundles/blueprint/META-INF/MANIFEST.MF</manifestFile>
-						  </archive>
-						  <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
-						  <includes>
-						    <include>org/apache/aries/subsystem/itests/blueprint/**</include>
-						    <include>OSGI-INF/blueprint/blueprint.xml</include>
-						  </includes>
-						  <outputDirectory>${project.build.directory}/test-classes/blueprint</outputDirectory>
-						  <finalName>blueprint</finalName>
-						</configuration>
-						<phase>process-test-classes</phase>
-					</execution>
-					
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.5</version>
-				<executions>
-					<execution>
-						<id>core-fragment</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>src/test/bundles/core.fragment</source>
-							</sources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>add-source-tb1</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>src/test/bundles/tb1</source>
-							</sources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>add-source-tb2</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>src/test/bundles/tb2</source>
-							</sources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>add-source-tb3</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>src/test/bundles/tb3</source>
-							</sources>
-						</configuration>
-					</execution>
-					
-					<!-- New pom for hello tests, part 2 -->
-						
-					<execution>
-						<id>add-source-helloImpl</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>src/test/bundles/helloImpl</source>
-							</sources>
-						</configuration>
-					</execution>
-					
-					<execution>
-						<id>add-source-dynamicImport</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>src/test/bundles/dynamicImport</source>
-							</sources>
-						</configuration>
-					</execution>
-					
-					<!-- End of new pom for hello tests, part 2 -->
-					
-					<execution>
-						<id>add-source-blueprint</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>src/test/bundles/blueprint</source>
-							</sources>
-						</configuration>
-					</execution>
-					
-					<execution>
-						<id>add-source-classes</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>src/test/classes</source>
-							</sources>
-						</configuration>
-					</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>
-                    </includes>
-                </configuration>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3</version>
+                <executions>
+                    <execution>
+                        <id>core-fragment</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifestFile>src/test/bundles/core.fragment/META-INF/MANIFEST.MF</manifestFile>
+                            </archive>
+                            <excludes>
+                                <exclude>**/*</exclude>
+                            </excludes>
+                            <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+                            <outputDirectory>${project.build.directory}/test-classes/core.fragment</outputDirectory>
+                            <finalName>core.fragment</finalName>
+                        </configuration>
+                        <phase>process-test-classes</phase>
+                    </execution>
+                    <execution>
+                        <id>tb1-application1</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifestFile>src/test/bundles/tb1/META-INF/MANIFEST.MF</manifestFile>
+                            </archive>
+                            <excludes>
+                                <exclude>**/*</exclude>
+                            </excludes>
+                            <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+                            <outputDirectory>${project.build.directory}/test-classes/application1</outputDirectory>
+                            <finalName>tb1</finalName>
+                        </configuration>
+                        <phase>process-test-classes</phase>
+                    </execution>
+                    <execution>
+                        <id>tb1-feature1</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifestFile>src/test/bundles/tb1/META-INF/MANIFEST.MF</manifestFile>
+                            </archive>
+                            <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+                            <includes>
+                                <include>org/apache/aries/subsystem/itests/tb1/**</include>
+                            </includes>
+                            <outputDirectory>${project.build.directory}/test-classes/feature1</outputDirectory>
+                            <finalName>tb1</finalName>
+                        </configuration>
+                        <phase>process-test-classes</phase>
+                    </execution>
+                    <execution>
+                        <id>tb2-feature2</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifestFile>src/test/bundles/tb2/META-INF/MANIFEST.MF</manifestFile>
+                            </archive>
+                            <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+                            <includes>
+                                <include>org/apache/aries/subsystem/itests/tb2/**</include>
+                                <include>org/apache/aries/subsystem/itests/tb3/**</include>
+                            </includes>
+                            <outputDirectory>${project.build.directory}/test-classes/feature2</outputDirectory>
+                            <finalName>tb2</finalName>
+                        </configuration>
+                        <phase>process-test-classes</phase>
+                    </execution>
+                    <execution>
+                        <id>tb3-feature1</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifestFile>src/test/bundles/tb3/META-INF/MANIFEST.MF</manifestFile>
+                            </archive>
+                            <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+                            <includes>
+                                <include>org/apache/aries/subsystem/itests/tb3/**</include>
+                            </includes>
+                            <outputDirectory>${project.build.directory}/test-classes/feature1</outputDirectory>
+                            <finalName>tb3</finalName>
+                        </configuration>
+                        <phase>process-test-classes</phase>
+                    </execution>
+                    <execution>
+                        <id>tb3-feature2</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifestFile>src/test/bundles/tb3/META-INF/MANIFEST.MF</manifestFile>
+                            </archive>
+                            <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+                            <includes>
+                                <include>org/apache/aries/subsystem/itests/tb3/**</include>
+                            </includes>
+                            <outputDirectory>${project.build.directory}/test-classes/feature2</outputDirectory>
+                            <finalName>tb3</finalName>
+                        </configuration>
+                        <phase>process-test-classes</phase>
+                    </execution>
+                    <execution>
+                        <id>tb3-feature3</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifestFile>src/test/bundles/tb3/META-INF/MANIFEST.MF</manifestFile>
+                            </archive>
+                            <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+                            <includes>
+                                <include>org/apache/aries/subsystem/itests/tb3/**</include>
+                            </includes>
+                            <outputDirectory>${project.build.directory}/test-classes/feature3</outputDirectory>
+                            <finalName>tb3</finalName>
+                        </configuration>
+                        <phase>process-test-classes</phase>
+                    </execution>
+
+                    <!-- New pom for hello + related tests, part 1 -->
+
+                    <execution>
+                        <id>hello-impl</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifestFile>src/test/bundles/helloImpl/META-INF/MANIFEST.MF</manifestFile>
+                            </archive>
+                            <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+                            <includes>
+                                <include>org/apache/aries/subsystem/itests/hello/impl/**</include>
+                            </includes>
+                            <outputDirectory>${project.build.directory}/test-classes/hello</outputDirectory>
+                            <finalName>helloImpl</finalName>
+                        </configuration>
+                        <phase>process-test-classes</phase>
+                    </execution>
+
+                    <execution>
+                        <id>dynamic-import-impl</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifestFile>src/test/bundles/dynamicImport/META-INF/MANIFEST.MF</manifestFile>
+                            </archive>
+                            <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+                            <includes>
+                                <include>org/apache/aries/subsystem/itests/dynamicImport/**</include>
+                            </includes>
+                            <outputDirectory>${project.build.directory}/test-classes/dynamicImport</outputDirectory>
+                            <finalName>dynamicImport</finalName>
+                        </configuration>
+                        <phase>process-test-classes</phase>
+                    </execution>
+
+                    <!-- End of new pom for hello tests, part 1 -->
+
+                    <execution>
+                        <id>basic-blueprint-application</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifestFile>src/test/bundles/blueprint/META-INF/MANIFEST.MF</manifestFile>
+                            </archive>
+                            <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+                            <includes>
+                                <include>org/apache/aries/subsystem/itests/blueprint/**</include>
+                                <include>OSGI-INF/blueprint/blueprint.xml</include>
+                            </includes>
+                            <outputDirectory>${project.build.directory}/test-classes/blueprint</outputDirectory>
+                            <finalName>blueprint</finalName>
+                        </configuration>
+                        <phase>process-test-classes</phase>
+                    </execution>
+
+                </executions>
             </plugin>
             <plugin>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>maven-paxexam-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.5</version>
                 <executions>
                     <execution>
-                        <id>generate-config</id>
+                        <id>core-fragment</id>
+                        <phase>generate-sources</phase>
                         <goals>
-                            <goal>generate-depends-file</goal>
-                            <goal>generate-config</goal>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/bundles/core.fragment</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add-source-tb1</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
                         </goals>
                         <configuration>
-                            <outputFile>${project.build.directory}/test-classes/META-INF/maven/dependencies.properties</outputFile>
+                            <sources>
+                                <source>src/test/bundles/tb1</source>
+                            </sources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>add-source-tb2</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/bundles/tb2</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add-source-tb3</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/bundles/tb3</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+
+                    <!-- New pom for hello tests, part 2 -->
+
+                    <execution>
+                        <id>add-source-helloImpl</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/bundles/helloImpl</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>add-source-dynamicImport</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/bundles/dynamicImport</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+
+                    <!-- End of new pom for hello tests, part 2 -->
+
+                    <execution>
+                        <id>add-source-blueprint</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/bundles/blueprint</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>add-source-classes</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/classes</source>
+                            </sources>
+                        </configuration>
+                    </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>
 

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependencyTestBase.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependencyTestBase.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependencyTestBase.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependencyTestBase.java Mon Jun 30 16:54:57 2014
@@ -7,16 +7,14 @@ import static org.junit.Assert.fail;
 import static org.osgi.framework.namespace.BundleNamespace.BUNDLE_NAMESPACE;
 import static org.osgi.framework.namespace.PackageNamespace.PACKAGE_NAMESPACE;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
+import org.apache.aries.subsystem.itests.Header;
 import org.apache.aries.subsystem.itests.SubsystemTest;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -54,7 +52,7 @@ import org.osgi.service.subsystem.Subsys
 	  - Bundle E
  */
 
-@RunWith(MavenConfiguredJUnit4TestRunner.class)
+@ExamReactorStrategy(PerMethod.class)
 public abstract class SubsystemDependencyTestBase extends SubsystemTest 
 {
 	protected static String BUNDLE_A = "sdt_bundle.a.jar";
@@ -65,95 +63,69 @@ public abstract class SubsystemDependenc
 	protected static String BUNDLE_F = "sdt_bundle.f.jar";
 	protected static String BUNDLE_G = "sdt_bundle.g.jar";
 
-	private static boolean _staticResourcesCreated = false;
-	@Before
-	public void setUp() throws Exception
-	{
-		super.setUp();
-		
+	@Override
+	protected void createApplications() throws Exception {
 		// We'd like to do this in an @BeforeClass method, but files written in @BeforeClass
 		// go into the project's target/ directory whereas those written in @Before go into 
 		// paxexam's temp directory, which is where they're needed. 
-		if (!_staticResourcesCreated) { 
-			createBundleA();
-			createBundleB();
-			createBundleC();
-			createBundleD();
-			createBundleE();
-			createBundleF();
-			createBundleG();
-			_staticResourcesCreated = true;
-		}
+		createBundleA();
+		createBundleB();
+		createBundleC();
+		createBundleD();
+		createBundleE();
+		createBundleF();
+		createBundleG();
 	}
 	
-	private static void createBundleA() throws Exception
+	private void createBundleA() throws Exception
 	{ 
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.BUNDLE_VERSION, "1.0.0");
-		headers.put(Constants.EXPORT_PACKAGE, "x");
-		createBundle(BUNDLE_A, headers);
-	}
-	
-	private static void createBundleB() throws Exception
-	{
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.BUNDLE_VERSION, "1.0.0");
-		headers.put(Constants.PROVIDE_CAPABILITY, "y;y=randomNamespace"); // TODO: see comment below about bug=true
-		createBundle(BUNDLE_B, headers);
-	}
-	
-	private static void createBundleC() throws Exception
-	{
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.BUNDLE_VERSION, "1.0.0");
-		headers.put(Constants.IMPORT_PACKAGE, "x");
-		createBundle(BUNDLE_C, headers);
-	}
-	
-	private static void createBundleD() throws Exception
-	{
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.BUNDLE_VERSION, "1.0.0");
-		headers.put(Constants.REQUIRE_BUNDLE, BUNDLE_A);
-		createBundle(BUNDLE_D, headers);
-	}
-	
-	private static void createBundleE() throws Exception 
-	{
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.BUNDLE_VERSION, "1.0.0");
-		headers.put(Constants.REQUIRE_CAPABILITY, "y");
-		// TODO:
-		/*
-		 * According to the OSGi Core Release 5 spec section 3.3.6 page 35, 
-		 *   "A filter is optional, if no filter directive is specified the requirement always matches."
-		 *  
-		 * If omitted, we first get an NPE in DependencyCalculator.MissingCapability.initializeAttributes(). 
-		 * If that's fixed, we get exceptions of the form, 
-		 * 
-		 *  Caused by: java.lang.IllegalArgumentException: The filter must not be null.
-		 *    at org.eclipse.equinox.internal.region.StandardRegionFilterBuilder.allow(StandardRegionFilterBuilder.java:49)
-		 *    at org.apache.aries.subsystem.core.internal.SubsystemResource.setImportIsolationPolicy(SubsystemResource.java:655)
-	     * 
-	     * This looks to be an Equinox defect - at least in the level of 3.8.0 currently being used by these tests. 
-		 */
-		createBundle(BUNDLE_E, headers);
+		createBundle(name(BUNDLE_A), version("1.0.0"), exportPackage("x"));
+	}
+	
+	private void createBundleB() throws Exception
+	{
+		// TODO: see comment below about bug=true
+		createBundle(name(BUNDLE_B), version("1.0.0"), new Header(Constants.PROVIDE_CAPABILITY, "y;y=randomNamespace"));
+	}
+	
+	private void createBundleC() throws Exception
+	{
+		createBundle(name(BUNDLE_C), version("1.0.0"), importPackage("x"));
+	}
+	
+	private void createBundleD() throws Exception
+	{
+		createBundle(name(BUNDLE_D), version("1.0.0"), requireBundle(BUNDLE_A));
+	}
+
+	// TODO:
+	/*
+	 * According to the OSGi Core Release 5 spec section 3.3.6 page 35, 
+	 *   "A filter is optional, if no filter directive is specified the requirement always matches."
+	 *  
+	 * If omitted, we first get an NPE in DependencyCalculator.MissingCapability.initializeAttributes(). 
+	 * If that's fixed, we get exceptions of the form, 
+	 * 
+	 *  Caused by: java.lang.IllegalArgumentException: The filter must not be null.
+	 *    at org.eclipse.equinox.internal.region.StandardRegionFilterBuilder.allow(StandardRegionFilterBuilder.java:49)
+	 *    at org.apache.aries.subsystem.core.internal.SubsystemResource.setImportIsolationPolicy(SubsystemResource.java:655)
+     * 
+     * This looks to be an Equinox defect - at least in the level of 3.8.0 currently being used by these tests. 
+	 */
+	private void createBundleE() throws Exception 
+	{
+		createBundle(name(BUNDLE_E), version("1.0.0"), new Header(Constants.REQUIRE_CAPABILITY, "y"));
 	}
 
-	private static void createBundleF() throws Exception 
+	private void createBundleF() throws Exception 
 	{
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.BUNDLE_VERSION, "1.0.0");
-		headers.put(Constants.EXPORT_PACKAGE, "x");
-		createBundle(BUNDLE_F, headers);
+		createBundle(name(BUNDLE_F), version("1.0.0"), exportPackage("x"));
 	}
 	
-	private static void createBundleG() throws Exception 
+	// TODO: see comment above about bug=true
+	private void createBundleG() throws Exception 
 	{
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.BUNDLE_VERSION, "1.0.0");
-		headers.put(Constants.PROVIDE_CAPABILITY, "y;y=randomNamespace");      // TODO: see comment above about bug=true
-		createBundle(BUNDLE_G, headers);
+		createBundle(name(BUNDLE_G), version("1.0.0"), new Header(Constants.PROVIDE_CAPABILITY, "y;y=randomNamespace"));
 	}
 	
 	protected void registerRepositoryR1() throws Exception
@@ -188,10 +160,10 @@ public abstract class SubsystemDependenc
 	 */
 	protected void verifySinglePackageWiring (Subsystem s, String wiredBundleName, String expectedPackage, String expectedProvidingBundle)
 	{
-		Bundle wiredBundle = getBundle(s, wiredBundleName);
+		Bundle wiredBundle = context(s).getBundleByName(wiredBundleName);
 		assertNotNull ("Bundle not found", wiredBundleName);
 
-		BundleWiring wiring = wiredBundle.adapt(BundleWiring.class);
+		BundleWiring wiring = (BundleWiring) wiredBundle.adapt(BundleWiring.class);
 		List<BundleWire> wiredPackages = wiring.getRequiredWires(PACKAGE_NAMESPACE);
 		assertEquals ("Only one package expected", 1, wiredPackages.size());
 		
@@ -212,10 +184,10 @@ public abstract class SubsystemDependenc
 	 */
 	protected void verifyRequireBundleWiring (Subsystem s, String wiredBundleName, String expectedProvidingBundleName)
 	{
-		Bundle wiredBundle = getBundle(s, BUNDLE_D);
+		Bundle wiredBundle = context(s).getBundleByName(BUNDLE_D);
 		assertNotNull ("Target bundle " + wiredBundleName + " not found", wiredBundle);
 	
-		BundleWiring wiring = wiredBundle.adapt(BundleWiring.class);
+		BundleWiring wiring = (BundleWiring) wiredBundle.adapt(BundleWiring.class);
 		List<BundleWire> wiredBundles = wiring.getRequiredWires(BUNDLE_NAMESPACE);
 		assertEquals ("Only one bundle expected", 1, wiredBundles.size());
 	
@@ -238,10 +210,10 @@ public abstract class SubsystemDependenc
 	protected void verifyCapabilityWiring (Subsystem s, String wiredBundleName, 
 			String namespace, String expectedProvidingBundleName)
 	{
-		Bundle wiredBundle = getBundle(s, wiredBundleName);
+		Bundle wiredBundle = context(s).getBundleByName(wiredBundleName);
 		assertNotNull ("Targt bundle " + wiredBundleName + " not found", wiredBundleName);
 		
-		BundleWiring wiring = wiredBundle.adapt(BundleWiring.class);
+		BundleWiring wiring = (BundleWiring) wiredBundle.adapt(BundleWiring.class);
 		List<BundleWire> wiredProviders = wiring.getRequiredWires(namespace);
 		assertEquals("Only one wire for capability namespace " + namespace +" expected", 
 				1, wiredProviders.size());

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4ATest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4ATest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4ATest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4ATest.java Mon Jun 30 16:54:57 2014
@@ -5,7 +5,6 @@ import static org.junit.Assert.assertTru
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 import org.osgi.service.subsystem.Subsystem;
@@ -30,16 +29,11 @@ A) Test a transitively closed subsystem 
 public class SubsystemDependency_4ATest extends SubsystemDependencyTestBase 
 {
 	protected static String APPLICATION_A="sdt_application.a.esa";
-	private static boolean _testAppCreated = false;
 	
-	@Before
-	public void setUp() throws Exception
-	{
-		super.setUp();
-		if (!_testAppCreated) { 
-			createTestApplicationA();
-			_testAppCreated = true;
-		}
+	@Override
+	public void createApplications() throws Exception {
+		super.createApplications();
+		createTestApplicationA();
 		registerRepositoryR1();
 	}
 	

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4BTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4BTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4BTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4BTest.java Mon Jun 30 16:54:57 2014
@@ -30,16 +30,14 @@ public class SubsystemDependency_4BTest 
 
 	protected static String APPLICATION_B="sdt_application.b.esa";
 	
-	private static boolean appCreated = false;
+	@Override
+	public void createApplications() throws Exception {
+		super.createApplications();
+		createTestApplicationB();
+	}
 	
 	@Before
-	public void setUp() throws Exception
-	{ 
-		super.setUp();
-		if (!appCreated) { 
-			createTestApplicationB();
-			appCreated = true;
-		}
+	public void registerRepo() throws Exception {
 		registerRepositoryR2();
 	}
 	

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4CTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4CTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4CTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4CTest.java Mon Jun 30 16:54:57 2014
@@ -3,8 +3,9 @@ package org.apache.aries.subsystem.ctt.i
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Before;
 import org.junit.Test;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.service.subsystem.Subsystem;
@@ -21,25 +22,20 @@ C) Test with pre-installed transitive re
 - Verify no new bundles are installed into the Root or S1 subsystems
 */
 
+@ExamReactorStrategy(PerMethod.class)
 public class SubsystemDependency_4CTest extends SubsystemDependencyTestBase 
 {
 	private static final String SUBSYSTEM_S1 = "sdt_composite.s1.esa";
 	private static final String SUBSYSTEM_S2 = "sdt_composite.s2.esa";
-	private static boolean _testSubsystemCreated = false;
 	private Subsystem s1;
 	private Subsystem s2;
 	
-	@Before
-	public void setUp() throws Exception
-	{ 
-		super.setUp();
-		if (!_testSubsystemCreated) { 
-			createSubsystemS1();
-			createSubsystemS2();
-			_testSubsystemCreated = true;
-		}
+	@Override
+	protected void createApplications() throws Exception {
+		super.createApplications();
+		createSubsystemS1();
+		createSubsystemS2();
 		registerRepositoryR1();
-		
 	}
 	
 	// doing this within @Before doesn't work :(
@@ -55,8 +51,8 @@ public class SubsystemDependency_4CTest 
 	{
 		stopSubsystem(s2);
 		stopSubsystem(s1);
-		uninstallSubsystem(s2);
-		uninstallSubsystem(s1);
+		//uninstallSubsystem(s2);
+		//uninstallSubsystem(s1);
 	}
 	
 	// Using the subsystem S1, install a composite S2 that 
@@ -66,29 +62,15 @@ public class SubsystemDependency_4CTest 
     // - Verify the wiring of C, D and E wire to A->x, A, B->y respectively 
 
 	@Test
-	public void verifyCinS1WiresToAxInS2() throws Exception
+	public void verify() throws Exception
 	{
 		startSubsystems();
 		verifySinglePackageWiring (s2, BUNDLE_C, "x", BUNDLE_A);
-		stopSubsystems();
-	}
-	
-	@Test
-	public void verifyBundleDWiredToBundleA() throws Exception
-	{
-		startSubsystems();
 		verifyRequireBundleWiring (s2, BUNDLE_D, BUNDLE_A);
-		stopSubsystems();
-	}
-	
-	@Test
-	public void verifyBundleEWiredToCapability_yFromBundleB() throws Exception
-	{
-		startSubsystems();
 		verifyCapabilityWiring (s2, BUNDLE_E, "y", BUNDLE_B);
 		stopSubsystems();
 	}
-
+	
 	@Test
 	public void verifyNoUnexpectedBundlesProvisioned() throws Exception 
 	{ 

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4DTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4DTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4DTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4DTest.java Mon Jun 30 16:54:57 2014
@@ -5,7 +5,6 @@ import static org.junit.Assert.assertTru
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 import org.osgi.service.subsystem.Subsystem;
@@ -28,16 +27,12 @@ import org.osgi.service.subsystem.Subsys
 public class SubsystemDependency_4DTest extends SubsystemDependencyTestBase 
 {
 	private static final String SUBSYSTEM_4D = "sdt_application4d.esa";
-	private static boolean _testSubsystemCreated = false;
 	private Subsystem subsystem;
 	
-	@Before
-	public void setUp() throws Exception
-	{
-		super.setUp();
-		if (!_testSubsystemCreated) { 
-			createApplication4d();
-		}
+	@Override
+	public void createApplications() throws Exception {
+		super.createApplications();
+		createApplication4d();
 		registerRepositoryR2();
 	}
 	

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4E1Test.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4E1Test.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4E1Test.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4E1Test.java Mon Jun 30 16:54:57 2014
@@ -11,7 +11,6 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.Constants;
 import org.osgi.framework.namespace.IdentityNamespace;
@@ -42,18 +41,15 @@ public class SubsystemDependency_4E1Test
 	private static final String SUBSYSTEM_4E_S2_APP = "sdt_application4e_s2.esa";
 	private static final String SUBSYSTEM_4E_S2_COMP = "sdt_composite4e_s2.esa";
 	private static final String SUBSYSTEM_4E_S2_FEATURE = "sdt_feature4e_s2.esa";
-	private static boolean _testSubsystemsCreated = false;
 	
-	@Before
-	public void setUp() throws Exception
+	@Override
+	public void createApplications() throws Exception
 	{
-		super.setUp();
-		if (!_testSubsystemsCreated) { 
-			createComposite4E_S1();
-			createApplication4E_S2();
-			createComposite4E_S2();
-			createFeature4E_S2();
-		}
+		super.createApplications();
+		createComposite4E_S1();
+		createApplication4E_S2();
+		createComposite4E_S2();
+		createFeature4E_S2();
 		registerRepositoryR2();
 	}
 	

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4E2Test.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4E2Test.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4E2Test.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/ctt/itests/SubsystemDependency_4E2Test.java Mon Jun 30 16:54:57 2014
@@ -11,7 +11,6 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.Constants;
 import org.osgi.framework.namespace.IdentityNamespace;
@@ -53,22 +52,18 @@ import org.osgi.service.subsystem.Subsys
  */
 public class SubsystemDependency_4E2Test extends SubsystemDependencyTestBase 
 {
-	private static final boolean _testSubsystemsCreated = false;
 	private static final String SUBSYSTEM_4E2_S1_COMP = "sdt_composite4e2_s1.esa";
 	private static final String SUBSYSTEM_4E2_S2_APP = "sdt_application4e2_s2.esa";
 	private static final String SUBSYSTEM_4E2_S2_COMP = "sdt_composite4e2_s2.esa";
 	private static final String SUBSYSTEM_4E2_S2_FEATURE = "sdt_feature4e2_s2.esa";
 	
-	@Before
-	public void setUp() throws Exception
-	{
-		super.setUp();
-		if (!_testSubsystemsCreated) { 
-			createComposite4E2_S1();
-			createApplication4E2_S2();
-			createComposite4E2_S2();
-			createFeature4E2_S2();
-		}
+	@Override
+	public void createApplications() throws Exception {
+		super.createApplications();
+		createComposite4E2_S1();
+		createApplication4E2_S2();
+		createComposite4E2_S2();
+		createFeature4E2_S2();
 		registerRepositoryR2();
 	}
 	

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ApplicationTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ApplicationTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ApplicationTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ApplicationTest.java Mon Jun 30 16:54:57 2014
@@ -33,8 +33,6 @@ import org.apache.aries.subsystem.itests
 import org.apache.aries.subsystem.itests.util.TestRepositoryContent;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
@@ -45,7 +43,6 @@ import org.osgi.service.repository.Repos
 import org.osgi.service.subsystem.Subsystem;
 import org.osgi.service.subsystem.SubsystemConstants;
 
-@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class ApplicationTest extends SubsystemTest {
 	/*
 	 * Subsystem-SymbolicName: application.a.esa
@@ -76,7 +73,7 @@ public class ApplicationTest extends Sub
 	private static boolean createdTestFiles;
 	
 	@Before
-	public static void createTestFiles() throws Exception {
+	public void createTestFiles() throws Exception {
 		if (createdTestFiles)
 			return;
 		createBundleA();
@@ -87,55 +84,47 @@ public class ApplicationTest extends Sub
 		createdTestFiles = true;
 	}
 	
-	private static void createBundleA() throws IOException {
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.REQUIRE_CAPABILITY, "foo; filter:=\"(foo=bar)\"");
-		createBundle(BUNDLE_A, "1.0.0", headers);
+	private void createBundleA() throws IOException {
+		createBundle(name(BUNDLE_A), version("1.0.0"),
+				new Header(Constants.REQUIRE_CAPABILITY, "foo; filter:=\"(foo=bar)\""));
 	}
 	
-	private static void createBundleB() throws IOException {
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.PROVIDE_CAPABILITY, "foo; foo=bar");
-		createBundle(BUNDLE_B, "1.0.0", headers);
+	private void createBundleB() throws IOException {
+		createBundle(name(BUNDLE_B), version("1.0.0"), 
+				new Header(Constants.PROVIDE_CAPABILITY, "foo; foo=bar"));
 	}
 	
-	private static void createBundleC() throws IOException {
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.REQUIRE_BUNDLE, BUNDLE_B);
-		createBundle(BUNDLE_C, "1.0.0", headers);
+	private void createBundleC() throws IOException {
+		createBundle(name(BUNDLE_C), version("1.0.0"), requireBundle(BUNDLE_B));
 	}
 	
-	private static void createApplicationA() throws IOException {
+	private void createApplicationA() throws IOException {
 		createApplicationAManifest();
 		createSubsystem(APPLICATION_A, BUNDLE_A);
 	}
 	
-	private static void createApplicationB() throws IOException {
+	private void createApplicationB() throws IOException {
 		createApplicationBManifest();
 		createSubsystem(APPLICATION_B, BUNDLE_C);
 	}
 	
-	private static void createApplicationAManifest() throws IOException {
+	private void createApplicationAManifest() throws IOException {
 		Map<String, String> attributes = new HashMap<String, String>();
 		attributes.put(SubsystemConstants.SUBSYSTEM_SYMBOLICNAME, APPLICATION_A);
 		attributes.put(SubsystemConstants.SUBSYSTEM_CONTENT, BUNDLE_A);
 		createManifest(APPLICATION_A + ".mf", attributes);
 	}
 	
-	private static void createApplicationBManifest() throws IOException {
+	private void createApplicationBManifest() throws IOException {
 		Map<String, String> attributes = new HashMap<String, String>();
 		attributes.put(SubsystemConstants.SUBSYSTEM_SYMBOLICNAME, APPLICATION_B);
 		attributes.put(SubsystemConstants.SUBSYSTEM_CONTENT, BUNDLE_C);
 		createManifest(APPLICATION_B + ".mf", attributes);
 	}
 	
-	@Before
-	public static void createApplications() throws Exception {
-		if (createdApplications) {
-			return;
-		}
-		createApplication("application1", new String[]{"tb1.jar"});
-		createdApplications = true;
+	@Override
+	public void createApplications() throws Exception {
+		createApplication("application1", "tb1.jar");
 	}
 	
 	public void setUp() throws Exception {

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/AriesSubsystemTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/AriesSubsystemTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/AriesSubsystemTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/AriesSubsystemTest.java Mon Jun 30 16:54:57 2014
@@ -18,10 +18,9 @@ import org.apache.aries.util.filesystem.
 import org.easymock.EasyMock;
 import org.eclipse.equinox.region.Region;
 import org.eclipse.equinox.region.RegionFilter;
-import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
 import org.osgi.framework.namespace.IdentityNamespace;
@@ -33,7 +32,7 @@ import org.osgi.service.subsystem.Subsys
 import org.osgi.service.subsystem.SubsystemConstants;
 import org.osgi.service.subsystem.SubsystemException;
 
-@RunWith(MavenConfiguredJUnit4TestRunner.class)
+@ExamReactorStrategy(PerMethod.class)
 public class AriesSubsystemTest extends SubsystemTest {
 	/*
 	 * Subsystem-SymbolicName: application.a.esa
@@ -61,46 +60,42 @@ public class AriesSubsystemTest extends 
 	 */
 	private static final String COMPOSITE_A = "composite.a.esa";
 	
-	private static void createApplicationA() throws IOException {
+	private void createApplicationA() throws IOException {
 		createApplicationAManifest();
 		createSubsystem(APPLICATION_A, BUNDLE_A);
 	}
 	
-	private static void createApplicationB() throws IOException {
+	private void createApplicationB() throws IOException {
 		createApplicationBManifest();
 		createSubsystem(APPLICATION_B, BUNDLE_B);
 	}
 	
-	private static void createApplicationAManifest() throws IOException {
+	private void createApplicationAManifest() throws IOException {
 		Map<String, String> attributes = new HashMap<String, String>();
 		attributes.put(SubsystemConstants.SUBSYSTEM_SYMBOLICNAME, APPLICATION_A);
 		createManifest(APPLICATION_A + ".mf", attributes);
 	}
 	
-	private static void createApplicationBManifest() throws IOException {
+	private void createApplicationBManifest() throws IOException {
 		Map<String, String> attributes = new HashMap<String, String>();
 		attributes.put(SubsystemConstants.SUBSYSTEM_SYMBOLICNAME, APPLICATION_B);
 		createManifest(APPLICATION_B + ".mf", attributes);
 	}
 	
-	private static void createBundleA() throws IOException {
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.IMPORT_PACKAGE, "org.osgi.framework,org.osgi.resource");
-		createBundle(BUNDLE_A, headers);
+	private void createBundleA() throws IOException {
+		createBundle(name(BUNDLE_A), importPackage("org.osgi.framework,org.osgi.resource"));
 	}
 	
-	private static void createBundleB() throws IOException {
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.IMPORT_PACKAGE, "org.osgi.resource");
-		createBundle(BUNDLE_B, headers);
+	private void createBundleB() throws IOException {
+		createBundle(name(BUNDLE_B), importPackage("org.osgi.resource"));
 	}
 	
-	private static void createCompositeA() throws IOException {
+	private void createCompositeA() throws IOException {
 		createCompositeAManifest();
 		createSubsystem(COMPOSITE_A, BUNDLE_B, APPLICATION_B);
 	}
 	
-	private static void createCompositeAManifest() throws IOException {
+	private void createCompositeAManifest() throws IOException {
 		Map<String, String> attributes = new HashMap<String, String>();
 		attributes.put(SubsystemConstants.SUBSYSTEM_SYMBOLICNAME, COMPOSITE_A);
 		attributes.put(SubsystemConstants.SUBSYSTEM_TYPE, SubsystemConstants.SUBSYSTEM_TYPE_COMPOSITE);
@@ -111,21 +106,13 @@ public class AriesSubsystemTest extends 
 		createManifest(COMPOSITE_A + ".mf", attributes);
 	}
 	
-	private static boolean createdTestFiles;
-	@Before
-	public static void createTestFiles() throws Exception {
-		if (createdTestFiles)
-			return;
+	@Override
+	public void createApplications() throws Exception {
 		createBundleA();
 		createBundleB();
 		createApplicationA();
 		createApplicationB();
 		createCompositeA();
-		createdTestFiles = true;
-	}
-	
-	public void setUp() throws Exception {
-		super.setUp();
 	}
 	
 	/*

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/AutostartTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/AutostartTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/AutostartTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/AutostartTest.java Mon Jun 30 16:54:57 2014
@@ -17,18 +17,13 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
 import org.osgi.framework.namespace.IdentityNamespace;
 import org.osgi.service.subsystem.Subsystem;
 import org.osgi.service.subsystem.SubsystemConstants;
 
-import aQute.lib.osgi.Constants;
-
-@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class AutostartTest extends SubsystemTest {
 	/*
 	 * Subsystem-SymbolicName: application.a.esa
@@ -95,36 +90,32 @@ public class AutostartTest extends Subsy
 		createManifest(APPLICATION_A + ".mf", attributes);
 	}
 	
-	private static void createApplicationB() throws IOException {
+	private void createApplicationB() throws IOException {
 		createApplicationBManifest();
 		createSubsystem(APPLICATION_B, BUNDLE_A, APPLICATION_A);
 	}
 	
-	private static void createApplicationBManifest() throws IOException {
+	private void createApplicationBManifest() throws IOException {
 		Map<String, String> attributes = new HashMap<String, String>();
 		attributes.put(SubsystemConstants.SUBSYSTEM_SYMBOLICNAME, APPLICATION_B);
 		attributes.put(SubsystemConstants.SUBSYSTEM_CONTENT, BUNDLE_A + ',' + APPLICATION_A + ';' + IdentityNamespace.CAPABILITY_TYPE_ATTRIBUTE + '=' + SubsystemConstants.SUBSYSTEM_TYPE_APPLICATION);
 		createManifest(APPLICATION_B + ".mf", attributes);
 	}
 	
-	private static void createBundleA() throws IOException {
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.EXPORT_PACKAGE, "x");
-		createBundle(BUNDLE_A, headers);
+	private void createBundleA() throws IOException {
+		createBundle(name(BUNDLE_A), exportPackage("x"));
 	}
 	
-	private static void createBundleB() throws IOException {
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put(Constants.IMPORT_PACKAGE, "x");
-		createBundle(BUNDLE_B, headers);
+	private void createBundleB() throws IOException {
+		createBundle(name(BUNDLE_B), importPackage("x"));
 	}
 	
-	private static void createCompositeA() throws IOException {
+	private void createCompositeA() throws IOException {
 		createCompositeAManifest();
 		createSubsystem(COMPOSITE_A, BUNDLE_A);
 	}
 	
-	private static void createCompositeAManifest() throws IOException {
+	private void createCompositeAManifest() throws IOException {
 		Map<String, String> attributes = new HashMap<String, String>();
 		attributes.put(SubsystemConstants.SUBSYSTEM_SYMBOLICNAME, COMPOSITE_A);
 		attributes.put(SubsystemConstants.SUBSYSTEM_TYPE, SubsystemConstants.SUBSYSTEM_TYPE_COMPOSITE);
@@ -186,12 +177,9 @@ public class AutostartTest extends Subsy
 		attributes.put(SubsystemConstants.SUBSYSTEM_CONTENT, BUNDLE_A + ',' + FEATURE_A + ';' + IdentityNamespace.CAPABILITY_TYPE_ATTRIBUTE + '=' + SubsystemConstants.SUBSYSTEM_TYPE_FEATURE);
 		createManifest(FEATURE_C + ".mf", attributes);
 	}
-	
-	private static boolean createdTestFiles;
-	@Before
-	public static void createTestFiles() throws Exception {
-		if (createdTestFiles)
-			return;
+
+	@Override
+	public void createApplications() throws Exception {
 		createBundleA();
 		createBundleB();
 		createApplicationA();
@@ -201,11 +189,6 @@ public class AutostartTest extends Subsy
 		createFeatureA();
 		createFeatureB();
 		createFeatureC();
-		createdTestFiles = true;
-	}
-	
-	public void setUp() throws Exception {
-		super.setUp();
 	}
 	
 	@Test

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BasicTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BasicTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BasicTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BasicTest.java Mon Jun 30 16:54:57 2014
@@ -21,27 +21,19 @@ package org.apache.aries.subsystem.itest
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.Version;
 import org.osgi.service.subsystem.Subsystem;
 import org.osgi.service.subsystem.SubsystemConstants;
 
-@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class BasicTest extends SubsystemTest {
 	
-	@Before
-	public static void createApplications() throws Exception {
-		if (createdApplications) {
-			return;
-		}
+	@Override
+	public void createApplications() throws Exception {
 		createApplication("emptyFeature", new String[]{});
 		createApplication("emptySubsystem", new String[]{});
-		createdApplications = true;
 	}
 	
 	/*
@@ -59,9 +51,9 @@ public class BasicTest extends Subsystem
     		}
     	}
     	assertTrue("Subsystems implementation bundle not found", found);
-    	ServiceReference<Subsystem> serviceReference = bundleContext.getServiceReference(Subsystem.class);
+    	ServiceReference serviceReference = bundleContext.getServiceReference(Subsystem.class);
     	assertNotNull("Reference to subsystem service not found", serviceReference);
-    	Subsystem subsystem = bundleContext.getService(serviceReference);
+    	Subsystem subsystem = (Subsystem) bundleContext.getService(serviceReference);
     	assertNotNull("Subsystem service not found", subsystem);
     }
     

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BlueprintTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BlueprintTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BlueprintTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BlueprintTest.java Mon Jun 30 16:54:57 2014
@@ -1,34 +1,21 @@
 package org.apache.aries.subsystem.itests;
 
 import static org.junit.Assert.assertEquals;
-import static org.ops4j.pax.exam.CoreOptions.options;
 
+import org.apache.aries.itest.RichBundleContext;
 import org.apache.aries.subsystem.itests.hello.api.Hello;
-import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.subsystem.Subsystem;
 
 /*
  * iTest for blueprint with subsystems
  */
-@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class BlueprintTest extends SubsystemTest 
 {
-	private static boolean _testAppCreated = false;
-	
-	@Before
-	public void setUp() throws Exception 
-	{
-		super.setUp();
-		if (!_testAppCreated) { 
-			createApplication("blueprint", new String[]{"blueprint.jar"});
-			_testAppCreated = true;
-		}
+	@Override
+	public void createApplications() throws Exception {
+		createApplication("blueprint", "blueprint.jar");
 	}
 
 	@Test
@@ -38,7 +25,7 @@ public class BlueprintTest extends Subsy
 		try { 
 			startSubsystem(subsystem);
 			BundleContext bc = subsystem.getBundleContext();
-			Hello h = getOsgiService(bc, Hello.class, null, DEFAULT_TIMEOUT);
+			Hello h = new RichBundleContext(bc).getService(Hello.class);
 			String message = h.saySomething();
 			assertEquals("Wrong message back", "messageFromBlueprint", message);
 		} finally { 
@@ -47,15 +34,4 @@ public class BlueprintTest extends Subsy
 		}
 	}
 	
-	@Configuration
-	public static Option[] extraBundles() 
-	{
-		return options(
-				mavenBundle("org.apache.aries.subsystem", "org.apache.aries.subsystem.itest.interfaces"),
-		        mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"), 
-		        mavenBundle("org.ow2.asm", "asm-all"),
-		        mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy")
-//				org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777")
-		);
-	}
 }

Modified: aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BundleEventHookTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BundleEventHookTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BundleEventHookTest.java (original)
+++ aries/branches/subsystemsR6/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/BundleEventHookTest.java Mon Jun 30 16:54:57 2014
@@ -31,10 +31,7 @@ import java.util.concurrent.TimeoutExcep
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.ServiceEvent;
@@ -42,7 +39,6 @@ import org.osgi.framework.ServiceListene
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.subsystem.Subsystem;
 
-@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class BundleEventHookTest extends SubsystemTest {
     /*
 	 * Bundle-SymbolicName: bundle.a.jar
@@ -53,22 +49,18 @@ public class BundleEventHookTest extends
 	 */
 	private static final String BUNDLE_B = "bundle.b.jar";
 	
-	@Before
-	public static void createApplications() throws Exception {
-		if (createdApplications) {
-			return;
-		}
+	@Override
+	public void createApplications() throws Exception {
 		createBundleA();
 		createBundleB();
-		createdApplications = true;
 	}
 	
-	private static void createBundleA() throws IOException {
-		createBundle(BUNDLE_A);
+	private void createBundleA() throws IOException {
+		createBundle(name(BUNDLE_A));
 	}
 	
-	private static void createBundleB() throws IOException {
-		createBundle(BUNDLE_B);
+	private void createBundleB() throws IOException {
+		createBundle(name(BUNDLE_B));
 	}
     
     /*
@@ -151,6 +143,7 @@ public class BundleEventHookTest extends
     	final AtomicReference<Bundle> a = new AtomicReference<Bundle>();
     	bundleContext.addServiceListener(
     			new ServiceListener() {
+					@SuppressWarnings("unchecked")
 					@Override
 					public void serviceChanged(ServiceEvent event) {
 						if ((event.getType() & (ServiceEvent.REGISTERED | ServiceEvent.MODIFIED)) == 0)
@@ -158,8 +151,8 @@ public class BundleEventHookTest extends
 						if (a.get() != null)
 							// We've been here before and already done what needs doing.
 							return;
-						ServiceReference<Subsystem> sr = (ServiceReference<Subsystem>)event.getServiceReference();
-						Subsystem s = bundleContext.getService(sr);
+						ServiceReference sr = (ServiceReference)event.getServiceReference();
+						bundleContext.getService(sr);
 						try {
 							// Queue up the installed event.
 							a.set(core.getBundleContext().installBundle(BUNDLE_A, new FileInputStream(BUNDLE_A)));
@@ -204,6 +197,7 @@ public class BundleEventHookTest extends
     	final AtomicReference<Bundle> a = new AtomicReference<Bundle>();
     	bundleContext.addServiceListener(
     			new ServiceListener() {
+					@SuppressWarnings("unchecked")
 					@Override
 					public void serviceChanged(ServiceEvent event) {
 						if ((event.getType() & (ServiceEvent.REGISTERED | ServiceEvent.MODIFIED)) == 0)
@@ -211,8 +205,8 @@ public class BundleEventHookTest extends
 						if (a.get() != null)
 							// We've been here before and already done what needs doing.
 							return;
-						ServiceReference<Subsystem> sr = (ServiceReference<Subsystem>)event.getServiceReference();
-						Subsystem s = bundleContext.getService(sr);
+						ServiceReference sr = (ServiceReference)event.getServiceReference();
+						bundleContext.getService(sr);
 						try {
 							// Queue up the installed event for bundle A using B's context.
 							a.set(b.getBundleContext().installBundle(BUNDLE_A, new FileInputStream(BUNDLE_A)));



Mime
View raw message