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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Jul 18 11:25:20 EDT 2008


Author: pgier
Date: 2008-07-18 11:25:18 -0400 (Fri, 18 Jul 2008)
New Revision: 76001

Modified:
   projects/aop/trunk/aop/build-tests-jdk50-maven.xml
   projects/aop/trunk/aop/build-tests-jdk50.xml
   projects/aop/trunk/aop/build.xml
   projects/aop/trunk/asintegration/build-test.xml
   projects/aop/trunk/asintegration/build.xml
   projects/aop/trunk/aspects/build.xml
   projects/aop/trunk/build/build-release.xml
   projects/aop/trunk/build/build_for_dist/build.xml
   projects/aop/trunk/tools/etc/jbossbuild/tasks.xml
   projects/aop/trunk/tools/lib/jbossbuild.jar
Log:
[JBBUILD-476] Update jbossbuild.jar to sync with app server.

Modified: projects/aop/trunk/aop/build-tests-jdk50-maven.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50-maven.xml	2008-07-18 14:38:14 UTC (rev 76000)
+++ projects/aop/trunk/aop/build-tests-jdk50-maven.xml	2008-07-18 15:25:18 UTC (rev 76001)
@@ -87,10 +87,10 @@
          <path refid="apache.log4j.classpath"/>
          <path refid="javassist.classpath"/>
          <path refid="jboss.profiler.jvmti.classpath"/>
-         <path refid="jboss/common.core.classpath"/>
-         <path refid="jboss/common.logging.log4j.classpath"/>
-         <path refid="jboss/common.logging.jdk.classpath"/>
-         <path refid="jboss/common.logging.spi.classpath"/>
+         <path refid="jboss.common.core.classpath"/>
+         <path refid="jboss.common.logging.log4j.classpath"/>
+         <path refid="jboss.common.logging.jdk.classpath"/>
+         <path refid="jboss.common.logging.spi.classpath"/>
          <path refid="jboss.microcontainer.classpath"/>
          <path refid="jboss.test.classpath"/>
          <path refid="junit.junit.classpath"/>

Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml	2008-07-18 14:38:14 UTC (rev 76000)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml	2008-07-18 15:25:18 UTC (rev 76001)
@@ -82,14 +82,14 @@
          <path refid="apache.log4j.classpath"/>
          <path refid="javassist.classpath"/>
          <path refid="jboss.profiler.jvmti.classpath"/>
-         <path refid="jboss/common.core.classpath"/>
-         <path refid="jboss/common.logging.log4j.classpath"/>
+         <path refid="jboss.common.core.classpath"/>
+         <path refid="jboss.common.logging.log4j.classpath"/>
          <!--
-         <path refid="jboss/common.logging.jdk.classpath"/>
+         <path refid="jboss.common.logging.jdk.classpath"/>
          -->
-         <path refid="jboss/common.logging.spi.classpath"/>
-         <path refid="jboss/jboss.reflect.classpath"/>
-         <path refid="jboss/jboss.mdr.classpath"/>
+         <path refid="jboss.common.logging.spi.classpath"/>
+         <path refid="jboss.jboss.reflect.classpath"/>
+         <path refid="jboss.jboss.mdr.classpath"/>
          <path refid="jboss.test.classpath"/>
          <path refid="junit.junit.classpath"/>
          <path refid="qdox.classpath"/>

Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml	2008-07-18 14:38:14 UTC (rev 76000)
+++ projects/aop/trunk/aop/build.xml	2008-07-18 15:25:18 UTC (rev 76001)
@@ -82,14 +82,14 @@
          <path refid="apache.ant.classpath"/>
          <path refid="junit.junit.classpath"/>
          <path refid="jboss.profiler.jvmti.classpath"/>
-         <path refid="jboss/common.core.classpath"/>
-         <path refid="jboss/common.logging.log4j.classpath"/>
+         <path refid="jboss.common.core.classpath"/>
+         <path refid="jboss.common.logging.log4j.classpath"/>
          <!--
-         <path refid="jboss/common.logging.jdk.classpath"/>
+         <path refid="jboss.common.logging.jdk.classpath"/>
          -->
-         <path refid="jboss/common.logging.spi.classpath"/>
-         <path refid="jboss/jboss.reflect.classpath"/>
-         <path refid="jboss/jboss.mdr.classpath"/>
+         <path refid="jboss.common.logging.spi.classpath"/>
+         <path refid="jboss.jboss.reflect.classpath"/>
+         <path refid="jboss.jboss.mdr.classpath"/>
          <path refid="jboss.test.classpath"/>
       </path>
 
@@ -192,8 +192,8 @@
       <path id="jbossretro.classpath">
          <path refid="apache.ant.classpath"/>
          <path refid="javassist.classpath"/>
-         <path refid="jboss/jboss.retro.classpath"/>
-         <path refid="jboss/backport.concurrent.classpath"/>
+         <path refid="jboss.jboss.retro.classpath"/>
+         <path refid="jboss.backport.concurrent.classpath"/>
       </path>
       -->
 
@@ -453,11 +453,11 @@
       <jar jarfile="${build.lib}/jboss-aop-jdk50-single.jar" manifest="${build.etc}/default.mf">
          <zipfileset src="${build.lib}/jboss-aop-jdk50.jar"/>
          <zipfileset src="${javassist.javassist.lib}/javassist.jar"/>
-         <zipfileset src="${jboss/common.core.lib}/jboss-common-core.jar"/>
-         <zipfileset src="${jboss/jboss.reflect.lib}/jboss-reflect.jar"/>
-         <zipfileset src="${jboss/jboss.mdr.lib}/jboss-mdr.jar"/>
-         <zipfileset src="${jboss/common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
-         <zipfileset src="${jboss/common.logging.spi.lib}/jboss-logging-spi.jar"/>
+         <zipfileset src="${jboss.common.core.lib}/jboss-common-core.jar"/>
+         <zipfileset src="${jboss.jboss.reflect.lib}/jboss-reflect.jar"/>
+         <zipfileset src="${jboss.jboss.mdr.lib}/jboss-mdr.jar"/>
+         <zipfileset src="${jboss.common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
+         <zipfileset src="${jboss.common.logging.spi.lib}/jboss-logging-spi.jar"/>
          <zipfileset src="${apache.log4j.lib}/log4j.jar"/>
          <zipfileset src="${trove.trove.lib}/trove.jar"/>
          <fileset file ="${source.etc}/jbossorg-eula.txt"/>

Modified: projects/aop/trunk/asintegration/build-test.xml
===================================================================
--- projects/aop/trunk/asintegration/build-test.xml	2008-07-18 14:38:14 UTC (rev 76000)
+++ projects/aop/trunk/asintegration/build-test.xml	2008-07-18 15:25:18 UTC (rev 76001)
@@ -79,8 +79,8 @@
          <path refid="apache.log4j.classpath"/>
          <path refid="dom4j.dom4j.classpath"/>
 		   <path refid="javassist.classpath"/>
-      	<path refid="jbossas/core.libs.classpath"/>
-      	<path refid="jboss/jboss.vfs.classpath"/>
+      	<path refid="jbossas.core.libs.classpath"/>
+      	<path refid="jboss.jboss.vfs.classpath"/>
       	<path refid="jboss.microcontainer.classpath"/>
          <path refid="jboss.test.classpath"/>
          <path refid="junit.junit.classpath"/>

Modified: projects/aop/trunk/asintegration/build.xml
===================================================================
--- projects/aop/trunk/asintegration/build.xml	2008-07-18 14:38:14 UTC (rev 76000)
+++ projects/aop/trunk/asintegration/build.xml	2008-07-18 15:25:18 UTC (rev 76001)
@@ -66,12 +66,12 @@
          <path refid="apache.log4j.classpath"/>
          <path refid="dom4j.dom4j.classpath"/>
 		   <path refid="javassist.classpath"/>
-      	<path refid="jbossas/core.libs.classpath"/>
-      	<path refid="jboss/jboss.reflect.classpath"/>
-      	<path refid="jboss/jboss.mdr.classpath"/>
-      	<path refid="jboss/jboss.vfs.classpath"/>
-      	<path refid="jboss/jboss.deployers.classpath"/>
-      	<path refid="jboss/jboss.managed.classpath"/>
+      	<path refid="jbossas.core.libs.classpath"/>
+      	<path refid="jboss.jboss.reflect.classpath"/>
+      	<path refid="jboss.jboss.mdr.classpath"/>
+      	<path refid="jboss.jboss.vfs.classpath"/>
+      	<path refid="jboss.jboss.deployers.classpath"/>
+      	<path refid="jboss.jboss.managed.classpath"/>
          <path refid="jboss.test.classpath"/>
          <path refid="junit.junit.classpath"/>
       	<path refid="qdox.classpath"/>

Modified: projects/aop/trunk/aspects/build.xml
===================================================================
--- projects/aop/trunk/aspects/build.xml	2008-07-18 14:38:14 UTC (rev 76000)
+++ projects/aop/trunk/aspects/build.xml	2008-07-18 15:25:18 UTC (rev 76001)
@@ -78,11 +78,11 @@
 
       <!-- Configure modules -->
       <path id="dependentmodule.classpath">
-	      <path refid="jboss/common.core.classpath"/>
-   	   <path refid="jboss/common.logging.spi.classpath"/>
-      	<path refid="jboss/common.logging.log4j.classpath"/>
+	      <path refid="jboss.common.core.classpath"/>
+   	   <path refid="jboss.common.logging.spi.classpath"/>
+      	<path refid="jboss.common.logging.log4j.classpath"/>
         <!--
-	      <path refid="jboss/common.logging.jdk.classpath"/>
+	      <path refid="jboss.common.logging.jdk.classpath"/>
           -->
       </path>
 
@@ -144,8 +144,8 @@
       <path id="jbossretro.classpath">
          <path refid="apache.ant.classpath"/>
          <path refid="javassist.classpath"/>
-         <path refid="jboss/jboss.retro.classpath"/>
-         <path refid="jboss/backport.concurrent.classpath"/>
+         <path refid="jboss.jboss.retro.classpath"/>
+         <path refid="jboss.backport.concurrent.classpath"/>
       </path>
       -->
 

Modified: projects/aop/trunk/build/build-release.xml
===================================================================
--- projects/aop/trunk/build/build-release.xml	2008-07-18 14:38:14 UTC (rev 76000)
+++ projects/aop/trunk/build/build-release.xml	2008-07-18 15:25:18 UTC (rev 76001)
@@ -138,10 +138,10 @@
       <property name="aop.jboss-service.location" value="${project.root}/asintegration/src/resources/META-INF/jboss-service.xml"/>
 
       <property name="javassist.location" value="${javassist.javassist.lib}/javassist.jar"/>
-      <property name="jboss-backport-concurrent.location" value="${jboss/backport.concurrent.lib}/jboss-backport-concurrent.jar"/>
-      <property name="jboss-common-core.location" value="${jboss/common.core.lib}/jboss-common-core.jar"/>
-      <property name="jboss-logging-log4j.location" value="${jboss/common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
-      <property name="jboss-logging-spi.location" value="${jboss/common.logging.spi.lib}/jboss-logging-spi.jar"/>
+      <property name="jboss-backport-concurrent.location" value="${jboss.backport.concurrent.lib}/jboss-backport-concurrent.jar"/>
+      <property name="jboss-common-core.location" value="${jboss.common.core.lib}/jboss-common-core.jar"/>
+      <property name="jboss-logging-log4j.location" value="${jboss.common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
+      <property name="jboss-logging-spi.location" value="${jboss.common.logging.spi.lib}/jboss-logging-spi.jar"/>
 
       <property name="jboss-reflect.location" value="${project.thirdparty}/jboss/jboss-reflect/lib/jboss-reflect.jar"/>
       <property name="jboss-mdr.location" value="${project.thirdparty}/jboss/jboss-mdr/lib/jboss-mdr.jar"/>

Modified: projects/aop/trunk/build/build_for_dist/build.xml
===================================================================
--- projects/aop/trunk/build/build_for_dist/build.xml	2008-07-18 14:38:14 UTC (rev 76000)
+++ projects/aop/trunk/build/build_for_dist/build.xml	2008-07-18 15:25:18 UTC (rev 76001)
@@ -82,10 +82,10 @@
          <path refid="apache.ant.classpath"/>
          <path refid="junit.junit.classpath"/>
          <path refid="jboss.profiler.jvmti.classpath"/>
-         <path refid="jboss/common.core.classpath"/>
-         <path refid="jboss/common.logging.log4j.classpath"/>
-         <path refid="jboss/common.logging.jdk.classpath"/>
-         <path refid="jboss/common.logging.spi.classpath"/>
+         <path refid="jboss.common.core.classpath"/>
+         <path refid="jboss.common.logging.log4j.classpath"/>
+         <path refid="jboss.common.logging.jdk.classpath"/>
+         <path refid="jboss.common.logging.spi.classpath"/>
          <path refid="jboss.microcontainer.classpath"/>
          <path refid="jboss.test.classpath"/>
          -->

Modified: projects/aop/trunk/tools/etc/jbossbuild/tasks.xml
===================================================================
--- projects/aop/trunk/tools/etc/jbossbuild/tasks.xml	2008-07-18 14:38:14 UTC (rev 76000)
+++ projects/aop/trunk/tools/etc/jbossbuild/tasks.xml	2008-07-18 15:25:18 UTC (rev 76001)
@@ -118,6 +118,13 @@
             classpath="${jboss.tasks.path}"
    />
    
+   <!-- Generate a componentref graph and resolve the components -->
+   <taskdef name="resolvecomponents"
+            classname="org.jboss.ant.tasks.build.ResolveComponentRefsTask"
+            loaderRef="jboss.tasks.path"
+            classpath="${jboss.tasks.path}"
+   />   
+   
    <!-- A task which allows a visitor to visit the graph -->
    <taskdef name="visit-componentref-graph"
             classname="org.jboss.ant.tasks.build.VisitComponentRefGraphTask"
@@ -160,9 +167,13 @@
             classpath="${jboss.tasks.path}"
    />  
    
-  
+   <!-- File release task -->
+   <taskdef name="release-deployments"
+            classname="org.jboss.ant.tasks.build.ReleaseDeploymentsTask"
+            loaderRef="jboss.tasks.path"
+            classpath="${jboss.tasks.path}"
+   />    
    
-
    
 
 <!-- ================================================================== -->
@@ -242,7 +253,7 @@
          -->
          <main>
             <mkdir dir="@{releaseDir}"/>
-            <antCall target="release"/>
+            <execute-target target="release"/>
          </main>
 
 
@@ -627,9 +638,12 @@
       <!-- ============================================================ -->
 
       <targetdef target="release">
-      
-
-          <!-- Copy the artifact into the release -->
+       
+       <main>
+        <echo message="target is being executed"/>
+        <release-deployments/>
+       </main>
+          <!-- Copy the artifact into the release 
          <artifact when="@{tofile}">
              <copy-release release="@{release}" tofile="@{tofile}" requiredJDK="@{requiredJDK}"
              exploded="@{exploded}" overwrite="@{overwrite}">
@@ -645,7 +659,7 @@
               >
                <output/>
             </copy-release>
-         </artifact>         
+         </artifact>     -->    
 
       </targetdef>
 
@@ -757,6 +771,7 @@
 
       <targetdef target="clean" description="Clean">
          <common>
+            <echo message="executing common outputdir is @{output}"/>
             <delete dir="@{output}" failonerror="false"/>
          </common>
       </targetdef>
@@ -804,7 +819,13 @@
 
          <!-- If the component exists we just do a cvs update -->
          <componentmain if="@{exists}">
-           <cvs dest="@{dir}" command="update"/>
+            <get src="@{location}/${jbossbuild.component.info}"
+               dest="@{dir}/${jbossbuild.component.info}"
+               useTimestamp="true"
+               verbose="true"
+            />
+	   
+           <cvs dest="@{dir}" command="update -dP"/>
             <!-- NOTE: unable to delegate to component until JBBUILD-62 is resolved -->
             <!--invoke target="synchronize" dir="@{dir}"/--> 
             <!--execant target="synchronize.after" dir="@{dir}"/--> 
@@ -814,6 +835,7 @@
               get the source build check it out from cvs
          -->
          <componentmain unless="@{exists}" if="@{local}">
+            <echo message="doing component @{id}"/>
             <cvs dest="@{dir.parent}">
                <commandline>
                   <argument value="-d"/>
@@ -1007,7 +1029,7 @@
       />
       <sequential>
          <!-- Invoke using a new ant -->
-         <ant antfile="jbossbuild.xml" dir="@{dir}" target="@{target}"/>
+         <ant antfile="jbossbuild.xml" dir="@{dir}" target="@{target}" inheritRefs="false"/>
       </sequential>
    </macrodef>
 

Modified: projects/aop/trunk/tools/lib/jbossbuild.jar
===================================================================
(Binary files differ)




More information about the jboss-cvs-commits mailing list