From 264ff63269523de0dce679623d5a18e76c12af4d Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Mon, 9 Aug 2010 22:48:40 +0000
Subject: [PATCH] CSPACE-2602: Checking in Laramie's changes to the deploy_jpa
 target in the common module's Ant buildfile. This resolves an issue, present
 in releases 0.7 and 0.8, which could result in a 'could not find resource
 file' error when running 'ant deploy'.

---
 services/common/build.xml | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/services/common/build.xml b/services/common/build.xml
index d08e4b2bd..26a875f43 100644
--- a/services/common/build.xml
+++ b/services/common/build.xml
@@ -1,4 +1,3 @@
-
 <project name="common" default="package" basedir=".">
     <description>
         collectionspace services common
@@ -8,6 +7,7 @@
     <!-- enviornment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
+
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
     <property name="build" location="build"/>
@@ -17,6 +17,7 @@
     </condition>
     <condition property="osfamily-windows">
         <os family="windows" />
+
     </condition>
 
     <target name="init" >
@@ -28,6 +29,7 @@
             description="Package CollectionSpace Services" />
     <target name="package-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
+
             <arg value="package" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -37,6 +39,7 @@
         </exec>
     </target>
     <target name="package-windows" if="osfamily-windows">
+
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
             <arg value="mvn.bat" />
@@ -46,6 +49,7 @@
             <arg value="${basedir}/pom.xml" />
             <arg value="-N" />
             <arg value="${mvn.opts}" />
+
         </exec>
     </target>
 
@@ -56,6 +60,7 @@
             <arg value="install" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
+
             <arg value="${basedir}/pom.xml" />
             <arg value="-N" />
             <arg value="${mvn.opts}" />
@@ -65,6 +70,7 @@
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
             <arg value="mvn.bat" />
+
             <arg value="install" />
             <arg value="-Dmaven.test.skip=true" />
             <arg value="-f" />
@@ -84,6 +90,7 @@
             <arg value="${mvn.opts}" />
         </exec>
     </target>
+
     <target name="clean-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
             <arg value="/c" />
@@ -102,6 +109,7 @@
     </target>
     <target name="test-windows" if="osfamily-windows">
         <exec executable="cmd" failonerror="true">
+
             <arg value="/c" />
             <arg value="mvn.bat" />
             <arg value="test" />
@@ -109,18 +117,19 @@
         </exec>
     </target>
 
-    <target name="deploy_jpa"
-            description="deploy jpa binaries in ${jboss.server.cspace}">
+    <target name="deploy_jpa" description="deploy jpa binaries in ${jboss.server.cspace}">
         <move todir="${jboss.server.cspace}/jpa-upgrade/lib" overwrite="false">
-            <filelist dir="${jboss.server.cspace}/lib">
-                <file name="hibernate-annotations.jar"/>
-                <file name="hibernate-entitymanager.jar"/>
-                <file name="ejb3-persistence.jar"/>
-            </filelist>
+
+            <fileset dir="${jboss.server.cspace}/lib">
+              <include name="hibernate-annotations*.jar"/>
+              <include name="hibernate-entitymanager*.jar"/>
+              <include name="ejb3-persistence*.jar"/>
+            </fileset>
         </move>
         <copy todir="${jboss.server.cspace}/lib">
             <fileset dir="${basedir}/lib/jpa-upgrade"/>
         </copy>
+
     </target>
 
     <target name="deploy_spring"
@@ -135,6 +144,7 @@
         <copy tofile="${jboss.server.cspace}/conf/jboss-log4j.xml.org"
               file="${jboss.server.cspace}/conf/jboss-log4j.xml"
               overwrite="false"/>
+
         <copy tofile="${jboss.server.cspace}/conf/jboss-log4j.xml"
               file="${src}/main/config/log/jboss-log4j.xml"
               overwrite="true"/>
@@ -162,6 +172,7 @@
     <target name="undeploy_spring"
             description="undeploy spring binaries from ${jboss.server.cspace}">
         <delete>
+
             <fileset dir="${jboss.server.cspace}/lib" includes="org.springframework.*.jar"/>
             <fileset dir="${jboss.server.cspace}/lib" includes="spring-security*.jar"/>
         </delete>
@@ -172,6 +183,7 @@
         <copy todir="${services.trunk}/${dist.server.cspace}/lib">
             <fileset dir="${basedir}/lib/jpa-upgrade"/>
         </copy>
+
     </target>
 
     <target name="dist_spring"
@@ -184,6 +196,7 @@
     <target name="dist"
             description="generate distribution for common elements" depends="package">
         <antcall target="dist_jpa" />
+
         <antcall target="dist_spring" />
         <copy todir="${services.trunk}/${dist.server.cspace}/cspace/config/services">
             <fileset dir="${basedir}/src/main/config"/>
-- 
2.47.3