ACT-394 ACT-396 and version updated from 5.0-SNAPSHOT to 5.1-SNAPSHOT

distro/build.xml

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

distro/src/setup/build.xml

@@ -9,7 +9,7 @@
   <property file="build.${db}.properties" />
 
   <property name="activiti.home" value=".." /> 
-  <property name="activiti.version" value="5.0-SNAPSHOT" />   
+  <property name="activiti.version" value="5.1-SNAPSHOT" />   
   <property name="apache.mirror.url" value="http://mirrors.enquira.co.uk/apache/" />
   
   <property name="cycle.workspace" location="${activiti.home}/workspace/activiti-cycle-examples"/>
@@ -36,11 +36,8 @@
   
   <!-- ### CFG #################################################################### -->
 
-  <available property="is.cfg.available" file="${activiti.home}/setup/build/activiti-cfg.jar" />
-
   <target name="cfg.create"
-          description="Creates a build/activiti-cfg/activiti.cfg.xml and build/activiti-cfg.jar as specified by the build.properties"
-          unless="is.cfg.available">
+          description="Creates a build/activiti-cfg/activiti.cfg.xml and build/activiti-cfg.jar as specified by the build.properties">
     <mkdir dir="${activiti.home}/setup/build/activiti-cfg" />
     <copy todir="${activiti.home}/setup/build/activiti-cfg" overwrite="true">
       <filterset filtersfile="build.${db}.properties" />
@@ -451,7 +448,7 @@ set JAVA_OPTS=%JAVA_OPTS% @tomcat.java.opts@
   
   <target name="deploy.activiti.cfg.into.tomcat" 
           depends="cfg.create, internal.define.jdbc.driver.libs">
-    <copy todir="${tomcat.home}/lib">
+    <copy todir="${tomcat.home}/webapps/activiti-rest/WEB-INF/lib">
       <fileset dir="build">
         <include name="activiti-cfg.jar"/>
       </fileset>

distro/src/workspace/activiti-cycle-examples/EasyBugFilingProcess/build.properties

 # Defines the home directory of the Activiti installation.
 # The value is either the absolute path to ${acitviti.home} or the relative path
-activiti.home = C://Projekte_Activiti/activiti/distro/target/activiti-5.0-SNAPSHOT
-activiti.tomcat.lib = C://Projekte_Activiti/activiti/distro/target/activiti-5.0-SNAPSHOT/apps/apache-tomcat-6.0.29/lib
+activiti.home = C://Projekte_Activiti/activiti/distro/target/activiti-5.1-SNAPSHOT
+activiti.tomcat.lib = C://Projekte_Activiti/activiti/distro/target/activiti-5.1-SNAPSHOT/apps/apache-tomcat-6.0.29/lib

distro/src/workspace/activiti-cycle-examples/EasyBugFilingProcess/pom.xml

@@ -5,14 +5,14 @@
 	<name>EasyBugFilingProcess</name>
 	<groupId>org.activiti</groupId>
 	<artifactId>EasyBugFilingProcess</artifactId>
-	<version>5.0-SNAPSHOT</version>
+	<version>5.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<parent>
 	  <!-- use the parent for correct dependency versions -->
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
-		<version>5.0-SNAPSHOT</version>
+		<version>5.1-SNAPSHOT</version>
 	</parent>
 	
 	<properties>
@@ -32,7 +32,7 @@
 			<groupId>org.activiti</groupId>
 			<artifactId>activiti-engine</artifactId>
 			<!--
-			<version>5.0-SNAPSHOT</version>
+			<version>5.1-SNAPSHOT</version>
 			-->
 			<scope>compile</scope>
 		</dependency>

distro/src/workspace/activiti-engine-examples/.classpath

@@ -5,8 +5,8 @@
 	<classpathentry kind="src" path="src/test/java"/>
   <classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="lib" path="libs-runtime/activation-1.1.jar"/>
-	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.0-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.0-SNAPSHOT.jar" sourcepath="libs-runtime/activiti-engine-5.0-SNAPSHOT-sources.jar"/>
+	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.1-SNAPSHOT-sources.jar"/>
+	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.1-SNAPSHOT.jar" sourcepath="libs-runtime/activiti-engine-5.1-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="lib" path="libs-runtime/commons-email-1.2.jar"/>
 	<classpathentry kind="lib" path="libs-runtime/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="libs-runtime/livetribe-jsr223-2.0.6.jar"/>

distro/src/workspace/activiti-engine-examples/pom.xml

@@ -8,7 +8,7 @@
   <artifactId>activiti-engine-examples</artifactId>
 
   <packaging>jar</packaging>
-  <version>5.0-SNAPSHOT</version>
+  <version>5.1-SNAPSHOT</version>
 
   <dependencies>
   

distro/src/workspace/activiti-groovy-examples/.classpath

@@ -5,8 +5,8 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="lib" path="libs-runtime/activation-1.1.jar"/>
-	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.0-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.0-SNAPSHOT.jar" sourcepath="libs-runtime/activiti-engine-5.0-SNAPSHOT-sources.jar"/>
+	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.1-SNAPSHOT-sources.jar"/>
+	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.1-SNAPSHOT.jar" sourcepath="libs-runtime/activiti-engine-5.1-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="lib" path="libs-runtime/commons-email-1.2.jar"/>
 	<classpathentry kind="lib" path="libs-runtime/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="libs-runtime/livetribe-jsr223-2.0.6.jar"/>

distro/src/workspace/activiti-jpa-examples/.classpath

@@ -5,8 +5,8 @@
 	<classpathentry kind="src" path="src/test/java"/>
   <classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="lib" path="libs-runtime/activation-1.1.jar"/>
-	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.0-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.0-SNAPSHOT.jar" sourcepath="libs-runtime/activiti-engine-5.0-SNAPSHOT-sources.jar"/>
+	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.1-SNAPSHOT-sources.jar"/>
+	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.1-SNAPSHOT.jar" sourcepath="libs-runtime/activiti-engine-5.1-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="lib" path="libs-runtime/commons-email-1.2.jar"/>
 	<classpathentry kind="lib" path="libs-runtime/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="libs-runtime/livetribe-jsr223-2.0.6.jar"/>

distro/src/workspace/activiti-spring-examples/.classpath

@@ -5,8 +5,8 @@
 	<classpathentry kind="src" path="src/test/java"/>
   <classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="lib" path="libs-runtime/activation-1.1.jar"/>
-	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.0-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.0-SNAPSHOT.jar" sourcepath="libs-runtime/activiti-engine-5.0-SNAPSHOT-sources.jar"/>
+	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.1-SNAPSHOT-sources.jar"/>
+	<classpathentry kind="lib" path="libs-runtime/activiti-engine-5.1-SNAPSHOT.jar" sourcepath="libs-runtime/activiti-engine-5.1-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="lib" path="libs-runtime/aopalliance-1.0.jar"/>
 	<classpathentry kind="lib" path="libs-runtime/commons-email-1.2.jar"/>
 	<classpathentry kind="lib" path="libs-runtime/commons-logging-1.1.1.jar"/>
@@ -40,8 +40,8 @@
 	<classpathentry kind="lib" path="libs-test/subethasmtp-smtp-1.2.jar"/>
 	<classpathentry kind="lib" path="libs-test/subethasmtp-wiser-1.2.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="libs-runtime/activiti-spring-5.0-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="lib" path="libs-runtime/activiti-spring-5.0-SNAPSHOT.jar" sourcepath="libs-runtime/activiti-spring-5.0-SNAPSHOT-sources.jar"/>
+	<classpathentry kind="lib" path="libs-runtime/activiti-spring-5.1-SNAPSHOT-sources.jar"/>
+	<classpathentry kind="lib" path="libs-runtime/activiti-spring-5.1-SNAPSHOT.jar" sourcepath="libs-runtime/activiti-spring-5.1-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="lib" path="libs-runtime/persistence-api-1.0.jar"/>
 	<classpathentry kind="lib" path="libs-test/antlr-2.7.7.jar"/>
 	<classpathentry kind="lib" path="libs-test/asm-3.1.jar"/>

modules/activiti-cxf/pom.xml

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

modules/activiti-cycle-maven-template/pom.xml

@@ -5,14 +5,14 @@
 	<name>activiti.project.template</name>
 	<groupId>org.activiti</groupId>
 	<artifactId>activiti.project.template</artifactId>
-	<version>5.0-SNAPSHOT</version>
+	<version>5.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<parent>
 	  <!-- use the parent for correct dependency versions -->
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
-		<version>5.0-SNAPSHOT</version>
+		<version>5.1-SNAPSHOT</version>
 	</parent>
 	
 	<properties>
@@ -32,7 +32,7 @@
 			<groupId>org.activiti</groupId>
 			<artifactId>activiti-engine</artifactId>
 			<!--
-			<version>5.0-SNAPSHOT</version>
+			<version>5.1-SNAPSHOT</version>
 			-->
 			<scope>compile</scope>
 		</dependency>

modules/activiti-cycle/pom.xml

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

modules/activiti-cycle/src/test/java/org/activiti/cycle/impl/conf/RepositoryConnectorConfigurationManagerImplTest.java

@@ -135,7 +135,7 @@ public class RepositoryConnectorConfigurationManagerImplTest {
   // + "<org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>"
   // + "<name>Eclipse Workspace (File System)</name>"
   // +
-  // "<baseFilePath>C:/Dokumente+und+Einstellungen/polenz/workspace/activiti/distro/target/activiti-5.0-SNAPSHOT/apps/eclipse-workspace</baseFilePath>"
+  // "<baseFilePath>C:/Dokumente+und+Einstellungen/polenz/workspace/activiti/distro/target/activiti-5.1-SNAPSHOT/apps/eclipse-workspace</baseFilePath>"
   // +
   // "</org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>"
   // + "<org.activiti.cycle.impl.connector.signavio.OryxConnectorConfiguration>"
@@ -171,7 +171,7 @@ public class RepositoryConnectorConfigurationManagerImplTest {
   // + "<org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>"
   // + "<name>Eclipse Workspace (File System)</name>"
   // +
-  // "<baseFilePath>C:/Dokumente+und+Einstellungen/polenz/workspace/activiti/distro/target/activiti-5.0-SNAPSHOT/apps/eclipse-workspace</baseFilePath>"
+  // "<baseFilePath>C:/Dokumente+und+Einstellungen/polenz/workspace/activiti/distro/target/activiti-5.1-SNAPSHOT/apps/eclipse-workspace</baseFilePath>"
   // +
   // "</org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>"
   // + "<org.activiti.cycle.impl.connector.signavio.OryxConnectorConfiguration>"

modules/activiti-engine/pom.xml

@@ -11,7 +11,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-		<version>5.0-SNAPSHOT</version>
+		<version>5.1-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 {
 
   /** the version of the activiti library */
-  public static String VERSION = "5.0-SNAPSHOT";
+  public static String VERSION = "5.1-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.h2.create.sql

@@ -6,7 +6,7 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.0-SNAPSHOT', 1);
+values ('schema.version', '5.1-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.sql

@@ -6,7 +6,7 @@ create table ACT_GE_PROPERTY (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.0-SNAPSHOT', 1);
+values ('schema.version', '5.1-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.sql

@@ -6,7 +6,7 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.0-SNAPSHOT', 1);
+values ('schema.version', '5.1-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.sql

@@ -6,7 +6,7 @@ create table ACT_GE_PROPERTY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '5.0-SNAPSHOT', 1);
+values ('schema.version', '5.1-SNAPSHOT', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);

modules/activiti-mule/pom.xml

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

modules/activiti-osgi-rest/pom.xml

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

modules/activiti-osgi/pom.xml

@@ -12,7 +12,7 @@
 		<groupId>org.activiti</groupId>
 		<artifactId>activiti-root</artifactId>
 		<relativePath>../..</relativePath>
-        <version>5.0-SNAPSHOT</version>
+        <version>5.1-SNAPSHOT</version>
 	</parent>
 
 	<build>

modules/activiti-spring/pom.xml

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

modules/activiti-webapp-cycle/pom.xml

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

modules/activiti-webapp-explorer/pom.xml

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

modules/activiti-webapp-init/pom.xml

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

modules/activiti-webapp-probe/pom.xml

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

modules/activiti-webapp-rest/pom.xml

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

modules/activiti-webapp/pom.xml

@@ -9,7 +9,7 @@
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
     <relativePath>../..</relativePath>
-    <version>5.0-SNAPSHOT</version>
+    <version>5.1-SNAPSHOT</version>
   </parent>  
 
   <build>

pom.xml

@@ -8,7 +8,7 @@
   <artifactId>activiti-root</artifactId>
 
   <packaging>pom</packaging>
-  <version>5.0-SNAPSHOT</version>
+  <version>5.1-SNAPSHOT</version>
   <properties>
     <spring.framework.version>3.0.3.RELEASE</spring.framework.version>
     <spring.surf.version>1.0.0-RC2</spring.surf.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.0-SNAPSHOT" />
+  <property name="activiti.version" value="5.1-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" />

userguide/src/en/chapters/ch14-REST.xml

@@ -265,7 +265,7 @@ success={success}&amp;failure={success}&amp;deployment={file}</programlisting>
   "name": "default",
   "resourceUrl": "jar:file:\//&lt;path-to-deployment&gt;\/activiti-cfg.jar!\/activiti.properties",
   "exception": null,
-  "version": "5.0-SNAPSHOT"
+  "version": "5.1-SNAPSHOT"
 }</programlisting>
             </para>
           </listitem>
@@ -1087,7 +1087,7 @@ success={success}&amp;failure={success}&amp;deployment={file}</programlisting>
     {
       "NAME_": "schema.version",
       "REV_": "1",
-      "VALUE_": "5.0-SNAPSHOT"
+      "VALUE_": "5.1-SNAPSHOT"
     },
     {
       "NAME_": "next.dbid",