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

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

Author: flavia.rainone at jboss.com
Date: 2008-12-18 07:56:34 -0500 (Thu, 18 Dec 2008)
New Revision: 82364

Modified:
   projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml
Log:
[JBAOP-685] Now the jboss 5 install script updates the client jar.

Modified: projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml	2008-12-18 12:30:09 UTC (rev 82363)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml	2008-12-18 12:56:34 UTC (rev 82364)
@@ -10,7 +10,8 @@
 
       <!-- The rest are automatic -->
       <property name="jboss.config.dir" value="${jboss.home}/server/${jboss.config}"/>
-      <property name="jboss.bin.dir" value="${jboss.home}/bin"/>
+      <property name="jboss.bin.dir" value="${jboss.home}/bin"/>
+      <property name="jboss.client.dir" value="${jboss.home}/client"/>
       
       <available file="${jboss.home}" property="jboss.exists" type="dir"/>
       <fail unless="jboss.exists" message="${jboss.home} does not exist. Modify 'jboss.home' in build.xml to be a valid root of a jboss installation"/>
@@ -18,6 +19,10 @@
       <available file="${jboss.bin.dir}" property="bin.exists" type="dir"/>
       <fail unless="bin.exists" message="${jboss.bin.dir} does not exist. Modify 'jboss.home' in build.xml to be a valid root of a jboss installation"/>
 
+      <available file="${jboss.client.dir}" property="client.exists" type="dir"/>
+      <fail unless="client.exists" message="${jboss.client.dir} does not exist. Modify 'jboss.config' in build.xml to be a valid server configuration"/>
+      
+      
       <available file="${jboss.config.dir}" property="config.exists" type="dir"/>
       <fail unless="config.exists" message="${jboss.config.dir} does not exist. Modify 'jboss.config' in build.xml to be a valid server configuration"/>
 
@@ -31,6 +36,26 @@
       <available file="${jboss.lib}" property="lib.exists" type="dir"/>
       <fail unless="lib.exists" message="${jboss.lib} does not exist. Modify 'jboss.home' in build.xml to be a valid root of a jboss installation"/>
 
+      <property name="jboss.aop.lib" value="../lib"/>
+      <available file="${jboss.aop.lib}" property="lib.jboss.aop.exists"/>
+      <fail unless="lib.jboss.aop.exists" message="${jboss.aop.lib} does not exist. Modify build.xml, setting the value of the property 'jboss.aop.lib' to be the path of the JBoss AOP lib installation directory."/>
+            
+      <property name="lib.jbossaop-client" value="${jboss.aop.lib}/jboss-aop-client.jar"/>
+      <available file="${lib.jbossaop-client}" property="lib.jbossaop-client.exists"/>
+      <fail unless="lib.jbossaop-client.exists" message="${lib.jbossaop-client} does not exist. Modify build.xml, setting the value of the property 'jboss.aop.lib' to be the path of the JBoss AOP lib installation directory."/>
+            
+      <property name="lib.jbossaop-client.injboss" value="${jboss.client.dir}/jboss-aop-client.jar"/>
+      <available file="${lib.jbossaop-client.injboss}" property="lib.jbossaop-client.injboss.exists"/>
+      <fail unless="lib.jbossaop-client.injboss.exists" message="${lib.jbossaop-client.injboss} does not exist. Modify 'jboss.home' in build.xml to be a valid root of a jboss installation"/>
+            
+      <property name="bak.jbossaop-client" value="${jboss.client.dir}/jboss-aop-client.bak"/>
+      <available file="${bak.jbossaop-client}" property="jbossaop-client.bak.exists"/>
+      <condition property="backup.jbossaop-client" value="true">
+         <not>
+            <isset property="jbossaop-client.bak.exists"/>
+         </not>
+      </condition>
+      
       <tstamp>
          <format property="tstamp"  pattern="yyyyMMdd-HHmmss"/>
       </tstamp>
@@ -52,13 +77,19 @@
          <fileset dir="${aspect.deployer}"/>
       </copy>
    </target>
+   
+   <target name="backup.client.lib" if="backup.jbossaop-client">
+      <echo>Backing up existing ${lib.jbossaop-client.injboss} to ${bak.jbossaop-client}</echo>
+      <copy file="${lib.jbossaop-client.injboss}" tofile="${bak.jbossaop-client}"/>
+   </target>
 
-   <target name="install.lib" depends="backup.lib">
+   <target name="install.lib" depends="backup.lib,backup.client.lib">
       <copy todir="${jboss.lib}">
          <fileset dir="lib">
             <include name="*"/>
          </fileset>
       </copy>
+      <copy file="${lib.jbossaop-client}" tofile="${bak.jbossaop-client.injboss}"/>
    </target>
 
    <target name="install.deployer" depends="backup.deployer">