[jbpm-commits] JBoss JBPM SVN: r3013 - in jbpm3/trunk: modules/core and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-11-20 09:24:56 -0500 (Thu, 20 Nov 2008) New Revision: 3013 Modified: jbpm3/trunk/modules/core/pom.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.hsqldb.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml jbpm3/trunk/modules/db/pom.xml jbpm3/trunk/modules/db/src/main/resources/mysql.properties jbpm3/trunk/modules/db/src/main/resources/sybase.properties jbpm3/trunk/modules/integration/.classpath jbpm3/trunk/profiles.xml.example Log: Parameterize SchemaUpdate properties Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2008-11-20 14:06:49 UTC (rev 3012) +++ jbpm3/trunk/modules/core/pom.xml 2008-11-20 14:24:56 UTC (rev 3013) @@ -251,9 +251,9 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <!-- [JBPM-983] concurrent process execution fails --> + <!-- Won't Fix [JBPM-983] concurrent process execution fails --> <exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude> - <!-- [JBPM-1072] Concurrent JobExecutors can process the same job in parallel --> + <!-- Won't Fix [JBPM-1072] Concurrent JobExecutors can process the same job in parallel --> <exclude>org/jbpm/jbpm1072/JBPM1072Test.java</exclude> <!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema --> <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude> Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml 2008-11-20 14:06:49 UTC (rev 3012) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml 2008-11-20 14:24:56 UTC (rev 3013) @@ -17,6 +17,10 @@ <!-- # common settings # --> <!-- ################################### --> + <!-- Automatic schema creation (begin) --> + <property name="hibernate.hbm2ddl.auto">create</property> + <!-- Automatic schema creation (end) --> + <!-- Simple memory-only cache --> <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.hsqldb.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.hsqldb.xml 2008-11-20 14:06:49 UTC (rev 3012) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.hsqldb.xml 2008-11-20 14:24:56 UTC (rev 3013) @@ -9,6 +9,3 @@ <property name="hibernate.connection.password"></property> <!-- JDBC connection properties (end) --> - <!-- Automatic schema creation (begin) --> - <property name="hibernate.hbm2ddl.auto">create</property> - <!-- Automatic schema creation (end) --> Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml 2008-11-20 14:06:49 UTC (rev 3012) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml 2008-11-20 14:24:56 UTC (rev 3013) @@ -9,8 +9,3 @@ <property name="hibernate.connection.password">${jdbc.mysql.password}</property> <property name="hibernate.query.substitutions">true 1, false 0</property> <!-- JDBC connection properties (end) --> - - <!-- Automatic schema creation (begin) --> - <property name="hibernate.hbm2ddl.auto">create</property> - <!-- Automatic schema creation (end) --> - Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-11-20 14:06:49 UTC (rev 3012) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-11-20 14:24:56 UTC (rev 3013) @@ -13,12 +13,8 @@ <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property> <!-- JDBC connection properties (begin) --> - <property name="hibernate.connection.driver_class">${jdbc.sybase.driver}</property> + <property name="hibernate.connection.driver_class">net.sourceforge.jtds.jdbc.Driver</property> <property name="hibernate.connection.url">${jdbc.sybase.url}</property> <property name="hibernate.connection.username">${jdbc.sybase.username}</property> <property name="hibernate.connection.password">${jdbc.sybase.password}</property> <!-- JDBC connection properties (end) --> - - <!-- Automatic schema creation (begin) --> - <property name="hibernate.hbm2ddl.auto">create</property> - <!-- Automatic schema creation (end) --> Modified: jbpm3/trunk/modules/db/pom.xml =================================================================== --- jbpm3/trunk/modules/db/pom.xml 2008-11-20 14:06:49 UTC (rev 3012) +++ jbpm3/trunk/modules/db/pom.xml 2008-11-20 14:24:56 UTC (rev 3013) @@ -73,6 +73,12 @@ <!-- Plugins --> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> Modified: jbpm3/trunk/modules/db/src/main/resources/mysql.properties =================================================================== --- jbpm3/trunk/modules/db/src/main/resources/mysql.properties 2008-11-20 14:06:49 UTC (rev 3012) +++ jbpm3/trunk/modules/db/src/main/resources/mysql.properties 2008-11-20 14:24:56 UTC (rev 3013) @@ -1,6 +1,8 @@ hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect +# +# This uses the jbpm322 database schema as reference for the SchemaUpdate task +# hibernate.connection.driver_class=com.mysql.jdbc.Driver -hibernate.connection.url=jdbc:mysql://localhost:3306/jbpm322 -hibernate.connection.username=jbpmtest -hibernate.connection.password= -hibernate.query.substitutions=true 1, false 0 \ No newline at end of file +hibernate.connection.url=jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/jbpm322 +hibernate.connection.username=${jdbc.mysql.username} +hibernate.connection.password=${jdbc.mysql.password} Modified: jbpm3/trunk/modules/db/src/main/resources/sybase.properties =================================================================== --- jbpm3/trunk/modules/db/src/main/resources/sybase.properties 2008-11-20 14:06:49 UTC (rev 3012) +++ jbpm3/trunk/modules/db/src/main/resources/sybase.properties 2008-11-20 14:24:56 UTC (rev 3013) @@ -1,5 +1,8 @@ hibernate.dialect=org.hibernate.dialect.SybaseDialect +# +# This uses the jbpm322 database schema as reference for the SchemaUpdate task +# hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver -hibernate.connection.url=jdbc:jtds:sybase://localhost:5000/jbpm322 -hibernate.connection.username=jbpmtest -hibernate.connection.password=jbpmtest +hibernate.connection.url=jdbc:jtds:sybase://${jdbc.sybase.server}:${jdbc.sybase.port}/jbpm322 +hibernate.connection.username=${jdbc.sybase.username} +hibernate.connection.password=${jdbc.sybase.password} Modified: jbpm3/trunk/modules/integration/.classpath =================================================================== --- jbpm3/trunk/modules/integration/.classpath 2008-11-20 14:06:49 UTC (rev 3012) +++ jbpm3/trunk/modules/integration/.classpath 2008-11-20 14:24:56 UTC (rev 3013) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> Modified: jbpm3/trunk/profiles.xml.example =================================================================== --- jbpm3/trunk/profiles.xml.example 2008-11-20 14:06:49 UTC (rev 3012) +++ jbpm3/trunk/profiles.xml.example 2008-11-20 14:24:56 UTC (rev 3013) @@ -17,6 +17,9 @@ <!-- <jdbc.mysql.url>jdbc:mysql://localhost:3306/jbpmtest</jdbc.mysql.url> + <jdbc.mysql.server>localhost</jdbc.mysql.server> + <jdbc.mysql.port>3306</jdbc.mysql.port> + <jdbc.mysql.database>jbpmtest</jdbc.mysql.database> <jdbc.mysql.username>jbpmtest</jdbc.mysql.username> <jdbc.mysql.password></jdbc.mysql.password> @@ -27,7 +30,6 @@ <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> <jdbc.postgresql.password></jdbc.postgresql.password> - <jdbc.sybase.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.sybase.driver> <jdbc.sybase.url>jdbc:jtds:sybase://localhost:5000/jbpmtest</jdbc.sybase.url> <jdbc.sybase.server>localhost</jdbc.sybase.server> <jdbc.sybase.port>5000</jdbc.sybase.port>