[jbpm-commits] JBoss JBPM SVN: r2064 - in jbpm3/trunk/modules: distribution/scripts and 7 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Sep 2 06:00:33 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-09-02 06:00:32 -0400 (Tue, 02 Sep 2008)
New Revision: 2064

Added:
   jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml
   jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml
   jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml
   jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml
Removed:
   jbpm3/trunk/modules/distribution/src/main/resources/database/hypersonic/jbpm-ds.xml
Modified:
   jbpm3/trunk/modules/distribution/pom.xml
   jbpm3/trunk/modules/distribution/scripts/install-definition.xml
   jbpm3/trunk/modules/enterprise/pom.xml
   jbpm3/trunk/modules/jpdl/core/pom.xml
   jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml
   jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml
   jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml
Log:
Support choice of container/database in installer

Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml	2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/distribution/pom.xml	2008-09-02 10:00:32 UTC (rev 2064)
@@ -10,7 +10,8 @@
 <!-- ====================================================================== -->
 
 <!-- $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">
+<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">
   <modelVersion>4.0.0</modelVersion>
   <name>JBoss jBPM - Distribution</name>
   <groupId>org.jboss.jbpm</groupId>
@@ -81,6 +82,17 @@
       <groupId>izpack</groupId>
       <artifactId>standalone-compiler</artifactId>
     </dependency>
+    
+    <!-- Database Drivers -->
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <classifier>jdbc3</classifier>
+    </dependency>
   </dependencies>
 
    <!-- Plugins -->

Modified: jbpm3/trunk/modules/distribution/scripts/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/install-definition.xml	2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml	2008-09-02 10:00:32 UTC (rev 2064)
@@ -1,94 +1,133 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-
 <installation version="1.0">
-   <!-- Ant properties in this file can be referenced with @{},
-otherwise use variables below in installer files with ${} -->
-   <info>
-      <appname>@{product.name}</appname>
-      <appversion>@{product.version}</appversion>
-      <uninstaller name="remove.task" write="yes" />
-   </info>
+  <!-- 
+    Ant properties in this file can be referenced with @{},
+    otherwise use variables below in installer files with ${} 
+  -->
+  <info>
+    <appname>@{product.name}</appname>
+    <appversion>@{product.version}</appversion>
+    <uninstaller name="remove.task" write="yes" />
+  </info>
+  
+  <guiprefs width="600" height="480" resizable="no">
+    <laf name="kunststoff">
+      <os family="unix" />
+    </laf>
+  </guiprefs>
+  
+  <locale>
+    <langpack iso3="eng" />
+  </locale>
 
-   <guiprefs width="600" height="480" resizable="no">
-      <laf name="kunststoff">
-         <os family="unix" />
-      </laf>
-      <!--
-      <modifier key="useHeadingPanel" value="yes" />
-      <modifier key="useHeadingForSummary" value="yes" />
-      <modifier key="headingImageOnLeft" value="yes" />
-      <modifier key="headingLineCount" value="2" />
-      <modifier key="headingFontSize" value="1.5" />
-      <modifier key="headingBackgroundColor" value="0x00ffffff" />
-      <modifier key="headingPanelCounter" value="text" />
-      <modifier key="headingPanelCounterPos" value="inHeading" />
-      -->
-   </guiprefs>
+  <!-- Need to define ant properties we want to use during install as variables -->
+  <variables>
+    <variable name="jboss422.home" value="@{jboss422.home}" />
+    <variable name="jboss423.home" value="@{jboss423.home}" />
+    <variable name="jboss500.home" value="@{jboss500.home}" />
+  </variables>
+  <dynamicvariables>
+    <variable name="jboss.home" value="${jboss422.home}" condition="isJBoss422" />
+    <variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" />
+    <variable name="jboss.home" value="${jboss500.home}" condition="isJBoss500" />
+  </dynamicvariables>
+  <conditions>
+    <condition type="variable" id="isJBoss422">
+      <name>jbossSelection</name>
+      <value>jboss422</value>
+    </condition>
+    <condition type="variable" id="isJBoss423">
+      <name>jbossSelection</name>
+      <value>jboss423</value>
+    </condition>
+    <condition type="variable" id="isJBoss500">
+      <name>jbossSelection</name>
+      <value>jboss500</value>
+    </condition>
+    <condition type="variable" id="isHypersonic">
+      <name>databaseSelection</name>
+      <value>hsqldb</value>
+    </condition>
+    <condition type="variable" id="isMySQL">
+      <name>databaseSelection</name>
+      <value>mysql</value>
+    </condition>
+    <condition type="variable" id="isPostgreSQL">
+      <name>databaseSelection</name>
+      <value>postgresql</value>
+    </condition>
+  </conditions>
+  
+  <resources>
+    <res id="userInputSpec.xml" src="@{filtered.resources.dir}/userInputSpec.xml" />
+  </resources>
+  
+  <panels>
+    <panel classname="HelloPanel" />
+    <panel classname="UserInputPanel" />
+    <panel classname="UserInputPanel" />
+    <!-- Packs and summary panels do not repect the conditions - ->
+    <panel classname="PacksPanel" />
+    <panel classname="SummaryPanel" />
+    -->
+    <panel classname="InstallPanel" />
+    <panel classname="FinishPanel" />
+  </panels>
+  
+  <packs>
+    <!-- jBPM Main Components -->
+    <pack name="jBPM3" required="yes" installGroups="Main" preselected="yes">
+      <description>The jBPM Main Components</description>
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
+        override="true">
+        <include name="jboss-bpm-api.jar" />
+        <include name="jbpm-jpdl-core.jar" />
+        <include name="jbpm-jpdl-identity.jar" />
+        <include name="jbpm-jpdl-integration.jar" />
+      </fileset>
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" override="true">
+        <include name="jbpm-enterprise.jar" />
+      </fileset>
+      <file src="@{deploy.artifacts.dir}/lib/jbpm-console.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-console.war"
+        unpack="true" override="true" />
+      <file src="@{deploy.artifacts.dir}/lib/jbpm-console-service.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
+        unpack="true" override="true" />
+      <file src="@{deploy.artifacts.dir}/resources/jbpm-config/jbpm.cfg.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"/>
+    </pack>
 
-   <locale>
-      <langpack iso3="eng" />
-   </locale>
+    <!-- jBPM Hypersonic Database -->
+    <pack name="jBPM3 Hypersonic Database" required="no" installGroups="Database" condition="isHypersonic">
+      <description>The Hypersonic Database</description>
+      <fileset dir="@{resources.dir}/database" targetdir="${installPath}/server/${jbossTargetServer}/data">
+        <include name="hypersonic/jbpmDB.*" />
+      </fileset>
+      <file src="@{resources.dir}/database/jbpm-hsqldb-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"/>
+      <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-config/hibernate.cfg.hsqldb.xml" 
+        target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/>
+    </pack>
 
-   <!-- Need to define ant properties we want to use during install as variables -->
-   <variables>
-      <variable name="UserPathPanelVariable" value="@{jboss422.home}" />
-   </variables>
+    <!-- jBPM MySQL Database -->
+    <pack name="jBPM3 MySQL Database" required="no" installGroups="Database" condition="isMySQL">
+      <description>The MySQL Database</description>
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
+        override="true">
+        <include name="mysql-connector-java.jar" />
+      </fileset>
+      <file src="@{resources.dir}/database/jbpm-mysql-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"/>
+      <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-config/hibernate.cfg.mysql.xml" 
+        target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/>
+    </pack>
 
-   <resources>
-      <res id="TargetPanel.dir" src="@{filtered.resources.dir}/target-panel-dir.txt"/>
-   </resources>
-
-   <panels>
-      <panel classname="HelloPanel" />
-      <panel classname="TargetPanel" />
-      <panel classname="TreePacksPanel" />
-      <panel classname="SummaryPanel" />
-      <panel classname="InstallPanel" />
-      <panel classname="FinishPanel" />
-   </panels>
-
-   <packs>
-      <!-- jBPM Main Components -->
-      <pack name="jBPM3" required="yes" installGroups="Main">
-         <description>The jBPM Main Components</description>
-         <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm/jbpm-service.sar" 
-            override="true">
-            <include name="jboss-bpm-api.jar"/>
-            <include name="jbpm-jpdl-core.jar"/>
-            <include name="jbpm-jpdl-identity.jar"/>
-            <include name="jbpm-jpdl-integration.jar"/>
-         </fileset>
-         <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm" 
-            override="true">
-            <include name="jbpm-enterprise.jar"/>
-         </fileset>
-         <file src="@{deploy.artifacts.dir}/lib/jbpm-console.zip" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm/jbpm-console.war" 
-            unpack="true" override="true"/>
-         <file src="@{deploy.artifacts.dir}/lib/jbpm-console-service.zip" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm/jbpm-service.sar" 
-            unpack="true" override="true"/>
-      </pack>
-
-      <!-- jBPM Distro config -->
-      <pack name="jBPM3 Config" required="yes" installGroups="Main">
-         <description>The jBPM default configuration</description>
-         <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-config" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm/jbpm-service.sar">
-            <include name="hibernate.cfg.xml"/>
-            <include name="jbpm.cfg.xml"/>
-         </fileset>
-      </pack>
-            
-      <!-- jBPM Hypersonic Database -->
-      <pack name="jBPM3 Hypersonic Database Scripts" required="no" installGroups="Main">
-         <description>The Hypersonic Database Scripts</description>
-         <fileset dir="@{resources.dir}/database" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/data" 
-            override="asktrue">
-            <include name="hypersonic/jbpmDB.*"/>
-         </fileset>
-         <fileset dir="@{resources.dir}/database/hypersonic" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm" 
-            override="asktrue">
-            <include name="jbpm-ds.xml"/>
-         </fileset>
-      </pack>
-   </packs>
-
-</installation>
+    <!-- jBPM PostgreSQL Database -->
+    <pack name="jBPM3 PostgreSQL Database" required="no" installGroups="Database" condition="isPostgreSQL">
+      <description>The PostgreSQL Database</description>
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
+        override="true">
+        <include name="postgresql-jdbc3.jar" />
+      </fileset>
+      <file src="@{resources.dir}/database/jbpm-postgresql-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"/>
+      <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-config/hibernate.cfg.postgresql.xml" 
+        target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/>
+    </pack>
+  </packs>
+</installation>
\ No newline at end of file

Deleted: jbpm3/trunk/modules/distribution/src/main/resources/database/hypersonic/jbpm-ds.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/database/hypersonic/jbpm-ds.xml	2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/distribution/src/main/resources/database/hypersonic/jbpm-ds.xml	2008-09-02 10:00:32 UTC (rev 2064)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<datasources>
-
-   <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>
-      <min-pool-size>1</min-pool-size>
-      <max-pool-size>5</max-pool-size>
-      <idle-timeout-minutes>0</idle-timeout-minutes>
-      <track-statements/>
-      <!-- 
-      <security-domain>HsqlDbRealm</security-domain>
-      -->
-      <prepared-statement-cache-size>32</prepared-statement-cache-size>
-      <metadata><type-mapping>Hypersonic SQL</type-mapping></metadata>
-      <depends>jboss:service=Hypersonic,database=jbpmDB</depends>
-   </local-tx-datasource>
-
-   <mbean code="org.jboss.jdbc.HypersonicDatabase" 
-     name="jboss:service=Hypersonic,database=jbpmDB">
-     <attribute name="Database">jbpmDB</attribute>
-     <attribute name="InProcessMode">true</attribute>
-   </mbean>
-
-</datasources>

Added: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml	                        (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml	2008-09-02 10:00:32 UTC (rev 2064)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+
+   <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>
+      <min-pool-size>1</min-pool-size>
+      <max-pool-size>5</max-pool-size>
+      <idle-timeout-minutes>0</idle-timeout-minutes>
+      <track-statements/>
+      <!-- 
+      <security-domain>HsqlDbRealm</security-domain>
+      -->
+      <prepared-statement-cache-size>32</prepared-statement-cache-size>
+      <metadata><type-mapping>Hypersonic SQL</type-mapping></metadata>
+      <depends>jboss:service=Hypersonic,database=jbpmDB</depends>
+   </local-tx-datasource>
+
+   <mbean code="org.jboss.jdbc.HypersonicDatabase" 
+     name="jboss:service=Hypersonic,database=jbpmDB">
+     <attribute name="Database">jbpmDB</attribute>
+     <attribute name="InProcessMode">true</attribute>
+   </mbean>
+
+</datasources>


Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml	                        (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml	2008-09-02 10:00:32 UTC (rev 2064)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+  <local-tx-datasource>
+    <jndi-name>JbpmDS</jndi-name>
+    <connection-url>jdbc:mysql://localhost:3306/jbpmtest</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <user-name>jbpmtest</user-name>
+    <password></password>
+    <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter</exception-sorter-class-name>
+    <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml -->
+    <metadata>
+      <type-mapping>mySQL</type-mapping>
+    </metadata>
+  </local-tx-datasource>
+</datasources>
\ No newline at end of file


Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml	                        (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml	2008-09-02 10:00:32 UTC (rev 2064)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+
+   <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>
+      <min-pool-size>1</min-pool-size>
+      <max-pool-size>5</max-pool-size>
+      <idle-timeout-minutes>0</idle-timeout-minutes>
+      <track-statements/>
+      <!-- 
+      <security-domain>HsqlDbRealm</security-domain>
+      -->
+      <prepared-statement-cache-size>32</prepared-statement-cache-size>
+      <metadata><type-mapping>Hypersonic SQL</type-mapping></metadata>
+      <depends>jboss:service=Hypersonic,database=jbpmDB</depends>
+   </local-tx-datasource>
+
+   <mbean code="org.jboss.jdbc.HypersonicDatabase" 
+     name="jboss:service=Hypersonic,database=jbpmDB">
+     <attribute name="Database">jbpmDB</attribute>
+     <attribute name="InProcessMode">true</attribute>
+   </mbean>
+
+</datasources>


Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml	                        (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml	2008-09-02 10:00:32 UTC (rev 2064)
@@ -0,0 +1,32 @@
+<userInput>
+  <panel order="0">
+    <createForPack name="jBPM3" />
+    <field type="radio" variable="jbossSelection">
+      <description align="left" txt="Please choose your target server" />
+      <spec>
+        <choice txt="JBoss-4.2.2" value="jboss422" set="true" />
+        <choice txt="JBoss-4.2.3" value="jboss423" />
+        <choice txt="JBoss-5.0.0" value="jboss500" />
+      </spec>
+    </field>
+    <field type="text" variable="jbossTargetServer">
+      <spec txt="Server:" size="15" set="default" />
+    </field>
+    <field type="divider" />
+    <field type="radio" variable="databaseSelection">
+      <description align="left" txt="Please choose your target database" />
+      <spec>
+        <choice txt="Hypersonic" value="hsqldb" set="true" />
+        <choice txt="MySQL" value="mysql" />
+        <choice txt="PostgreSQL" value="postgresql" />
+      </spec>
+    </field>
+  </panel>
+  <!--  -->
+  <panel order="1">
+    <createForPack name="jBPM3" />
+    <field type="dir" align="left" variable="installPath">
+      <spec txt="Install Path:" size="25" set="${jboss.home}" />
+    </field>
+  </panel>
+</userInput>
\ No newline at end of file


Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/userInputSpec.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml	2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/enterprise/pom.xml	2008-09-02 10:00:32 UTC (rev 2064)
@@ -147,6 +147,7 @@
           </excludes>
         </configuration>
       </plugin>
+      <!-- 
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jboss-maven-plugin</artifactId>
@@ -173,6 +174,7 @@
           </execution>
         </executions>
       </plugin>
+      -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>

Modified: jbpm3/trunk/modules/jpdl/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/pom.xml	2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/jpdl/core/pom.xml	2008-09-02 10:00:32 UTC (rev 2064)
@@ -135,49 +135,6 @@
         </configuration>
       </plugin>
       <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>org/jbpm/mail/MailTest.java</exclude>
-            <exclude>org/jbpm/mail/TaskMailTest.java</exclude>
-            <!--
-              Cleanup stale tests from the testsuite http://jira.jboss.org/jira/browse/JBPM-1205
-            -->
-            <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
-            <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
-            <exclude>org/jbpm/DefaultConfigurationTest.java</exclude>
-            <exclude>org/jbpm/graph/def/ExceptionHandlerDbTest.java</exclude>
-            <exclude>org/jbpm/graph/def/TransitionDbTest.java</exclude>
-            <exclude>org/jbpm/graph/exe/StateDbTest.java</exclude>
-            <exclude>org/jbpm/graph/exe/SubProcessCancellationTest.java</exclude>
-            <exclude>org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java
-            </exclude>
-            <exclude>org/jbpm/graph/log/NodeLogTest.java</exclude>
-            <exclude>org/jbpm/instantiation/UserCodeInterceptorTest.java</exclude>
-            <exclude>org/jbpm/JbpmDefaultConfigTest.java</exclude>
-            <exclude>org/jbpm/jcr/JcrDbTest.java</exclude>
-            <exclude>org/jbpm/job/executor/ConcurrencyTest.java</exclude>
-            <exclude>org/jbpm/job/executor/JobExecutorDbTest.java</exclude>
-            <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude>
-            <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude>
-            <exclude>org/jbpm/jpdl/convert/ConversionTestCase.java</exclude>
-            <exclude>org/jbpm/jpdl/xml/SchemaTest.java</exclude>
-            <exclude>org/jbpm/logging/exe/LoggingConfigDbTest.java</exclude>
-            <exclude>org/jbpm/logging/exe/LogLogTest.java</exclude>
-            <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude>
-            <exclude>org/jbpm/mock/JdbcProxyTest.java</exclude>
-            <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude>
-            <exclude>org/jbpm/perf/StateUpdateTest.java</exclude>
-            <exclude>org/jbpm/perf/TasklistEagerLoadingTest.java</exclude>
-            <exclude>org/jbpm/perf/TaskWithVariablesTest.java</exclude>
-            <exclude>org/jbpm/persistence/db/PersistenceConfigurationTest.java
-            </exclude>
-            <exclude>org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java</exclude>
-            <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
@@ -199,5 +156,191 @@
   
   <!-- Profiles -->
   <profiles>
+  
+    <!-- 
+    Name:  hsqldb
+    Descr: Hypersonic Database Setup   
+    -->
+    <profile>
+      <id>hsqldb</id>
+      <activation>
+        <property>
+          <name>database</name>
+          <value>hsqldb</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <!--
+                  Cleanup stale tests from the testsuite 
+                  http://jira.jboss.org/jira/browse/JBPM-1205
+                -->
+                <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
+                <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
+                <exclude>org/jbpm/DefaultConfigurationTest.java</exclude>
+                <exclude>org/jbpm/graph/def/ExceptionHandlerDbTest.java</exclude>
+                <exclude>org/jbpm/graph/def/TransitionDbTest.java</exclude>
+                <exclude>org/jbpm/graph/exe/StateDbTest.java</exclude>
+                <exclude>org/jbpm/graph/exe/SubProcessCancellationTest.java</exclude>
+                <exclude>org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java</exclude>
+                <exclude>org/jbpm/graph/log/NodeLogTest.java</exclude>
+                <exclude>org/jbpm/instantiation/UserCodeInterceptorTest.java</exclude>
+                <exclude>org/jbpm/JbpmDefaultConfigTest.java</exclude>
+                <exclude>org/jbpm/jcr/JcrDbTest.java</exclude>
+                <exclude>org/jbpm/job/executor/ConcurrencyTest.java</exclude>
+                <exclude>org/jbpm/job/executor/JobExecutorDbTest.java</exclude>
+                <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude>
+                <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude>
+                <exclude>org/jbpm/jpdl/convert/ConversionTestCase.java</exclude>
+                <exclude>org/jbpm/jpdl/xml/SchemaTest.java</exclude>
+                <exclude>org/jbpm/logging/exe/LoggingConfigDbTest.java</exclude>
+                <exclude>org/jbpm/logging/exe/LogLogTest.java</exclude>
+                <exclude>org/jbpm/mail/MailTest.java</exclude>
+                <exclude>org/jbpm/mail/TaskMailTest.java</exclude>
+                <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude>
+                <exclude>org/jbpm/mock/JdbcProxyTest.java</exclude>
+                <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude>
+                <exclude>org/jbpm/perf/StateUpdateTest.java</exclude>
+                <exclude>org/jbpm/perf/TasklistEagerLoadingTest.java</exclude>
+                <exclude>org/jbpm/perf/TaskWithVariablesTest.java</exclude>
+                <exclude>org/jbpm/persistence/db/PersistenceConfigurationTest.java</exclude>
+                <exclude>org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java</exclude>
+                <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    
+    <!-- 
+    Name:  mysql
+    Descr: MySQL Database Setup   
+    -->
+    <profile>
+      <id>mysql</id>
+      <activation>
+        <property>
+          <name>database</name>
+          <value>mysql</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <!--
+                  Cleanup stale tests from the testsuite 
+                  http://jira.jboss.org/jira/browse/JBPM-1205
+                -->
+                <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
+                <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
+                <exclude>org/jbpm/DefaultConfigurationTest.java</exclude>
+                <exclude>org/jbpm/graph/def/ExceptionHandlerDbTest.java</exclude>
+                <exclude>org/jbpm/graph/def/TransitionDbTest.java</exclude>
+                <exclude>org/jbpm/graph/exe/StateDbTest.java</exclude>
+                <exclude>org/jbpm/graph/exe/SubProcessCancellationTest.java</exclude>
+                <exclude>org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java</exclude>
+                <exclude>org/jbpm/graph/log/NodeLogTest.java</exclude>
+                <exclude>org/jbpm/instantiation/UserCodeInterceptorTest.java</exclude>
+                <exclude>org/jbpm/JbpmDefaultConfigTest.java</exclude>
+                <exclude>org/jbpm/jcr/JcrDbTest.java</exclude>
+                <exclude>org/jbpm/job/executor/ConcurrencyTest.java</exclude>
+                <exclude>org/jbpm/job/executor/JobExecutorDbTest.java</exclude>
+                <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude>
+                <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude>
+                <exclude>org/jbpm/jpdl/convert/ConversionTestCase.java</exclude>
+                <exclude>org/jbpm/jpdl/xml/SchemaTest.java</exclude>
+                <exclude>org/jbpm/logging/exe/LoggingConfigDbTest.java</exclude>
+                <exclude>org/jbpm/logging/exe/LogLogTest.java</exclude>
+                <exclude>org/jbpm/mail/MailTest.java</exclude>
+                <exclude>org/jbpm/mail/TaskMailTest.java</exclude>
+                <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude>
+                <exclude>org/jbpm/mock/JdbcProxyTest.java</exclude>
+                <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude>
+                <exclude>org/jbpm/perf/StateUpdateTest.java</exclude>
+                <exclude>org/jbpm/perf/TasklistEagerLoadingTest.java</exclude>
+                <exclude>org/jbpm/perf/TaskWithVariablesTest.java</exclude>
+                <exclude>org/jbpm/persistence/db/PersistenceConfigurationTest.java</exclude>
+                <exclude>org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java</exclude>
+                <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude>
+                <!--
+                  Fix MySQL regression
+                  https://jira.jboss.org/jira/browse/JBPM-1711 
+                 -->
+                <exclude>org/jbpm/persistence/db/PersistenceServiceDbTest.java</exclude>
+                <exclude>org/jbpm/persistence/db/PersistenceServiceFactoryDbTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    
+    <!-- 
+    Name:  postgresql
+    Descr: MySQL Database Setup   
+    -->
+    <profile>
+      <id>postgresql</id>
+      <activation>
+        <property>
+          <name>database</name>
+          <value>postgresql</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <!--
+                  Cleanup stale tests from the testsuite 
+                  http://jira.jboss.org/jira/browse/JBPM-1205
+                -->
+                <exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
+                <exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
+                <exclude>org/jbpm/DefaultConfigurationTest.java</exclude>
+                <exclude>org/jbpm/graph/def/ExceptionHandlerDbTest.java</exclude>
+                <exclude>org/jbpm/graph/def/TransitionDbTest.java</exclude>
+                <exclude>org/jbpm/graph/exe/StateDbTest.java</exclude>
+                <exclude>org/jbpm/graph/exe/SubProcessCancellationTest.java</exclude>
+                <exclude>org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java</exclude>
+                <exclude>org/jbpm/graph/log/NodeLogTest.java</exclude>
+                <exclude>org/jbpm/instantiation/UserCodeInterceptorTest.java</exclude>
+                <exclude>org/jbpm/JbpmDefaultConfigTest.java</exclude>
+                <exclude>org/jbpm/jcr/JcrDbTest.java</exclude>
+                <exclude>org/jbpm/job/executor/ConcurrencyTest.java</exclude>
+                <exclude>org/jbpm/job/executor/JobExecutorDbTest.java</exclude>
+                <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude>
+                <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude>
+                <exclude>org/jbpm/jpdl/convert/ConversionTestCase.java</exclude>
+                <exclude>org/jbpm/jpdl/xml/SchemaTest.java</exclude>
+                <exclude>org/jbpm/logging/exe/LoggingConfigDbTest.java</exclude>
+                <exclude>org/jbpm/logging/exe/LogLogTest.java</exclude>
+                <exclude>org/jbpm/mail/MailTest.java</exclude>
+                <exclude>org/jbpm/mail/TaskMailTest.java</exclude>
+                <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude>
+                <exclude>org/jbpm/mock/JdbcProxyTest.java</exclude>
+                <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude>
+                <exclude>org/jbpm/perf/StateUpdateTest.java</exclude>
+                <exclude>org/jbpm/perf/TasklistEagerLoadingTest.java</exclude>
+                <exclude>org/jbpm/perf/TaskWithVariablesTest.java</exclude>
+                <exclude>org/jbpm/persistence/db/PersistenceConfigurationTest.java</exclude>
+                <exclude>org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java</exclude>
+                <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>

Modified: jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml	2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml	2008-09-02 10:00:32 UTC (rev 2064)
@@ -12,42 +12,47 @@
 <!-- $Id$ -->
 
 <project default="concat">
+
   <property name="project.build.directory" value="${basedir}/target"/>
   <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
 
-  <target name="check-database">
+  <macrodef name="macro-database-cfg">
+    <attribute name="database" />
+    <sequential>
+
+      <available property="database.properties.available" file="${project.resources.directory}/hibernate.properties.@{database}.xml"/>
+      <fail message="hibernate.properties.@{database}.xml not available" unless="database.properties.available"/>
+      
+      <echo message="Concat hibernate.cfg.@{database}.xml using hibernate.properties.@{database}.xml" />
+      
+      <!-- Concat hibernate.cfg.xml -->
+      <concat destfile="${project.build.directory}/classes/hibernate.cfg.@{database}.xml">
+        <header trimleading="yes"><![CDATA[<?xml version='1.0' encoding='utf-8'?>
   
-    <property name="hibernate.properties.xml" value="hibernate.properties.${database}.xml"/>
-    <available property="database.properties.available" file="${project.resources.directory}/${hibernate.properties.xml}"/>
-    <fail message="${hibernate.properties.xml} not available" unless="database.properties.available"/>
-    
-    <echo/>
-    <echo message="Concat hibernate.cfg.xml using ${hibernate.properties.xml}" />
-    <echo/>
-    
-  </target>
+        <!DOCTYPE hibernate-configuration PUBLIC 
+          "-//Hibernate/Hibernate Configuration DTD 3.0//EN" 
+          "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
   
-  <target name="concat" depends="check-database">
+        <hibernate-configuration>
+          <session-factory>
+        ]]></header>
+        <fileset file="${project.resources.directory}/hibernate.properties.@{database}.xml" />
+        <fileset file="${project.resources.directory}/hibernate.mapping.xml" />
+        <fileset file="${project.resources.directory}/hibernate.cache.xml" />
+        <footer trimleading="yes"><![CDATA[
+          </session-factory>
+        </hibernate-configuration>
+        ]]></footer>
+      </concat>
+    </sequential>
+  </macrodef>
 
-    <!-- Concat hibernate.cfg.xml -->
-    <concat destfile="${project.build.directory}/classes/hibernate.cfg.xml">
-      <header trimleading="yes"><![CDATA[<?xml version='1.0' encoding='utf-8'?>
-
-<!DOCTYPE hibernate-configuration PUBLIC 
-  "-//Hibernate/Hibernate Configuration DTD 3.0//EN" 
-  "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
-  <session-factory>
-  ]]></header>
-      <fileset file="${project.resources.directory}/${hibernate.properties.xml}" />
-      <fileset file="${project.resources.directory}/hibernate.mapping.xml" />
-      <fileset file="${project.resources.directory}/hibernate.cache.xml" />
-      <footer trimleading="yes"><![CDATA[
-  </session-factory>
-</hibernate-configuration>
-  ]]></footer>
-    </concat>
+  <target name="concat">
+    <macro-database-cfg database="hsqldb"/>
+    <macro-database-cfg database="mysql"/>
+    <macro-database-cfg database="postgresql"/>
     
+    <echo message="Copy hibernate.cfg.${database}.xml to hibernate.cfg.xml" />
+    <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" tofile="${project.build.directory}/classes/hibernate.cfg.xml"/>
   </target>
 </project>
\ No newline at end of file

Modified: jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml	2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml	2008-09-02 10:00:32 UTC (rev 2064)
@@ -7,24 +7,14 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>src/main/resources</directory>
+      <directory>${project.build.outputDirectory}</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>hibernate.*</include>
+        <include>hibernate.cfg.xml</include>
+        <include>hibernate.cfg.*.xml</include>
         <include>jbpm.cfg.xml</include>
         <include>jbpm.mail.templates.xml</include>
       </includes>
-      <!-- exclude the dummy extra mappings -->
-      <excludes>
-        <exclude>hibernate.extra.hbm.xml</exclude>
-      </excludes>
     </fileSet>
-    <fileSet>
-      <directory>target/classes</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>hibernate.cfg.xml</include>
-      </includes>
-    </fileSet>
   </fileSets>
 </assembly>
\ No newline at end of file

Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml	2008-09-02 06:32:15 UTC (rev 2063)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml	2008-09-02 10:00:32 UTC (rev 2064)
@@ -1,4 +1,5 @@
-<!-- ################################### -->
+    
+    <!-- ################################### -->
     <!-- # cache settings                  # -->
     <!-- # strategy="nonstrict-read-write" # -->
     <!-- # can be used with hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider # -->




More information about the jbpm-commits mailing list