[jbpm-commits] JBoss JBPM SVN: r6221 - in jbpm3/branches/jbpm-3.2-soa: modules/core/src/main/resources and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sun Mar 14 04:00:20 EDT 2010
Author: alex.guizar at jboss.com
Date: 2010-03-14 04:00:18 -0400 (Sun, 14 Mar 2010)
New Revision: 6221
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.common.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.db2.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.hsqldb.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mssql.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mysql.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.oracle.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.postgresql.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.sybase.xml
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-hsqldb-ds.xml
jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/db/scripts/antrun-jbpmschema.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml
jbpm3/branches/jbpm-3.2-soa/pom.xml
Log:
JBPM-2143: abandon ant for schema update script generation in favor of sql maven plugin
register third-party maven plugins in plugin management section
apply jdbc.database properties consistently
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.common.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.common.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -19,10 +19,10 @@
<!-- Simple memory-only cache -->
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
- <!-- SQL rendering properties (begin) ===
+ <!-- SQL rendering properties (begin) -->
<property name="hibernate.format_sql">true</property>
<property name="hibernate.use_sql_comments">true</property>
- ==== SQL rendering properties (end) -->
+ <!-- SQL rendering properties (end) -->
<!-- ############################################ -->
<!-- # mapping files with external dependencies # -->
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.db2.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.db2.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.db2.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -3,7 +3,7 @@
<property name="hibernate.dialect">org.hibernate.dialect.DB2Dialect</property>
<!-- JDBC connection properties (begin) -->
- <property name="hibernate.connection.driver_class">com.ibm.db2.jcc.DB2Driver</property>
+ <property name="hibernate.connection.driver_class">${jdbc.db2.driver}</property>
<property name="hibernate.connection.url">${jdbc.db2.url}</property>
<property name="hibernate.connection.username">${jdbc.db2.username}</property>
<property name="hibernate.connection.password">${jdbc.db2.password}</property>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.hsqldb.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.hsqldb.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.hsqldb.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -3,10 +3,10 @@
<property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
<!-- JDBC connection properties (begin) -->
- <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
- <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbpm</property>
- <property name="hibernate.connection.username">sa</property>
- <property name="hibernate.connection.password"></property>
+ <property name="hibernate.connection.driver_class">${jdbc.hsqldb.driver}</property>
+ <property name="hibernate.connection.url">${jdbc.hsqldb.url}</property>
+ <property name="hibernate.connection.username">${jdbc.hsqldb.username}</property>
+ <property name="hibernate.connection.password">${jdbc.hsqldb.password}</property>
<!-- JDBC connection properties (end) -->
<!-- Automatic schema creation (begin) -->
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mssql.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mssql.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mssql.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -3,7 +3,7 @@
<property name="hibernate.dialect">org.hibernate.dialect.SQLServerDialect</property>
<!-- JDBC connection properties (begin) -->
- <property name="hibernate.connection.driver_class">com.microsoft.sqlserver.jdbc.SQLServerDriver</property>
+ <property name="hibernate.connection.driver_class">${jdbc.mssql.driver}</property>
<property name="hibernate.connection.url">${jdbc.mssql.url}</property>
<property name="hibernate.connection.username">${jdbc.mssql.username}</property>
<property name="hibernate.connection.password">${jdbc.mssql.password}</property>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mysql.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mysql.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mysql.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -3,7 +3,7 @@
<property name="hibernate.dialect">org.jbpm.db.hibernate.MySQLDialect</property>
<!-- JDBC connection properties (begin) -->
- <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
+ <property name="hibernate.connection.driver_class">${jdbc.mysql.driver}</property>
<property name="hibernate.connection.url">${jdbc.mysql.url}</property>
<property name="hibernate.connection.username">${jdbc.mysql.username}</property>
<property name="hibernate.connection.password">${jdbc.mysql.password}</property>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.oracle.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.oracle.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.oracle.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -3,7 +3,7 @@
<property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property>
<!-- JDBC connection properties (begin) -->
- <property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property>
+ <property name="hibernate.connection.driver_class">${jdbc.oracle.driver}</property>
<property name="hibernate.connection.url">${jdbc.oracle.url}</property>
<property name="hibernate.connection.username">${jdbc.oracle.username}</property>
<property name="hibernate.connection.password">${jdbc.oracle.password}</property>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.postgresql.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.postgresql.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.postgresql.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -3,7 +3,7 @@
<property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
<!-- JDBC connection properties (begin) -->
- <property name="hibernate.connection.driver_class">org.postgresql.Driver</property>
+ <property name="hibernate.connection.driver_class">${jdbc.postgresql.driver}</property>
<property name="hibernate.connection.url">${jdbc.postgresql.url}</property>
<property name="hibernate.connection.username">${jdbc.postgresql.username}</property>
<property name="hibernate.connection.password">${jdbc.postgresql.password}</property>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.sybase.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.sybase.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.sybase.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -1,13 +1,3 @@
- <!--
- Out-of-the-box compatibility with Sybase
- https://jira.jboss.org/jira/browse/JBPM-700
-
- System Service QA Database Sybase
- https://wiki.corp.jboss.com/bin/view/IT/SystemServiceQaDatabaseSybase
-
- Install Sybase ASE 15.0.2 on Fedora9
- https://www.jboss.org/community/docs/DOC-12932
- -->
<!-- hibernate dialect -->
<property name="hibernate.dialect">org.jbpm.db.hibernate.SybaseDialect</property>
@@ -21,3 +11,4 @@
<!-- jConnect does not support retrieving natively generated keys after insert -->
<property name="hibernate.jdbc.use_get_generated_keys">false</property>
+
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-hsqldb-ds.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-hsqldb-ds.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-hsqldb-ds.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -4,10 +4,10 @@
<local-tx-datasource>
<jndi-name>JbpmDS</jndi-name>
- <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbpmDB</connection-url>
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
- <user-name>sa</user-name>
- <password></password>
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}${jdbc.hsqldb.database}</connection-url>
+ <driver-class>${jdbc.hsqldb.driver}</driver-class>
+ <user-name>${jdbc.hsqldb.username}</user-name>
+ <password>${jdbc.hsqldb.password}</password>
<!-- disable idle connection removal, hsqldb does not reap threads on closed connections -->
<idle-timeout-minutes>0</idle-timeout-minutes>
@@ -20,12 +20,12 @@
<type-mapping>Hypersonic SQL</type-mapping>
<!-- ensure the datasource is not initialized before the database itself -->
- <depends>jboss:service=Hypersonic,database=jbpmDB</depends>
+ <depends>jboss:service=Hypersonic,database=${jdbc.hsqldb.database}</depends>
</local-tx-datasource>
<!-- for hsqldb accessed from jboss only, in-process (standalone) mode -->
- <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbpmDB">
- <attribute name="Database">jbpmDB</attribute>
+ <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=${jdbc.hsqldb.database}">
+ <attribute name="Database">${jdbc.hsqldb.database}</attribute>
<attribute name="InProcessMode">true</attribute>
</mbean>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== -->
-<!-- jBPM: Workflow in Java -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ====================================================================== -->
+ <!-- ====================================================================== -->
+ <!-- jBPM: Workflow in Java -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- ====================================================================== -->
-<!-- $Id$ -->
+ <!-- $Id$ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -26,117 +26,10 @@
</parent>
<properties>
- <previous.version>3.2.5.SP5</previous.version>
+ <previous.version>3.2.8</previous.version>
+ <previous.version.directory>${project.build.directory}/${previous.version}</previous.version.directory>
</properties>
- <profiles>
- <profile>
- <id>update</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>previous-version</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-db</artifactId>
- <version>${previous.version}</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${previous.version.directory}</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>update-schema</id>
- <phase>compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="project.output.dir" value="${project.build.outputDirectory}" />
- <property name="previous.version.dir" value="${previous.version.directory}" />
- <ant antfile="scripts/antrun-jbpmschema.xml" target="update-schema"
- inheritRefs="true" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <previous.version.directory>${project.build.directory}/${previous.version}</previous.version.directory>
- </properties>
-
- <dependencies>
- <!-- Database Drivers -->
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>com.sybase</groupId>
- <artifactId>jconnect</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jtds</groupId>
- <artifactId>jtds</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>msjdbc</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>qa.jboss.com</id>
- <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url>
- </repository>
- </repositories>
- </profile>
- </profiles>
-
<!-- Dependencies -->
<dependencies>
<!-- jBPM Dependencies -->
@@ -186,7 +79,7 @@
<executions>
<execution>
<id>create-drop-schema</id>
- <phase>compile</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>run</goal>
</goals>
@@ -200,6 +93,31 @@
</tasks>
</configuration>
</execution>
+
+ <execution>
+ <id>generate-update-script</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="project.output.dir" value="${project.build.outputDirectory}" />
+ <property name="database" value="${database}" />
+ <condition property="skip">
+ <equals arg1="${database}" arg2="hsqldb" />
+ </condition>
+ <condition property="delimiter" value="go" else=";">
+ <equals arg1="${database}" arg2="sybase" />
+ </condition>
+ <condition property="delimitertype" value="row" else="normal">
+ <equals arg1="${database}" arg2="sybase" />
+ </condition>
+ <ant antfile="scripts/antrun-jbpmschema.xml" target="update-schema"
+ inheritRefs="true" />
+ </tasks>
+ </configuration>
+ </execution>
</executions>
</plugin>
@@ -211,7 +129,374 @@
</includes>
</configuration>
</plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>previous-version</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-db</artifactId>
+ <version>${previous.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${previous.version.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>drop-current-schema</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <autocommit>true</autocommit>
+ <onError>continue</onError>
+ <srcFiles>
+ <srcFile>${project.build.outputDirectory}/jbpm.jpdl.${database}.drop.sql</srcFile>
+ </srcFiles>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>create-previous-schema</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <autocommit>true</autocommit>
+ <srcFiles>
+ <srcFile>${previous.version.directory}/jbpm.jpdl.${database}.sql</srcFile>
+ </srcFiles>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>update-schema</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <autocommit>true</autocommit>
+ <srcFiles>
+ <srcFile>${project.build.outputDirectory}/jbpm.jpdl.${database}.update.sql</srcFile>
+ </srcFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
+ <profiles>
+ <!--
+ Name: no-database
+ Desc: Default Database Schema Update
+ -->
+ <profile>
+ <id>no-database</id>
+ <activation>
+ <property>
+ <name>!database</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <configuration>
+ <driver>${jdbc.hsqldb.driver}</driver>
+ <url>${jdbc.hsqldb.url}</url>
+ <username>${jdbc.hsqldb.username}</username>
+ <password>${jdbc.hsqldb.password}</password>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: db2
+ Desc: DB2 Schema Update
+ -->
+ <profile>
+ <id>db2</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>db2</value>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>${db2jcc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ </dependency>
+ </dependencies>
+
+ <configuration>
+ <driver>${jdbc.db2.driver}</driver>
+ <url>${jdbc.db2.url}</url>
+ <username>${jdbc.db2.username}</username>
+ <password>${jdbc.db2.password}</password>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: hsqldb
+ Desc: HSQL Schema Update
+ -->
+ <profile>
+ <id>hsqldb</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>hsqldb</value>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <configuration>
+ <driver>${jdbc.hsqldb.driver}</driver>
+ <url>${jdbc.hsqldb.url}</url>
+ <username>${jdbc.hsqldb.username}</username>
+ <password>${jdbc.hsqldb.password}</password>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: mssql
+ Desc: SQL Server Schema Update
+ -->
+ <profile>
+ <id>mssql</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>mssql</value>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>msjdbc</artifactId>
+ <version>${msjdbc.version}</version>
+ </dependency>
+ </dependencies>
+
+ <configuration>
+ <driver>${jdbc.mssql.driver}</driver>
+ <url>${jdbc.mssql.url}</url>
+ <username>${jdbc.mssql.username}</username>
+ <password>${jdbc.mssql.password}</password>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: mysql
+ Desc: MySQL Schema Update
+ -->
+ <profile>
+ <id>mysql</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>mysql</value>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql.connector.version}</version>
+ </dependency>
+ </dependencies>
+
+ <configuration>
+ <driver>${jdbc.mysql.driver}</driver>
+ <url>${jdbc.mysql.url}</url>
+ <username>${jdbc.mysql.username}</username>
+ <password>${jdbc.mysql.password}</password>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: oracle
+ Desc: Oracle Schema Update
+ -->
+ <profile>
+ <id>oracle</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>oracle</value>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <version>${ojdbc14.version}</version>
+ </dependency>
+ </dependencies>
+
+ <configuration>
+ <driver>${jdbc.oracle.driver}</driver>
+ <url>${jdbc.oracle.url}</url>
+ <username>${jdbc.oracle.username}</username>
+ <password>${jdbc.oracle.password}</password>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: postgresql
+ Desc: PostgreSQL Schema Update
+ -->
+ <profile>
+ <id>postgresql</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>postgresql</value>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgresql.version}</version>
+ </dependency>
+ </dependencies>
+
+ <configuration>
+ <driver>${jdbc.postgresql.driver}</driver>
+ <url>${jdbc.postgresql.url}</url>
+ <username>${jdbc.postgresql.username}</username>
+ <password>${jdbc.postgresql.password}</password>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: sybase
+ Desc: Sybase Schema Update
+ -->
+ <profile>
+ <id>sybase</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>sybase</value>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>${jtds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sybase</groupId>
+ <artifactId>jconnect</artifactId>
+ <version>${jconnect.version}</version>
+ </dependency>
+ </dependencies>
+
+ <configuration>
+ <driver>${jdbc.sybase.driver}</driver>
+ <url>${jdbc.sybase.url}</url>
+ <username>${jdbc.sybase.username}</username>
+ <password>${jdbc.sybase.password}</password>
+ <delimiter>go</delimiter>
+ <delimiterType>row</delimiterType>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
</project>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/db/scripts/antrun-jbpmschema.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/db/scripts/antrun-jbpmschema.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/modules/db/scripts/antrun-jbpmschema.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -1,24 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- ================================================================== -->
+<!-- jBPM Database schema -->
+<!-- ================================================================== -->
+
<!-- $Id$ -->
<project>
-
- <!-- ================================================================== -->
- <!-- jBPM Database schema -->
- <!-- ================================================================== -->
-
<target name="init">
<taskdef name="jbpmschema"
classname="org.jbpm.ant.JbpmSchemaTask"
- classpathref="maven.runtime.classpath" />
- <taskdef name="hbproperties"
- classname="org.jbpm.ant.HibernatePropertiesTask"
- classpathref="maven.runtime.classpath" />
+ classpathref="maven.test.classpath" />
<mkdir dir="${project.output.dir}" />
</target>
- <target name="create-schema" depends="init" description="Generate schema creation scripts">
+ <target name="create-schema" depends="init" description="Generate schema create scripts">
<jbpmschema output="${project.output.dir}/jbpm.jpdl.db2.sql"
config="hibernate.cfg.db2.xml"
action="create" />
@@ -88,64 +84,14 @@
delimiterType="row" />
</target>
- <target name="update-schema" depends="init" description="Generate schema update scripts">
- <!--generate-update-script db="db2" /-->
- <!--generate-update-script db="mssql" /-->
- <generate-update-script db="mysql" />
- <!--generate-update-script db="oracle" /-->
- <generate-update-script db="postgresql" />
- <generate-update-script db="sybase" delimiter="go" delimitertype="row" />
+ <target name="update-schema"
+ depends="init"
+ unless="skip"
+ description="Generate schema update scripts">
+ <jbpmschema output="${project.output.dir}/jbpm.jpdl.${database}.update.sql"
+ config="hibernate.cfg.${database}.xml"
+ action="update"
+ delimiter="${delimiter}"
+ delimiterType="${delimitertype}" />
</target>
-
- <macrodef name="generate-update-script">
- <attribute name="db" />
- <attribute name="delimiter" default=";" />
- <attribute name="delimitertype" default="normal" />
-
- <sequential>
- <hbproperties config="hibernate.cfg.@{db}.xml"
- prefix="@{db}."
- includes="hibernate\.connection\..*" />
-
- <sql src="${project.output.dir}/jbpm.jpdl.@{db}.drop.sql"
- url="${@{db}.hibernate.connection.url}"
- driver="${@{db}.hibernate.connection.driver_class}"
- userid="${@{db}.hibernate.connection.username}"
- password="${@{db}.hibernate.connection.password}"
- classpathref="maven.runtime.classpath"
- autocommit="yes"
- onerror="continue"
- delimiter="@{delimiter}"
- delimitertype="@{delimitertype}" />
-
- <sql src="${previous.version.dir}/jbpm.jpdl.@{db}.sql"
- url="${@{db}.hibernate.connection.url}"
- driver="${@{db}.hibernate.connection.driver_class}"
- userid="${@{db}.hibernate.connection.username}"
- password="${@{db}.hibernate.connection.password}"
- classpathref="maven.runtime.classpath"
- autocommit="yes"
- onerror="continue"
- delimiter="@{delimiter}"
- delimitertype="@{delimitertype}" />
-
- <echo>Generating @{db} update schema</echo>
- <jbpmschema output="${project.output.dir}/jbpm.jpdl.@{db}.update.sql"
- config="hibernate.cfg.@{db}.xml"
- action="update"
- delimiter="@{delimiter}"
- delimitertype="@{delimitertype}" />
-
- <sql src="${project.output.dir}/jbpm.jpdl.@{db}.update.sql"
- url="${@{db}.hibernate.connection.url}"
- driver="${@{db}.hibernate.connection.driver_class}"
- userid="${@{db}.hibernate.connection.username}"
- password="${@{db}.hibernate.connection.password}"
- classpathref="maven.runtime.classpath"
- autocommit="yes"
- onerror="continue"
- delimiter="@{delimiter}"
- delimitertype="@{delimitertype}" />
- </sequential>
- </macrodef>
</project>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -226,7 +226,6 @@
<plugin>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-maven-plugin</artifactId>
- <version>${izpack.version}</version>
<executions>
<execution>
<phase>package</phase>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -38,7 +38,6 @@
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
- <version>${jdocbook.version}</version>
<extensions>true</extensions>
<configuration>
<sourceDocumentName>en/master.xml</sourceDocumentName>
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-03-12 22:31:22 UTC (rev 6220)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-03-14 08:00:18 UTC (rev 6221)
@@ -49,7 +49,6 @@
<drools.version>4.0.7</drools.version>
<dumbster.version>1.6</dumbster.version>
<hibernate.version>3.2.4.sp1</hibernate.version>
- <izpack.version>1.0-alpha-5</izpack.version>
<jackrabbit.version>1.4.5</jackrabbit.version>
<jasper.reports.version>3.0.0</jasper.reports.version>
<javax.el.version>1.2</javax.el.version>
@@ -63,7 +62,6 @@
<jboss.j2ee.version>4.0.2</jboss.j2ee.version>
<jbpm.designer.version>3.1.7</jbpm.designer.version>
<jbpm.jsf-console.version>3.2.9-SNAPSHOT</jbpm.jsf-console.version>
- <jdocbook.version>2.1.2</jdocbook.version>
<junit.version>3.8.1</junit.version>
<log4j.version>1.2.14</log4j.version>
<mvel.version>1.3.1-java1.4</mvel.version>
@@ -351,6 +349,28 @@
</configuration>
</plugin>
</plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.izpack</groupId>
+ <artifactId>izpack-maven-plugin</artifactId>
+ <version>1.0-alpha-5</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.2</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<!-- Repositories -->
@@ -433,8 +453,8 @@
<!-- DATABASE PROFILES -->
<!--
- Name: no-database
- Desc: Setup the default database
+ Name: no-database
+ Desc: Default Database Setup
-->
<profile>
<id>no-database</id>
@@ -445,6 +465,11 @@
</activation>
<properties>
<database>hsqldb</database>
+ <jdbc.hsqldb.database>jbpm3</jdbc.hsqldb.database>
+ <jdbc.hsqldb.url>jdbc:hsqldb:mem:${jdbc.hsqldb.database}</jdbc.hsqldb.url>
+ <jdbc.hsqldb.username>sa</jdbc.hsqldb.username>
+ <jdbc.hsqldb.password></jdbc.hsqldb.password>
+ <jdbc.hsqldb.driver>org.hsqldb.jdbcDriver</jdbc.hsqldb.driver>
</properties>
<dependencies>
<dependency>
@@ -456,8 +481,8 @@
</profile>
<!--
- Name: db2
- Desc: DB2 Database Setup
+ Name: db2
+ Desc: DB2 Database Setup
-->
<profile>
<id>db2</id>
@@ -488,8 +513,8 @@
</profile>
<!--
- Name: hsqldb
- Desc: Hypersonic Database Setup
+ Name: hsqldb
+ Desc: Hypersonic Database Setup
-->
<profile>
<id>hsqldb</id>
@@ -499,6 +524,13 @@
<value>hsqldb</value>
</property>
</activation>
+ <properties>
+ <jdbc.hsqldb.database>jbpm3</jdbc.hsqldb.database>
+ <jdbc.hsqldb.url>jdbc:hsqldb:mem:${jdbc.hsqldb.database}</jdbc.hsqldb.url>
+ <jdbc.hsqldb.username>sa</jdbc.hsqldb.username>
+ <jdbc.hsqldb.password></jdbc.hsqldb.password>
+ <jdbc.hsqldb.driver>org.hsqldb.jdbcDriver</jdbc.hsqldb.driver>
+ </properties>
<dependencies>
<dependency>
<groupId>hsqldb</groupId>
@@ -509,8 +541,8 @@
</profile>
<!--
- Name: mssql
- Desc: MSSQL Database Setup
+ Name: mssql
+ Desc: MSSQL Database Setup
-->
<profile>
<id>mssql</id>
@@ -536,8 +568,8 @@
</profile>
<!--
- Name: mysql
- Desc: MySQL Database Setup
+ Name: mysql
+ Desc: MySQL Database Setup
-->
<profile>
<id>mysql</id>
@@ -557,8 +589,8 @@
</profile>
<!--
- Name: oracle
- Desc: Oracle Database Setup
+ Name: oracle
+ Desc: Oracle Database Setup
-->
<profile>
<id>oracle</id>
@@ -584,8 +616,8 @@
</profile>
<!--
- Name: postgresql
- Desc: PostgreSQL Database Setup
+ Name: postgresql
+ Desc: PostgreSQL Database Setup
-->
<profile>
<id>postgresql</id>
@@ -605,8 +637,8 @@
</profile>
<!--
- Name: sybase
- Desc: Sybase Database Setup
+ Name: sybase
+ Desc: Sybase Database Setup
-->
<profile>
<id>sybase</id>
More information about the jbpm-commits
mailing list