[jbpm-commits] JBoss JBPM SVN: r2817 - in jbpm3/branches/jbpm-3.3.0.GA/modules/core: src/main/resources and 1 other directory.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-11-08 09:54:36 -0500 (Sat, 08 Nov 2008)
New Revision: 2817

Modified:
   jbpm3/branches/jbpm-3.3.0.GA/modules/core/scripts/antrun-jbpm-config.xml
   jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.common.xml
   jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.hsqldb.xml
   jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.mysql.xml
   jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.postgresql.xml
   jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.sybase.xml
Log:
Move auto create from common to respective dbs

Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/branches/jbpm-3.3.0.GA/modules/core/scripts/antrun-jbpm-config.xml	2008-11-08 14:19:48 UTC (rev 2816)
+++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/scripts/antrun-jbpm-config.xml	2008-11-08 14:54:36 UTC (rev 2817)
@@ -16,10 +16,36 @@
   <property name="project.build.directory" value="${basedir}/target"/>
   <property name="project.resources.directory" value="${basedir}/target/classes"/>
 
-  <!--
-    macrodef: macro-database-cfg
-    Concatenates the various db specific hibernate files to produce hibernate.cfg.[database].xml
-  -->
+  <macrodef name="macro-disable">
+    <attribute name="file" />
+    <attribute name="section" />
+    <sequential>
+      <replace file="@{file}" summary="true">
+        <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacetoken>
+        <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacevalue>
+      </replace>
+      <replace file="@{file}" summary="true">
+        <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacetoken>
+        <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue>
+      </replace>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="macro-enable">
+    <attribute name="file" />
+    <attribute name="section" />
+    <sequential>
+      <replace file="@{file}" summary="true">
+        <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacetoken>
+        <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacevalue>
+      </replace>
+      <replace file="@{file}" summary="true">
+        <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken>
+        <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacevalue>
+      </replace>
+    </sequential>
+  </macrodef>
+
   <macrodef name="macro-database-cfg">
     <attribute name="database" />
     <sequential>
@@ -56,18 +82,13 @@
     </sequential>
   </macrodef>
 
-  <!--
-    Target: concat
-    Invokes the database config macro for all supported databases
-  -->
-  <target name="concat">
-  
+  <target name="concat" >
     <macro-database-cfg database="hsqldb"/>
     <macro-database-cfg database="mysql"/>
     <macro-database-cfg database="postgresql"/>
     <macro-database-cfg database="sybase"/>
-    
     <echo message="Copy hibernate.cfg.${database}.xml to hibernate.cfg.xml" />
     <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" tofile="${project.build.directory}/classes/hibernate.cfg.xml"/>
   </target>
+  
 </project>
\ No newline at end of file

Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.common.xml	2008-11-08 14:19:48 UTC (rev 2816)
+++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.common.xml	2008-11-08 14:54:36 UTC (rev 2817)
@@ -17,10 +17,6 @@
     <!-- # common settings                 # -->
     <!-- ################################### -->
 
-    <!-- Automatic schema creation (begin) -->
-    <property name="hibernate.hbm2ddl.auto">create</property>
-    <!-- Automatic schema creation (end) -->
-
     <!-- Simple memory-only cache -->
     <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
 

Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.hsqldb.xml
===================================================================
--- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.hsqldb.xml	2008-11-08 14:19:48 UTC (rev 2816)
+++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.hsqldb.xml	2008-11-08 14:54:36 UTC (rev 2817)
@@ -8,3 +8,8 @@
     <property name="hibernate.connection.username">sa</property>
     <property name="hibernate.connection.password"></property>
     <!-- JDBC connection properties (end) -->
+    
+    <!-- Automatic schema creation (begin) -->
+    <property name="hibernate.hbm2ddl.auto">create</property>
+    <!-- Automatic schema creation (end) -->
+    
\ No newline at end of file

Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.mysql.xml
===================================================================
--- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.mysql.xml	2008-11-08 14:19:48 UTC (rev 2816)
+++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.mysql.xml	2008-11-08 14:54:36 UTC (rev 2817)
@@ -9,3 +9,9 @@
     <property name="hibernate.connection.password">${jdbc.mysql.password}</property>
     <property name="hibernate.query.substitutions">true 1, false 0</property>
     <!-- JDBC connection properties (end) -->
+
+    <!-- Automatic schema creation (begin) -->
+    <property name="hibernate.hbm2ddl.auto">create</property>
+    <!-- Automatic schema creation (end) -->
+
+    
\ No newline at end of file

Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.postgresql.xml
===================================================================
--- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.postgresql.xml	2008-11-08 14:19:48 UTC (rev 2816)
+++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.postgresql.xml	2008-11-08 14:54:36 UTC (rev 2817)
@@ -8,3 +8,8 @@
     <property name="hibernate.connection.username">${jdbc.postgresql.username}</property>
     <property name="hibernate.connection.password">${jdbc.postgresql.password}</property>
     <!-- JDBC connection properties (end) -->
+    
+    <!-- Automatic schema creation (begin) -->
+    <property name="hibernate.hbm2ddl.auto">create</property>
+    <!-- Automatic schema creation (end) -->
+    
\ No newline at end of file

Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.sybase.xml
===================================================================
--- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.sybase.xml	2008-11-08 14:19:48 UTC (rev 2816)
+++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.properties.sybase.xml	2008-11-08 14:54:36 UTC (rev 2817)
@@ -20,3 +20,7 @@
     <property name="hibernate.connection.password">${jdbc.sybase.password}</property>
     <!-- JDBC connection properties (end) -->
     
+    <!-- Automatic schema creation (begin) ===
+    <property name="hibernate.hbm2ddl.auto">create</property>
+    ==== Automatic schema creation (end) -->
+    
\ No newline at end of file