diff --git a/.classpath b/.classpath
index 6eeb0510..ab04c014 100644
--- a/.classpath
+++ b/.classpath
@@ -5,7 +5,28 @@
 	<classpathentry kind="con" path="melibrary.com.genuitec.eclipse.j2eedt.core.MYECLIPSE_JAVAEE_5_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/com.genuitec.embedded.tomcat.runtime.v70">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="com.genuitec.runtime.library/com.genuitec.hibernate_3.3">
+		<attributes>
+			<attribute name="owner.project.facets" value="me.hibernate"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="com.genuitec.runtime.library/com.genuitec.jstl_1.2">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web.jstl"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="com.genuitec.runtime.library/com.genuitec.generic_5.0"/>
 	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
 </classpath>
diff --git a/.project b/.project
index cd875a81..509374b1 100644
--- a/.project
+++ b/.project
@@ -60,8 +60,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>com.genuitec.eclipse.springframework.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>com.genuitec.eclipse.springframework.springnature</nature>
 		<nature>com.genuitec.eclipse.hibernate.hibernatenature</nature>
 		<nature>com.genuitec.eclipse.ast.deploy.core.deploymentnature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 36db1aad..8109378e 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="jsh_java_erp">
-        <wb-resource deploy-path="/" source-path="/WebRoot"/>
+        <wb-resource deploy-path="/" source-path="/WebRoot" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/config"/>
         <property name="context-root" value="/jsh_java_erp"/>
         <property name="java-output-path" value="/jsh_java_erp/WebRoot/WEB-INF/classes"/>
+        <property name="me-merge-utility-modules" value="true"/>
     </wb-module>
 </project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index e8d5fa15..0872fc23 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
+  <runtime name="com.genuitec.embedded.tomcat.runtime.v70"/>
   <installed facet="java" version="1.6"/>
   <installed facet="jst.web" version="2.5"/>
+  <installed facet="jst.web.jstl" version="1.2"/>
+  <installed facet="me.hibernate" version="3.3"/>
+  <installed facet="me.spring" version="3.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
 </faceted-project>
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/asset/AssetAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/asset/AssetAction.class
index ede440a6..a96ef5a5 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/asset/AssetAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/asset/AssetAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/asset/ReportAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/asset/ReportAction.class
index e6bbc033..f5eaefdd 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/asset/ReportAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/asset/ReportAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class
index 5852e80a..82baf7bd 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AppAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AppAction.class
index 31d17bf2..36bcafaa 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AppAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AppAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AssetNameAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AssetNameAction.class
index a53099c9..46a05653 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AssetNameAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AssetNameAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/CategoryAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/CategoryAction.class
index 3f6d2d53..74f6900f 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/CategoryAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/CategoryAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class
index b945f526..98ef4a84 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/DepotAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/FunctionsAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/FunctionsAction.class
index 40178ed8..cbb8c04c 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/FunctionsAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/FunctionsAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/InOutItemAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/InOutItemAction.class
index 1c3dcddc..1aa80e9a 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/InOutItemAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/InOutItemAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/LogAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/LogAction.class
index 94647062..ae9c4e40 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/LogAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/LogAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/RoleAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/RoleAction.class
index d2793557..91a845f0 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/RoleAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/RoleAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class
index 0025cb62..052fe1af 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/SupplierAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserAction.class
index 082e2805..dccc1124 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserBusinessAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserBusinessAction.class
index 74619d18..b5f71076 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserBusinessAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/basic/UserBusinessAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class
index f2b34296..9926e0cf 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotItemAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotItemAction.class
index 8ca33420..be1b082c 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotItemAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotItemAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialAction.class
index ccea8af8..0eef1eae 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialCategoryAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialCategoryAction.class
index b07e87bf..c03188b0 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialCategoryAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/MaterialCategoryAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class
index 7ffc38a8..174ae52d 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class and b/WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/base/Log.class b/WebRoot/WEB-INF/classes/com/jsh/base/Log.class
index 8c61cdde..95609348 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/base/Log.class and b/WebRoot/WEB-INF/classes/com/jsh/base/Log.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/dao/materials/DepotItemDAO.class b/WebRoot/WEB-INF/classes/com/jsh/dao/materials/DepotItemDAO.class
index 17aa5e8a..4a43167e 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/dao/materials/DepotItemDAO.class and b/WebRoot/WEB-INF/classes/com/jsh/dao/materials/DepotItemDAO.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/asset/AssetService.class b/WebRoot/WEB-INF/classes/com/jsh/service/asset/AssetService.class
index 1dde7ece..7820347e 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/service/asset/AssetService.class and b/WebRoot/WEB-INF/classes/com/jsh/service/asset/AssetService.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/basic/LogService.class b/WebRoot/WEB-INF/classes/com/jsh/service/basic/LogService.class
index b496c1ce..1e73c9c5 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/service/basic/LogService.class and b/WebRoot/WEB-INF/classes/com/jsh/service/basic/LogService.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/basic/UserService.class b/WebRoot/WEB-INF/classes/com/jsh/service/basic/UserService.class
index 0cd779d8..632f878c 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/service/basic/UserService.class and b/WebRoot/WEB-INF/classes/com/jsh/service/basic/UserService.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/service/materials/DepotItemService.class b/WebRoot/WEB-INF/classes/com/jsh/service/materials/DepotItemService.class
index 9cf1117a..928de6b2 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/service/materials/DepotItemService.class and b/WebRoot/WEB-INF/classes/com/jsh/service/materials/DepotItemService.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/util/BeanFactoryUtil.class b/WebRoot/WEB-INF/classes/com/jsh/util/BeanFactoryUtil.class
index 55e37b64..d6d6d332 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/util/BeanFactoryUtil.class and b/WebRoot/WEB-INF/classes/com/jsh/util/BeanFactoryUtil.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/util/PathTool.class b/WebRoot/WEB-INF/classes/com/jsh/util/PathTool.class
index 0e51f50e..fe512ea9 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/util/PathTool.class and b/WebRoot/WEB-INF/classes/com/jsh/util/PathTool.class differ
diff --git a/WebRoot/WEB-INF/classes/com/jsh/util/Tools.class b/WebRoot/WEB-INF/classes/com/jsh/util/Tools.class
index 608326d6..3292b8d2 100644
Binary files a/WebRoot/WEB-INF/classes/com/jsh/util/Tools.class and b/WebRoot/WEB-INF/classes/com/jsh/util/Tools.class differ