[jboss-cvs] JBossAS SVN: r83165 - 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-21 13:41:05 -0500 (Wed, 21 Jan 2009)
New Revision: 83165

Modified:
   projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml
Log:
[JBAOP-694] Applied the same changes applied to trunk's jboss-50-install script:
  Changed the JBOSS-50 install script so that now the deployers backups are put outside of deployers dir.
  The new deployers backup directory is $JBOSS_HOME/server/conf/deployers.bak
  Erasing unless attributes that reference variables that have been removed from the INSTALL-50 script.

Modified: projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml	2009-01-21 18:32:51 UTC (rev 83164)
+++ projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml	2009-01-21 18:41:05 UTC (rev 83165)
@@ -12,6 +12,7 @@
       <property name="jboss.config.dir" value="${jboss.home}/server/${jboss.config}"/>
       <property name="jboss.bin.dir" value="${jboss.home}/bin"/>
       <property name="jboss.client.dir" value="${jboss.home}/client"/>
+      <property name="jboss.backup.dir" value="${jboss.config.dir}/deployers.bak"/>
 
       <available file="${jboss.home}" property="jboss.exists" type="dir"/>
       <fail unless="jboss.exists" message="${jboss.home} does not exist. Modify 'jboss.home' in jboss.properties to be a valid root of a jboss installation"/>
@@ -61,7 +62,7 @@
    </target>
 
 
-   <target name="backup.lib" depends="init" unless="old.lib.exists">
+   <target name="backup.lib" depends="init">
       <property name="old.lib" value="${jboss.lib}-${tstamp}.bak"/>
       <echo>Backing up existing lib directory to ${old.lib}</echo>
       <copy todir="${old.lib}">
@@ -69,14 +70,12 @@
       </copy>
    </target>
 
-   <target name="backup.deployer" depends="init" unless="old.deployer.exists">
-      <property name="old.deployer" value="${aspect.deployer}-${tstamp}.bak"/>
+   <target name="backup.deployer" depends="init">
+      <mkdir dir="${jboss.backup.dir}"/>
       <echo>Backing up existing aop deployer to ${old.deployer}</echo>
-      <copy todir="${old.deployer}">
+      <copy todir="${jboss.backup.dir}/jboss-aop-jboss5.deployer-${tstamp}.bak">
          <fileset dir="${aspect.deployer}"/>
       </copy>
-      <move file="${old.deployer}/META-INF/jboss-aspect-library-jboss-beans.xml" 
-         tofile="${old.deployer}/META-INF/jboss-aspect-library-jboss-beans.xml.bak"/>
    </target>
 
    <target name="backup.client.lib" if="backup.jbossaop-client">