X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.server%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Fserver%2Fspring%2FservletContext.xml;h=69dffa73f4a1826d589eeabb4b6d234f6f429b2d;hb=7a8f034133c1112e187e2a2bfd2c56a8d2452345;hp=93d45e265262d419654680d300b41521dcd82e6a;hpb=6a8fd6015286658988c9df6e849bab9d16ca1fb3;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml
index 93d45e265..69dffa73f 100644
--- a/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml
+++ b/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml
@@ -1,176 +1,154 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:aop="http://www.springframework.org/schema/aop"
+    xmlns:tx="http://www.springframework.org/schema/tx"
+    xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
-	default-lazy-init="true">
-
-	<import
-		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
-	<import resource="transaction.xml" />
-
-	<!--  Properties -->
-	<bean
-		class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
-		lazy-init="false">
-		<property name="contextOverride" value="true"/>
-		<property name="properties">
-			<props>
-				<prop key="sessionFactoryParentBean">
-					slcServerDefault.sessionFactory.HSQLTest
-				</prop>
-			</props>
-		</property>
-	</bean>
-
-	<!-- Use session factories -->
-	<bean id="sessionFactory" parent="${sessionFactoryParentBean}" />
-
-	<!--  JNDI data source  -->
-	<bean id="slcDefault.jndiTemplate"
-		class="org.springframework.jndi.JndiTemplate">
-	</bean>
-
-	<bean id="slcDefaut.dataSourceJndi"
-		class="org.springframework.jndi.JndiObjectFactoryBean">
-		<property name="jndiTemplate" ref="slcDefault.jndiTemplate" />
-		<property name="jndiName" value="java:comp/env/jdbc/mainDs" />
-	</bean>
-
-	<!-- DB types -->
-	<bean id="slcServerDefault.sessionFactory.HSQL"
-		parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="slcDefaut.dataSourceJndi" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
+    default-lazy-init="true">
+
+    <import
+        resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
+    <import resource="transaction.xml" />
+
+    <!--  Properties -->
+    <bean
+        class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
+        lazy-init="false">
+        <property name="contextOverride" value="true" />
+        <property name="properties">
+            <props>
+                <prop key="sessionFactoryParentBean">
+                    slcServerDefault.sessionFactory.HSQLTest
+                </prop>
+            </props>
+        </property>
+    </bean>
+
+    <!-- Use session factories -->
+    <bean id="sessionFactory" parent="${sessionFactoryParentBean}" />
+
+    <!--  JNDI data source  -->
+    <bean id="slcDefault.jndiTemplate"
+        class="org.springframework.jndi.JndiTemplate">
+    </bean>
+
+    <bean id="slcDefaut.dataSourceJndi"
+        class="org.springframework.jndi.JndiObjectFactoryBean">
+        <property name="jndiTemplate" ref="slcDefault.jndiTemplate" />
+        <property name="jndiName" value="java:comp/env/jdbc/mainDs" />
+    </bean>
+
+    <!-- DB types -->
+    <bean id="slcServerDefault.sessionFactory.HSQL"
+        parent="slcTemplates.sessionFactory.hibernateBasic">
+        <property name="dataSource" ref="slcDefaut.dataSourceJndi" />
+        <property name="hibernateProperties">
+            <value><![CDATA[
 				hibernate.dialect=org.hibernate.dialect.HSQLDialect
 				hibernate.hbm2ddl.auto=update
 				hibernate.connection.autocommit=false
 			]]></value>
-		</property>
-	</bean>
-
-	<bean id="slcServerDefault.sessionFactory.HSQLTest"
-		parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="slcDefaut.dataSourceJndi" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
+        </property>
+    </bean>
+
+    <bean id="slcServerDefault.sessionFactory.HSQLTest"
+        parent="slcTemplates.sessionFactory.hibernateBasic">
+        <property name="dataSource" ref="slcDefaut.dataSourceJndi" />
+        <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="slcServerDefault.sessionFactory.MySQL"
-		parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="slcDefaut.dataSourceJndi" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
+        </property>
+    </bean>
+
+    <bean id="slcServerDefault.sessionFactory.MySQL"
+        parent="slcTemplates.sessionFactory.hibernateBasic">
+        <property name="dataSource" ref="slcDefaut.dataSourceJndi" />
+        <property name="hibernateProperties">
+            <value><![CDATA[
 				hibernate.dialect=org.hibernate.dialect.MySQLDialect
 				hibernate.hbm2ddl.auto=update
 				hibernate.connection.autocommit=false
 			]]></value>
-		</property>
-	</bean>
-
-
-	<!--  In memory session factory
-		<bean id="slcServerDefault.dataSource.inMemoryTestHSQL"
-		parent="slcDefault.dataSource.inMemoryTestHSQL"
-		destroy-method="destroy">
-		<property name="autoCommit" value="false" />
-		</bean>
-		
-		<bean id="slcServerDefault.sessionFactory.hibernateTestHSQL"
-		parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource"
-		ref="slcServerDefault.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>
-	-->
-	<!--  HSQLDB persistent session factory
-		<bean id="slcServerDefault.sessionFactory.persistentHSQL"
-		parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource"
-		ref="slcServerDefault.datasource.persistentHSQL" />
-		<property name="hibernateProperties">
-		<value><![CDATA[
-		hibernate.dialect=org.hibernate.dialect.HSQLDialect
-		hibernate.hbm2ddl.auto=update
-		hibernate.connection.autocommit=false
-		]]></value>
-		</property>
-		</bean>
-		
-		<bean id="slcServerDefault.datasource.persistentHSQL"
-		class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
-		destroy-method="destroy">
-		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
-		<property name="url" value="${jdbcUrl}" />
-		<property name="username" value="sa" />
-		<property name="password" value="" />
-		<property name="suppressClose" value="true" />
-		</bean>
-	-->
-	<!-- Services -->
-	<bean id="testManagerService"
-		class="org.argeo.slc.services.test.impl.TestManagerServiceImpl">
-		<constructor-arg ref="testResultDao" />
-		<constructor-arg ref="testRunDescriptorDao" />
-		<constructor-arg ref="slcExecutionDao" />
-		<constructor-arg ref="testResultCollectionDao" />
-	</bean>
-
-	<!-- DAOs -->
-	<bean id="hibernateTemplate"
-		class="org.springframework.orm.hibernate3.HibernateTemplate">
-		<property name="sessionFactory" ref="sessionFactory" />
-		<property name="allowCreate" value="false" />
-	</bean>
-
-	<bean id="testResultDao" parent="slcTemplates.dao.testResultDao">
-		<property name="hibernateTemplate" ref="hibernateTemplate" />
-	</bean>
-
-	<bean id="testResultCollectionDao"
-		parent="slcTemplates.dao.testResultCollectionDao">
-		<property name="hibernateTemplate" ref="hibernateTemplate" />
-	</bean>
-
-	<bean id="testRunDescriptorDao"
-		parent="slcTemplates.dao.testRunDescriptorDao">
-		<property name="hibernateTemplate" ref="hibernateTemplate" />
-	</bean>
-
-	<bean id="slcExecutionDao"
-		parent="slcTemplates.dao.slcExecutionDao">
-		<property name="hibernateTemplate" ref="hibernateTemplate" />
-	</bean>
-
-	<!-- Hibernate instrumentation -->
-	<bean id="osivInterceptor"
-		class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-
-	<!-- Transaction -->
-	<bean id="transactionManager"
-		class="org.springframework.orm.hibernate3.HibernateTransactionManager"
-		lazy-init="false">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
+        </property>
+    </bean>
+
+    <bean id="slcServerDefault.sessionFactory.MySQL5"
+        parent="slcTemplates.sessionFactory.hibernateBasic">
+        <property name="dataSource" ref="slcDefaut.dataSourceJndi" />
+        <property name="hibernateProperties">
+            <value><![CDATA[
+                hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+                hibernate.hbm2ddl.auto=update
+                hibernate.connection.autocommit=false
+            ]]></value>
+        </property>
+    </bean>
+
+    <bean id="slcServerDefault.sessionFactory.Sybase"
+        parent="slcTemplates.sessionFactory.hibernateBasic">
+        <property name="dataSource" ref="slcDefaut.dataSourceJndi" />
+        <property name="hibernateProperties">
+            <value><![CDATA[
+                hibernate.dialect=org.hibernate.dialect.SybaseDialect
+                hibernate.hbm2ddl.auto=update
+                hibernate.connection.autocommit=false
+            ]]></value>
+        </property>
+    </bean>
+
+    <!-- Services -->
+    <bean id="testManagerService"
+        class="org.argeo.slc.services.test.impl.TestManagerServiceImpl">
+        <constructor-arg ref="testResultDao" />
+        <constructor-arg ref="testRunDescriptorDao" />
+        <constructor-arg ref="slcExecutionDao" />
+        <constructor-arg ref="testResultCollectionDao" />
+    </bean>
+
+    <!-- DAOs -->
+    <bean id="hibernateTemplate"
+        class="org.springframework.orm.hibernate3.HibernateTemplate">
+        <property name="sessionFactory" ref="sessionFactory" />
+        <property name="allowCreate" value="false" />
+    </bean>
+
+    <bean id="testResultDao" parent="slcTemplates.dao.testResultDao">
+        <property name="hibernateTemplate" ref="hibernateTemplate" />
+    </bean>
+
+    <bean id="testResultCollectionDao"
+        parent="slcTemplates.dao.testResultCollectionDao">
+        <property name="hibernateTemplate" ref="hibernateTemplate" />
+    </bean>
+
+    <bean id="testRunDescriptorDao"
+        parent="slcTemplates.dao.testRunDescriptorDao">
+        <property name="hibernateTemplate" ref="hibernateTemplate" />
+    </bean>
+
+    <bean id="slcExecutionDao"
+        parent="slcTemplates.dao.slcExecutionDao">
+        <property name="hibernateTemplate" ref="hibernateTemplate" />
+    </bean>
+
+    <!-- Hibernate instrumentation -->
+    <bean id="osivInterceptor"
+        class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
+        <property name="sessionFactory" ref="sessionFactory" />
+    </bean>
+
+    <!-- Transaction -->
+    <bean id="transactionManager"
+        class="org.springframework.orm.hibernate3.HibernateTransactionManager"
+        lazy-init="false">
+        <property name="sessionFactory" ref="sessionFactory" />
+    </bean>
 
 </beans>
\ No newline at end of file