diff --git a/pom.xml b/pom.xml index 0d5b2a9..6cd8d3f 100644 --- a/pom.xml +++ b/pom.xml @@ -193,12 +193,7 @@ ehcache-web 2.0.4 - - javax.mail - mail - 1.4 - compile - + opensymphony sitemesh @@ -221,11 +216,7 @@ commons-dbcp 1.4 - - commons-fileupload - commons-fileupload - 1.2.2 - + commons-io commons-io @@ -252,11 +243,11 @@ spring-core ${spring.version} - - org.springframework - spring-orm - ${spring.version} - + + + + + org.springframework spring-tx @@ -327,24 +318,6 @@ compile - - - - - - - - org.antlr - antlr-runtime - 3.3 - compile - - - org.antlr - stringtemplate - 3.2.1 - - ch.qos.logback logback-classic @@ -361,12 +334,6 @@ 1.7.5 - - com.google.zxing - javase - 2.2 - - org.mybatis @@ -390,28 +357,6 @@ compile - - net.sf.json-lib - json-lib - 2.4 - jdk15 - - - displaytag - displaytag - 1.2 - - - org.slf4j - slf4j-log4j12 - - - org.slf4j - jcl104-over-slf4j - - - - org.springframework @@ -419,12 +364,6 @@ ${spring.version} test - - org.easymock - easymock - 3.0 - test - org.testng testng diff --git a/src/main/webapp/WEB-INF/logback.xml b/src/main/webapp/WEB-INF/logback.xml index a74bca6..3027c4d 100644 --- a/src/main/webapp/WEB-INF/logback.xml +++ b/src/main/webapp/WEB-INF/logback.xml @@ -8,17 +8,6 @@ - - - - - - - - - - - diff --git a/src/main/webapp/WEB-INF/hy-servlet.xml b/src/main/webapp/WEB-INF/wdcy-servlet.xml similarity index 84% rename from src/main/webapp/WEB-INF/hy-servlet.xml rename to src/main/webapp/WEB-INF/wdcy-servlet.xml index 25bd889..72ee5f7 100644 --- a/src/main/webapp/WEB-INF/hy-servlet.xml +++ b/src/main/webapp/WEB-INF/wdcy-servlet.xml @@ -29,10 +29,5 @@ - - - - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 3eb7edc..1d10e75 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -113,12 +113,12 @@ - hy + wdcy org.springframework.web.servlet.DispatcherServlet 2 - hy + wdcy /