[jboss-cvs] JBossAS SVN: r82576 - projects/aop/branches/Branch_2_0/asintegration-core/src/etc.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 31 19:55:30 EST 2008
Author: flavia.rainone at jboss.com
Date: 2008-12-31 19:55:29 -0500 (Wed, 31 Dec 2008)
New Revision: 82576
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-42-install-jboss-aop-jdk50-build.xml
Log:
[JBAOP-685] Applied fixes to 2.0 branch.
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-01-01 00:41:37 UTC (rev 82575)
+++ projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml 2009-01-01 00:55:29 UTC (rev 82576)
@@ -1,138 +1,160 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="install" name="JBoss/AOP Application Server installation">
-
- <target name="init">
- <!-- ========================================= -->
- <!-- Set the jboss root and server config here -->
- <!-- ========================================= -->
- <property file="jboss.properties"/>
-
- <!-- 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"/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="install" name="JBoss/AOP Application Server installation">
+
+ <target name="init">
+ <!-- ========================================= -->
+ <!-- Set the jboss root and server config here -->
+ <!-- ========================================= -->
+ <property file="jboss.properties"/>
+
+ <!-- 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"/>
-
- <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"/>
-
- <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"/>
- <available file="${aspect.deployer}" property="deployer.exists" type="dir"/>
- <fail unless="deployer.exists" message="${aspect.deployer} does not exist."/>
-
- <property name="aspect.library" value="${aspect.deployer}/jboss-aspect-library.jar"/>
- <available file="${aspect.library}" property="library.exists"/>
- <fail unless="library.exists" message="${aspect.library} does not exist."/>
-
- <property name="old.deployer" value="${jboss.config.dir}/deploy/jboss-aop.deployer.bak"/>
- <available file="${old.deployer}" property="old.deployer.exists"/>
-
- <property name="lib.javassist" value="${jboss.config.dir}/lib/javassist.jar"/>
- <available file="${lib.javassist}" property="jboss.post.4.0.4"/>
- <property name="bak.javassist" value="${old.deployer}/javassist.bak"/>
- <available file="${bak.javassist}" property="javassist.bak.exists"/>
-
- <condition property="backup.javassist" value="true">
- <and>
- <isset property="jboss.post.4.0.4"/>
- <not>
- <isset property="javassist.bak.exists"/>
- </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">
- <not>
- <isset property="jbossall-client.bak.exists"/>
- </not>
- </condition>
-
- </target>
-
- <target name="prepare-aspect-library" depends="init">
- <!-- 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"/>
-
- <!-- Get rid of the files that exist in jboss-aop-as4-deplyer.jar -->
- <delete dir="aspect-library-temp/org/jboss/aop"/>
-
- <!-- Get rid of the files that exist in jboss-standalone-aspect-library-jdk50.jar -->
- <delete dir="aspect-library-temp/org/jboss/aspects/asynchronous"/>
- <delete dir="aspect-library-temp/org/jboss/aspects/concurrent"/>
- <delete dir="aspect-library-temp/org/jboss/aspects/dbc"/>
- <delete dir="aspect-library-temp/org/jboss/aspects/jmx"/>
- <delete dir="aspect-library-temp/org/jboss/aspects/logging"/>
- <delete dir="aspect-library-temp/org/jboss/aspects/patterns"/>
- <delete file="aspect-library-temp/org/jboss/aspects/*.class"/>
-
- <jar destfile="jboss-aspect-library.jar" basedir="aspect-library-temp" manifest="aspect-library-temp/META-INF/MANIFEST.MF"/>
-
- <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"/>
-
- <delete dir="jbossall-client-library-temp"/>
- </target>
-
- <target name="backup-jbossall-library" if="backup.jbossall-client">
- <echo>Backing up existing jbossall-client.jar to ${bak.jbossall-client}</echo>
- <copy file="${lib.jbossall-client}" tofile="${bak.jbossall-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}">
- <fileset dir="${aspect.deployer}"/>
- </copy>
- <delete dir="${aspect.deployer}"/>
- </target>
-
- <target name="install.deployer" depends="backup">
- <copy todir="${deploy.dir}">
- <fileset dir="..">
- <include name="jboss-aop-jdk50.deployer/**"/>
- <exclude name="jboss-aop-jdk50.deployer/build.xml"/>
- <exclude name="jboss-aop-jdk50.deployer/jboss.properties"/>
- <exclude name="jboss-aop-jdk50.deployer/build_jboss4.0.xml"/>
- <exclude name="jboss-aop-jdk50.deployer/ReadMe-AS4.txt"/>
- </fileset>
- </copy>
+
+ <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"/>
+
+ <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"/>
+ <available file="${aspect.deployer}" property="deployer.exists" type="dir"/>
+ <fail unless="deployer.exists" message="${aspect.deployer} does not exist."/>
+
+ <property name="aspect.library" value="${aspect.deployer}/jboss-aspect-library.jar"/>
+ <available file="${aspect.library}" property="library.exists"/>
+ <fail unless="library.exists" message="${aspect.library} does not exist."/>
+
+ <property name="old.deployer" value="${jboss.config.dir}/deploy/jboss-aop.deployer.bak"/>
+ <available file="${old.deployer}" property="old.deployer.exists"/>
+
+ <property name="lib.javassist" value="${jboss.config.dir}/lib/javassist.jar"/>
+ <available file="${lib.javassist}" property="jboss.post.4.0.4"/>
+ <property name="bak.javassist" value="${old.deployer}/javassist.bak"/>
+ <available file="${bak.javassist}" property="javassist.bak.exists"/>
+
+ <condition property="backup.javassist" value="true">
+ <and>
+ <isset property="jboss.post.4.0.4"/>
+ <not>
+ <isset property="javassist.bak.exists"/>
+ </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">
+ <not>
+ <isset property="jbossall-client.bak.exists"/>
+ </not>
+ </condition>
+
+ <loadproperties>
+ <zipentry zipfile="${lib.jbossall-client}" name="META-INF/MANIFEST.MF"/>
+ <!-- Add the prefix -->
+ <filterchain>
+ <linecontains>
+ <contains value="Version"/>
+ </linecontains>
+ <prefixlines prefix="AS-"/>
+ </filterchain>
+ </loadproperties>
+
+ <echo>Version is '${AS-Specification-Version}'</echo>
+
+ <condition property="AS-40">
+ <matches pattern="4.0.*" string="${AS-Specification-Version}"/>
+ </condition>
+
+ <echo>AS is 40: ${AS-40}</echo>
+ </target>
+
+ <target name="prepare-aspect-library" depends="init">
+ <!-- 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"/>
+
+ <!-- Get rid of the files that exist in jboss-aop-as4-deplyer.jar -->
+ <delete dir="aspect-library-temp/org/jboss/aop"/>
+
+ <!-- Get rid of the files that exist in jboss-standalone-aspect-library-jdk50.jar -->
+ <delete dir="aspect-library-temp/org/jboss/aspects/asynchronous"/>
+ <delete dir="aspect-library-temp/org/jboss/aspects/concurrent"/>
+ <delete dir="aspect-library-temp/org/jboss/aspects/dbc"/>
+ <delete dir="aspect-library-temp/org/jboss/aspects/jmx"/>
+ <delete dir="aspect-library-temp/org/jboss/aspects/logging"/>
+ <delete dir="aspect-library-temp/org/jboss/aspects/patterns"/>
+ <delete file="aspect-library-temp/org/jboss/aspects/*.class"/>
+
+ <jar destfile="jboss-aspect-library.jar" basedir="aspect-library-temp" manifest="aspect-library-temp/META-INF/MANIFEST.MF"/>
+
+ <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">
+ <patternset>
+ <exclude name="META-INF/MANIFEST.MF"/>
+ </patternset>
+ </unjar>
+ <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">
+ <echo>Backing up existing jbossall-client.jar to ${bak.jbossall-client}</echo>
+ <copy file="${lib.jbossall-client}" tofile="${bak.jbossall-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}">
+ <fileset dir="${aspect.deployer}"/>
+ </copy>
+ <delete dir="${aspect.deployer}"/>
+ </target>
+
+ <target name="install.deployer" depends="backup">
+ <copy todir="${deploy.dir}">
+ <fileset dir="..">
+ <include name="jboss-aop-jdk50.deployer/**"/>
+ <exclude name="jboss-aop-jdk50.deployer/build.xml"/>
+ <exclude name="jboss-aop-jdk50.deployer/jboss.properties"/>
+ <exclude name="jboss-aop-jdk50.deployer/build_jboss4.0.xml"/>
+ <exclude name="jboss-aop-jdk50.deployer/ReadMe-AS4.txt"/>
+ </fileset>
+ </copy>
<move file="${deploy.dir}/jboss-aop-jdk50.deployer" tofile="${deploy.dir}/jboss-aop.deployer"/>
- <copy todir="${deploy.dir}/jboss-aop.deployer" file="${old.deployer}/base-aop.xml"/>
- </target>
-
- <target name="backup.javassist.post.4.0.4" depends="init" if="backup.javassist">
- <move file="${lib.javassist}" tofile="${bak.javassist}"/>
+ <copy todir="${deploy.dir}/jboss-aop.deployer" file="${old.deployer}/base-aop.xml"/>
</target>
+
+ <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">
<copy todir="${jboss.bin.dir}">
@@ -141,13 +163,13 @@
<include name="jrockit-pluggable-instrumentor.jar"/>
</fileset>
</copy>
- </target>
-
- <target name="install.post.4.0.4" depends="install.deployer, install.bin, backup.javassist.post.4.0.4" if="jboss.post.4.0.4">
- <delete file="${aspect.deployer}/javassist.jar"/>
- <copy file="javassist.jar" tofile="${lib.javassist}" overwrite="true"/>
- </target>
-
-
- <target name="install" depends="install.post.4.0.4"/>
-</project>
+ </target>
+
+ <target name="install.post.4.0.4" depends="install.deployer, install.bin, backup.javassist.post.4.0.4" if="jboss.post.4.0.4">
+ <delete file="${aspect.deployer}/javassist.jar"/>
+ <copy file="javassist.jar" tofile="${lib.javassist}" overwrite="true"/>
+ </target>
+
+
+ <target name="install" depends="install.post.4.0.4"/>
+</project>
Modified: projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml 2009-01-01 00:41:37 UTC (rev 82575)
+++ projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml 2009-01-01 00:55:29 UTC (rev 82576)
@@ -1,181 +1,185 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="install" name="JBoss/AOP Application Server installation">
-
- <target name="init">
- <!-- ========================================= -->
- <!-- Set the jboss root and server config here -->
- <!-- ========================================= -->
- <property file="jboss.properties"/>
-
- <!-- 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"/>
-
- <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"/>
-
- <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"/>
- <available file="${aspect.deployer}" property="deployer.exists" type="dir"/>
- <fail unless="deployer.exists" message="${aspect.deployer} does not exist."/>
-
- <property name="aspect.library" value="${aspect.deployer}/jboss-aspect-library-jdk50.jar"/>
- <available file="${aspect.library}" property="library.exists"/>
- <fail unless="library.exists" message="${aspect.library} does not exist."/>
-
- <property name="old.deployer" value="${jboss.config.dir}/deploy/jboss-aop-jdk50.deployer.bak"/>
- <available file="${old.deployer}" property="old.deployer.exists"/>
-
- <property name="lib.javassist" value="${jboss.config.dir}/lib/javassist.jar"/>
- <available file="${lib.javassist}" property="jboss.post.4.0.4"/>
- <property name="bak.javassist" value="${old.deployer}/javassist.bak"/>
- <available file="${bak.javassist}" property="javassist.bak.exists"/>
-
- <condition property="backup.javassist" value="true">
- <and>
- <isset property="jboss.post.4.0.4"/>
- <not>
- <isset property="javassist.bak.exists"/>
- </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">
- <not>
- <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">
- <not>
- <isset property="jbossaop-client.bak.exists"/>
- </not>
- </condition>
- </target>
-
- <target name="prepare-aspect-library" depends="init">
- <!-- 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"/>
-
- <!-- Get rid of the files that exist in jboss-aop-as4-deplyer.jar -->
- <delete dir="aspect-library-temp/org/jboss/aop"/>
-
- <!-- Get rid of the files that exist in jboss-standalone-aspect-library-jdk50.jar -->
- <delete dir="aspect-library-temp/org/jboss/aspects/asynchronous"/>
- <delete dir="aspect-library-temp/org/jboss/aspects/concurrent"/>
- <delete dir="aspect-library-temp/org/jboss/aspects/dbc"/>
- <delete dir="aspect-library-temp/org/jboss/aspects/jmx"/>
- <delete dir="aspect-library-temp/org/jboss/aspects/logging"/>
- <delete dir="aspect-library-temp/org/jboss/aspects/patterns"/>
- <delete file="aspect-library-temp/org/jboss/aspects/*.class"/>
-
- <jar destfile="jboss-aspect-library-jdk50.jar" basedir="aspect-library-temp" manifest="aspect-library-temp/META-INF/MANIFEST.MF"/>
-
- <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"/>
-
- <delete dir="jbossall-client-library-temp"/>
- </target>
-
- <target name="backup-jbossall-library" if="backup.jbossall-client">
- <echo>Backing up existing jbossall-client.jar to ${bak.jbossall-client}</echo>
- <copy file="${lib.jbossall-client}" tofile="${bak.jbossall-client}"/>
- </target>
-
- <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}"/>
- </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}">
- <fileset dir="${aspect.deployer}"/>
- </copy>
- <delete dir="${aspect.deployer}"/>
- </target>
-
- <target name="install.deployer" depends="backup">
- <copy todir="${deploy.dir}">
- <fileset dir="..">
- <include name="jboss-aop-jdk50.deployer/**"/>
- <exclude name="jboss-aop-jdk50.deployer/build.xml"/>
- <exclude name="jboss-aop-jdk50.deployer/jboss.properties"/>
- <exclude name="jboss-aop-jdk50.deployer/build_jboss4.0.xml"/>
- <exclude name="jboss-aop-jdk50.deployer/ReadMe-AS4.txt"/>
- <exclude name="jboss-aop-jdk50.deployer/jboss-reflect.jar"/>
- </fileset>
- </copy>
- <copy todir="${deploy.dir}/jboss-aop-jdk50.deployer" file="${old.deployer}/base-aop.xml"/>
- </target>
-
- <target name="backup.javassist.post.4.0.4" depends="init" if="backup.javassist">
- <move file="${lib.javassist}" tofile="${bak.javassist}"/>
- </target>
+<?xml version="1.0" encoding="UTF-8"?>
- <target name="install.bin" depends="init, update-jbossall-library, update-jbossaop-library">
- <copy todir="${jboss.bin.dir}">
- <fileset dir="../../lib">
- <include name="pluggable-instrumentor.jar"/>
- <include name="jrockit-pluggable-instrumentor.jar"/>
- </fileset>
- </copy>
- </target>
-
- <target name="install.post.4.0.4" depends="install.deployer, install.bin, backup.javassist.post.4.0.4" if="jboss.post.4.0.4">
- <delete file="${aspect.deployer}/javassist.jar"/>
- <copy file="javassist.jar" tofile="${lib.javassist}" overwrite="true"/>
- </target>
-
-
- <target name="install" depends="install.post.4.0.4"/>
-</project>
+<project default="install" name="JBoss/AOP Application Server installation">
+
+ <target name="init">
+ <!-- ========================================= -->
+ <!-- Set the jboss root and server config here -->
+ <!-- ========================================= -->
+ <property file="jboss.properties"/>
+
+ <!-- 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"/>
+
+ <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"/>
+
+ <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"/>
+ <available file="${aspect.deployer}" property="deployer.exists" type="dir"/>
+ <fail unless="deployer.exists" message="${aspect.deployer} does not exist."/>
+
+ <property name="aspect.library" value="${aspect.deployer}/jboss-aspect-library-jdk50.jar"/>
+ <available file="${aspect.library}" property="library.exists"/>
+ <fail unless="library.exists" message="${aspect.library} does not exist."/>
+
+ <property name="old.deployer" value="${jboss.config.dir}/deploy/jboss-aop-jdk50.deployer.bak"/>
+ <available file="${old.deployer}" property="old.deployer.exists"/>
+
+ <property name="lib.javassist" value="${jboss.config.dir}/lib/javassist.jar"/>
+ <available file="${lib.javassist}" property="jboss.post.4.0.4"/>
+ <property name="bak.javassist" value="${old.deployer}/javassist.bak"/>
+ <available file="${bak.javassist}" property="javassist.bak.exists"/>
+
+ <condition property="backup.javassist" value="true">
+ <and>
+ <isset property="jboss.post.4.0.4"/>
+ <not>
+ <isset property="javassist.bak.exists"/>
+ </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">
+ <not>
+ <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">
+ <not>
+ <isset property="jbossaop-client.bak.exists"/>
+ </not>
+ </condition>
+ </target>
+
+ <target name="prepare-aspect-library" depends="init">
+ <!-- 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"/>
+
+ <!-- Get rid of the files that exist in jboss-aop-as4-deplyer.jar -->
+ <delete dir="aspect-library-temp/org/jboss/aop"/>
+
+ <!-- Get rid of the files that exist in jboss-standalone-aspect-library-jdk50.jar -->
+ <delete dir="aspect-library-temp/org/jboss/aspects/asynchronous"/>
+ <delete dir="aspect-library-temp/org/jboss/aspects/concurrent"/>
+ <delete dir="aspect-library-temp/org/jboss/aspects/dbc"/>
+ <delete dir="aspect-library-temp/org/jboss/aspects/jmx"/>
+ <delete dir="aspect-library-temp/org/jboss/aspects/logging"/>
+ <delete dir="aspect-library-temp/org/jboss/aspects/patterns"/>
+ <delete file="aspect-library-temp/org/jboss/aspects/*.class"/>
+
+ <jar destfile="jboss-aspect-library-jdk50.jar" basedir="aspect-library-temp" manifest="aspect-library-temp/META-INF/MANIFEST.MF"/>
+
+ <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">
+ <patternset>
+ <exclude name="META-INF/MANIFEST.MF"/>
+ </patternset>
+ </unjar>
+ <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">
+ <echo>Backing up existing jbossall-client.jar to ${bak.jbossall-client}</echo>
+ <copy file="${lib.jbossall-client}" tofile="${bak.jbossall-client}"/>
+ </target>
+
+ <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}"/>
+ </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}">
+ <fileset dir="${aspect.deployer}"/>
+ </copy>
+ <delete dir="${aspect.deployer}"/>
+ </target>
+
+ <target name="install.deployer" depends="backup">
+ <copy todir="${deploy.dir}">
+ <fileset dir="..">
+ <include name="jboss-aop-jdk50.deployer/**"/>
+ <exclude name="jboss-aop-jdk50.deployer/build.xml"/>
+ <exclude name="jboss-aop-jdk50.deployer/jboss.properties"/>
+ <exclude name="jboss-aop-jdk50.deployer/build_jboss4.0.xml"/>
+ <exclude name="jboss-aop-jdk50.deployer/ReadMe-AS4.txt"/>
+ <exclude name="jboss-aop-jdk50.deployer/jboss-reflect.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${deploy.dir}/jboss-aop-jdk50.deployer" file="${old.deployer}/base-aop.xml"/>
+ </target>
+
+ <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">
+ <include name="pluggable-instrumentor.jar"/>
+ <include name="jrockit-pluggable-instrumentor.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="install.post.4.0.4" depends="install.deployer, install.bin, backup.javassist.post.4.0.4" if="jboss.post.4.0.4">
+ <delete file="${aspect.deployer}/javassist.jar"/>
+ <copy file="javassist.jar" tofile="${lib.javassist}" overwrite="true"/>
+ </target>
+
+
+ <target name="install" depends="install.post.4.0.4"/>
+</project>
More information about the jboss-cvs-commits
mailing list