Author: tmjee
Date: Sat Sep 9 06:26:47 2006
New Revision: 441787
URL: http://svn.apache.org/viewvc?view=rev&rev=441787
Log:
- moved Spring's application context location from
/WEB-INF/applicationContext.xml to classpath:applicationContext.xml
- added to web.xml
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>classpath*:applicationContext*.xml</param-value>
</context-param>
Added:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/applicationContext.xml
Removed:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml?view=diff&rev=441787&r1=441786&r2=441787
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
Sat Sep 9 06:26:47 2006
@@ -16,10 +16,10 @@
<resource>src/main/resources/struts.xml</resource>
<resource>src/main/resources/xwork-conversion.properties</resource>
<resource>src/main/resources/struts.properties</resource>
+ <resource>src/main/resources/applicationContext.xml</resource>
<resource>src/main/webapp/ftl/index.ftl</resource>
<resource>src/main/webapp/ftl/helloWorld.ftl</resource>
<resource>src/main/webapp/WEB-INF/decorators/main.ftl</resource>
- <resource>src/main/webapp/WEB-INF/applicationContext.xml</resource>
<resource>src/main/webapp/WEB-INF/decorators.xml</resource>
<resource>src/main/webapp/styles/main.css</resource>
<resource>src/main/webapp/styles/forms.css</resource>
Added:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/applicationContext.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/applicationContext.xml?view=auto&rev=441787
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/applicationContext.xml
(added)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/applicationContext.xml
Sat Sep 9 06:26:47 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC
+ "-//SPRING//DTD BEAN//EN"
+ "http://www.springframework.org/dtd/spring-beans.dtd";>
+
+<beans>
+ <!-- Example of SAF2 action instantiated by Spring -->
+ <bean id="helloWorldAction" class="${package}.HelloWorldAction"
singleton="false" />
+</beans>
+
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?view=diff&rev=441787&r1=441786&r2=441787
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Sat Sep 9 06:26:47 2006
@@ -6,6 +6,11 @@
<web-app>
<display-name>Struts 2 - Maven Archetype - Starter</display-name>
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>classpath*:applicationContext*.xml</param-value>
+ </context-param>
+
<!-- Filters -->
<filter>
<filter-name>action2-cleanup</filter-name>
