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

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2008-10-17 11:54:33 -0400 (Fri, 17 Oct 2008)
New Revision: 79651

Modified:
   projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
   projects/aop/trunk/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml
   projects/aop/trunk/build/build.xml
Log:
[JBAOP-668] Fix install scripts for new location. Make sure that the files in the as 4 deployer are called the same as always

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	2008-10-17 15:52:06 UTC (rev 79650)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml	2008-10-17 15:54:33 UTC (rev 79651)
@@ -100,7 +100,7 @@
    
    <target name="install.bin" depends="init">
       <copy todir="${jboss.bin.dir}">
-         <fileset dir="../../lib-50">
+         <fileset dir="../../lib">
             <include name="pluggable-instrumentor.jar"/>
             <include name="jrockit-pluggable-instrumentor.jar"/>
          </fileset>

Modified: projects/aop/trunk/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml	2008-10-17 15:52:06 UTC (rev 79650)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml	2008-10-17 15:54:33 UTC (rev 79651)
@@ -100,7 +100,7 @@
    
    <target name="install.bin" depends="init">
       <copy todir="${jboss.bin.dir}">
-         <fileset dir="../../lib-50">
+         <fileset dir="../../lib">
             <include name="pluggable-instrumentor.jar"/>
             <include name="jrockit-pluggable-instrumentor.jar"/>
          </fileset>

Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml	2008-10-17 15:52:06 UTC (rev 79650)
+++ projects/aop/trunk/build/build.xml	2008-10-17 15:54:33 UTC (rev 79651)
@@ -416,8 +416,8 @@
     <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/build_jboss4.0.xml" file="../asintegration-core/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-core/src/etc/jboss-42-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 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}"/>
+    <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 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}"/>