You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by mn...@apache.org on 2012/06/29 15:00:28 UTC

svn commit: r1355350 - in /aries/trunk/subsystem: org.apache.aries.subsystem.itest.interfaces/ subsystem-itests-api-bundle/pom.xml subsystem-itests-api-bundle/src/ subsystem-itests/pom.xml

Author: mnuttall
Date: Fri Jun 29 13:00:27 2012
New Revision: 1355350

URL: http://svn.apache.org/viewvc?rev=1355350&view=rev
Log:
Aries-865: patching up svn disaster

Added:
    aries/trunk/subsystem/subsystem-itests-api-bundle/pom.xml
      - copied unchanged from r1355346, aries/trunk/subsystem/org.apache.aries.subsystem.itest.interfaces/pom.xml
    aries/trunk/subsystem/subsystem-itests-api-bundle/src/
      - copied from r1355346, aries/trunk/subsystem/org.apache.aries.subsystem.itest.interfaces/src/
Removed:
    aries/trunk/subsystem/org.apache.aries.subsystem.itest.interfaces/
Modified:
    aries/trunk/subsystem/subsystem-itests/pom.xml

Modified: aries/trunk/subsystem/subsystem-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/pom.xml?rev=1355350&r1=1355349&r2=1355350&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-itests/pom.xml Fri Jun 29 13:00:27 2012
@@ -242,6 +242,14 @@
             <artifactId>pax-url-mvn</artifactId>
             <scope>test</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.aries.subsystem</groupId>
+            <artifactId>org.apache.aries.subsystem.itest.interfaces</artifactId>
+            <version>0.1-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        
     </dependencies>
     <build>
         <plugins>
@@ -359,6 +367,31 @@
 						</configuration>
 						<phase>process-test-classes</phase>
 					</execution>
+					
+					<!-- New pom for hello 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>src/test/resources/hello</outputDirectory>
+							<finalName>helloImpl</finalName>
+						</configuration>
+						<phase>process-test-classes</phase>
+					</execution>
+					
+					<!-- End of new pom for hello tests, part 1 -->
+					
+					
 				</executions>
 			</plugin>
 			<plugin>
@@ -402,6 +435,24 @@
 							</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>
+					
+					<!-- End of new pom for hello tests, part 2 -->
+					
 				</executions>
 			</plugin>
             <plugin>