You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hise-commits@incubator.apache.org by wi...@apache.org on 2010/07/07 14:36:12 UTC

svn commit: r961390 - in /incubator/hise/trunk: hise-bundle/src/main/resources/META-INF/spring/hise-ds.xml hise-services/src/test/resources/dao.xml

Author: witek
Date: Wed Jul  7 14:36:12 2010
New Revision: 961390

URL: http://svn.apache.org/viewvc?rev=961390&view=rev
Log:
HISE-43 allowing database schema configuration

Modified:
    incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise-ds.xml
    incubator/hise/trunk/hise-services/src/test/resources/dao.xml

Modified: incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise-ds.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise-ds.xml?rev=961390&r1=961389&r2=961390&view=diff
==============================================================================
--- incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise-ds.xml (original)
+++ incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise-ds.xml Wed Jul  7 14:36:12 2010
@@ -35,6 +35,7 @@
         <prop key="openjpa.synchronizeMappings">buildSchema(ForeignKeys=true,SchemaAction='add')</prop>
         <prop key="openjpa.generateDdl">true</prop>
         <prop key="openjpa.showSql">false</prop>
+        <prop key="openjpa.schema">hise</prop>
         <prop key="db.driver">org.h2.Driver</prop>
         <prop key="db.url">jdbc:h2:file:hise-h2-db;DB_CLOSE_ON_EXIT=false</prop>
         <prop key="db.user">sa</prop>
@@ -80,6 +81,7 @@
 	    <property name="extProperties">
 	      <util:map>
 	        <entry key="openjpa.jdbc.SynchronizeMappings" value="${openjpa.synchronizeMappings}"/>
+            <entry key="openjpa.jdbc.Schema" value="${openjpa.schema}"/>
 	      </util:map>
 	    </property>
     </bean>

Modified: incubator/hise/trunk/hise-services/src/test/resources/dao.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/test/resources/dao.xml?rev=961390&r1=961389&r2=961390&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/test/resources/dao.xml (original)
+++ incubator/hise/trunk/hise-services/src/test/resources/dao.xml Wed Jul  7 14:36:12 2010
@@ -87,10 +87,10 @@
 <!-- OpenJPA H2
    -->
   <bean id="jpaVendorAdapter" class="org.apache.hise.dao.vendor.OpenJpaVendorAdapter">
-    <property name="database"       value="H2" />
+    <property name="database" value="H2" />
     <property name="databasePlatform" value="org.apache.openjpa.jdbc.sql.H2Dictionary" />
-    <property name="generateDdl"    value="true" />
-    <property name="showSql"      value="true" />
+    <property name="generateDdl" value="true" />
+    <property name="showSql" value="true" />
     <property name="extProperties">
       <util:map>
         <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true,SchemaAction='drop,add')"/>