From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 10 Jul 2008 12:50:32 +0000 (+0000)
Subject: Adapt for Tomcat and MySQL
X-Git-Tag: argeo-slc-2.1.7~2628
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=6a8fd6015286658988c9df6e849bab9d16ca1fb3;hp=c9ab36896bc1927119031c855e2409699f06bae0;p=gpl%2Fargeo-slc.git

Adapt for Tomcat and MySQL

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

diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml
index 6f56d6791..f8915601f 100644
--- a/org.argeo.slc.server/pom.xml
+++ b/org.argeo.slc.server/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
@@ -27,6 +29,9 @@
 					<webAppSourceDirectory>
 						../org.argeo.slc.webapp/src/main/webapp
 					</webAppSourceDirectory>
+					<jettyConfig>
+						../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
+					</jettyConfig>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -80,10 +85,6 @@
 			<artifactId>servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>c3p0</groupId>
-			<artifactId>c3p0</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
@@ -91,12 +92,10 @@
 		<dependency>
 			<groupId>net.sourceforge.jexcelapi</groupId>
 			<artifactId>jxl</artifactId>
-			<version>2.6.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.lowagie</groupId>
 			<artifactId>itext</artifactId>
-			<version>2.1.2</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
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 651ddb2d8..93d45e265 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
@@ -13,61 +13,109 @@
 		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
 	<import resource="transaction.xml" />
 
-	<!--  Default data source -->
+	<!--  Properties -->
 	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
+		class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
 		lazy-init="false">
-		<property name="ignoreResourceNotFound" value="true" />
-		<property name="ignoreUnresolvablePlaceholders" value="true" />
-		<property name="locations">
-			<value>WEB-INF/local.properties</value>
-		</property>
+		<property name="contextOverride" value="true"/>
 		<property name="properties">
 			<props>
 				<prop key="sessionFactoryParentBean">
-					slcServerDefault.sessionFactory.hibernateTestHSQL
+					slcServerDefault.sessionFactory.HSQLTest
 				</prop>
 			</props>
 		</property>
 	</bean>
 
-
+	<!-- Use session factories -->
 	<bean id="sessionFactory" parent="${sessionFactoryParentBean}" />
 
-	<bean id="slcServerDefault.sessionFactory.hibernateTestHSQL"
+	<!--  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="slcServerDefault.dataSource.inMemoryTestHSQL" />
+		<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.hbm2ddl.auto=update
 				hibernate.connection.autocommit=false
 			]]></value>
 		</property>
 	</bean>
 
-	<bean id="slcServerDefault.dataSource.inMemoryTestHSQL"
-		parent="slcDefault.dataSource.inMemoryTestHSQL"
-		destroy-method="destroy">
-		<property name="autoCommit" value="false" />
+	<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.persistentHSQL"
+	<bean id="slcServerDefault.sessionFactory.MySQL"
 		parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource"
-			ref="slcServerDefault.datasource.persistentHSQL" />
+		<property name="dataSource" ref="slcDefaut.dataSourceJndi" />
 		<property name="hibernateProperties">
 			<value><![CDATA[
-				hibernate.dialect=org.hibernate.dialect.HSQLDialect
+				hibernate.dialect=org.hibernate.dialect.MySQLDialect
 				hibernate.hbm2ddl.auto=update
-				hibernate.current_session_context_class=thread
+				hibernate.connection.autocommit=false
 			]]></value>
 		</property>
 	</bean>
 
-	<bean id="slcServerDefault.datasource.persistentHSQL"
+
+	<!--  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" />
@@ -75,8 +123,8 @@
 		<property name="username" value="sa" />
 		<property name="password" value="" />
 		<property name="suppressClose" value="true" />
-	</bean>
-
+		</bean>
+	-->
 	<!-- Services -->
 	<bean id="testManagerService"
 		class="org.argeo.slc.services.test.impl.TestManagerServiceImpl">