[jboss-svn-commits] JBL Code SVN: r36759 - in labs/jbosstm/trunk: ArjunaCore/tsmx/jmxbrowser and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Feb 26 10:10:29 EST 2011
Author: tomjenkinson
Date: 2011-02-26 10:10:27 -0500 (Sat, 26 Feb 2011)
New Revision: 36759
Modified:
labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/ArjunaCore/tsmx/jmxbrowser/pom.xml
labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser/pom.xml
labs/jbosstm/trunk/ArjunaCore/tsmx/perfgraph/pom.xml
labs/jbosstm/trunk/ArjunaCore/tsmx/tools/pom.xml
labs/jbosstm/trunk/ArjunaJTA/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
Log:
JBTM-574 updated to bring closer in to line with existing build
Modified: labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml 2011-02-25 21:45:40 UTC (rev 36758)
+++ labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml 2011-02-26 15:10:27 UTC (rev 36759)
@@ -112,6 +112,7 @@
<exclude>org.jboss.jbossts:osbv-defaults</exclude>
<exclude>org.jboss.jbossts:tsmx-perfgraph</exclude>
<exclude>org.jboss.jbossts:txoj</exclude>
+ <exclude>junit:junit</exclude>
</excludes>
<outputDirectory>lib/ext</outputDirectory>
<unpack>false</unpack>
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/jmxbrowser/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/jmxbrowser/pom.xml 2011-02-25 21:45:40 UTC (rev 36758)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/jmxbrowser/pom.xml 2011-02-26 15:10:27 UTC (rev 36759)
@@ -48,6 +48,8 @@
<configuration>
<includes>
<include>com/arjuna/ats/tools/jmxbrowser/**</include>
+ <include>**/*.properties</include>
+ <include>**/*.gif</include>
</includes>
</configuration>
</plugin>
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser/pom.xml 2011-02-25 21:45:40 UTC (rev 36758)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser/pom.xml 2011-02-26 15:10:27 UTC (rev 36759)
@@ -53,6 +53,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>
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/perfgraph/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/perfgraph/pom.xml 2011-02-25 21:45:40 UTC (rev 36758)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/perfgraph/pom.xml 2011-02-26 15:10:27 UTC (rev 36759)
@@ -48,6 +48,8 @@
<configuration>
<includes>
<include>com/arjuna/ats/tools/perfgraph/**</include>
+ <include>**/*.properties</include>
+ <include>**/*.gif</include>
</includes>
</configuration>
</plugin>
@@ -59,6 +61,11 @@
<artifactId>jfreechart</artifactId>
<version>1.0.2</version>
</dependency>
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jcommon</artifactId>
+ <version>1.0.2</version>
+ </dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
<artifactId>tsmx-tools</artifactId>
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/tools/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/tools/pom.xml 2011-02-25 21:45:40 UTC (rev 36758)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/tools/pom.xml 2011-02-26 15:10:27 UTC (rev 36759)
@@ -53,7 +53,6 @@
<configuration>
<includes>
<include>com/arjuna/ats/tools/toolsframework/**</include>
- <include>com/arjuna/ats/tsmx/**</include>
</includes>
</configuration>
</plugin>
@@ -62,7 +61,8 @@
<configuration>
<includes>
<include>com/arjuna/ats/tools/toolsframework/**</include>
- <include>com/arjuna/ats/tsmx/**</include>
+ <include>**/*.properties</include>
+ <include>**/*.gif</include>
</includes>
</configuration>
</plugin>
Modified: labs/jbosstm/trunk/ArjunaJTA/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/dist/src/main/assembly/bin.xml 2011-02-25 21:45:40 UTC (rev 36758)
+++ labs/jbosstm/trunk/ArjunaJTA/dist/src/main/assembly/bin.xml 2011-02-26 15:10:27 UTC (rev 36759)
@@ -125,6 +125,7 @@
<exclude>org.jboss.jbossts:jta</exclude>
<exclude>org.jboss.jbossts:jdbc</exclude>
<exclude>org.jboss.jbossts:tsmx-jta-objectstorebrowser</exclude>
+ <exclude>junit:junit</exclude>
</excludes>
<outputDirectory>lib/ext</outputDirectory>
<unpack>false</unpack>
Modified: labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml 2011-02-25 21:45:40 UTC (rev 36758)
+++ labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml 2011-02-26 15:10:27 UTC (rev 36759)
@@ -150,6 +150,7 @@
<exclude>org.jboss.jbossts:tsmx-jts-objectstorebrowser</exclude>
<exclude>org.jboss.jbossts:jbossts-tools</exclude>
<exclude>org.jboss.jbossts:jbossts-jopr-plugin</exclude>
+ <exclude>junit:junit</exclude>
</excludes>
<outputDirectory>lib/ext</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
Modified: labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml 2011-02-25 21:45:40 UTC (rev 36758)
+++ labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml 2011-02-26 15:10:27 UTC (rev 36759)
@@ -27,6 +27,21 @@
<build>
<sourceDirectory>../../atsintegration</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <arjuna-scm-revision>${buildScmBranch} (revision: ${buildNumber})</arjuna-scm-revision>
+ <arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
+ <arjuna-builder>JBoss Inc. [${user.name}] ${os.name} ${os.version} ${buildproperty.date}</arjuna-builder>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
More information about the jboss-svn-commits
mailing list