Merge branch 'master' of github.com:Activiti/Activiti

distro/build.xml

@@ -4,7 +4,7 @@
 
 	<property file="${user.home}/.activiti/build.properties" />
 
-	<property name="activiti.version" value="5.11-SNAPSHOT" />
+	<property name="activiti.version" value="5.12-SNAPSHOT" />
 	<property name="target.distro.root" value="target/zip/activiti-${activiti.version}" />
 	<property name="activiti.website" value="../../activiti-website" />
 

distro/src/notice.txt

@@ -16,17 +16,17 @@ This software package includes changed source code of the following libraries:
 
 JUEL
  * Location: http://juel.sourceforge.net/
- * Included in activiti-engine-5.11-SNAPSHOT.jar in package org.activiti.engine.impl.juel
+ * Included in activiti-engine-5.12-SNAPSHOT.jar in package org.activiti.engine.impl.juel
  * License: Apache V2
  
 Quartz
  * Location: http://www.quartz-scheduler.org/
- * CronExpression is included in activiti-engine-5.11-SNAPSHOT.jar in package org.activiti.engine.impl.calendar
+ * CronExpression is included in activiti-engine-5.12-SNAPSHOT.jar in package org.activiti.engine.impl.calendar
  * License: Apache V2
 
 JSON
  * Location: http://www.JSON.org/java
- * Included in activiti-engine-5.11-SNAPSHOT.jar in package org.activiti.engine.impl.json
+ * Included in activiti-engine-5.12-SNAPSHOT.jar in package org.activiti.engine.impl.json
  * License:
 ===============================================================================
 Copyright (c) 2002 JSON.org

modules/activiti-bpmn-converter/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -46,6 +46,30 @@
     </dependency>          
   </dependencies>
   
+  <profiles>
+    <profile>
+      <id>distro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
   <repositories>
     <!-- This repo declaration is here for as this will be part of the distro -->
     <repository>

modules/activiti-bpmn-model/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -20,6 +20,30 @@
     </dependency>         
   </dependencies>
   
+  <profiles>
+    <profile>
+      <id>distro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
   <repositories>
     <!-- This repo declaration is here for as this will be part of the distro -->
     <repository>

modules/activiti-cactus/pom.xml

@@ -12,7 +12,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <dependencies>

modules/activiti-camel/pom.xml

@@ -12,7 +12,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
 

modules/activiti-cdi/pom.xml

@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
 

modules/activiti-cxf/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
 
   </parent>
 

modules/activiti-engine/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <dependencies>

modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngine.java

@@ -49,7 +49,7 @@ package org.activiti.engine;
 public interface ProcessEngine extends EngineServices {
 
   /** the version of the activiti library */
-  public static String VERSION = "5.11-SNAPSHOT";
+  public static String VERSION = "5.12-SNAPSHOT";
 
   /** The name as specified in 'process-engine-name' in 
    * the activiti.cfg.xml configuration file.

modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql

@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql

@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql

@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql

@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql

@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql

@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-explorer/pom.xml

@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -141,6 +141,30 @@
     </dependency>
 
   </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>distro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
   <repositories>
     <repository>

modules/activiti-explorer/src/main/resources/messages_zh_CN.properties

@@ -7,6 +7,7 @@ confirmation.dialog.no= \u5426
 button.ok = \u786e\u5b9a
 button.create = \u521b\u5efa
 button.cancel = \u53d6\u6d88
+uncaught.exception = \u8b66\u544a
 
 # Navigation
 navigation.error.not.involved.title = \u65e0\u6cd5\u67e5\u770b\u6b64\u4efb\u52a1
@@ -35,7 +36,7 @@ main.menu.repositories = \u4ed3\u5e93
 
 # Password
 password.change = \u4fee\u6539\u5bc6\u7801
-password.change.input.required = \u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a 
+password.change.input.required = \u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a
 password.change.input.match = \u4e24\u6b21\u8f93\u5165\u7684\u5bc6\u7801\u5fc5\u987b\u4e00\u81f4
 password.changed.notification = \u5bc6\u7801\u5df2\u66f4\u65b0
 
@@ -93,10 +94,10 @@ task.name.required = \u4efb\u52a1\u540d\u4e3a\u5fc5\u586b\u9879
 
 # Task menu
 task.menu.tasks = \u6211\u7684\u4efb\u52a1
-task.menu.inbox = \u6536\u4ef6\u7bb1
+task.menu.inbox = \u5f85\u529e\u4efb\u52a1
 task.menu.queued = \u961f\u5217
-task.menu.involved = \u9080\u8bf7
-task.menu.archived = \u5f52\u6863
+task.menu.involved = \u53d7\u9080
+task.menu.archived = \u5df2\u5f52\u6863
 
 # Task details
 task.id = ID
@@ -117,7 +118,7 @@ task.create.time = \u521b\u5efa\u65f6\u95f4
 task.complete.time = \u5b8c\u6210
 task.duedate = \u5230\u671f\u65e5
 task.duedate.unknown = \u672a\u8bbe\u7f6e\u5230\u671f\u65e5
-task.duedate.short = Due {0} 
+task.duedate.short = Due {0}
 task.complete = \u5b8c\u6210\u4efb\u52a1
 task.task.completed = \u4efb\u52a1 {0} \u5df2\u529e\u7406\u5b8c\u6210
 task.form.reset = \u91cd\u7f6e\u8868\u5355
@@ -130,7 +131,7 @@ task.priority.low= \u4f4e
 task.priority.medium= \u4e2d
 task.priority.high= \u9ad8
 task.part.of.process = \u4efb\u52a1\u5c5e\u4e8e\u6d41\u7a0b: ''{0}''
-task.subtask.of.parent.task = \u5c5e\u4e8e ''{0}'' \u7684\u5b50\u4efb\u52a1  
+task.subtask.of.parent.task = \u5c5e\u4e8e ''{0}'' \u7684\u5b50\u4efb\u52a1
 task.jump.to.process =  \u8df3\u8f6c\u5230\u6d41\u7a0b
 task.claim= \u7b7e\u6536
 task.claim.failed= \u7b7e\u6536\u4efb\u52a1\u5931\u8d25
@@ -170,23 +171,41 @@ process.menu.editor.definitions = \u6d41\u7a0b\u8bbe\u8ba1\u5de5\u4f5c\u533a
 process.menu.instances = \u6d41\u7a0b\u5b9e\u4f8b
 
 # Process page
-process.category = \u7c7b\u522b: 
+process.category = \u7c7b\u522b:
 process.version = \u7248\u672c {0}
 process.deploy.time = \u90e8\u7f72\u4e8e {0}
 process.header.diagram = \u6d41\u7a0b\u56fe
 process.no.diagram = \u6b64\u6d41\u7a0b\u6ca1\u6709\u5bf9\u5e94\u7684\u6d41\u7a0b\u56fe\u3002
+process.header.suspension.state = \u6302\u8d77\u72b6\u6001\u66f4\u6539
+process.scheduled.suspend = \u6b64\u6d41\u7a0b\u5b9a\u4e49\u8ba1\u5212\u4e8e<b>{0} \u6302\u8d77</b>
+process.scheduled.activate = \u6b64\u6d41\u7a0b\u5b9a\u4e49\u8ba1\u5212\u4e8e<b>{0} \u6fc0\u6d3b</b>
 process.start = \u542f\u52a8\u6d41\u7a0b
 process.edit = \u7f16\u8f91\u6a21\u578b
+process.copy = \u590d\u5236\u6a21\u578b
 process.delete = \u5220\u9664\u6a21\u578b
 process.new = \u65b0\u5efa\u6a21\u578b
-process.deploy = \u90e8\u7f72\u4e3a\u6d41\u7a0b\u5b9a\u4e49
+process.import = \u5bfc\u5165
+process.deploy = \u90e8\u7f72
+process.activate = \u6fc0\u6d3b
+process.activate.popup = \u6fc0\u6d3b\u6d41\u7a0b\u5b9a\u4e49
+process.activate.popup.time.description = \u4f55\u65f6\u6fc0\u6d3b\u6b64\u6d41\u7a0b\u5b9a\u4e49\uff1f
+process.activate.popup.process.instances.description = \u540c\u65f6\u6fc0\u6d3b\u548c\u6b64\u6d41\u7a0b\u5b9a\u4e49\u76f8\u5173\u7684\u6d41\u7a0b\u5b9e\u4f8b
+process.suspend = \u6302\u8d77
+process.suspend.popup = \u6302\u8d77\u6d41\u7a0b\u5b9a\u4e49
+process.suspend.popup.time.description = \u4f55\u65f6\u6302\u8d77\u6b64\u6d41\u7a0b\u5b9a\u4e49\uff1f
+process.suspend.popup.time.now = \u73b0\u5728
+process.suspend.popup.time.date = \u8bbe\u5b9a\u65f6\u95f4
+process.suspend.popup.process.instances.description = \u540c\u65f6\u6302\u8d77\u548c\u6b64\u6d41\u7a0b\u5b9a\u4e49\u76f8\u5173\u7684\u6d41\u7a0b\u5b9e\u4f8b
 process.convert = \u8f6c\u6362\u4e3a\u53ef\u7f16\u8f91\u6a21\u578b
+process.export = \u5bfc\u51fa\u6a21\u578b
+process.toxml.failed = \u521b\u5efaBPMN\u6587\u4ef6\u5931\u8d25
 process.instance.delete = \u5220\u9664
 process.instance.delete.popup.title = \u5220\u9664\u6d41\u7a0b\u5b9e\u4f8b {0}?
 process.instance.delete.popup.description = \u60a8\u786e\u5b9a\u8981\u5220\u9664\u6d41\u7a0b\u5b9e\u4f8b\u5417\uff1f<br/>\u6b64\u64cd\u4f5c\u4f1a\u5220\u9664\u548c\u6d41\u7a0b\u5b9e\u4f8b\u76f8\u5173\u7684\u4efb\u52a1\u548c\u6570\u636e\u3002
 process.start.time = \u5df2\u542f\u52a8 {0}
 process.started.notification = \u6d41\u7a0b {0} \u5df2\u542f\u52a8
 process.instance.started.on = \u5df2\u542f\u52a8 {0}
+process.instance.started = \u5df2\u542f\u52a8
 process.instance.header.tasks = \u4efb\u52a1
 process.instance.no.tasks= \u6ca1\u6709\u67e5\u8be2\u5230\u548c\u6b64\u6d41\u7a0b\u5b9e\u4f8b\u76f8\u5173\u7684\u4efb\u52a1
 process.instance.header.variables = \u53d8\u91cf
@@ -195,6 +214,7 @@ process.instances = \u6d41\u7a0b\u5b9e\u4f8b
 process.no.instances = \u6ca1\u6709\u67e5\u8be2\u5230\u548c\u6b64\u6d41\u7a0b\u5b9a\u4e49\u76f8\u5173\u7684\u6d41\u7a0b\u5b9e\u4f8b
 process.action.view = \u67e5\u770b
 process.instance.id = ID
+process.instance.name = \u540d\u79f0
 process.instance.businesskey = \u4e1a\u52a1ID
 process.instance.actions = \u64cd\u4f5c
 process.instance.variable.name = \u540d\u79f0
@@ -204,6 +224,7 @@ process.convert.popup.message = \u60a8\u786e\u5b9a\u8981\u7528\u6b64\u6d41\u7a0b
 process.convert.popup.convert.button = \u8f6c\u6362
 process.new.popup.caption = \u65b0\u6a21\u578b
 process.new.popup.create.button = \u521b\u5efa
+process.copy.popup.caption = \u590d\u5236\u6a21\u578b
 process.delete.popup.caption = \u5220\u9664 {0}
 process.delete.popup.message = \u60a8\u786e\u5b9a\u4ece\u5f53\u524d\u5de5\u4f5c\u533a\u5220\u9664\u6a21\u578b\u5417\uff1f
 process.delete.popup.delete.button = \u5220\u9664
@@ -213,26 +234,35 @@ management.menu.database = \u6570\u636e\u5e93
 management.menu.deployments = \u90e8\u7f72\u5305
 management.menu.deployments.show.all = \u67e5\u770b\u5168\u90e8
 management.menu.deployments.upload = \u6dfb\u52a0\u65b0\u7684\u90e8\u7f72\u5305
+management.menu.active.processdefinitions = \u6d3b\u52a8\u7684\u6d41\u7a0b
+management.menu.suspended.processdefinitions = \u6302\u8d77\u7684\u6d41\u7a0b
 management.menu.jobs = \u4f5c\u4e1a
 management.menu.users = \u7528\u6237
 management.menu.groups = \u7ec4
+management.menu.admin = \u7ba1\u7406
 
 # Job page
 job.execute = \u6267\u884c
-job.header.execution = \u4f5c\u4e1a\u6267\u884c
+job.delete = \u5220\u9664
+job.deleted = \u5220\u9664\u4f5c\u4e1a
+job.header.execution = \u6267\u884c\u4f5c\u4e1a
 job.retries = \u91cd\u8bd5 : {0}
 job.no.retries = \u91cd\u8bd5\u5931\u8d25\u3002
 job.default.name = \u4f5c\u4e1a {0}
 job.timer = \u5b9a\u65f6\u4f5c\u4e1a {0}
-job.message = \u6d88\u606f\u4f5c\u4e1a {0} 
+job.message = \u6d88\u606f\u4f5c\u4e1a {0}
 job.duedate = \u5230\u671f\u65e5 {0}
 job.no.dudedate = \u65e0\u5230\u671f\u65e5
 job.error = \u6267\u884c\u4f5c\u4e1a\u65f6\u7cfb\u7edf\u62a5\u9519
 job.not.executed = \u4f5c\u4e1a\u8fd8\u672a\u6267\u884c\u3002
+job.error = \u6267\u884c\u4f5c\u4e1a\u662f\u51fa\u9519
+job.not.executed = \u4f5c\u4e1a\u8fd8\u672a\u6267\u884c\u3002
+job.suspend.processdefinition = \u6b64\u4f5c\u4e1a\u5c06\u6302\u8d77\u6d41\u7a0b\u5b9a\u4e49\u3002
+job.activate.processdefinition = \u6b64\u4f5c\u4e1a\u5c06\u6fc0\u6d3b\u6d41\u7a0b\u5b9a\u4e49\u3002
 
 # Deployment page
 deployment.delete = \u5220\u9664
-deployment.create.time = \u90e8\u7f72\u4e8e 
+deployment.create.time = \u90e8\u7f72\u4e8e
 deployment.header.definitions = \u5305\u542b\u7684\u6d41\u7a0b\u5b9a\u4e49
 deployment.header.resources = \u76f8\u5173\u8d44\u6e90
 deployment.upload = \u65b0\u7684\u90e8\u7f72\u5305
@@ -248,21 +278,33 @@ deployment.delete.popup.caption = \u5220\u9664\u5df2\u90e8\u7f72\u7684 {0}?
 deployment.delete.popup.warning = \u67e5\u8be2\u5230\u6709 <b>{0} \u4e2a\u5904\u4e8e\u8fd0\u884c\u4e2d</b>\u7684\u6d41\u7a0b\u5b9e\u4f8b\u3002<br/>\u786e\u5b9a\u7ee7\u7eed\u5220\u9664\u5417\uff1f
 deployment.delete.popup.delete.button = \u5220\u9664
 
+# Import to model workspace
+model.import = \u5bfc\u5165\u6a21\u578b
+model.import.description = \u9009\u62e9\u4e00\u4e2a\u5305\u542b\u56fe\u7247\u4fe1\u606f\uff08\u7528\u4e8e\u5750\u6807\u5b9a\u4f4d\uff09\u7684\u6587\u4ef6 (.bpmn20.xml \u6216 .bpmn)\u3002
+model.import.failed = \u5bfc\u5165\u5931\u8d25
+model.import.invalid.file = \u4e0d\u80fd\u5bfc\u5165\u6587\u4ef6
+model.import.invalid.file.explanation = \u4ec5\u652f\u6301.bpmn \u6216 .bpmn20.xml\u7c7b\u578b\u7684\u6587\u4ef6
+model.import.invalid.bpmndi = \u672a\u627e\u5230 BPMN DI \u5143\u7d20
+model.import.invalid.bpmndi.explanation = \u8bf7\u786e\u8ba4\u6587\u4ef6\u4e2d\u5305\u542bBPMN DI\u4fe1\u606f
+model.import.invalid.bpmn.explanation = \u8bf7\u786e\u8ba4\u6587\u4ef6\u4e2d\u5305\u542b\u6709\u6548\u7684BPMN\u5b9a\u4e49
+
+model.action = \u5904\u7406\u6a21\u578b:
+
 # Database page
 database.no.rows = \u65e0\u6570\u636e\u3002
 
 # User page
 user.header.details = \u8be6\u7ec6\u8d44\u6599
 user.header.groups = \u7ec4
-user.id = \u5de5\u53f7
+user.id = Id
 user.id.required = \u6dfb\u52a0\u65b0\u7528\u6237\u65f6\u5de5\u53f7\u4e3a\u5fc5\u586b\u9879
 user.id.unique = \u6b64\u7528\u6237\u5df2\u7ecf\u5b58\u5728
 user.firstname = \u540d
 user.lastname = \u59d3
-user.email = \u7535\u5b50\u90ae\u7bb1
+user.email = Email
 user.password = \u5bc6\u7801
 user.password.required = \u521b\u5efa\u7528\u6237\u65f6\u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a
-user.password.min.lenth = \u5bc6\u7801\u957f\u5ea6\u592a\u77ed\uff1a \u5bc6\u7801\u81f3\u5c11 {0} \u4e2a\u5b57\u7b26  
+user.password.min.lenth = \u5bc6\u7801\u957f\u5ea6\u592a\u77ed\uff1a \u5bc6\u7801\u81f3\u5c11 {0} \u4e2a\u5b57\u7b26
 user.reset.password = (\u8bf7\u6ce8\u610f\uff0c\u5982\u679c\u586b\u5199\u4f1a\u91cd\u7f6e\u5bc6\u7801\uff01)
 user.create = \u6dfb\u52a0\u7528\u6237
 user.edit = \u7f16\u8f91\u8be6\u7ec6\u8d44\u6599
@@ -270,7 +312,7 @@ user.delete = \u5220\u9664\u7528\u6237
 user.save = \u4fdd\u5b58\u8be6\u7ec6\u8d44\u6599
 user.no.picture = \u65e0\u5934\u50cf
 user.no.groups = \u6b64\u7528\u6237\u4e0d\u5c5e\u4e8e\u4efb\u4f55\u7ec4
-user.confirm.delete = \u60a8\u786e\u5b9a\u8981\u5220\u9664 <b>{0}</b>? 
+user.confirm.delete = \u60a8\u786e\u5b9a\u8981\u5220\u9664 <b>{0}</b>?
 user.confirm.delete.group = \u4ece\u7ec4 <b>{1}</b> \u4e2d\u79fb\u9664\u7528\u6237 <b>{0}</b> \uff1f
 user.select.groups = \u9009\u62e9
 user.select.groups.popup = \u4e3a\u7528\u6237 {0} \u9009\u62e9\u7ec4
@@ -289,6 +331,30 @@ group.no.members = \u6b64\u7ec4\u8fd8\u6ca1\u6709\u6210\u5458
 group.select.members = \u9009\u62e9 {0} \u7ec4\u7684\u6210\u5458
 group.delete = \u5220\u9664\u7ec4
 
+# Running process instances page
+admin.menu.running = \u6d3b\u52a8\u7684\u6d41\u7a0b\u5b9e\u4f8b
+admin.menu.completed = \u5df2\u5b8c\u6210\u6d41\u7a0b\u5b9e\u4f8b
+admin.menu.database = \u6570\u636e\u5e93\u914d\u7f6e
+admin.running.title = \u5305\u542b\u8fd0\u884c\u4e2d\u6d41\u7a0b\u5b9e\u4f8b\u7684\u6d41\u7a0b\u5b9a\u4e49
+admin.definitions = \u6d41\u7a0b\u5b9a\u4e49\u5217\u8868
+admin.running.none.found = \u65e0\u8fd0\u884c\u4e2d\u6d41\u7a0b\u5b9e\u4f8b
+admin.completed.title = \u5305\u542b\u5df2\u5b8c\u6210\u6d41\u7a0b\u5b9e\u4f8b\u7684\u6d41\u7a0b\u5b9a\u4e49
+admin.completed.none.found = \u65e0\u5df2\u5b8c\u6210\u6d41\u7a0b\u5b9e\u4f8b
+admin.nr.instances = \u5b9e\u4f8b\u6570\u91cf
+admin.started.by = \u53d1\u8d77\u4eba
+admin.start.activity = \u542f\u52a8\u6d41\u7a0b\u7684\u6d3b\u52a8ID
+admin.finished = \u5df2\u5b8c\u6210
+
+# Database settings page
+database.title = \u6570\u636e\u5e93\u914d\u7f6e
+database.type = \u6570\u636e\u5e93\u7c7b\u578b
+database.update = \u66f4\u65b0\u6570\u636e\u5e93Schema
+database.config.type = Database configuration
+database.jndi = JNDI\u540d\u79f0
+database.datasource.class = \u6570\u636e\u6e90\u7c7b
+database.datasource.url = \u6570\u636e\u6e90URL
+database.jdbc.url = JDBC URL
+
 # Upload
 upload.select = \u9009\u62e9\u4e00\u4e2a\u6587\u4ef6
 upload.drop = \u62d6\u52a8\u6587\u4ef6\u5230\u8fd9\u91cc
@@ -339,6 +405,6 @@ time.unit.month=\u4e00\u4e2a\u6708
 time.unit.months={0} \u6708
 time.unit.year=\u4e00\u5e74
 time.unit.years={0} \u5e74
-time.unit.future={0} \u672a\u6765
+time.unit.future={0} \u5c06\u6765
 time.unit.past={0} \u4e4b\u524d
-time.unit.just.now=\u521a\u521a
+time.unit.just.now=\u521a\u521a
\ No newline at end of file

modules/activiti-json-converter/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -41,6 +41,30 @@
     </dependency>          
   </dependencies>
   
+  <profiles>
+    <profile>
+      <id>distro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
   <repositories>
     <!-- This repo declaration is here for as this will be part of the distro -->
     <repository>

modules/activiti-modeler/pom.xml

@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -86,6 +86,30 @@
    
   </dependencies>
   
+  <profiles>
+    <profile>
+      <id>distro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
   <repositories>
     <repository>
       <id>buzzmedia</id>

modules/activiti-mule/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
 
   </parent>
 

modules/activiti-osgi/pom.xml

@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <build>

modules/activiti-rest/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
   
   <properties>
@@ -82,4 +82,29 @@
     </dependency>
 
   </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>distro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
 </project>

modules/activiti-spring/pom.xml

@@ -9,7 +9,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <dependencies>

modules/activiti-upgrade/pom.xml

@@ -6,7 +6,7 @@
   <name>Activiti - Upgrade</name>
   <groupId>org.activiti</groupId>
   <artifactId>activiti-upgrade</artifactId>
-  <version>5.11-SNAPSHOT</version>
+  <version>5.12-SNAPSHOT</version>
 
   <properties>
     <skipTests>true</skipTests>

modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.db2.create.engine.sql

@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.h2.create.engine.sql

@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mssql.create.engine.sql

@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mysql.create.engine.sql

@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.oracle.create.engine.sql

@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.postgres.create.engine.sql

@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.11-SNAPSHOT', 1);
+values ('schema.version', '5.12-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(5.11-SNAPSHOT)', 1);
+values ('schema.history', 'create(5.12-SNAPSHOT)', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-webapp-explorer2/pom.xml

@@ -11,7 +11,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <properties>

modules/activiti-webapp-rest2/pom.xml

@@ -10,7 +10,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <build>

pom.xml

@@ -8,7 +8,7 @@
   <artifactId>activiti-root</artifactId>
 
   <packaging>pom</packaging>
-  <version>5.11-SNAPSHOT</version>
+  <version>5.12-SNAPSHOT</version>
   <properties>
     <spring.framework.version>3.1.2.RELEASE</spring.framework.version>
     <mule.version>3.3.0</mule.version>

qa/build.xml

@@ -4,7 +4,7 @@
   	
   <property file="${user.home}/.activiti/build.properties" />
   <property file="../distro/src/setup/build.properties" />
-  <property name="activiti.version" value="5.11-SNAPSHOT" />
+  <property name="activiti.version" value="5.12-SNAPSHOT" />
   <property name="activiti.home" value="../distro/target/activiti-${activiti.version}" /> 
   <property name="macos.browser" value="/usr/bin/open" />
   <property name="windows.browser" value="C:/Program Files/Mozilla Firefox/firefox.exe" />

qa/dbclean/pom.xml

@@ -8,7 +8,7 @@
   <artifactId>activiti-dbclean</artifactId>
 
   <packaging>pom</packaging>
-  <version>5.11-SNAPSHOT</version>
+  <version>5.12-SNAPSHOT</version>
 
   <dependencies>
     <dependency>

qa/upgrade/build.xml

@@ -2,7 +2,7 @@
 <project name="activiti.qa.upgrade" default="upgrade">
 	
   <property file="${user.home}/.activiti/build.properties" />
-  <property name="activiti.version" value="5.11-SNAPSHOT" />
+  <property name="activiti.version" value="5.12-SNAPSHOT" />
   <property name="database" value="h2" />
   <property name="activiti.old.version" value="5.0" />
   <property name="downloads.dir" value="${user.home}/.activiti/downloads" />

qa/upgrade/pom.xml

@@ -6,13 +6,13 @@
   <name>Activiti - Upgrade Fetcher</name>
   <groupId>org.activiti</groupId>
   <artifactId>activiti-upgrade-fetcher</artifactId>
-  <version>5.11-SNAPSHOT</version>
+  <version>5.12-SNAPSHOT</version>
 
   <parent>
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.11-SNAPSHOT</version>
+    <version>5.12-SNAPSHOT</version>
   </parent>
 
   <dependencies>

userguide/src/en/chapters/ch02-GettingStarted.xml

@@ -142,7 +142,7 @@
         contain all the Activiti jars (and the source jars). The dependencies are not shipped this way.
         The required dependencies of the Activiti engine are (generated using <literal>mvn dependency:tree</literal>):
        <programlisting>
-org.activiti:activiti-engine:jar:5.11-SNAPSHOT
+org.activiti:activiti-engine:jar:5.12-SNAPSHOT
 +- org.apache.commons:commons-email:jar:1.2:compile
 |  +- javax.mail:mail:jar:1.4.1:compile
 |  \- javax.activation:activation:jar:1.1:compile

userguide/src/en/index.xml

@@ -20,7 +20,7 @@
 
 <book>
 
-  <bookinfo><title>Activiti 5.11-SNAPSHOT User Guide</title></bookinfo>
+  <bookinfo><title>Activiti 5.12-SNAPSHOT User Guide</title></bookinfo>
   
   <toc />