<?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"/>
-<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>
<configuration>
<scanIntervalSeconds>0</scanIntervalSeconds>
<daemon>true</daemon>
+ <jettyConfig>
+ src/main/config/jetty/jetty-test.xml
+ </jettyConfig>
</configuration>
</execution>
<execution>
--- /dev/null
+<?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
--- /dev/null
+<?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>
<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
# Set root logger level to DEBUG and its only appender to A1.\r
-log4j.rootLogger=INFO, console\r
+log4j.rootLogger=WARN, console\r
\r
## Levels\r
# Slc\r
-log4j.logger.org.argeo.slc=DEBUG\r
-log4j.logger.org.argeo.slc.ws.process=DEBUG\r
+log4j.logger.org.argeo.slc=WARN\r
+\r
# Spring\r
-log4j.logger.org.springframework=INFO\r
+log4j.logger.org.springframework=WARN\r
+log4j.logger.org.springframework.transaction=WARN\r
+log4j.logger.org.springframework.orm.hibernate3=WARN\r
+log4j.logger.org.springframework.orm.hibernate3.HibernateTransactionManager=WARN\r
+\r
# Hibernate\r
log4j.logger.org.hibernate=WARN\r
-#log4j.logger.org.hibernate.SQL=TRACE\r
+log4j.logger.org.hibernate.stat=INFO\r
+log4j.logger.org.hibernate.SQL=WARN\r
+log4j.logger.org.hibernate.transaction=WARN\r
#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE\r
#log4j.logger.org.hibernate.type=TRACE\r
\r
+# EhCache\r
+log4j.logger.net.sf.ehcache=WARN\r
\r
## Appenders\r
# A1 is set to be a ConsoleAppender.\r
+++ /dev/null
-# Rename this file to local.properties\r
-\r
-# For in memory database switch following lines\r
-sessionFactoryParentBean=slcServerDefault.sessionFactory.hibernateTestHSQL\r
-#sessionFactoryParentBean=slcServerDefault.sessionFactory.persistentHSQL\r
-\r
-# URL of the persistent database\r
-jdbcUrl=jdbc:hsqldb:file:/<path to a directory>/<db name>;shutdown=true\r
-# Under Windows use the following form (with /!)\r
-#jdbcUrl=jdbc:hsqldb:file:/C:/dev/test/dbSlc/db;shutdown=true\r
-\r
+++ /dev/null
-# Set root logger level to DEBUG and its only appender to A1.\r
-log4j.rootLogger=WARN, console\r
-\r
-## Levels\r
-# Slc\r
-log4j.logger.org.argeo.slc=DEBUG\r
-\r
-# Spring\r
-log4j.logger.org.springframework=WARN\r
-log4j.logger.org.springframework.transaction=WARN\r
-log4j.logger.org.springframework.orm.hibernate3=WARN\r
-log4j.logger.org.springframework.orm.hibernate3.HibernateTransactionManager=WARN\r
-\r
-# Hibernate\r
-log4j.logger.org.hibernate=WARN\r
-log4j.logger.org.hibernate.stat=INFO\r
-log4j.logger.org.hibernate.SQL=WARN\r
-log4j.logger.org.hibernate.transaction=WARN\r
-#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE\r
-#log4j.logger.org.hibernate.type=TRACE\r
-\r
-# EhCache\r
-log4j.logger.net.sf.ehcache=WARN\r
-\r
-## Appenders\r
-# A1 is set to be a ConsoleAppender.\r
-log4j.appender.console=org.apache.log4j.ConsoleAppender\r
-\r
-# A1 uses PatternLayout.\r
-log4j.appender.console.layout=org.apache.log4j.PatternLayout\r
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n\r
-\r
<?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>
</context-param>
<listener>
+ <display-name>Spring Context</display-name>
<listener-class>
org.springframework.web.context.ContextLoaderListener
</listener-class>
</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>