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

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

Author: kabir.khan at jboss.com
Date: 2007-06-07 09:08:56 -0400 (Thu, 07 Jun 2007)
New Revision: 63386

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 (Set property properly)

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 11:54:17 UTC (rev 63385)
+++ projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk14-build.xml	2007-06-07 13:08:56 UTC (rev 63386)
@@ -59,16 +59,14 @@
       <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>
+      <condition property="backup.javassist" value="true">
+         <and>
+            <isset property="jboss.post.4.0.4"/>
+            <not>
+               <isset property="javassist.bak.exists"/>
+             </not>
+         </and>
+      </condition>
    </target>
 
    <target name="prepare=aspect-library" depends="init">

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 11:54:17 UTC (rev 63385)
+++ projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml	2007-06-07 13:08:56 UTC (rev 63386)
@@ -35,16 +35,14 @@
       <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>      
+      <condition property="backup.javassist" value="true">
+         <and>
+            <isset property="jboss.post.4.0.4"/>
+            <not>
+               <isset property="javassist.bak.exists"/>
+             </not>
+         </and>
+      </condition>
    </target>
 
    <target name="prepare=aspect-library" depends="init">