[jboss-svn-commits] JBL Code SVN: r36826 - in labs/jbosstm/trunk: ArjunaJTS/dist/src/main/assembly and 2 other directories.

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

Author: tomjenkinson
Date: 2011-03-16 12:41:53 -0400 (Wed, 16 Mar 2011)
New Revision: 36826

Modified:
   labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml
   labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml
   labs/jbosstm/trunk/narayana-parent/pom.xml
Log:
JBTM-574 updated to provide the trailmap as a bonafide artifact

Modified: labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml	2011-03-16 16:34:14 UTC (rev 36825)
+++ labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml	2011-03-16 16:41:53 UTC (rev 36826)
@@ -133,6 +133,10 @@
 			<artifactId>jbossts-jopr-plugin</artifactId>
 			<classifier>sources</classifier>
 		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>trailmap</artifactId>
+		</dependency>
 	</dependencies>
 
 

Modified: labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml	2011-03-16 16:34:14 UTC (rev 36825)
+++ labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml	2011-03-16 16:41:53 UTC (rev 36826)
@@ -21,6 +21,20 @@
 	<dependencySets>
 		<dependencySet>
 			<includes>
+				<include>org.jboss.jbossts:trailmap</include>
+			</includes>
+			<outputDirectory>trailmap</outputDirectory>
+			<useProjectAttachments>true</useProjectAttachments>
+			<unpack>true</unpack>
+			<useProjectArtifact>false</useProjectArtifact>
+			<unpackOptions>
+				<excludes>
+					<exclude>META-INF/</exclude>
+				</excludes>
+			</unpackOptions>
+		</dependencySet>
+		<dependencySet>
+			<includes>
 				<include>*:javadoc</include>
 			</includes>
 			<excludes>
@@ -195,6 +209,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>org.jboss.jbossts:trailmap</exclude>
 			</excludes>
 			<outputDirectory>lib/ext</outputDirectory>
 			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
@@ -380,22 +395,6 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>../trailmap</directory>
-			<outputDirectory>trail_map</outputDirectory>
-			<includes>
-				<include>src/</include>
-				<include>build.xml</include>
-				<include>README.txt</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>../trailmap/target/</directory>
-			<outputDirectory>trail_map</outputDirectory>
-			<includes>
-				<include>html/</include>
-			</includes>
-		</fileSet>
-		<fileSet>
 			<directory>../jacorb</directory>
 			<outputDirectory>jacorb</outputDirectory>
 		</fileSet>

Modified: labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml	2011-03-16 16:34:14 UTC (rev 36825)
+++ labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml	2011-03-16 16:41:53 UTC (rev 36826)
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jboss.jbossts</groupId>
 	<artifactId>trailmap</artifactId>
-	<packaging>pom</packaging>
+	<packaging>jar</packaging>
 	<name>JBossJTS Trailmap documentation</name>
 
 	<build>
@@ -39,7 +39,7 @@
 							<target>
 								<property name="docs.dir" value="docs" />
 								<property name="xsl.dir" value="xsl" />
-								<property name="html.dir" value="target/html" />
+								<property name="html.dir" value="target/classes/html" />
 								<property name="xsl.file" value="ATL_LookAndFeel.xsl" />
 								<copy todir="${html.dir}">
 									<fileset dir="${docs.dir}">
@@ -54,6 +54,15 @@
 									extension=".html">
 									<param name="rootpath" expression="." />
 								</style>
+
+        <copy todir="target/classes/">
+            <fileset dir=".">
+		<include name="src/"/>
+		<include name="build.xml"/>
+		<include name="README.txt"/>
+            </fileset>
+        </copy>
+
 							</target>
 							<dependencies>
 								<dependency>

Modified: labs/jbosstm/trunk/narayana-parent/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-parent/pom.xml	2011-03-16 16:34:14 UTC (rev 36825)
+++ labs/jbosstm/trunk/narayana-parent/pom.xml	2011-03-16 16:41:53 UTC (rev 36826)
@@ -591,6 +591,11 @@
 				<artifactId>xts-demo</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.jboss.jbossts</groupId>
+				<artifactId>trailmap</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>