[jboss-cvs] JBossAS SVN: r84091 - 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-02-11 07:47:49 -0500 (Wed, 11 Feb 2009)
New Revision: 84091

Modified:
   projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
Log:
[JBAOP-701] The non-ejb3 4.0.5.GA version has been added to the list of servers that require jarjar to avoid classpath errors.

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-02-11 12:23:35 UTC (rev 84090)
+++ projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml	2009-02-11 12:47:49 UTC (rev 84091)
@@ -54,6 +54,16 @@
          <matches pattern="4.0.*" string="${AS-Specification-Version}"/>
       </condition>
 
+      <condition property="enable.jarjar">
+         <or>
+            <isfalse value="${AS-40}"/>
+            <and>
+               <available file="${jboss.deploy.dir}/jboss-aop.deployer" type="dir"/>
+               <matches pattern="4.0.5.GA" string="${AS-Specification-Version}"/>
+            </and>
+         </or>
+      </condition>
+      
       <condition property="dot" value="." else="-jdk50.">
          <and>
             <istrue value="${AS-40}"/>
@@ -124,7 +134,7 @@
 
    </target>
 
-   <target name="jarjar" depends="init" unless="AS-40" >
+   <target name="jarjar" depends="init" if="enable.jarjar" >
       <path id="classpath">
          <pathelement location="jarjar.jar"/>
       </path>
@@ -256,7 +266,7 @@
       
       <!-- Indicates whether the jar files have been jarjarred -->
       <condition property="jarjarred" value="NOT_JARJARRED" else="">
-         <istrue value="${AS-40}"/>
+         <isfalse value="${enable.jarjar}"/>
       </condition>
       
       <copy todir="${jboss.deploy.dir}" overwrite="true">