[jboss-cvs] JBossAS SVN: r100837 - trunk/build.

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

Author: pgier
Date: 2010-02-10 18:02:46 -0500 (Wed, 10 Feb 2010)
New Revision: 100837

Modified:
   trunk/build/build.xml
Log:
[JBAS-7718] Fix manifest classpath in jbossall-client.jar

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-02-10 22:43:23 UTC (rev 100836)
+++ trunk/build/build.xml	2010-02-10 23:02:46 UTC (rev 100837)
@@ -397,58 +397,12 @@
 
   </target>
 
-  <target name="jboss-all-client" depends="init"
-      description="Create jar containing client classpath">
+  <target name="jboss-all-client" depends="configure"
+      description="Create jar containing client app classpath">
 
-    <!--Create a jbossall-client.jar containing the classpath for everything a client app needs-->
-
-    <property name="client.jar.dir" location="${install.client}" />
     <property name="jbossall.client.filename" value="jbossall-client.jar"/>
-
-    <fileset id="client.jar.fileset" dir="${client.jar.dir}">
-      <include name="*-client.jar"/>
-      <include name="asm.jar"/>
-      <include name="cglib-2.1.1.jar"/>
-      <include name="jcl-over-slf4j.jar"/>
-      <include name="cdi-api.jar"/>
-      <include name="concurrent.jar"/>
-      <include name="jpa-api.jar"/>
-      <include name="hibernate-annotations.jar"/>
-      <include name="hibernate-commons-annotations.jar"/>
-      <include name="hibernate-core.jar"/>
-      <include name="hibernate-validator.jar"/>      
-      <include name="javax.inject.jar"/>
-      <include name="jboss-annotations-ejb3.jar"/>
-      <include name="jboss-auth.jar"/>
-      <include name="jboss-appclient.jar"/>
-      <include name="jboss-common*.jar"/>
-      <include name="jboss-ejb3-ext-api.jar"/>
-      <include name="jboss-logging*.jar"/>
-      <include name="jboss-interceptor-api.jar"/>
-      <include name="slf4j-api.jar"/>
-      <include name="slf4j-jboss-logging.jar"/>
-      <include name="jboss-deployment.jar"/>
-      <include name="jboss-javaee.jar"/>
-      <include name="jboss-integration.jar"/>
-      <include name="jboss-j2se.jar"/>
-      <include name="jboss-jmx-annotations.jar"/>
-      <include name="jboss-jmx.jar"/>
-      <include name="jboss-remoting.jar"/>
-      <include name="jboss-security-spi.jar"/>
-      <include name="jboss-serialization.jar"/>
-      <include name="jmx-connector-client-factory.jar"/>
-      <include name="namespace.jar"/>
-      <include name="xmlsec.jar"/>
-      <include name="jboss-messaging.jar"/>
-      <include name="jboss-mdr.jar"/>
-      <include name="jboss-deployers-core.jar"/>
-      <include name="jboss-deployers-core-spi.jar"/>
-      <include name="jboss-deployers-client.jar"/>
-      <include name="jboss-deployers-client-spi.jar"/>
-      <include name="jbossjts.jar"/>
-      <include name="jbossjts-integration.jar"/>
-      <include name="jbossjts-jacorb.jar"/>
-      <include name="weld-api.jar"/>
+    
+    <fileset id="client.jar.fileset" dir="${install.client}">
       <!-- client excludes -->
       <exclude name="jbossws-native-client.jar"/>
       <exclude name="${jbossall.client.filename}"/>
@@ -460,12 +414,12 @@
 
     <pathconvert property="client.jar.manifest.classpath" refid="client.jar.classpath"
                  pathsep=" " dirsep="${file.separator}">
-      <map from="${client.jar.dir}${file.separator}" to="" />
+      <map from="${install.client}${file.separator}" to="" />
     </pathconvert>
 
     <pathconvert property="client.jar.files" refid="client.jar.classpath" 
                  pathsep="${line.separator}"  dirsep="${file.separator}">
-      <map from="${client.jar.dir}${file.separator}" to="" />
+      <map from="${install.client}${file.separator}" to="" />
     </pathconvert>
 
     <mkdir dir="${dist.module.output}/temp"/>