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

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2008-12-09 09:58:19 -0500 (Tue, 09 Dec 2008)
New Revision: 82149

Modified:
   projects/aop/trunk/aspects/pom.xml
   projects/aop/trunk/build/build.xml
   projects/aop/trunk/pom.xml
   projects/aop/trunk/tools/etc/ant/common-tasks.xml
Log:
Change build order to avoid jrockit dependency problem.

Modified: projects/aop/trunk/aspects/pom.xml
===================================================================
--- projects/aop/trunk/aspects/pom.xml	2008-12-09 14:01:25 UTC (rev 82148)
+++ projects/aop/trunk/aspects/pom.xml	2008-12-09 14:58:19 UTC (rev 82149)
@@ -62,7 +62,7 @@
   
   <dependencies>
     <dependency>
-      <groupId>bsh</groupId>
+      <groupId>org.beanshell</groupId>
       <artifactId>bsh</artifactId>
     </dependency>
     <dependency>
@@ -107,4 +107,4 @@
       <type>test-jar</type>
     </dependency>-->
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml	2008-12-09 14:01:25 UTC (rev 82148)
+++ projects/aop/trunk/build/build.xml	2008-12-09 14:58:19 UTC (rev 82149)
@@ -24,7 +24,7 @@
      | .
    -->
 
-  <target name="init" depends="verify-environment, init-maven-environment">
+  <target name="init" depends="verify-environment, init-maven-parent">
 
     <!-- Defines repository.home -->
     <property file="local.properties"/>
@@ -225,7 +225,7 @@
 
   <target name="release-no-reference-docs"
 	       description="Builds the default release structure, minus the reference documentation"
-        depends="init">
+        depends="init, init-maven-dist-dependencies">
     <delete dir="output/temp"/>
     <mkdir dir="output/temp"/>
 

Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml	2008-12-09 14:01:25 UTC (rev 82148)
+++ projects/aop/trunk/pom.xml	2008-12-09 14:58:19 UTC (rev 82149)
@@ -92,7 +92,7 @@
         <version>2.9.1</version>
       </dependency>
       <dependency>
-        <groupId>bsh</groupId>
+        <groupId>org.beanshell</groupId>
         <artifactId>bsh</artifactId>
         <version>1.3.0</version>
       </dependency>

Modified: projects/aop/trunk/tools/etc/ant/common-tasks.xml
===================================================================
--- projects/aop/trunk/tools/etc/ant/common-tasks.xml	2008-12-09 14:01:25 UTC (rev 82148)
+++ projects/aop/trunk/tools/etc/ant/common-tasks.xml	2008-12-09 14:58:19 UTC (rev 82149)
@@ -4,7 +4,7 @@
 <!-- ================================================================== -->
 <project name="common-tasks">
 
-  <target name="init-maven-environment" xmlns:maven="urn:maven-artifact-ant"
+  <target name="init-maven-parent" xmlns:maven="urn:maven-artifact-ant"
       unless="maven.init.complete"
       description="Initialize properties for accessing maven configuration">
 
@@ -28,9 +28,16 @@
     
     <maven:pom id="maven.project" file="pom.xml" />
 
-    <!-- This tasks resolves maven dependencies and creates a property of the
-      -  form groupId:artifactId:type that points to the dependency jar file.
-      -->
+    <property name="maven.init.complete" value="true"/>
+
+  </target>
+  
+  
+  <!-- This target resolves maven dependencies for the dist and creates a property of the
+    -  form groupId:artifactId:type that points to the dependency jar file.
+    -->
+  <target name="init-maven-dist-dependencies" xmlns:maven="urn:maven-artifact-ant">
+    
     <maven:dependencies pathId="maven.dependencies.compile.classpath" useScope="compile">
       <pom refid="maven.project" />
     </maven:dependencies>
@@ -39,8 +46,6 @@
       <pom refid="maven.project" />
     </maven:dependencies>
     
-    <property name="maven.init.complete" value="true"/>
-
   </target>
 
   <target name="verify-environment" description="Check that the build environment is set up correctly">