Moved (and renamed) Spring MVC config from WEB-INF to classpath.

WEB-INF/spring-servlet.xml -> WEB-INF/classes/spring/DispatcherServletContext.xml

No functional changes.

Author: php-coder

pom.xml

@@ -417,7 +417,7 @@
 								</goals>
 								<configuration>
 									<outputDirectory>
-										${project.build.directory}/${build.finalName}
+										${project.build.outputDirectory}
 									</outputDirectory>
 									<resources>
 										<resource>
@@ -463,7 +463,7 @@
 								</goals>
 								<configuration>
 									<outputDirectory>
-										${project.build.directory}/${build.finalName}
+										${project.build.outputDirectory}
 									</outputDirectory>
 									<resources>
 										<resource>
@@ -483,17 +483,15 @@
 								<component>
 									<name>hbm2ddl</name>
 									<implementation>jpaconfiguration</implementation>
-									<outputDirectory>
-										target/${build.finalName}/WEB-INF/classes
-									</outputDirectory>
+									<outputDirectory>target/classes</outputDirectory>
 								</component>
 							</components>
 							<componentProperties>
 								<console>false</console>
 								<format>true</format>
 								<jdk5>true</jdk5>
 								<propertyfile>
-									${env.dir}/test/WEB-INF/database.properties
+									${env.dir}/test/spring/database.properties
 								</propertyfile>
 								<outputfilename>hsql-scheme.sql</outputfilename>
 

src/env/dev/WEB-INF/classes/log4j.properties renamed to src/env/dev/log4j.properties

@@ -13,7 +13,7 @@ public final class SiteMap {
 	// defined at pom.xml (and used by functional tests only)
 	public static final String SITE_URL                  = "http://127.0.0.1:8081";
 
-	// defined at webapp/WEB-INF/spring-servlet.xml
+	// defined at src/main/resources/spring/DispatcherServletContext.xml
 	public static final String INDEX_PAGE_URL            = "/site/index.htm";
 	public static final String MAINTENANCE_PAGE_URL      = "/site/maintenance.htm";
 
@@ -26,7 +26,7 @@ public final class SiteMap {
 
 	public static final String ADD_COUNTRY_PAGE_URL      = "/country/add.htm";
 
-	// defined at webapp/WEB-INF/spring-servlet.xml
+	// defined at src/main/resources/spring/DispatcherServletContext.xml
 	public static final String RESTORE_PASSWORD_PAGE_URL = "/password/restore.htm";
 
 	public static final String NOT_FOUND_PAGE_URL        = "/error/404.htm";

src/env/dev/WEB-INF/database.properties renamed to src/env/dev/spring/database.properties

@@ -11,7 +11,7 @@
 
 	<tx:annotation-driven />
 
-	<context:property-placeholder location="/WEB-INF/database.properties" />
+	<context:property-placeholder location="classpath:spring/database.properties" />
 
 	<import resource="datasource.xml" />
 

src/env/dev/WEB-INF/datasource.xml renamed to src/env/dev/spring/datasource.xml

@@ -10,6 +10,12 @@
 		<servlet-class>
 			org.springframework.web.servlet.DispatcherServlet
 		</servlet-class>
+		<init-param>
+			<param-name>contextConfigLocation</param-name>
+			<param-value>
+				classpath:spring/DispatcherServletContext.xml
+			</param-value>
+		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>