[jboss-cvs] JBossAS SVN: r83733 - projects/aop/branches/Branch_2_0/asintegration-core/src/etc.

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

Author: flavia.rainone at jboss.com
Date: 2009-01-31 18:08:41 -0500 (Sat, 31 Jan 2009)
New Revision: 83733

Modified:
   projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
Log:
[JBAOP-696] Adapted the install script, so that now a jdk50 version of the aspect-library is downloaded from jboss repository if it is not already available at the jboss-aop-deployer directory.

Modified: projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml	2009-01-31 22:52:49 UTC (rev 83732)
+++ projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml	2009-01-31 23:08:41 UTC (rev 83733)
@@ -65,9 +65,9 @@
       <available file="${aspect.deployer}" property="deployer.exists" type="dir"/>
       <fail unless="deployer.exists" message="${aspect.deployer} does not exist."/>
 
-      <property name="aspect.library" value="${aspect.deployer}/jboss-aspect-library${dot}jar"/>
+      <property name="aspect.library" value="${aspect.deployer}/jboss-aspect-library-jdk50.jar"/>
       <available file="${aspect.library}" property="library.exists"/>
-      <fail unless="library.exists" message="${aspect.library} does not exist."/>
+      <!-- <fail unless="library.exists" message="${aspect.library} does not exist. If you are using the non-ejb3 versions of jboss-4.0.4.GA and jboss-4.0.5.GA, you should "/> -->
 
       <property name="old.deployer" value="${jboss.config.dir}/deploy/jboss-aop${dot}deployer.bak"/>
       <available file="${old.deployer}" property="old.deployer.exists"/>
@@ -181,7 +181,7 @@
       </jarjar>
    </target>  
 
-   <target name="prepare-aspect-library" depends="init">
+   <target name="prepare-aspect-library" depends="init,download-aspect-library">
       <!-- Unjar aspect library into a temp folder -->
       <delete file="jboss-aspect-library-jdk50.jar"/>
       <mkdir dir="aspect-library-temp"/>
@@ -199,11 +199,19 @@
       <delete dir="aspect-library-temp/org/jboss/aspects/patterns"/>
       <delete file="aspect-library-temp/org/jboss/aspects/*.class"/>
 
-      <jar destfile="jboss-aspect-library${dot}jar" basedir="aspect-library-temp" manifest="aspect-library-temp/META-INF/MANIFEST.MF"/>
+      <jar destfile="jboss-aspect-library-jdk50.jar" basedir="aspect-library-temp" manifest="aspect-library-temp/META-INF/MANIFEST.MF"/>
 
       <delete dir="aspect-library-temp"/>
    </target>
 
+   <target name="download-aspect-library" depends="init" unless="library.exists">
+      <echo>The server ${jboss.home} lacks a jboss-aspect-library.jdk50.jar library. Downloading jar...</echo>
+      <get src="http://repository.jboss.com/jbossas/core-libs/4.2.2.GA/lib/jboss-aspect-library-jdk50.jar"
+         dest="${aspect.library}" 
+         verbose="true"
+         usetimestamp="true"/>
+   </target>
+   
    <target name="update-jbossall-library" depends="init,backup-jbossall-library">
       <!-- Unjar aspect library into a temp folder -->