From db1d0f556524b31a3dcb9c81a5233e35ef9398b6 Mon Sep 17 00:00:00 2001
From: AngiWANG <angi.wang.afe@gmail.com>
Date: Thu, 8 May 2014 10:31:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/web/form/dynamic/DynamicFormController.java    | 6 +++---
 .../demo/activiti/web/form/formkey/FormKeyController.java   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/me/kafeitu/demo/activiti/web/form/dynamic/DynamicFormController.java b/src/main/java/me/kafeitu/demo/activiti/web/form/dynamic/DynamicFormController.java
index 62e0c5684a..de40e2de26 100644
--- a/src/main/java/me/kafeitu/demo/activiti/web/form/dynamic/DynamicFormController.java
+++ b/src/main/java/me/kafeitu/demo/activiti/web/form/dynamic/DynamicFormController.java
@@ -111,7 +111,7 @@ public ModelAndView processDefinitionList(Model model, @RequestParam(value = "pr
     }
 
     /**
-     * 读取启动流程的表单字段
+     * 初始化启动流程，读取启动流程的表单字段来渲染start form
      */
     @RequestMapping(value = "get-form/start/{processDefinitionId}")
     @ResponseBody
@@ -172,7 +172,7 @@ public Map<String, Object> findTaskForm(@PathVariable("taskId") String taskId) t
     }
 
     /**
-     * 提交task的并保存form
+     * 办理任务，提交task的并保存form
      */
     @RequestMapping(value = "task/complete/{taskId}")
     @SuppressWarnings("unchecked")
@@ -212,7 +212,7 @@ public String completeTask(@PathVariable("taskId") String taskId, @RequestParam(
     }
 
     /**
-     * 读取启动流程的表单字段
+     * 提交启动流程
      */
     @RequestMapping(value = "start-process/{processDefinitionId}")
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/me/kafeitu/demo/activiti/web/form/formkey/FormKeyController.java b/src/main/java/me/kafeitu/demo/activiti/web/form/formkey/FormKeyController.java
index 014eaafdec..4c7dbfd5f7 100644
--- a/src/main/java/me/kafeitu/demo/activiti/web/form/formkey/FormKeyController.java
+++ b/src/main/java/me/kafeitu/demo/activiti/web/form/formkey/FormKeyController.java
@@ -92,7 +92,7 @@ public ModelAndView processDefinitionList(Model model, HttpServletRequest reques
     }
 
     /**
-     * 读取启动流程的表单内容
+     * 初始化启动流程，读取启动流程的表单内容来渲染start form
      */
     @RequestMapping(value = "get-form/start/{processDefinitionId}")
     @ResponseBody
@@ -115,7 +115,7 @@ public Object findTaskForm(@PathVariable("taskId") String taskId) throws Excepti
     }
 
     /**
-     * 提交task的并保存form
+     * 办理任务，提交task的并保存form
      */
     @RequestMapping(value = "task/complete/{taskId}")
     @SuppressWarnings("unchecked")

From d68d20bd2ae000c8a0cb8ce2ed482eaa65d66e1c Mon Sep 17 00:00:00 2001
From: AngiWANG <angi.wang.afe@gmail.com>
Date: Thu, 8 May 2014 13:58:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dh2=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 support/h2/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/h2/pom.xml b/support/h2/pom.xml
index 613eaac168..509ca71a65 100644
--- a/support/h2/pom.xml
+++ b/support/h2/pom.xml
@@ -12,7 +12,7 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.3.167</version>
+			<version>1.3.173</version>
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>