[jboss-cvs] JBossAS SVN: r62743 - in trunk: aspects and 16 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 2 12:24:21 EDT 2007
Author: wolfc
Date: 2007-05-02 12:24:21 -0400 (Wed, 02 May 2007)
New Revision: 62743
Removed:
trunk/ejb3x/
trunk/j2ee/
Modified:
trunk/aspects/.classpath
trunk/aspects/build.xml
trunk/build/build-distr.xml
trunk/build/build-thirdparty.xml
trunk/build/build.xml
trunk/cluster/.classpath
trunk/cluster/build.xml
trunk/connector/.classpath
trunk/connector/build.xml
trunk/deployment/.classpath
trunk/deployment/build.xml
trunk/ejb3/.classpath
trunk/ejb3/build.xml
trunk/hibernate-int/.classpath
trunk/hibernate-int/build.xml
trunk/iiop/.classpath
trunk/iiop/build.xml
trunk/jbossmq/.classpath
trunk/jbossmq/build.xml
trunk/management/.classpath
trunk/management/build.xml
trunk/messaging/.classpath
trunk/messaging/build.xml
trunk/server/.classpath
trunk/server/build.xml
trunk/spring-int/.classpath
trunk/testsuite/.classpath
trunk/testsuite/build.sh
trunk/testsuite/build.xml
trunk/tomcat/.classpath
trunk/tomcat/build.xml
trunk/transaction/.classpath
trunk/transaction/build.xml
trunk/varia/.classpath
trunk/varia/build.xml
Log:
Replaced j2ee & ejb3x with javaee module.
Modified: trunk/aspects/.classpath
===================================================================
--- trunk/aspects/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/aspects/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -10,7 +10,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar" sourcepath="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-sources.jar"/>
<classpathentry kind="src" path="/cluster"/>
<classpathentry kind="src" path="/transaction"/>
- <classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar" sourcepath="/thirdparty/apache-log4j/lib/log4j-src.zip"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-logging/lib/commons-logging.jar"/>
@@ -35,5 +34,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/pluggable-instrumentor.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/aspects/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -87,7 +87,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.j2ee.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.jmx.classpath"/>
<path refid="jboss.system.classpath"/>
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/build/build-distr.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -1864,6 +1864,12 @@
<fileset dir="${jboss.jbossws.wsconsume.impl.lib}">
<include name="jbossws-wsconsume-impl.jar"/>
</fileset>
+ <fileset dir="${jboss.jboss.jaspi.api.lib}">
+ <include name="jboss-jaspi-api.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jboss.javaee.lib}">
+ <include name="jboss-javaee.jar"/>
+ </fileset>
</copy>
<!-- Copy thirdparty code to lib/endorsed -->
@@ -1888,6 +1894,12 @@
<fileset dir="${jaxen.jaxen.lib}">
<include name="jaxen.jar"/>
</fileset>
+ <fileset dir="${jboss.jboss.jaspi.api.lib}">
+ <include name="jboss-jaspi-api.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jboss.javaee.lib}">
+ <include name="jboss-javaee.jar"/>
+ </fileset>
<fileset dir="${jboss.jbossws.lib}">
<include name="jbossws-integration.jar"/>
<include name="jboss-jaxrpc.jar"/>
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/build/build-thirdparty.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -92,6 +92,8 @@
<componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/>
<componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
<componentref name="jboss/jaxr" version="1.2.0.GA"/>
+ <componentref name="jboss/jboss-javaee" version="5.0.0-SNAPSHOT"/>
+ <componentref name="jboss/jboss-jaspi-api" version="1.0-SNAPSHOT"/>
<componentref name="jboss/jbossxb" version="2.0.0.CR2"/>
<componentref name="jboss/jbossws-jboss50" version="2.0.0.CR5"/>
<componentref name="jboss/jbossws-wsconsume-impl" version="2.0.0"/>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/build/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -88,11 +88,9 @@
<module name="console"/>
<module name="deployment"/>
<module name="ejb3"/>
- <module name="ejb3x"/>
<module name="embedded"/>
<module name="hibernate-int"/>
<module name="iiop"/>
- <module name="j2ee"/>
<module name="j2se"/>
<module name="jmx"/>
<module name="management"/>
@@ -127,8 +125,7 @@
</group>
<group name="basic">
- <include modules="j2ee,
- transaction,
+ <include modules="transaction,
server,
deployment" />
@@ -146,7 +143,6 @@
iiop,
management,
aspects,
- ejb3x,
ejb3,
tomcat,
hibernate-int,
@@ -382,9 +378,11 @@
<!-- EJB3X -->
<!-- ======== -->
+<!--
<target name="_module-ejb3x-most">
<ant antfile="build-distr.xml" target="_module-ejb3x-most"/>
</target>
+-->
<!-- ======== -->
<!-- ASPECTS -->
@@ -402,6 +400,7 @@
<!-- J2EE -->
<!-- ==== -->
+<!--
<target name="_module-j2ee-most">
<ant antfile="build-distr.xml" target="_module-j2ee-most"/>
</target>
@@ -409,6 +408,7 @@
<target name="_module-j2ee-all" depends="_module-j2ee-most">
<ant antfile="build-distr.xml" target="_module-j2ee-all"/>
</target>
+-->
<!-- ====== -->
@@ -789,8 +789,7 @@
<include name="jboss-common*.jar"/>
<include name="jboss-logging*.jar"/>
<include name="jboss-deployment.jar"/>
- <include name="jboss-ejb3x.jar"/>
- <include name="jboss-j2ee.jar"/>
+ <include name="jboss-javaee.jar"/>
<include name="jboss-j2se.jar"/>
<include name="jboss-remoting.jar"/>
<include name="jboss-security-spi.jar"/>
@@ -828,8 +827,7 @@
<include name="jboss-common*.jar"/>
<include name="jboss-logging*.jar"/>
<include name="jboss-deployment.jar"/>
- <include name="jboss-ejb3x.jar"/>
- <include name="jboss-j2ee.jar"/>
+ <include name="jboss-javaee.jar"/>
<include name="jboss-j2se.jar"/>
<include name="jboss-remoting.jar"/>
<include name="jboss-security-spi.jar"/>
Modified: trunk/cluster/.classpath
===================================================================
--- trunk/cluster/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/cluster/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -6,7 +6,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
<classpathentry kind="src" path="/server"/>
- <classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="src" path="/transaction"/>
<classpathentry kind="src" path="/naming"/>
<classpathentry kind="src" path="/messaging"/>
@@ -23,5 +22,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/cluster/build.xml
===================================================================
--- trunk/cluster/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/cluster/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -89,7 +89,7 @@
&modules;
<!-- The combined dependent module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
Modified: trunk/connector/.classpath
===================================================================
--- trunk/connector/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/connector/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -3,7 +3,6 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/system"/>
- <classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
<classpathentry kind="src" path="/server"/>
@@ -29,5 +28,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50-client.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar" sourcepath="/thirdparty/jboss/aop/lib/jboss-aop-src.zip"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int-src.zip"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/connector/build.xml
===================================================================
--- trunk/connector/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/connector/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -97,7 +97,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.j2ee.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.security.classpath"/>
<path refid="jboss.security.spi.classpath"/>
<path refid="jboss.server.classpath"/>
Modified: trunk/deployment/.classpath
===================================================================
--- trunk/deployment/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/deployment/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -7,12 +7,12 @@
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/j2ee"/>
<classpathentry combineaccessrules="false" kind="src" path="/j2se"/>
<classpathentry combineaccessrules="false" kind="src" path="/system"/>
<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/deployment/build.xml
===================================================================
--- trunk/deployment/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/deployment/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -85,7 +85,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.j2ee.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/ejb3/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -2,8 +2,6 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry excluding="org/jboss/ejb3/test/**/*EmbeddedTest.java|org/jboss/ejb3/test/clusteredentity/unit/|org/jboss/ejb3/test/clusteredservice/unit/|org/jboss/ejb3/test/clusteredsession/unit/|org/jboss/ejb3/test/ejbthree921/unit/" kind="src" path="src/test"/>
- <classpathentry kind="src" path="/ejb3x"/>
- <classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="lib" path="/thirdparty/trove/lib/trove.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
@@ -54,5 +52,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jbossws-client.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/mbeans"/>
<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/ejb3/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -114,12 +114,11 @@
<!-- The combined dependent module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.aop.classpath"/>
<path refid="jboss.cache.classpath"/>
<path refid="jboss.aspects.classpath"/>
- <path refid="jboss.ejb3x.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
@@ -373,9 +372,6 @@
<fileset dir="${build.lib}">
<include name="jboss-annotations-ejb3.jar"/>
</fileset>
- <fileset dir="${jboss.ejb3x.lib}">
- <include name="jboss-ejb3x.jar"/>
- </fileset>
<fileset dir="${resources}">
<include name="META-INF/ejb3-deployers-beans.xml"/>
<include name="META-INF/persistence.properties"/>
Modified: trunk/hibernate-int/.classpath
===================================================================
--- trunk/hibernate-int/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/hibernate-int/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -2,10 +2,9 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
- <classpathentry kind="src" path="/j2ee"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
<classpathentry kind="src" path="/server"/>
<classpathentry kind="src" path="/transaction"/>
<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
@@ -17,5 +16,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/hibernate-int/build.xml
===================================================================
--- trunk/hibernate-int/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/hibernate-int/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -92,7 +92,7 @@
<path refid="jboss.common.logging.log4j.classpath"/>
<path refid="jboss.common.logging.jdk.classpath"/>
<path refid="jboss.j2se.classpath"/>
- <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
Modified: trunk/iiop/.classpath
===================================================================
--- trunk/iiop/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/iiop/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -6,7 +6,6 @@
<classpathentry kind="lib" path="/thirdparty/jacorb/lib/jacorb.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
- <classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="src" path="/naming"/>
<classpathentry kind="src" path="/server"/>
<classpathentry kind="src" path="/system"/>
@@ -15,10 +14,11 @@
<classpathentry kind="lib" path="/thirdparty/apache-avalon/lib/avalon-framework.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/security/lib/jbosssx.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/security-spi/lib/jboss-security-spi.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/iiop/build.xml
===================================================================
--- trunk/iiop/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/iiop/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -89,7 +89,7 @@
&modules;
<!-- The combined dependent module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
Modified: trunk/jbossmq/.classpath
===================================================================
--- trunk/jbossmq/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/jbossmq/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -3,11 +3,10 @@
<classpathentry kind="src" path="output/gen-parsers"/>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="src" path="/system"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
<classpathentry kind="src" path="/server"/>
<classpathentry kind="src" path="/transaction"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
@@ -16,5 +15,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/security/lib/jbosssx.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/security-spi/lib/jboss-security-spi.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/jbossmq/build.xml
===================================================================
--- trunk/jbossmq/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/jbossmq/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -76,7 +76,7 @@
&modules;
<!-- The combined depedant module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
Modified: trunk/management/.classpath
===================================================================
--- trunk/management/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/management/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="src" path="/server"/>
<classpathentry kind="src" path="/cluster"/>
<classpathentry kind="src" path="/connector"/>
@@ -12,5 +11,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
<classpathentry combineaccessrules="false" kind="src" path="/system"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/management/build.xml
===================================================================
--- trunk/management/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/management/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -106,7 +106,7 @@
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.j2se.classpath"/>
- <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
</path>
<!-- ===== -->
Modified: trunk/messaging/.classpath
===================================================================
--- trunk/messaging/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/messaging/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="src" path="/system"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
@@ -16,5 +15,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/security-spi/lib/jboss-security-spi.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
<classpathentry kind="lib" path="/thirdparty/jboss/messaging/lib/jboss-messaging.jar" sourcepath="/home/svn/JBossMessaging/JBossMessaging_1_0_1_GA/src/main"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/messaging/build.xml
===================================================================
--- trunk/messaging/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/messaging/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -75,7 +75,7 @@
&modules;
<!-- The combined depedant module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.j2se.classpath"/>
Modified: trunk/server/.classpath
===================================================================
--- trunk/server/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/server/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -8,7 +8,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
<classpathentry kind="src" path="/system"/>
- <classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="src" path="/naming"/>
<classpathentry kind="lib" path="/thirdparty/apache-bcel/lib/bcel.jar"/>
<classpathentry kind="lib" path="/thirdparty/gjt-jpl-util/lib/jpl-pattern.jar"/>
@@ -38,5 +37,6 @@
<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jbossws-integration.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer-src.zip"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/server/build.xml
===================================================================
--- trunk/server/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/server/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -99,8 +99,8 @@
&modules;
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
- <path refid="ejb3-persistence.classpath"/>
- <path refid="jboss.j2ee.classpath"/>
+ <!--path refid="ejb3-persistence.classpath"/-->
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
Modified: trunk/spring-int/.classpath
===================================================================
--- trunk/spring-int/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/spring-int/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -11,8 +11,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
<classpathentry kind="lib" path="/thirdparty/spring/lib/spring-beans.jar"/>
<classpathentry kind="lib" path="/thirdparty/spring/lib/spring-core.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/j2ee"/>
- <classpathentry combineaccessrules="false" kind="src" path="/ejb3x"/>
<classpathentry kind="lib" path="/thirdparty/spring/lib/spring-web.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/spring/lib/spring-webmvc.jar"/>
@@ -28,5 +26,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/pluggable-instrumentor.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-logging/lib/commons-logging.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/testsuite/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -28,7 +28,6 @@
<classpathentry kind="lib" path="/thirdparty/ibm-wsdl4j/lib/wsdl4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/hsqldb/lib/hsqldb.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
- <classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="src" path="/j2se"/>
<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
<classpathentry kind="src" path="/mbeans"/>
@@ -39,7 +38,6 @@
<classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar"/>
<classpathentry kind="lib" path="/thirdparty/xmlunit-xmlunit/lib/xmlunit1.0.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/hibernate-int"/>
- <classpathentry combineaccessrules="false" kind="src" path="/ejb3x"/>
<classpathentry combineaccessrules="false" kind="src" path="/ejb3"/>
<classpathentry kind="lib" path="/thirdparty/apache-xalan/lib/xalan.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/tomcat"/>
@@ -85,6 +83,8 @@
<classpathentry kind="lib" path="/thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-jaxws.jar"/>
<classpathentry kind="lib" path="/thirdparty/objectweb-joramtests/lib/joramtests.jar" sourcepath="/thirdparty/objectweb-joramtests/lib/joramtests-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api.jar" sourcepath="/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/httpunit/lib/httpunit.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/testsuite/build.sh
===================================================================
--- trunk/testsuite/build.sh 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/testsuite/build.sh 2007-05-02 16:24:21 UTC (rev 62743)
@@ -151,7 +151,7 @@
ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"
# add some more memory
- ANT_OPTS="$ANT_OPTS -Xmx256m"
+ ANT_OPTS="$ANT_OPTS -Xmx512m"
# prevent default config beeing used
ANT_OPTIONS="--noconfig $ANT_OPTIONS"
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/testsuite/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -180,12 +180,12 @@
<path refid="jboss.common.logging.jdk.classpath"/>
<path refid="jboss.deployment.classpath"/>
<path refid="jboss.ejb3.classpath"/>
- <path refid="jboss.ejb3x.classpath"/>
<path refid="jboss.hibernate.classpath"/>
<path refid="jboss.iiop.classpath"/>
<path refid="jboss.internal-server.classpath"/>
<path refid="jboss.j2se.classpath"/>
- <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jboss.jaspi.api.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.jboss.vfs.classpath"/>
<path refid="jboss.jca.classpath"/>
<path refid="jboss.jmx.classpath"/>
Modified: trunk/tomcat/.classpath
===================================================================
--- trunk/tomcat/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/tomcat/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -10,7 +10,6 @@
<classpathentry kind="src" path="/server"/>
<classpathentry kind="src" path="/system"/>
<classpathentry kind="src" path="/cluster"/>
- <classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/jsp-api.jar"/>
<classpathentry kind="src" path="/connector"/>
@@ -46,5 +45,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jbossws-integration.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api.jar" sourcepath="/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/tomcat/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -74,7 +74,8 @@
<!-- The combined dependent module classpath -->
&modules;
<path id="dependentmodule.classpath">
- <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
+ <path refid="jboss.jboss.jaspi.api.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.security.spi.classpath"/>
@@ -85,7 +86,6 @@
<path refid="jboss.cache.classpath"/>
<path refid="jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
- <path refid="jboss.ejb3x.classpath"/>
<path refid="jboss.ejb3.classpath"/>
<path refid="jboss.jca.classpath"/>
<path refid="jboss.transaction.classpath"/>
Modified: trunk/transaction/.classpath
===================================================================
--- trunk/transaction/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/transaction/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -3,13 +3,13 @@
<classpathentry excluding="org/jboss/tm/recovery/test/**" kind="src" path="src/main"/>
<classpathentry kind="src" path="/j2se"/>
<classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
- <classpathentry combineaccessrules="false" kind="src" path="/j2ee"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/system"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/transaction/build.xml
===================================================================
--- trunk/transaction/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/transaction/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -88,7 +88,7 @@
<!-- The combined dependent module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
Modified: trunk/varia/.classpath
===================================================================
--- trunk/varia/.classpath 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/varia/.classpath 2007-05-02 16:24:21 UTC (rev 62743)
@@ -7,7 +7,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
<classpathentry kind="src" path="/cluster"/>
- <classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="src" path="/server"/>
<classpathentry kind="src" path="/transaction"/>
<classpathentry kind="src" path="/naming"/>
@@ -39,5 +38,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossmq"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml 2007-05-02 16:01:13 UTC (rev 62742)
+++ trunk/varia/build.xml 2007-05-02 16:24:21 UTC (rev 62743)
@@ -103,7 +103,7 @@
&modules;
<!-- The combined dependent module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
More information about the jboss-cvs-commits
mailing list