[jboss-cvs] JBossAS SVN: r69944 - in projects/ejb3/trunk/installer/src/main/resources: conf and 1 other directory.

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

Author: ALRubinger
Date: 2008-02-19 13:46:23 -0500 (Tue, 19 Feb 2008)
New Revision: 69944

Added:
   projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-jar-jbossall-includeslib.txt
Modified:
   projects/ejb3/trunk/installer/src/main/resources/build-install-ejb3-plugin.xml
Log:
[EJBTHREE-1194] Hack AOP Client classes into jbossall-client.jar

Modified: projects/ejb3/trunk/installer/src/main/resources/build-install-ejb3-plugin.xml
===================================================================
--- projects/ejb3/trunk/installer/src/main/resources/build-install-ejb3-plugin.xml	2008-02-19 17:56:28 UTC (rev 69943)
+++ projects/ejb3/trunk/installer/src/main/resources/build-install-ejb3-plugin.xml	2008-02-19 18:46:23 UTC (rev 69944)
@@ -22,6 +22,8 @@
 
   <!-- Configuration -->
   <property name="jboss.client" value="${jboss.home}/client" />
+  <!-- REMOVE: EJBTHREE-1194 -->
+  <property name="jboss.lib" value="${jboss.home}/lib" />
   <property name="installer.client" value="${installer.home}/client" />
   <property name="installer.lib" value="${installer.home}/lib" />
   <property name="installer.deploy" value="${installer.home}/deploy" />
@@ -37,6 +39,8 @@
   <property name="file.jbossas.patterns.deploy.includes" value="conf/jbossas-ejb3-patterns-to-unjar-for-deploy.txt" />
   <property name="file.jbossas.deployer.ejb3.includes" value="conf/jbossas-ejb3-files-to-place-in-ejb3-deployer.txt" />
   <property name="file.jbossas.jbossall.includes" value="conf/jbossas-ejb3-jar-jbossall-includes.txt" />
+  <!-- REMOVE: EJBTHREE-1194 -->
+  <property name="file.jbossas.jbossall.includeslib" value="conf/jbossas-ejb3-jar-jbossall-includeslib.txt" />
   <property name="file.jbossas.jbossall.excludes" value="conf/jbossas-ejb3-jar-jbossall-excludes.txt" />
   <property name="file.jbossas.ejb3client.includes" value="conf/jbossas-ejb3-jar-ejb3client-includes.txt" />
 
@@ -265,6 +269,13 @@
         <excludesfile name="${file.jbossas.jbossall.excludes}" />
       </fileset>
     </unjar>
+    
+    <!-- REMOVE: EJBTHREE-1194 -->
+    <unjar dest="${installer.client}">
+      <fileset dir="${jboss.lib}">
+        <includesfile name="${file.jbossas.jbossall.includeslib}" />
+      </fileset>
+    </unjar>
 
     <!-- ReJAR jbossall-client -->
     <jar destfile="${jboss.client}/jbossall-client.jar" basedir="${installer.client}" />

Added: projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-jar-jbossall-includeslib.txt
===================================================================
--- projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-jar-jbossall-includeslib.txt	                        (rev 0)
+++ projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-jar-jbossall-includeslib.txt	2008-02-19 18:46:23 UTC (rev 69944)
@@ -0,0 +1 @@
+jboss-aop-jdk50.jar
\ No newline at end of file