Author: alex.guizar(a)jboss.com Date: 2009-08-27 18:13:23 -0400 (Thu, 27 Aug 2009) New Revision: 5570 Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-mssql-ds.xml jbpm3/branches/jbpm-3.2-soa/modules/db/src/main/resources/mssql.properties Modified: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mssql.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/distribution/scripts/antrun-installer.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml jbpm3/branches/jbpm-3.2-soa/pom.xml jbpm3/branches/jbpm-3.2-soa/profiles.xml.example Log: [JBPM-1365] Add QA for mssql Modified: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa 2009-08-27 19:38:40 UTC (rev 5569) +++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa 2009-08-27 22:13:23 UTC (rev 5570) @@ -18,6 +18,13 @@ <jdbc.db2.username>jbpmtest</jdbc.db2.username> <jdbc.db2.password>jbpmtest</jdbc.db2.password> + <jdbc.mssql.server>localhost</jdbc.mssql.server> + <jdbc.mssql.port>3918</jdbc.mssql.port> + <jdbc.mssql.database>jbpmtest</jdbc.mssql.database> + <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url> + <jdbc.mssql.username>jbpmtest</jdbc.mssql.username> + <jdbc.mssql.password>jbpmtest</jdbc.mssql.password> + <jdbc.mysql.server>localhost</jdbc.mysql.server> <jdbc.mysql.port>3306</jdbc.mysql.port> <jdbc.mysql.database>jbpmtest</jdbc.mysql.database> Modified: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa 2009-08-27 19:38:40 UTC (rev 5569) +++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa 2009-08-27 22:13:23 UTC (rev 5570) @@ -18,6 +18,13 @@ <jdbc.db2.username>jbpm3</jdbc.db2.username> <jdbc.db2.password>jbpm3</jdbc.db2.password> + <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server> + <jdbc.mssql.port>3918</jdbc.mssql.port> + <jdbc.mssql.database>jbpm</jdbc.mssql.database> + <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url> + <jdbc.mssql.username>jbpm</jdbc.mssql.username> + <jdbc.mssql.password>jbpm</jdbc.mssql.password> + <jdbc.mysql.server>dev02.qa.atl2.redhat.com</jdbc.mysql.server> <jdbc.mysql.port>3306</jdbc.mysql.port> <jdbc.mysql.database>jbpm3</jdbc.mysql.database> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2009-08-27 19:38:40 UTC (rev 5569) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2009-08-27 22:13:23 UTC (rev 5570) @@ -239,110 +239,32 @@ </profile> <!-- - Name: no-database - Descr: Setup the default database + Name: db2 + Descr: DB2 Database Setup --> <profile> - <id>no-database</id> + <id>db2</id> <activation> <property> - <name>!database</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: hsqldb - Descr: Hypersonic Database Setup - --> - <profile> - <id>hsqldb</id> - <activation> - <property> <name>database</name> - <value>hsqldb</value> + <value>db2</value> </property> </activation> <build> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/jbpm/db/JbpmSchemaDbTest.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> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: postgresql - Descr: PostgreSQL Database Setup - --> - <profile> - <id>postgresql</id> - <activation> - <property> - <name>database</name> - <value>postgresql</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: sybase - Descr: Sybase Database Setup - --> - <profile> - <id>sybase</id> - <activation> - <property> - <name>database</name> - <value>sybase</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: oracle Descr: Oracle Database Setup --> @@ -367,32 +289,5 @@ </plugins> </build> </profile> - - <!-- - Name: db2 - Descr: DB2 Database Setup - --> - <profile> - <id>db2</id> - <activation> - <property> - <name>database</name> - <value>db2</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> 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 2009-08-27 19:38:40 UTC (rev 5569) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.mssql.xml 2009-08-27 22:13:23 UTC (rev 5570) @@ -3,10 +3,10 @@ <property name="hibernate.dialect">org.hibernate.dialect.SQLServerDialect</property> <!-- JDBC connection properties (begin) --> - <!-- fetch driver from http://msdn.microsoft.com/data/jdbc --> - <property name="hibernate.connection.driver_class">net.sourceforge.jtds.jdbc.Driver</property> - <property name="hibernate.connection.url">jdbc:jtds:sqlserver://localhost:1433/jbpmtest</property> - <property name="hibernate.connection.username"></property> - <property name="hibernate.connection.password"></property> + <property name="hibernate.connection.driver_class">com.microsoft.sqlserver.jdbc.SQLServerDriver</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> + <property name="hibernate.connection.isolation">4096</property> <!-- JDBC connection properties (end) --> Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-mssql-ds.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-mssql-ds.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-mssql-ds.xml 2009-08-27 22:13:23 UTC (rev 5570) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<datasources> + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>com.microsoft.sqlserver.jdbc.SQLServerXADataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.mssql.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.mssql.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.mssql.database}</xa-datasource-property> + <xa-datasource-property name="SelectMethod">cursor</xa-datasource-property> + <user-name>${jdbc.mssql.username}</user-name> + <password>${jdbc.mssql.password}</password> + + <!-- disable transaction interleaving --> + <track-connection-by-tx /> + <!-- force XAResource.isSameRM(XAResource) to return false --> + <isSameRM-override-value>false</isSameRM-override-value> + + <!-- corresponding type-mapping in standardjbosscmp-jdbc.xml --> + <type-mapping>MS SQLSERVER2000</type-mapping> + </xa-datasource> + +</datasources> 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 2009-08-27 19:38:40 UTC (rev 5569) +++ jbpm3/branches/jbpm-3.2-soa/modules/db/scripts/antrun-jbpmschema.xml 2009-08-27 22:13:23 UTC (rev 5570) @@ -16,35 +16,91 @@ <target name="setup-schema"> <taskdef name="jbpmschema" classname="org.jbpm.ant.JbpmSchemaTask"> - <classpath path="${maven.runtime.classpath}"/> + <classpath path="${maven.runtime.classpath}" /> </taskdef> - <property name="scriptsdir" value="${basedir}/target/classes"/> - <mkdir dir="${scriptsdir}"/> + <property name="scriptsdir" value="${basedir}/target/classes" /> + <mkdir dir="${scriptsdir}" /> </target> - <target name="create-schema" depends="setup-schema" description="Generate jBPM Database Schemas"> - <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" delimiter=";"/> - <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"/> + <target name="create-schema" + depends="setup-schema" + description="Generate jBPM Database Schemas"> + <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" + delimiter=";" /> + <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" /> </target> - - <target name="update-schema" depends="setup-schema" description="Generate jBPM Database Update Scripts"> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.db2.update322.sql" config="hibernate.cfg.db2.xml" properties="db2.properties" action="update"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.mysql.update322.sql" config="hibernate.cfg.mysql.xml" properties="mysql.properties" action="update" delimiter=";"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.oracle.update322.sql" config="hibernate.cfg.oracle.xml" properties="oracle.properties" action="update" delimiter=";"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.update322.sql" config="hibernate.cfg.postgresql.xml" properties="postgresql.properties" action="update" delimiter=";"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.sybase.update322.sql" config="hibernate.cfg.sybase.xml" properties="sybase.properties" action="update"/> + + <target name="update-schema" + depends="setup-schema" + description="Generate jBPM Database Update Scripts"> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.db2.update322.sql" + config="hibernate.cfg.db2.xml" + properties="db2.properties" + action="update" + delimiter=";" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.mssql.update322.sql" + config="hibernate.cfg.mssql.xml" + properties="mssql.properties" + action="update" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.mysql.update322.sql" + config="hibernate.cfg.mysql.xml" + properties="mysql.properties" + action="update" + delimiter=";" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.oracle.update322.sql" + config="hibernate.cfg.oracle.xml" + properties="oracle.properties" + action="update" + delimiter=";" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.update322.sql" + config="hibernate.cfg.postgresql.xml" + properties="postgresql.properties" + action="update" + delimiter=";" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.sybase.update322.sql" + config="hibernate.cfg.sybase.xml" + properties="sybase.properties" + action="update" /> </target> - + </project> Added: jbpm3/branches/jbpm-3.2-soa/modules/db/src/main/resources/mssql.properties =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/db/src/main/resources/mssql.properties (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/db/src/main/resources/mssql.properties 2009-08-27 22:13:23 UTC (rev 5570) @@ -0,0 +1,8 @@ +hibernate.dialect=org.hibernate.dialect.SQLServerDialect +# +# This uses the jbpm322 database schema as reference for the SchemaUpdate task +# +hibernate.connection.driver_class=com.microsoft.sqlserver.jdbc.SQLServerDriver +hibernate.connection.url=jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port}/jbpm322 +hibernate.connection.username=${jdbc.mssql.username} +hibernate.connection.password=${jdbc.mssql.password} \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-08-27 19:38:40 UTC (rev 5569) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-08-27 22:13:23 UTC (rev 5570) @@ -108,13 +108,6 @@ <type>zip</type> </dependency> <dependency> - <groupId>org.jbpm</groupId> - <artifactId>report-server</artifactId> - <type>war</type> - </dependency> - - <!-- Sources --> - <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-enterprise</artifactId> <classifier>sources</classifier> @@ -132,8 +125,6 @@ <classifier>sources</classifier> <version>${project.version}</version> </dependency> - - <!-- Javadoc --> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-enterprise</artifactId> @@ -152,14 +143,10 @@ <classifier>javadoc</classifier> <version>${project.version}</version> </dependency> - - <!-- Thirdparty Dependencies --> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> </dependency> - - <!-- Database Drivers --> <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> @@ -172,6 +159,14 @@ <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> </dependency> + + <!-- Sources --> + + <!-- Javadoc --> + + <!-- Thirdparty Dependencies --> + + <!-- Database Drivers --> </dependencies> <!-- Plugins --> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-08-27 19:38:40 UTC (rev 5569) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-08-27 22:13:23 UTC (rev 5570) @@ -60,6 +60,13 @@ </target> <target name="configure"> + <property name="db2.cfg.xml" + value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.db2.xml" /> + <macro-disable file="${db2.cfg.xml}" section="JDBC connection properties" /> + <macro-disable file="${db2.cfg.xml}" section="Automatic schema creation" /> + <macro-enable file="${db2.cfg.xml}" section="DataSource properties" /> + <macro-enable file="${db2.cfg.xml}" section="JTA transaction properties" /> + <property name="hsqldb.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" /> <macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties" /> @@ -67,6 +74,13 @@ <macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties" /> <macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties" /> + <property name="mssql.cfg.xml" + value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.mssql.xml" /> + <macro-disable file="${mssql.cfg.xml}" section="JDBC connection properties" /> + <macro-disable file="${mssql.cfg.xml}" section="Automatic schema creation" /> + <macro-enable file="${mssql.cfg.xml}" section="DataSource properties" /> + <macro-enable file="${mssql.cfg.xml}" section="JTA transaction properties" /> + <property name="mysql.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.mysql.xml" /> <macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties" /> @@ -74,6 +88,13 @@ <macro-enable file="${mysql.cfg.xml}" section="DataSource properties" /> <macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties" /> + <property name="oracle.cfg.xml" + value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.oracle.xml" /> + <macro-disable file="${oracle.cfg.xml}" section="JDBC connection properties" /> + <macro-disable file="${oracle.cfg.xml}" section="Automatic schema creation" /> + <macro-enable file="${oracle.cfg.xml}" section="DataSource properties" /> + <macro-enable file="${oracle.cfg.xml}" section="JTA transaction properties" /> + <property name="postgresql.cfg.xml" value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.postgresql.xml" /> <macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties" /> @@ -88,20 +109,6 @@ <macro-enable file="${sybase.cfg.xml}" section="DataSource properties" /> <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties" /> - <property name="oracle.cfg.xml" - value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.oracle.xml" /> - <macro-disable file="${oracle.cfg.xml}" section="JDBC connection properties" /> - <macro-disable file="${oracle.cfg.xml}" section="Automatic schema creation" /> - <macro-enable file="${oracle.cfg.xml}" section="DataSource properties" /> - <macro-enable file="${oracle.cfg.xml}" section="JTA transaction properties" /> - - <property name="db2.cfg.xml" - value="${project.build.assembly.resources}/jbpm-jpdl-config/hibernate.cfg.db2.xml" /> - <macro-disable file="${db2.cfg.xml}" section="JDBC connection properties" /> - <macro-disable file="${db2.cfg.xml}" section="Automatic schema creation" /> - <macro-enable file="${db2.cfg.xml}" section="DataSource properties" /> - <macro-enable file="${db2.cfg.xml}" section="JTA transaction properties" /> - <subant genericantfile="${ant.file}" target="reorganize-example" inheritall="yes"> <dirset dir="${project.build.assembly.resources}/jbpm-examples-dev/src/test/resources" includes="*" /> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-08-27 19:38:40 UTC (rev 5569) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-08-27 22:13:23 UTC (rev 5570) @@ -64,14 +64,26 @@ </condition> <!-- Target Database Conditions --> + <condition type="variable" id="isDB2"> + <name>dbSelection</name> + <value>db2</value> + </condition> <condition type="variable" id="isHypersonic"> <name>dbSelection</name> <value>hsqldb</value> </condition> + <condition type="variable" id="isMSSQL"> + <name>dbSelection</name> + <value>mssql</value> + </condition> <condition type="variable" id="isMySQL"> <name>dbSelection</name> <value>mysql</value> </condition> + <condition type="variable" id="isOracle"> + <name>dbSelection</name> + <value>oracle</value> + </condition> <condition type="variable" id="isPostgreSQL"> <name>dbSelection</name> <value>postgresql</value> @@ -80,14 +92,6 @@ <name>dbSelection</name> <value>sybase</value> </condition> - <condition type="variable" id="isOracle"> - <name>dbSelection</name> - <value>oracle</value> - </condition> - <condition type="variable" id="isDB2"> - <name>dbSelection</name> - <value>db2</value> - </condition> </conditions> <!-- Panels --> @@ -229,20 +233,30 @@ <!-- Database configs to docs/examples/jbpm --> <fileset dir=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true"> + <include name="hibernate.cfg.db2.xml" /> <include name="hibernate.cfg.hsqldb.xml" /> + <include name="hibernate.cfg.mssql.xml" /> <include name="hibernate.cfg.mysql.xml" /> + <include name="hibernate.cfg.oracle.xml" /> <include name="hibernate.cfg.postgresql.xml" /> <include name="hibernate.cfg.sybase.xml" /> - <include name="hibernate.cfg.oracle.xml" /> - <include name="hibernate.cfg.db2.xml" /> + <include name="jbpm-db2-ds.xml" /> <include name="jbpm-hsqldb-ds.xml" /> + <include name="jbpm-mssql-ds.xml" /> <include name="jbpm-mysql-ds.xml" /> + <include name="jbpm-oracle-ds.xml" /> <include name="jbpm-postgresql-ds.xml" /> <include name="jbpm-sybase-ds.xml" /> - <include name="jbpm-oracle-ds.xml" /> - <include name="jbpm-db2-ds.xml" /> </fileset> + <!-- Database DB2 --> + <file condition="isDB2" + src=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-db2-ds.xml&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /> + <singlefile condition="isDB2" + src=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.db2.xml&quot; + target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + <!-- Database Hypersonic --> <file condition="isHypersonic" src=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml&quot; @@ -255,6 +269,14 @@ <include name="hypersonic/jbpmDB.*" /> </fileset> + <!-- Database MSSQL --> + <file condition="isMSSQL" + src=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-mssql-ds.xml&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /> + <singlefile condition="isMSSQL" + src=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.mssql.xml&quot; + target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + <!-- Database MySQL --> <file condition="isMySQL" src=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml&quot; @@ -265,6 +287,14 @@ <file condition="isMySQL" src=&quot;(a){project.build.assemblyDirectory}/lib/mysql-connector-java.jar&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" /> + <!-- Database Oracle --> + <file condition="isOracle" + src=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /> + <singlefile condition="isOracle" + src=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.oracle.xml&quot; + target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + <!-- Database PostgreSQL --> <file condition="isPostgreSQL" src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-postgresql-ds.xml" @@ -282,22 +312,6 @@ <singlefile condition="isSybase" src=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.sybase.xml&quot; target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - - <!-- Database Oracle --> - <file condition="isOracle" - src=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml&quot; - targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /> - <singlefile condition="isOracle" - src=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.oracle.xml&quot; - target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - - <!-- Database DB2 --> - <file condition="isDB2" - src=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-db2-ds.xml&quot; - targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /> - <singlefile condition="isDB2" - src=&quot;(a){project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.db2.xml&quot; - target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> </pack> <!-- Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml 2009-08-27 19:38:40 UTC (rev 5569) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml 2009-08-27 22:13:23 UTC (rev 5570) @@ -28,6 +28,7 @@ <spec> <choice txt="DB2" value="db2"/> <choice txt="HSQL" value="hsqldb" set="true"/> + <choice txt="SQL Server" value="mssql"/> <choice txt="MySQL" value="mysql"/> <choice txt="PostgreSQL" value="postgresql"/> <choice txt="Sybase" value="sybase"/> Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-08-27 19:38:40 UTC (rev 5569) +++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-08-27 22:13:23 UTC (rev 5570) @@ -43,11 +43,10 @@ <!-- Properties --> <properties> - <apache.ant.version>1.7.0</apache.ant.version> - <apache.cactus.version>1.8.0</apache.cactus.version> - <apache.jackrabbit.version>1.4.5</apache.jackrabbit.version> + <ant.version>1.7.0</ant.version> <birt.version>2.2.2</birt.version> <bsh.version>1.3.0</bsh.version> + <cactus.version>1.8.0</cactus.version> <commons.fileupload.version>1.2.1</commons.fileupload.version> <commons.io.version>1.4</commons.io.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -57,6 +56,7 @@ <dumbster.version>1.6</dumbster.version> <hibernate.version>3.2.6.ga</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> <javax.faces.version>1.2_03</javax.faces.version> @@ -64,28 +64,27 @@ <javax.mail.version>1.4</javax.mail.version> <javax.servlet.version>2.5</javax.servlet.version> <jaxen.version>1.1.1</jaxen.version> + <jboss.client.version>4.0.5.GA</jboss.client.version> + <jboss.gravel.version>1.0.0.GA</jboss.gravel.version> <jboss.j2ee.version>4.0.2</jboss.j2ee.version> <jbpm.designer.version>3.1.7</jbpm.designer.version> <jbpm.jsf-console.version>3.2.7</jbpm.jsf-console.version> - <jboss.client.version>4.0.5.GA</jboss.client.version> - <jboss.gravel.version>1.0.0.GA</jboss.gravel.version> <jdocbook.version>2.1.2</jdocbook.version> <junit.version>3.8.1</junit.version> + <mvel.version>1.3.1-java1.4</mvel.version> <richfaces.ui.version>3.2.1.GA</richfaces.ui.version> - <report-server.version>1.0.0.Beta1</report-server.version> <sun.facelets.version>1.1.14</sun.facelets.version> <xerces.version>2.6.2</xerces.version> <!-- Database Driver Versions --> + <db2jcc.version>3.1.57</db2jcc.version> <hsqldb.version>1.8.0.7</hsqldb.version> + <jconnect.version>6.0.5</jconnect.version> + <msjdbc.version>1.2.2828.100</msjdbc.version> <mysql.connector.version>5.0.7</mysql.connector.version> + <ojdbc.version>10.2.0.4</ojdbc.version> <postgresql.version>8.2-504.jdbc3</postgresql.version> - <jtds.version>1.2.2</jtds.version> - <jconnect.version>6.0.5</jconnect.version> - <ojdbc.version>10.2.0.4</ojdbc.version> - <db2jcc.version>3.1.57</db2jcc.version> - <mvel.version>1.3.1-java1.4</mvel.version> - </properties> + </properties> <!-- DependencyManagement --> <dependencyManagement> @@ -110,25 +109,29 @@ <version>${jbpm.designer.version}</version> <type>zip</type> </dependency> - <dependency> - <groupId>org.jbpm</groupId> - <artifactId>report-server</artifactId> - <version>${report-server.version}</version> - <type>war</type> - </dependency> <!-- Thirdparty Dependencies --> <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>${ant.version}</version> + </dependency> + <dependency> <groupId>bsh</groupId> <artifactId>bsh</artifactId> <version>${bsh.version}</version> </dependency> <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>${sun.facelets.version}</version> + <groupId>org.apache.cactus</groupId> + <artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId> + <version>${cactus.version}</version> </dependency> <dependency> + <groupId>org.apache.cactus</groupId> + <artifactId>cactus.integration.shared.api</artifactId> + <version>${cactus.version}</version> + </dependency> + <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> <version>${commons.fileupload.version}</version> @@ -154,11 +157,26 @@ <version>${dom4j.version}</version> </dependency> <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-compiler</artifactId> + <version>${drools.version}</version> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-core</artifactId> + <version>${drools.version}</version> + </dependency> + <dependency> <groupId>dumbster</groupId> <artifactId>dumbster</artifactId> <version>${dumbster.version}</version> </dependency> <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-core</artifactId> + <version>${jackrabbit.version}</version> + </dependency> + <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> <version>${jasper.reports.version}</version> @@ -184,6 +202,21 @@ <version>${javax.faces.version}</version> </dependency> <dependency> + <groupId>org.jboss.client</groupId> + <artifactId>jbossall-client</artifactId> + <version>${jboss.client.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.gravel</groupId> + <artifactId>gravel</artifactId> + <version>${jboss.gravel.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-j2ee</artifactId> + <version>${jboss.j2ee.version}</version> + </dependency> + <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> <version>${javax.jcr.version}</version> @@ -199,61 +232,23 @@ <version>${javax.servlet.version}</version> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - <version>${jboss.j2ee.version}</version> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${apache.ant.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cactus</groupId> - <artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId> - <version>${apache.cactus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cactus</groupId> - <artifactId>cactus.integration.shared.api</artifactId> - <version>${apache.cactus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-core</artifactId> - <version>${apache.jackrabbit.version}</version> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-compiler</artifactId> - <version>${drools.version}</version> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-core</artifactId> - <version>${drools.version}</version> - </dependency> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> <version>${hibernate.version}</version> </dependency> <dependency> - <groupId>org.jboss.client</groupId> - <artifactId>jbossall-client</artifactId> - <version>${jboss.client.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.gravel</groupId> - <artifactId>gravel</artifactId> - <version>${jboss.gravel.version}</version> - </dependency> - <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> <version>${richfaces.ui.version}</version> </dependency> <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>${sun.facelets.version}</version> + </dependency> + + <!-- Database Driver Versions --> + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>${hsqldb.version}</version> @@ -268,8 +263,6 @@ <artifactId>postgresql</artifactId> <version>${postgresql.version}</version> </dependency> - - <!-- Database Driver Versions --> </dependencies> </dependencyManagement> @@ -404,6 +397,40 @@ </profile> <!-- + Name: db2 + Descr: DB2 Database Setup + --> + <profile> + <id>db2</id> + <activation> + <property> + <name>database</name> + <value>db2</value> + </property> + </activation> + <repositories> + <repository> + <id>qa.jboss.com</id> + <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url> + </repository> + </repositories> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>${db2jcc.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>${db2jcc.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + + <!-- Name: hsqldb Descr: Hypersonic Database Setup --> @@ -425,6 +452,33 @@ </profile> <!-- + Name: mssql + Descr: MSSQL Database Setup + --> + <profile> + <id>mssql</id> + <activation> + <property> + <name>database</name> + <value>mssql</value> + </property> + </activation> + <repositories> + <repository> + <id>qa.jboss.com</id> + <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url> + </repository> + </repositories> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>msjdbc</artifactId> + <version>${msjdbc.version}</version> + </dependency> + </dependencies> + </profile> + + <!-- Name: mysql Descr: MySQL Database Setup --> @@ -521,40 +575,5 @@ </repository> </repositories> </profile> - - <!-- - Name: db2 - Descr: DB2 Database Setup - --> - <profile> - <id>db2</id> - <activation> - <property> - <name>database</name> - <value>db2</value> - </property> - </activation> - <repositories> - <repository> - <id>qa.jboss.com</id> - <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url> - </repository> - </repositories> - <dependencies> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc</artifactId> - <version>${db2jcc.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>${db2jcc.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - </profiles> </project> Modified: jbpm3/branches/jbpm-3.2-soa/profiles.xml.example =================================================================== --- jbpm3/branches/jbpm-3.2-soa/profiles.xml.example 2009-08-27 19:38:40 UTC (rev 5569) +++ jbpm3/branches/jbpm-3.2-soa/profiles.xml.example 2009-08-27 22:13:23 UTC (rev 5570) @@ -25,6 +25,13 @@ <jdbc.db2.username>jbpmtest</jdbc.db2.username> <jdbc.db2.password>jbpmtest</jdbc.db2.password> + <jdbc.mssql.server>localhost</jdbc.mssql.server> + <jdbc.mssql.port>3918</jdbc.mssql.port> + <jdbc.mssql.database>jbpmtest</jdbc.mssql.database> + <jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url> + <jdbc.mssql.username>jbpmtest</jdbc.mssql.username> + <jdbc.mssql.password>jbpmtest</jdbc.mssql.password> + <jdbc.mysql.server>localhost</jdbc.mysql.server> <jdbc.mysql.port>3306</jdbc.mysql.port> <jdbc.mysql.database>jbpmtest</jdbc.mysql.database>