[jboss-cvs] JBossAS SVN: r63385 - projects/aop/trunk/asintegration/src/etc.

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

Author: kabir.khan at jboss.com
Date: 2007-06-07 07:54:17 -0400 (Thu, 07 Jun 2007)
New Revision: 63385

Modified:
   projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk14-build.xml
   projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
Log:
Should not backup javassist on jboss < 4.0.4.GA

Modified: projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk14-build.xml
===================================================================
--- projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk14-build.xml	2007-06-07 09:59:08 UTC (rev 63384)
+++ projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk14-build.xml	2007-06-07 11:54:17 UTC (rev 63385)
@@ -58,6 +58,17 @@
       <available file="${lib.javassist}" property="jboss.post.4.0.4"/>
       <property name="bak.javassist" value="${old.deployer}/javassist.bak"/>
       <available file="${bak.javassist}" property="javassist.bak.exists"/>
+
+      <property name="backup.javassist" value="true">
+         <condition>
+            <and>
+               <isset property="jboss.post.4.0.4"/>
+               <not>
+	               <isset property="javassist.bak.exists"/>
+	            </not>
+            </and>
+         </condition>
+      </property>
    </target>
 
    <target name="prepare=aspect-library" depends="init">
@@ -130,7 +141,7 @@
       <delete dir="${temp.dir}"/>
    </target>
 
-   <target name="backup.javassist.post.4.0.4" depends="init" unless="javassist.bak.exists">
+   <target name="backup.javassist.post.4.0.4" depends="init" if="backup.javassist">
       <move file="${lib.javassist}" tofile="${bak.javassist}"/>
    </target>
 

Modified: projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml	2007-06-07 09:59:08 UTC (rev 63384)
+++ projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml	2007-06-07 11:54:17 UTC (rev 63385)
@@ -34,6 +34,17 @@
       <available file="${lib.javassist}" property="jboss.post.4.0.4"/>
       <property name="bak.javassist" value="${old.deployer}/javassist.bak"/>
       <available file="${bak.javassist}" property="javassist.bak.exists"/>
+      
+      <property name="backup.javassist" value="true">
+         <condition>
+            <and>
+               <isset property="jboss.post.4.0.4"/>
+               <not>
+	               <isset property="javassist.bak.exists"/>
+	            </not>
+            </and>
+         </condition>
+      </property>      
    </target>
 
    <target name="prepare=aspect-library" depends="init">
@@ -69,7 +80,7 @@
       <copy todir="${deploy.dir}/jboss-aop-jdk50.deployer" file="${old.deployer}/base-aop.xml"/>
    </target>
 
-   <target name="backup.javassist.post.4.0.4" depends="init" unless="javassist.bak.exists">
+   <target name="backup.javassist.post.4.0.4" depends="init" if="backup.javassist">
       <move file="${lib.javassist}" tofile="${bak.javassist}"/>
    </target>