[jboss-cvs] JBossAS SVN: r84647 - in trunk: aspects and 22 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 23 12:39:03 EST 2009
Author: adrian at jboss.org
Date: 2009-02-23 12:39:03 -0500 (Mon, 23 Feb 2009)
New Revision: 84647
Removed:
trunk/j2se/
trunk/jmx/
trunk/mbeans/
Modified:
trunk/aspects/build.xml
trunk/aspects/pom.xml
trunk/build/build-distr.xml
trunk/build/build.xml
trunk/build/pom.xml
trunk/cluster/build.xml
trunk/cluster/pom.xml
trunk/component-matrix/pom.xml
trunk/connector/build.xml
trunk/connector/pom.xml
trunk/console/build.xml
trunk/console/pom.xml
trunk/deployment/pom.xml
trunk/ejb3/build-test.xml
trunk/ejb3/build.xml
trunk/ejb3/pom.xml
trunk/embedded/build.xml
trunk/embedded/pom.xml
trunk/iiop/build.xml
trunk/iiop/pom.xml
trunk/jbossas/jmx-remoting/pom.xml
trunk/jbossas/remoting/pom.xml
trunk/jmx-remoting/pom.xml
trunk/management/build.xml
trunk/management/pom.xml
trunk/messaging/build.xml
trunk/messaging/pom.xml
trunk/pom.xml
trunk/security/pom.xml
trunk/server/pom.xml
trunk/system-jmx/pom.xml
trunk/testsuite/build.xml
trunk/thirdparty/pom.xml
trunk/tomcat/build.xml
trunk/tomcat/pom.xml
trunk/varia/build.xml
trunk/varia/pom.xml
trunk/webservices/build.xml
Log:
[JBAS-6539] - Use JBossMX 6.0.0.Beta1
Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/aspects/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -98,8 +98,7 @@
<!-- Configure modules -->
<path id="dependentmodule.classpath">
- <path refid="jboss.j2se.classpath"/>
- <path refid="jboss.jmx.classpath"/>
+ <path refid="jboss.mx.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.cluster.classpath"/>
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/aspects/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -112,8 +112,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/build/build-distr.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -804,117 +804,6 @@
</copy>
</target>
- <!-- ==== -->
- <!-- J2SE -->
- <!-- ==== -->
-
- <target name="_module-j2se-most">
- <property name="_module.name" value="j2se" override="true"/>
- <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
- <!-- Copy the generated libraries -->
- <mkdir dir="${install.lib}"/>
- <copy todir="${install.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-j2se.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy the generated client libraries -->
- <mkdir dir="${install.client}"/>
- <copy tofile="${install.client}/jboss-j2se.jar" file="${_module.output}/lib/jboss-j2se.jar"/>
-
- </target>
-
- <target name="_module-j2se-all" depends="_module-j2se-most">
- <!-- Copy the generated javadocs -->
- <mkdir dir="${install.api}/${_module.name}"/>
- <copy todir="${install.api}/${_module.name}" filtering="no">
- <fileset dir="${_module.output}/api">
- <include name="**/*"/>
- </fileset>
- </copy>
-
- </target>
-
- <!-- ====== -->
- <!-- MBeans -->
- <!-- ====== -->
-
- <target name="_module-mbeans-most">
- <property name="_module.name" value="mbeans" override="true"/>
- <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
- <!-- Copy the generated libraries -->
- <mkdir dir="${install.lib}"/>
- <copy todir="${install.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-mbeans.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy the DTDs -->
- <mkdir dir="${install.dtd}"/>
- <copy todir="${install.dtd}" filtering="no">
- <fileset dir="${project.root}/${_module.name}/src/resources/dtd"/>
- </copy>
-
- </target>
-
- <target name="_module-mbeans-all" depends="_module-mbeans-most">
- <!-- Copy the generated javadocs -->
- <mkdir dir="${install.api}/${_module.name}"/>
- <copy todir="${install.api}/${_module.name}" filtering="no">
- <fileset dir="${_module.output}/api">
- <include name="**/*"/>
- </fileset>
- </copy>
-
- </target>
-
- <!-- === -->
- <!-- JMX -->
- <!-- === -->
-
- <target name="_module-jmx-most">
- <property name="_module.name" value="jmx" override="true"/>
- <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
- <!-- Copy the generated libraries -->
- <mkdir dir="${install.lib}"/>
- <copy todir="${install.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-jmx.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy thirdparty code -->
- <copy todir="${install.lib}" filtering="no">
- <fileset dir="${oswego.concurrent.lib}">
- <include name="concurrent.jar"/>
- </fileset>
- <fileset dir="${dom4j.dom4j.lib}">
- <include name="dom4j.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy the generated client libraries -->
- <mkdir dir="${install.client}"/>
- <copy tofile="${install.client}/jmx-client.jar" file="${_module.output}/lib/jboss-jmx.jar"/>
-
- </target>
-
- <target name="_module-jmx-all" depends="_module-jmx-most">
- <!-- Copy the generated javadocs -->
- <mkdir dir="${install.api}/${_module.name}"/>
- <copy todir="${install.api}/${_module.name}" filtering="no">
- <fileset dir="${_module.output}/api">
- <include name="**/*"/>
- </fileset>
- </copy>
-
- </target>
-
<!-- ======== -->
<!-- Security -->
<!-- ======== -->
@@ -2007,6 +1896,17 @@
<include name="jboss-metatype.jar"/>
<include name="jboss-managed.jar"/>
</fileset>
+ <fileset dir="${oswego.concurrent.lib}">
+ <include name="concurrent.jar"/>
+ </fileset>
+ <fileset dir="${dom4j.dom4j.lib}">
+ <include name="dom4j.jar"/>
+ </fileset>
+ <fileset dir="${jboss.mx.lib}">
+ <include name="jboss-j2se.jar"/>
+ <include name="jboss-mbeans.jar"/>
+ <include name="jboss-jmx.jar"/>
+ </fileset>
<fileset dir="${jboss.jboss.cl.lib}">
<include name="jboss-classloader.jar"/>
<include name="jboss-classloading.jar"/>
@@ -2103,6 +2003,10 @@
<fileset dir="${jboss.jbosssx.lib}">
<include name="jbosssx-client.jar"/>
</fileset>
+ <fileset dir="${jboss.mx.lib}">
+ <include name="jboss-j2se.jar"/>
+ <include name="jboss-jmx.jar"/>
+ </fileset>
<fileset dir="${jboss.metadata.lib}">
<include name="jboss-metadata.jar"/>
</fileset>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/build/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -97,11 +97,8 @@
<module name="embedded"/>
<module name="hibernate-int"/>
<module name="iiop"/>
- <module name="j2se" externalBuild="true"/>
- <module name="jmx" externalBuild="true"/>
<module name="main" externalBuild="true"/>
<module name="management"/>
- <module name="mbeans" externalBuild="true"/>
<module name="messaging"/>
<module name="jbossas/remoting" externalBuild="true"/>
<module name="jmx-remoting" externalBuild="true"/>
@@ -127,7 +124,7 @@
</group>
<group name="core">
- <include modules="bootstrap, main, j2se, mbeans, jmx, system, system-jmx"/>
+ <include modules="bootstrap, main, system, system-jmx"/>
</group>
<group name="basic">
@@ -513,42 +510,6 @@
</target>
- <!-- ==== -->
- <!-- J2SE -->
- <!-- ==== -->
-
- <target name="_module-j2se-most">
- <ant antfile="build-distr.xml" target="_module-j2se-most"/>
- </target>
-
- <target name="_module-j2se-all" depends="_module-j2se-most">
- <ant antfile="build-distr.xml" target="_module-j2se-all"/>
- </target>
-
- <!-- ====== -->
- <!-- MBeans -->
- <!-- ====== -->
-
- <target name="_module-mbeans-most">
- <ant antfile="build-distr.xml" target="_module-mbeans-most"/>
- </target>
-
- <target name="_module-mbeans-all" depends="_module-mbeans-most">
- <ant antfile="build-distr.xml" target="_module-mbeans-most"/>
- </target>
-
- <!-- === -->
- <!-- JMX -->
- <!-- === -->
-
- <target name="_module-jmx-most">
- <ant antfile="build-distr.xml" target="_module-jmx-most"/>
- </target>
-
- <target name="_module-jmx-all" depends="_module-jmx-most">
- <ant antfile="build-distr.xml" target="_module-jmx-all"/>
- </target>
-
<!-- ======== -->
<!-- Security -->
<!-- ======== -->
@@ -919,6 +880,7 @@
<include name="jboss-javaee.jar"/>
<include name="jboss-integration.jar"/>
<include name="jboss-j2se.jar"/>
+ <include name="jboss-jmx.jar"/>
<include name="jboss-remoting.jar"/>
<include name="jboss-security-spi.jar"/>
<include name="jboss-serialization.jar"/>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/build/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -47,16 +47,6 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jmx</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-main</artifactId>
</dependency>
@@ -64,11 +54,6 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-management</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-mbeans</artifactId>
- </dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
Modified: trunk/cluster/build.xml
===================================================================
--- trunk/cluster/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/cluster/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -108,7 +108,7 @@
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.server.classpath"/>
- <path refid="jboss.j2se.classpath"/>
+ <path refid="jboss.mx.classpath"/>
</path>
<!-- ===== -->
Modified: trunk/cluster/pom.xml
===================================================================
--- trunk/cluster/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/cluster/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -149,8 +149,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/component-matrix/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -76,6 +76,7 @@
<version.org.jboss.integration>6.0.0.Alpha4</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.0.GA</version.org.jboss.jbossxb>
<version.org.jboss.metadata>1.0.0.CR16</version.org.jboss.metadata>
+ <version.org.jboss.mx>6.0.0.Beta1</version.org.jboss.mx>
<version.org.jboss.naming>5.0.1.GA</version.org.jboss.naming>
<version.org.jboss.remoting>2.5.0.SP2</version.org.jboss.remoting>
<version.org.jboss.security>2.0.2.SP3</version.org.jboss.security>
@@ -764,6 +765,24 @@
</dependency>
<dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ <version>${version.org.jboss.mx}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-mbeans</artifactId>
+ <version>${version.org.jboss.mx}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <version>${version.org.jboss.mx}</version>
+ </dependency>
+
+ <dependency>
<groupId>jboss.jbossts</groupId>
<artifactId>jbossjta</artifactId>
<version>${version.jboss.jbossts}</version>
Modified: trunk/connector/build.xml
===================================================================
--- trunk/connector/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/connector/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -114,7 +114,7 @@
<path refid="jboss.bootstrap.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.j2se.classpath"/>
+ <path refid="jboss.mx.classpath"/>
<path refid="jboss.serialization.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.aop.classpath"/>
Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/connector/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -98,8 +98,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: trunk/console/build.xml
===================================================================
--- trunk/console/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/console/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -94,7 +94,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.j2se.classpath"/>
+ <path refid="jboss.mx.classpath"/>
<path refid="jboss.management.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.server.classpath"/>
@@ -359,7 +359,7 @@
<zipfileset src="${jboss.jnp.client.lib}/jnp-client.jar">
<exclude name="META-INF/INDEX.LIST"/>
</zipfileset>
- <zipfileset src="${jboss.jmx.lib}/jboss-jmx.jar">
+ <zipfileset src="${jboss.mx.lib}/jboss-jmx.jar">
<exclude name="META-INF/INDEX.LIST"/>
<exclude name="org/jboss/mx/server/**"/>
<exclude name="org/jboss/mx/remote/**"/>
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/console/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -91,8 +91,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
<groupId>dom4j</groupId>
Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/deployment/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -211,8 +211,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/ejb3/build-test.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -190,7 +190,7 @@
<!-- The combined dependent module classpath -->
<path id="dependentmodule.classpath">
<path refid="jboss.jboss.javaee.classpath"/>
- <path refid="jboss.j2se.classpath"/>
+ <path refid="jboss.mx.classpath"/>
<path refid="jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
<path refid="jboss.common.core.classpath"/>
Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/ejb3/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -136,7 +136,7 @@
<!-- The combined dependent module classpath -->
<path id="dependentmodule.classpath">
<path refid="jboss.jboss.javaee.classpath"/>
- <path refid="jboss.j2se.classpath"/>
+ <path refid="jboss.mx.classpath"/>
<path refid="jboss.aop.classpath"/>
<path refid="jboss.cache.jbosscache.core.classpath"/>
<path refid="jboss.aspects.classpath"/>
@@ -148,7 +148,6 @@
<path refid="jboss.main.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.mbeans.classpath"/>
<path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/ejb3/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -155,8 +155,8 @@
<artifactId>jboss-as-iiop</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
Modified: trunk/embedded/build.xml
===================================================================
--- trunk/embedded/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/embedded/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -119,7 +119,7 @@
<!-- The combined dependent module classpath -->
<path id="dependentmodule.classpath">
<path refid="jboss.jboss.javaee.classpath"/>
- <path refid="jboss.j2se.classpath"/>
+ <path refid="jboss.mx.classpath"/>
<path refid="jboss.aop.classpath"/>
<path refid="jboss.cache.classpath"/>
<path refid="jboss.aspects.classpath"/>
Modified: trunk/embedded/pom.xml
===================================================================
--- trunk/embedded/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/embedded/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -129,8 +129,8 @@
<artifactId>jboss-transaction-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
Modified: trunk/iiop/build.xml
===================================================================
--- trunk/iiop/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/iiop/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -103,7 +103,7 @@
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.server.classpath"/>
- <path refid="jboss.j2se.classpath"/>
+ <path refid="jboss.mx.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
<path refid="jboss.security.int.classpath"/>
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/iiop/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -240,4 +240,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/jbossas/jmx-remoting/pom.xml
===================================================================
--- trunk/jbossas/jmx-remoting/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/jbossas/jmx-remoting/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -85,8 +85,8 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
@@ -99,4 +99,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/jbossas/remoting/pom.xml
===================================================================
--- trunk/jbossas/remoting/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/jbossas/remoting/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -89,8 +89,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -102,4 +102,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/jmx-remoting/pom.xml
===================================================================
--- trunk/jmx-remoting/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/jmx-remoting/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -107,8 +107,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
<groupId>javax.security</groupId>
@@ -124,4 +124,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/management/build.xml
===================================================================
--- trunk/management/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/management/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -115,7 +115,7 @@
<path refid="jboss.bootstrap.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.j2se.classpath"/>
+ <path refid="jboss.mx.classpath"/>
</path>
<!-- ===== -->
Modified: trunk/management/pom.xml
===================================================================
--- trunk/management/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/management/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -100,8 +100,8 @@
<artifactId>jboss-ha-server-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
Modified: trunk/messaging/build.xml
===================================================================
--- trunk/messaging/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/messaging/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -82,7 +82,7 @@
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.jboss.deployers.classpath"/>
- <path refid="jboss.j2se.classpath"/>
+ <path refid="jboss.mx.classpath"/>
<path refid="jboss.messaging.classpath"/>
<path refid="jboss.metadata.classpath"/>
<path refid="jboss.server.classpath"/>
Modified: trunk/messaging/pom.xml
===================================================================
--- trunk/messaging/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/messaging/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -23,8 +23,8 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -65,4 +65,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -206,17 +206,6 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
<version>${project.version}</version>
</dependency>
@@ -239,11 +228,6 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jmx</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-main</artifactId>
<version>${project.version}</version>
</dependency>
@@ -266,11 +250,6 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-mbeans</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-profileservice</artifactId>
<version>${project.version}</version>
</dependency>
@@ -384,9 +363,6 @@
<module>component-matrix</module>
<module>bootstrap</module>
<module>main</module>
- <module>j2se</module>
- <module>mbeans</module>
- <module>jmx</module>
<module>system</module>
<module>system-jmx</module>
<module>security</module>
@@ -433,9 +409,6 @@
<module>component-matrix</module>
<module>bootstrap</module>
<module>main</module>
- <module>j2se</module>
- <module>mbeans</module>
- <module>jmx</module>
<module>system</module>
<module>system-jmx</module>
<module>security</module>
Modified: trunk/security/pom.xml
===================================================================
--- trunk/security/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/security/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -128,8 +128,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
@@ -159,4 +159,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/server/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -357,8 +357,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
@@ -458,4 +458,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/system-jmx/pom.xml
===================================================================
--- trunk/system-jmx/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/system-jmx/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -164,8 +164,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -176,8 +176,8 @@
<artifactId>jboss-as-system</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jmx</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/testsuite/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -223,7 +223,7 @@
<path refid="jboss.hibernate.classpath"/>
<path refid="jboss.iiop.classpath"/>
<path refid="jboss.internal-server.classpath"/>
- <path refid="jboss.j2se.classpath"/>
+ <path refid="jboss.mx.classpath"/>
<path refid="jboss.jboss.jaspi.api.classpath"/>
<path refid="jboss.jboss.javaee.classpath"/>
<path refid="org.jboss.javaee.classpath"/>
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/thirdparty/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -636,6 +636,27 @@
</mapping>
</dependency>
<dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ <mapping>
+ <componentId>jboss.mx</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-mbeans</artifactId>
+ <mapping>
+ <componentId>jboss.mx</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <mapping>
+ <componentId>jboss.mx</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnpserver</artifactId>
<mapping>
@@ -1516,6 +1537,18 @@
<artifactId>jbossxb</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-mbeans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnp-client</artifactId>
</dependency>
Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/tomcat/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -97,7 +97,7 @@
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.security.int.classpath"/>
<path refid="jboss.server.classpath"/>
- <path refid="jboss.j2se.classpath"/>
+ <path refid="jboss.mx.classpath"/>
<path refid="jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
<path refid="jboss.jca.classpath"/>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/tomcat/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -203,8 +203,8 @@
<artifactId>jboss-as-iiop</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/varia/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -115,12 +115,11 @@
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
<path refid="jboss.common.logging.jdk.classpath"/>
- <path refid="jboss.jmx.classpath"/>
<path refid="jboss.cluster.classpath"/>
<path refid="jboss.bootstrap.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.j2se.classpath"/>
+ <path refid="jboss.mx.classpath"/>
<path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/varia/pom.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -129,8 +129,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
Modified: trunk/webservices/build.xml
===================================================================
--- trunk/webservices/build.xml 2009-02-23 17:30:26 UTC (rev 84646)
+++ trunk/webservices/build.xml 2009-02-23 17:39:03 UTC (rev 84647)
@@ -92,8 +92,7 @@
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
<path refid="jboss.aspects.classpath"/>
- <path refid="jboss.j2se.classpath"/>
- <path refid="jboss.jmx.classpath"/>
+ <path refid="jboss.mx.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
More information about the jboss-cvs-commits
mailing list