[jboss-cvs] JBossAS SVN: r103203 - projects/aop/trunk/asintegration-core/src/etc.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 29 15:30:50 EDT 2010
Author: flavia.rainone at jboss.com
Date: 2010-03-29 15:30:50 -0400 (Mon, 29 Mar 2010)
New Revision: 103203
Modified:
projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml
projects/aop/trunk/asintegration-core/src/etc/jboss-60-install-jboss-aop-build.xml
Log:
[JBAOP-777] Fix jboss-40-install script, complete the support to backup disabling for the three scripts, add backup of aop.xml file that is ovewritten by jboss-50-install script and by jboss-60-install script.
Modified: projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml 2010-03-29 19:22:01 UTC (rev 103202)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml 2010-03-29 19:30:50 UTC (rev 103203)
@@ -80,7 +80,12 @@
<!-- <fail unless="library.exists" message="${aspect.library} does not exist. If you are using the non-ejb3 versions of jboss-4.0.4.GA and jboss-4.0.5.GA, you should "/> -->
<property name="old.deployer" value="${jboss.config.dir}/deploy/jboss-aop${dot}deployer.bak"/>
- <available file="${old.deployer}" property="old.deployer.exists"/>
+ <condition property="old.deployer.exists">
+ <or>
+ <available file="${old.deployer}"/>
+ <isfalse value="${backup}"/>
+ </or>
+ </condition>
<property name="lib.javassist" value="${jboss.config.dir}/lib/javassist.jar"/>
<available file="${lib.javassist}" property="jboss.post.4.0.4"/>
@@ -89,10 +94,13 @@
<condition property="backup.javassist" value="true">
<and>
- <isset property="jboss.post.4.0.4"/>
- <not>
- <isset property="javassist.bak.exists"/>
- </not>
+ <and>
+ <isset property="jboss.post.4.0.4"/>
+ <not>
+ <isset property="javassist.bak.exists"/>
+ </not>
+ </and>
+ <istrue value="${backup}"/>
</and>
</condition>
@@ -103,9 +111,12 @@
<property name="bak.jbossall-client" value="${jboss.client.dir}/jbossall-client.bak"/>
<available file="${bak.jbossall-client}" property="jbossall-client.bak.exists"/>
<condition property="backup.jbossall-client" value="true">
- <not>
- <isset property="jbossall-client.bak.exists"/>
- </not>
+ <and>
+ <not>
+ <isset property="jbossall-client.bak.exists"/>
+ </not>
+ <istrue value="${backup}"/>
+ </and>
</condition>
</target>
@@ -127,9 +138,12 @@
<property name="bak.jbossaop-client" value="${jboss.client.dir}/jboss-aop-jdk50-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>
+ <and>
+ <not>
+ <isset property="jbossaop-client.bak.exists"/>
+ </not>
+ <istrue value="${backup}"/>
+ </and>
</condition>
</target>
@@ -254,15 +268,19 @@
<copy file="${lib.jbossaop-client.injboss}" tofile="${bak.jbossaop-client}"/>
</target>
- <target name="backup" depends="prepare-aspect-library" unless="old.deployer.exists">
+ <target name="backup.deployer" unless="old.deployer.exists">
<echo>Backing up existing aop deployer to ${old.deployer}</echo>
<copy todir="${old.deployer}">
<fileset dir="${aspect.deployer}"/>
</copy>
+ </target>
+
+ <target name="delete.deployer" depends="prepare-aspect-library,backup.deployer">
+ <move file="${aspect.deployer}/base-aop.xml" todir="."/>
<delete dir="${aspect.deployer}"/>
</target>
- <target name="install.deployer" depends="backup,jarjar">
+ <target name="install.deployer" depends="delete.deployer,jarjar">
<!-- Indicates whether the jar files have been jarjarred -->
<condition property="jarjarred" value="NOT_JARJARRED" else="">
@@ -293,7 +311,7 @@
<delete file="jboss-aop-asintegration-core-jarjar.jar"/>
<delete file="jboss-aop-asintegration-jmx-jarjar.jar"/>
<move file="${jboss.deploy.dir}/jboss-aop-jdk50.deployer" tofile="${jboss.deploy.dir}/jboss-aop${dot}deployer"/>
- <copy todir="${jboss.deploy.dir}/jboss-aop${dot}deployer" file="${old.deployer}/base-aop.xml"/>
+ <move file="./base-aop.xml" todir="${jboss.deploy.dir}/jboss-aop${dot}deployer"/>
</target>
<target name="backup.javassist.post.4.0.4" depends="init" if="backup.javassist">
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 2010-03-29 19:22:01 UTC (rev 103202)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml 2010-03-29 19:30:50 UTC (rev 103203)
@@ -14,6 +14,7 @@
<property name="jboss.client.dir" value="${jboss.home}/client"/>
<property name="jboss.backup.dir" value="${jboss.config.dir}/deployers.bak"/>
<property name="jboss.bootstrap.dir" value="${jboss.config.dir}/conf/bootstrap"/>
+ <property name="jboss.conf.backup.dir" value="${jboss.config.dir}/conf.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"/>
@@ -176,7 +177,14 @@
</concat>
</target>
- <target name="install.aop.xml" depends="init">
+ <target name="backup.aop.xml" depends="init" if="backup.enabled">
+ <property name="old.bootstrap" value="${jboss.conf.backup.dir}/bootstrap-${tstamp}.bak"/>
+ <mkdir dir="${old.bootstrap}"/>
+ <echo>Backing up existing conf/bootstrap/aop.xml file to ${old.bootstrap}/aop.xml</echo>
+ <copy file="${jboss.bootstrap.dir}/aop.xml" todir="${old.bootstrap}"/>
+ </target>
+
+ <target name="install.aop.xml" depends="init,backup.aop.xml">
<copy file="aop.xml" todir="${jboss.bootstrap.dir}" overwrite="true"/>
</target>
Modified: projects/aop/trunk/asintegration-core/src/etc/jboss-60-install-jboss-aop-build.xml
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss-60-install-jboss-aop-build.xml 2010-03-29 19:22:01 UTC (rev 103202)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-60-install-jboss-aop-build.xml 2010-03-29 19:30:50 UTC (rev 103203)
@@ -14,6 +14,7 @@
<property name="jboss.client.dir" value="${jboss.home}/client"/>
<property name="jboss.backup.dir" value="${jboss.config.dir}/deployers.bak"/>
<property name="jboss.bootstrap.dir" value="${jboss.config.dir}/conf/bootstrap"/>
+ <property name="jboss.conf.backup.dir" value="${jboss.config.dir}/conf.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"/>
@@ -55,18 +56,25 @@
<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>
+ <and>
+ <not>
+ <isset property="jbossaop-client.bak.exists"/>
+ </not>
+ <istrue value="${backup}"/>
+ </and>
</condition>
<tstamp>
<format property="tstamp" pattern="yyyyMMdd-HHmmss"/>
</tstamp>
+
+ <condition property="backup.enabled" value="true">
+ <istrue value="${backup}"/>
+ </condition>
</target>
- <target name="backup.lib" depends="init">
+ <target name="backup.lib" depends="init" if="backup.enabled">
<property name="old.lib" value="${jboss.lib}-${tstamp}.bak"/>
<echo>Backing up existing lib directory to ${old.lib}</echo>
<copy todir="${old.lib}">
@@ -74,7 +82,7 @@
</copy>
</target>
- <target name="backup.deployer" depends="init">
+ <target name="backup.deployer" depends="init" if="backup.enabled">
<mkdir dir="${jboss.backup.dir}"/>
<echo>Backing up existing aop deployer to ${old.deployer}</echo>
<copy todir="${jboss.backup.dir}/jboss-aop-jboss5.deployer-${tstamp}.bak">
@@ -112,7 +120,14 @@
</copy>
</target>
- <target name="install.aop.xml" depends="init">
+ <target name="backup.aop.xml" depends="init" if="backup.enabled">
+ <property name="old.bootstrap" value="${jboss.conf.backup.dir}/bootstrap-${tstamp}.bak"/>
+ <mkdir dir="${old.bootstrap}"/>
+ <echo>Backing up existing conf/bootstrap/aop.xml file to ${old.bootstrap}/aop.xml</echo>
+ <copy file="${jboss.bootstrap.dir}/aop.xml" todir="${old.bootstrap}"/>
+ </target>
+
+ <target name="install.aop.xml" depends="init,backup.aop.xml">
<copy file="aop.xml" todir="${jboss.bootstrap.dir}" overwrite="true"/>
</target>
More information about the jboss-cvs-commits
mailing list