[jboss-svn-commits] JBL Code SVN: r36737 - in labs/jbosstm/trunk: ArjunaCore/docs/ArjunaCore_Installation_And_Administration_Guide and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 25 03:41:11 EST 2011
Author: tomjenkinson
Date: 2011-02-25 03:41:11 -0500 (Fri, 25 Feb 2011)
New Revision: 36737
Modified:
labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/pom.xml
labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_And_Administration_Guide/pom.xml
labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Development_Guide/pom.xml
labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Installation_And_Administration_Guide/pom.xml
labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Development_Guide/pom.xml
labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Installation_And_Administration_Guide/pom.xml
labs/jbosstm/trunk/ArjunaJTS/pom.xml
labs/jbosstm/trunk/ArjunaJTS/trailmap/
labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml
labs/jbosstm/trunk/narayana-build-common/pom.xml
Log:
JBTM-574 add a skipPublican flag so that we don't need to build docs each time, also suppress the TS_EMMA_JAR enforcer
Modified: labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/pom.xml 2011-02-25 07:44:30 UTC (rev 36736)
+++ labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/pom.xml 2011-02-25 08:41:11 UTC (rev 36737)
@@ -30,18 +30,19 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
<executions>
<execution>
<phase>compile</phase>
<configuration>
- <tasks>
+ <target unless="skipPublican">
<exec dir="." executable="publican">
<arg value="build" />
<arg value="--langs=en-US" />
<arg value="--formats=pdf" />
<arg value="--config=publican-maven.cfg" />
</exec>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_And_Administration_Guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_And_Administration_Guide/pom.xml 2011-02-25 07:44:30 UTC (rev 36736)
+++ labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_And_Administration_Guide/pom.xml 2011-02-25 08:41:11 UTC (rev 36737)
@@ -30,18 +30,19 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
<executions>
<execution>
<phase>compile</phase>
<configuration>
- <tasks>
+ <target unless="skipPublican">
<exec dir="." executable="publican">
<arg value="build" />
<arg value="--langs=en-US" />
<arg value="--formats=pdf" />
<arg value="--config=publican-maven.cfg" />
</exec>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Development_Guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Development_Guide/pom.xml 2011-02-25 07:44:30 UTC (rev 36736)
+++ labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Development_Guide/pom.xml 2011-02-25 08:41:11 UTC (rev 36737)
@@ -31,18 +31,19 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
<executions>
<execution>
<phase>compile</phase>
<configuration>
- <tasks>
+ <target unless="skipPublican">
<exec dir="." executable="publican">
<arg value="build" />
<arg value="--langs=en-US" />
<arg value="--formats=pdf" />
<arg value="--config=publican-maven.cfg" />
</exec>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Installation_And_Administration_Guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Installation_And_Administration_Guide/pom.xml 2011-02-25 07:44:30 UTC (rev 36736)
+++ labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Installation_And_Administration_Guide/pom.xml 2011-02-25 08:41:11 UTC (rev 36737)
@@ -30,18 +30,19 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
<executions>
<execution>
<phase>compile</phase>
<configuration>
- <tasks>
+ <target unless="skipPublican">
<exec dir="." executable="publican">
<arg value="build" />
<arg value="--langs=en-US" />
<arg value="--formats=pdf" />
<arg value="--config=publican-maven.cfg" />
</exec>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml 2011-02-25 07:44:30 UTC (rev 36736)
+++ labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml 2011-02-25 08:41:11 UTC (rev 36737)
@@ -334,13 +334,19 @@
<directory>../trailmap</directory>
<outputDirectory>trailmap</outputDirectory>
<includes>
- <include>html/</include>
<include>src/</include>
<include>build.xml</include>
<include>README.txt</include>
</includes>
</fileSet>
<fileSet>
+ <directory>../trailmap/target/</directory>
+ <outputDirectory>trailmap</outputDirectory>
+ <includes>
+ <include>html/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../jacorb</directory>
<outputDirectory>jacorb</outputDirectory>
</fileSet>
Modified: labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Development_Guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Development_Guide/pom.xml 2011-02-25 07:44:30 UTC (rev 36736)
+++ labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Development_Guide/pom.xml 2011-02-25 08:41:11 UTC (rev 36737)
@@ -31,18 +31,19 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
<executions>
<execution>
<phase>compile</phase>
<configuration>
- <tasks>
+ <target unless="skipPublican">
<exec dir="." executable="publican">
<arg value="build" />
<arg value="--langs=en-US" />
<arg value="--formats=pdf" />
<arg value="--config=publican-maven.cfg" />
</exec>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Installation_And_Administration_Guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Installation_And_Administration_Guide/pom.xml 2011-02-25 07:44:30 UTC (rev 36736)
+++ labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Installation_And_Administration_Guide/pom.xml 2011-02-25 08:41:11 UTC (rev 36737)
@@ -30,18 +30,19 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
<executions>
<execution>
<phase>compile</phase>
<configuration>
- <tasks>
+ <target unless="skipPublican">
<exec dir="." executable="publican">
<arg value="build" />
<arg value="--langs=en-US" />
<arg value="--formats=pdf" />
<arg value="--config=publican-maven.cfg" />
</exec>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: labs/jbosstm/trunk/ArjunaJTS/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/pom.xml 2011-02-25 07:44:30 UTC (rev 36736)
+++ labs/jbosstm/trunk/ArjunaJTS/pom.xml 2011-02-25 08:41:11 UTC (rev 36737)
@@ -25,25 +25,7 @@
<name>JBossJTS everything</name>
<modules>
- <module>../narayana-build-common</module>
- <module>../common</module>
- <module>../ArjunaCore/arjuna</module>
- <module>../ArjunaCore/txoj</module>
- <module>../ArjunaCore/tsmx</module>
- <module>../ArjunaCore/arjuna/services</module>
- <module>../ArjunaJTA/jta</module>
- <module>../ArjunaJTA/jdbc</module>
- <module>../ArjunaJTA/tsmx</module>
- <module>orbportability</module>
- <module>jts</module>
- <module>jtax</module>
- <module>tsmx-sar</module>
- <module>jbossjts</module>
- <module>tsmx</module>
- <module>integration</module>
+ <module>docs/ArjunaJTS_Development_Guide</module>
<module>trailmap</module>
- <module>docs</module>
- <module>../rhq-plugin</module>
- <module>dist</module>
</modules>
</project>
Property changes on: labs/jbosstm/trunk/ArjunaJTS/trailmap
___________________________________________________________________
Modified: svn:ignore
- .project
.settings
html
+ target
build
.project
.classpath
.settings
Modified: labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml 2011-02-25 07:44:30 UTC (rev 36736)
+++ labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml 2011-02-25 08:41:11 UTC (rev 36737)
@@ -31,14 +31,15 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
<executions>
<execution>
<phase>compile</phase>
<configuration>
- <tasks>
+ <target>
<property name="docs.dir" value="docs" />
<property name="xsl.dir" value="xsl" />
- <property name="html.dir" value="html" />
+ <property name="html.dir" value="target/html" />
<property name="xsl.file" value="ATL_LookAndFeel.xsl" />
<copy todir="${html.dir}">
<fileset dir="${docs.dir}">
@@ -53,13 +54,7 @@
extension=".html">
<param name="rootpath" expression="." />
</style>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
+ </target>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
@@ -67,6 +62,12 @@
<version>1.8.0</version>
</dependency>
</dependencies>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: labs/jbosstm/trunk/narayana-build-common/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-build-common/pom.xml 2011-02-25 07:44:30 UTC (rev 36736)
+++ labs/jbosstm/trunk/narayana-build-common/pom.xml 2011-02-25 08:41:11 UTC (rev 36737)
@@ -187,10 +187,11 @@
<artifactId>emma</artifactId>
<version>2.1.5320</version>
<scope>system</scope>
- <systemPath>${TS_EMMA_JAR}/emma.jar</systemPath>
+ <systemPath>${TS_EMMA_JAR}</systemPath>
</dependency>
</dependencies>
</plugin>
+<!--
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
@@ -214,6 +215,7 @@
</execution>
</executions>
</plugin>
+-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
More information about the jboss-svn-commits
mailing list