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

Adapt for Tomcat and MySQL

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

diff --git a/org.argeo.slc.webapp/.classpath b/org.argeo.slc.webapp/.classpath
index fe6837c7e..15cac424b 100644
--- a/org.argeo.slc.webapp/.classpath
+++ b/org.argeo.slc.webapp/.classpath
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index 67ade149d..5d517148a 100644
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/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>
@@ -48,6 +50,9 @@
 						<configuration>
 							<scanIntervalSeconds>0</scanIntervalSeconds>
 							<daemon>true</daemon>
+							<jettyConfig>
+								src/main/config/jetty/jetty-test.xml
+							</jettyConfig>
 						</configuration>
 					</execution>
 					<execution>
diff --git a/org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml b/org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
new file mode 100644
index 000000000..ad1893d4b
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<Configure id="Server" class="org.mortbay.jetty.Server">
+
+	<Array id="plusConfig" type="java.lang.String">
+		<Item>org.mortbay.jetty.webapp.WebInfConfiguration</Item>
+		<Item>org.mortbay.jetty.plus.webapp.EnvConfiguration</Item>
+		<Item>org.mortbay.jetty.plus.webapp.Configuration</Item>
+		<Item>org.mortbay.jetty.webapp.JettyWebXmlConfiguration</Item>
+		<Item>org.mortbay.jetty.webapp.TagLibConfiguration</Item>
+	</Array>
+
+	<New id="org.argeo.infra.web"
+		class="org.mortbay.jetty.webapp.WebAppContext">
+		<Set name="ConfigurationClasses">
+			<Ref id="plusConfig" />
+		</Set>
+	</New>
+
+	<New id="mainDs" class="org.mortbay.jetty.plus.naming.Resource">
+		<Arg>jdbc/mainDs</Arg>
+		<Arg>
+			<New class="org.hsqldb.jdbc.jdbcDataSource">
+				<Set name="database">jdbc:hsqldb:mem:mainDs</Set>
+				<!--
+				<Set name="database">
+					<Property name="jdbcUrl"
+						default="jdbc:hsqldb:mem:mainDs" />
+				</Set>
+				  -->
+				<Set name="user">sa</Set>
+				<Set name="password"></Set>
+			</New>
+		</Arg>
+	</New>
+</Configure>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/config/tomcat/org.argeo.slc.webapp.xml b/org.argeo.slc.webapp/src/main/config/tomcat/org.argeo.slc.webapp.xml
new file mode 100644
index 000000000..75d7b2546
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/config/tomcat/org.argeo.slc.webapp.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!-- Local configuration of the Argeo SLC server -->
+<Context>
+
+	<!-- Default set of monitored resources -->
+	<WatchedResource>WEB-INF/web.xml</WatchedResource>
+
+	<!--  
+		<Resource name="jdbc/mainDs" auth="Container"
+		type="javax.sql.DataSource" maxActive="10" maxIdle="5" maxWait="10000"
+		username="root" password="" driverClassName="com.mysql.jdbc.Driver"
+		url="jdbc:mysql://localhost:3306/argeo_slc?autoReconnect=true" />
+		
+		<Parameter name="sessionFactoryParentBean"
+		value="slcServerDefault.sessionFactory.MySQL" override="false" />
+	-->
+
+	<Resource name="jdbc/mainDs" auth="Container"
+		type="javax.sql.DataSource" maxActive="10" maxIdle="5" maxWait="10000"
+		username="sa" password="" driverClassName="org.hsqldb.jdbcDriver"
+		url="jdbc:hsqldb:mem:test" />
+
+</Context>
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
index be752d4c0..080a075fc 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -10,6 +10,6 @@
 	<import
 		resource="classpath:/org/argeo/slc/server/spring/servletContext.xml" />
 
-	<import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
+	<!-- <import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />-->
 
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties
index c49b71be8..80106d6e2 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties
@@ -1,18 +1,26 @@
 # Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, console
+log4j.rootLogger=WARN, console
 
 ## Levels
 # Slc
-log4j.logger.org.argeo.slc=DEBUG
-log4j.logger.org.argeo.slc.ws.process=DEBUG
+log4j.logger.org.argeo.slc=WARN
+
 # Spring
-log4j.logger.org.springframework=INFO
+log4j.logger.org.springframework=WARN
+log4j.logger.org.springframework.transaction=WARN
+log4j.logger.org.springframework.orm.hibernate3=WARN
+log4j.logger.org.springframework.orm.hibernate3.HibernateTransactionManager=WARN
+
 # Hibernate
 log4j.logger.org.hibernate=WARN
-#log4j.logger.org.hibernate.SQL=TRACE
+log4j.logger.org.hibernate.stat=INFO
+log4j.logger.org.hibernate.SQL=WARN
+log4j.logger.org.hibernate.transaction=WARN
 #log4j.logger.org.hibernate.tool.hbm2ddl=TRACE
 #log4j.logger.org.hibernate.type=TRACE
 
+# EhCache
+log4j.logger.net.sf.ehcache=WARN
 
 ## Appenders
 # A1 is set to be a ConsoleAppender.
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties
deleted file mode 100644
index 3f6e3de34..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/local-template.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Rename this file to local.properties
-
-# For in memory database switch following lines
-sessionFactoryParentBean=slcServerDefault.sessionFactory.hibernateTestHSQL
-#sessionFactoryParentBean=slcServerDefault.sessionFactory.persistentHSQL
-
-# URL of the persistent database
-jdbcUrl=jdbc:hsqldb:file:/<path to a directory>/<db name>;shutdown=true
-# Under Windows use the following form (with /!)
-#jdbcUrl=jdbc:hsqldb:file:/C:/dev/test/dbSlc/db;shutdown=true
-
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/log4j.properties b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/log4j.properties
deleted file mode 100644
index e6e7a9131..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/log4j.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=WARN, console
-
-## Levels
-# Slc
-log4j.logger.org.argeo.slc=DEBUG
-
-# Spring
-log4j.logger.org.springframework=WARN
-log4j.logger.org.springframework.transaction=WARN
-log4j.logger.org.springframework.orm.hibernate3=WARN
-log4j.logger.org.springframework.orm.hibernate3.HibernateTransactionManager=WARN
-
-# Hibernate
-log4j.logger.org.hibernate=WARN
-log4j.logger.org.hibernate.stat=INFO
-log4j.logger.org.hibernate.SQL=WARN
-log4j.logger.org.hibernate.transaction=WARN
-#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE
-#log4j.logger.org.hibernate.type=TRACE
-
-# EhCache
-log4j.logger.net.sf.ehcache=WARN
-
-## Appenders
-# A1 is set to be a ConsoleAppender.
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
-
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
index abde0c299..58956dc75 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-	version="2.4">
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	version="2.5">
 
 	<display-name>SLC Web Application</display-name>
 
@@ -64,6 +64,7 @@
 	</context-param>
 
 	<listener>
+		<display-name>Spring Context</display-name>
 		<listener-class>
 			org.springframework.web.context.ContextLoaderListener
 		</listener-class>
@@ -80,15 +81,24 @@
 		</jsp-property-group>
 	</jsp-config>
 
+	<!-- Env refs -->
+	<resource-env-ref>
+		<resource-env-ref-name>jdbc/mainDs</resource-env-ref-name>
+		<resource-env-ref-type>
+			javax.sql.DataSource
+		</resource-env-ref-type>
+	</resource-env-ref>
+
 	<!-- Log4j configContext loader config -->
 	<listener>
+		<display-name>Log4j</display-name>
 		<listener-class>
 			org.springframework.web.util.Log4jConfigListener
 		</listener-class>
 	</listener>
 	<context-param>
 		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/log4j.properties</param-value>
+		<param-value>/WEB-INF/classes/log4j.properties</param-value>
 	</context-param>
 	<context-param>
 		<param-name>log4jRefreshInterval</param-name>