You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/10/26 18:12:20 UTC

svn commit: r1027618 - in /tuscany/sca-java-1.x/trunk/samples/implementation-pojo-extension: build.xml pom.xml src/test/assembly/ src/test/assembly/test.xml

Author: nash
Date: Tue Oct 26 16:12:20 2010
New Revision: 1027618

URL: http://svn.apache.org/viewvc?rev=1027618&view=rev
Log:
Merge r1023372 TUSCANY-3685: Add jar in binary distribution for test classes and resources

Added:
    tuscany/sca-java-1.x/trunk/samples/implementation-pojo-extension/src/test/assembly/
      - copied from r1023372, tuscany/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-pojo-extension/src/test/assembly/
    tuscany/sca-java-1.x/trunk/samples/implementation-pojo-extension/src/test/assembly/test.xml
      - copied unchanged from r1023372, tuscany/sca-java-1.x/branches/sca-java-1.6.1/samples/implementation-pojo-extension/src/test/assembly/test.xml
Modified:
    tuscany/sca-java-1.x/trunk/samples/implementation-pojo-extension/build.xml
    tuscany/sca-java-1.x/trunk/samples/implementation-pojo-extension/pom.xml

Modified: tuscany/sca-java-1.x/trunk/samples/implementation-pojo-extension/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/implementation-pojo-extension/build.xml?rev=1027618&r1=1027617&r2=1027618&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/implementation-pojo-extension/build.xml (original)
+++ tuscany/sca-java-1.x/trunk/samples/implementation-pojo-extension/build.xml Tue Oct 26 16:12:20 2010
@@ -51,6 +51,7 @@
             <fileset dir="src/test/resources"/>
         </copy>
         <jar destfile="target/sample-implementation-pojo-extension.jar" basedir="target/classes"/>
+        <jar destfile="target/sample-implementation-pojo-extension-test.jar" basedir="target/test-classes"/>
     </target>	
 
     <target name="package" depends="compile"/>
@@ -58,7 +59,7 @@
     <target name="run">
         <java classname="helloworld.HelloWorldTestClient" fork="true">
             <classpath>
-                <pathelement location="target/test-classes"/>
+                <pathelement location="target/sample-implementation-pojo-extension-test.jar"/>
                 <pathelement location="target/sample-implementation-pojo-extension.jar"/>
                 <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
             </classpath>

Modified: tuscany/sca-java-1.x/trunk/samples/implementation-pojo-extension/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/implementation-pojo-extension/pom.xml?rev=1027618&r1=1027617&r2=1027618&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/implementation-pojo-extension/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/samples/implementation-pojo-extension/pom.xml Tue Oct 26 16:12:20 2010
@@ -71,7 +71,29 @@
     </dependencies>
 
     <build>
-       <finalName>${artifactId}</finalName>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>test</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/test/assembly/test.xml</descriptor>
+                            </descriptors>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                            <finalName>${artifactId}</finalName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
 </project>