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

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

Author: wolfc
Date: 2007-05-03 08:09:48 -0400 (Thu, 03 May 2007)
New Revision: 62778

Modified:
   trunk/build/build-distr.xml
Log:
JBAS-4392: fixed hibernate-annotations & hibernate-entitymanager installation

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-05-03 10:42:25 UTC (rev 62777)
+++ trunk/build/build-distr.xml	2007-05-03 12:09:48 UTC (rev 62778)
@@ -131,29 +131,6 @@
   </target>
 
   <!-- ======== -->
-  <!-- EJB3X  -->
-  <!-- ======== -->
-
-  <target name="_module-ejb3x-most">
-    <property name="_module.name" value="ejb3x" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
-    <!-- Copy across client jars -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-ejb3x.jar"/>
-      </fileset>
-    </copy>
-
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${hibernate.entitymanager.lib}" includes="*.jar"/>
-      <fileset dir="${hibernate.annotations.lib}" includes="*.jar"/>
-    </copy>
-
-  </target>
-
-  <!-- ======== -->
   <!-- EJB 3.0 -->
   <!-- ======== -->
 
@@ -179,9 +156,8 @@
 
     <!-- Copy the third party libraries -->
     <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${hibernate.entitymanager.lib}">
-        <include name="ejb3-persistence.jar"/>
-      </fileset>
+      <fileset dir="${hibernate.entitymanager.lib}" includes="*.jar"/>
+      <fileset dir="${hibernate.annotations.lib}" includes="*.jar"/>
     </copy>
 
     <!-- Copy across client jars -->
@@ -189,7 +165,6 @@
     <copy todir="${install.client}" filtering="no">
       <fileset dir="${_module.output}/lib">
         <include name="jboss-ejb3-client.jar"/>
-        <include name="jboss-ejb3x.jar"/>
         <include name="hibernate-client.jar"/>
         <include name="jboss-annotations-ejb3.jar"/>
       </fileset>
@@ -282,47 +257,6 @@
 
   </target>
 
-  <!-- ==== -->
-  <!-- J2EE -->
-  <!-- ==== -->
-
-  <target name="_module-j2ee-most">
-    <property name="_module.name" value="j2ee" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-j2ee.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-        <include name="jboss-j2ee.jar"/>
-      </fileset>
-      <fileset dir="${sun.jaf.lib}">
-        <include name="activation.jar"/>
-      </fileset>
-      <fileset dir="${sun.javamail.lib}">
-        <include name="mail.jar"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="_module-j2ee-all" depends="_module-j2ee-most">
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${_module.name}"/>
-    <copy todir="${install.api}/${_module.name}" filtering="no">
-      <fileset dir="${_module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
   <!-- ====== -->
   <!-- System -->
   <!-- ====== -->