[jboss-cvs] JBossAS SVN: r63459 - in projects/aop/trunk: asintegration/src/etc and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 11 15:06:17 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-06-11 15:06:17 -0400 (Mon, 11 Jun 2007)
New Revision: 63459
Modified:
projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml
projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk14-build.xml
projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
projects/aop/trunk/asintegration/src/etc/jboss.properties
projects/aop/trunk/aspects/build.xml
Log:
Update install scripts to
* Get rid of the classes in jboss-standalone-aspect-library-jdkxx.jar from jboss-aspect-library.jar
* Update jbossretro-rt.jar in the target client/ and server/xxx/directories
* Update javassist.jar in the target client/ directory
Modified: projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml 2007-06-11 18:22:01 UTC (rev 63458)
+++ projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml 2007-06-11 19:06:17 UTC (rev 63459)
@@ -48,13 +48,16 @@
</listitem>
<listitem>
In JBoss 4.0.4.GA and later, move <literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk50.deployer/javassist.jar]]></literal>
- to <literal><![CDATA[server/<config-name>/lib/javassist.jar]]></literal>.
+ to <literal><![CDATA[server/<config-name>/lib/javassist.jar]]></literal>. Any existing javassist.jar in that location is copied to
+ <literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk50.deployer.bak/lib/javassist.bak]]></literal>
</listitem>
<listitem>
If you NOT upgrading from a previous AOP 2 distribution, open up
<literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar]]></literal> and
- delete all classes and subpackages under <literal>org.jboss.aop</literal>. (In AOP 2.0 we changed the packaging, these
- classes now exist inside <![CDATA[server/<config-name>/deploy/jboss-aop-jdk50.deployer/jboss-aop-as4-deployer.jar]]>
+ delete all classes and subpackages under <literal>org.jboss.aop</literal>. In AOP 2.0 we changed the packaging, these
+ classes now exist inside <literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk50.deployer/jboss-aop-as4-deployer.jar]]></literal>.
+ Also, we delete any files that also exist in
+ <literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk50.deployer/jboss-standalone-aspect-library-jdk14.jar]]></literal>
</listitem>
</orderedlist>
</sect1>
@@ -81,16 +84,30 @@
</listitem>
<listitem>
In JBoss 4.0.4.GA and later, move <literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk50.deployer/javassist.jar]]></literal>
- to <literal><![CDATA[server/<config-name>/lib/javassist.jar]]></literal>
+ to <literal><![CDATA[server/<config-name>/lib/javassist.jar]]></literal>. Any existing javassist.jar in that location is copied to
+ <literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk50.deployer.bak/lib/javassist.bak]]></literal>
</listitem>
<listitem>
- If you NOT upgrading from a previous AOP 2 distribution, copy the
- <literal><![CDATA[server/<config-name>/deploy/jboss-aop.deployer.bak/jboss-aspect-library.jar]]></literal> to
- <literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk14.deployer/jboss-aspect-library.jar]]></literal> and
- delete all classes and subpackages under <literal>org.jboss.aop</literal>. (In AOP 2.0 we changed the packaging, these
- classes now exist inside <literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk14.deployer/jboss-aop-as4-deployer.jar]]></literal>. The
- script also makes the jdk 1.4 annotations compatible with how they are simulated in JBoss AOP 2.x.
+ In JBoss 4.0.4.GA and later, move <literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk50.deployer/jbossretro-rt.jar]]></literal>
+ to <literal><![CDATA[server/<config-name>/lib/jbossretro-rt.jar]]></literal>. Any existing jbossretro-rt.jar in that location is copied to
+ <literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk50.deployer.bak/lib/jbossretro-rt.bak]]></literal>
</listitem>
+ <listitem>
+ In JBoss 4.0.4.GA and later, move <literal><![CDATA[client/jbossretro-rt.jar]]></literal>
+ to <literal><![CDATA[client/jbossretro-rt.bak]]></literal>.
+ </listitem>
+ <listitem>
+ In JBoss 4.0.4.GA and later, move <literal><![CDATA[client/javassist.jar]]></literal>
+ to <literal><![CDATA[client/javassist.bak]]></literal>.
+ </listitem>
+ <listitem>
+ If you NOT upgrading from a previous AOP 2 distribution, open up
+ <literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar]]></literal> and
+ delete all classes and subpackages under <literal>org.jboss.aop</literal>. In AOP 2.0 we changed the packaging, these
+ classes now exist inside <literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk50.deployer/jboss-aop-as4-deployer.jar]]></literal>.
+ Also, we delete any files that also exist in
+ <literal><![CDATA[server/<config-name>/deploy/jboss-aop-jdk50.deployer/jboss-standalone-aspect-library-jdk14.jar]]></literal>
+ </listitem>
</orderedlist>
</sect1>
Modified: projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk14-build.xml
===================================================================
--- projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk14-build.xml 2007-06-11 18:22:01 UTC (rev 63458)
+++ projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk14-build.xml 2007-06-11 19:06:17 UTC (rev 63459)
@@ -27,7 +27,7 @@
<property name="aop2.deployer" value="${deploy.dir}/jboss-aop-jdk14.deployer"/>
<available file="${aop2.deployer}" property="aop2.deployer.exists" type="dir"/>
- <fail message="Neither ${jdk14.deployer} (JBoss AOP 2.0) nor ${aop2.deployer} exist.">
+ <fail message="Neither ${jdk15.deployer} (JBoss AOP 1.5.x) nor ${aop2.deployer} (JBoss AOP 2.0) exist.">
<condition>
<and>
<not><isset property="aop15.deployer.exists"/></not>
@@ -35,7 +35,6 @@
</and>
</condition>
</fail>
-
</target>
<target name="init-has-aop15-deployer" depends="setup" if="aop15.deployer.exists">
@@ -55,35 +54,85 @@
<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="${lib.javassist}" property="lib.javassist.exists"/>
+ <property name="bak.javassist" value="${old.deployer}/lib/javassist.bak"/>
<available file="${bak.javassist}" property="javassist.bak.exists"/>
- <condition property="backup.javassist" value="true">
+ <condition property="backup.lib.javassist" value="true">
<and>
- <isset property="jboss.post.4.0.4"/>
+ <isset property="lib.javassist.exists"/>
<not>
<isset property="javassist.bak.exists"/>
</not>
</and>
</condition>
+
+ <property name="client.javassist" value="${jboss.home}/client/javassist.jar"/>
+ <available file="${client.javassist}" property="client.javassist.exists"/>
+ <property name="bak.client.javassist" value="${jboss.home}/client/javassist.bak"/>
+ <available file="${bak.client.javassist}" property="client.javassist.bak.exists"/>
+
+ <condition property="backup.client.javassist" value="true">
+ <and>
+ <isset property="client.javassist.exists"/>
+ <not>
+ <isset property="client.javassist.bak.exists"/>
+ </not>
+ </and>
+ </condition>
+
+ <property name="client.retro" value="${jboss.home}/client/jbossretro-rt.jar"/>
+ <available file="${client.retro}" property="client.retro.exists"/>
+ <property name="bak.client.retro" value="${jboss.home}/client/jbossretro-rt.bak"/>
+ <available file="${bak.client.retro}" property="client.retro.bak.exists"/>
+
+ <condition property="backup.client.retro" value="true">
+ <and>
+ <isset property="client.retro.exists"/>
+ <not>
+ <isset property="client.retro.bak.exists"/>
+ </not>
+ </and>
+ </condition>
+
+ <property name="lib.retro" value="${jboss.config.dir}/lib/jbossretro-rt.jar"/>
+ <available file="${lib.retro}" property="lib.retro.exists"/>
+ <property name="bak.lib.retro" value="${old.deployer}/lib/jbossretro-rt.bak"/>
+ <available file="${bak.lib.retro}" property="lib.retro.bak.exists"/>
+
+ <condition property="backup.lib.retro" value="true">
+ <and>
+ <isset property="lib.retro.exists"/>
+ <not>
+ <isset property="lib.retro.bak.exists"/>
+ </not>
+ </and>
+ </condition>
</target>
- <target name="prepare=aspect-library" depends="init">
+ <target name="prepare-aspect-library" depends="init">
<delete file="jboss-aspect-library.jar"/>
- <tempfile property="temp.dir" prefix="aop"/>
- <mkdir dir="${temp.dir}"/>
- <unjar src="${aspect.library}" dest="${temp.dir}"/>
+ <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="${temp.dir}/org/jboss/aop"/>
+ <delete dir="aspect-library-temp/org/jboss/aop"/>
- <jar destfile="jboss-aspect-library.jar" basedir="${temp.dir}" manifest="${temp.dir}/META-INF/MANIFEST.MF"/>
+ <!-- Get rid of the files that exist in jboss-standalone-aspect-library-jdk14.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"/>
- <delete dir="${temp.dir}"/>
+ <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="backup" depends="prepare=aspect-library" unless="old.deployer.exists">
+ <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}"/>
@@ -139,14 +188,43 @@
<delete dir="${temp.dir}"/>
</target>
- <target name="backup.javassist.post.4.0.4" depends="init" if="backup.javassist">
- <move file="${lib.javassist}" tofile="${bak.javassist}"/>
+ <target name="backup.lib.javassist" depends="init" if="backup.lib.javassist">
+ <copy file="${lib.javassist}" tofile="${bak.javassist}" overwrite="true"/>
</target>
+
+ <target name="install.lib.javassist" depends="backup.lib.javassist" if="lib.javassist.exists">
+ <delete file="${deploy.dir}/jboss-aop-jdk14.deployer/javassist.jar"/>
+ <copy file="javassist.jar" tofile="${lib.javassist}" overwrite="true"/>
+ </target>
- <target name="install.post.4.0.4" depends="install.deployer, 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 name="backup.client.javassist" depends="init" if="backup.client.javassist">
+ <copy file="${client.javassist}" tofile="${bak.client.javassist}" overwrite="true"/>
</target>
+
+ <target name="install.client.javassist" depends="backup.client.javassist" if="client.javassist.exists">
+ <delete file="${deploy.dir}/jboss-aop-jdk14.deployer/javassist.jar"/>
+ <copy file="javassist.jar" tofile="${lib.javassist}" overwrite="true"/>
+ </target>
- <target name="install" depends="install.post.4.0.4"/>
+ <target name="backup.client.retro" depends="init" if="backup.client.retro">
+ <copy file="${client.retro}" tofile="${bak.client.retro}" overwrite="true"/>
+ </target>
+
+ <target name="install.client.retro" depends="backup.client.retro" if="client.retro.exists">
+ <copy file="jbossretro-rt.jar" tofile="${client.retro}" overwrite="true"/>
+ </target>
+
+ <target name="backup.lib.retro" depends="init" if="backup.lib.retro">
+ <copy file="${lib.retro}" tofile="${bak.lib.retro}" overwrite="true"/>
+ </target>
+
+ <target name="install.lib.retro" depends="backup.lib.retro" if="lib.retro.exists">
+ <delete file="${deploy.dir}/jboss-aop-jdk14.deployer/jbossretro-rt.jar"/>
+ <delete file="${deploy.dir}/jboss-aop-jdk14.deployer/jboss-backport-concurrent.jar"/>
+ <copy file="jbossretro-rt.jar" tofile="${lib.retro}" overwrite="true"/>
+ </target>
+
+ <target name="install.post.4.0.4" depends="install.lib.javassist, install.client.javassist, install.client.retro, install.lib.retro"/>
+
+ <target name="install" depends="install.deployer, install.post.4.0.4"/>
</project>
Modified: projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml 2007-06-11 18:22:01 UTC (rev 63458)
+++ projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml 2007-06-11 19:06:17 UTC (rev 63459)
@@ -45,21 +45,30 @@
</condition>
</target>
- <target name="prepare=aspect-library" depends="init">
+ <target name="prepare-aspect-library" depends="init">
+ <!-- Unjar aspect library into a temp folder -->
<delete file="jboss-aspect-library-jdk50.jar"/>
- <tempfile property="temp.dir" prefix="aop"/>
- <mkdir dir="${temp.dir}"/>
- <unjar src="${aspect.library}" dest="${temp.dir}"/>
+ <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="${temp.dir}/org/jboss/aop"/>
+ <delete dir="aspect-library-temp/org/jboss/aop"/>
- <jar destfile="jboss-aspect-library-jdk50.jar" basedir="${temp.dir}" manifest="${temp.dir}/META-INF/MANIFEST.MF"/>
+ <!-- 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"/>
- <delete dir="${temp.dir}"/>
+ <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="backup" depends="prepare=aspect-library" unless="old.deployer.exists">
+ <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}"/>
Modified: projects/aop/trunk/asintegration/src/etc/jboss.properties
===================================================================
--- projects/aop/trunk/asintegration/src/etc/jboss.properties 2007-06-11 18:22:01 UTC (rev 63458)
+++ projects/aop/trunk/asintegration/src/etc/jboss.properties 2007-06-11 19:06:17 UTC (rev 63459)
@@ -1,5 +1,5 @@
# Properties file for the ant install scripts
# Set the root of your jboss installation here
-jboss.home=C:/cygwin/home/Kabir/sourcecontrol/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
+jboss.home=C:/temp/jboss-4.0.4.GA-src/build/output/jboss-4.0.4.GA
#Set the server configuration you want to patch here (e.g, all or default)
jboss.config=all
Modified: projects/aop/trunk/aspects/build.xml
===================================================================
--- projects/aop/trunk/aspects/build.xml 2007-06-11 18:22:01 UTC (rev 63458)
+++ projects/aop/trunk/aspects/build.xml 2007-06-11 19:06:17 UTC (rev 63459)
@@ -245,7 +245,7 @@
<!-- Build jboss-standalone-aspect-library-jdk14.jar -->
<jar destfile="${build.lib}/jboss-standalone-aspect-library-jdk14.jar" manifest="${build.etc}/default.mf"
update="${jar.update}" index="${jar.index}">
- <fileset dir="${build.classes}">
+ <fileset dir="${build.classes.retro}">
<include name="org/jboss/aop/junit/**"/>
<include name="org/jboss/aspects/**"/>
</fileset>
More information about the jboss-cvs-commits
mailing list