[jboss-svn-commits] JBL Code SVN: r36760 - in labs/jbosstm/trunk: ArjunaJTA/tsmx and 3 other directories.

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

Author: tomjenkinson
Date: 2011-02-26 11:46:35 -0500 (Sat, 26 Feb 2011)
New Revision: 36760

Modified:
   labs/jbosstm/trunk/ArjunaCore/tsmx/tools/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/tsmx/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/tsmx/pom.xml
Log:
JBTM-574 updated to make sure the properties and gifs make it into the jar

Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/tools/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/tools/pom.xml	2011-02-26 15:10:27 UTC (rev 36759)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/tools/pom.xml	2011-02-26 16:46:35 UTC (rev 36760)
@@ -53,6 +53,7 @@
 				<configuration>
 					<includes>
 						<include>com/arjuna/ats/tools/toolsframework/**</include>
+						<include>com/arjuna/ats/tsmx/**</include>
 					</includes>
 				</configuration>
 			</plugin>
@@ -61,6 +62,7 @@
 				<configuration>
 					<includes>
 						<include>com/arjuna/ats/tools/toolsframework/**</include>
+						<include>com/arjuna/ats/tsmx/**</include>
 						<include>**/*.properties</include>
 						<include>**/*.gif</include>
 					</includes>

Modified: labs/jbosstm/trunk/ArjunaJTA/tsmx/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx/pom.xml	2011-02-26 15:10:27 UTC (rev 36759)
+++ labs/jbosstm/trunk/ArjunaJTA/tsmx/pom.xml	2011-02-26 16:46:35 UTC (rev 36760)
@@ -51,6 +51,8 @@
 				<configuration>
 					<includes>
 						<include>com/arjuna/ats/tools/objectstorebrowser/**</include>
+						<include>**/*.properties</include>
+						<include>**/*.gif</include>
 					</includes>
 					<!-- TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO 
 						A TYPO <excludes> <exclude>com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/**</exclude> 

Modified: labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml	2011-02-26 15:10:27 UTC (rev 36759)
+++ labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml	2011-02-26 16:46:35 UTC (rev 36760)
@@ -29,6 +29,24 @@
 		<sourceDirectory>../../atsintegration</sourceDirectory>
 		<plugins>
 			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
+				<version>1.0-beta-4</version>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<doCheck>true</doCheck>
+					<doUpdate>false</doUpdate>
+					<scmBranchPropertyName>buildScmBranch</scmBranchPropertyName>
+				</configuration>
+			</plugin>
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>

Modified: labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml	2011-02-26 15:10:27 UTC (rev 36759)
+++ labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml	2011-02-26 16:46:35 UTC (rev 36760)
@@ -96,7 +96,8 @@
 								<source>../../ArjunaJTA/jdbc/classes</source>
 								<source>../orbportability/classes</source>
 								<source>../jts/classes</source>
-								<source>../jtax/bin</source>
+								<source>../jts/services/classes</source>
+								<source>../jtax/classes</source>
 							</sources>
 						</configuration>
 					</execution>
@@ -105,9 +106,10 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<excludes>
-						<exclude>**/*.*</exclude>
-					</excludes>
+					<includes>
+						<include>com/arjuna/ats/jts/services/**/*.java</include>
+						<include>com/arjuna/ats/internal/tsmx/**/*.java</include>
+					</includes>
 				</configuration>
 				<executions>
 					<execution>
@@ -149,6 +151,29 @@
 									<include>org.jboss.jbossts:jtax</include>
 								</includes>
 							</artifactSet>
+<filters>
+  <filter>
+    <artifact>org.jboss.jbossts:tsmx-jmxbrowser</artifact>
+    <excludes>
+      <exclude>**/tools.properties</exclude>
+      <exclude>**/*.gif</exclude>
+    </excludes>
+  </filter>
+  <filter>
+    <artifact>org.jboss.jbossts:tsmx-perfgraph</artifact>
+    <excludes>
+      <exclude>**/tools.properties</exclude>
+      <exclude>**/*.gif</exclude>
+    </excludes>
+  </filter>
+  <filter>
+    <artifact>org.jboss.jbossts:tsmx-tools</artifact>
+    <excludes>
+      <exclude>**/tools.properties</exclude>
+      <exclude>**/*.gif</exclude>
+    </excludes>
+  </filter>
+</filters>
 						</configuration>
 					</execution>
 				</executions>
@@ -205,6 +230,11 @@
 			<groupId>org.jboss.jbossts</groupId>
 			<artifactId>jtax</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>tanukisoft</groupId>
+			<artifactId>wrapper</artifactId>
+			<version>3.2.3</version>
+		</dependency>
 	</dependencies>
 
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/tsmx/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/tsmx/pom.xml	2011-02-26 15:10:27 UTC (rev 36759)
+++ labs/jbosstm/trunk/ArjunaJTS/tsmx/pom.xml	2011-02-26 16:46:35 UTC (rev 36760)
@@ -51,6 +51,8 @@
 				<configuration>
 					<includes>
 						<include>com/arjuna/ats/tools/objectstorebrowser/**</include>
+						<include>**/*.properties</include>
+						<include>**/*.gif</include>
 					</includes>
 					<!-- TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO 
 						A TYPO <excludes> <exclude>com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/**</exclude>