X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fbundles%2Forg.argeo.slc.server.hibernate%2FMETA-INF%2Fspring%2Fdb.xml;h=4a08a84d30f8b9ca09d9ad8bd5f6242e9da34cd6;hb=0f26a1ac2596c4f949973028af21bc0f951b7b7a;hp=5e098a61fd85e103f76e8582fe45732dcbc981e1;hpb=2ad1acc6a405415f6456c5547ad6ec2a87438fec;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db.xml
index 5e098a61f..4a08a84d3 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db.xml
@@ -8,44 +8,9 @@
        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/spring/applicationContext.xml"
-		/>
-	-->
+	<import
+		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
 
-	<!--
-		Use session factories <bean id="sessionFactory"
-		parent="${sessionFactoryParentBean}" />
-	-->
-
-	<!--
-		<bean id="sessionFactory"
-		parent="slcTemplates.sessionFactory.hibernateBasic" lazy-init="false">
-		<property name="dataSource"
-		ref="slcDefault.dataSource.inMemoryTestHSQL" /> <property
-		name="hibernateProperties"> <value><![CDATA[
-		hibernate.dialect=org.hibernate.dialect.HSQLDialect
-		hibernate.hbm2ddl.auto=create hibernate.generate_statistics=true
-		hibernate.connection.autocommit=false ]]></value> </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="jdbc:hsqldb:mem:test"/>
-		<property name="user" value="sa"/>
-		<property name="password" value=""/>
-		
-	</bean>
 	<!-- DAOs -->
 	<bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
 		<property name="sessionFactory" ref="sessionFactory" />
@@ -72,105 +37,4 @@
 		<property name="hibernateTemplate" ref="hibernateTemplate" />
 	</bean>
 
-
-
-	<!-- IMPORTED -->
-	
-	<!-- 
-	<bean id="slcDefault.dataSource.inMemoryTestHSQL"
-		class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
-		destroy-method="destroy">
-		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
-		<property name="url" value="jdbc:hsqldb:mem:test" />
-		<property name="username" value="sa" />
-		<property name="password" value="" />
-		<property name="suppressClose" value="true" />
-	</bean>
- -->
-	<bean id="slcTemplates.sessionFactory.hibernateBasic" abstract="true"
-		class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="mappingResources">
-			<list>
-				<value>
-					org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/process/SlcExecution.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/process/SlcExecutionSpec.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/runtime/SlcAgentDescriptor.hbm.xml
-				</value>
-			</list>
-		</property>
-		<property name="cacheProvider" ref="slcDefault.cacheProvider.ehCache" />
-	</bean>
-
-	<bean id="slcDefault.cacheProvider.ehCache" class="net.sf.ehcache.hibernate.SingletonEhCacheProvider"
-		depends-on="slcDefault.cacheProvider.ehCacheManager">
-	</bean>
-
-	<bean id="slcDefault.cacheProvider.ehCacheManager"
-		class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
-		<property name="shared" value="true" />
-		<property name="configLocation"
-			value="classpath:/org/argeo/slc/hibernate/cache/ehcache.xml" />
-	</bean>
-<!-- 
-	<bean id="slcDefault.sessionFactory.hibernateTestHSQL" parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="slcDefault.dataSource.inMemoryTestHSQL" />
-		<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="slcTemplates.dao.testResultDao"
-		class="org.argeo.slc.hibernate.test.tree.TreeTestResultDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.testResultCollectionDao"
-		class="org.argeo.slc.hibernate.test.tree.TreeTestResultCollectionDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.testRunDescriptorDao"
-		class="org.argeo.slc.hibernate.test.TestRunDescriptorDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.slcExecutionDao"
-		class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.slcAgentDescriptorDao"
-		class="org.argeo.slc.hibernate.runtime.SlcAgentDescriptorDaoHibernate"
-		abstract="true">
-	</bean>
-
 </beans>
\ No newline at end of file