From 21c2ae44c3e52d7e88c3cee65a946db421bfbe33 Mon Sep 17 00:00:00 2001
From: lishengzhao <shengzhao@honyee.cc>
Date: Thu, 20 Mar 2014 12:09:00 +0800
Subject: [PATCH] Change to wdcy

---
 pom.xml                                       | 75 ++-----------------
 src/main/webapp/WEB-INF/logback.xml           | 11 ---
 .../{hy-servlet.xml => wdcy-servlet.xml}      |  5 --
 src/main/webapp/WEB-INF/web.xml               |  4 +-
 4 files changed, 9 insertions(+), 86 deletions(-)
 rename src/main/webapp/WEB-INF/{hy-servlet.xml => wdcy-servlet.xml} (84%)

diff --git a/pom.xml b/pom.xml
index 0d5b2a9..6cd8d3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,12 +193,7 @@
             <artifactId>ehcache-web</artifactId>
             <version>2.0.4</version>
         </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4</version>
-            <scope>compile</scope>
-        </dependency>
+
         <dependency>
             <groupId>opensymphony</groupId>
             <artifactId>sitemesh</artifactId>
@@ -221,11 +216,7 @@
             <artifactId>commons-dbcp</artifactId>
             <version>1.4</version>
         </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.2.2</version>
-        </dependency>
+
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -252,11 +243,11 @@
             <artifactId>spring-core</artifactId>
             <version>${spring.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.springframework</groupId>-->
+            <!--<artifactId>spring-orm</artifactId>-->
+            <!--<version>${spring.version}</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>
@@ -327,24 +318,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>cglib</groupId>-->
-            <!--<artifactId>cglib</artifactId>-->
-            <!--<version>2.2.2</version>-->
-        <!--</dependency>-->
-
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr-runtime</artifactId>
-            <version>3.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>stringtemplate</artifactId>
-            <version>3.2.1</version>
-        </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -361,12 +334,6 @@
             <version>1.7.5</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.zxing</groupId>
-            <artifactId>javase</artifactId>
-            <version>2.2</version>
-        </dependency>
-
         <!--mybatis-->
         <dependency>
             <groupId>org.mybatis</groupId>
@@ -390,28 +357,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>net.sf.json-lib</groupId>
-            <artifactId>json-lib</artifactId>
-            <version>2.4</version>
-            <classifier>jdk15</classifier>
-        </dependency>
-        <dependency>
-            <groupId>displaytag</groupId>
-            <artifactId>displaytag</artifactId>
-            <version>1.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>jcl104-over-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!--public test dependencies-->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -419,12 +364,6 @@
             <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>3.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
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 @@
         </encoder>
     </appender>
 
-    <!--<appender name="AccessLogin" class="ch.qos.logback.core.FileAppender">-->
-        <!--<file>../logs/access_login.log</file>-->
-        <!--<append>true</append>-->
-        <!--<encoder>-->
-            <!--<pattern>%d{yyyy-MM-dd HH:mm:ss} %level %class:%line - %msg%n</pattern>-->
-        <!--</encoder>-->
-    <!--</appender>-->
-
-    <!--<logger name="com.honyee.jiuzhai.web.context.JiuzhaiAuthenticationSuccessHandler" level="DEBUG" additivity="false">-->
-        <!--<appender-ref ref="AccessLogin"/>-->
-    <!--</logger>-->
 
     <!--springframework package level: WARN-->
     <logger name="org.springframework" level="WARN"/>
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 @@
         <property name="suffix" value=".jsp"/>
     </bean>
 
-    <!-- fileUpload Support -->
-    <bean id="webMultipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
-        <property name="defaultEncoding" value="UTF-8"/>
-        <property name="maxUploadSize" value="-1"/>
-    </bean>
 
 </beans>
\ 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 mvc-->
     <servlet>
-        <servlet-name>hy</servlet-name>
+        <servlet-name>wdcy</servlet-name>
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
         <load-on-startup>2</load-on-startup>
     </servlet>
     <servlet-mapping>
-        <servlet-name>hy</servlet-name>
+        <servlet-name>wdcy</servlet-name>
         <url-pattern>/</url-pattern>
     </servlet-mapping>