[jboss-svn-commits] JBL Code SVN: r36840 - in labs/jbosstm/trunk/XTS/sar: assembly and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tomjenkinson
Date: 2011-03-17 10:13:17 -0400 (Thu, 17 Mar 2011)
New Revision: 36840

Modified:
   labs/jbosstm/trunk/XTS/sar/assembly/sar.xml
   labs/jbosstm/trunk/XTS/sar/pom.xml
Log:
JBTM-574 updated to look more correct as the sar, missing wars though

Modified: labs/jbosstm/trunk/XTS/sar/assembly/sar.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/assembly/sar.xml	2011-03-17 12:02:38 UTC (rev 36839)
+++ labs/jbosstm/trunk/XTS/sar/assembly/sar.xml	2011-03-17 14:13:17 UTC (rev 36840)
@@ -22,6 +22,9 @@
 		<fileSet>
 			<directory>META-INF/</directory>
 			<outputDirectory>META-INF/</outputDirectory>
+			<includes>
+				<include>jboss-classloading.xml</include>
+			</includes>
 		</fileSet>
 	</fileSets>
 	<files>
@@ -30,6 +33,16 @@
 			<outputDirectory>/</outputDirectory>
 			<destName>service.jar</destName>
 		</file>
+		<file>
+			<source>META-INF/application${buildType}.xml</source>
+			<outputDirectory>META-INF/</outputDirectory>
+			<destName>application.xml</destName>
+		</file>
+		<file>
+			<source>META-INF/xts${buildType}-jboss-beans.xml</source>
+			<outputDirectory>META-INF/</outputDirectory>
+			<destName>xts-jboss-beans.xml</destName>
+		</file>
 	</files>
 	<dependencySets>
 		<dependencySet>

Modified: labs/jbosstm/trunk/XTS/sar/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
+++ labs/jbosstm/trunk/XTS/sar/pom.xml	2011-03-17 14:13:17 UTC (rev 36840)
@@ -24,23 +24,6 @@
         <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.6</version>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <configuration>
-                            <target>
-                                <copy file="META-INF/application11.xml" tofile="target/archive-tmp/foo"/>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.2</version>
@@ -146,4 +129,8 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
+    <properties>
+        <buildType>11</buildType>
+    </properties>
 </project>