[jboss-cvs] JBossAS SVN: r77756 - in projects/aop/trunk: build and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 1 11:56:13 EDT 2008
Author: stalep
Date: 2008-09-01 11:56:13 -0400 (Mon, 01 Sep 2008)
New Revision: 77756
Added:
projects/aop/trunk/asintegration/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml
Modified:
projects/aop/trunk/asintegration/src/etc/ReadMe-AS4.txt
projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
projects/aop/trunk/build/build-release.xml
Log:
Now it should install cleanly on AS 4.2.* and 4.0.*
Modified: projects/aop/trunk/asintegration/src/etc/ReadMe-AS4.txt
===================================================================
--- projects/aop/trunk/asintegration/src/etc/ReadMe-AS4.txt 2008-09-01 15:15:54 UTC (rev 77755)
+++ projects/aop/trunk/asintegration/src/etc/ReadMe-AS4.txt 2008-09-01 15:56:13 UTC (rev 77756)
@@ -1,3 +1,10 @@
+NOTE:
+If you want to install JBoss AOP on JBoss 4.2.* or newer, use build.xml
+If you Want to install JBoss AOP on JBoss 4.0.* use build_jboss4.0.xml (ant -f build_jboss4.0.xml)
+
+- 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.
+
* 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,
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 2008-09-01 15:15:54 UTC (rev 77755)
+++ projects/aop/trunk/asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml 2008-09-01 15:56:13 UTC (rev 77756)
@@ -23,15 +23,15 @@
<property name="deploy.dir" value="${jboss.config.dir}/deploy"/>
- <property name="aspect.deployer" value="${deploy.dir}/jboss-aop-jdk50.deployer"/>
+ <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-jdk50.jar"/>
+ <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-jdk50.deployer.bak"/>
+ <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"/>
@@ -67,7 +67,7 @@
<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"/>
+ <jar destfile="jboss-aspect-library.jar" basedir="aspect-library-temp" manifest="aspect-library-temp/META-INF/MANIFEST.MF"/>
<delete dir="aspect-library-temp"/>
</target>
@@ -84,11 +84,14 @@
<copy todir="${deploy.dir}">
<fileset dir="..">
<include name="jboss-aop-jdk50.deployer/**"/>
- <exclude name="build.xml"/>
- <exclude name="jboss.properties"/>
+ <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>
- <copy todir="${deploy.dir}/jboss-aop-jdk50.deployer" file="${old.deployer}/base-aop.xml"/>
+ <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">
Added: projects/aop/trunk/asintegration/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/trunk/asintegration/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml (rev 0)
+++ projects/aop/trunk/asintegration/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml 2008-09-01 15:56:13 UTC (rev 77756)
@@ -0,0 +1,117 @@
+<?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"/>
+
+ <available file="${jboss.home}" property="jboss.exists" type="dir"/>
+ <fail unless="jboss.exists" message="${jboss.home} does not exist. Modify 'jboss.home' in build.xml 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 build.xml 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 build.xml 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>
+ </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="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">
+ <copy todir="${jboss.bin.dir}">
+ <fileset dir="../../lib-50">
+ <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>
Modified: projects/aop/trunk/build/build-release.xml
===================================================================
--- projects/aop/trunk/build/build-release.xml 2008-09-01 15:15:54 UTC (rev 77755)
+++ projects/aop/trunk/build/build-release.xml 2008-09-01 15:56:13 UTC (rev 77756)
@@ -177,7 +177,8 @@
<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/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/build_jboss4.0.xml" file="../asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/build.xml" file="../asintegration/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="../asintegration/src/etc/jboss.properties"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.50.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.aspect-library50.location}"/>
More information about the jboss-cvs-commits
mailing list