[jboss-cvs] JBossAS SVN: r83106 - projects/aop/branches/Branch_2_0/asintegration-core/src/etc.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 20 09:00:27 EST 2009
Author: flavia.rainone at jboss.com
Date: 2009-01-20 09:00:27 -0500 (Tue, 20 Jan 2009)
New Revision: 83106
Modified:
projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
Log:
[JBAOP-693] Updating the branch 2.0 script with the jarjar feature.
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-20 13:47:57 UTC (rev 83105)
+++ projects/aop/branches/Branch_2_0/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml 2009-01-20 14:00:27 UTC (rev 83106)
@@ -124,6 +124,63 @@
</target>
+ <target name="jarjar" depends="init" unless="AS-40" >
+ <path id="classpath">
+ <pathelement location="jarjar.jar"/>
+ </path>
+ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="classpath"/>
+ <jarjar destfile="jboss-reflect-aop.jar">
+ <zipfileset src="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"/>
+ <rule pattern="org.jboss.joinpoint.**" result="org.jboss.org.jboss.jbossaop4deployermc2.joinpoint. at 1"/>
+ <rule pattern="org.jboss.reflect.**" result="org.jboss.org.jboss.jbossaop4deployermc2.reflect. at 1"/>
+ <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"/>
+ <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"/>
+ <rule pattern="org.jboss.joinpoint.**" result="org.jboss.org.jboss.jbossaop4deployermc2.joinpoint. at 1"/>
+ <rule pattern="org.jboss.reflect.**" result="org.jboss.org.jboss.jbossaop4deployermc2.reflect. at 1"/>
+ <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"/>
+ <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"/>
+ <rule pattern="org.jboss.joinpoint.**" result="org.jboss.org.jboss.jbossaop4deployermc2.joinpoint. at 1"/>
+ <rule pattern="org.jboss.reflect.**" result="org.jboss.org.jboss.jbossaop4deployermc2.reflect. at 1"/>
+ <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"/>
+ <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"/>
+ <rule pattern="org.jboss.joinpoint.**" result="org.jboss.org.jboss.jbossaop4deployermc2.joinpoint. at 1"/>
+ <rule pattern="org.jboss.reflect.**" result="org.jboss.org.jboss.jbossaop4deployermc2.reflect. at 1"/>
+ <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"/>
+ <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"/>
+ <rule pattern="org.jboss.joinpoint.**" result="org.jboss.org.jboss.jbossaop4deployermc2.joinpoint. at 1"/>
+ <rule pattern="org.jboss.reflect.**" result="org.jboss.org.jboss.jbossaop4deployermc2.reflect. at 1"/>
+ <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>
+ </target>
+
<target name="prepare-aspect-library" depends="init">
<!-- Unjar aspect library into a temp folder -->
<delete file="jboss-aspect-library-jdk50.jar"/>
@@ -171,7 +228,7 @@
</target>
<target name="update-jbossaop-library" depends="init-lib, backup-jbossaop-library" unless="AS-40">
- <copy file="${lib.jbossaop-client}" tofile="${bak.jbossaop-client.injboss}"/>
+ <copy file="${lib.jbossaop-client}" tofile="${lib.jbossaop-client.injboss}" overwrite="true"/>
</target>
<target name="backup-jbossaop-library" if="backup.jbossaop-client">
@@ -187,16 +244,36 @@
<delete dir="${aspect.deployer}"/>
</target>
- <target name="install.deployer" depends="backup">
- <copy todir="${jboss.deploy.dir}">
+ <target name="install.deployer" depends="backup,jarjar">
+
+ <!-- Indicates whether the jar files have been jarjarred -->
+ <condition property="jarjarred" value="NOT_JARJARRED" else="">
+ <istrue value="${AS-40}"/>
+ </condition>
+
+ <copy todir="${jboss.deploy.dir}" overwrite="true">
<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"/>
</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"/>
<copy todir="${jboss.deploy.dir}/jboss-aop${dot}deployer" file="${old.deployer}/base-aop.xml"/>
</target>
More information about the jboss-cvs-commits
mailing list