[jboss-cvs] JBossAS SVN: r79096 - in trunk: build and 11 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Oct 3 11:25:59 EDT 2008


Author: kabir.khan at jboss.com
Date: 2008-10-03 11:25:59 -0400 (Fri, 03 Oct 2008)
New Revision: 79096

Modified:
   trunk/aspects/.classpath
   trunk/aspects/build.xml
   trunk/build/build-distr.xml
   trunk/component-matrix/pom.xml
   trunk/console/.classpath
   trunk/embedded/.classpath
   trunk/jbossas/.classpath
   trunk/main/src/main/org/jboss/system/server/ServerLoader.java
   trunk/profileservice/.classpath
   trunk/spring-int/.classpath
   trunk/system/.classpath
   trunk/testsuite/.classpath
   trunk/tomcat/.classpath
   trunk/tools/etc/buildmagic/modules.ent
Log:
[JBAS-5894] Upgrade to AOP 2.0.0.CR18 while waiting for GA

Modified: trunk/aspects/.classpath
===================================================================
--- trunk/aspects/.classpath	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/aspects/.classpath	2008-10-03 15:25:59 UTC (rev 79096)
@@ -6,10 +6,6 @@
 	<classpathentry kind="src" path="src/test50"/>
 	<classpathentry exported="true" kind="src" path="/j2se"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/aop/lib/jboss-standalone-aspect-library-jdk50.jar"/>
-	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-deployer-jdk50.jar"/>
-	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar"/>
-	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jboss4-jdk50.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/javassist/lib/javassist.jar" sourcepath="/thirdparty/javassist/lib/javassist-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
@@ -42,5 +38,10 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar" sourcepath="/thirdparty/jboss/aop/lib/jboss-aop-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-asintegration-core.jar" sourcepath="/thirdparty/jboss/aop/lib/jboss-aop-asintegration-core-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-asintegration-mc.jar" sourcepath="/thirdparty/jboss/aop/lib/jboss-aop-asintegration-mc-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-aspects.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-asintegration-jmx.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/aspects/build.xml	2008-10-03 15:25:59 UTC (rev 79096)
@@ -223,7 +223,7 @@
       <mkdir dir="${build.lib}"/>
 
       <!-- Build jboss-aspect-deployer-jdk50.jar -->
-      <jar destfile="${build.lib}/jboss-aspect-library-jdk50.jar" manifest="${build.etc}/default.mf"
+      <jar destfile="${build.lib}/jboss-aspect-library.jar" manifest="${build.etc}/default.mf"
          update="${jar.update}" index="${jar.index}">
          <fileset dir="${build.classes}">
             <include name="org/jboss/aop/junit/**"/>
@@ -268,7 +268,7 @@
          </fileset>
       </jar>
 
-      <!-- Build jboss-aop-jboss5.jar -->
+      <!-- Build jboss-aop-embedded.jar -->
       <jar destfile="${build.lib}/jboss-aop-embedded.jar" manifest="${build.etc}/default.mf"
          update="${jar.update}" index="${jar.index}">
          <fileset dir="${build.classes}">
@@ -304,8 +304,8 @@
 
       <jar destfile="${build.lib}/jboss-aop-jboss5.deployer" manifest="${build.etc}/default.mf"
          update="${jar.update}" index="${jar.index}">
-         <fileset file="${build.lib}/jboss-aspect-library-jdk50.jar"/>
-         <fileset file="${jboss.aop.lib}/jboss-standalone-aspect-library-jdk50.jar"/>
+         <fileset file="${build.lib}/jboss-aspect-library.jar"/>
+         <fileset file="${jboss.aop.lib}/jboss-aop-aspects.jar"/>
          <fileset file="${jboss.aop.lib}/pluggable-instrumentor.jar"/>
          <fileset file="${jboss.aop.lib}/jrockit-pluggable-instrumentor.jar"/>
       	 <fileset file="${build.meta.inf}/base-aspects.xml"/>

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/build/build-distr.xml	2008-10-03 15:25:59 UTC (rev 79096)
@@ -201,7 +201,7 @@
         <include name="hibernate-annotations.jar"/>
       </fileset>
       <fileset dir="${jboss.aop.lib}">
-        <include name="jboss-aop-jdk50-client.jar"/>
+        <include name="jboss-aop-client.jar"/>
       </fileset>
       <fileset dir="${jboss.jboss.ejb3.ext.api.lib}" includes="*.jar" excludes="*sources.jar"/>
       <!-- For JSR-250 impl -->
@@ -240,13 +240,15 @@
     <mkdir dir="${install.lib}"/>
     <copy todir="${install.lib}" filtering="no">
        <fileset dir="${jboss.aop.lib}">
-          <include name="jboss-aop-deployer-jdk50.jar"/>
+          <include name="jboss-asi.jar"/>
        </fileset>
     </copy>
 
     <copy todir="${install.lib}" filtering="no">
       <fileset dir="${jboss.aop.lib}">
-        <include name="jboss-aop-jboss4-jdk50.jar"/>
+        <include name="jboss-aop-asintegration-core.jar"/>
+        <include name="jboss-aop-asintegration-jmx.jar"/>
+        <include name="jboss-aop-asintegration-mc.jar"/>
       </fileset>
     </copy>
 
@@ -1789,7 +1791,7 @@
         <include name="javassist.jar"/>
       </fileset>
       <fileset dir="${jboss.aop.lib}">
-        <include name="jboss-aop-jdk50.jar"/>
+        <include name="jboss-aop.jar"/>
       </fileset>
       <fileset dir="${jboss.common.core.lib}">
         <exclude name="*-sources.jar"/>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/component-matrix/pom.xml	2008-10-03 15:25:59 UTC (rev 79096)
@@ -45,7 +45,7 @@
     <version.org.hibernate.ejb3.persistence>1.0.2.GA</version.org.hibernate.ejb3.persistence>
     <version.org.hibernate.entity.manager>3.4.0.GA</version.org.hibernate.entity.manager>
     <version.org.hibernate.validator>3.1.0.GA</version.org.hibernate.validator>
-    <version.org.jboss.aop>2.0.0.CR17</version.org.jboss.aop>
+    <version.org.jboss.aop>2.0.0.CR18</version.org.jboss.aop>
     <version.org.jboss.common.core>2.2.8.GA</version.org.jboss.common.core>
     <version.org.jboss.ejb3>1.0.0-Beta4</version.org.jboss.ejb3>
     <version.org.jboss.ejb3.common.client>0.1.6</version.org.jboss.ejb3.common.client>
@@ -574,40 +574,41 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>org.jboss.aop</groupId>
-        <artifactId>jboss-aop-as4-deployer</artifactId>
+        <artifactId>jboss-aop-asintegration-core</artifactId>
         <version>${version.org.jboss.aop}</version>
       </dependency>
       
       <dependency>
         <groupId>org.jboss.aop</groupId>
-        <artifactId>jboss-aop-deployer-jdk50</artifactId>
+        <artifactId>jboss-aop-asintegration-jmx</artifactId>
         <version>${version.org.jboss.aop}</version>
       </dependency>
       
       <dependency>
         <groupId>org.jboss.aop</groupId>
-        <artifactId>jboss-aop-jboss4-jdk50</artifactId>
+        <artifactId>jboss-aop-asintegration-mc</artifactId>
         <version>${version.org.jboss.aop}</version>
       </dependency>
       
       <dependency>
         <groupId>org.jboss.aop</groupId>
-        <artifactId>jboss-aop-jdk50-client</artifactId>
+        <artifactId>jboss-aop</artifactId>
         <version>${version.org.jboss.aop}</version>
       </dependency>
       
       <dependency>
         <groupId>org.jboss.aop</groupId>
-        <artifactId>jboss-aop-jdk50</artifactId>
+        <artifactId>jboss-aop</artifactId>
         <version>${version.org.jboss.aop}</version>
+        <classifier>client</classifier>
       </dependency>
       
       <dependency>
         <groupId>org.jboss.aop</groupId>
-        <artifactId>jboss-standalone-aspect-library-jdk50</artifactId>
+        <artifactId>jboss-aop-aspects</artifactId>
         <version>${version.org.jboss.aop}</version>
       </dependency>
       
@@ -624,12 +625,6 @@
       </dependency>
       
       <dependency>
-        <groupId>org.jboss.aop</groupId>
-        <artifactId>resources</artifactId>
-        <version>${version.org.jboss.aop}</version>
-      </dependency>
-      
-      <dependency>
         <groupId>jboss.common</groupId>
         <artifactId>jboss-common</artifactId>
         <version>1.2.1.GA-brew</version>

Modified: trunk/console/.classpath
===================================================================
--- trunk/console/.classpath	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/console/.classpath	2008-10-03 15:25:59 UTC (rev 79096)
@@ -8,5 +8,6 @@
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jfreechart/lib/jfreechart.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/sun-servlet/lib/jsp-api.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/beanshell/lib/bsh.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/embedded/.classpath
===================================================================
--- trunk/embedded/.classpath	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/embedded/.classpath	2008-10-03 15:25:59 UTC (rev 79096)
@@ -33,7 +33,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/jbossweb.jar" sourcepath="/thirdparty/jboss/web/lib/jbossweb-src.zip"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/servlet-api.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/aop/lib/jboss-aop-jdk50.jar" sourcepath="/thirdparty/jboss/aop/lib/jboss-aop-src.zip"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
@@ -53,5 +52,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jnpserver/lib/jnpserver.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/org/jboss/aspects/lib/jboss-security-aspects.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
 	<classpathentry kind="output" path="output/classes"/>
 </classpath>

Modified: trunk/jbossas/.classpath
===================================================================
--- trunk/jbossas/.classpath	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/jbossas/.classpath	2008-10-03 15:25:59 UTC (rev 79096)
@@ -7,6 +7,6 @@
 	<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="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/main/src/main/org/jboss/system/server/ServerLoader.java
===================================================================
--- trunk/main/src/main/org/jboss/system/server/ServerLoader.java	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/main/src/main/org/jboss/system/server/ServerLoader.java	2008-10-03 15:25:59 UTC (rev 79096)
@@ -106,7 +106,7 @@
       "jboss-classloading.jar",
       "jboss-classloading-vfs.jar",
       // Fixme aop
-      "jboss-aop-jdk50.jar",
+      "jboss-aop.jar",
       "jboss-aop-mc-int.jar",
       "trove.jar",
    };

Modified: trunk/profileservice/.classpath
===================================================================
--- trunk/profileservice/.classpath	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/profileservice/.classpath	2008-10-03 15:25:59 UTC (rev 79096)
@@ -15,5 +15,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar" sourcepath="/thirdparty/jboss/test/lib/jboss-test-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar" sourcepath="/thirdparty/junit/lib/junit-src.zip"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/spring-int/.classpath
===================================================================
--- trunk/spring-int/.classpath	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/spring-int/.classpath	2008-10-03 15:25:59 UTC (rev 79096)
@@ -12,5 +12,6 @@
 	<classpathentry exported="true" kind="lib" path="/thirdparty/spring/lib/spring-context.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/system/.classpath
===================================================================
--- trunk/system/.classpath	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/system/.classpath	2008-10-03 15:25:59 UTC (rev 79096)
@@ -10,7 +10,6 @@
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/common-logging-jdk/lib/jboss-logging-jdk.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/jboss-man/lib/jboss-metatype.jar" sourcepath="/thirdparty/jboss/jboss-man/lib/jboss-metatype-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar" sourcepath="/thirdparty/jboss/aop/lib/jboss-aop-src.zip"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core-spi.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core-spi-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client-spi.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client-spi-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-structure-spi.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-structure-spi-sources.jar"/>
@@ -18,12 +17,12 @@
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-impl.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-impl-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-spi.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-spi-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/javassist/lib/javassist.jar" sourcepath="/thirdparty/javassist/lib/javassist-src.jar"/>
-	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-deployer-jdk50.jar" sourcepath="/thirdparty/jboss/aop/lib/jboss-asintegration-src.zip"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/trove/lib/trove.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="/thirdparty/jboss/jboss-man/lib/jboss-managed.jar" sourcepath="/thirdparty/jboss/jboss-man/lib/jboss-managed-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/testsuite/.classpath	2008-10-03 15:25:59 UTC (rev 79096)
@@ -36,12 +36,14 @@
 	<classpathentry kind="lib" path="/thirdparty/org/jboss/aspects/lib/jboss-security-aspects.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/org/jboss/aspects/lib/jboss-transaction-aspects.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core.jar"/>
-   <classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo.jar"/>
-   <classpathentry kind="lib" path="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-spi.jar"/>
-   <classpathentry kind="lib" path="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-jbc.jar"/>
-   <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate-core.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/org/jboss/cluster/lib/jboss-ha-server-cache-jbc.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate-core.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-security/lib/jboss-ejb3-security.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-security/lib/jboss-ejb3-security-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/stax-api/lib/stax-api.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-proxy/lib/jboss-ejb3-proxy-client.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-aspects.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/tomcat/.classpath
===================================================================
--- trunk/tomcat/.classpath	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/tomcat/.classpath	2008-10-03 15:25:59 UTC (rev 79096)
@@ -27,5 +27,6 @@
 	<classpathentry kind="lib" path="/thirdparty/org/jboss/ws/lib/jbossws-spi.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/cluster"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-jpa-deployers/lib/jboss-jpa-deployers.jar" sourcepath="/thirdparty/jboss/jboss-jpa-deployers/lib/jboss-jpa-deployers-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent	2008-10-03 15:12:25 UTC (rev 79095)
+++ trunk/tools/etc/buildmagic/modules.ent	2008-10-03 15:25:59 UTC (rev 79096)
@@ -18,7 +18,7 @@
 <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">
-  <pathelement path="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/>
+  <pathelement path="${jboss.aspects.lib}/jboss-aspect-library.jar"/>
 </path>
 
 <!-- tomcat -->




More information about the jboss-cvs-commits mailing list