[jboss-svn-commits] JBL Code SVN: r36681 - in labs/jbosstm/trunk: ArjunaJTS/dist/src/main/assembly and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 24 06:21:07 EST 2011
Author: tomjenkinson
Date: 2011-02-24 06:21:07 -0500 (Thu, 24 Feb 2011)
New Revision: 36681
Modified:
labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml
labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/ArjunaJTS/tsmx-sar/pom.xml
labs/jbosstm/trunk/narayana-build-common/pom.xml
labs/jbosstm/trunk/rhq-plugin/pom.xml
Log:
JBTM-574 updated to use the narayana-build-common parent
Modified: labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml 2011-02-24 11:13:16 UTC (rev 36680)
+++ labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml 2011-02-24 11:21:07 UTC (rev 36681)
@@ -73,6 +73,12 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
+ <artifactId>jbossts-tools</artifactId>
+ <classifier>sar</classifier>
+ <type>sar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
<artifactId>tsmx-tools</artifactId>
</dependency>
<dependency>
@@ -113,9 +119,13 @@
<groupId>org.jboss.jbossts</groupId>
<artifactId>jbossjts-integration</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>jbossts-jopr-plugin</artifactId>
+ </dependency>
</dependencies>
-
-
+
+
<properties>
<PRODUCT_NAME>jbossjts</PRODUCT_NAME>
<HOME_DIRECTORY>JBOSSTS_HOME</HOME_DIRECTORY>
Modified: labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml 2011-02-24 11:13:16 UTC (rev 36680)
+++ labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml 2011-02-24 11:21:07 UTC (rev 36681)
@@ -21,7 +21,7 @@
<dependencySets>
<dependencySet>
<includes>
- <include>*:javadoc</include>
+ <include>org.jboss.jbossts:jbossjts:*:javadoc</include>
</includes>
<outputDirectory>htdocs</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
@@ -29,6 +29,14 @@
</dependencySet>
<dependencySet>
<includes>
+ <include>org.jboss.jbossts:jbossts-jopr-plugin:*:javadoc</include>
+ </includes>
+ <outputDirectory>bin</outputDirectory>
+ <useProjectAttachments>true</useProjectAttachments>
+ <unpack>false</unpack>
+ </dependencySet>
+ <dependencySet>
+ <includes>
<include>*:sources</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}
@@ -39,6 +47,26 @@
</dependencySet>
<dependencySet>
<includes>
+ <include>org.jboss.jbossts:jbossts-jopr-plugin</include>
+ </includes>
+ <outputDirectory>bin</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+ </outputFileNameMapping>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.jbossts:jbossts-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-tools</include>
</includes>
<outputDirectory>bin</outputDirectory>
@@ -59,7 +87,7 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.jbossts:tsmx-jta-objectstorebrowser</include>
+ <include>org.jboss.jbossts:tsmx-jts-objectstorebrowser</include>
</includes>
<outputDirectory>bin/tools</outputDirectory>
<outputFileNameMapping>tsmx-objectstorebrowser.jar
@@ -123,11 +151,10 @@
<exclude>org.jboss.jbossts:tsmx-perfgraph</exclude>
<exclude>org.jboss.jbossts:txoj</exclude>
<exclude>org.jboss.jbossts:jta</exclude>
- <exclude>org.jboss.jbossts:jdbc</exclude>
- <exclude>org.jboss.jbossts:tsmx-jta-objectstorebrowser</exclude>
<exclude>org.jboss.jbossts:orbportability</exclude>
<exclude>org.jboss.jbossts:jts</exclude>
<exclude>org.jboss.jbossts:jtax</exclude>
+ <exclude>org.jboss.jbossts:tsmx-jts-objectstorebrowser</exclude>
</excludes>
<outputDirectory>lib/ext</outputDirectory>
<unpack>false</unpack>
@@ -193,6 +220,7 @@
</file>
<file>
<source>../docs/index.html</source>
+ <outputDirectory>user_guide</outputDirectory>
<fileMode>0644</fileMode>
</file>
</files>
@@ -202,6 +230,7 @@
<outputDirectory>bin</outputDirectory>
<filtered>true</filtered>
<includes>
+ <include>start-transaction-service*</include>
<include>start-recovery-manager*</include>
<include>run-tools*</include>
</includes>
@@ -233,12 +262,12 @@
<outputDirectory>docs/images</outputDirectory>
</fileSet>
<fileSet>
- <directory>../docs/ArjunaTA_Installation_And_Administration_Guide/target/publican/ArjunaTA_Installation_And_Administration_Guide/en-US/pdf/
+ <directory>../docs/ArjunaJTS_Installation_And_Administration_Guide/target/publican/ArjunaJTS_Installation_And_Administration_Guide/en-US/pdf/
</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../docs/ArjunaTA_Development_Guide/target/publican/ArjunaTA_Development_Guide/en-US/pdf/
+ <directory>../docs/ArjunaJTS_Development_Guide/target/publican/ArjunaJTS_Development_Guide/en-US/pdf/
</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
Modified: labs/jbosstm/trunk/ArjunaJTS/tsmx-sar/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/tsmx-sar/pom.xml 2011-02-24 11:13:16 UTC (rev 36680)
+++ labs/jbosstm/trunk/ArjunaJTS/tsmx-sar/pom.xml 2011-02-24 11:21:07 UTC (rev 36681)
@@ -21,8 +21,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tsmx-tools-sar</artifactId>
- <name>ArjunaJTA tsmx-tools sar</name>
+ <artifactId>jbossts-tools</artifactId>
+ <name>ArjunaJTS tsmx tools sar</name>
<packaging>jar</packaging>
Modified: labs/jbosstm/trunk/narayana-build-common/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-build-common/pom.xml 2011-02-24 11:13:16 UTC (rev 36680)
+++ labs/jbosstm/trunk/narayana-build-common/pom.xml 2011-02-24 11:21:07 UTC (rev 36681)
@@ -227,6 +227,13 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
+ <artifactId>jbossts-tools</artifactId>
+ <version>${project.version}</version>
+ <classifier>sar</classifier>
+ <type>sar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
<artifactId>tsmx-tools</artifactId>
<version>${project.version}</version>
</dependency>
@@ -329,6 +336,11 @@
<artifactId>tsmx-jts-objectstorebrowser</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>jbossts-jopr-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: labs/jbosstm/trunk/rhq-plugin/pom.xml
===================================================================
--- labs/jbosstm/trunk/rhq-plugin/pom.xml 2011-02-24 11:13:16 UTC (rev 36680)
+++ labs/jbosstm/trunk/rhq-plugin/pom.xml 2011-02-24 11:21:07 UTC (rev 36681)
@@ -9,7 +9,7 @@
<version>5.0.0.M1-SNAPSHOT</version>
</parent>
- <artifactId>jopr-jbossts-plugin</artifactId>
+ <artifactId>jbossts-jopr-plugin</artifactId>
<packaging>jar</packaging>
<name>Jopr Test Plugin</name>
@@ -29,36 +29,12 @@
</repository>
</repositories>
+<!--
<build>
- <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>create_sources_jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <phase>prepare-package</phase>
- </execution>
- </executions>
- <configuration>
- <forceCreation>true</forceCreation>
- <includePom>true</includePom>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <!--<version>2.7</version>-->
<executions>
<execution>
<id>create_javadocs</id>
@@ -69,39 +45,10 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>create_sources_jar</id>
- <goals> <goal>jar</goal> </goals>
- <phase>prepare-package</phase>
- </execution>
- </executions>
- <configuration>
- <forceCreation>true</forceCreation>
- <includePom>true</includePom>
- </configuration>
- </plugin>
</plugins>
</build>
+-->
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.on</groupId>
- <!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
- <artifactId>jopr-modules-parent</artifactId>
- <version>2.3.0.EmbJopr.1.3.0-4</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-
<dependencies>
<!-- Below are the core modules that are required dependencies of all plugins -->
<dependency>
More information about the jboss-svn-commits
mailing list