[seam-commits] Seam SVN: r14995 - branches/enterprise/JBPAPP_5_0/seam-gen.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2012-07-20 15:48:14 -0400 (Fri, 20 Jul 2012)
New Revision: 14995

Modified:
   branches/enterprise/JBPAPP_5_0/seam-gen/build.xml
Log:
JBPAPP-7520 default hsqldb driver is available in jboss-as directory

Modified: branches/enterprise/JBPAPP_5_0/seam-gen/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/seam-gen/build.xml	2012-07-20 15:11:42 UTC (rev 14994)
+++ branches/enterprise/JBPAPP_5_0/seam-gen/build.xml	2012-07-20 19:48:14 UTC (rev 14995)
@@ -373,7 +373,8 @@
         <condition property="hibernate.connection.url.default" value="jdbc:h2:.">
             <equals arg1="${database.type.new}" arg2="h2"/>
         </condition>
-        <condition property="driver.jar.default" value="${seam.dir}/lib/hsqldb.jar">
+        <!--<condition property="driver.jar.default" value="${seam.dir}/lib/hsqldb.jar">-->
+        <condition property="driver.jar.default" value="${jboss.home.new}/common/lib/hsqldb.jar">
             <equals arg1="${database.type.new}" arg2="hsql"/>
         </condition>
         <condition property="hibernate.connection.url.default" value="jdbc:hsqldb:.">
@@ -538,13 +539,20 @@
             <entry key="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> <!-- yuck! -->
         </propertyfile>
 
+        <!-- HSQL jdbc driver jar file is not needed a it is in EAP AS libraries already -->
+        <condition property="copyJdbcDriver">
+            <not><equals arg1="${database.type.new}" arg2="hsql"/></not>
+        </condition>
+
         <echo message="Installing JDBC driver jar to JBoss AS"/>
         <condition property="has.license.jar">
             <not><equals arg1="${driver.license.jar.new}" arg2=""/></not>
         </condition>
+
         <copy todir="${jboss.home.new}/server/${jboss.domain.new}/lib" overwrite="true">
             <fileset file="${driver.jar.new}">
-                <include name="${driver.jar.new}"/>
+                <include name="${driver.jar.new}" if="copyJdbcDriver"/>
+                <exclude name="**/*" unless="copyJdbcDriver"/>
             </fileset>
             <fileset file="${driver.license.jar.new}">
                 <include name="${driver.license.jar.new}" if="has.license.jar"/>