[jboss-svn-commits] JBL Code SVN: r37053 - in labs/jbosstm/trunk: ArjunaJTA/dist/src/main/assembly and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jun 2 05:32:31 EDT 2011
Author: tomjenkinson
Date: 2011-06-02 05:32:31 -0400 (Thu, 02 Jun 2011)
New Revision: 37053
Modified:
labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/ArjunaJTA/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml
labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml
labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet/pom.xml
labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml
labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/XTS/localjunit/pom.xml
Log:
further working poms
Modified: labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml 2011-06-02 09:24:01 UTC (rev 37052)
+++ labs/jbosstm/trunk/ArjunaCore/dist/src/main/assembly/bin.xml 2011-06-02 09:32:31 UTC (rev 37053)
@@ -42,7 +42,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:arjunacore</include>
+ <include>org.jboss.narayana:arjunacore</include>
</includes>
<excludes>
<exclude>*:sources</exclude>
@@ -56,11 +56,11 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<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:txoj</exclude>
+ <exclude>org.jboss.narayana:arjunacore</exclude>
+ <exclude>org.jboss.narayana:arjunacore-services</exclude>
+ <exclude>org.jboss.narayana:common</exclude>
+ <exclude>org.jboss.narayana:arjuna</exclude>
+ <exclude>org.jboss.narayana:txoj</exclude>
</excludes>
<outputDirectory>lib/ext</outputDirectory>
<unpack>false</unpack>
@@ -68,7 +68,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:arjunacore-services</include>
+ <include>org.jboss.narayana:arjunacore-services</include>
</includes>
<outputDirectory>services/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
Modified: labs/jbosstm/trunk/ArjunaJTA/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/dist/src/main/assembly/bin.xml 2011-06-02 09:24:01 UTC (rev 37052)
+++ labs/jbosstm/trunk/ArjunaJTA/dist/src/main/assembly/bin.xml 2011-06-02 09:32:31 UTC (rev 37053)
@@ -42,7 +42,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:jbossjta</include>
+ <include>org.jboss.narayana:jbossjta</include>
</includes>
<excludes>
<exclude>*:sources</exclude>
@@ -56,7 +56,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:jbossjta-integration</include>
+ <include>org.jboss.narayana:jbossjta-integration</include>
</includes>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
@@ -66,14 +66,14 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<excludes>
- <exclude>org.jboss.jbossts:jbossjta</exclude>
- <exclude>org.jboss.jbossts:jbossjta-integration</exclude>
- <exclude>org.jboss.jbossts:arjunacore-services</exclude>
- <exclude>org.jboss.jbossts:common</exclude>
- <exclude>org.jboss.jbossts:arjuna</exclude>
- <exclude>org.jboss.jbossts:txoj</exclude>
- <exclude>org.jboss.jbossts:jta</exclude>
- <exclude>org.jboss.jbossts:jdbc</exclude>
+ <exclude>org.jboss.narayana:jbossjta</exclude>
+ <exclude>org.jboss.narayana:jbossjta-integration</exclude>
+ <exclude>org.jboss.narayana:arjunacore-services</exclude>
+ <exclude>org.jboss.narayana:common</exclude>
+ <exclude>org.jboss.narayana:arjuna</exclude>
+ <exclude>org.jboss.narayana:txoj</exclude>
+ <exclude>org.jboss.narayana:jta</exclude>
+ <exclude>org.jboss.narayana:jdbc</exclude>
</excludes>
<outputDirectory>lib/ext</outputDirectory>
<unpack>false</unpack>
@@ -81,7 +81,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:arjunacore-services</include>
+ <include>org.jboss.narayana:arjunacore-services</include>
</includes>
<outputDirectory>services/lib</outputDirectory>
<outputFileNameMapping>jbossjta-services.jar
Modified: labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml 2011-06-02 09:24:01 UTC (rev 37052)
+++ labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml 2011-06-02 09:32:31 UTC (rev 37053)
@@ -22,7 +22,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:trailmap</include>
+ <include>org.jboss.narayana:trailmap</include>
</includes>
<outputDirectory>trailmap</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
@@ -36,7 +36,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:jbossts-jopr-plugin:*:javadoc</include>
+ <include>org.jboss.narayana:jbossts-jopr-plugin:*:javadoc</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}-javadoc.${artifact.extension}
</outputFileNameMapping>
@@ -47,7 +47,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:jbossts-jopr-plugin:*:sources</include>
+ <include>org.jboss.narayana:jbossts-jopr-plugin:*:sources</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}
</outputFileNameMapping>
@@ -58,7 +58,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:jbossjts:*:javadoc</include>
+ <include>org.jboss.narayana:jbossjts:*:javadoc</include>
</includes>
<outputDirectory>htdocs</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
@@ -67,7 +67,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:jbossjts:*:sources</include>
+ <include>org.jboss.narayana:jbossjts:*:sources</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}
</outputFileNameMapping>
@@ -78,7 +78,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:jbossts-jopr-plugin</include>
+ <include>org.jboss.narayana:jbossts-jopr-plugin</include>
</includes>
<outputDirectory>bin</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
@@ -89,7 +89,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:jbossts-tools</include>
+ <include>org.jboss.narayana:jbossts-tools</include>
</includes>
<outputDirectory>bin</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
@@ -100,7 +100,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:jbossjts</include>
+ <include>org.jboss.narayana:jbossjts</include>
</includes>
<excludes>
<exclude>*:sources</exclude>
@@ -114,7 +114,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:jbossjts-integration</include>
+ <include>org.jboss.narayana:jbossjts-integration</include>
</includes>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
@@ -124,19 +124,19 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<excludes>
- <exclude>org.jboss.jbossts:jbossjts</exclude>
- <exclude>org.jboss.jbossts:jbossjts-integration</exclude>
- <exclude>org.jboss.jbossts:arjunacore-services</exclude>
- <exclude>org.jboss.jbossts:common</exclude>
- <exclude>org.jboss.jbossts:arjuna</exclude>
- <exclude>org.jboss.jbossts:txoj</exclude>
- <exclude>org.jboss.jbossts:jta</exclude>
- <exclude>org.jboss.jbossts:orbportability</exclude>
- <exclude>org.jboss.jbossts:jts</exclude>
- <exclude>org.jboss.jbossts:jtax</exclude>
- <exclude>org.jboss.jbossts:jbossts-tools</exclude>
- <exclude>org.jboss.jbossts:jbossts-jopr-plugin</exclude>
- <exclude>org.jboss.jbossts:trailmap</exclude>
+ <exclude>org.jboss.narayana:jbossjts</exclude>
+ <exclude>org.jboss.narayana:jbossjts-integration</exclude>
+ <exclude>org.jboss.narayana:arjunacore-services</exclude>
+ <exclude>org.jboss.narayana:common</exclude>
+ <exclude>org.jboss.narayana:arjuna</exclude>
+ <exclude>org.jboss.narayana:txoj</exclude>
+ <exclude>org.jboss.narayana:jta</exclude>
+ <exclude>org.jboss.narayana:orbportability</exclude>
+ <exclude>org.jboss.narayana:jts</exclude>
+ <exclude>org.jboss.narayana:jtax</exclude>
+ <exclude>org.jboss.narayana:jbossts-tools</exclude>
+ <exclude>org.jboss.narayana:jbossts-jopr-plugin</exclude>
+ <exclude>org.jboss.narayana:trailmap</exclude>
</excludes>
<outputDirectory>lib/ext</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
@@ -146,7 +146,7 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.jbossts:arjunacore-services</include>
+ <include>org.jboss.narayana:arjunacore-services</include>
</includes>
<outputDirectory>services/lib</outputDirectory>
<outputFileNameMapping>jbossjts-services.jar
Modified: labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml 2011-06-02 09:24:01 UTC (rev 37052)
+++ labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml 2011-06-02 09:32:31 UTC (rev 37053)
@@ -55,8 +55,8 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- <version>2.0.0.Alpha3</version>
+ <artifactId>jbossws-api</artifactId>
+ <version>1.0.0.Beta1</version><!-- TODO AS7 -->
</dependency>
<dependency>
<groupId>org.jboss.narayana</groupId>
Modified: labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml 2011-06-02 09:24:01 UTC (rev 37052)
+++ labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml 2011-06-02 09:32:31 UTC (rev 37053)
@@ -104,5 +104,10 @@
<groupId>org.jboss.narayana</groupId>
<artifactId>wsas</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-api</artifactId>
+ <version>1.0.0.Beta1</version><!-- TODO AS7 -->
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet/pom.xml 2011-06-02 09:24:01 UTC (rev 37052)
+++ labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet/pom.xml 2011-06-02 09:32:31 UTC (rev 37053)
@@ -32,6 +32,13 @@
</includes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml 2011-06-02 09:24:01 UTC (rev 37052)
+++ labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml 2011-06-02 09:32:31 UTC (rev 37053)
@@ -69,5 +69,10 @@
<groupId>org.jboss.narayana</groupId>
<artifactId>wstx</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-api</artifactId>
+ <version>1.0.0.Beta1</version><!-- TODO AS7 -->
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml 2011-06-02 09:24:01 UTC (rev 37052)
+++ labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml 2011-06-02 09:32:31 UTC (rev 37053)
@@ -14,7 +14,7 @@
<dependencySets>
<dependencySet>
<includes>
- <include>org.jboss.jbossts:xts-demo</include>
+ <include>org.jboss.narayana:xts-demo</include>
</includes>
<outputDirectory>demo</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
@@ -28,7 +28,7 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.jbossts:jbossxts-api*javadoc*</include>
+ <include>org.jboss.narayana:jbossxts-api*javadoc*</include>
</includes>
<outputDirectory>docs/api</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
@@ -37,7 +37,7 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.jbossts:localjunit</include>
+ <include>org.jboss.narayana:localjunit</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>interop-tests</outputDirectory>
@@ -47,7 +47,7 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.jbossts:localjunit</include>
+ <include>org.jboss.narayana:localjunit</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>tests</outputDirectory>
@@ -57,7 +57,7 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.jbossts:xts-test-servlet</include>
+ <include>org.jboss.narayana:xts-test-servlet</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>tests</outputDirectory>
@@ -67,15 +67,15 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.jbossts:ws-t11*api</include>
- <include>org.jboss.jbossts:wstx11*api</include>
- <include>org.jboss.jbossts:ws-c*api</include>
- <include>org.jboss.jbossts:bridge*api</include>
- <include>org.jboss.jbossts:ws-t*api</include>
- <include>org.jboss.jbossts:ws-c10*api</include>
- <include>org.jboss.jbossts:wstx10*api</include>
- <include>org.jboss.jbossts:wstx*api</include>
- <include>org.jboss.jbossts:ws-t10*api</include>
+ <include>org.jboss.narayana:ws-t11*api</include>
+ <include>org.jboss.narayana:wstx11*api</include>
+ <include>org.jboss.narayana:ws-c*api</include>
+ <include>org.jboss.narayana:bridge*api</include>
+ <include>org.jboss.narayana:ws-t*api</include>
+ <include>org.jboss.narayana:ws-c10*api</include>
+ <include>org.jboss.narayana:wstx10*api</include>
+ <include>org.jboss.narayana:wstx*api</include>
+ <include>org.jboss.narayana:ws-t10*api</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
@@ -85,21 +85,21 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.jbossts:wsas:jar</include>
- <include>org.jboss.jbossts:ws-c:jar</include>
- <include>org.jboss.jbossts:ws-c10:jar</include>
- <include>org.jboss.jbossts:ws-c11:jar</include>
- <include>org.jboss.jbossts:ws-t:jar</include>
- <include>org.jboss.jbossts:ws-t10:jar</include>
- <include>org.jboss.jbossts:ws-t11:jar</include>
- <include>org.jboss.jbossts:wscf:jar</include>
- <include>org.jboss.jbossts:wscf10:jar</include>
- <include>org.jboss.jbossts:wscf11:jar</include>
- <include>org.jboss.jbossts:wstx:jar</include>
- <include>org.jboss.jbossts:wstx10:jar</include>
- <include>org.jboss.jbossts:wstx11:jar</include>
- <include>org.jboss.jbossts:recovery:jar</include>
- <include>org.jboss.jbossts:jbossxts-api:jar</include>
+ <include>org.jboss.narayana:wsas:jar</include>
+ <include>org.jboss.narayana:ws-c:jar</include>
+ <include>org.jboss.narayana:ws-c10:jar</include>
+ <include>org.jboss.narayana:ws-c11:jar</include>
+ <include>org.jboss.narayana:ws-t:jar</include>
+ <include>org.jboss.narayana:ws-t10:jar</include>
+ <include>org.jboss.narayana:ws-t11:jar</include>
+ <include>org.jboss.narayana:wscf:jar</include>
+ <include>org.jboss.narayana:wscf10:jar</include>
+ <include>org.jboss.narayana:wscf11:jar</include>
+ <include>org.jboss.narayana:wstx:jar</include>
+ <include>org.jboss.narayana:wstx10:jar</include>
+ <include>org.jboss.narayana:wstx11:jar</include>
+ <include>org.jboss.narayana:recovery:jar</include>
+ <include>org.jboss.narayana:jbossxts-api:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
@@ -109,7 +109,7 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.jbossts:jbossxts-sar:sar:sar</include>
+ <include>org.jboss.narayana:jbossxts-sar:sar:sar</include>
</includes>
<outputDirectory>sar</outputDirectory>
<outputFileNameMapping>jbossxts.${artifact.extension}
@@ -120,11 +120,11 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.jbossts:ws-c10:war:war</include>
- <include>org.jboss.jbossts:ws-c11:war:war</include>
- <include>org.jboss.jbossts:ws-t10:war:war</include>
- <include>org.jboss.jbossts:wscf10:war:war</include>
- <include>org.jboss.jbossts:wstx10:war:war</include>
+ <include>org.jboss.narayana:ws-c10:war:war</include>
+ <include>org.jboss.narayana:ws-c11:war:war</include>
+ <include>org.jboss.narayana:ws-t10:war:war</include>
+ <include>org.jboss.narayana:wscf10:war:war</include>
+ <include>org.jboss.narayana:wstx10:war:war</include>
</includes>
<outputDirectory>webapps</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
@@ -135,9 +135,9 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.jbossts:ws-t11:war:client</include>
- <include>org.jboss.jbossts:ws-t11:war:coordinator</include>
- <include>org.jboss.jbossts:ws-t11:war:participant</include>
+ <include>org.jboss.narayana:ws-t11:war:client</include>
+ <include>org.jboss.narayana:ws-t11:war:coordinator</include>
+ <include>org.jboss.narayana:ws-t11:war:participant</include>
</includes>
<outputDirectory>webapps</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}
Modified: labs/jbosstm/trunk/XTS/localjunit/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/pom.xml 2011-06-02 09:24:01 UTC (rev 37052)
+++ labs/jbosstm/trunk/XTS/localjunit/pom.xml 2011-06-02 09:32:31 UTC (rev 37053)
@@ -16,6 +16,15 @@
<packaging>jar</packaging>
<build>
<sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<dependency>
More information about the jboss-svn-commits
mailing list