From fa6fd105db177d41dc4179cf1b03ae780ec048d6 Mon Sep 17 00:00:00 2001 From: Costin Leau <cleau@vmware.com> Date: Mon, 14 Dec 2009 19:47:46 +0000 Subject: [PATCH] SAMPLESPET-3 + move spring application context files under a dedicated folder (to prevent JBoss XML parser from choking) http://forum.springsource.org/showthread.php?t=68949 --- .../WEB-INF/{ => spring}/applicationContext-dataSource.xml | 0 .../WEB-INF/{ => spring}/applicationContext-hibernate.xml | 0 .../webapp/WEB-INF/{ => spring}/applicationContext-jdbc.xml | 0 .../webapp/WEB-INF/{ => spring}/applicationContext-jpa.xml | 0 src/main/webapp/WEB-INF/web.xml | 6 +++--- 5 files changed, 3 insertions(+), 3 deletions(-) rename src/main/webapp/WEB-INF/{ => spring}/applicationContext-dataSource.xml (100%) rename src/main/webapp/WEB-INF/{ => spring}/applicationContext-hibernate.xml (100%) rename src/main/webapp/WEB-INF/{ => spring}/applicationContext-jdbc.xml (100%) rename src/main/webapp/WEB-INF/{ => spring}/applicationContext-jpa.xml (100%) diff --git a/src/main/webapp/WEB-INF/applicationContext-dataSource.xml b/src/main/webapp/WEB-INF/spring/applicationContext-dataSource.xml similarity index 100% rename from src/main/webapp/WEB-INF/applicationContext-dataSource.xml rename to src/main/webapp/WEB-INF/spring/applicationContext-dataSource.xml diff --git a/src/main/webapp/WEB-INF/applicationContext-hibernate.xml b/src/main/webapp/WEB-INF/spring/applicationContext-hibernate.xml similarity index 100% rename from src/main/webapp/WEB-INF/applicationContext-hibernate.xml rename to src/main/webapp/WEB-INF/spring/applicationContext-hibernate.xml diff --git a/src/main/webapp/WEB-INF/applicationContext-jdbc.xml b/src/main/webapp/WEB-INF/spring/applicationContext-jdbc.xml similarity index 100% rename from src/main/webapp/WEB-INF/applicationContext-jdbc.xml rename to src/main/webapp/WEB-INF/spring/applicationContext-jdbc.xml diff --git a/src/main/webapp/WEB-INF/applicationContext-jpa.xml b/src/main/webapp/WEB-INF/spring/applicationContext-jpa.xml similarity index 100% rename from src/main/webapp/WEB-INF/applicationContext-jpa.xml rename to src/main/webapp/WEB-INF/spring/applicationContext-jpa.xml diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index c83f52eb..b4af8222 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -37,10 +37,10 @@ --> <context-param> <param-name>contextConfigLocation</param-name> - <param-value>/WEB-INF/applicationContext-jdbc.xml</param-value> + <param-value>/WEB-INF/spring/applicationContext-jdbc.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/spring/applicationContext-hibernate.xml</param-value> + <param-value>/WEB-INF/spring/applicationContext-jpa.xml</param-value> --> <!-- -- GitLab