ACT-266 Demo now runs on prostgres as wel

distro/src/setup/build.postgres.properties

+db=postgres
+jdbc.driver=org.postgresql.Driver
+jdbc.url=jdbc:postgresql://localhost:5432/activiti
+jdbc.username=activiti
+jdbc.password=activiti
\ No newline at end of file

distro/src/setup/build.properties

 # The db property should refer to the type of database that 
-# you want to use.  Currently only h2, MySQL(mysql) and 
-# Oracle 10g (oracle) is supported.
+# you want to use. Currently h2, MySQL(mysql), 
+# Postgres SQL(postgres) and Oracle 10g (oracle) is supported.
+#
 # When using oracle, follow the instructions described in the userguide, chapter
 # Configuration > Changing the database > Using Oracle in the demo setup
 db=h2

distro/src/setup/build.xml

@@ -112,7 +112,7 @@
   	<fileset id="jdbc.driver.libs" dir="${activiti.home}/examples/activiti-engine-examples/libs-test">
   	  <include name="h2-*.jar" if="db.use.h2"/>
   	  <include name="mysql-*.jar" if="db.use.mysql"/>
-  	  <include name="postgres-*.jar" if="db.use.postgres"/>
+  	  <include name="postgresql-*.jar" if="db.use.postgres"/>
   	  <include name="ojdbc5*.jar" if="db.use.oracle"/>
   	</fileset>
   </target>

distro/src/setup/files/demo/postgres.data.sql

+insert into ACT_ID_GROUP values ('admin',       1, 'System administrator', 'security-role');
+insert into ACT_ID_GROUP values ('user',        1, 'User', 'security-role');
+insert into ACT_ID_GROUP values ('manager',     1, 'Manager', 'security-role');
+insert into ACT_ID_GROUP values ('management',  1, 'Management',  'assignment');
+insert into ACT_ID_GROUP values ('accountancy', 1, 'Accountancy', 'assignment');
+insert into ACT_ID_GROUP values ('engineering', 1, 'Engineering', 'assignment');
+insert into ACT_ID_GROUP values ('sales',       1, 'Sales', 'assignment');
+
+insert into ACT_ID_USER values ('kermit', 1, 'Kermit', 'the Frog', 'kermit@localhost', 'kermit');
+insert into ACT_ID_MEMBERSHIP values ('kermit', 'admin');
+insert into ACT_ID_MEMBERSHIP values ('kermit', 'manager');
+insert into ACT_ID_MEMBERSHIP values ('kermit', 'management');
+insert into ACT_ID_MEMBERSHIP values ('kermit', 'accountancy');
+insert into ACT_ID_MEMBERSHIP values ('kermit', 'engineering');
+insert into ACT_ID_MEMBERSHIP values ('kermit', 'sales');
+
+insert into ACT_ID_USER values ('fozzie', 1, 'Fozzie', 'Bear', 'fozzie@localhost', 'fozzie');
+insert into ACT_ID_MEMBERSHIP values ('fozzie', 'user');
+insert into ACT_ID_MEMBERSHIP values ('fozzie', 'accountancy');
+
+insert into ACT_ID_USER values ('gonzo', 1, 'Gonzo', 'the Great', 'gonzo@localhost', 'gonzo');
+insert into ACT_ID_MEMBERSHIP values ('gonzo', 'manager');
+insert into ACT_ID_MEMBERSHIP values ('gonzo', 'management');
+insert into ACT_ID_MEMBERSHIP values ('gonzo', 'accountancy');
+insert into ACT_ID_MEMBERSHIP values ('gonzo', 'sales');
+
+update ACT_GE_PROPERTY
+set VALUE_ = '10'
+where NAME_ = 'next.dbid';
+
+insert into ACT_CY_CONFIG values ('kermit', '<org.activiti.cycle.impl.conf.ConfigurationContainer>
+  <name>kermit</name>
+  <linkedConnectors>
+    <org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration>
+      <id>Activiti</id>
+      <name>Activiti Modeler</name>
+      <credentialsSaved>false</credentialsSaved>
+      <signavioBaseUrl>@activiti.modeler.base.url@</signavioBaseUrl>
+      <loginRequired>false</loginRequired>
+    </org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration>
+    <org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>
+      <id>Workspace</id>
+      <name>Eclipse Workspace (File System)</name>
+      <baseFilePath>@cycle.base.file.path@</baseFilePath>
+    </org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>
+  </linkedConnectors>
+  <parentContainers/>
+</org.activiti.cycle.impl.conf.ConfigurationContainer>', 1);
+insert into ACT_CY_CONFIG values ('fozzie', '<org.activiti.cycle.impl.conf.ConfigurationContainer>
+  <name>fozzie</name>
+  <linkedConnectors>
+    <org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration>
+      <id>Activiti</id>
+      <name>Activiti Modeler</name>
+      <credentialsSaved>false</credentialsSaved>
+      <signavioBaseUrl>@activiti.modeler.base.url@</signavioBaseUrl>
+      <loginRequired>false</loginRequired>
+    </org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration>
+    <org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>
+      <id>Workspace</id>
+      <name>Eclipse Workspace (File System)</name>
+      <baseFilePath>@cycle.base.file.path@</baseFilePath>
+    </org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>
+  </linkedConnectors>
+  <parentContainers/>
+</org.activiti.cycle.impl.conf.ConfigurationContainer>', 1);
+insert into ACT_CY_CONFIG values ('gonzo', '<org.activiti.cycle.impl.conf.ConfigurationContainer>
+  <name>gonzo</name>
+  <linkedConnectors>
+    <org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration>
+      <id>Activiti</id>
+      <name>Activiti Modeler</name>
+      <credentialsSaved>false</credentialsSaved>
+      <signavioBaseUrl>http://localhost:8080/activiti-modeler/</signavioBaseUrl>
+      <loginRequired>false</loginRequired>
+    </org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration>
+    <org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>
+      <id>Workspace</id>
+      <name>Eclipse Workspace (File System)</name>
+      <baseFilePath>@cycle.base.file.path@</baseFilePath>
+    </org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>
+  </linkedConnectors>
+  <parentContainers/>
+</org.activiti.cycle.impl.conf.ConfigurationContainer>', 1);
\ No newline at end of file

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

@@ -6,7 +6,7 @@ create table ACT_CY_CONFIG (
 );
 
 create table ACT_CY_LINK (
-	ID_ varchar(255) AUTO_INCREMENT,
+	ID_ serial,
 	SOURCE_CONNECTOR_ID_ varchar(255),
 	SOURCE_ARTIFACT_ID_ varchar(255),
 	SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL,
@@ -23,13 +23,6 @@ create table ACT_CY_LINK (
 	primary key(ID_)
 );
 
-create table ACT_CY_TAG (
-	ID_ bigint,
-	NAME_ varchar(255),
-	ALIAS_ varchar(255),
-	primary key(ID_)
-);
-
 create table ACT_CY_TAG (
 	ID_ varchar(255),
 	NAME_ varchar(700),

modules/activiti-engine/pom.xml

@@ -178,6 +178,7 @@
 					<groupId>postgresql</groupId>
 					<artifactId>postgresql</artifactId>
 					<version>8.4-701.jdbc4</version>
+                    <scope>test</scope>
 				</dependency>
 			</dependencies>
 			<build>