From: remillet <remillet@yahoo.com>
Date: Tue, 2 Jun 2015 23:42:50 +0000 (-0700)
Subject: CSPACE-6692: We needed to copy the binaries that are in the resources folder without... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=4895dfe9ebed72b1fac14cbfcc58fc39d5eb94cc;p=tmp%2Fjakarta-migration.git

CSPACE-6692: We needed to copy the binaries that are in the resources folder without the <filterset> in place because it seems to corrupt them.
---

diff --git a/services/common/build.xml b/services/common/build.xml
index 826de10ba..ac37e2194 100644
--- a/services/common/build.xml
+++ b/services/common/build.xml
@@ -141,7 +141,9 @@
     <target name="deploy_tenantconfig"
             description="deploy tenant configuration">
         <copy todir="${jee.server.cspace}/cspace/config/services">
-            <fileset dir="${basedir}/src/main/cspace/config/services"/>
+            <fileset dir="${basedir}/src/main/cspace/config/services">
+				<exclude name="resources/"/>
+			</fileset>
 			<filterset>
 				<filter token="CSPACE_INSTANCE_ID" value="${cspace.instance.id}" />
 				<filter token="DB_CSADMIN_NAME" value="${db.csadmin.name}" />
@@ -149,6 +151,13 @@
 				<filter token="DB_CSPACE_NAME" value="${db.cspace.name}" />
 			</filterset>
         </copy>
+		<!--
+			We need to copy the binaries that are in the "resources" folder
+			without the <filterset> in place because it seems to corrupt them.
+		-->
+        <copy todir="${jee.server.cspace}/cspace/config/services/resources">
+            <fileset dir="${basedir}/src/main/cspace/config/services/resources"/>
+        </copy>		
     </target>
 
     <target name="deploy" depends="install"