deleted:    bin/.settings/.jsdtscope
	deleted:    bin/.settings/org.eclipse.jdt.core.prefs
	deleted:    bin/.settings/org.eclipse.m2e.core.prefs
	deleted:    bin/.settings/org.eclipse.wst.common.component
	deleted:    bin/.settings/org.eclipse.wst.common.project.facet.core.xml
	deleted:    bin/.settings/org.eclipse.wst.jsdt.ui.superType.container
	deleted:    bin/.settings/org.eclipse.wst.jsdt.ui.superType.name
	deleted:    bin/README.md
	deleted:    bin/WebContent/META-INF/MANIFEST.MF
	deleted:    bin/pom.xml
	deleted:    bin/src/main/java/com/dms/test/controller/SysUserController.class
	deleted:    bin/src/main/java/com/dms/test/dao/SysUserDAO.class
	deleted:    bin/src/main/java/com/dms/test/dao/SysUserDAOImpl.class
	deleted:    bin/src/main/java/com/dms/test/model/SysUser.class
	deleted:    bin/src/main/java/com/dms/test/service/SysUserService.class
	deleted:    bin/src/main/java/com/dms/test/service/SysUserServiceImpl.class
	deleted:    bin/src/main/resources/hibernate.cfg.xml
	deleted:    bin/src/main/resources/messages_en.properties
	deleted:    bin/src/main/webapp/WEB-INF/dms-servlet.xml
	deleted:    bin/src/main/webapp/WEB-INF/jdbc.properties
	deleted:    bin/src/main/webapp/WEB-INF/web.xml
	deleted:    bin/target/classes/hibernate.cfg.xml
	deleted:    bin/target/classes/messages_en.properties
	deleted:    bin/target/tomcat/conf/tomcat-users.xml
	deleted:    bin/target/tomcat/conf/web.xml
	deleted:    target/classes/com/dms/common/util/Encryption.class
	deleted:    target/classes/com/dms/common/util/SystemInterceptor.class
	deleted:    target/classes/com/dms/test/controller/SysUserController.class
	deleted:    target/classes/com/dms/test/dao/SysUserDAO.class
	deleted:    target/classes/com/dms/test/dao/SysUserDAOImpl.class
	deleted:    target/classes/com/dms/test/model/SysUser.class
	deleted:    target/classes/com/dms/test/service/SysUserService.class
	deleted:    target/classes/com/dms/test/service/SysUserServiceImpl.class
	deleted:    target/classes/com/dms/test/validator/LoginValidator.class
	deleted:    target/classes/hibernate.cfg.xml
	deleted:    target/classes/log4j.properties
	deleted:    target/classes/messages_zh_CN.properties
	deleted:    target/d1.war
	deleted:    target/d1/WEB-INF/classes/com/dms/common/util/Encryption.class
	deleted:    target/d1/WEB-INF/classes/com/dms/common/util/SystemInterceptor.class
	deleted:    target/d1/WEB-INF/classes/com/dms/test/controller/SysUserController.class
	deleted:    target/d1/WEB-INF/classes/com/dms/test/dao/SysUserDAO.class
	deleted:    target/d1/WEB-INF/classes/com/dms/test/dao/SysUserDAOImpl.class
	deleted:    target/d1/WEB-INF/classes/com/dms/test/model/SysUser.class
	deleted:    target/d1/WEB-INF/classes/com/dms/test/service/SysUserService.class
	deleted:    target/d1/WEB-INF/classes/com/dms/test/service/SysUserServiceImpl.class
	deleted:    target/d1/WEB-INF/classes/com/dms/test/validator/LoginValidator.class
	deleted:    target/d1/WEB-INF/classes/hibernate.cfg.xml
	deleted:    target/d1/WEB-INF/classes/log4j.properties
	deleted:    target/d1/WEB-INF/classes/messages_en.properties
	deleted:    target/d1/WEB-INF/classes/messages_zh_CN.properties
	deleted:    target/d1/WEB-INF/css/bootstrap-responsive.css
	deleted:    target/d1/WEB-INF/css/bootstrap-responsive.min.css
	deleted:    target/d1/WEB-INF/css/bootstrap.css
	deleted:    target/d1/WEB-INF/css/bootstrap.min.css
	deleted:    target/d1/WEB-INF/decorators.xml
	deleted:    target/d1/WEB-INF/dms-servlet.xml
	deleted:    target/d1/WEB-INF/img/glyphicons-halflings-white.png
	deleted:    target/d1/WEB-INF/img/glyphicons-halflings.png
	deleted:    target/d1/WEB-INF/jdbc.properties
	deleted:    target/d1/WEB-INF/js/bootstrap.js
	deleted:    target/d1/WEB-INF/js/bootstrap.min.js
	deleted:    target/d1/WEB-INF/jsp/layout/basic-theme.jsp
	deleted:    target/d1/WEB-INF/jsp/login.jsp
	deleted:    target/d1/WEB-INF/jsp/sysUser.jsp
	deleted:    target/d1/WEB-INF/jsp/welcome.jsp
	deleted:    target/d1/WEB-INF/lib/antlr-2.7.6.jar
	deleted:    target/d1/WEB-INF/lib/aopalliance-1.0.jar
	deleted:    target/d1/WEB-INF/lib/asm-3.3.1.jar
	deleted:    target/d1/WEB-INF/lib/cglib-2.2.2.jar
	deleted:    target/d1/WEB-INF/lib/commons-collections-3.1.jar
	deleted:    target/d1/WEB-INF/lib/commons-dbcp-1.4.jar
	deleted:    target/d1/WEB-INF/lib/commons-logging-1.1.1.jar
	deleted:    target/d1/WEB-INF/lib/commons-pool-1.5.4.jar
	deleted:    target/d1/WEB-INF/lib/dom4j-1.6.1.jar
	deleted:    target/d1/WEB-INF/lib/hibernate-annotations-3.5.4-Final.jar
	deleted:    target/d1/WEB-INF/lib/hibernate-commons-annotations-3.2.0.Final.jar
	deleted:    target/d1/WEB-INF/lib/hibernate-core-3.5.4-Final.jar
	deleted:    target/d1/WEB-INF/lib/hibernate-entitymanager-3.5.4-Final.jar
	deleted:    target/d1/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
	deleted:    target/d1/WEB-INF/lib/javassist-3.12.1.GA.jar
	deleted:    target/d1/WEB-INF/lib/jstl-1.2.jar
	deleted:    target/d1/WEB-INF/lib/jta-1.1.jar
	deleted:    target/d1/WEB-INF/lib/log4j-1.2.14.jar
	deleted:    target/d1/WEB-INF/lib/log4j-1.2.16.jar
	deleted:    target/d1/WEB-INF/lib/mysql-connector-java-5.1.21.jar
	deleted:    target/d1/WEB-INF/lib/sitemesh-2.4.2.jar
	deleted:    target/d1/WEB-INF/lib/slf4j-api-1.5.8.jar
	deleted:    target/d1/WEB-INF/lib/slf4j-log4j12-1.5.5.jar
	deleted:    target/d1/WEB-INF/lib/slf4j-log4j12-1.5.6.jar
	deleted:    target/d1/WEB-INF/lib/spring-aop-3.2.2.RELEASE.jar
	deleted:    target/d1/WEB-INF/lib/spring-beans-3.2.2.RELEASE.jar
	deleted:    target/d1/WEB-INF/lib/spring-context-3.2.2.RELEASE.jar
	deleted:    target/d1/WEB-INF/lib/spring-core-3.2.2.RELEASE.jar
	deleted:    target/d1/WEB-INF/lib/spring-expression-3.2.2.RELEASE.jar
	deleted:    target/d1/WEB-INF/lib/spring-jdbc-3.2.2.RELEASE.jar
	deleted:    target/d1/WEB-INF/lib/spring-orm-3.2.2.RELEASE.jar
	deleted:    target/d1/WEB-INF/lib/spring-tx-3.2.2.RELEASE.jar
	deleted:    target/d1/WEB-INF/lib/spring-web-3.2.2.RELEASE.jar
	deleted:    target/d1/WEB-INF/lib/spring-webmvc-3.2.2.RELEASE.jar
	deleted:    target/d1/WEB-INF/lib/xml-apis-1.0.b2.jar
	deleted:    target/d1/WEB-INF/web.xml
	deleted:    target/maven-archiver/pom.properties
	deleted:    target/tomcat/conf/tomcat-users.xml
	deleted:    target/tomcat/conf/web.xml
	deleted:    target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/layout/basic_002dtheme_jsp.class
	deleted:    target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/layout/basic_002dtheme_jsp.java
	deleted:    target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/login_jsp.class
	deleted:    target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/login_jsp.java
	deleted:    target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/sysUser_jsp.class
	deleted:    target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/sysUser_jsp.java
	deleted:    target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/underwork_jsp.class
	deleted:    target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/underwork_jsp.java
	deleted:    target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/welcome_jsp.class
	deleted:    target/tomcat/work/localEngine/localhost/d1/org/apache/jsp/WEB_002dINF/jsp/welcome_jsp.java
Merge branch 'master' of https://github.com/dingyi216/d1