[jboss-cvs] JBossAS SVN: r92587 - in branches/JBPAPP_5_0: build and 3 other directories.

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

Author: permaine
Date: 2009-08-19 18:07:38 -0400 (Wed, 19 Aug 2009)
New Revision: 92587

Modified:
   branches/JBPAPP_5_0/aspects/build.xml
   branches/JBPAPP_5_0/build/build-distr.xml
   branches/JBPAPP_5_0/ejb3/build.xml
   branches/JBPAPP_5_0/main/build.xml
   branches/JBPAPP_5_0/server/src/etc/conf/all/bootstrap/aop.xml
Log:
JBPAPP-2518 Some jars in EAP contain no classes

Modified: branches/JBPAPP_5_0/aspects/build.xml
===================================================================
--- branches/JBPAPP_5_0/aspects/build.xml	2009-08-19 20:15:29 UTC (rev 92586)
+++ branches/JBPAPP_5_0/aspects/build.xml	2009-08-19 22:07:38 UTC (rev 92587)
@@ -256,14 +256,6 @@
          -->
       </jar>
 
-      <!-- Build jboss-aop-jboss5.jar -->
-      <jar destfile="${build.lib}/jboss-aop-jboss5.jar" manifest="${build.etc}/default.mf"
-         update="${jar.update}" index="${jar.index}">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/aop/asintegration/jboss5/**"/>
-         </fileset>
-      </jar>
-
       <!-- Build jboss-aop-embedded.jar -->
       <jar destfile="${build.lib}/jboss-aop-embedded.jar" manifest="${build.etc}/default.mf"
          update="${jar.update}" index="${jar.index}">

Modified: branches/JBPAPP_5_0/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_0/build/build-distr.xml	2009-08-19 20:15:29 UTC (rev 92586)
+++ branches/JBPAPP_5_0/build/build-distr.xml	2009-08-19 22:07:38 UTC (rev 92587)
@@ -245,12 +245,6 @@
       </fileset>
     </copy>
 
-    <copy todir="${install.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-aop-jboss5.jar"/>
-      </fileset>
-    </copy>
-
     <!-- Copy across client jars -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">

Modified: branches/JBPAPP_5_0/ejb3/build.xml
===================================================================
--- branches/JBPAPP_5_0/ejb3/build.xml	2009-08-19 20:15:29 UTC (rev 92586)
+++ branches/JBPAPP_5_0/ejb3/build.xml	2009-08-19 22:07:38 UTC (rev 92587)
@@ -318,12 +318,6 @@
             <include name="org/jboss/ejb3/clientmodule/**"/>
          </fileset>
       </jar>
-      <!-- jboss-ejb3-iiop.jar -->
-      <jar jarfile="${build.lib}/jboss-ejb3-iiop.jar" manifest="${build.etc}/default.mf">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/iiop/**"/>
-         </fileset>
-      </jar>
       <!-- jboss-ejb3-deployer.jar -->
       <jar jarfile="${build.lib}/jboss-ejb3-deployer.jar" manifest="${build.etc}/default.mf">
          <fileset dir="${build.classes}">
@@ -348,7 +342,6 @@
       <copy todir="${build.lib}/ejb3.deployer">
          <fileset dir="${build.lib}">
             <include name="jboss-ejb3-deployer.jar"/>
-            <include name="jboss-ejb3-iiop.jar"/>
          </fileset>
          <fileset dir="${resources}">
             <include name="META-INF/ejb3-deployers-jboss-beans.xml"/>

Modified: branches/JBPAPP_5_0/main/build.xml
===================================================================
--- branches/JBPAPP_5_0/main/build.xml	2009-08-19 20:15:29 UTC (rev 92586)
+++ branches/JBPAPP_5_0/main/build.xml	2009-08-19 22:07:38 UTC (rev 92587)
@@ -88,12 +88,6 @@
     <property name="jar.prefix" value="jboss-main"/>
     <property name="javac.target" value="1.5"/>
     <property name="javac.source" value="1.5"/>
-    <property name="jar.client.includes" 
-              value="org/jboss/system/server/ServerLoader*.class,
-                     org/jboss/system/server/Server.class,
-                     org/jboss/system/server/ServerConfig.class,
-                     **/*MBean.class"
-    />
 
     <call target="_default:task-init"/>
 
@@ -149,10 +143,6 @@
       <fileset dir="${build.classes}"/>
     </jar>
 
-    <jar jarfile="${build.lib}/${jar.client.name}" manifest="${build.etc}/default.mf">
-       <fileset dir="${build.classes}" includes="${jar.client.includes}"/>
-    </jar>
-  	
   	<!-- Inflate out contents of the Bootstrap JAR into a Temp Directory -->
   	<property name="inflated.dir" value="tmp-bootstrap" />
   	<mkdir dir="${inflated.dir}"/>

Modified: branches/JBPAPP_5_0/server/src/etc/conf/all/bootstrap/aop.xml
===================================================================
--- branches/JBPAPP_5_0/server/src/etc/conf/all/bootstrap/aop.xml	2009-08-19 20:15:29 UTC (rev 92586)
+++ branches/JBPAPP_5_0/server/src/etc/conf/all/bootstrap/aop.xml	2009-08-19 22:07:38 UTC (rev 92587)
@@ -12,7 +12,6 @@
       <root>${jboss.lib.url}jboss-aop-asintegration-jmx.jar</root>
       <root>${jboss.lib.url}jboss-aop-asintegration-mc.jar</root>
       <root>${jboss.lib.url}jboss-aop-deployers.jar</root>
-      <root>${jboss.lib.url}jboss-aop-jboss5.jar</root>
    </classloader>
 
    <!-- Integration -->