[jboss-cvs] JBossAS SVN: r79743 - in projects/aop/trunk: build and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Oct 20 08:13:34 EDT 2008


Author: kabir.khan at jboss.com
Date: 2008-10-20 08:13:34 -0400 (Mon, 20 Oct 2008)
New Revision: 79743

Added:
   projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml
Modified:
   projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS5.txt
   projects/aop/trunk/asintegration-core/src/etc/jboss.properties
   projects/aop/trunk/build/build.xml
Log:
[JBAOP-668] Add AS 5 install script to release

Modified: projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS5.txt
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS5.txt	2008-10-20 12:09:45 UTC (rev 79742)
+++ projects/aop/trunk/asintegration-core/src/etc/ReadMe-AS5.txt	2008-10-20 12:13:34 UTC (rev 79743)
@@ -1,5 +1,5 @@
 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-jdk50.deployer/ folder
-Note that this will not replace the jboss-aspect-library-jdk50.jar, which is tied to application
+2) Copy the jboss-aop-jdk50.deployer over the JBoss-5.x/server/xxx/deployers/jboss-aop-jboss5.deployer/ folder
+Note that this will not replace the jboss-aspect-library.jar, which is tied to application
 server version
\ No newline at end of file

Added: 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	                        (rev 0)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-50-install-jboss-aop-jdk50-build.xml	2008-10-20 12:13:34 UTC (rev 79743)
@@ -0,0 +1,83 @@
+<?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="deployers.dir" value="${jboss.config.dir}/deployers"/>
+
+      <property name="aspect.deployer" value="${deployers.dir}/jboss-aop-jboss5.deployer"/>
+      <available file="${aspect.deployer}" property="deployer.exists" type="dir"/>
+      <fail unless="deployer.exists" message="${aspect.deployer} does not exist."/>
+
+      <property name="jboss.lib" value="${jboss.home}/lib"/>
+      <available file="${jboss.lib}" property="lib.exists" type="dir"/>
+      <fail unless="lib.exists" message="${jboss.lib} does not exist. Modify 'jboss.home' in build.xml to be a valid root of a jboss installation"/>
+
+      <tstamp>
+         <format property="tstamp"  pattern="yyyyMMdd-HHmmss"/>
+      </tstamp>
+   </target>
+
+
+   <target name="backup.lib" depends="init" unless="old.lib.exists">
+      <property name="old.lib" value="${jboss.lib}-${tstamp}.bak"/>
+      <echo>Backing up existing lib directory to ${old.lib}</echo>
+      <copy todir="${old.lib}">
+         <fileset dir="${jboss.lib}"/>
+      </copy>
+   </target>
+
+   <target name="backup.deployer" depends="init" unless="old.deployer.exists">
+      <property name="old.deployer" value="${aspect.deployer}-${tstamp}.bak"/>
+      <echo>Backing up existing aop deployer to ${old.deployer}</echo>
+      <copy todir="${old.deployer}">
+         <fileset dir="${aspect.deployer}"/>
+      </copy>
+   </target>
+
+   <target name="install.lib" depends="backup.lib">
+      <copy todir="${jboss.lib}">
+         <fileset dir="lib">
+            <include name="*"/>
+         </fileset>
+      </copy>
+   </target>
+
+   <target name="install.deployer" depends="backup.deployer">
+      <copy todir="${aspect.deployer}">
+         <fileset dir="jboss-aop-jboss5.deployer">
+            <include name="**/*"/>
+         </fileset>
+      </copy>
+   </target>
+
+   <target name="install.bin" depends="init">
+      <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" depends="install.lib,install.deployer,install.bin"/>
+</project>

Modified: projects/aop/trunk/asintegration-core/src/etc/jboss.properties
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss.properties	2008-10-20 12:09:45 UTC (rev 79742)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss.properties	2008-10-20 12:13:34 UTC (rev 79743)
@@ -1,5 +1,5 @@
 # Properties file for the ant install scripts
 # Set the root of your jboss installation here 
-jboss.home=C:/temp/jboss-4.0.4.GA-src/build/output/jboss-4.0.4.GA
+jboss.home=/Users/kabir/sourcecontrol/jboss-head/build/output/jboss-5.0.0.GA/
 #Set the server configuration you want to patch here (e.g, all or default)
 jboss.config=all

Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml	2008-10-20 12:09:45 UTC (rev 79742)
+++ projects/aop/trunk/build/build.xml	2008-10-20 12:13:34 UTC (rev 79743)
@@ -434,6 +434,8 @@
     <copy todir="${project.release}/jboss-50-install/lib" file="${aop.asintegration-mc.location}"/>
     <copy todir="${project.release}/jboss-50-install/lib" file="${aop.asintegration-jmx.location}"/>
     <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}"/>




More information about the jboss-cvs-commits mailing list