[jboss-svn-commits] JBL Code SVN: r36634 - in labs/jbosstm/trunk/ArjunaCore: arjuna and 14 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sun Feb 20 11:52:05 EST 2011


Author: tomjenkinson
Date: 2011-02-20 11:52:05 -0500 (Sun, 20 Feb 2011)
New Revision: 36634

Added:
   labs/jbosstm/trunk/ArjunaCore/dist/
   labs/jbosstm/trunk/ArjunaCore/dist/pom.xml
   labs/jbosstm/trunk/ArjunaCore/dist/src/
   labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml
Removed:
   labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml
   labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/foo.xml
   labs/jbosstm/trunk/ArjunaCore/src/
Modified:
   labs/jbosstm/trunk/ArjunaCore/
   labs/jbosstm/trunk/ArjunaCore/arjuna/
   labs/jbosstm/trunk/ArjunaCore/arjuna/services/
   labs/jbosstm/trunk/ArjunaCore/arjunacore/
   labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
   labs/jbosstm/trunk/ArjunaCore/docs/
   labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/
   labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_And_Administration_Guide/
   labs/jbosstm/trunk/ArjunaCore/pom.xml
   labs/jbosstm/trunk/ArjunaCore/tsmx/
   labs/jbosstm/trunk/ArjunaCore/tsmx/jmxbrowser/
   labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser/
   labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser/pom.xml
   labs/jbosstm/trunk/ArjunaCore/tsmx/osbv-defaults/
   labs/jbosstm/trunk/ArjunaCore/tsmx/osbv-defaults/pom.xml
   labs/jbosstm/trunk/ArjunaCore/tsmx/perfgraph/
   labs/jbosstm/trunk/ArjunaCore/tsmx/pom.xml
   labs/jbosstm/trunk/ArjunaCore/tsmx/tools/
   labs/jbosstm/trunk/ArjunaCore/txoj/
Log:
JBTM-574 updated to build the dist as a different module so it can be re-ran


Property changes on: labs/jbosstm/trunk/ArjunaCore
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings



Property changes on: labs/jbosstm/trunk/ArjunaCore/arjuna
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings



Property changes on: labs/jbosstm/trunk/ArjunaCore/arjuna/services
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings



Property changes on: labs/jbosstm/trunk/ArjunaCore/arjunacore
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings


Modified: labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml	2011-02-19 22:39:59 UTC (rev 36633)
+++ labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml	2011-02-20 16:52:05 UTC (rev 36634)
@@ -115,7 +115,7 @@
 									<include>org.jboss.jbossts:arjuna</include>
 									<include>org.jboss.jbossts:tsmx-tools</include>
 									<include>org.jboss.jbossts:tsmx-jmxbrowser</include>
-									<include>org.jboss.jbossts:tsmx-objectstorebrowser</include>
+									<include>org.jboss.jbossts:tsmx-core-objectstorebrowser</include>
 									<include>org.jboss.jbossts:osbv-defaults</include>
 									<include>org.jboss.jbossts:tsmx-perfgraph</include>
 									<include>org.jboss.jbossts:txoj</include>
@@ -147,7 +147,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-objectstorebrowser</artifactId>
+			<artifactId>tsmx-core-objectstorebrowser</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.jbossts</groupId>


Property changes on: labs/jbosstm/trunk/ArjunaCore/dist
___________________________________________________________________
Added: svn:ignore
   + target
build
.project
.classpath
.settings


Added: labs/jbosstm/trunk/ArjunaCore/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/dist/pom.xml	                        (rev 0)
+++ labs/jbosstm/trunk/ArjunaCore/dist/pom.xml	2011-02-20 16:52:05 UTC (rev 36634)
@@ -0,0 +1,122 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+		LLC, and individual contributors as indicated by the @author tags. See the 
+		copyright.txt in the distribution for a full listing of individual contributors. 
+		This copyrighted material is made available to anyone wishing to use, modify, 
+		copy, or redistribute it subject to the terms and conditions of the GNU Lesser 
+		General Public License, v. 2.1. This program is distributed in the hope that 
+		it will be useful, but WITHOUT A WARRANTY; without even the implied warranty 
+		of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser 
+		General Public License for more details. You should have received a copy 
+		of the GNU Lesser General Public License, v.2.1 along with this distribution; 
+		if not, write to the Free Software Foundation, Inc., 51 Franklin Street, 
+		Fifth Floor, Boston, MA 02110-1301, USA. (C) 2009, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
+
+
+	<parent>
+		<groupId>org.jboss.jbossts</groupId>
+		<artifactId>narayana-build-common</artifactId>
+		<version>5.0.0.M1-SNAPSHOT</version>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.jboss.jbossts</groupId>
+	<artifactId>arjunacore-dist</artifactId>
+	<packaging>pom</packaging>
+	<name>ArjunaCore</name>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<descriptors>
+						<descriptor>src/main/assembly/bin.xml</descriptor>
+					</descriptors>
+					<tarLongFileMode>gnu</tarLongFileMode>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>arjunacore</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>arjunacore</artifactId>
+			<classifier>javadoc</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>arjunacore</artifactId>
+			<classifier>sources</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>arjunacore-services</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>arjuna</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>tsmx-tools</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>tsmx-jmxbrowser</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>tsmx-core-objectstorebrowser</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>osbv-defaults</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>tsmx-perfgraph</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>txoj</artifactId>
+		</dependency>
+	</dependencies>
+	
+	<properties>
+		<PRODUCT_NAME>arjunacore</PRODUCT_NAME>
+		<HOME_DIRECTORY>JBOSSCORE_HOME</HOME_DIRECTORY>
+	</properties>
+</project>

Deleted: labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/src/main/assembly/bin.xml	2011-02-17 09:25:47 UTC (rev 36615)
+++ labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml	2011-02-20 16:52:05 UTC (rev 36634)
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
-	LLC, and others contributors as indicated by the @authors tag. All rights 
-	reserved. See the copyright.txt in the distribution for a full listing of 
-	individual contributors. This copyrighted material is made available to anyone 
-	wishing to use, modify, copy, or redistribute it subject to the terms and 
-	conditions of the GNU Lesser General Public License, v. 2.1. This program 
-	is distributed in the hope that it will be useful, but WITHOUT A WARRANTY; 
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
-	PURPOSE. See the GNU Lesser General Public License for more details. You 
-	should have received a copy of the GNU Lesser General Public License, v.2.1 
-	along with this distribution; if not, write to the Free Software Foundation, 
-	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<assembly>
-	<id>bin</id>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
-		<format>tar.gz</format>
-		<format>zip</format>
-	</formats>
-	<moduleSets>
-		<moduleSet>
-			<includes>
-				<include>org.jboss.jbossts:arjunacore</include>
-			</includes>
-			<binaries>
-				<outputDirectory>htdocs</outputDirectory>
-				<attachmentClassifier>javadoc</attachmentClassifier>
-				<includeDependencies>false</includeDependencies>
-			</binaries>
-		</moduleSet>
-		<moduleSet>
-			<includes>
-				<include>org.jboss.jbossts:arjunacore</include>
-			</includes>
-			<binaries>
-				<outputFileNameMapping>${module.artifactId}-sources.${module.extension}
-				</outputFileNameMapping>
-				<outputDirectory>lib</outputDirectory>
-				<attachmentClassifier>sources</attachmentClassifier>
-				<includeDependencies>false</includeDependencies>
-				<unpack>false</unpack>
-			</binaries>
-		</moduleSet>
-		<moduleSet>
-			<includes>
-				<include>org.jboss.jbossts:tsmx-tools</include>
-			</includes>
-			<binaries>
-				<outputDirectory>bin</outputDirectory>
-				<outputFileNameMapping>${module.artifactId}.${module.extension}
-				</outputFileNameMapping>
-				<unpack>false</unpack>
-				<includeDependencies>false</includeDependencies>
-			</binaries>
-		</moduleSet>
-		<moduleSet>
-			<includes>
-				<include>org.jboss.jbossts:tsmx-jmxbrowser</include>
-			</includes>
-			<binaries>
-				<outputDirectory>bin/tools</outputDirectory>
-				<outputFileNameMapping>${module.artifactId}.${module.extension}
-				</outputFileNameMapping>
-				<unpack>false</unpack>
-				<includeDependencies>false</includeDependencies>
-			</binaries>
-		</moduleSet>
-		<moduleSet>
-			<includes>
-				<include>org.jboss.jbossts:tsmx-objectstorebrowser</include>
-			</includes>
-			<binaries>
-				<outputDirectory>bin/tools</outputDirectory>
-				<outputFileNameMapping>${module.artifactId}.${module.extension}
-				</outputFileNameMapping>
-				<unpack>false</unpack>
-				<includeDependencies>false</includeDependencies>
-			</binaries>
-		</moduleSet>
-		<moduleSet>
-			<includes>
-				<include>org.jboss.jbossts:tsmx-perfgraph</include>
-			</includes>
-			<binaries>
-				<outputDirectory>bin/tools</outputDirectory>
-				<outputFileNameMapping>${module.artifactId}.${module.extension}
-				</outputFileNameMapping>
-				<unpack>false</unpack>
-				<includeDependencies>false</includeDependencies>
-			</binaries>
-		</moduleSet>
-		<moduleSet>
-			<includes>
-				<include>org.jboss.jbossts:osbv-defaults</include>
-			</includes>
-			<binaries>
-				<outputDirectory>bin/tools/plugins</outputDirectory>
-				<outputFileNameMapping>${module.artifactId}.${module.extension}
-				</outputFileNameMapping>
-				<unpack>false</unpack>
-				<includeDependencies>false</includeDependencies>
-			</binaries>
-		</moduleSet>
-		<moduleSet>
-			<includes>
-				<include>org.jboss.jbossts:arjunacore</include>
-			</includes>
-			<binaries>
-				<outputDirectory>lib</outputDirectory>
-				<outputFileNameMapping>${module.artifactId}.${module.extension}
-				</outputFileNameMapping>
-				<unpack>false</unpack>
-				<dependencySets>
-					<dependencySet>
-						<outputDirectory>lib/ext</outputDirectory>
-						<outputFileNameMapping>${module.artifactId}.${module.extension}
-						</outputFileNameMapping>
-						<useTransitiveDependencies>true</useTransitiveDependencies>
-						<excludes>
-							<exclude>org.jboss.jbossts:common</exclude>
-							<exclude>org.jboss.jbossts:arjuna</exclude>
-							<exclude>org.jboss.jbossts:tsmx-tools</exclude>
-							<exclude>org.jboss.jbossts:tsmx-jmxbrowser</exclude>
-							<exclude>org.jboss.jbossts:tsmx-objectstorebrowser</exclude>
-							<exclude>org.jboss.jbossts:osbv-defaults</exclude>
-							<exclude>org.jboss.jbossts:tsmx-perfgraph</exclude>
-							<exclude>org.jboss.jbossts:txoj</exclude>
-						</excludes>
-					</dependencySet>
-				</dependencySets>
-			</binaries>
-		</moduleSet>
-		<moduleSet>
-			<includes>
-				<include>org.jboss.jbossts:arjunacore-services</include>
-			</includes>
-			<binaries>
-				<outputDirectory>services/lib</outputDirectory>
-				<outputFileNameMapping>${module.artifactId}.${module.extension}
-				</outputFileNameMapping>
-				<unpack>false</unpack>
-				<dependencySets>
-					<dependencySet>
-						<outputDirectory>lib/ext</outputDirectory>
-						<outputFileNameMapping>${module.artifactId}.${module.extension}
-						</outputFileNameMapping>
-						<useTransitiveDependencies>false</useTransitiveDependencies>
-						<excludes>
-							<exclude>org.jboss.jbossts:arjuna</exclude>
-						</excludes>
-					</dependencySet>
-				</dependencySets>
-			</binaries>
-		</moduleSet>
-	</moduleSets>
-	<files>
-		<file>
-			<source>copyright.txt</source>
-			<fileMode>0644</fileMode>
-		</file>
-		<file>
-			<source>../JBossORG-EULA.txt</source>
-			<fileMode>0644</fileMode>
-		</file>
-		<file>
-			<source>tsmx/etc/toolsframework.xml</source>
-			<fileMode>0644</fileMode>
-			<outputDirectory>bin/tools</outputDirectory>
-		</file>
-		<file>
-			<source>arjuna/etc/log4j.properties</source>
-			<fileMode>0644</fileMode>
-			<outputDirectory>etc</outputDirectory>
-		</file>
-		<file>
-			<source>jbossts-properties.xml</source>
-			<fileMode>0644</fileMode>
-			<outputDirectory>etc</outputDirectory>
-		</file>
-		<file>
-			<source>../ext/third_party_licenses.txt</source>
-			<fileMode>0644</fileMode>
-			<outputDirectory>lib/ext</outputDirectory>
-		</file>
-		<file>
-			<source>scripts/withoutorb-setup-env.sh</source>
-			<fileMode>0755</fileMode>
-			<outputDirectory>bin</outputDirectory>
-			<destName>setup-env.sh</destName>
-			<filtered>true</filtered>
-		</file>
-		<file>
-			<source>scripts/withoutorb-setup-env.bat</source>
-			<fileMode>0755</fileMode>
-			<outputDirectory>bin</outputDirectory>
-			<destName>setup-env.bat</destName>
-			<filtered>true</filtered>
-		</file>
-	</files>
-	<fileSets>
-		<fileSet>
-			<directory>scripts</directory>
-			<outputDirectory>bin</outputDirectory>
-			<filtered>true</filtered>
-			<includes>
-				<include>start-recovery-manager*</include>
-				<include>run-tools*</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>arjuna/services/scripts/windows</directory>
-			<outputDirectory>services/bin/windows</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>arjuna/services/scripts/unix</directory>
-			<outputDirectory>services/bin/hpux</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>arjuna/services/scripts/unix</directory>
-			<outputDirectory>services/bin/linux</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>arjuna/services/scripts/unix</directory>
-			<outputDirectory>services/bin/solaris</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>arjuna/services/config</directory>
-			<outputDirectory>services/config</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>docs/ArjunaCore_Installation_And_Administration_Guide/target/publican/ArjunaCore_Installation_And_Administration_Guide/en-US/pdf/</directory>
-			<outputDirectory>docs/ArjunaCore_Installation_And_Administration_Guide/en-US/</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>docs/ArjunaCore_Development_Guide/target/publican/ArjunaCore_Development_Guide/en-US/pdf/</directory>
-			<outputDirectory>docs/ArjunaCore_Development_Guide/en-US/</outputDirectory>
-		</fileSet>
-	</fileSets>
-</assembly> 

Copied: labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml (from rev 36626, labs/jbosstm/trunk/ArjunaCore/src/main/assembly/bin.xml)
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml	                        (rev 0)
+++ labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml	2011-02-20 16:52:05 UTC (rev 36634)
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
+	LLC, and others contributors as indicated by the @authors tag. All rights 
+	reserved. See the copyright.txt in the distribution for a full listing of 
+	individual contributors. This copyrighted material is made available to anyone 
+	wishing to use, modify, copy, or redistribute it subject to the terms and 
+	conditions of the GNU Lesser General Public License, v. 2.1. This program 
+	is distributed in the hope that it will be useful, but WITHOUT A WARRANTY; 
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+	PURPOSE. See the GNU Lesser General Public License for more details. You 
+	should have received a copy of the GNU Lesser General Public License, v.2.1 
+	along with this distribution; if not, write to the Free Software Foundation, 
+	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
+<assembly>
+	<id>bin</id>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<formats>
+		<format>tar.gz</format>
+		<format>zip</format>
+	</formats>
+	<dependencySets>
+		<dependencySet>
+			<includes>
+				<include>*:javadoc</include>
+			</includes>
+			<outputDirectory>htdocs</outputDirectory>
+			<useProjectAttachments>true</useProjectAttachments>
+			<unpack>true</unpack>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>*:sources</include>
+			</includes>
+			<outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}
+			</outputFileNameMapping>
+			<outputDirectory>lib</outputDirectory>
+			<useTransitiveDependencies>false</useTransitiveDependencies>
+			<unpack>false</unpack>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>org.jboss.jbossts:tsmx-tools</include>
+			</includes>
+			<outputDirectory>bin</outputDirectory>
+			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+			</outputFileNameMapping>
+			<unpack>false</unpack>
+			<useTransitiveDependencies>false</useTransitiveDependencies>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>org.jboss.jbossts:tsmx-jmxbrowser</include>
+			</includes>
+			<outputDirectory>bin/tools</outputDirectory>
+			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+			</outputFileNameMapping>
+			<unpack>false</unpack>
+			<useTransitiveDependencies>false</useTransitiveDependencies>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>org.jboss.jbossts:tsmx-core-objectstorebrowser</include>
+			</includes>
+			<outputDirectory>bin/tools</outputDirectory>
+			<outputFileNameMapping>tsmx-objectstorebrowser.jar
+			</outputFileNameMapping>
+			<unpack>false</unpack>
+			<useTransitiveDependencies>false</useTransitiveDependencies>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>org.jboss.jbossts:tsmx-perfgraph</include>
+			</includes>
+			<outputDirectory>bin/tools</outputDirectory>
+			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+			</outputFileNameMapping>
+			<unpack>false</unpack>
+			<useTransitiveDependencies>false</useTransitiveDependencies>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>org.jboss.jbossts:osbv-defaults</include>
+			</includes>
+			<outputDirectory>bin/tools/plugins</outputDirectory>
+			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+			</outputFileNameMapping>
+			<unpack>false</unpack>
+			<useTransitiveDependencies>false</useTransitiveDependencies>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>org.jboss.jbossts:arjunacore</include>
+			</includes>
+			<excludes>
+				<exclude>*:sources</exclude>
+				<exclude>*:javadoc</exclude>
+			</excludes>
+			<outputDirectory>lib</outputDirectory>
+			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+			</outputFileNameMapping>
+			<unpack>false</unpack>
+		</dependencySet>
+		<dependencySet>
+			<excludes>
+				<exclude>org.jboss.jbossts:arjunacore</exclude>
+				<exclude>org.jboss.jbossts:arjunacore-services</exclude>
+				<exclude>org.jboss.jbossts:common</exclude>
+				<exclude>org.jboss.jbossts:arjuna</exclude>
+				<exclude>org.jboss.jbossts:tsmx-tools</exclude>
+				<exclude>org.jboss.jbossts:tsmx-jmxbrowser</exclude>
+				<exclude>org.jboss.jbossts:tsmx-core-objectstorebrowser</exclude>
+				<exclude>org.jboss.jbossts:osbv-defaults</exclude>
+				<exclude>org.jboss.jbossts:tsmx-perfgraph</exclude>
+				<exclude>org.jboss.jbossts:txoj</exclude>
+			</excludes>
+			<outputDirectory>lib/ext</outputDirectory>
+			<unpack>false</unpack>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>org.jboss.jbossts:arjunacore-services</include>
+			</includes>
+			<outputDirectory>services/lib</outputDirectory>
+			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+			</outputFileNameMapping>
+			<unpack>false</unpack>
+		</dependencySet>
+	</dependencySets>
+	<files>
+		<file>
+			<source>../copyright.txt</source>
+			<fileMode>0644</fileMode>
+		</file>
+		<file>
+			<source>../../JBossORG-EULA.txt</source>
+			<fileMode>0644</fileMode>
+		</file>
+		<file>
+			<source>../tsmx/etc/toolsframework.xml</source>
+			<fileMode>0644</fileMode>
+			<outputDirectory>bin/tools</outputDirectory>
+		</file>
+		<file>
+			<source>../arjuna/etc/log4j.properties</source>
+			<fileMode>0644</fileMode>
+			<outputDirectory>etc</outputDirectory>
+		</file>
+		<file>
+			<source>../../ext/third_party_licenses.txt</source>
+			<fileMode>0644</fileMode>
+			<outputDirectory>lib/ext</outputDirectory>
+		</file>
+		<file>
+			<source>../scripts/withoutorb-setup-env.sh</source>
+			<fileMode>0755</fileMode>
+			<outputDirectory>bin</outputDirectory>
+			<destName>setup-env.sh</destName>
+			<filtered>true</filtered>
+		</file>
+		<file>
+			<source>../scripts/withoutorb-setup-env.bat</source>
+			<fileMode>0755</fileMode>
+			<outputDirectory>bin</outputDirectory>
+			<destName>setup-env.bat</destName>
+			<filtered>true</filtered>
+		</file>
+		<file>
+			<source>../docs/user_guide/FailureRecoveryGuide.pdf</source>
+			<outputDirectory>docs</outputDirectory>
+		</file>
+		<file>
+			<source>../jbossts-properties-arjunacore.xml</source>
+			<fileMode>0644</fileMode>
+			<destName>default-jbossts-properties.xml</destName>
+		</file>
+		<file>
+			<source>../jbossts-properties-arjunacore.xml</source>
+			<fileMode>0644</fileMode>
+			<outputDirectory>etc</outputDirectory>
+			<destName>jbossts-properties.xml</destName>
+		</file>
+	</files>
+	<fileSets>
+		<fileSet>
+			<directory>../scripts</directory>
+			<outputDirectory>bin</outputDirectory>
+			<filtered>true</filtered>
+			<includes>
+				<include>start-recovery-manager*</include>
+				<include>run-tools*</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>../arjuna/services/scripts/windows</directory>
+			<outputDirectory>services/bin/windows</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../arjuna/services/scripts/unix</directory>
+			<outputDirectory>services/bin/hpux</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../arjuna/services/scripts/unix</directory>
+			<outputDirectory>services/bin/linux</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../arjuna/services/scripts/unix</directory>
+			<outputDirectory>services/bin/solaris</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../arjuna/services/config</directory>
+			<outputDirectory>services/config</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../docs/ArjunaCore_Installation_And_Administration_Guide/target/publican/ArjunaCore_Installation_And_Administration_Guide/en-US/pdf/
+			</directory>
+			<outputDirectory>docs</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../docs/ArjunaCore_Development_Guide/target/publican/ArjunaCore_Development_Guide/en-US/pdf/
+			</directory>
+			<outputDirectory>docs</outputDirectory>
+		</fileSet>
+	</fileSets>
+</assembly> 

Deleted: labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/foo.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/src/main/assembly/foo.xml	2011-02-17 09:25:47 UTC (rev 36615)
+++ labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/foo.xml	2011-02-20 16:52:05 UTC (rev 36634)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
-	LLC, and others contributors as indicated by the @authors tag. All rights 
-	reserved. See the copyright.txt in the distribution for a full listing of 
-	individual contributors. This copyrighted material is made available to anyone 
-	wishing to use, modify, copy, or redistribute it subject to the terms and 
-	conditions of the GNU Lesser General Public License, v. 2.1. This program 
-	is distributed in the hope that it will be useful, but WITHOUT A WARRANTY; 
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
-	PURPOSE. See the GNU Lesser General Public License for more details. You 
-	should have received a copy of the GNU Lesser General Public License, v.2.1 
-	along with this distribution; if not, write to the Free Software Foundation, 
-	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<assembly>
-	<id>bin</id>
-	<includeBaseDirectory>true</includeBaseDirectory>
-	<formats>
-		<format>tar.gz</format>
-		<format>zip</format>
-	</formats>
-	<moduleSets>
-
-		<moduleSet>
-			<includes>
-				<include>org.jboss.jbossts:common</include>
-			</includes>
-			<binaries>
-				<outputDirectory>htdocs</outputDirectory>
-				<attachmentClassifier>javadoc</attachmentClassifier>
-			</binaries>
-		</moduleSet>
-	</moduleSets>
-</assembly> 


Property changes on: labs/jbosstm/trunk/ArjunaCore/docs
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings



Property changes on: labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings



Property changes on: labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_And_Administration_Guide
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings


Modified: labs/jbosstm/trunk/ArjunaCore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/pom.xml	2011-02-19 22:39:59 UTC (rev 36633)
+++ labs/jbosstm/trunk/ArjunaCore/pom.xml	2011-02-20 16:52:05 UTC (rev 36634)
@@ -23,31 +23,13 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>arjunacore-dist</artifactId>
+	<artifactId>arjunacore-all</artifactId>
 	<packaging>pom</packaging>
 	<name>ArjunaCore</name>
 
 	<build>
 		<plugins>
 			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/bin.xml</descriptor>
-					</descriptors>
-					<tarLongFileMode>gnu</tarLongFileMode>
-				</configuration>
-			</plugin>
-			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 				<executions>
@@ -63,6 +45,7 @@
 	</build>
 
 	<modules>
+<!--
 		<module>../common</module>
 		<module>arjuna</module>
 		<module>arjuna/services</module>
@@ -70,10 +53,8 @@
 		<module>txoj</module>
 		<module>arjunacore</module>
 		<module>docs</module>
+-->
+		<module>arjunacore</module>
+		<module>dist</module>
 	</modules>
-	
-	<properties>
-		<PRODUCT_NAME>arjunacore</PRODUCT_NAME>
-		<HOME_DIRECTORY>JBOSSCORE_HOME</HOME_DIRECTORY>
-	</properties>
 </project>


Property changes on: labs/jbosstm/trunk/ArjunaCore/tsmx
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings



Property changes on: labs/jbosstm/trunk/ArjunaCore/tsmx/jmxbrowser
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings



Property changes on: labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings


Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser/pom.xml	2011-02-19 22:39:59 UTC (rev 36633)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser/pom.xml	2011-02-20 16:52:05 UTC (rev 36634)
@@ -21,8 +21,8 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>tsmx-objectstorebrowser</artifactId>
-	<name>ArjunaCore tsmx-objectstorebrowser module</name>
+	<artifactId>tsmx-core-objectstorebrowser</artifactId>
+	<name>ArjunaCore tsmx-core-objectstorebrowser module</name>
 	<packaging>jar</packaging>
 
 	<build>
@@ -41,9 +41,11 @@
 					<includes>
 						<include>com/arjuna/ats/tools/objectstorebrowser/**</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>
 					</excludes>
+					 -->
 				</configuration>
 			</plugin>
 		</plugins>


Property changes on: labs/jbosstm/trunk/ArjunaCore/tsmx/osbv-defaults
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings


Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/osbv-defaults/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/osbv-defaults/pom.xml	2011-02-19 22:39:59 UTC (rev 36633)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/osbv-defaults/pom.xml	2011-02-20 16:52:05 UTC (rev 36634)
@@ -70,7 +70,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-objectstorebrowser</artifactId>
+			<artifactId>tsmx-core-objectstorebrowser</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.javaee</groupId>


Property changes on: labs/jbosstm/trunk/ArjunaCore/tsmx/perfgraph
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings


Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/pom.xml	2011-02-19 22:39:59 UTC (rev 36633)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/pom.xml	2011-02-20 16:52:05 UTC (rev 36634)
@@ -21,7 +21,7 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>tsmx</artifactId>
+	<artifactId>tsmx-core</artifactId>
 	<name>ArjunaCore tsmx module</name>
 	<packaging>pom</packaging>
 


Property changes on: labs/jbosstm/trunk/ArjunaCore/tsmx/tools
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings



Property changes on: labs/jbosstm/trunk/ArjunaCore/txoj
___________________________________________________________________
Modified: svn:ignore
   - target
.classpath
.settings
.project

   + target
build
.project
.classpath
.settings




More information about the jboss-svn-commits mailing list