[jbpm-commits] JBoss JBPM SVN: r3203 - in jbpm4/trunk: modules/db and 10 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Dec 4 10:06:22 EST 2008
Author: tom.baeyens at jboss.com
Date: 2008-12-04 10:06:22 -0500 (Thu, 04 Dec 2008)
New Revision: 3203
Added:
jbpm4/trunk/modules/db/src/main/resources/db.properties/
jbpm4/trunk/modules/db/src/main/resources/db.properties/db2.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/derby.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/firebird.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/frontbase.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/informix.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/ingres.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/interbase.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/mckoi.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/mssql.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/pointbase.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/progress.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/sapdb.properties
jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties
jbpm4/trunk/modules/db/src/main/resources/hibernate.cfg.xml
jbpm4/trunk/modules/userguide/src/main/docbook/en/images/show.view.data.source.explorer.png
Removed:
jbpm4/trunk/modules/db/src/main/resources/mysql.properties
jbpm4/trunk/modules/db/src/main/resources/sybase.properties
Modified:
jbpm4/trunk/modules/db/
jbpm4/trunk/modules/db/src/main/ant/build.schema.xml
jbpm4/trunk/modules/distro/assembly-distro-package.xml
jbpm4/trunk/modules/distro/pom.xml
jbpm4/trunk/modules/pvm/pom.xml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
jbpm4/trunk/modules/userguide/.settings/attachedFile.properties
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml
jbpm4/trunk/pom.xml
Log:
updating db scripts
Property changes on: jbpm4/trunk/modules/db
___________________________________________________________________
Name: svn:ignore
+ .settings
target
Modified: jbpm4/trunk/modules/db/src/main/ant/build.schema.xml
===================================================================
--- jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2008-12-04 15:04:22 UTC (rev 3202)
+++ jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2008-12-04 15:06:22 UTC (rev 3203)
@@ -14,47 +14,54 @@
<!-- jBPM Database schema -->
<!-- ================================================================== -->
- <target name="setup-schema">
-
- <!-- echo message="${maven.runtime.classpath}"/ -->
+ <target name="create-schema">
+ <echo message="${maven.runtime.classpath}"/>
- <taskdef name="jbpmschema" classname="org.jbpm.ant.JbpmSchemaTask">
+ <taskdef name="schemaexport"
+ classname="org.hibernate.tool.hbm2ddl.SchemaExportTask">
<classpath path="${maven.runtime.classpath}"/>
</taskdef>
+
+ <property name="cfg" value="src/main/resources/hibernate.cfg.xml" />
- <property name="scriptsdir" value="${basedir}/target/classes"/>
- <mkdir dir="${scriptsdir}"/>
+ <mkdir dir="target/create"/>
+ <mkdir dir="target/drop"/>
- </target>
+ <schemaexport properties="src/main/resources/db.properties/hsqldb.properties"
+ output="target/create/jbpm.hsqldb.create.sql"
+ create="yes" drop="no" config="${cfg}" text="yes" />
+ <schemaexport properties="src/main/resources/db.properties/hsqldb.properties"
+ output="target/drop/jbpm.hsqldb.drop.sql"
+ create="no" drop="yes" config="${cfg}" text="yes" />
- <target name="create-schema" depends="setup-schema" description="Generate jBPM Database Schemas">
+ <schemaexport properties="src/main/resources/db.properties/mysql.properties"
+ output="target/create/jbpm.mysql.create.sql"
+ create="yes" drop="no" config="${cfg}" text="yes" />
+ <schemaexport properties="src/main/resources/db.properties/mysql.properties"
+ output="target/drop/jbpm.mysql.drop.sql"
+ create="no" drop="yes" config="${cfg}" text="yes" />
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.db2.sql" config="hibernate.cfg.db2.xml" action="create"/>
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.derby.sql" config="hibernate.cfg.derby.xml" action="create"/>
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.firebird.sql" config="hibernate.cfg.firebird.xml" action="create"/>
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.hsqldb.sql" config="hibernate.cfg.hsqldb.xml" action="create"/>
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.ingres.sql" config="hibernate.cfg.ingres.xml" action="create"/>
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.interbase.sql" config="hibernate.cfg.interbase.xml" action="create"/>
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.mckoi.sql" config="hibernate.cfg.mckoi.xml" action="create"/>
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.mssql.sql" config="hibernate.cfg.mssql.xml" action="create"/>
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.mysql.sql" config="hibernate.cfg.mysql.xml" action="create" delimiter=";"/>
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.oracle.sql" config="hibernate.cfg.oracle.xml" action="create" delimiter=";"/>
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.sql" config="hibernate.cfg.postgresql.xml" action="create"/>
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.sapdb.sql" config="hibernate.cfg.sapdb.xml" action="create"/>
- <jbpmschema output="${scriptsdir}/jbpm.jpdl.sybase.sql" config="hibernate.cfg.sybase.xml" action="create"/>
-
- <!--[JBPM-1813] Fix create schema generation -->
- <!--jbpmschema output="${scriptsdir}/jbpm.jpdl.informix.sql" config="hibernate.cfg.informix.xml" action="create"/-->
- <!--jbpmschema output="${scriptsdir}/jbpm.jpdl.pointbase.sql" config="hibernate.cfg.pointbase.xml" action="create"/-->
- <!--jbpmschema output="${scriptsdir}/jbpm.jpdl.progress.sql" config="hibernate.cfg.progress.xml" action="create"/-->
-
+ <schemaexport properties="src/main/resources/db.properties/oracle.properties"
+ output="target/create/jbpm.oracle.create.sql"
+ create="yes" drop="no" config="${cfg}" text="yes" />
+ <schemaexport properties="src/main/resources/db.properties/oracle.properties"
+ output="target/drop/jbpm.oracle.drop.sql"
+ create="no" drop="yes" config="${cfg}" text="yes" />
+
+ <schemaexport properties="src/main/resources/db.properties/postgresql.properties"
+ output="target/create/jbpm.postgresql.create.sql"
+ create="yes" drop="no" config="${cfg}" text="yes" />
+ <schemaexport properties="src/main/resources/db.properties/postgresql.properties"
+ output="target/drop/jbpm.postgresql.drop.sql"
+ create="no" drop="yes" config="${cfg}" text="yes" />
+
+ <schemaexport properties="src/main/resources/db.properties/sybase.properties"
+ output="target/create/jbpm.sybase.create.sql"
+ create="yes" drop="no" config="${cfg}" text="yes" />
+ <schemaexport properties="src/main/resources/db.properties/sybase.properties"
+ output="target/drop/jbpm.sybase.drop.sql"
+ create="no" drop="yes" config="${cfg}" text="yes" />
+
</target>
- <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.sybase.update322.sql" config="hibernate.cfg.sybase.xml" properties="sybase.properties" action="update" delimiter=";"/>
-
- </target>
-
</project>
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/db2.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/db2.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/db2.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,6 @@
+hibernate.dialect=org.hibernate.dialect.DB2Dialect
+# fetch driver from http://www-128.ibm.com/developerworks/db2/downloads/jcc/
+hibernate.connection.driver_class=com.ibm.db2.jcc.DB2Driver
+hibernate.connection.url=jdbc:db2://localhost:50000/jbpm
+hibernate.connection.username=username
+hibernate.connection.password=password
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/derby.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/derby.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/derby.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,6 @@
+hibernate.dialect=org.hibernate.dialect.DerbyDialect
+# fetch driver from http://db.apache.org/derby
+hibernate.connection.driver_class=org.apache.derby.jdbc.EmbeddedDriver
+hibernate.connection.url=jdbc:derby:build/derby/jbpmtest;create=true
+hibernate.connection.username=username
+hibernate.connection.password=password
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/firebird.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/firebird.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/firebird.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,6 @@
+hibernate.dialect=org.hibernate.dialect.FirebirdDialect
+# fetch driver from http://firebird.sourceforge.net/
+hibernate.connection.driver_class=org.firebirdsql.jdbc.FBDriver
+hibernate.connection.url=jdbc:firebirdsql:localhost:jbpmtest
+hibernate.connection.username=username
+hibernate.connection.password=password
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/frontbase.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/frontbase.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/frontbase.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,6 @@
+hibernate.dialect=org.hibernate.dialect.FrontbaseDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url=
+hibernate.connection.username=username
+hibernate.connection.password=password
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/hsqldb.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,5 @@
+hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.connection.driver_class=org.hsqldb.jdbcDriver
+hibernate.connection.url=jdbc:hsqldb:hsql://${jdbc.hsqldb.server}/${jdbc.hsqldb.dbname}
+hibernate.connection.username=${jdbc.hsqldb.username}
+hibernate.connection.password=${jdbc.hsqldb.password}
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/informix.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/informix.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/informix.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,6 @@
+hibernate.dialect= org.hibernate.dialect.InformixDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url=
+hibernate.connection.username=username
+hibernate.connection.password=password
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/ingres.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/ingres.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/ingres.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,6 @@
+hibernate.dialect=org.hibernate.dialect.IngresDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url=
+hibernate.connection.username=username
+hibernate.connection.password=password
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/interbase.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/interbase.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/interbase.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,6 @@
+hibernate.dialect=org.hibernate.dialect.InterbaseDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url=
+hibernate.connection.username=username
+hibernate.connection.password=password
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/mckoi.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/mckoi.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/mckoi.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,6 @@
+hibernate.dialect= org.hibernate.dialect.MckoiDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url=
+hibernate.connection.username=username
+hibernate.connection.password=password
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/mssql.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/mssql.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/mssql.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,7 @@
+hibernate.dialect=org.hibernate.dialect.SQLServerDialect
+# fetch driver from http://msdn.microsoft.com/data/jdbc
+hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver
+hibernate.connection.url=jdbc:jtds:sqlserver://localhost:1433/jbpmtest
+hibernate.connection.username=username
+hibernate.connection.password=password
+hibernate.query.substitutions=true 1, false 0
\ No newline at end of file
Copied: jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties (from rev 3189, jbpm4/trunk/modules/db/src/main/resources/mysql.properties)
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,5 @@
+hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
+hibernate.connection.driver_class=com.mysql.jdbc.Driver
+hibernate.connection.url=jdbc:mysql://${jdbc.mysql.server}/${jdbc.mysql.dbname}
+hibernate.connection.username=${jdbc.mysql.username}
+hibernate.connection.password=${jdbc.mysql.password}
Property changes on: jbpm4/trunk/modules/db/src/main/resources/db.properties/mysql.properties
___________________________________________________________________
Name: svn:mergeinfo
+
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,10 @@
+hibernate.dialect=org.hibernate.dialect.Oracle9Dialect
+# fetch driver from http://www.oracle.com
+hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver
+hibernate.connection.url=jdbc:oracle:thin:@${jdbc.oracle.server}:1521:${jdbc.oracle.dbname}
+hibernate.connection.username=${jdbc.oracle.username}
+hibernate.connection.password=${jdbc.oracle.password}
+hibernate.query.substitutions=true 1, false 0
+
+# for Oracle 8 compatibility use
+#hibernate.dialect=org.hibernate.dialect.OracleDialect
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/pointbase.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/pointbase.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/pointbase.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,6 @@
+hibernate.dialect=org.hibernate.dialect.PointbaseDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url=
+hibernate.connection.username=username
+hibernate.connection.password=password
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/postgresql.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,6 @@
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+# fetch driver from http://jdbc.postgresql.org/
+hibernate.connection.driver_class=org.postgresql.Driver
+hibernate.connection.url=jdbc:postgresql://${jdbc.postgreql.server}/${jdbc.postgreql.dbname}
+hibernate.connection.username=${jdbc.postgreql.username}
+hibernate.connection.password=${jdbc.postgreql.password}
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/progress.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/progress.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/progress.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,6 @@
+hibernate.dialect=org.hibernate.dialect.ProgressDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url=
+hibernate.connection.username=username
+hibernate.connection.password=password
Added: jbpm4/trunk/modules/db/src/main/resources/db.properties/sapdb.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/sapdb.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/sapdb.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,6 @@
+hibernate.dialect=org.hibernate.dialect.SAPDBDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url=
+hibernate.connection.username=username
+hibernate.connection.password=password
Copied: jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties (from rev 3189, jbpm4/trunk/modules/db/src/main/resources/sybase.properties)
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,5 @@
+hibernate.dialect=org.hibernate.dialect.SybaseDialect
+hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver
+hibernate.connection.url=jdbc:jtds:sybase://${jdbc.sybase.server}/${jdbc.sybase.dbname}
+hibernate.connection.username=${jdbc.sybase.username}
+hibernate.connection.password=${jdbc.sybase.password}
Property changes on: jbpm4/trunk/modules/db/src/main/resources/db.properties/sybase.properties
___________________________________________________________________
Name: svn:mergeinfo
+
Added: jbpm4/trunk/modules/db/src/main/resources/hibernate.cfg.xml
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/hibernate.cfg.xml (rev 0)
+++ jbpm4/trunk/modules/db/src/main/resources/hibernate.cfg.xml 2008-12-04 15:06:22 UTC (rev 3203)
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!DOCTYPE hibernate-configuration PUBLIC
+ "-//Hibernate/Hibernate Configuration DTD 2.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-2.0.dtd">
+
+<hibernate-configuration>
+
+ <session-factory>
+ <mapping resource="jbpm.pvm.typedefs.hbm.xml" />
+ <mapping resource="jbpm.pvm.wire.hbm.xml" />
+ <mapping resource="jbpm.pvm.definition.hbm.xml" />
+ <mapping resource="jbpm.pvm.execution.hbm.xml" />
+ <mapping resource="jbpm.pvm.variable.hbm.xml" />
+ <mapping resource="jbpm.pvm.job.hbm.xml" />
+ <mapping resource="jbpm.jpdl.hbm.xml" />
+ </session-factory>
+
+</hibernate-configuration>
Property changes on: jbpm4/trunk/modules/db/src/main/resources/hibernate.cfg.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbpm4/trunk/modules/db/src/main/resources/mysql.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/mysql.properties 2008-12-04 15:04:22 UTC (rev 3202)
+++ jbpm4/trunk/modules/db/src/main/resources/mysql.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -1,8 +0,0 @@
-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://${jdbc.mysql.server}:${jdbc.mysql.port}/jbpm322
-hibernate.connection.username=${jdbc.mysql.username}
-hibernate.connection.password=${jdbc.mysql.password}
Deleted: jbpm4/trunk/modules/db/src/main/resources/sybase.properties
===================================================================
--- jbpm4/trunk/modules/db/src/main/resources/sybase.properties 2008-12-04 15:04:22 UTC (rev 3202)
+++ jbpm4/trunk/modules/db/src/main/resources/sybase.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -1,8 +0,0 @@
-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://${jdbc.sybase.server}:${jdbc.sybase.port}/jbpm322
-hibernate.connection.username=${jdbc.sybase.username}
-hibernate.connection.password=${jdbc.sybase.password}
Modified: jbpm4/trunk/modules/distro/assembly-distro-package.xml
===================================================================
--- jbpm4/trunk/modules/distro/assembly-distro-package.xml 2008-12-04 15:04:22 UTC (rev 3202)
+++ jbpm4/trunk/modules/distro/assembly-distro-package.xml 2008-12-04 15:06:22 UTC (rev 3203)
@@ -45,6 +45,14 @@
<outputDirectory>doc/schemadoc</outputDirectory>
</fileSet>
<fileSet>
+ <directory>../db/target/create</directory>
+ <outputDirectory>db/create</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../db/target/drop</directory>
+ <outputDirectory>db/drop</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>../devguide/target/docbook/publish/en</directory>
<outputDirectory>doc/devguide</outputDirectory>
<excludes>
Modified: jbpm4/trunk/modules/distro/pom.xml
===================================================================
--- jbpm4/trunk/modules/distro/pom.xml 2008-12-04 15:04:22 UTC (rev 3202)
+++ jbpm4/trunk/modules/distro/pom.xml 2008-12-04 15:06:22 UTC (rev 3203)
@@ -63,6 +63,11 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-db</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-test-db</artifactId>
<version>${version}</version>
</dependency>
Modified: jbpm4/trunk/modules/pvm/pom.xml
===================================================================
--- jbpm4/trunk/modules/pvm/pom.xml 2008-12-04 15:04:22 UTC (rev 3202)
+++ jbpm4/trunk/modules/pvm/pom.xml 2008-12-04 15:06:22 UTC (rev 3203)
@@ -182,6 +182,8 @@
<exclude>**/JobExecutorTest.java</exclude>
<exclude>**/ContinuationTest.java</exclude>
<exclude>**/LanguageExtensionsDbTest.java</exclude>
+ <exclude>**/ObjectWireTest.java</exclude>
+ <exclude>**/ClassWireTest.java</exclude>
</excludes>
</configuration>
</plugin>
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java 2008-12-04 15:04:22 UTC (rev 3202)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ConverterType.java 2008-12-04 15:06:22 UTC (rev 3203)
@@ -82,8 +82,7 @@
for(Object key : properties.keySet()) {
String converterClassName = (String) key;
try {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- Class<?> converterClass = ReflectUtil.loadClass(classLoader, converterClassName);
+ Class<?> converterClass = ReflectUtil.loadClass(null, converterClassName);
String converterName = properties.getProperty(converterClassName);
converterNames.put(converterClass, converterName);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2008-12-04 15:04:22 UTC (rev 3202)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2008-12-04 15:06:22 UTC (rev 3203)
@@ -17,7 +17,7 @@
public abstract class ReflectUtil {
private static Log log = Log.getLog(ReflectUtil.class.getName());
-
+
static ClassLoader resolveClassLoader(ClassLoader classLoader) {
// 1) if the user provided a classloader through the API, use that one
if (classLoader!=null) {
@@ -41,15 +41,24 @@
}
public static Class<?> loadClass(ClassLoader classLoader, String className) {
+ if (classLoader!=null) {
+ try {
+ return classLoader.loadClass(className);
+ } catch (ClassNotFoundException e) {
+ log.trace("couldn't load class "+className+" with given classloader "+classLoader);
+ }
+ }
try {
- classLoader = resolveClassLoader(classLoader);
- log.trace("loading class "+className);
- return classLoader.loadClass(className);
- } catch (NoClassDefFoundError e) {
- throw new JbpmException("couldn't define class "+className, e);
+ return Thread.currentThread().getContextClassLoader().loadClass(className);
} catch (ClassNotFoundException e) {
- throw new JbpmException("couldn't load class "+className, e);
+ log.trace("couldn't load class "+className+" with context classloader "+classLoader);
}
+ try {
+ return ReflectUtil.class.getClassLoader().loadClass(className);
+ } catch (ClassNotFoundException e) {
+ log.trace("couldn't load class "+className+" with pvm lib classloader "+classLoader);
+ }
+ throw new JbpmException("couldn't find class "+className);
}
public static InputStream getResourceAsStream(ClassLoader classLoader, String resource) {
Modified: jbpm4/trunk/modules/userguide/.settings/attachedFile.properties
===================================================================
--- jbpm4/trunk/modules/userguide/.settings/attachedFile.properties 2008-12-04 15:04:22 UTC (rev 3202)
+++ jbpm4/trunk/modules/userguide/.settings/attachedFile.properties 2008-12-04 15:06:22 UTC (rev 3203)
@@ -1,2 +1,2 @@
## index of importer -> set(imports)
-#Thu Dec 04 08:28:47 CET 2008
+#Thu Dec 04 15:25:44 CET 2008
Added: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/show.view.data.source.explorer.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/show.view.data.source.explorer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2008-12-04 15:04:22 UTC (rev 3202)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2008-12-04 15:06:22 UTC (rev 3203)
@@ -32,7 +32,27 @@
<section id="database">
<title>Database</title>
- <para>TODO</para>
+ <para>jBPM works with your database of choice. That way, jBPM's data
+ tables can be placed next to your application tables in the same
+ database. In case you're working outside an application server
+ you can combine your application updates with jBPM's process updates in a
+ single transaction by using the same JDBC connection.
+ </para>
+ <section>
+ <title>For test</title>
+ <para></para>
+ </section>
+ <para>This section guides you through the steps that you should
+ do to get
+ </para>
+ <section>
+ <title>Install DB</title>
+ <para></para>
+ </section>
+ <section>
+ <title>Set up a connection</title>
+ <para></para>
+ </section>
</section>
<section id="eclipse">
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2008-12-04 15:04:22 UTC (rev 3202)
+++ jbpm4/trunk/pom.xml 2008-12-04 15:06:22 UTC (rev 3203)
@@ -275,6 +275,7 @@
<profile>
<id>distro</id>
<modules>
+ <module>modules/db</module>
<module>modules/devguide</module>
<module>modules/userguide</module>
<module>modules/distro</module>
More information about the jbpm-commits
mailing list