[jboss-cvs] JBossAS SVN: r82492 - projects/aop/trunk/asintegration-core/src/etc.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 23 01:04:05 EST 2008
Author: flavia.rainone at jboss.com
Date: 2008-12-23 01:04:04 -0500 (Tue, 23 Dec 2008)
New Revision: 82492
Modified:
projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
projects/aop/trunk/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml
projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml
Log:
[JBAOP-685] Tyding up script files.
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 2008-12-23 05:37:45 UTC (rev 82491)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml 2008-12-23 06:04:04 UTC (rev 82492)
@@ -11,11 +11,11 @@
<!-- 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.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 jboss.properties to be a valid root of a jboss installation"/>
-
+ <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 jboss.properties to be a valid root of a jboss installation"/>
+
<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 jboss.properties to be a valid root of a jboss installation"/>
@@ -24,7 +24,7 @@
<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 jboss.properties to be a valid server configuration"/>
-
+
<property name="deploy.dir" value="${jboss.config.dir}/deploy"/>
<property name="aspect.deployer" value="${deploy.dir}/jboss-aop.deployer"/>
@@ -51,11 +51,11 @@
</not>
</and>
</condition>
-
+
<property name="lib.jbossall-client" value="${jboss.client.dir}/jbossall-client.jar"/>
<available file="${lib.jbossall-client}" property="lib.jbossall-client.exists"/>
<fail unless="lib.jbossall-client.exists" message="${lib.jbossall-client} does not exist. Modify 'jboss.home' in jboss.properties to be a valid root of a jboss installation"/>
-
+
<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">
@@ -63,11 +63,11 @@
<isset property="jbossall-client.bak.exists"/>
</not>
</condition>
-
+
</target>
<target name="prepare-aspect-library" depends="init">
- <!-- Unjar aspect library into a temp folder -->
+ <!-- Unjar aspect library into a temp folder -->
<delete file="jboss-aspect-library-jdk50.jar"/>
<mkdir dir="aspect-library-temp"/>
<unjar src="${aspect.library}" dest="aspect-library-temp"/>
@@ -88,19 +88,19 @@
<delete dir="aspect-library-temp"/>
</target>
-
+
<target name="update-jbossall-library" depends="init,backup-jbossall-library">
- <!-- Unjar aspect library into a temp folder -->
-
- <mkdir dir="jbossall-client-library-temp"/>
- <unjar src="${lib.jbossall-client}" dest="jbossall-client-library-temp"/>
- <delete file="${lib.jbossall-client}"/>
- <!-- Get rid of the files that exist in jboss-aop-jdk50.jar -->
- <delete dir="jbossall-client-library-temp/org/jboss/aop"/>
- <unjar src="jboss-aop-jdk50.jar" dest="jbossall-client-library-temp"/>
- <jar destfile="${lib.jbossall-client}" basedir="jbossall-client-library-temp" manifest="jbossall-client-library-temp/META-INF/MANIFEST.MF"/>
+ <!-- Unjar aspect library into a temp folder -->
- <delete dir="jbossall-client-library-temp"/>
+ <mkdir dir="jbossall-client-library-temp"/>
+ <unjar src="${lib.jbossall-client}" dest="jbossall-client-library-temp"/>
+ <delete file="${lib.jbossall-client}"/>
+ <!-- Get rid of the files that exist in jboss-aop-jdk50.jar -->
+ <delete dir="jbossall-client-library-temp/org/jboss/aop"/>
+ <unjar src="jboss-aop-jdk50.jar" dest="jbossall-client-library-temp"/>
+ <jar destfile="${lib.jbossall-client}" basedir="jbossall-client-library-temp" manifest="jbossall-client-library-temp/META-INF/MANIFEST.MF"/>
+
+ <delete dir="jbossall-client-library-temp"/>
</target>
<target name="backup-jbossall-library" if="backup.jbossall-client">
Modified: projects/aop/trunk/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml 2008-12-23 05:37:45 UTC (rev 82491)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml 2008-12-23 06:04:04 UTC (rev 82492)
@@ -12,10 +12,10 @@
<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"/>
-
+
<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"/>
-
+
<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 jboss.properties to be a valid root of a jboss installation"/>
@@ -24,7 +24,7 @@
<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 jboss.properties to be a valid server configuration"/>
-
+
<property name="deploy.dir" value="${jboss.config.dir}/deploy"/>
<property name="aspect.deployer" value="${deploy.dir}/jboss-aop-jdk50.deployer"/>
@@ -63,19 +63,19 @@
<isset property="jbossall-client.bak.exists"/>
</not>
</condition>
-
+
<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-jdk50-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 jboss.properties to be a valid root of a jboss installation"/>
-
+
<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">
@@ -107,19 +107,19 @@
<delete dir="aspect-library-temp"/>
</target>
-
+
<target name="update-jbossall-library" depends="init,backup-jbossall-library">
- <!-- Unjar aspect library into a temp folder -->
-
- <mkdir dir="jbossall-client-library-temp"/>
- <unjar src="${lib.jbossall-client}" dest="jbossall-client-library-temp"/>
- <delete file="${lib.jbossall-client}"/>
- <!-- Get rid of the files that exist in jboss-aop-jdk50.jar -->
- <delete dir="jbossall-client-library-temp/org/jboss/aop"/>
- <unjar src="jboss-aop-jdk50.jar" dest="jbossall-client-library-temp"/>
- <jar destfile="${lib.jbossall-client}" basedir="jbossall-client-library-temp" manifest="jbossall-client-library-temp/META-INF/MANIFEST.MF"/>
+ <!-- Unjar aspect library into a temp folder -->
- <delete dir="jbossall-client-library-temp"/>
+ <mkdir dir="jbossall-client-library-temp"/>
+ <unjar src="${lib.jbossall-client}" dest="jbossall-client-library-temp"/>
+ <delete file="${lib.jbossall-client}"/>
+ <!-- Get rid of the files that exist in jboss-aop-jdk50.jar -->
+ <delete dir="jbossall-client-library-temp/org/jboss/aop"/>
+ <unjar src="jboss-aop-jdk50.jar" dest="jbossall-client-library-temp"/>
+ <jar destfile="${lib.jbossall-client}" basedir="jbossall-client-library-temp" manifest="jbossall-client-library-temp/META-INF/MANIFEST.MF"/>
+
+ <delete dir="jbossall-client-library-temp"/>
</target>
<target name="backup-jbossall-library" if="backup.jbossall-client">
@@ -130,12 +130,12 @@
<target name="update-jbossaop-library" depends="init,backup-jbossaop-library">
<copy file="${lib.jbossaop-client}" tofile="${bak.jbossaop-client.injboss}"/>
</target>
-
+
<target name="backup-jbossaop-library" 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}"/>
+ <copy file="${lib.jbossaop-client.injboss}" tofile="${bak.jbossaop-client}"/>
</target>
-
+
<target name="backup" depends="prepare-aspect-library" unless="old.deployer.exists">
<echo>Backing up existing aop deployer to ${old.deployer}</echo>
<copy todir="${old.deployer}">
@@ -161,7 +161,7 @@
<target name="backup.javassist.post.4.0.4" depends="init" if="backup.javassist">
<move file="${lib.javassist}" tofile="${bak.javassist}"/>
</target>
-
+
<target name="install.bin" depends="init, update-jbossall-library, update-jbossaop-library">
<copy todir="${jboss.bin.dir}">
<fileset dir="../../lib">
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-23 05:37:45 UTC (rev 82491)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml 2008-12-23 06:04:04 UTC (rev 82492)
@@ -11,18 +11,17 @@
<!-- 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.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 jboss.properties to be a valid root of a jboss installation"/>
-
- <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 jboss.properties to be a valid root of a jboss installation"/>
+ <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 jboss.properties to be a valid root of a jboss installation"/>
+
+ <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 jboss.properties 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 jboss.properties 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 jboss.properties to be a valid server configuration"/>
@@ -39,15 +38,15 @@
<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 jboss.properties 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">
@@ -55,7 +54,7 @@
<isset property="jbossaop-client.bak.exists"/>
</not>
</condition>
-
+
<tstamp>
<format property="tstamp" pattern="yyyyMMdd-HHmmss"/>
</tstamp>
@@ -77,7 +76,7 @@
<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}"/>
More information about the jboss-cvs-commits
mailing list