[jboss-cvs] JBossAS SVN: r110989 - branches/JBPAPP_5_1/varia.

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

Author: fnasser at redhat.com
Date: 2011-03-21 18:33:21 -0400 (Mon, 21 Mar 2011)
New Revision: 110989

Modified:
   branches/JBPAPP_5_1/varia/build.xml
Log:
JBPAPP-5244 - rpm dist-diff: differences in hsqldb.jar

Modified: branches/JBPAPP_5_1/varia/build.xml
===================================================================
--- branches/JBPAPP_5_1/varia/build.xml	2011-03-21 22:06:54 UTC (rev 110988)
+++ branches/JBPAPP_5_1/varia/build.xml	2011-03-21 22:33:21 UTC (rev 110989)
@@ -352,6 +352,9 @@
     </jar>
 
     <!-- patched hsqldb.jar -->
+    <!-- JBPAPP-5244 - rpm dist-diff: differences in hsqldb.jar
+         We no longer need this change so remove this code
+         and do a plain copy instead.
     <jar jarfile="${build.lib}/hsqldb.jar"
       manifest="${build.etc}/default.mf">
       <zipfileset src="${hsqldb.hsqldb.lib}/hsqldb.jar">
@@ -363,6 +366,8 @@
         <include name="org/hsqldb/Embedded**"/>
       </fileset>
     </jar>
+    -->
+    <copy todir="${build.lib}" file="${hsqldb.hsqldb.lib}/hsqldb.jar" />
 
     <!-- hsqldb-plugin.jar -->
     <jar jarfile="${build.lib}/hsqldb-plugin.jar"