+ add default servlet definition (for containers that do not declare it - such as GlassFish)

+ increase Spring version to RC3 (it works with trunk just fine)
This commit is contained in:
Costin Leau 2009-12-10 20:49:35 +00:00 committed by Mic
parent d8b7615705
commit fe63e9c87f
2 changed files with 198 additions and 165 deletions

22
pom.xml
View file

@ -8,7 +8,7 @@
<packaging>war</packaging> <packaging>war</packaging>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<properties> <properties>
<spring.version>3.0.0.RC2</spring.version> <spring.version>3.0.0.RC3</spring.version>
<slf4j.version>1.5.6</slf4j.version> <slf4j.version>1.5.6</slf4j.version>
</properties> </properties>
<dependencies> <dependencies>
@ -73,12 +73,24 @@
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>com.springsource.org.aspectj.weaver</artifactId> <artifactId>com.springsource.org.aspectj.weaver</artifactId>
<version>1.6.3.RELEASE</version> <version>1.6.5.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>com.springsource.org.hibernate</artifactId> <artifactId>hibernate</artifactId>
<version>3.3.1.GA</version> <version>3.2.7.ga</version>
<exclusions>
<exclusion>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</exclusion>
<!--
<exclusion>
<groupId>org.apache.log4j</groupId>
<artifactId>com.springsource.org.apache.log4j</artifactId>
</exclusion>
-->
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
@ -222,8 +234,10 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<verbose>true</verbose>
<source>1.5</source> <source>1.5</source>
<target>1.5</target> <target>1.5</target>
<showWarnings>true</showWarnings>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

View file

@ -37,9 +37,8 @@
--> -->
<context-param> <context-param>
<param-name>contextConfigLocation</param-name> <param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/applicationContext-jdbc.xml</param-value> <param-value>/WEB-INF/applicationContext-jdbc.xml</param-value>
<!-- <!--
<param-value>/WEB-INF/applicationContext-hibernate.xml</param-value> <param-value>/WEB-INF/applicationContext-hibernate.xml</param-value>
<param-value>/WEB-INF/applicationContext-jpa.xml</param-value> <param-value>/WEB-INF/applicationContext-jpa.xml</param-value>
--> -->
@ -87,6 +86,26 @@
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener> </listener>
<!--
Defines the 'default' servlet (usually for service static resources).
Uncomment this in containers (GlassFish) that do not declare this
implicit definition out of the box, or change the name of the servlet mapping
below to the appropriate one.
<servlet>
<servlet-name>default</servlet-name>
<servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
<init-param>
<param-name>debug</param-name>
<param-value>0</param-value>
</init-param>
<init-param>
<param-name>listings</param-name>
<param-value>false</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
-->
<!-- <!--
- Map static resources to the default servlet - Map static resources to the default servlet
- examples: - examples: