Author: heiko.braun(a)jboss.com Date: 2009-11-24 10:15:55 -0500 (Tue, 24 Nov 2009) New Revision: 316 Modified: trunk/distribution/pom.xml trunk/distribution/src/main/assembly/bin.xml trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml trunk/distribution/src/main/release/db/jdbc/hsql.properties trunk/distribution/src/main/release/install/build.xml trunk/pom.xml trunk/runtime/engine-assembly/src/main/resources/bpel-ds.xml Log: Update to h2 version 1.2.124; Use TX_ISO serializable and multithreaded=true when running H2 Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2009-11-24 15:14:06 UTC (rev 315) +++ trunk/distribution/pom.xml 2009-11-24 15:15:55 UTC (rev 316) @@ -37,8 +37,7 @@ <mysql.connector.version>5.0.8</mysql.connector.version> <postgresql.version>8.3-603.jdbc3</postgresql.version> <jtds.version>1.2.2</jtds.version> - <derby.version>10.4.1.3</derby.version> - <h2.version>1.0.68</h2.version> + <derby.version>10.4.1.3</derby.version> </properties> <dependencies> @@ -121,8 +120,13 @@ <version>9.x</version> </dependency> - <!-- database driver --> <dependency> + <artifactId>h2</artifactId> + <groupId>com.h2database</groupId> + </dependency> + + <!-- database driver --> + <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>${mysql.connector.version}</version> @@ -149,8 +153,7 @@ </dependency> <dependency> <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2.version}</version> + <artifactId>h2</artifactId> </dependency> <!-- Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2009-11-24 15:14:06 UTC (rev 315) +++ trunk/distribution/src/main/assembly/bin.xml 2009-11-24 15:15:55 UTC (rev 316) @@ -184,7 +184,7 @@ <include>net.sf.saxon:saxon-xqj</include> <include>wsdl4j:wsdl4j</include> <include>xalan:xalan</include> - <include>xerces:xercesImpl</include> + <include>xerces:xercesImpl</include> </includes> </dependencySet> Modified: trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml =================================================================== --- trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml 2009-11-24 15:14:06 UTC (rev 315) +++ trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml 2009-11-24 15:15:55 UTC (rev 316) @@ -21,4 +21,4 @@ <attribute name="DataDir">${jboss.server.data.dir}</attribute> </mbean> -</datasources> \ No newline at end of file +</datasources> Modified: trunk/distribution/src/main/release/db/jdbc/hsql.properties =================================================================== --- trunk/distribution/src/main/release/db/jdbc/hsql.properties 2009-11-24 15:14:06 UTC (rev 315) +++ trunk/distribution/src/main/release/db/jdbc/hsql.properties 2009-11-24 15:15:55 UTC (rev 316) @@ -1,4 +1,4 @@ -connection.url=jdbc:h2:${jboss.server.data.dir}${/}h2${/}BPELDB +connection.url=jdbc:h2:${jboss.server.data.dir}${/}h2${/}BPELDB;MVCC=false;LOCK_MODE=1;MULTI_THREADED=TRUE driver=org.h2.Driver username=sa password= Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2009-11-24 15:14:06 UTC (rev 315) +++ trunk/distribution/src/main/release/install/build.xml 2009-11-24 15:15:55 UTC (rev 316) @@ -86,7 +86,7 @@ <!--install appropriate db driver--> <antcall target="internal.install.riftsaw.into.jboss.db.${database}" /> - + <!-- BPM Console --> <mkdir dir="${deploy.dir}/bpel-console"/> @@ -182,7 +182,9 @@ <!-- uninstall database specific driver --> <target name="internal.uninstall.riftsaw.into.jboss.db.hsql"> - <delete file="${server.lib.dir}/h2-1.0.68.jar" /> + <delete dir="${server.lib.dir}"> + <include>h2*.jar</include> + </delete> </target> <target name="internal.uninstall.riftsaw.into.jboss.db.derby"> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-24 15:14:06 UTC (rev 315) +++ trunk/pom.xml 2009-11-24 15:15:55 UTC (rev 316) @@ -73,9 +73,10 @@ <junit.version>3.8.1</junit.version> <jboss.version>5.0.0.GA</jboss.version> <log4j.version>1.2.14</log4j.version> - <rosetta.version>4.6</rosetta.version> + <rosetta.version>4.6</rosetta.version> <jbossesb.version>4.6</jbossesb.version> <wsdl4j.version>1.6.2</wsdl4j.version> + <h2.version>1.2.124</h2.version> </properties> <dependencyManagement> @@ -113,8 +114,13 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${commons.logging.version}</version> - </dependency> - + </dependency> + + <dependency> + <artifactId>h2</artifactId> + <groupId>com.h2database</groupId> + <version>${h2.version}</version> + </dependency> <!-- RiftSaw Ode artifacts --> <dependency> <groupId>org.jboss.soa.bpel</groupId> @@ -145,7 +151,7 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-agents</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-schedule-simpler</artifactId> @@ -180,37 +186,37 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-scheduler-simple</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-obj</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-ql</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-schemas</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-dao-hibernate</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-jacob</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-tools</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>junit</groupId> Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-ds.xml =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-ds.xml 2009-11-24 15:14:06 UTC (rev 315) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-ds.xml 2009-11-24 15:15:55 UTC (rev 316) @@ -4,7 +4,7 @@ <datasources> <local-tx-datasource> <jndi-name>BPELDB</jndi-name> - <connection-url>jdbc:h2:${jboss.server.data.dir}${/}h2${/}BPELDB</connection-url> + <connection-url>jdbc:h2:${jboss.server.data.dir}${/}h2${/}BPELDB;MVCC=false;LOCK_MODE=1;MULTI_THREADED=TRUE</connection-url> <driver-class>org.h2.Driver</driver-class> <user-name>sa</user-name> <password/>