[jboss-cvs] JBossAS SVN: r77682 - in trunk: build and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Aug 30 14:22:06 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-08-30 14:22:06 -0400 (Sat, 30 Aug 2008)
New Revision: 77682
Modified:
trunk/aspects/build.xml
trunk/build/build-distr.xml
trunk/cluster/build.xml
trunk/ejb3/build.xml
trunk/embedded/build.xml
trunk/management/build.xml
trunk/testsuite/build.xml
trunk/thirdparty/pom.xml
trunk/tomcat/build.xml
trunk/varia/build.xml
Log:
Get rid of legacy mapping in thirdparty for org.jboss.cluster group
Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml 2008-08-30 12:03:13 UTC (rev 77681)
+++ trunk/aspects/build.xml 2008-08-30 18:22:06 UTC (rev 77682)
@@ -84,8 +84,7 @@
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.jboss.vfs.classpath"/>
<path refid="jboss.aop.classpath"/>
- <path refid="jboss.jboss.ha.client.classpath"/>
- <path refid="jboss.jboss.ha.server.api.classpath"/>
+ <path refid="org.jboss.cluster.classpath"/>
<path refid="jboss.test.classpath"/>
<path refid="jboss.integration.classpath"/>
<path refid="jboss.common.core.classpath"/>
@@ -252,10 +251,10 @@
</zipfileset>
<!-- Don't include the broken out clustering aspects in the lib
TODO: do these belong? They are already on the AS classpath
- <zipfileset src="${jboss.jboss.ha.client.lib}/jboss-ha-client.jar">
+ <zipfileset src="${org.jboss.clustert.lib}/jboss-ha-client.jar">
<include name="org/jboss/aspects/remoting/**.class"/>
</zipfileset>
- <zipfileset src="${jboss.jboss.ha.server.api.lib}/jboss-ha-server-api.jar">
+ <zipfileset src="${org.jboss.cluster.lib}/jboss-ha-server-api.jar">
<include name="org/jboss/aspects/remoting/**.class"/>
</zipfileset>
-->
@@ -296,7 +295,7 @@
<include name="org/jboss/aspects/tx/ClientTxPropagationInterceptor.class"/>
</zipfileset>
<!-- include the broken out clustering aspects in the lib -->
- <zipfileset src="${jboss.jboss.ha.client.lib}/jboss-ha-client.jar">
+ <zipfileset src="${org.jboss.cluster.lib}/jboss-ha-client.jar">
<include name="org/jboss/aspects/remoting/**.class"/>
</zipfileset>
</jar>
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-08-30 12:03:13 UTC (rev 77681)
+++ trunk/build/build-distr.xml 2008-08-30 18:22:06 UTC (rev 77682)
@@ -1920,7 +1920,7 @@
<fileset dir="${jboss.serialization.lib}">
<include name="jboss-serialization.jar"/>
</fileset>
- <fileset dir="${jboss.jboss.ha.client.lib}">
+ <fileset dir="${org.jboss.cluster.lib}">
<include name="jboss-ha-client.jar"/>
</fileset>
<fileset dir="${sun.jaf.lib}">
@@ -1982,10 +1982,10 @@
<fileset dir="${jaxen.jaxen.lib}">
<include name="jaxen.jar"/>
</fileset>
- <fileset dir="${jboss.jboss.ha.client.lib}">
+ <fileset dir="${org.jboss.cluster.lib}">
<include name="jboss-ha-client.jar"/>
</fileset>
- <fileset dir="${jboss.jboss.ha.server.api.lib}">
+ <fileset dir="${org.jboss.cluster.lib}">
<include name="jboss-ha-server-api.jar"/>
</fileset>
<fileset dir="${jboss.integration.lib}">
Modified: trunk/cluster/build.xml
===================================================================
--- trunk/cluster/build.xml 2008-08-30 12:03:13 UTC (rev 77681)
+++ trunk/cluster/build.xml 2008-08-30 18:22:06 UTC (rev 77682)
@@ -79,8 +79,7 @@
<path refid="jgroups.jgroups.classpath"/>
<path refid="jboss.cache.jbosscache.core.classpath"/>
<path refid="jboss.cache.jbosscache.pojo.classpath"/>
- <path refid="jboss.jboss.ha.client.classpath"/>
- <path refid="jboss.jboss.ha.server.api.classpath"/>
+ <path refid="org.jboss.cluster.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.metadata.classpath"/>
Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml 2008-08-30 12:03:13 UTC (rev 77681)
+++ trunk/ejb3/build.xml 2008-08-30 18:22:06 UTC (rev 77682)
@@ -95,8 +95,7 @@
<path refid="jboss.remoting.classpath"/>
<path refid="apache.logging.classpath"/>
<path refid="jboss.jboss.cl.classpath"/>
- <path refid="jboss.jboss.ha.client.classpath"/>
- <path refid="jboss.jboss.ha.server.api.classpath"/>
+ <path refid="org.jboss.cluster.classpath"/>
<path refid="jboss.jboss.jaspi.api.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
Modified: trunk/embedded/build.xml
===================================================================
--- trunk/embedded/build.xml 2008-08-30 12:03:13 UTC (rev 77681)
+++ trunk/embedded/build.xml 2008-08-30 18:22:06 UTC (rev 77682)
@@ -437,7 +437,7 @@
<zipfileset src="${jboss.jboss.ejb3.cache.lib}/jboss-ejb3-cache.jar"/>
<zipfileset src="${jboss.jboss.ejb3.ext.api.lib}/jboss-ejb3-ext-api.jar"/>
<zipfileset src="${jboss.jboss.ejb3.impl.lib}/jboss-ejb3-impl.jar"/>
- <zipfileset src="${jboss.jboss.ha.client.lib}/jboss-ha-client.jar" />
+ <zipfileset src="${org.jboss.cluster.lib}/jboss-ha-client.jar" />
<zipfileset src="${jboss.profileservice.lib}/jboss-profileservice.jar" />
<zipfileset src="../messaging/output/lib/jboss-messaging-int.jar"/>
</jar>
Modified: trunk/management/build.xml
===================================================================
--- trunk/management/build.xml 2008-08-30 12:03:13 UTC (rev 77681)
+++ trunk/management/build.xml 2008-08-30 18:22:06 UTC (rev 77682)
@@ -90,7 +90,7 @@
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
<path refid="jboss.common.logging.jdk.classpath"/>
- <path refid="jboss.jboss.ha.server.api.classpath"/>
+ <path refid="org.jboss.cluster.classpath"/>
<path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.metadata.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-08-30 12:03:13 UTC (rev 77681)
+++ trunk/testsuite/build.xml 2008-08-30 18:22:06 UTC (rev 77682)
@@ -129,8 +129,7 @@
<path refid="trove.classpath"/>
<path refid="wutka.dtdparser.classpath"/>
<path refid="woodstox.woodstox.classpath"/>
- <path refid="jboss.jboss.ha.client.classpath"/>
- <path refid="jboss.jboss.ha.server.api.classpath"/>
+ <path refid="org.jboss.cluster.classpath"/>
<path refid="org.jboss.jaxr.classpath"/>
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.serialization.classpath"/>
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2008-08-30 12:03:13 UTC (rev 77681)
+++ trunk/thirdparty/pom.xml 2008-08-30 18:22:06 UTC (rev 77682)
@@ -565,20 +565,6 @@
</mapping>
</dependency>
<dependency>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-client</artifactId>
- <mapping>
- <componentId>jboss.jboss-ha-client</componentId>
- </mapping>
- </dependency>
- <dependency>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-api</artifactId>
- <mapping>
- <componentId>jboss.jboss-ha-server-api</componentId>
- </mapping>
- </dependency>
- <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-security-spi</artifactId>
<mapping>
@@ -1588,6 +1574,14 @@
<artifactId>jboss-server-manager</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.cluster</groupId>
+ <artifactId>jboss-ha-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cluster</groupId>
+ <artifactId>jboss-ha-server-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>jboss.web</groupId>
<artifactId>jbossweb</artifactId>
</dependency>
Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml 2008-08-30 12:03:13 UTC (rev 77681)
+++ trunk/tomcat/build.xml 2008-08-30 18:22:06 UTC (rev 77682)
@@ -74,7 +74,7 @@
<path refid="jboss.integration.classpath"/>
<path refid="jboss.jboss.ejb3.core.classpath" />
<path refid="jboss.jboss.ejb3.interceptors.classpath" />
- <path refid="jboss.jboss.ha.server.api.classpath"/>
+ <path refid="org.jboss.cluster.classpath"/>
<path refid="jboss.jboss.jpa.deployers.classpath" />
<path refid="jboss.jboss.reflect.classpath" />
<path refid="net.jcip.classpath" />
Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml 2008-08-30 12:03:13 UTC (rev 77681)
+++ trunk/varia/build.xml 2008-08-30 18:22:06 UTC (rev 77682)
@@ -99,7 +99,7 @@
<path refid="org.jboss.ws.native.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.integration.classpath"/>
- <path refid="jboss.jboss.ha.server.api.classpath"/>
+ <path refid="org.jboss.cluster.classpath"/>
<path refid="jboss.jboss.vfs.classpath"/>
</path>
More information about the jboss-cvs-commits
mailing list