[jboss-cvs] JBossAS SVN: r72673 - in projects/aop/trunk: asintegration and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Apr 24 10:16:43 EDT 2008


Author: kabir.khan at jboss.com
Date: 2008-04-24 10:16:43 -0400 (Thu, 24 Apr 2008)
New Revision: 72673

Modified:
   projects/aop/trunk/aop/.classpath
   projects/aop/trunk/asintegration/.classpath
   projects/aop/trunk/asintegration/build.xml
   projects/aop/trunk/aspects/.classpath
   projects/aop/trunk/build/build-thirdparty.xml
Log:
[JBAOP-547] Tidy up dependencies and add comments about what is needed at the different stages

Modified: projects/aop/trunk/aop/.classpath
===================================================================
--- projects/aop/trunk/aop/.classpath	2008-04-24 14:09:46 UTC (rev 72672)
+++ projects/aop/trunk/aop/.classpath	2008-04-24 14:16:43 UTC (rev 72673)
@@ -12,10 +12,10 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar" sourcepath="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-container-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar" sourcepath="/thirdparty/jboss/test/lib/jboss-test-src.zip"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
 	<classpathentry kind="lib" path="src/resources"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-reflect/lib/jboss-reflect.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-mdr/lib/jboss-mdr.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: projects/aop/trunk/asintegration/.classpath
===================================================================
--- projects/aop/trunk/asintegration/.classpath	2008-04-24 14:09:46 UTC (rev 72672)
+++ projects/aop/trunk/asintegration/.classpath	2008-04-24 14:16:43 UTC (rev 72673)
@@ -7,24 +7,20 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/aop"/>
 	<classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar" sourcepath="/javassist"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi.jar"/>
 	<classpathentry 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/common-logging-spi/lib/jboss-logging-spi.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/integration/lib/jboss-classloading-spi.jar" sourcepath="/thirdparty/jboss/integration/lib/jboss-classloading-spi-sources.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-classloader.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-classloader-sources.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container-metadata-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-container-sources.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container-metadata.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-impl.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-managed.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-mdr/lib/jboss-mdr.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-structure-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client-spi.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-managed/lib/jboss-managed.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-cl/lib/jboss-classloader.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: projects/aop/trunk/asintegration/build.xml
===================================================================
--- projects/aop/trunk/asintegration/build.xml	2008-04-24 14:09:46 UTC (rev 72672)
+++ projects/aop/trunk/asintegration/build.xml	2008-04-24 14:16:43 UTC (rev 72673)
@@ -74,7 +74,6 @@
       	<path refid="jboss/jboss.managed.classpath"/>
          <path refid="jboss.test.classpath"/>
          <path refid="junit.junit.classpath"/>
-         <path refid="oswego.concurrent.classpath"/>
       	<path refid="qdox.classpath"/>
          <path refid="trove.classpath"/>
       </path>

Modified: projects/aop/trunk/aspects/.classpath
===================================================================
--- projects/aop/trunk/aspects/.classpath	2008-04-24 14:09:46 UTC (rev 72672)
+++ projects/aop/trunk/aspects/.classpath	2008-04-24 14:16:43 UTC (rev 72673)
@@ -5,15 +5,12 @@
 	<classpathentry excluding="org/jboss/test/aop/test/AOPTestSetup.java|org/jboss/test/asynch/|org/jboss/test/hotdeploy/|org/jboss/test/proxyfactory/" kind="src" path="src/test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar" sourcepath="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar"/>
-	<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="lib" path="/thirdparty/apache-log4j/lib/log4j.jar" sourcepath="/thirdparty/apache-log4j/lib/log4j-src.zip"/>
 	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/trove/lib/trove.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar" sourcepath="/thirdparty/javassist/lib/javassist-src.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.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 combineaccessrules="false" kind="src" path="/aop"/>
 	<classpathentry kind="lib" path="/thirdparty/beanshell/lib/bsh.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>

Modified: projects/aop/trunk/build/build-thirdparty.xml
===================================================================
--- projects/aop/trunk/build/build-thirdparty.xml	2008-04-24 14:09:46 UTC (rev 72672)
+++ projects/aop/trunk/build/build-thirdparty.xml	2008-04-24 14:16:43 UTC (rev 72673)
@@ -43,29 +43,49 @@
         The repository is in CVS under the module repository.jboss.com whose contents
         are pushed to the http://repository.jboss.com site.
       -->
+      <!-- log4j: Needed for standalone release + direct dependency from aspects module -->
       <componentref name="apache-log4j" version="1.2.14-brew"/>
+      <!-- Dom4j: aop -->
       <componentref name="dom4j" version="1.6.1jboss"/>
+      <!-- beanshell: aspects -->
       <componentref name="beanshell" version="1.3.0"/>
+      <!-- javassist: aop, asintegration, aspects-->
       <componentref name="javassist" version="3.7.1.GA"/>
-      <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
+      <!-- jboss-cl: jboss-classloader.jar used by asintegration tests -->
+      <componentref name="jboss/jboss-cl" version="2.0.0.Beta11"/>
+      <!-- common-core: aop, asintegration, aspects -->
       <componentref name="jboss/common-core" version="2.2.5.GA"/>
+      <!-- common-logging-log4j: Needed for standalone release -->
       <componentref name="jboss/common-logging-log4j" version="2.0.5.GA"/>
+      <!-- common-logging-spi: aop, asintegration, aspects -->
       <componentref name="jboss/common-logging-spi" version="2.0.5.GA"/>
-
+		<!-- integration/jboss-classloading-spi.jar: asintegration -->
       <componentref name="jboss/integration" version="5.0.0.Beta4"/>
+		<!-- jboss-mdr: aop, asintegration -->
       <componentref name="jboss/jboss-mdr" version="2.0.0.Beta12"/>
+		<!-- jboss-reflect: aop -->
       <componentref name="jboss/jboss-reflect" version="2.0.0.Beta12"/>
+		<!-- jboss-reflect: asintegration -->
       <componentref name="jboss/jboss-vfs" version="2.0.0.Beta9"/>
+		<!-- jboss-deployers: asintegration -->
       <componentref name="jboss/jboss-deployers" version="2.0.0.Beta12"/>
+		<!-- jboss-deployers: asintegration build dependency -->
       <componentref name="jboss/jboss-managed" version="2.0.0.Beta10.1"/>
+		<!-- jvmti: aop memory tests -->
       <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
+		<!-- jvmti: aop tests -->
       <componentref name="jboss/test" version="1.0.3.GA"/>
-      <componentref name="jboss/jboss-vfs" version="2.0.0.Beta6"/>
+		<!-- core-libs: asintegration (for jboss 4) -->
       <componentref name="jbossas/core-libs" version="4.0.4.GA"/>
+		<!-- junit: aop, asintegration,  tests -->
       <componentref name="junit" version="3.8.2-brew"/>
+		<!-- qdox: aop -->
       <componentref name="qdox" version="1.6.1"/>
+		<!-- sun-javacc: parsers in aop -->
       <componentref name="sun-javacc" version="4.0-brew"/>
+		<!-- trove: aop -->
       <componentref name="trove" version="2.1.1"/>
+		<!-- xdoclet: aop -->
       <componentref name="xdoclet" version="1.2.3-brew"/>
    </build>
 




More information about the jboss-cvs-commits mailing list