[jboss-cvs] JBossAS SVN: r103302 - in projects/aop/trunk: asintegration-core/src/etc and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 31 04:52:41 EDT 2010
Author: flavia.rainone at jboss.com
Date: 2010-03-31 04:52:40 -0400 (Wed, 31 Mar 2010)
New Revision: 103302
Modified:
projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml
projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS4.txt
projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS5.txt
projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS6.txt
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
projects/aop/trunk/build/build.xml
Log:
[JBAOP-777] Fix jboss-40-install script (it was still not working), tidy up the installation scripts, update documentation and README files.
Modified: projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml
===================================================================
--- projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml 2010-03-31 08:30:14 UTC (rev 103301)
+++ projects/aop/trunk/aop/docs/reference/reference/en/modules/installing.xml 2010-03-31 08:52:40 UTC (rev 103302)
@@ -3,7 +3,7 @@
<title>Installing</title>
<para>
- This section defines how to install JBoss AOP standalone, within JBoss 4.0.x, JBoss 4.2.x and within JBoss 5.x
+ This section defines how to install JBoss AOP standalone, within JBoss 4.0.x, JBoss 4.2.x, JBoss 5.x, and JBoss 6.x
</para>
<mediaobject>
@@ -34,10 +34,10 @@
<para>
To install JBoss AOP in JBoss 4.0.x or JBoss 4.2.x Application Server: with JDK 5, there is an ant build script to
- install into the application server. It lives in <literal>jboss-40-install/jboss-aop-jdk50.deployer/build.xml</literal>.
- Modify <literal>jboss-40-install/jboss-aop-jdk50.deployer/jboss.properties</literal> to point to the the root of your
- JBoss installation and specify the application server configuration you want to upgrade. These are the steps taken by
- the ant script:
+ install into the application server. It lives in <literal>jboss-40-install/build.xml</literal>.
+ Modify <literal>jboss-40-install/jboss.properties</literal> so that <literal>jboss.home</literal> property points
+ to the the root of your JBoss installation and specify the application server configuration you want to upgrade.
+ These are the steps taken by the ant script:
</para>
<orderedlist spacing="compact">
<listitem>
@@ -51,11 +51,22 @@
<literal><![CDATA[${jboss.home}/server/<config-name>/deploy/jboss-aop-jdk50.deployer]]></literal>
</listitem>
<listitem>
+ Copy the files <literal>javassist.jar</literal>, <literal>jboss-common-core.jar</literal>,
+ <literal>trove.jar</literal>, <literal>jboss-classpool.jar</literal>, and <literal>jboss-classpool-scoped.jar</literal>
+ from <literal>lib</literal> folder over the files that already exist in your existing JBoss Application Server
+ distribution under <literal><![CDATA[${jboss.home}/server/<config-name>/deploy/jboss-aop-jdk50.deployer]]></literal>
+ </listitem>
+ <listitem>
In JBoss 4.0.4.GA and later, move <literal><![CDATA[${jboss.home}/server/<config-name>/deploy/jboss-aop-jdk50.deployer/javassist.jar]]></literal>
to <literal><![CDATA[${jboss.home}/server/<config-name>/lib/javassist.jar]]></literal>. Any existing javassist.jar in that location is copied to
<literal><![CDATA[${jboss.home}/server/<config-name>/deploy/jboss-aop-jdk50.deployer.bak/lib/javassist.bak]]></literal>
</listitem>
<listitem>
+ In JBoss 4.0.5.GA and later, we are using jarjar to rename the packages of the files in <literal>jboss-40-install/jboss-aop-jdk50.deployer</literal>.
+ This is done to avoid crashing with older versions of the same packages in the server. If your server version is 4.0.5.GA or later, we
+ advise you to use the ant script for installation.
+ </listitem>
+ <listitem>
If you NOT upgrading from a previous AOP 2 distribution, open up
<literal><![CDATA[${jboss.home}/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
@@ -69,27 +80,77 @@
<sect1 id="installing-jboss5-jdk5" revision="1">
<title>Installing with JBoss Application Server 5</title>
<para>
- JBoss AS 5 ships with AOP 2.0.0.GA. To upgrade to a newer AOP version, we have provided am an script to
- upgrade the server. It can be found at <literal>jboss-50-install/build.xml</literal>. Modifly
- <literal>jboss-50-install</literal> to point to the root of your JBoss installation, and specify the
- application server configuration you want to upgrade. These are the steps taken by the
- ant script:
+ JBoss AS 5 ships with AOP 2.0.0.GA. To upgrade to a newer AOP version, we have provided an script to
+ upgrade the server. It can be found at <literal>jboss-50-install/build.xml</literal>. Modify
+ <literal>jboss-50-install/jboss.properties</literal> so that <literal>jboss.home</literal> points to the
+ root of your JBoss installation, and specify the application server configuration you want to upgrade.
+ These are the steps taken by the ant script:
</para>
<orderedlist spacing="compact">
<listitem>
Back up the existing <literal>${jboss.home}/lib</literal> and
- <literal><![CDATA[${jboss.home}/server/<config-name>/deployers/jboss-aop-jboss5.deployer]]></literal> folders.
+ <literal><![CDATA[${jboss.home}/server/<config-name>/deployers/jboss-aop-jboss5.deployer]]></literal> folders,
+ besides <literal><![CDATA[${jboss.home}/server/<config-name>/conf/bootstrap/aop.xml]]></literal> file
</listitem>
<listitem>
- Overwrite the <literal><![CDATA[${jboss.home}/server/<config-name>/deployers/jboss-aop-jboss5.deployer]]></literal>
- folder with the files from <literal>jboss-50-install/jboss-aop-jboss5.deployer</literal>.
+ Overwrite the <literal>${jboss.home}/lib</literal> folder with the files from <literal>jboss-50-install/lib</literal>.
</listitem>
<listitem>
- Overwrite the <literal>${jboss.home}/lib</literal> folder with the files from
- <literal>jboss-50-install/lib</literal>.
+ Overwrite the <literal>jboss-aop.jar</literal>, <literal>javassist.jar</literal>,
+ <literal>pluggable-instrumentor.jar</literal>, and <literal>trove.jar</literal> files in
+ <literal>${jboss.home}/lib</literal> with the corresponding files from <literal>lib</literal>
</listitem>
+ <listitem>
+ Overwrite the <literal>pluggable-instrumentor.jar</literal> and <literal>jboss-aop-aspects.jar</literal> files in the
+ <literal><![CDATA[${jboss.home}/server/<config-name>/deployers/jboss-aop-jboss5.deployer]]></literal> folder with
+ the corresponding files from <literal>lib</literal>
+ </listitem>
+ <listitem>
+ Overwrite the <literal><![CDATA[${jboss.home}/server/client/jboss-aop-client.jar]]></literal> file with the
+ <literal>lib/jboss-aop-client.jar</literal> file
+ </listitem>
+ <listitem>
+ Overwrite the <literal><![CDATA[${jboss.home}/server/<config-name>/conf/bootstrap/aop.xml]]></literal> file with
+ the corresponding file from <listeral>jboss-50-install</literal> directory
+ </listitem>
+
</orderedlist>
</sect1>
+ <sect1 id="installing-jboss6" revision="1">
+ <title>Installing with JBoss Application Server 6</title>
+ <para>
+ To upgrade JBoss AS 6 to a newer AOP version, we have provided an script to
+ upgrade the server. It can be found at <literal>jboss-60-install/build.xml</literal>. Modify
+ <literal>jboss-60-install/jboss.properties</literal> so that <literal>jboss.home</literal> points to the
+ root of your JBoss installation, and specify the application server configuration you want to upgrade.
+ These are the steps taken by the ant script:
+ </para>
+ <orderedlist spacing="compact">
+ <listitem>
+ Back up the existing <literal>${jboss.home}/lib</literal> and
+ <literal><![CDATA[${jboss.home}/server/<config-name>/deployers/jboss-aop-jboss5.deployer]]></literal> folders
+ </listitem>
+ <listitem>
+ Overwrite the <literal>${jboss.home}/lib</literal> folder with the files from <literal>jboss-60-install/lib</literal>.
+ </listitem>
+ <listitem>
+ Overwrite the <literal>jboss-aop.jar</literal>, <literal>javassist.jar</literal>, <literal>jboss-classpool.jar</literal>,
+ <literal>jboss-classpool-scoped.jar</literal>, and <literal>trove.jar</literal> files in
+ <literal>${jboss.home}/lib</literal> with the corresponding files from <literal>lib</literal>
+ </listitem>
+ <listitem>
+ Overwrite the <literal>pluggable-instrumentor.jar</literal> and <literal>jboss-aop-aspects.jar</literal> files in the
+ <literal><![CDATA[${jboss.home}/server/<config-name>/deployers/jboss-aop-jboss5.deployer]]></literal> folder with
+ the corresponding files from <literal>lib</literal>
+ </listitem>
+ <listitem>
+ Overwrite the <literal><![CDATA[${jboss.home}/server/client/jboss-aop-client.jar]]></literal> file with the
+ <literal>lib/jboss-aop-client.jar</literal> file
+ </listitem>
+
+ </orderedlist>
+
+ </sect1>
</chapter>
Modified: projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS4.txt
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS4.txt 2010-03-31 08:30:14 UTC (rev 103301)
+++ projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS4.txt 2010-03-31 08:52:40 UTC (rev 103302)
@@ -1,8 +1,26 @@
NOTE: from the 2.0 release of JBoss AOP only JDK1.5 is supported. This means that that both JBoss AS and AOP
need to be compiled with JDK1.5 before you upgrade JBoss AOP.
-To upgrade your jboss instance:
+To upgrade your JBoss AS 6.x instance, use the ant script:
+1) Edit jboss.properties file, setting the root of the jboss installation
+and the server configuration you wish to patch.
+2) Run the command:
+$ ant
+The ant script does an automatic backup of the affected files in your server.
+You can disable that option by setting backup property to false in the jboss.properties
+file.
+Alternatively, you can do the installation process manually:
+1) Copy the contents of jboss-aop-jdk50.deployer folder over the corresponding deployer folder in
+JBoss4.x/server/xxx/all/deploy
+2) Copy the files javassist.jar, jboss-common-core.jar, trove.jar, jboss-classpool.jar, and
+jboss-classpool-scoped.jar from ../lib folder over the files that already exist in your
+JBoss4.x/server/<config-name>/deploy/jboss-aop-jdk50.deployer folder
+
+* In JBoss 4.0.5.GA and later, we are using jarjar to rename the packages of the files in jboss-aop-jdk50.deployer
+This is done to avoid crashing with older versions of the same packages in the server. If your server version
+4.0.5.GA or later, we advise you to use the ant script for installation.
+
* If installing in a version before JBoss 4.0.4, you should leave javassist.jar in place in this folder.
*If installing in jboss 4.0.4 or later, the classes contained in javassist.jar will already be available,
@@ -23,10 +41,4 @@
* If you are deploying the jdk 1.4 deployer and upgrading from JDK 1.5, we need to modify the interfaces
specifying the simulated annotations in jboss-aspect-library.jar. The build.xml file does this
-as part of the install step.
-
-Alternatively, you can use the ant script, which will automate all these tasks for you:
-1) Edit jboss.properties file, setting the root of the jboss installation
-and the server configuration you wish to patch.
-2) Run the command:
-$ ant
\ No newline at end of file
+as part of the install step.
\ No newline at end of file
Modified: projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS5.txt
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS5.txt 2010-03-31 08:30:14 UTC (rev 103301)
+++ projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS5.txt 2010-03-31 08:52:40 UTC (rev 103302)
@@ -1,11 +1,20 @@
-To upgrade your jboss instance:
-1) Copy the contents of the lib folder into the JBoss-5.x/lib/ folder
-2) Copy the jboss-aop-jdk50.deployer over the JBoss-5.x/server/xxx/deployers/jboss-aop-jboss5.deployer/ folder
-3) Copy the jboss-aop-client.jar (located at ../lib) into the JBoss-5.x/client/ folder.
-Note that this will not replace the jboss-aspect-library.jar, which is tied to application
-server version
-Alternatively, you can use the ant script:
+To upgrade your JBoss AS 5.x instance, use the ant script:
1) Edit jboss.properties file, setting the root of the jboss installation
and the server configuration you wish to patch.
2) Run the command:
-$ ant
\ No newline at end of file
+$ ant
+The ant script does an automatic backup of the affected files in your server.
+You can disable that option by setting backup property to false in the jboss.properties
+file.
+
+Alternatively, you can do the installation process manually:
+1) Copy the contents of the lib folder into the JBoss-5.x/lib/ folder
+2) Copy the files jboss-aop.jar, javassist.jar, pluggable-instrumentor.jar, and
+trove.jar (from ../lib) into the JBoss-5.x/lib/ folder
+3) Copy the files ../lib/pluggable-instrumentor and ../lib/jboss-aop-aspects.jar
+over the JBoss-5.x/server/xxx/deployers/jboss-aop-jboss5.deployer/ folder
+4) Copy the jboss-aop-client.jar (located at ../lib) into the JBoss-5.x/client/ folder.
+5) Copy the aop.xml file into JBoss-5.x/server/xxx/conf/bootstrap
+
+Note that this will not replace the jboss-aspect-library.jar, which is tied to application
+server version
\ No newline at end of file
Modified: projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS6.txt
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS6.txt 2010-03-31 08:30:14 UTC (rev 103301)
+++ projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS6.txt 2010-03-31 08:52:40 UTC (rev 103302)
@@ -1,12 +1,21 @@
-To upgrade your jboss instance:
+To upgrade your JBoss AS 6.x instance, use the ant script:
+1) Edit jboss.properties file, setting the root of the jboss installation
+and the server configuration you wish to patch.
+2) Run the command:
+$ ant
+The ant script does an automatic backup of the affected files in your server.
+You can disable that option by setting backup property to false in the jboss.properties
+file.
+
+Alternatively, you can do the installation process manually:
1) Copy the contents of the lib folder into the JBoss-6.x/lib/ folder
-2) Copy the jboss-aop-jdk50.deployer over the JBoss-6.x/server/xxx/deployers/jboss-aop-jboss5.deployer/ folder
-3) Copy the jboss-aop-client.jar (located at ../lib) into the JBoss-6.x/client/ folder.
-4) Copy the aop.xml file into the JBoss-6.x/server/<your-server-config>/conf/bootstrap/
+2) Copy the files jboss-aop.jar, jboss-classpool.jar, jboss-classpool-scoped.jar,
+javassist.jar, and trove.jar (from ../lib) to the JBoss-6.x/lib folder.
+3) Copy the files ../lib/pluggable-instrumentor.jar and ../lib/jboss-aop-aspects.jar
+to the JBoss-6.x/server/xxx/deployers/jboss-aop-jboss5.deployer/ folder
+4) Copy the jboss-aop-client.jar (located at ../lib) into the JBoss-6.x/client/ folder.
+5) Copy the aop.xml file into the JBoss-6.x/server/<your-server-config>/conf/bootstrap/
+
Note that this will not replace the jboss-aspect-library.jar, which is tied to application
server version
-Alternatively, you can use the ant script:
-1) Edit jboss.properties file, setting the root of the jboss installation
-and the server configuration you wish to patch.
-2) Run the command:
-$ ant
\ No newline at end of file
+
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-31 08:30:14 UTC (rev 103301)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml 2010-03-31 08:52:40 UTC (rev 103302)
@@ -119,14 +119,14 @@
</and>
</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."/>
+
</target>
<target name="init-lib" depends="init" unless="AS-40">
- <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."/>
@@ -148,13 +148,16 @@
</target>
- <target name="jarjar" depends="init" if="enable.jarjar" >
+ <target name="jarjar" depends="init-lib" if="enable.jarjar" >
<path id="classpath">
<pathelement location="jarjar.jar"/>
</path>
+ <property name="jarjar.lib" value="jarjar-lib"/>
+ <property name="jarjar.suffix" value="-jarjar"/>
+ <mkdir dir="${jarjar.lib}"/>
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="classpath"/>
- <jarjar destfile="jboss-reflect-aop.jar">
- <zipfileset src="jboss-reflect.jar"/>
+ <jarjar destfile="${jarjar.lib}/jboss-reflect${jarjar.suffix}.jar">
+ <zipfileset src="${jboss.aop.lib}/jboss-reflect.jar"/>
<rule pattern="org.jboss.beans.**" result="org.jboss.jbossaop4deployermc2.beans. at 1"/>
<rule pattern="org.jboss.classadapter.**" result="org.jboss.jbossaop4deployermc2.classadapter. at 1"/>
<rule pattern="org.jboss.config.**" result="org.jboss.org.jboss.jbossaop4deployermc2.config. at 1"/>
@@ -163,8 +166,8 @@
<rule pattern="org.jboss.annotation.**" result="org.jboss.org.jboss.jbossaop4deployermc2.annotation. at 1"/>
<rule pattern="org.jboss.metadata.**" result="org.jboss.org.jboss.jbossaop4deployermc2.metadata. at 1"/>
</jarjar>
- <jarjar destfile="jboss-mdr-aop.jar">
- <zipfileset src="jboss-mdr.jar"/>
+ <jarjar destfile="${jarjar.lib}/jboss-mdr${jarjar.suffix}.jar">
+ <zipfileset src="${jboss.aop.lib}/jboss-mdr.jar"/>
<rule pattern="org.jboss.beans.**" result="org.jboss.jbossaop4deployermc2.beans. at 1"/>
<rule pattern="org.jboss.classadapter.**" result="org.jboss.jbossaop4deployermc2.classadapter. at 1"/>
<rule pattern="org.jboss.config.**" result="org.jboss.org.jboss.jbossaop4deployermc2.config. at 1"/>
@@ -173,8 +176,8 @@
<rule pattern="org.jboss.annotation.**" result="org.jboss.org.jboss.jbossaop4deployermc2.annotation. at 1"/>
<rule pattern="org.jboss.metadata.**" result="org.jboss.org.jboss.jbossaop4deployermc2.metadata. at 1"/>
</jarjar>
- <jarjar destfile="jboss-aop-jarjar.jar">
- <zipfileset src="jboss-aop-jdk50.jar"/>
+ <jarjar destfile="${jarjar.lib}/jboss-aop${jarjar.suffix}.jar">
+ <zipfileset src="${jboss.aop.lib}/jboss-aop.jar"/>
<rule pattern="org.jboss.beans.**" result="org.jboss.jbossaop4deployermc2.beans. at 1"/>
<rule pattern="org.jboss.classadapter.**" result="org.jboss.jbossaop4deployermc2.classadapter. at 1"/>
<rule pattern="org.jboss.config.**" result="org.jboss.org.jboss.jbossaop4deployermc2.config. at 1"/>
@@ -183,8 +186,8 @@
<rule pattern="org.jboss.annotation.**" result="org.jboss.org.jboss.jbossaop4deployermc2.annotation. at 1"/>
<rule pattern="org.jboss.metadata.**" result="org.jboss.org.jboss.jbossaop4deployermc2.metadata. at 1"/>
</jarjar>
- <jarjar destfile="jboss-aop-asintegration-core-jarjar.jar">
- <zipfileset src="jboss-aop-asintegration-core.jar"/>
+ <jarjar destfile="${jarjar.lib}/jboss-aop-asintegration-core${jarjar.suffix}.jar">
+ <zipfileset src="jboss-aop-jdk50.deployer/jboss-aop-asintegration-core.jar"/>
<rule pattern="org.jboss.beans.**" result="org.jboss.jbossaop4deployermc2.beans. at 1"/>
<rule pattern="org.jboss.classadapter.**" result="org.jboss.jbossaop4deployermc2.classadapter. at 1"/>
<rule pattern="org.jboss.config.**" result="org.jboss.org.jboss.jbossaop4deployermc2.config. at 1"/>
@@ -193,8 +196,8 @@
<rule pattern="org.jboss.annotation.**" result="org.jboss.org.jboss.jbossaop4deployermc2.annotation. at 1"/>
<rule pattern="org.jboss.metadata.**" result="org.jboss.org.jboss.jbossaop4deployermc2.metadata. at 1"/>
</jarjar>
- <jarjar destfile="jboss-aop-asintegration-jmx-jarjar.jar">
- <zipfileset src="jboss-aop-asintegration-jmx.jar"/>
+ <jarjar destfile="${jarjar.lib}/jboss-aop-asintegration-jmx${jarjar.suffix}.jar">
+ <zipfileset src="jboss-aop-jdk50.deployer/jboss-aop-asintegration-jmx.jar"/>
<rule pattern="org.jboss.beans.**" result="org.jboss.jbossaop4deployermc2.beans. at 1"/>
<rule pattern="org.jboss.classadapter.**" result="org.jboss.jbossaop4deployermc2.classadapter. at 1"/>
<rule pattern="org.jboss.config.**" result="org.jboss.org.jboss.jbossaop4deployermc2.config. at 1"/>
@@ -207,7 +210,6 @@
<target name="prepare-aspect-library" depends="init,download-aspect-library">
<!-- 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"/>
@@ -244,7 +246,7 @@
<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">
+ <unjar src="${jboss.aop.lib}/jboss-aop.jar" dest="jbossall-client-library-temp">
<patternset>
<exclude name="META-INF/MANIFEST.MF"/>
</patternset>
@@ -283,35 +285,45 @@
<target name="install.deployer" depends="delete.deployer,jarjar">
<!-- Indicates whether the jar files have been jarjarred -->
- <condition property="jarjarred" value="NOT_JARJARRED" else="">
+ <condition property="lib.dir" value="${jboss.aop.lib}" else="${jarjar.lib}">
<isfalse value="${enable.jarjar}"/>
</condition>
-
+ <condition property="suffix" value="${jarjar.suffix}" else="">
+ <istrue value="${enable.jarjar}"/>
+ </condition>
+ <condition property="exclude" value="**/*asintegration*.jar" else="">
+ <istrue value="${enable.jarjar}"/>
+ </condition>
<copy todir="${jboss.deploy.dir}" overwrite="true">
- <fileset 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/jarjar.jar"/>
- <!-- if the jar files have been jarjarred, we must not deploy the
- original jar files. If they haven't been jarjarred, we must deploy
- the original jar files. -->
- <exclude name="${jarjarred}jboss-aop-jdk50.deployer/jboss-reflect.jar"/>
- <exclude name="${jarjarred}jboss-aop-jdk50.deployer/jboss-mdr.jar"/>
- <exclude name="${jarjarred}jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
- <exclude name="${jarjarred}jboss-aop-jdk50.deployer/jboss-asintegration-core.jar"/>
- <exclude name="${jarjarred}jboss-aop-jdk50.deployer/jboss-asintegration-jmx.jar"/>
+ <exclude name="${exclude}"/>
</fileset>
</copy>
- <delete file="jboss-reflect-aop.jar"/>
- <delete file="jboss-mdr-aop.jar"/>
- <delete file="jboss-aop-jarjar.jar"/>
- <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"/>
- <move file="./base-aop.xml" todir="${jboss.deploy.dir}/jboss-aop${dot}deployer"/>
+ <copy todir="${jboss.deploy.dir}/jboss-aop-jdk50.deployer" overwrite="true" flatten="true">
+ <fileset dir="${jboss.aop.lib}">
+ <include name="javassist.jar"/>
+ <include name="jboss-common-core.jar"/>
+ <include name="trove.jar"/>
+ <include name="jboss-classpool.jar"/>
+ <include name="jboss-classpool-scoped.jar"/>
+ </fileset>
+ <!-- if the jar files have been jarjarred, we must not deploy the
+ original jar files. If they haven't been jarjarred, we must deploy
+ the original jar files. -->
+ <fileset dir="${lib.dir}">
+ <include name="jboss-aop-asintegration-core${suffix}.jar"/>
+ <include name="jboss-aop-asintegration-jmx${suffix}.jar"/>
+ <include name="jboss-mdr${suffix}.jar"/>
+ <include name="jboss-reflect${suffix}.jar"/>
+ </fileset>
+ </copy>
+ <move file="jboss-aspect-library-jdk50.jar" todir="${jboss.deploy.dir}/jboss-aop-jdk50.deployer"/>
+ <copy file="${lib.dir}/jboss-aop${suffix}.jar" tofile="${jboss.deploy.dir}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <copy file="${jboss.aop.lib}/jboss-aop-aspects.jar" tofile="${jboss.deploy.dir}/jboss-aop-jdk50.deployer/jboss-standalone-aspect-library-jdk50.jar"/>
+ <move file="${jboss.deploy.dir}/jboss-aop-jdk50.deployer" tofile="${jboss.deploy.dir}/jboss-aop${dot}deployer"/>
+ <move file="./base-aop.xml" todir="${jboss.deploy.dir}/jboss-aop${dot}deployer"/>
+ <delete dir="${jarjar.lib}"/>
</target>
<target name="backup.javassist.post.4.0.4" depends="init" if="backup.javassist">
@@ -328,7 +340,7 @@
<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"/>
+ <copy file="${jboss.aop.lib}/javassist.jar" tofile="${lib.javassist}" overwrite="true"/>
</target>
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-31 08:30:14 UTC (rev 103301)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml 2010-03-31 08:52:40 UTC (rev 103302)
@@ -107,6 +107,11 @@
<tstamp>
<format property="tstamp" pattern="yyyyMMdd-HHmmss"/>
</tstamp>
+
+ <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."/>
+
</target>
@@ -142,18 +147,25 @@
</target>
<target name="install.lib" depends="backup.lib,backup.client.lib">
- <copy todir="${jboss.lib}" overwrite="true">
+ <copy todir="${jboss.lib}" overwrite="true" flatten="true">
<fileset dir="lib">
<include name="*"/>
</fileset>
+ <fileset dir="${jboss.aop.lib}">
+ <include name="javassist.jar"/>
+ <include name="jboss-aop.jar"/>
+ <include name="pluggable-instrumentor.jar"/>
+ <include name="trove.jar"/>
+ </fileset>
</copy>
<copy file="${lib.jbossaop-client}" tofile="${lib.jbossaop-client.injboss}"/>
</target>
<target name="install.deployer" depends="backup.deployer">
- <copy todir="${aspect.deployer}" overwrite="true">
- <fileset dir="jboss-aop-jboss5.deployer">
- <include name="**/*"/>
+ <copy todir="${aspect.deployer}" overwrite="true" flatten="true">
+ <fileset dir="${jboss.aop.lib}">
+ <include name="pluggable-instrumentor.jar"/>
+ <include name="jboss-aop-aspects.jar"/>
</fileset>
</copy>
</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-31 08:30:14 UTC (rev 103301)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-60-install-jboss-aop-build.xml 2010-03-31 08:52:40 UTC (rev 103302)
@@ -71,6 +71,7 @@
<condition property="backup.enabled" value="true">
<istrue value="${backup}"/>
</condition>
+
</target>
@@ -100,14 +101,22 @@
<fileset dir="lib">
<include name="*"/>
</fileset>
+ <fileset dir="${jboss.aop.lib}">
+ <include name="javassist.jar"/>
+ <include name="jboss-aop.jar"/>
+ <include name="jboss-classpool.jar"/>
+ <include name="jboss-classpool-scoped.jar"/>
+ <include name="trove.jar"/>
+ </fileset>
</copy>
<copy file="${lib.jbossaop-client}" tofile="${lib.jbossaop-client.injboss}"/>
</target>
<target name="install.deployer" depends="backup.deployer">
<copy todir="${aspect.deployer}" overwrite="true">
- <fileset dir="jboss-aop-jboss5.deployer">
- <include name="**/*"/>
+ <fileset dir="${jboss.aop.lib}">
+ <include name="pluggable-instrumentor"/>
+ <include name="jboss-aop-aspects.jar"/>
</fileset>
</copy>
</target>
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2010-03-31 08:30:14 UTC (rev 103301)
+++ projects/aop/trunk/build/build.xml 2010-03-31 08:52:40 UTC (rev 103302)
@@ -319,14 +319,13 @@
<property name="aop.asintegration-mc.name" value="jboss-aop-asintegration-mc.jar"/>
<property name="aop.deployers.name" value="jboss-aop-deployers.jar"/>
- <property name="aop.50.location" value="${project.root}/aop/target/lib/jboss-aop.jar"/>
- <property name="aop.50.single.location" value="${project.root}/aop/target/lib/jboss-aop-single.jar"/>
- <property name="aop.aspect-library50.location" value="${project.root}/aspects/target/jboss-aop-aspects.jar"/>
+ <property name="aop.location" value="${project.root}/aop/target/lib/jboss-aop.jar"/>
+ <property name="aop.single.location" value="${project.root}/aop/target/lib/jboss-aop-single.jar"/>
+ <property name="aop.aspect-library.location" value="${project.root}/aspects/target/jboss-aop-aspects.jar"/>
<property name="aop.asintegration-core.location" value="${project.root}/asintegration-core/target/jboss-aop-asintegration-core.jar"/>
<property name="aop.asintegration-jmx.location" value="${project.root}/asintegration-jmx/target/jboss-aop-asintegration-jmx.jar"/>
<property name="aop.asintegration-mc.location" value="${project.root}/asintegration-mc/target/${aop.asintegration-mc.name}"/>
- <property name="aop.as5integration-mc.location" value="${project.root}/as5integration/target/jboss-aop-as5integration-mc.jar"/>
- <property name="aop.as5integration-deployers.location" value="${project.root}/as5integration/target/jboss-aop-as5integration-deployers.jar"/>
+ <property name="aop.as5integration-lib.location" value="${project.root}/as5integration/target/as5-install"/>
<property name="aop.pluggable-instrumentor.location" value="${project.root}/pluggable-instrumentor/target/pluggable-instrumentor.jar"/>
<property name="aop.deployers.location" value="${project.root}/deployers/target/${aop.deployers.name}"/>
<property name="aop.readme-as4.location" value="${project.root}/asintegration-core/src/etc/ReadMe-AS4.txt"/>
@@ -341,10 +340,10 @@
<copy todir="${project.release}" file="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
<!-- The JDK 5 libs -->
- <copy todir="${project.release}/lib" file="${aop.50.location}"/>
- <copy todir="${project.release}/lib" file="${aop.50.single.location}"/>
+ <copy todir="${project.release}/lib" file="${aop.location}"/>
+ <copy todir="${project.release}/lib" file="${aop.single.location}"/>
<copy todir="${project.release}/lib" file="${project.root}/aop/target/lib/jboss-aop-client.jar"/>
- <copy todir="${project.release}/lib" file="${aop.aspect-library50.location}"/>
+ <copy todir="${project.release}/lib" file="${aop.aspect-library.location}"/>
<copy todir="${project.release}/lib" file="${aop.pluggable-instrumentor.location}"/>
<copy todir="${project.release}/lib" file="${aop.deployers.location}"/>
<copy tofile="${project.release}/lib/javassist.jar" file="${javassist:javassist:jar}"/>
@@ -366,26 +365,20 @@
<filter token="SERVICE_NAME" value="org.jboss.aop.deployment.AspectManagerServiceJDK5"/>
</filterset>
</copy>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/build.xml" file="../asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="../asintegration-core/src/etc/jboss.properties"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar" file="${aop.50.location}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-standalone-aspect-library-jdk50.jar" file="${aop.aspect-library50.location}"/>
+ <copy tofile="${project.release}/jboss-40-install/build.xml" file="../asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml"/>
+ <copy todir="${project.release}/jboss-40-install/" file="${aop.readme-as4.location}"/>
+ <copy tofile="${project.release}/jboss-40-install/jarjar.jar" file="${com.google.code:jarjar:jar}"/>
+ <copy todir="${project.release}/jboss-40-install" file="../asintegration-core/src/etc/jboss.properties"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.asintegration-core.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.asintegration-jmx.location}"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.readme-as4.location}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-reflect.jar" file="${org.jboss:jboss-reflect:jar}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-mdr.jar" file="${org.jboss:jboss-mdr:jar}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-common-core.jar" file="${org.jboss:jboss-common-core:jar}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/javassist.jar" file="${javassist:javassist:jar}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/trove.jar" file="${trove:trove:jar}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jarjar.jar" file="${com.google.code:jarjar:jar}"/>
- <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml" file="output/temp/jboss-service-jdk50.xml"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml" file="output/temp/jboss-service-jdk50.xml"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/jboss-classpool-ucl.jar" file="${org.jboss.classpool:jboss-classpool-ucl:jar}"/>
+
<!-- The JBoss 5 libs for JDK 5 (JBoss 5 needs JDK 5) -->
- <copy todir="${project.release}/jboss-50-install/lib" file="${aop.50.location}"/>
<copy todir="${project.release}/jboss-50-install/lib" file="${aop.asintegration-core.location}"/>
<copy todir="${project.release}/jboss-50-install/lib">
- <fileset dir="${project.root}/as5integration/target/as5-install">
+ <fileset dir="${aop.as5integration-lib.location}">
<include name="*.jar"/>
</fileset>
</copy>
@@ -393,29 +386,18 @@
<copy todir="${project.release}/jboss-50-install" file="${aop.readme-as5.location}"/>
<copy tofile="${project.release}/jboss-50-install/build.xml" file="../asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml"/>
<copy todir="${project.release}/jboss-50-install" file="../asintegration-core/src/etc/jboss.properties"/>
- <copy tofile="${project.release}/jboss-50-install/lib/javassist.jar" file="${javassist:javassist:jar}"/>
- <copy tofile="${project.release}/jboss-50-install/lib/trove.jar" file="${trove:trove:jar}"/>
- <copy todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer/" file="${aop.aspect-library50.location}"/>
- <copy todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer/" file="${aop.pluggable-instrumentor.location}"/>
<copy tofile="${project.release}/jboss-50-install/aop.xml" file="${jboss-install-aop.xml.location}"/>
<copy tofile="${project.release}/jboss-50-install/append-run.conf" file="${jboss-50-run.conf.location}"/>
<copy tofile="${project.release}/jboss-50-install/append-run.conf.bat" file="${jboss-50-run.conf.bat.location}"/>
<!-- The JBoss 6 libs for JDK 6 (JBoss 6 needs JDK6) -->
- <copy todir="${project.release}/jboss-60-install/lib" file="${aop.50.location}"/>
- <copy todir="${project.release}/jboss-60-install/lib" file="${aop.asintegration-core.location}"/>
- <copy todir="${project.release}/jboss-60-install/lib" file="${aop.asintegration-mc.location}"/>
<copy todir="${project.release}/jboss-60-install" file="${aop.readme-as6.location}"/>
<copy tofile="${project.release}/jboss-60-install/build.xml" file="../asintegration-core/src/etc/jboss-60-install-jboss-aop-build.xml"/>
<copy tofile="${project.release}/jboss-60-install/aop.xml" file="${jboss-install-aop.xml.location}"/>
<copy todir="${project.release}/jboss-60-install" file="../asintegration-core/src/etc/jboss.properties"/>
- <copy tofile="${project.release}/jboss-60-install/lib/javassist.jar" file="${javassist:javassist:jar}"/>
- <copy tofile="${project.release}/jboss-60-install/lib/jboss-classpool-scoped.jar" file="${org.jboss.classpool:jboss-classpool-scoped:jar}"/>
- <copy tofile="${project.release}/jboss-60-install/lib/jboss-classpool.jar" file="${org.jboss.classpool:jboss-classpool:jar}"/>
+ <copy todir="${project.release}/jboss-60-install/lib" file="${aop.asintegration-core.location}"/>
+ <copy todir="${project.release}/jboss-60-install/lib" file="${aop.asintegration-mc.location}"/>
<copy tofile="${project.release}/jboss-60-install/lib/jboss-classpool-jbosscl.jar" file="${org.jboss.classpool:jboss-classpool-jbosscl:jar}"/>
- <copy tofile="${project.release}/jboss-60-install/lib/trove.jar" file="${trove:trove:jar}"/>
- <copy todir="${project.release}/jboss-60-install/jboss-aop-jboss5.deployer/" file="${aop.aspect-library50.location}"/>
- <copy todir="${project.release}/jboss-60-install/jboss-aop-jboss5.deployer/" file="${aop.pluggable-instrumentor.location}"/>
<!-- Copy aophelper to the dist -->
<mkdir dir="${project.release}/aophelper"/>
More information about the jboss-cvs-commits
mailing list