Simplify HSQLDB datasource

git-svn-id: https://svn.argeo.org/commons/trunk@3026 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF
index 7b93b37ac1dd84d4c2fbfec9ad9eb729bd0baaad..8c36088684a36ddbd181fbab2ae897c044c9df9e 100644 (file)
--- a/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF
@@ -1,13 +1,5 @@
 Manifest-Version: 1.0
 Bundle-Version: 0.1.1.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.hsqldb
-Import-Package: org.argeo.slc.hibernate,org.hibernate,org.springframew
- ork.orm.hibernate3,org.argeo.slc.runtime,org.argeo.slc.process,org.ar
- geo.slc.test,org.argeo.slc.core.attachment,org.argeo.slc.core.test.tr
- ee,org.argeo.slc.core.structure,org.argeo.slc.core.structure.tree,org
- .argeo.slc.hibernate.test.tree,org.argeo.slc.hibernate.runtime,org.ar
- geo.slc.hibernate.process,org.argeo.slc.hibernate.test,org.argeo.slc.
- hibernate.structure,org.argeo.slc.hibernate.attachment,org.aopallianc
- e.aop,org.argeo.slc.core.test,org.springframework.cache.ehcache,net.s
- f.ehcache.hibernate,org.hsqldb.jdbc,org.springframework.beans.factory
- .config
+Import-Package: org.hsqldb.jdbc,
+ org.springframework.beans.factory.config

diff --git a/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb-osgi.xml b/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb-osgi.xml
index 6d7b0e6f1464c2f1f2ee32a0db8bca0da530e932..4aeda080e0a965e5832913f65a783a01884ce670 100644 (file)
--- a/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb-osgi.xml
+++ b/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb-osgi.xml
@@ -6,6 +6,6 @@
        http://www.springframework.org/schema/beans   \r
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
-       <service ref="sessionFactory" interface="org.hibernate.SessionFactory" />\r
+       <service ref="dataSource" interface="javax.sql.DataSource" />\r
 \r
 </beans:beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb.xml b/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb.xml
index bab73dfcc8f3a2aef8144b6baa7383efa90b559a..f5ff99c0d0ba7a686517829508bef85a85ee3ef6 100644 (file)
--- a/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb.xml
+++ b/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb.xml
@@ -8,9 +8,6 @@
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
        default-lazy-init="false">
 
-       <import
-               resource="classpath:/org/argeo/slc/hibernate/sessionFactories.xml" />
-
        <bean
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
                <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
@@ -21,17 +18,6 @@
                </property>
        </bean>
 
-       <bean id="sessionFactory" parent="slcTemplates.sessionFactory.hibernateBasic">
-               <property name="dataSource" ref="dataSource" />
-               <property name="hibernateProperties">
-                       <value><![CDATA[
-                               hibernate.dialect=org.hibernate.dialect.HSQLDialect
-                               hibernate.hbm2ddl.auto=create
-                               hibernate.current_session_context_class=thread
-                       ]]></value>
-               </property>
-       </bean>
-
        <bean id="dataSource" class="org.hsqldb.jdbc.jdbcDataSource">
                <property name="database" value="${argeo.server.jdbc.url}" />
                <property name="user" value="${argeo.server.jdbc.username}" />