c
Revert "c"

This reverts commit 47469b89dfbcc4096ffd25094b3527ad5afbaf14.

Conflicts:
	workspace/src/main/resources/application.local.properties
	workspace/src/main/resources/applicationContext-quartz.xml
	workspace/src/main/resources/applicationContext.xml
	workspace/src/main/resources/cache/applicationContext-ehcache.xml
	workspace/src/main/resources/cache/ehcache-demo.xml
	workspace/src/main/resources/cache/ehcache-hibernate-local.xml
	workspace/src/main/resources/cache/ehcache-hibernate-rmi.xml
	workspace/src/main/resources/dictionary/area.properties
	workspace/src/main/resources/dictionary/db.properties
	workspace/src/main/resources/hibernate.cfg.xml
	workspace/src/main/webapp/WEB-INF/content/base/dictionary/list.jsp
	workspace/src/main/webapp/WEB-INF/content/workspace/index.jsp
	workspace/src/main/webapp/WEB-INF/web.xml
	鏂板缓鏂囦欢澶?IndexAction.java