[jbpm-commits] JBoss JBPM SVN: r3798 - in jbpm3/branches/jbpm-3.2.5.SP: hudson and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-02-07 17:27:43 -0500 (Sat, 07 Feb 2009) New Revision: 3798 Added: jbpm3/branches/jbpm-3.2.5.SP/modules/db/src/main/resources/postgresql.properties Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.redhat.qa jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/db/scripts/antrun-jbpmschema.xml jbpm3/branches/jbpm-3.2.5.SP/pom.xml Log: [JBPM-1369] Backport support for postgresql Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-02-07 21:21:03 UTC (rev 3797) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-02-07 22:27:43 UTC (rev 3798) @@ -42,6 +42,7 @@ <values> <string>hsqldb</string> <string>mysql</string> + <string>postgresql</string> <string>sybase</string> </values> </axis> Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa 2009-02-07 21:21:03 UTC (rev 3797) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa 2009-02-07 22:27:43 UTC (rev 3798) @@ -5,11 +5,13 @@ <!-- This profile can also be defined in ~/.m2/settings.xml --> <profile> <id>jboss-home-profile</id> + <activation> <property> <name>user.name</name> </property> </activation> + <properties> <jdbc.mysql.server>localhost</jdbc.mysql.server> <jdbc.mysql.port>3306</jdbc.mysql.port> @@ -27,14 +29,12 @@ <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> - <!-- PostgreSQL is currently not supported <jdbc.postgresql.server>localhost</jdbc.postgresql.server> <jdbc.postgresql.port>5432</jdbc.postgresql.port> <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database> <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> <jdbc.postgresql.password></jdbc.postgresql.password> - --> </properties> </profile> Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.redhat.qa =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.redhat.qa 2009-02-07 21:21:03 UTC (rev 3797) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.redhat.qa 2009-02-07 22:27:43 UTC (rev 3798) @@ -5,37 +5,37 @@ <!-- This profile can also be defined in ~/.m2/settings.xml --> <profile> <id>jboss-home-profile</id> + <activation> <property> <name>user.name</name> </property> </activation> + <properties> - + <jdbc.mysql.url>jdbc:mysql://dev02.qa.atl2.redhat.com/jbpm3</jdbc.my... <jdbc.mysql.server>dev02.qa.atl2.redhat.com</jdbc.mysql.server> <jdbc.mysql.port>3306</jdbc.mysql.port> <jdbc.mysql.database>jbpmtest</jdbc.mysql.database> <jdbc.mysql.username>jbpm3</jdbc.mysql.username> <jdbc.mysql.password>jbpm3</jdbc.mysql.password> - + <jdbc.sybase.url>jdbc:jtds:sybase://dev77.qa.atl2.redhat.com:4100/jbpm3</jdbc.sybase.url> <jdbc.sybase.server>dev77.qa.atl2.redhat.com</jdbc.sybase.server> <jdbc.sybase.port>4100</jdbc.sybase.port> <jdbc.sybase.database>jbpm3</jdbc.sybase.database> <jdbc.sybase.username>jbpm3</jdbc.sybase.username> <jdbc.sybase.password>jbpm3</jdbc.sybase.password> - - <!-- PostgreSQL is currently not supported + <jdbc.postgresql.url>jdbc:postgresql://localhost:5432/jbpmtest</jdbc.postgresql.url> <jdbc.postgresql.server>localhost</jdbc.postgresql.server> <jdbc.postgresql.port>5432</jdbc.postgresql.port> <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database> <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> <jdbc.postgresql.password></jdbc.postgresql.password> - --> </properties> </profile> - + </profiles> </profilesXml> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml 2009-02-07 21:21:03 UTC (rev 3797) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml 2009-02-07 22:27:43 UTC (rev 3798) @@ -65,6 +65,11 @@ <scope>runtime</scope> </dependency> <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>net.sourceforge.jtds</groupId> <artifactId>jtds</artifactId> <scope>runtime</scope> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/db/scripts/antrun-jbpmschema.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/db/scripts/antrun-jbpmschema.xml 2009-02-07 21:21:03 UTC (rev 3797) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/db/scripts/antrun-jbpmschema.xml 2009-02-07 22:27:43 UTC (rev 3798) @@ -53,6 +53,7 @@ <target name="update-schema" depends="setup-schema" description="Generate jBPM Database Update Scripts"> <jbpmschema output="${scriptsdir}/jbpm.jpdl.mysql.update322.sql" config="hibernate.cfg.mysql.xml" properties="mysql.properties" action="update" delimiter=";"/> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.update322.sql" config="hibernate.cfg.postgresql.xml" properties="postgresql.properties" action="update" delimiter=";"/> <jbpmschema output="${scriptsdir}/jbpm.jpdl.sybase.update322.sql" config="hibernate.cfg.sybase.xml" properties="sybase.properties" action="update" delimiter=";"/> </target> Copied: jbpm3/branches/jbpm-3.2.5.SP/modules/db/src/main/resources/postgresql.properties (from rev 3697, jbpm3/trunk/modules/db/src/main/resources/postgresql.properties) =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/db/src/main/resources/postgresql.properties (rev 0) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/db/src/main/resources/postgresql.properties 2009-02-07 22:27:43 UTC (rev 3798) @@ -0,0 +1,8 @@ +hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +# +# This uses the jbpm322 database schema as reference for the SchemaUpdate task +# +hibernate.connection.driver_class=org.postgresql.Driver +hibernate.connection.url=jdbc\:postgresql\://${jdbc.postgresql.server}\:${jdbc.postgresql.port}/jbpm322 +hibernate.connection.username=${jdbc.postgresql.username} +hibernate.connection.password=${jdbc.postgresql.password} Modified: jbpm3/branches/jbpm-3.2.5.SP/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-02-07 21:21:03 UTC (rev 3797) +++ jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-02-07 22:27:43 UTC (rev 3798) @@ -550,6 +550,34 @@ </dependencies> </profile> + <!-- + Name: oracle + Descr: Oracle Database Setup + --> + <profile> + <id>oracle</id> + <activation> + <property> + <name>database</name> + <value>oracle</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <version>10.0.2.0</version> + <scope>test</scope> + </dependency> + </dependencies> + <repositories> + <repository> + <id>qa.jboss.com</id> + <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url> + </repository> + </repositories> + </profile> + <!-- Name: postgresql Descr: MySQL Database Setup @@ -599,30 +627,5 @@ </repositories> </profile> - <!-- -Ddatabase=oracle --> - <profile> - <id>oracle</id> - <activation> - <property> - <name>database</name> - <value>oracle</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> - <version>10.0.2.0</version> - <scope>test</scope> - </dependency> - </dependencies> - <repositories> - <repository> - <id>qa.jboss.com</id> - <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url> - </repository> - </repositories> - </profile> - </profiles> </project>