[jboss-cvs] JBossAS SVN: r57351 - in trunk: aspects build console ejb3 jbossas testsuite thirdparty tomcat tools/etc/buildmagic
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 2 10:29:34 EDT 2006
Author: kabir.khan at jboss.com
Date: 2006-10-02 10:29:27 -0400 (Mon, 02 Oct 2006)
New Revision: 57351
Modified:
trunk/aspects/.classpath
trunk/aspects/build.xml
trunk/build/build-thirdparty.xml
trunk/build/build.xml
trunk/console/.classpath
trunk/ejb3/.classpath
trunk/jbossas/.classpath
trunk/testsuite/.classpath
trunk/thirdparty/.project
trunk/tomcat/.classpath
trunk/tools/etc/buildmagic/modules.ent
Log:
[JBAOP-289]Pull in jboss aop via thirdparty as preparation for moving it out of head
Modified: trunk/aspects/.classpath
===================================================================
--- trunk/aspects/.classpath 2006-10-02 14:10:15 UTC (rev 57350)
+++ trunk/aspects/.classpath 2006-10-02 14:29:27 UTC (rev 57351)
@@ -9,7 +9,6 @@
<classpathentry kind="src" path="/system"/>
<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="/aop"/>
<classpathentry kind="src" path="/cluster"/>
<classpathentry kind="src" path="/transaction"/>
<classpathentry kind="src" path="/j2ee"/>
@@ -33,5 +32,7 @@
<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-core/lib/jboss-common-core.jar"/>
+ <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="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml 2006-10-02 14:10:15 UTC (rev 57350)
+++ trunk/aspects/build.xml 2006-10-02 14:29:27 UTC (rev 57351)
@@ -95,7 +95,6 @@
<path refid="jboss.system.classpath"/>
<path refid="jboss.cluster.classpath"/>
<path refid="jboss.transaction.classpath"/>
- <path refid="jboss.aop.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.test.classpath"/>
</path>
@@ -180,6 +179,7 @@
<mkdir dir="${build.classes}"/>
<path id="javac14.classpath">
<path refid="javac.classpath"/>
+ <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
<pathelement path="${jboss.aop.lib}/jdk14-pluggable-instrumentor.jar"/>
</path>
<javac destdir="${build.classes}"
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2006-10-02 14:10:15 UTC (rev 57350)
+++ trunk/build/build-thirdparty.xml 2006-10-02 14:29:27 UTC (rev 57351)
@@ -84,6 +84,7 @@
<componentref name="jacorb" version="2.2.4jboss.patch1"/>
<componentref name="javassist" version="snapshot"/>
<componentref name="jaxen" version="1.1beta4"/>
+ <componentref name="jboss/aop" version="snapshot"/>
<componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
<componentref name="jboss/cache" version="snapshot"/>
<componentref name="jboss/common-core" version="2.0.1.GA"/>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2006-10-02 14:10:15 UTC (rev 57350)
+++ trunk/build/build.xml 2006-10-02 14:29:27 UTC (rev 57351)
@@ -82,7 +82,6 @@
<moduleconfig property="modules" selected="${groups}">
<!-- Modules -->
- <module name="aop"/>
<module name="aspects"/>
<module name="cluster"/>
<module name="connector"/>
@@ -121,7 +120,7 @@
</group>
<group name="core">
- <include modules="j2se, mbeans, jmx, system, system-jmx, naming, aop"/>
+ <include modules="j2se, mbeans, jmx, system, system-jmx, naming"/>
</group>
<group name="basic">
@@ -378,15 +377,6 @@
<ant antfile="build-distr.xml" target="_module-ejb3x-most"/>
</target>
- <!-- ======== -->
- <!-- AOP -->
- <!-- ======== -->
-
- <target name="_module-aop-most">
- <ant antfile="build-distr.xml" target="_module-aop-most"/>
- </target>
-
-
<!-- ======== -->
<!-- ASPECTS -->
<!-- ======== -->
Modified: trunk/console/.classpath
===================================================================
--- trunk/console/.classpath 2006-10-02 14:10:15 UTC (rev 57350)
+++ trunk/console/.classpath 2006-10-02 14:29:27 UTC (rev 57351)
@@ -3,9 +3,9 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<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="/management"/>
<classpathentry kind="lib" path="/thirdparty/gnu-getopt/lib/getopt.jar"/>
<classpathentry kind="lib" path="/thirdparty/beanshell/lib/bsh-1.3.0.jar"/>
@@ -15,12 +15,12 @@
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/jsp-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/trove/lib/trove.jar"/>
- <classpathentry kind="src" path="/aop"/>
<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
<classpathentry kind="src" path="/j2se"/>
<classpathentry kind="src" path="/server"/>
<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/aop/lib/jboss-aop-jdk50.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath 2006-10-02 14:10:15 UTC (rev 57350)
+++ trunk/ejb3/.classpath 2006-10-02 14:29:27 UTC (rev 57351)
@@ -48,11 +48,10 @@
<classpathentry kind="src" path="docs/tutorial/timer/src"/>
<classpathentry kind="src" path="/ejb3x"/>
<classpathentry kind="src" path="/j2ee"/>
- <classpathentry kind="src" path="/aop"/>
<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"/>
- <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="/system"/>
<classpathentry kind="src" path="/j2se"/>
<classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar"/>
@@ -91,5 +90,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/microcontainer/lib/jboss-deployers.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/jbossas/.classpath
===================================================================
--- trunk/jbossas/.classpath 2006-10-02 14:10:15 UTC (rev 57350)
+++ trunk/jbossas/.classpath 2006-10-02 14:29:27 UTC (rev 57351)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry combineaccessrules="false" kind="src" path="/aop"/>
<classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
<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-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="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2006-10-02 14:10:15 UTC (rev 57350)
+++ trunk/testsuite/.classpath 2006-10-02 14:29:27 UTC (rev 57351)
@@ -20,7 +20,6 @@
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry kind="lib" path="/thirdparty/junitejb/lib/junitejb.jar"/>
<classpathentry kind="lib" path="/tools/lib/ant.jar"/>
- <classpathentry kind="src" path="/aop"/>
<classpathentry kind="src" path="/aspects"/>
<classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/>
<classpathentry kind="lib" path="/thirdparty/jgroups/lib/jgroups.jar"/>
@@ -53,9 +52,9 @@
<classpathentry kind="lib" path="/thirdparty/sun-xacml/lib/sunxacml.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-xacml/lib/sunxacml-support.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache-jdk50.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 kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/thirdparty/joesnmp/lib/joesnmp.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-api.jar"/>
Modified: trunk/thirdparty/.project
===================================================================
--- trunk/thirdparty/.project 2006-10-02 14:10:15 UTC (rev 57350)
+++ trunk/thirdparty/.project 2006-10-02 14:29:27 UTC (rev 57351)
@@ -5,7 +5,13 @@
<projects>
</projects>
<buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Modified: trunk/tomcat/.classpath
===================================================================
--- trunk/tomcat/.classpath 2006-10-02 14:10:15 UTC (rev 57350)
+++ trunk/tomcat/.classpath 2006-10-02 14:29:27 UTC (rev 57351)
@@ -18,7 +18,6 @@
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-logging/lib/commons-logging.jar"/>
- <classpathentry kind="src" path="/aop"/>
<classpathentry kind="src" path="/aspects"/>
<classpathentry kind="src" path="/j2se"/>
<classpathentry kind="src" path="/transaction"/>
@@ -43,5 +42,6 @@
<classpathentry sourcepath="/home/svn/JBossMC/jbossmc/container/src/main" kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
<classpathentry sourcepath="/home/svn/JBossHead/projects/test/trunk/test/src/main" kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent 2006-10-02 14:10:15 UTC (rev 57350)
+++ trunk/tools/etc/buildmagic/modules.ent 2006-10-02 14:29:27 UTC (rev 57351)
@@ -25,16 +25,7 @@
</fileset>
</path>
-<!-- AOP -->
-<property name="jboss.aop.root" value="${project.root}/aop/output"/>
-<property name="jboss.aop.lib" value="${jboss.aop.root}/lib"/>
-<path id="jboss.aop.classpath">
- <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
-</path>
-<path id="jboss.aop50.classpath">
- <pathelement path="${jboss.aop.lib}/jboss-aop-jdk50.jar"/>
-</path>
-
+<!-- Aspects -->
<property name="jboss.aspects.root" value="${project.root}/aspects/output"/>
<property name="jboss.aspects.lib" value="${jboss.aspects.root}/lib"/>
<path id="jboss.aspects.classpath">
More information about the jboss-cvs-commits
mailing list