August 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r5570 - in jbpm3/branches/jbpm-3.2-soa: hudson and 7 other directories.

by do-not-reply＠jboss.org

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>  <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> - -  - <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>  - <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> - -  - <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> - -  - <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> - -  @@ -367,32 +289,5 @@ </plugins> </build> </profile> - -  - <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>  -  - <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>  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> + +  + <track-connection-by-tx /> +  + <isSameRM-override-value>false</isSameRM-override-value> + +  + <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> - -  - <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> - -  <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-enterprise</artifactId> @@ -152,14 +143,10 @@ <classifier>javadoc</classifier> <version>${project.version}</version> </dependency> - -  <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> </dependency> - -  <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> @@ -172,6 +159,14 @@ <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> </dependency> + +  + +  + +  + +  </dependencies>  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>  + <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>  @@ -229,20 +233,30 @@  <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config" 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> +  + <file condition="isDB2" + src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-db2-ds.xml" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /> + <singlefile condition="isDB2" + src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.db2.xml" + target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> +  <file condition="isHypersonic" src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml" @@ -255,6 +269,14 @@ <include name="hypersonic/jbpmDB.*" /> </fileset> +  + <file condition="isMSSQL" + src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-mssql-ds.xml" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /> + <singlefile condition="isMSSQL" + src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.mssql.xml" + target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> +  <file condition="isMySQL" src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml" @@ -265,6 +287,14 @@ <file condition="isMySQL" src="@{project.build.assemblyDirectory}/lib/mysql-connector-java.jar" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" /> +  + <file condition="isOracle" + src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /> + <singlefile condition="isOracle" + src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.oracle.xml" + target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> +  <file condition="isPostgreSQL" src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-postgresql-ds.xml" @@ -282,22 +312,6 @@ <singlefile condition="isSybase" src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.sybase.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - -  - <file condition="isOracle" - src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml" - targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /> - <singlefile condition="isOracle" - src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.oracle.xml" - target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - -  - <file condition="isDB2" - src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/jbpm-db2-ds.xml" - targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /> - <singlefile condition="isDB2" - src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.db2.xml" - target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> </pack>  <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>  + <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> @@ -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>  <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> + +  + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>${hsqldb.version}</version> @@ -268,8 +263,6 @@ <artifactId>postgresql</artifactId> <version>${postgresql.version}</version> </dependency> - -  </dependencies> </dependencyManagement> @@ -404,6 +397,40 @@ </profile>  + <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> + +  @@ -425,6 +452,33 @@ </profile>  + <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> + +  @@ -521,40 +575,5 @@ </repository> </repositories> </profile> - -  - <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>

16 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r5569 - in jbpm4/trunk: modules/distro/src/main/files/examples and 4 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-27 15:38:40 -0400 (Thu, 27 Aug 2009) New Revision: 5569 Added: jbpm4/trunk/qa/demo.setup.jboss.bat Removed: jbpm4/trunk/qa/test.demo.setup.bat Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml jbpm4/trunk/modules/distro/src/main/files/examples/build.xml jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml jbpm4/trunk/modules/distro/src/main/files/install/build.xml jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml Log: jboss demo setup migration Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-08-27 19:16:58 UTC (rev 5568) +++ jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-08-27 19:38:40 UTC (rev 5569) @@ -36,6 +36,7 @@ <exclude>org.jbpm.jbpm4:jbpm-distro:jar</exclude> <exclude>org.jbpm.jbpm4:jbpm-examples:jar</exclude> <exclude>org.jbpm.jbpm4:jbpm-gpd:zip</exclude> + <exclude>org.jbpm.jbpm4.dependencies.signavio:signavio:war</exclude> <exclude>org.jbpm.jbpm4:jbpm-test-db:jar</exclude> </excludes> <outputDirectory>lib</outputDirectory> @@ -45,8 +46,15 @@ <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> </includes> <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> - <outputDirectory>gpd</outputDirectory> + <outputDirectory>install/src/gpd</outputDirectory> </dependencySet> + <dependencySet> + <includes> + <include>org.jbpm.jbpm4.dependencies.signavio:signavio:war</include> + </includes> + <outputFileNameMapping>signavio.war</outputFileNameMapping> + <outputDirectory>install/src/signavio</outputDirectory> + </dependencySet> </dependencySets> <fileSets> Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-08-27 19:16:58 UTC (rev 5568) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-08-27 19:38:40 UTC (rev 5569) @@ -12,15 +12,6 @@ <property name="jboss.version" value="5.0.0.GA" /> <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> - <property name="jboss.parent.dir" value="${jbpm.home}" /> - <property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" /> - <property name="jboss.server.configuration" value="default" /> - <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> - - <property name="tomcat.version" value="6.0.20" /> - <property name="tomcat.parent.dir" value="${jbpm.home}" /> - <property name="tomcat.home" value="${tomcat.parent.dir}/apache-tomcat-${tomcat.version}" /> -  <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> <property file="${jbpm.home}/db/jdbc/${database}.properties" /> @@ -46,21 +37,13 @@ </target>  - <target name="deploy.examples.into.jboss" - description="deploys all the example processes" - depends="jbpm.libs.path, examples.jar, create.and.deploy.examples"> - <mkdir dir="${jboss.server.config.dir}/deploy/jbpm/userlibs" /> - <copy file="${jbpm.home}/examples/target/examples.jar" - todir="${jboss.server.config.dir}/deploy/jbpm/userlibs" - overwrite="true" /> - </target> - - <target name="create.and.deploy.examples"> + <target name="create.and.deploy.examples" + depends="jbpm.libs.path, examples.jar"> <mkdir dir="${jbpm.home}/examples/target" /> - <copy file="${jbpm.home}/db/hibernate.cfg/${database}.hibernate.cfg.xml" + <copy file="${jbpm.home}/install/src/cfg/hibernate/jdbc/${database}.hibernate.cfg.xml" tofile="${jbpm.home}/examples/target/classes/jbpm.hibernate.cfg.xml" overwrite="true"> - <filterset filtersfile="${jbpm.home}/db/jdbc/${database}.properties" /> + <filterset filtersfile="${jbpm.home}/install/src/jdbc/${database}.properties" /> </copy> <jar destfile="${jbpm.home}/examples/target/examples.bar"> <fileset dir="${jbpm.home}/examples/src"> @@ -90,15 +73,6 @@ <jbpm-deploy file="${jbpm.home}/examples/target/examples.bar" /> </target> - <target name="deploy.examples.into.tomcat" - description="deploys all the example processes" - depends="jbpm.libs.path, examples.jar, create.and.deploy.examples"> - - <copy file="${jbpm.home}/examples/target/examples.jar" - todir="${tomcat.home}/lib" - overwrite="true" /> - </target> - <target name="examples.jar" depends="jbpm.libs.path"> <mkdir dir="${jbpm.home}/examples/target/classes" /> <javac srcdir="${jbpm.home}/examples/src" Modified: jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 2009-08-27 19:16:58 UTC (rev 5568) +++ jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 2009-08-27 19:38:40 UTC (rev 5569) @@ -65,7 +65,6 @@ <property name="eclipse.parent.dir" value="${jbpm.home}" /> <property name="eclipse.distro.path" value="${eclipse.distro.dir}/${eclipse.filename}" /> -  <target name="log.properties"> <echo message="jbpm.version......... ${jbpm.version}" /> @@ -73,51 +72,4 @@ <echo message="eclipse.distro.path.. ${eclipse.distro.path}" /> </target> -  - <target name="install.eclipse" - depends="log.properties, get.eclipse" - description="unzips eclipse, downloads eclipse if it is not available in ${eclipse.distro.dir}"> - <antcall target="internal.install.eclipse.windows" /> - <antcall target="internal.install.eclipse.non.windows" /> - </target> - - <target name="internal.install.eclipse.windows" if="isWindows"> - <unzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${jbpm.home}" overwrite="true" /> - </target> - - <target name="internal.install.eclipse.non.windows" if="isNotWindows"> - <gunzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${eclipse.distro.dir}" /> - <untar src="${eclipse.distro.dir}/${eclipse.tarfilename}" dest="${jbpm.home}" overwrite="true" /> - <delete file="${eclipse.distro.dir}/${eclipse.tarfilename}"/> - </target> - -  - <condition property="is.eclipse.distro.available"> - <available file="${eclipse.distro.path}" /> - </condition> - <target name="get.eclipse" - unless="is.eclipse.distro.available" - description="downloads eclipse to ${eclipse.distro.dir}"> - <mkdir dir="${eclipse.distro.dir}" /> - <get src="${eclipse.distro.url}" dest="${eclipse.distro.path}" /> - </target> - -  - <target name="start.eclipse" - description="starts eclipse"> -  - <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> - <arg line="/C start "${jbpm.home}/eclipse/eclipse.exe" "-data" "${jbpm.home}/workspace"" /> - </exec> -  - <chmod perm="+x"> - <fileset dir="${jbpm.home}/eclipse"> - <filename name="eclipse"/> - </fileset> - </chmod> - <exec executable="/bin/bash" os="Linux,Mac OS X"> - <arg line="-c "${jbpm.home}/eclipse/eclipse" "-data" "${jbpm.home}/workspace"" /> - </exec> - </target> - </project> Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-27 19:16:58 UTC (rev 5568) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-27 19:38:40 UTC (rev 5569) @@ -47,6 +47,90 @@ <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> <property name="jboss.server.data.dir" value="${jboss.home}/server/${jboss.server.configuration}/data" /> +  + <condition property="is.jboss.distro.available"> + <available file="${jboss.distro.path}" /> + </condition> + <condition property="is.tomcat.distro.available"> + <available file="${tomcat.distro.path}" /> + </condition> + <condition property="is.linux.unix.or.mac"> + <or> + <os family="unix" /> + <os family="mac" /> + </or> + </condition> + +  + <condition property="isWindows"> + <os family="windows"/> + </condition> + <condition property="isNotWindows"> + <not> + <isset property="isWindows" /> + </not> + </condition> + +  + <condition property="eclipse.filename" value="eclipse-jee-galileo-win32.zip"> + <contains string="${os.name}" casesensitive="false" substring="win" /> + </condition> + <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-macosx-carbon.tar"> + <contains string="${os.name}" casesensitive="false" substring="mac" /> + </condition> + <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz"> + <contains string="${os.name}" casesensitive="false" substring="mac" /> + </condition> + <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-linux-gtk.tar"> + <and> + <contains string="${os.name}" casesensitive="false" substring="linux" /> + <not> + <contains string="${os.arch}" casesensitive="false" substring="64" /> + </not> + </and> + </condition> + <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz"> + <and> + <contains string="${os.name}" casesensitive="false" substring="linux" /> + <not> + <contains string="${os.arch}" casesensitive="false" substring="64" /> + </not> + </and> + </condition> + <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-linux-gtk-x86_64.tar"> + <and> + <contains string="${os.name}" casesensitive="false" substring="linux" /> + <contains string="${os.arch}" casesensitive="false" substring="64" /> + </and> + </condition> + <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz"> + <and> + <contains string="${os.name}" casesensitive="false" substring="linux" /> + <contains string="${os.arch}" casesensitive="false" substring="64" /> + </and> + </condition> + <property name="eclipse.distro.url" value="http://mirror.cc.vt.edu/pub/eclipse/technology/epp/downloads/release/gali..." /> + <property name="eclipse.distro.dir" value="${jbpm.home}/downloads" /> + <property name="eclipse.parent.dir" value="${jbpm.home}" /> + <property name="eclipse.distro.path" value="${eclipse.distro.dir}/${eclipse.filename}" /> + +  + <target name="demo.setup.jboss" + depends="install.jboss, install.jbpm.into.jboss, start.jboss" + description="installs jboss, installs jbpm into jboss, starts jboss, creates the jBPM DB schema, deploys examples, loads example identities, installs and starts eclipse"> + <antcall target="create.jbpm.schema" /> + <ant antfile="${jbpm.home}/examples/build.xml" target="create.and.deploy.examples" /> + <antcall target="load.example.identities" /> + <antcall target="install.eclipse" /> + <antcall target="start.eclipse" /> + </target> + + <target name="demo.teardown" + description="drops the jbpm db schema and stops jboss"> + <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" /> + <antcall target="stop.jboss" /> + </target> +  <target name="clean.cfg.dir" description="Deletes the ${cfg.dest.dir}"> <delete dir="${cfg.dest.dir}" /> @@ -149,9 +233,6 @@ </target>  - <condition property="is.jboss.distro.available"> - <available file="${jboss.distro.path}" /> - </condition> <target name="get.jboss" unless="is.jboss.distro.available" description="Downloads jboss into ${jboss.distro.dir}"> @@ -292,16 +373,10 @@ depends="get.tomcat" description="Downloads tomcat to ${tomcat.distro.dir} if its not available and then unzips tomcat"> <unzip src="${tomcat.distro.path}" dest="${tomcat.parent.dir}" /> - <condition property="isLinuxUnixOrMac"> - <or> - <os family="unix" /> - <os family="mac" /> - </or> - </condition> <antcall target="install.tomcat.linuxandmac" /> </target> - <target name="install.tomcat.linuxandmac" if="isLinuxUnixOrMac"> + <target name="install.tomcat.linuxandmac" if="is.linux.unix.or.mac"> <chmod perm="a+x" os="Linux, Mac OS X"> <fileset dir="${tomcat.home}/bin"> <include name="*.sh" /> @@ -310,9 +385,6 @@ </target>  - <condition property="is.tomcat.distro.available"> - <available file="${tomcat.distro.path}" /> - </condition> <target name="get.tomcat" unless="is.tomcat.distro.available" description="Downloads tomcat into ${tomcat.distro.dir} if it is not available"> @@ -560,7 +632,7 @@ userid="${jdbc.username}" password="${jdbc.password}" onerror="continue"> - <transaction src="${jbpm.home}/db/example.identities.sql"/> + <transaction src="${jbpm.home}/install/src/demo/example.identities.sql"/> <classpath> <fileset dir="${jbpm.home}/lib"> <include name="*.jar"/> @@ -591,7 +663,6 @@ </java> </target> - <target name="internal.copy.database.driver.if.needed" if="database.driver"> <available file="${jbpm.home}/lib/${database.driver}" property="database.driver.jar.available" /> <fail message="please download the ${database} driver jar and put it in the ${jbpm.home}/lib directory" unless="database.driver.jar.available" /> @@ -599,4 +670,51 @@ <copy file="${jbpm.home}/lib/${database.driver}" todir="${database.driver.destination.dir}" /> </target> +  + <target name="install.eclipse" + depends="get.eclipse" + description="unzips eclipse, downloads eclipse if it is not available in ${eclipse.distro.dir}"> + <antcall target="internal.install.eclipse.windows" /> + <antcall target="internal.install.eclipse.non.windows" /> + </target> + + <target name="internal.install.eclipse.windows" if="isWindows"> + <unzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${jbpm.home}" overwrite="true" /> + </target> + + <target name="internal.install.eclipse.non.windows" if="isNotWindows"> + <gunzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${eclipse.distro.dir}" /> + <untar src="${eclipse.distro.dir}/${eclipse.tarfilename}" dest="${jbpm.home}" overwrite="true" /> + <delete file="${eclipse.distro.dir}/${eclipse.tarfilename}"/> + </target> + +  + <condition property="is.eclipse.distro.available"> + <available file="${eclipse.distro.path}" /> + </condition> + <target name="get.eclipse" + unless="is.eclipse.distro.available" + description="downloads eclipse to ${eclipse.distro.dir}"> + <mkdir dir="${eclipse.distro.dir}" /> + <get src="${eclipse.distro.url}" dest="${eclipse.distro.path}" /> + </target> + +  + <target name="start.eclipse" + description="starts eclipse"> +  + <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> + <arg line="/C start "${jbpm.home}/eclipse/eclipse.exe" "-data" "${jbpm.home}/workspace"" /> + </exec> +  + <chmod perm="+x"> + <fileset dir="${jbpm.home}/eclipse"> + <filename name="eclipse"/> + </fileset> + </chmod> + <exec executable="/bin/bash" os="Linux,Mac OS X"> + <arg line="-c "${jbpm.home}/eclipse/eclipse" "-data" "${jbpm.home}/workspace"" /> + </exec> + </target> + </project> Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-08-27 19:16:58 UTC (rev 5568) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-08-27 19:38:40 UTC (rev 5569) @@ -64,7 +64,7 @@ <target name="demo.setup" depends="install.jboss, install.jbpm.into.jboss, start.jboss" description="installs jboss, installs jbpm into jboss, starts jboss, creates the jBPM DB schema, deploys examples, loads example identities, installs and starts eclipse"> - <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" /> + <antcall target="create.jbpm.schema" /> <ant antfile="${jbpm.home}/examples/build.xml" target="deploy.examples.into.jboss" /> <ant antfile="${jbpm.home}/db/build.xml" target="load.example.identities" /> <ant antfile="${jbpm.home}/gpd/build.xml" target="install.eclipse" /> Copied: jbpm4/trunk/qa/demo.setup.jboss.bat (from rev 5567, jbpm4/trunk/qa/test.demo.setup.bat) =================================================================== --- jbpm4/trunk/qa/demo.setup.jboss.bat (rev 0) +++ jbpm4/trunk/qa/demo.setup.jboss.bat 2009-08-27 19:38:40 UTC (rev 5569) @@ -0,0 +1,6 @@ +echo To run this, make sure that at least you have jbpm.parent.dir specified in your ${user.home}/.jbpm4/build.properties +cmd /C mvn -U -Pdistro clean install +cmd /C ant -f qa/build.xml reinstall.jbpm +cmd /C ant -f modules/distro/src/main/files/install/build.xml demo.setup.jboss + +echo \ No newline at end of file Deleted: jbpm4/trunk/qa/test.demo.setup.bat =================================================================== --- jbpm4/trunk/qa/test.demo.setup.bat 2009-08-27 19:16:58 UTC (rev 5568) +++ jbpm4/trunk/qa/test.demo.setup.bat 2009-08-27 19:38:40 UTC (rev 5569) @@ -1,6 +0,0 @@ -echo To run this, make sure that at least you have jbpm.parent.dir specified in your ${user.home}/.jbpm4/build.properties -cmd /C mvn -U -Pdistro,schemadocs clean install -cmd /C ant -f qa/build.xml reinstall.jbpm -cmd /C ant -f modules/distro/src/main/files/jboss/build.xml demo.setup - -echo \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r5568 - jbpm4/trunk/qa.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-27 15:16:58 -0400 (Thu, 27 Aug 2009) New Revision: 5568 Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh Log: changed windows backslashes to unix forward slashes Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2009-08-27 17:13:21 UTC (rev 5567) +++ jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2009-08-27 19:16:58 UTC (rev 5568) @@ -13,8 +13,8 @@ mvn -U -Pdistro,integration clean install ant -f qa/build.xml $ANT_PROPERTIES testsuite.jboss.setup -cd modules\test-cactus +cd modules/test-cactus mvn -Pruntest test -cd ..\.. +cd ../.. ant -f qa/build.xml $ANT_PROPERTIES testsuite.jboss.teardown

16 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r5567 - in jbpm4/trunk/modules/integration: tomcat and 12 other directories.

by do-not-reply＠jboss.org

Author: jbarrez Date: 2009-08-27 13:13:21 -0400 (Thu, 27 Aug 2009) New Revision: 5567 Added: jbpm4/trunk/modules/integration/tomcat/ jbpm4/trunk/modules/integration/tomcat/pom.xml jbpm4/trunk/modules/integration/tomcat/src/ jbpm4/trunk/modules/integration/tomcat/src/main/ jbpm4/trunk/modules/integration/tomcat/src/main/java/ jbpm4/trunk/modules/integration/tomcat/src/main/java/org/ jbpm4/trunk/modules/integration/tomcat/src/main/java/org/jbpm/ jbpm4/trunk/modules/integration/tomcat/src/main/java/org/jbpm/integration/ jbpm4/trunk/modules/integration/tomcat/src/main/java/org/jbpm/integration/tomcat6/ jbpm4/trunk/modules/integration/tomcat/src/main/java/org/jbpm/integration/tomcat6/JbpmConsoleRealm.java jbpm4/trunk/modules/integration/tomcat/src/main/resources/ jbpm4/trunk/modules/integration/tomcat/src/main/resources/org/ jbpm4/trunk/modules/integration/tomcat/src/main/resources/org/jbpm/ jbpm4/trunk/modules/integration/tomcat/src/main/resources/org/jbpm/integration/ jbpm4/trunk/modules/integration/tomcat/src/main/resources/org/jbpm/integration/tomcat6/ jbpm4/trunk/modules/integration/tomcat/src/main/resources/org/jbpm/integration/tomcat6/mbean-descriptors.xml Log: Forgot to commit tomcat6 integration classes Added: jbpm4/trunk/modules/integration/tomcat/pom.xml =================================================================== --- jbpm4/trunk/modules/integration/tomcat/pom.xml (rev 0) +++ jbpm4/trunk/modules/integration/tomcat/pom.xml 2009-08-27 17:13:21 UTC (rev 5567) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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>jBPM 4 - Integration Tomcat 6</name> + <description>JBoss jBPM - Tomcat 6</description> + + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-tomcat6</artifactId> + <packaging>jar</packaging> + + <parent> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-integration</artifactId> + <version>4.1-SNAPSHOT</version> + </parent> + +  + <properties> + </properties> + +  + <dependencies> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>catalina</artifactId> + <version>6.0.20</version> + <scope>provided</scope> + </dependency> + </dependencies> + +</project> Added: jbpm4/trunk/modules/integration/tomcat/src/main/java/org/jbpm/integration/tomcat6/JbpmConsoleRealm.java =================================================================== --- jbpm4/trunk/modules/integration/tomcat/src/main/java/org/jbpm/integration/tomcat6/JbpmConsoleRealm.java (rev 0) +++ jbpm4/trunk/modules/integration/tomcat/src/main/java/org/jbpm/integration/tomcat6/JbpmConsoleRealm.java 2009-08-27 17:13:21 UTC (rev 5567) @@ -0,0 +1,255 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +/** + * + */ +package org.jbpm.integration.tomcat6; + +import java.security.Principal; +import java.sql.Connection; +import java.sql.Driver; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import org.apache.catalina.realm.GenericPrincipal; +import org.apache.catalina.realm.JDBCRealm; +import org.apache.catalina.realm.RealmBase; + + +/** + * Basic implementation of a Realm authenticator for the jBPM identity tables + * using plain JDBC queries. + * + * The default provided JDBCRealm cannot be used, since the tables need + * to follow a schema which does not map to the jBPM identity tables. + * See http://tomcat.apache.org/tomcat-6.0-doc/realm-howto.html#JDBCRealm. + * + * This code is based on the {@link JDBCRealm} code. + * + * @author Joram Barrez + */ +public class JbpmConsoleRealm extends RealmBase { + + private String driverName; + + private String connectionUrl; + + private String connectionName; + + private String connectionPassword; + + private Driver driver; + + public Principal authenticate(String user, String credentials) { + Connection conn = null; + try { + + conn = openConnection(); + Long userId = retrieveUserId(conn, user, credentials); + + if (userId != null) { + List<String> roles = retrieveRoles(conn, userId); + return new GenericPrincipal(this, user, credentials, roles); + } + + } catch (Exception e) { + containerLog.error(e); + } finally { + if (conn != null) { + try { + conn.close(); + } catch (SQLException e) { + containerLog.error(e); + } + } + } + return null; + } + + private Long retrieveUserId(Connection conn, String username, String password) throws SQLException { + Long result = null; + PreparedStatement stm = null; + try { + stm = conn.prepareStatement("SELECT DBID_ FROM JBPM4_ID_USER WHERE ID_=? AND PASSWORD_=?"); + stm.setString(1, username); + stm.setString(2, password); + ResultSet rs = stm.executeQuery(); + while (rs.next()) { + return rs.getLong(1); + } + } finally { + stm.close(); + } + return result; + } + + private List<String> retrieveRoles(Connection conn, Long userDbId) throws SQLException { + List<String> roles = new ArrayList<String>(); + PreparedStatement stm = null; + try { + stm = conn.prepareStatement("SELECT JBPM4_ID_GROUP.NAME_ FROM JBPM4_ID_GROUP " + + "INNER JOIN JBPM4_ID_MEMBERSHIP ON JBPM4_ID_MEMBERSHIP.GROUP_=JBPM4_ID_GROUP.DBID_ " + + "INNER JOIN JBPM4_ID_USER ON JBPM4_ID_MEMBERSHIP.USER_=JBPM4_ID_USER.DBID_ " + + "WHERE JBPM4_ID_USER.DBID_=?"); + stm.setLong(1, userDbId); + ResultSet rs = stm.executeQuery(); + while (rs.next()) { + roles.add(rs.getString(1)); + } + } finally { + stm.close(); + } + return roles; + } + + public Principal authenticate(String user, byte[] credentials) { + return authenticate(user, new String(credentials)); + } + + public Principal authenticate(String arg0, String arg1, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7) { + throw new UnsupportedOperationException(); + } + + /** + * Return the password associated with the principal user name. + */ + @Override + protected String getPassword(String username) { + throw new UnsupportedOperationException(); + } + + + /** + * Return the principal associated with the given username. + */ + @Override + protected Principal getPrincipal(String userName) { + throw new UnsupportedOperationException(); + } + + + protected String getName() { + return this.getClass().getName(); + } + + public String getInfo() { + return "JbpmConsoleRealm"; + } + + + private Connection openConnection() throws SQLException { + + if (driver == null) { + try { + driver = (Driver) Class.forName(driverName).newInstance(); + DriverManager.setLoginTimeout(10); + } catch (Exception e) { + throw new RuntimeException("Could not instantiate driver " + driverName); + } + } + + + Properties props = new Properties(); + props.put("user", connectionName); + props.put("password", connectionPassword); + + Connection conn = driver.connect(connectionUrl, props); + conn.setReadOnly(true); + return conn; + } + + /** + * @return the driverName + */ + public String getDriverName() { + return driverName; + } + + + + /** + * @param driverName the driverName to set + */ + public void setDriverName(String driverName) { + this.driverName = driverName; + } + + + + /** + * @return the connectionUrl + */ + public String getConnectionUrl() { + return connectionUrl; + } + + + + /** + * @param connectionUrl the connectionUrl to set + */ + public void setConnectionUrl(String connectionUrl) { + this.connectionUrl = connectionUrl; + } + + + + /** + * @return the connectionName + */ + public String getConnectionName() { + return connectionName; + } + + + + /** + * @param connectionName the connectionName to set + */ + public void setConnectionName(String connectionName) { + this.connectionName = connectionName; + } + + + + /** + * @return the connectionPassword + */ + public String getConnectionPassword() { + return connectionPassword; + } + + + + /** + * @param connectionPassword the connectionPassword to set + */ + public void setConnectionPassword(String connectionPassword) { + this.connectionPassword = connectionPassword; + } + +} Added: jbpm4/trunk/modules/integration/tomcat/src/main/resources/org/jbpm/integration/tomcat6/mbean-descriptors.xml =================================================================== --- jbpm4/trunk/modules/integration/tomcat/src/main/resources/org/jbpm/integration/tomcat6/mbean-descriptors.xml (rev 0) +++ jbpm4/trunk/modules/integration/tomcat/src/main/resources/org/jbpm/integration/tomcat6/mbean-descriptors.xml 2009-08-27 17:13:21 UTC (rev 5567) @@ -0,0 +1,26 @@ +<?xml version="1.0"?> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd"> +<mbeans-descriptors> + <mbean name="JbpmConsoleRealm" className="org.apache.catalina.mbeans.ClassNameMBean" + description="Implementation of custom Realm for jBPM console" + domain="Catalina" group="Realm" + type="org.jbpm.integration.tomcat6.JbpmConsoleRealm"> + + <attribute name="driverName" description="The driver name" + type="java.lang.String" /> + + <attribute name="connectionUrl" description="The connectionUrl" + type="java.lang.String" /> + + <attribute name="connectionName" description="The connectionName" + type="java.lang.String" /> + + <attribute name="connectionPassword" description="The dconnectionPassword" + type="java.lang.String" /> + + </mbean> + +</mbeans-descriptors> +

16 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r5566 - in jbpm4/trunk: modules/distro and 6 other directories.

by do-not-reply＠jboss.org

Author: jbarrez Date: 2009-08-27 10:09:31 -0400 (Thu, 27 Aug 2009) New Revision: 5566 Added: jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml Modified: jbpm4/trunk/modules/distro/pom.xml jbpm4/trunk/modules/distro/src/main/files/examples/build.xml jbpm4/trunk/modules/distro/src/main/files/install/build.xml jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml jbpm4/trunk/modules/integration/pom.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java jbpm4/trunk/pom.xml Log: Added Tomcat version of the demo.setup Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/modules/distro/pom.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -69,6 +69,10 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-tomcat6</artifactId> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> </dependency> <dependency> Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -1,106 +1,119 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="jbpm.examples"> - -  - <property file="${user.home}/.jbpm4/build.properties" /> -  - <property name="database" value="hsqldb" /> - <property name="jbpm.parent.dir" value="../.." /> - <property name="jbpm.version" value="4.1-SNAPSHOT" /> - <property name="jboss.version" value="5.0.0.GA" /> - <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> +  + <property file="${user.home}/.jbpm4/build.properties" /> - <property name="jboss.parent.dir" value="${jbpm.home}" /> - <property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" /> - <property name="jboss.server.configuration" value="default" /> - <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> +  + <property name="database" value="hsqldb" /> + <property name="jbpm.parent.dir" value="../.." /> + <property name="jbpm.version" value="4.1-SNAPSHOT" /> + <property name="jboss.version" value="5.0.0.GA" /> + <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> -  - <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> - <property file="${jbpm.home}/db/jdbc/${database}.properties" /> + <property name="jboss.parent.dir" value="${jbpm.home}" /> + <property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" /> + <property name="jboss.server.configuration" value="default" /> + <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> + + <property name="tomcat.version" value="6.0.20" /> + <property name="tomcat.parent.dir" value="${jbpm.home}" /> + <property name="tomcat.home" value="${tomcat.parent.dir}/apache-tomcat-${tomcat.version}" /> +  + <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> + <property file="${jbpm.home}/db/jdbc/${database}.properties" /> +  - <target name="log.properties"> - <echo message="database: ${database}" /> - <echo message="jdbc.driver........ ${jdbc.driver}" /> - <echo message="jdbc.url........... ${jdbc.url}" /> - <echo message="jdbc.username...... ${jdbc.username}" /> - <echo message="jbpm.version....... ${jbpm.version}" /> - <echo message="jbpm.home.......... ${jbpm.home}" /> - </target> - + <target name="log.properties"> + <echo message="database: ${database}" /> + <echo message="jdbc.driver........ ${jdbc.driver}" /> + <echo message="jdbc.url........... ${jdbc.url}" /> + <echo message="jdbc.username...... ${jdbc.username}" /> + <echo message="jbpm.version....... ${jbpm.version}" /> + <echo message="jbpm.home.......... ${jbpm.home}" /> + </target> + <target name="jbpm.libs.path"> - <path id="jbpm.libs.incl.dependencies"> - <pathelement location="${jbpm.home}/examples/target/classes" /> - <fileset dir="${jbpm.home}"> - <include name="jbpm.jar" /> - </fileset> - <fileset dir="${jbpm.home}/lib" /> - </path> + <path id="jbpm.libs.incl.dependencies"> + <pathelement location="${jbpm.home}/examples/target/classes" /> + <fileset dir="${jbpm.home}"> + <include name="jbpm.jar" /> + </fileset> + <fileset dir="${jbpm.home}/lib" /> + </path> </target> - -  - <target name="deploy.examples" + +  + <target name="deploy.examples.into.jboss" description="deploys all the example processes" - depends="jbpm.libs.path, examples.jar"> - <mkdir dir="${jbpm.home}/examples/target" /> - <copy file="${jbpm.home}/db/hibernate.cfg/${database}.hibernate.cfg.xml" - tofile="${jbpm.home}/examples/target/classes/jbpm.hibernate.cfg.xml" - overwrite="true"> - <filterset filtersfile="${jbpm.home}/db/jdbc/${database}.properties" /> - </copy> - <jar destfile="${jbpm.home}/examples/target/examples.bar"> - <fileset dir="${jbpm.home}/examples/src"> - <exclude name="jbpm.cfg.xml" /> - <exclude name="jbpm.hibernate.cfg.xml" /> - <exclude name="jbpm.mail.properties" /> - <exclude name="jbpm.mail.templates.examples.xml" /> - <exclude name="logging.properties" /> - <exclude name="org/jbpm/examples/task/swimlane/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/task/candidates/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/concurrency/graphbased/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/timer/repeat/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/script/text/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/decision/handler/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/mail/template/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/script/expression/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/task/assignee/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/mail/inline/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/mail/template/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/eventlistener/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/timer/event/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/task/assignmenthandler/process.jpdl.xml" /> - <exclude name="org/jbpm/examples/java/JavaInstantiateTest.java" /> - </fileset> - </jar> - <taskdef name="jbpm-deploy" - classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" - classpathref="jbpm.libs.incl.dependencies" /> - <jbpm-deploy file="${jbpm.home}/examples/target/examples.bar" /> - - <mkdir dir="${jboss.server.config.dir}/deploy/jbpm/userlibs" /> - <copy file="${jbpm.home}/examples/target/examples.jar" + depends="jbpm.libs.path, examples.jar, create.and.deploy.examples"> + <mkdir dir="${jboss.server.config.dir}/deploy/jbpm/userlibs" /> + <copy file="${jbpm.home}/examples/target/examples.jar" todir="${jboss.server.config.dir}/deploy/jbpm/userlibs" overwrite="true" /> - </target> - + </target> + + <target name="create.and.deploy.examples"> + <mkdir dir="${jbpm.home}/examples/target" /> + <copy file="${jbpm.home}/db/hibernate.cfg/${database}.hibernate.cfg.xml" + tofile="${jbpm.home}/examples/target/classes/jbpm.hibernate.cfg.xml" + overwrite="true"> + <filterset filtersfile="${jbpm.home}/db/jdbc/${database}.properties" /> + </copy> + <jar destfile="${jbpm.home}/examples/target/examples.bar"> + <fileset dir="${jbpm.home}/examples/src"> + <exclude name="jbpm.cfg.xml" /> + <exclude name="jbpm.hibernate.cfg.xml" /> + <exclude name="jbpm.mail.properties" /> + <exclude name="jbpm.mail.templates.examples.xml" /> + <exclude name="logging.properties" /> + <exclude name="org/jbpm/examples/task/swimlane/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/task/candidates/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/concurrency/graphbased/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/timer/repeat/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/script/text/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/decision/handler/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/mail/template/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/script/expression/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/task/assignee/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/mail/inline/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/mail/template/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/eventlistener/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/timer/event/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/task/assignmenthandler/process.jpdl.xml" /> + <exclude name="org/jbpm/examples/java/JavaInstantiateTest.java" /> + </fileset> + </jar> + <taskdef name="jbpm-deploy" classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" classpathref="jbpm.libs.incl.dependencies" /> + <jbpm-deploy file="${jbpm.home}/examples/target/examples.bar" /> + </target> + + <target name="deploy.examples.into.tomcat" + description="deploys all the example processes" + depends="jbpm.libs.path, examples.jar, create.and.deploy.examples"> + + <copy file="${jbpm.home}/examples/target/examples.jar" + todir="${tomcat.home}/lib" + overwrite="true" /> + </target> + <target name="examples.jar" depends="jbpm.libs.path"> - <mkdir dir="${jbpm.home}/examples/target/classes" /> - <javac srcdir="${jbpm.home}/examples/src" + <mkdir dir="${jbpm.home}/examples/target/classes" /> + <javac srcdir="${jbpm.home}/examples/src" destdir="${jbpm.home}/examples/target/classes" classpathref="jbpm.libs.incl.dependencies" /> - <copy todir="${jbpm.home}/examples/target/classes"> - <fileset dir="${jbpm.home}/examples/src"> - <exclude name="**/*.java" /> - </fileset> - </copy> - <jar destfile="${jbpm.home}/examples/target/examples.jar" > - <fileset dir="${jbpm.home}/examples/target/classes"> - <include name="**/*.class" /> - </fileset> - </jar> + <copy todir="${jbpm.home}/examples/target/classes"> + <fileset dir="${jbpm.home}/examples/src"> + <exclude name="**/*.java" /> + </fileset> + </copy> + <jar destfile="${jbpm.home}/examples/target/examples.jar" > + <fileset dir="${jbpm.home}/examples/target/classes"> + <include name="**/*.class" /> + </fileset> + </jar> </target> </project> Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -23,6 +23,7 @@ <property name="install.src.dir" value="${jbpm.home}/install/src" /> <property name="jdbc.properties.dir" value="${install.src.dir}/jdbc" /> <property name="mail.cfg" value="default" /> + <property file="${jbpm.home}/install/src/jdbc/${database}.properties" /> <property name="tomcat.version" value="6.0.20" /> <property name="tomcat.parent.dir" value="${jbpm.home}" /> @@ -349,6 +350,7 @@ <include name="hibernate-cglib-repack.jar" /> <include name="javassist.jar" /> <include name="jbpm-spi.jar" /> + <include name="jbpm-tomcat6.jar" /> <include name="jta.jar" /> <include name="juel*.jar" /> <include name="livetribe-jsr223.jar" /> @@ -389,6 +391,24 @@ </target> +  + <target name="demo.setup.tomcat" + depends="install.tomcat, install.jbpm.into.tomcat" + description="installs tomcat, installs jbpm into tomcat, starts tomcat, creates the jBPM DB schema, deploys examples, loads example identities, installs and starts eclipse"> + + <condition property="hsqldb.needed"> + <equals arg1="${database}" arg2="hsqldb" /> + </condition> + <antcall target="internal.install.and.start.hqsldb.if.needed" /> + + <antcall target="create.jbpm.schema" /> + <ant antfile="${jbpm.home}/examples/build.xml" target="deploy.examples.into.tomcat" /> + <antcall target="install.example.identities.into.tomcat" /> + <antcall target="start.tomcat" /> + <ant antfile="${jbpm.home}/gpd/build.xml" target="install.eclipse" /> + <ant antfile="${jbpm.home}/gpd/build.xml" target="start.eclipse" /> + </target> +  <target name="install.hsqldb.server"> <delete dir="${hsqldb.server.install.dir}" />  @@ -418,7 +438,6 @@  <target name="shutdown.hsqldb.server"> - <property file="${jbpm.home}/install/src/jdbc/${database}.properties" /> <sql driver="${jdbc.driver}" password="${jdbc.password}" url="${jdbc.url}" @@ -432,6 +451,11 @@ </classpath> </sql> </target> + + <target name="internal.install.and.start.hqsldb.if.needed" if="hsqldb.needed"> + <antcall target="install.hsqldb.server" /> + <antcall target="start.hsqldb.server" /> + </target>  @@ -544,8 +568,16 @@ </classpath> </sql> </target> + +  + <target name="install.example.identities.into.tomcat" depends="load.example.identities"> + <copy file="${install.src.dir}/tomcat/server.xml" + tofile="${tomcat.home}/conf/server.xml" + overwrite="true"> + <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" /> + </copy> + </target> -  <target name="hsqldb.databasemanager" description="start the hsqldb database manager"> Added: jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -0,0 +1,50 @@ +<?xml version='1.0' encoding='utf-8'?> +  +<Server port="8005" shutdown="SHUTDOWN"> + + <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> + <Listener className="org.apache.catalina.core.JasperListener" /> + <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" /> + <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> + + <Service name="Catalina"> + + <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" /> + + <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> + + <Engine name="Catalina" defaultHost="localhost"> + + <Host name="localhost" appBase="webapps" unpackWARs="true" + autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"> + +  + <Realm className="org.jbpm.integration.tomcat6.JbpmConsoleRealm" + driverName="@jdbc.driver@" + connectionUrl="@jdbc.url@" + connectionName="@jdbc.username@" + connectionPassword="@jdbc.password@" /> + + </Host> + </Engine> + </Service> +</Server> \ No newline at end of file Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -65,7 +65,7 @@ depends="install.jboss, install.jbpm.into.jboss, start.jboss" description="installs jboss, installs jbpm into jboss, starts jboss, creates the jBPM DB schema, deploys examples, loads example identities, installs and starts eclipse"> <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" /> - <ant antfile="${jbpm.home}/examples/build.xml" target="deploy.examples" /> + <ant antfile="${jbpm.home}/examples/build.xml" target="deploy.examples.into.jboss" /> <ant antfile="${jbpm.home}/db/build.xml" target="load.example.identities" /> <ant antfile="${jbpm.home}/gpd/build.xml" target="install.eclipse" /> <ant antfile="${jbpm.home}/gpd/build.xml" target="start.eclipse" /> Modified: jbpm4/trunk/modules/integration/pom.xml =================================================================== --- jbpm4/trunk/modules/integration/pom.xml 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/modules/integration/pom.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -124,6 +124,7 @@ <module>form-plugin</module> <module>graphView-plugin</module> <module>report</module> + <module>tomcat</module> </modules> </project> Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java 2009-08-27 14:09:31 UTC (rev 5566) @@ -55,7 +55,7 @@ System.setProperty("CATALINA_HOME", getTomcatHome()); // launch the command and wait till the END_MESSAGE appears - Thread launcher = new Launcher(this, command, END_MESSAGE, getTomcatHome()+fileSeparator+"bin"); + Thread launcher = new Launcher(this, command, END_MESSAGE, null); launcher.start(); launcher.join(); Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-08-27 13:37:56 UTC (rev 5565) +++ jbpm4/trunk/pom.xml 2009-08-27 14:09:31 UTC (rev 5566) @@ -139,6 +139,11 @@ <artifactId>jbpm-jboss5</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-tomcat6</artifactId> + <version>${version}</version> + </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-console-integration</artifactId>

16 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r5565 - jbpm4/trunk/qa.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-27 09:37:56 -0400 (Thu, 27 Aug 2009) New Revision: 5565 Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh Log: updating the hudson-jbpm4-jboss.sh script to align with the new jboss integration driver script Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2009-08-27 13:30:10 UTC (rev 5564) +++ jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2009-08-27 13:37:56 UTC (rev 5565) @@ -3,22 +3,18 @@ # runs the jboss integration test suite MAVEN_OPTS="-Xms1024M -Xmx1024M" -ANT_PROPERTIES="-Ddatabase=$DATABASE -Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss" - +ANT_PROPERTIES="-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss" echo ANT_PROPERTIES=${ANT_PROPERTIES} echo just in case the previous run didnt complete ok, we stop jboss -ant -f modules/distro/src/main/files/jboss/build.xml $ANT_PROPERTIES reinstall.jboss -ant -f modules/distro/src/main/files/jboss/build.xml $ANT_PROPERTIES stop.jboss +ant -f modules/distro/src/main/files/install/build.xml $ANT_PROPERTIES reinstall.jboss +ant -f modules/distro/src/main/files/install/build.xml $ANT_PROPERTIES stop.jboss -ant -f modules/distro/src/main/files/jboss/build.xml $ANT_PROPERTIES reinstall.jbossidm +mvn -U -Pdistro,integration clean install +ant -f qa/build.xml $ANT_PROPERTIES testsuite.jboss.setup -mvn -U -Pdistro -Pschemadocs clean install +cd modules\test-cactus +mvn -Pruntest test +cd ..\.. -ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.setup - -# -Ddatabase=$DATABASE is necessary for the reporting tests in module test-db -# that test uses the jbpm.hibernate.cfg.xml resource on the classpath to connect to the db -mvn -U -Djboss.bind.address=localhost -Ddatabase=$DATABASE test - -ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.teardown +ant -f qa/build.xml $ANT_PROPERTIES testsuite.jboss.teardown

16 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r5564 - in jbpm4/trunk: modules/distro/src/main/files/install/src/cfg/jbpm and 9 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-27 09:30:10 -0400 (Thu, 27 Aug 2009) New Revision: 5564 Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/remote.client.jbpm.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config.common/ jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config.jboss4/ jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config.jboss5/ jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/datasources/ jbpm4/trunk/qa/cactus.webapp.cfg/ jbpm4/trunk/qa/jboss.jbpm.cfg/ jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.cfg.xml jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.properties jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml Removed: jbpm4/trunk/modules/distro/src/main/files/jboss/config.common/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/ jbpm4/trunk/modules/distro/src/main/files/jboss/datasources/ jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.remote.client/jbpm.cfg.xml jbpm4/trunk/qa/cfg/ jbpm4/trunk/qa/jbpm.cfg.jboss.testsuite/ jbpm4/trunk/qa/jbpm.test.webapp/ Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/JBPMService.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java jbpm4/trunk/qa/build.xml jbpm4/trunk/qa/hudson-jbpm4-jboss.bat Log: refactored CI scripts to leverage the new install directory in the distribution for jboss test suite and change the jboss testsuite execution to use cactus instead of remote execution Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-27 12:43:00 UTC (rev 5563) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-27 13:30:10 UTC (rev 5564) @@ -163,19 +163,19 @@ description="Installs jBPM into JBoss">  <copy todir="${jboss.server.config.dir}" overwrite="true"> - <fileset dir="${jbpm.home}/jboss/config.common" /> + <fileset dir="${jbpm.home}/install/src/jboss/config.common" /> </copy>  - <copy file="${jbpm.home}/jboss/hibernate.cfg/${database}.hibernate.cfg.xml" + <copy file="${jbpm.home}/install/src/cfg/hibernate/datasource/${database}.hibernate.cfg.xml" tofile="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar/jbpm.hibernate.cfg.xml" overwrite="true" />  <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> - <filterset filtersfile="${jbpm.home}/db/jdbc/${database}.properties" /> - <fileset dir="${jbpm.home}/jboss/datasources"> + <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" /> + <fileset dir="${jbpm.home}/install/src/jboss/datasources"> <include name="jbpm-${database}-ds.xml"/> </fileset> </copy> @@ -210,7 +210,7 @@ <mkdir dir="${jboss.home}/docs/examples/jbpm" /> <copy todir="${jboss.home}/docs/examples/jbpm" overwrite="true"> - <fileset dir="${jbpm.home}/jboss/datasources" /> + <fileset dir="${jbpm.home}/install/src/jboss/datasources" /> </copy>  @@ -221,7 +221,7 @@  <copy todir="${jboss.server.config.dir}" overwrite="true"> - <fileset dir="${jbpm.home}/jboss/config.jboss5" /> + <fileset dir="${jbpm.home}/install/src/jboss/config.jboss5" /> </copy> <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> Copied: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/remote.client.jbpm.cfg.xml (from rev 5559, jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.remote.client/jbpm.cfg.xml) =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/remote.client.jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/remote.client.jbpm.cfg.xml 2009-08-27 13:30:10 UTC (rev 5564) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <import resource="jbpm.jbossremote.cfg.xml" /> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/remote.client.jbpm.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config.common (from rev 5559, jbpm4/trunk/modules/distro/src/main/files/jboss/config.common) Copied: jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config.jboss4 (from rev 5559, jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4) Copied: jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config.jboss5 (from rev 5559, jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5) Copied: jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/datasources (from rev 5559, jbpm4/trunk/modules/distro/src/main/files/jboss/datasources) Deleted: jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.remote.client/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.remote.client/jbpm.cfg.xml 2009-08-27 12:43:00 UTC (rev 5563) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/jbpm.cfg.remote.client/jbpm.cfg.xml 2009-08-27 13:30:10 UTC (rev 5564) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jbpm-configuration> - - <import resource="jbpm.jbossremote.cfg.xml" /> - -</jbpm-configuration> Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/JBPMService.java =================================================================== --- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/JBPMService.java 2009-08-27 12:43:00 UTC (rev 5563) +++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/JBPMService.java 2009-08-27 13:30:10 UTC (rev 5564) @@ -47,7 +47,7 @@ public void start() { - this.processEngine = new Configuration().buildProcessEngine(); + this.processEngine = Configuration.getProcessEngine(); try { Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-08-27 12:43:00 UTC (rev 5563) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-08-27 13:30:10 UTC (rev 5564) @@ -92,19 +92,7 @@ protected synchronized void initialize(String jbpmTestCfgResource, String jbpmTestCfgType) { if (processEngine==null) { - - if (log.isDebugEnabled()) { - log.debug("building "+ - (jbpmTestCfgType!=null ? jbpmTestCfgType+" " : "")+ - "ProcessEngine "+ - (jbpmTestCfgResource!=null ? "from resource "+jbpmTestCfgResource : "from default resource jbpm.cfg.xml")); - } - - Configuration configuration = new Configuration(jbpmTestCfgType); - if (jbpmTestCfgResource!=null) { - configuration.setResource(jbpmTestCfgResource); - } - processEngine = configuration.buildProcessEngine(); + processEngine = Configuration.getProcessEngine(); repositoryService = processEngine.get(RepositoryService.class); executionService = processEngine.getExecutionService(); Modified: jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java =================================================================== --- jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java 2009-08-27 12:43:00 UTC (rev 5563) +++ jbpm4/trunk/modules/test-cactus/src/main/java/org/jbpm/cactustool/CactusTestGenerator.java 2009-08-27 13:30:10 UTC (rev 5564) @@ -80,7 +80,10 @@ if (dirContentFiles!=null) { for (File file : dirContentFiles) { String fileName = file.getName(); - if (file.isFile() && file.getName().endsWith("Test.java")) { + if ( file.isFile() + && fileName.endsWith("Test.java") + && ! fileName.endsWith("SQLStmtTest.java") + ) { String className = packageName + "." + fileName.substring(0, fileName.length()-5)+".class"; log(" adding "+className); out.println(" suite.addTestSuite(" + className + ");"); Modified: jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java =================================================================== --- jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java 2009-08-27 12:43:00 UTC (rev 5563) +++ jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java 2009-08-27 13:30:10 UTC (rev 5564) @@ -92,7 +92,6 @@ suite.addTestSuite(org.jbpm.test.process.ProcessDefinitionQueryTest.class); suite.addTestSuite(org.jbpm.test.process.ProcessDefinitionStartFormTest.class); suite.addTestSuite(org.jbpm.test.process.RepositoryServiceTest.class); - suite.addTestSuite(org.jbpm.test.reporting.SQLStmtTest.class); suite.addTestSuite(org.jbpm.test.task.SubTaskTest.class); suite.addTestSuite(org.jbpm.test.task.TaskCommentsTest.class); suite.addTestSuite(org.jbpm.test.task.TaskCreateUpdateDeleteTest.class); Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2009-08-27 12:43:00 UTC (rev 5563) +++ jbpm4/trunk/qa/build.xml 2009-08-27 13:30:10 UTC (rev 5564) @@ -38,28 +38,11 @@ <echo message="jbpm.distro.path.. ${jbpm.distro.path}" /> -  - <target name="reinstall.jbpm" - description="deletes the jbpm installation and then reinstalls jbpm"> - <delete dir="${jbpm.home}" /> - <unzip src="${jbpm.distro.path}" dest="${jbpm.parent.dir}" /> - -  - <copy file="jdbc/${database}.properties" - todir="${jbpm.home}/install/src/jdbc" - overwrite="true" - failonerror="false" /> -  - <copy file="${user.home}/.jbpm4/jdbc/${database}.properties" - todir="${jbpm.home}/install/src/jdbc" - overwrite="true" - failonerror="false" /> -  - <copy file="../modules/distro/target/libs/ojdbc14.jar" - todir="${jbpm.home}/lib"/> - </target> - -  +  +  +  + +  <target name="testsuite.db.setup" depends="reinstall.jbpm"> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema"> @@ -67,12 +50,12 @@ <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" /> </target> -  +  <target name="testsuite.db.teardown"> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> </target> -  +  <target name="testsuite.tomcat.setup" depends="reinstall.jbpm"> <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.tomcat" /> @@ -86,7 +69,7 @@  <copy todir="${tomcat.home}/webapps/jbpm-test-webapp" overwrite="true"> - <fileset dir="jbpm.test.webapp" /> + <fileset dir="cactus.webapp.cfg" /> </copy>  @@ -105,54 +88,104 @@ <ant antfile="${jbpm.home}/install/build.xml" target="start.tomcat" /> </target> -  +  <target name="testsuite.tomcat.teardown">  <ant antfile="${jbpm.home}/install/build.xml" target="stop.tomcat" /> </target> - +  <target name="testsuite.jboss.setup" depends="reinstall.jbpm" description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema"> - <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" /> + <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.jboss" /> + <ant antfile="${jbpm.home}/install/build.xml" target="install.jbpm.into.jboss" /> -  - <antcall target="drop.jbossidm.schema" /> - <antcall target="create.jbossidm.schema" /> + <antcall target="internal.enable.jboss.debug" /> + <ant antfile="${jbpm.home}/install/build.xml" target="create.user.webapp" /> - <ant antfile="${jbpm.home}/jboss/build.xml" target="install.jbpm.into.jboss" /> - <antcall target="internal.tweak.jbpm.installation.for.integration.testrun" /> - <antcall target="internal.enable.jboss.debug" /> - <ant antfile="${jbpm.home}/jboss/build.xml" target="start.jboss" /> - <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" /> - <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" /> + <ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" /> + <mkdir dir="${jboss.server.config.dir}/deploy/jbpm/userlibs" /> + <copy file="${jbpm.home}/examples/target/examples.jar" + todir="${jboss.server.config.dir}/deploy/jbpm/userlibs" /> + +  + <mkdir dir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war" /> + <copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war"> + <fileset dir="${jbpm.home}/install/generated/user-webapp"/> + </copy> + +  + <copy todir="${jboss.home}/server/default/deploy/jbpm/jbpm-service.sar" overwrite="true"> + <fileset dir="jboss.jbpm.cfg" /> + </copy> + +  + <copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war" overwrite="true"> + <fileset dir="cactus.webapp.cfg" /> + </copy> + +  + <delete dir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/classes" /> + <delete file="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib/jta.jar" /> + +  + <ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" /> + <copy file="${jbpm.home}/examples/target/examples.jar" todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib" /> + +  + <copy file="${jbpm.home}/lib/junit.jar" todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib" /> + +  + <copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib"> + <fileset dir="../modules/test-cactus/target/jbpm.test.webapp.libs" /> + </copy> + +  + <ant antfile="${jbpm.home}/install/build.xml" target="start.jboss" /> + +  + <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" /> </target> +  <target name="testsuite.jboss.teardown" description="drops the jbpm schema and stops jboss"> - <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" /> - <antcall target="drop.jbossidm.schema" /> - <ant antfile="${jbpm.home}/jboss/build.xml" target="stop.jboss" /> + <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> + <ant antfile="${jbpm.home}/install/build.xml" target="stop.jboss" /> </target> +  +  +  +  +  + <target name="reinstall.jbpm" + description="deletes the jbpm installation and then reinstalls jbpm"> + <delete dir="${jbpm.home}" /> + <unzip src="${jbpm.distro.path}" dest="${jbpm.parent.dir}" /> - <target name="internal.tweak.jbpm.installation.for.integration.testrun"> - <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> - <fileset dir="jbpm.cfg.jboss.testsuite/jbpm.identity" /> - </copy> - <antcall target="internal.install.idm.into.jboss.integrationtestspecifics" /> - <ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" /> - <mkdir dir="${jboss.server.config.dir}/deploy/jbpm/userlibs" /> - <copy file="${jbpm.home}/examples/target/examples.jar" - todir="${jboss.server.config.dir}/deploy/jbpm/userlibs" /> - <copy file="../modules/test-db/target/jbpm-test-db-${jbpm.version}-tests.jar" - todir="${jboss.server.config.dir}/deploy/jbpm/userlibs" /> - <copy file="../modules/distro/target/libs/junit.jar" - todir="${jboss.server.config.dir}/deploy/jbpm/userlibs"/> +  + <copy file="jdbc/${database}.properties" + todir="${jbpm.home}/install/src/jdbc" + overwrite="true" + failonerror="false" /> +  + <copy file="${user.home}/.jbpm4/jdbc/${database}.properties" + todir="${jbpm.home}/install/src/jdbc" + overwrite="true" + failonerror="false" /> +  + <copy file="../modules/distro/target/libs/ojdbc14.jar" + todir="${jbpm.home}/lib"/> </target> - + +  +  +  +  + <target name="internal.install.idm.into.jboss.integrationtestspecifics" if="jbpm.identity.idm"> <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> <fileset dir="jbpm.cfg.jboss.testsuite/jboss.idm" /> Copied: jbpm4/trunk/qa/cactus.webapp.cfg (from rev 5559, jbpm4/trunk/qa/jbpm.test.webapp) Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.bat =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-jboss.bat 2009-08-27 12:43:00 UTC (rev 5563) +++ jbpm4/trunk/qa/hudson-jbpm4-jboss.bat 2009-08-27 13:30:10 UTC (rev 5564) @@ -1,9 +1,13 @@ set MAVEN_OPTS=-Xms1024M -Xmx1024M -cmd /C mvn -U -Pdistro clean install +cmd /C mvn -U -Pdistro,integration clean install cmd /C ant -f qa/build.xml testsuite.jboss.setup -cmd /C mvn -U -Djboss.bind.address=localhost -Ddatabase=hsqldb test + +cd modules\test-cactus +cmd /C mvn -Pruntest test +cd ..\.. + cmd /C ant -f qa/build.xml testsuite.jboss.teardown echo Copied: jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.cfg.xml (from rev 5559, jbpm4/trunk/qa/jbpm.cfg.jboss.testsuite/jbpm.identity/jbpm.cfg.xml) =================================================================== --- jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.cfg.xml 2009-08-27 13:30:10 UTC (rev 5564) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> + <import resource="jbpm.tx.jta.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> + + <import resource="jbpm.mail.templates.examples.xml" /> + +</jbpm-configuration> Property changes on: jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.properties (from rev 5559, jbpm4/trunk/qa/jbpm.cfg.jboss.testsuite/jbpm.identity/jbpm.mail.properties) =================================================================== --- jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.properties (rev 0) +++ jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.properties 2009-08-27 13:30:10 UTC (rev 5564) @@ -0,0 +1,3 @@ +mail.smtp.host localhost +mail.smtp.port 2525 +mail.from noreply(a)jbpm.org \ No newline at end of file Property changes on: jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml (from rev 5559, jbpm4/trunk/qa/jbpm.cfg.jboss.testsuite/jbpm.identity/jbpm.mail.templates.examples.xml) =================================================================== --- jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml (rev 0) +++ jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml 2009-08-27 13:30:10 UTC (rev 5564) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <process-engine-context> + + <mail-template name="rectify-template"> + <to addresses="${addressee}" /> + <cc users="bb" groups="innerparty" /> + <bcc groups="thinkpol" /> + <subject>rectify ${newspaper}</subject> + <text>${newspaper} ${date} ${details}</text> + </mail-template> + + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/trunk/qa/jboss.jbpm.cfg/jbpm.mail.templates.examples.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

16 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r5563 - jbpm4/trunk/qa/jdbc.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-27 08:43:00 -0400 (Thu, 27 Aug 2009) New Revision: 5563 Modified: jbpm4/trunk/qa/jdbc/oracle.properties Log: switched oracle db user for the jbpm4-db job back to user pvm1 Modified: jbpm4/trunk/qa/jdbc/oracle.properties =================================================================== --- jbpm4/trunk/qa/jdbc/oracle.properties 2009-08-27 10:28:06 UTC (rev 5562) +++ jbpm4/trunk/qa/jdbc/oracle.properties 2009-08-27 12:43:00 UTC (rev 5563) @@ -1,4 +1,4 @@ jdbc.driver=oracle.jdbc.driver.OracleDriver jdbc.url=jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01 -jdbc.username=PVM3 -jdbc.password=PVM3 +jdbc.username=PVM1 +jdbc.password=PVM1

16 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r5562 - in projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4: connector and 1 other directories.

by do-not-reply＠jboss.org

Author: jim.ma Date: 2009-08-27 06:28:06 -0400 (Thu, 27 Aug 2009) New Revision: 5562 Added: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/util/ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/util/StringUtil.java Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ActivityComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionJobDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionalJobComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/InstanceJobDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/JobComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TimerDiscoveryComponent.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnector.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/RemoteJBPMEngineConnector.java Log: Refactored the code to filter the null value Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ActivityComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ActivityComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ActivityComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jbpm.api.ProcessDefinition; + import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.measurement.MeasurementDataTrait; import org.rhq.core.domain.measurement.MeasurementReport; @@ -35,6 +36,7 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; +import org.rhq.plugins.jbpm4.util.StringUtil; public class ActivityComponent implements ResourceComponent<ProcessDefComponent> , MeasurementFacet { private ResourceContext<ProcessDefComponent> resourceContext; @@ -56,13 +58,13 @@ String activityName = resourceContext.getResourceKey(); Long duration = map.get(activityName); MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(duration)); + StringUtil.replaceNull(duration)); report.addData(value); } if (request.getName().equals("name")) { String activityName = resourceContext.getResourceKey(); MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(activityName)); + StringUtil.replaceNull(activityName)); report.addData(value); } } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionJobDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionJobDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionJobDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -32,7 +32,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class ExceptionJobDiscoveryComponent implements ResourceDiscoveryComponent<ProcessEngineComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionalJobComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionalJobComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ExceptionalJobComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -25,7 +25,7 @@ import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class ExceptionalJobComponent extends JobComponent implements OperationFacet { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/InstanceJobDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/InstanceJobDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/InstanceJobDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -32,7 +32,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class InstanceJobDiscoveryComponent implements ResourceDiscoveryComponent<ProcessInstanceComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/JobComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/JobComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/JobComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -34,8 +34,9 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; +import org.rhq.plugins.jbpm4.util.StringUtil; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class JobComponent implements ResourceComponent , MeasurementFacet { @@ -64,30 +65,30 @@ if (request.getName().equals("id")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(job.getId())); + StringUtil.replaceNull(job.getId())); report.addData(value); } if (request.getName().equals("duedate")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,String.valueOf(job.getDueDate() == null ? "--" : job.getDueDate())); + MeasurementDataTrait value = new MeasurementDataTrait(request,StringUtil.replaceNull(job.getDueDate())); report.addData(value); } if (request.getName().equals("lockExpirationTime")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,String.valueOf(job.getLockExpirationTime() == null ? "--" : job.getLockExpirationTime())); + MeasurementDataTrait value = new MeasurementDataTrait(request,StringUtil.replaceNull(job.getLockExpirationTime())); report.addData(value); } if (request.getName().equals("lockOwner")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,String.valueOf(job.getLockOwner() == null ? "--" : job.getLockOwner())); + MeasurementDataTrait value = new MeasurementDataTrait(request,StringUtil.replaceNull(job.getLockOwner())); report.addData(value); } if (request.getName().equals("isExclusive")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,String.valueOf(job.isExclusive())); + MeasurementDataTrait value = new MeasurementDataTrait(request,StringUtil.replaceNull(job.isExclusive())); report.addData(value); } if (request.getName().equals("exception")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, job.getException() == null ? "" : job.getException()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(job.getException())); report.addData(value); } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -40,8 +40,9 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; +import org.rhq.plugins.jbpm4.util.StringUtil; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class ProcessDefComponent implements ResourceComponent<ProcessEngineComponent> , MeasurementFacet, CreateChildResourceFacet { @@ -62,23 +63,23 @@ for (MeasurementScheduleRequest request : metrics) { if (request.getName().equals("version")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(processDef.getVersion())); + StringUtil.replaceNull((processDef.getVersion()))); report.addData(value); } if (request.getName().equals("id")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(processDef.getId())); + StringUtil.replaceNull(processDef.getId())); report.addData(value); } if (request.getName().equals("description")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,processDef.getDescription()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(processDef.getDescription())); report.addData(value); } if (request.getName().equals("avgPerProcessInstanceDuration")) { - String duration = getAverageProcessInstanceDuration() == null ? "--" : String.valueOf(getAverageProcessInstanceDuration()); + String duration = StringUtil.replaceNull(getAverageProcessInstanceDuration()); MeasurementDataTrait value = new MeasurementDataTrait(request, duration); report.addData(value); } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDefDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -33,7 +33,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class ProcessDefDiscoveryComponent implements ResourceDiscoveryComponent<ProcessEngineComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -47,8 +47,9 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; +import org.rhq.plugins.jbpm4.util.StringUtil; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class ProcessDeploymentComponent implements ResourceComponent<ProcessEngineComponent> , MeasurementFacet, ContentFacet, DeleteResourceFacet { @@ -70,23 +71,23 @@ if (request.getName().equals("id")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(deployment.getId())); + StringUtil.replaceNull(deployment.getId())); report.addData(value); } if (request.getName().equals("name")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(deployment.getName())); + StringUtil.replaceNull(deployment.getName())); report.addData(value); } if (request.getName().equals("timestamp")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,String.valueOf(deployment.getTimestamp())); + MeasurementDataTrait value = new MeasurementDataTrait(request,StringUtil.replaceNull(deployment.getTimestamp())); report.addData(value); } if (request.getName().equals("state")) { - MeasurementDataTrait value = new MeasurementDataTrait(request,String.valueOf(deployment.getState())); + MeasurementDataTrait value = new MeasurementDataTrait(request,StringUtil.replaceNull(deployment.getState())); report.addData(value); } } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessDeploymentDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -32,7 +32,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class ProcessDeploymentDiscoveryComponent implements ResourceDiscoveryComponent<ProcessEngineComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -26,6 +26,7 @@ import org.rhq.plugins.jbpm4.connector.JBPMEngineConnector; import org.rhq.plugins.jbpm4.connector.LocalJBPMEngineConnector; import org.rhq.plugins.jbpm4.connector.RemoteJBPMEngineConnector; +import org.rhq.plugins.jbpm4.util.StringUtil; import org.rhq.plugins.jmx.MBeanResourceComponent; public class ProcessEngineComponent extends MBeanResourceComponent implements CreateChildResourceFacet { @@ -67,27 +68,27 @@ for (MeasurementScheduleRequest request : metricRequests) { if (request.getName().equals("deployedProcessNumber")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(this.jbpmConnection.getProcessDefs().size())); + StringUtil.replaceNull(this.jbpmConnection.getProcessDefs().size())); report.addData(value); } if (request.getName().equals("processInstancNumber")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(this.jbpmConnection.getAllProcessInstance().size())); + StringUtil.replaceNull(this.jbpmConnection.getAllProcessInstance().size())); report.addData(value); } if (request.getName().equals("jobsNumber")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(this.jbpmConnection.queryJob(false, false, false, null).size())); + StringUtil.replaceNull(this.jbpmConnection.queryJob(false, false, false, null).size())); report.addData(value); } if (request.getName().equals("exceptionalJobsNumber")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(this.jbpmConnection.queryJob(false, false, true, null).size())); + StringUtil.replaceNull(this.jbpmConnection.queryJob(false, false, true, null).size())); report.addData(value); } } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessEngineDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -40,7 +40,7 @@ import org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class ProcessEngineDiscoveryComponent extends MBeanResourceDiscoveryComponent implements ClassLoaderFacet { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -36,8 +36,9 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; +import org.rhq.plugins.jbpm4.util.StringUtil; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class ProcessInstanceComponent implements ResourceComponent<ProcessDefComponent>, MeasurementFacet, DeleteResourceFacet { @@ -67,42 +68,42 @@ if (request.getName().equals("id")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getId())); + StringUtil.replaceNull(instance.getId())); report.addData(value); } if (request.getName().equals("key")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getKey() == null ? "--" : instance.getKey())); + StringUtil.replaceNull(instance.getKey())); report.addData(value); } if (request.getName().equals("name")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getName() == null ? "--" : instance.getName())); + StringUtil.replaceNull(instance.getName())); report.addData(value); } if (request.getName().equals("priority")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getPriority())); + StringUtil.replaceNull(instance.getPriority())); report.addData(value); } if (request.getName().equals("definitionId")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getProcessDefinitionId())); + StringUtil.replaceNull(instance.getProcessDefinitionId())); report.addData(value); } if (request.getName().equals("status")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getState())); + StringUtil.replaceNull(instance.getState())); report.addData(value); } } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -31,7 +31,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class ProcessInstanceDiscoveryComponent implements ResourceDiscoveryComponent<ProcessDefComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -26,20 +26,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jbpm.api.Execution; -import org.jbpm.api.ProcessInstance; import org.jbpm.api.history.HistoryProcessInstance; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.measurement.MeasurementDataTrait; import org.rhq.core.domain.measurement.MeasurementReport; import org.rhq.core.domain.measurement.MeasurementScheduleRequest; -import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; +import org.rhq.plugins.jbpm4.util.StringUtil; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class ProcessInstanceHistoryComponent implements ResourceComponent<ProcessDefComponent>, MeasurementFacet { @@ -66,48 +64,48 @@ if (request.getName().equals("key")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getKey())); + StringUtil.replaceNull(instance.getKey())); report.addData(value); } if (request.getName().equals("processDefinitionId")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getProcessDefinitionId())); + StringUtil.replaceNull(instance.getProcessDefinitionId())); report.addData(value); } if (request.getName().equals("processInstanceId")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getProcessInstanceId())); + StringUtil.replaceNull(instance.getProcessInstanceId())); report.addData(value); } if (request.getName().equals("duration")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getDuration())); + StringUtil.replaceNull(instance.getDuration())); report.addData(value); } if (request.getName().equals("startTime")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getStartTime())); + StringUtil.replaceNull(instance.getStartTime())); report.addData(value); } if (request.getName().equals("endTime")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getEndTime())); + StringUtil.replaceNull(instance.getEndTime())); report.addData(value); } if (request.getName().equals("state")) { MeasurementDataTrait value = new MeasurementDataTrait(request, - String.valueOf(instance.getState())); + StringUtil.replaceNull(instance.getState())); report.addData(value); } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/ProcessInstanceHistoryDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -33,7 +33,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class ProcessInstanceHistoryDiscoveryComponent implements ResourceDiscoveryComponent<ProcessDefComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -35,10 +35,8 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; -/** - * @author ema(a)redhat.com - * - */ +import org.rhq.plugins.jbpm4.util.StringUtil; + public class TaskComponent implements ResourceComponent<ProcessInstanceComponent> , MeasurementFacet { private ResourceContext<ProcessInstanceComponent> resourceContext; private Log log = LogFactory.getLog(this.getClass()); @@ -57,60 +55,58 @@ public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) { for (MeasurementScheduleRequest request : metrics) { if (request.getName().equals("id")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getId()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getId())); report.addData(value); } if (request.getName().equals("name")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getName()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getName())); report.addData(value); } if (request.getName().equals("createTime")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, String.valueOf(task.getCreateTime())); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getCreateTime())); report.addData(value); } if (request.getName().equals("dueDate")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, String.valueOf(task.getDuedate())); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getDuedate())); report.addData(value); } if (request.getName().equals("priority")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, String.valueOf(task.getPriority())); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getPriority())); report.addData(value); } if (request.getName().equals("activityName")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getActivityName()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getActivityName())); report.addData(value); } if (request.getName().equals("assignee")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getAssignee()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getAssignee())); report.addData(value); } if (request.getName().equals("description")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getDescription()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getDescription())); report.addData(value); } if (request.getName().equals("executionId")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getExecutionId()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getExecutionId())); report.addData(value); } if (request.getName().equals("formResourceName")) { - MeasurementDataTrait value = new MeasurementDataTrait(request, task.getFormResourceName()); + MeasurementDataTrait value = new MeasurementDataTrait(request, StringUtil.replaceNull(task.getFormResourceName())); report.addData(value); } - } - } Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TaskDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -32,7 +32,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class TaskDiscoveryComponent implements ResourceDiscoveryComponent<ProcessInstanceComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TimerDiscoveryComponent.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TimerDiscoveryComponent.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/TimerDiscoveryComponent.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -32,7 +32,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jbpm4.connector.JBPMEngineConnection; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class TimerDiscoveryComponent implements ResourceDiscoveryComponent<ProcessEngineComponent> { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnection.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -32,7 +32,7 @@ import org.jbpm.api.job.Job; import org.jbpm.api.task.Task; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public interface JBPMEngineConnection { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnector.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnector.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/JBPMEngineConnector.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -22,7 +22,7 @@ package org.rhq.plugins.jbpm4.connector; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public interface JBPMEngineConnector { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/LocalJBPMEngineConnector.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -48,7 +48,7 @@ import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.cmd.ExecuteJobCmd; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class LocalJBPMEngineConnector implements JBPMEngineConnector, JBPMEngineConnection { Modified: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/RemoteJBPMEngineConnector.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/RemoteJBPMEngineConnector.java 2009-08-27 09:39:04 UTC (rev 5561) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/connector/RemoteJBPMEngineConnector.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** - * @author ema(a)redhat.com + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> * */ public class RemoteJBPMEngineConnector implements JBPMEngineConnector { Added: projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/util/StringUtil.java =================================================================== --- projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/util/StringUtil.java (rev 0) +++ projects/jopr-integration/trunk/src/main/java/org/rhq/plugins/jbpm4/util/StringUtil.java 2009-08-27 10:28:06 UTC (rev 5562) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2006, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.rhq.plugins.jbpm4.util; +/** + * @author <a href mailto="ema(a)redhat.com">Jim Ma</a> + * + */ +public class StringUtil { + public static String DEFAULT_STRING = "--"; + public static String replaceNull(Object input) { + return input == null ? DEFAULT_STRING : String.valueOf(input); + } + +}

16 years, 8 months

1
0
0 / 0

JBoss JBPM SVN: r5561 - jbpm4/trunk/qa.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-08-27 05:39:04 -0400 (Thu, 27 Aug 2009) New Revision: 5561 Modified: jbpm4/trunk/qa/build.xml jbpm4/trunk/qa/hudson-jbpm4-db.bat jbpm4/trunk/qa/hudson-jbpm4-db.sh jbpm4/trunk/qa/hudson-jbpm4-jboss.bat Log: made target names for testsuite setup and teardown consistent Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2009-08-27 09:17:01 UTC (rev 5560) +++ jbpm4/trunk/qa/build.xml 2009-08-27 09:39:04 UTC (rev 5561) @@ -60,7 +60,7 @@ </target>  - <target name="db.integration.testsuite.setup" + <target name="testsuite.db.setup" depends="reinstall.jbpm"> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema"> </ant> @@ -68,18 +68,17 @@ </target>  - <target name="db.integration.testsuite.teardown"> + <target name="testsuite.db.teardown"> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> </target>  - <target name="tomcat.integration.testsuite.setup" + <target name="testsuite.tomcat.setup" depends="reinstall.jbpm"> <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.tomcat" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.user.webapp" />  - <echo message="sldjkflskdfj" /> <mkdir dir="${tomcat.home}/webapps/jbpm-test-webapp" /> <copy todir="${tomcat.home}/webapps/jbpm-test-webapp"> <fileset dir="${jbpm.home}/install/generated/user-webapp"/> @@ -107,13 +106,13 @@ </target>  - <target name="tomcat.integration.testsuite.teardown"> + <target name="testsuite.tomcat.teardown">  <ant antfile="${jbpm.home}/install/build.xml" target="stop.tomcat" /> </target> - <target name="integration.testrun.setup" + <target name="testsuite.jboss.setup" depends="reinstall.jbpm" description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema"> <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" /> @@ -129,7 +128,16 @@ <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" /> <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" /> </target> - + + <target name="testsuite.jboss.teardown" + description="drops the jbpm schema and stops jboss"> + <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" /> + <antcall target="drop.jbossidm.schema" /> + <ant antfile="${jbpm.home}/jboss/build.xml" target="stop.jboss" /> + </target> + + + <target name="internal.tweak.jbpm.installation.for.integration.testrun"> <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> <fileset dir="jbpm.cfg.jboss.testsuite/jbpm.identity" /> @@ -172,14 +180,6 @@ failonerror="false" /--> </target> - <target name="integration.testrun.teardown" - description="drops the jbpm schema and stops jboss"> - <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" /> - <antcall target="drop.jbossidm.schema" /> - <ant antfile="${jbpm.home}/jboss/build.xml" target="stop.jboss" /> - </target> - - <target name="drop.jbossidm.schema" if="identity.component.idm"> <ant antfile="${jbossidm.home}/db/build.xml" target="drop.jbossidm.schema" /> </target> Modified: jbpm4/trunk/qa/hudson-jbpm4-db.bat =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-db.bat 2009-08-27 09:17:01 UTC (rev 5560) +++ jbpm4/trunk/qa/hudson-jbpm4-db.bat 2009-08-27 09:39:04 UTC (rev 5561) @@ -3,6 +3,6 @@ @echo database: %1 cmd /C mvn -U -Pdistro clean install -cmd /C ant -f qa/build.xml -Ddatabase=%1 db.integration.testsuite.setup +cmd /C ant -f qa/build.xml -Ddatabase=%1 testsuite.db.setup cmd /C mvn -Ddatabase=%1 test -cmd /C ant -f qa/build.xml -Ddatabase=%1 db.integration.testsuite.teardown +cmd /C ant -f qa/build.xml -Ddatabase=%1 testsuite.db.teardown Modified: jbpm4/trunk/qa/hudson-jbpm4-db.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-db.sh 2009-08-27 09:17:01 UTC (rev 5560) +++ jbpm4/trunk/qa/hudson-jbpm4-db.sh 2009-08-27 09:39:04 UTC (rev 5561) @@ -3,6 +3,6 @@ # runs the smoke test suite mvn -U -Pdistro clean install -ant -f qa/build.xml -Ddatabase=$DATABASE db.integration.testsuite.setup +ant -f qa/build.xml -Ddatabase=$DATABASE -Djbpm.parent.dir=$WORKSPACE testsuite.db.setup mvn -Ddatabase=$DATABASE test -ant -f qa/build.xml -Ddatabase=$DATABASE db.integration.testsuite.teardown +ant -f qa/build.xml -Ddatabase=$DATABASE -Djbpm.parent.dir=$WORKSPACE testsuite.db.teardown Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.bat =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-jboss.bat 2009-08-27 09:17:01 UTC (rev 5560) +++ jbpm4/trunk/qa/hudson-jbpm4-jboss.bat 2009-08-27 09:39:04 UTC (rev 5561) @@ -1,14 +1,9 @@ set MAVEN_OPTS=-Xms1024M -Xmx1024M -cmd /C ant -f modules/distro/src/main/files/jboss/build.xml reinstall.jbossidm - cmd /C mvn -U -Pdistro clean install - -cmd /C ant -f qa/build.xml -Djbpm.debug=true integration.testrun.setup - +cmd /C ant -f qa/build.xml testsuite.jboss.setup cmd /C mvn -U -Djboss.bind.address=localhost -Ddatabase=hsqldb test +cmd /C ant -f qa/build.xml testsuite.jboss.teardown -cmd /C ant -f qa/build.xml integration.testrun.teardown - echo

16 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits August 2009