January 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r3737 - in jbpm4/branches/hbraun/modules: distro/scripts and 6 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-01-30 15:29:00 -0500 (Fri, 30 Jan 2009) New Revision: 3737 Added: jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-config.xml jbpm4/branches/hbraun/modules/jpdl/scripts/antrun-jbpm-config.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.common.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.db2.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.derby.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml Modified: jbpm4/branches/hbraun/modules/distro/pom.xml jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml jbpm4/branches/hbraun/modules/enterprise/pom.xml jbpm4/branches/hbraun/modules/jpdl/pom.xml jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml Log: Create integration config (*-ds.xml, jbpm-server.sar, etc) Modified: jbpm4/branches/hbraun/modules/distro/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/pom.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/distro/pom.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -25,10 +25,6 @@ <relativePath>../../pom.xml</relativePath> </parent> -  - <properties> - </properties> -  <dependencies> <dependency> @@ -64,11 +60,6 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-db</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-task</artifactId> <version>${version}</version> </dependency> @@ -105,7 +96,7 @@ <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-2</version> <executions> - <execution> +   Modified: jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -64,7 +64,7 @@  <target name="configure" depends="init"> -  + <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties"/> <condition property="database.is.hsqldb" value="true" else="false"> <equals arg1="${database}" arg2="hsqldb"/> Modified: jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -32,16 +32,16 @@ <scope>test</scope> <unpack>false</unpack> </dependencySet> - <dependencySet> +  -  <dependencySet> <outputDirectory>resources/jbpm-jpdl-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> @@ -49,9 +49,19 @@ <include>*:jbpm-jpdl:jar:config</include> </includes> <unpack>true</unpack> + </dependencySet> +  - <fileSets> + </dependencySets> + + <fileSets> <fileSet> <directory>src/main/resources</directory> <includes> Modified: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -6,8 +6,8 @@ <com.izforge.izpack.panels.TreePacksPanel> <pack name="jBPM4 Standalone" index="0" selected="true"/> <pack name="jBPM4 JBoss Integration" index="1" selected="true"/> - <pack name="JSF-Console" index="2" selected="true"/> - <pack name="GWT-Console" index="3" selected="true"/> +  <pack name="Optional Components" index="4" selected="false"/> <pack name="Download JBoss-5.0.0" index="5" selected="false"/> <pack name="Download Eclipse-3.4.0" index="6" selected="false"/> Modified: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -123,12 +123,6 @@ unpack="true" override="true" />  - <file src="@{deploy.artifacts.dir}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database" - unpack="true" override="true" /> - -   + + <pack name="jBPM4 JBoss Integration" required="no" preselected="yes"> - <pack name="jbpm4 JBoss Integration" required="no" preselected="yes"> - - <description>The jbpm4 JBoss Integration</description> + <description>The jBPM4 JBoss Integration</description>  -  - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> - <include name="jbpm-db.jar" /> - <include name="jbpm-jpdl.jar" /> - <include name="jbpm-jpdl-config.jar" /> + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <include name="jbpm-jpdl.jar" /> <include name="jbpm-log.jar" /> <include name="jbpm-pvm.jar" /> <include name="jbpm-task.jar" /> @@ -186,7 +177,7 @@   -  + </fileset> -  <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/> <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - <fileset dir="@{resources.dir}/database" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" condition="isHypersonic"> +  + </fileset--> -  <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/> <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml" condition="isMySQL" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL"> <include name="mysql-connector-java.jar" /> - </fileset> --> + </fileset> </pack> @@ -241,7 +232,7 @@ --> <pack name="Optional Components" required="no" preselected="no"> - <description>Optional jbpm4 Components</description> + <description>Optional jBPM4 Components</description> </pack>  Modified: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -19,9 +19,9 @@ <description align="left" txt="Please choose your target database" /> <spec> <choice txt="Hypersonic" value="hsqldb"/> -  + <choice txt="MySQL" value="mysql" set="true"/>  -  + <choice txt="Sybase" value="sybase"/> </spec> </field> </panel> Modified: jbpm4/branches/hbraun/modules/enterprise/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/enterprise/pom.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/enterprise/pom.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -1,18 +1,18 @@ <?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"> + 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 - Enterprise</name> @@ -34,7 +34,7 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-api</artifactId> <version>${version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-pvm</artifactId> @@ -43,9 +43,9 @@  <dependency> - <groupId>cactus</groupId> - <artifactId>cactus</artifactId> - <scope>test</scope> + <groupId>cactus</groupId> + <artifactId>cactus</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.client</groupId> @@ -56,12 +56,12 @@  <build> - <testResources> - <testResource> - <filtering>true</filtering> - <directory>src/test/resources</directory> - </testResource> - </testResources> + <testResources> + <testResource> + <filtering>true</filtering> + <directory>src/test/resources</directory> + </testResource> + </testResources> <plugins> <plugin> @@ -89,6 +89,20 @@ </descriptors> </configuration> </execution> + <execution> + <id>assembly-enterprise-config</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-config.xml</descriptor> + </descriptors> + </configuration> + </execution> </executions> </plugin> Added: jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-config.xml =================================================================== --- jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-config.xml (rev 0) +++ jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-config.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,17 @@ +<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>config</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jbpm-*-ds.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Modified: jbpm4/branches/hbraun/modules/jpdl/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/pom.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/jpdl/pom.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -73,9 +73,33 @@ </resources> <plugins> <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <excludes> + <exclude>hibernate.*</exclude> + <exclude>jbpm.cfg.xml</exclude> + <exclude>jbpm-*-ds.xml</exclude> + <exclude>db.properties/**</exclude> + <exclude>logging.properties</exclude> + </excludes> + </configuration> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <phase>compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="database" value="${database}" /> + <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" /> + </tasks> + </configuration> + </execution> +  </executions> </plugin> @@ -97,7 +121,7 @@ <excludes>  <exclude>org/jbpm/jpdl/controlflow/DecisionExpressionTest.java</exclude> - <exclude>org/jbpm/jpdl/controlflow/DecisionHandlerTest.java</exclude> + <exclude>org/jbpm/jpdl/controlflow/DecisionHandlerTest.java</exclude> <exclude>org/jbpm/jpdl/parsing/JpdlSchemaTest.java</exclude> <exclude>org/jbpm/jpdl/parsing/ProcessParsingTest.java</exclude> <exclude>org/jbpm/jpdl/parsing/TransitionParsingTest.java</exclude> @@ -123,7 +147,7 @@ </executions> </plugin> - <plugin> +  </plugins> </build> Added: jbpm4/branches/hbraun/modules/jpdl/scripts/antrun-jbpm-config.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/scripts/antrun-jbpm-config.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/scripts/antrun-jbpm-config.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="concat"> + + <property name="project.build.directory" value="${basedir}/target"/> + <property name="build.resources.directory" value="${basedir}/target/classes"/> + + <macrodef name="macro-disable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[]]></replacetoken> + <replacevalue><![CDATA[]]></replacetoken> + <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> + </replace> + </sequential> + </macrodef> + + <macrodef name="macro-enable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[]]></replacevalue> + </replace> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> + <replacevalue><![CDATA[]]></replacevalue> + </replace> + </sequential> + </macrodef> + + <macrodef name="macro-database-cfg"> + <attribute name="database" /> + <sequential> + + <available property="@{database}.properties.available" file="${build.resources.directory}/hibernate.properties.(a){database}.xml"/> + <fail message="hibernate.properties.(a){database}.xml not available" unless="@{database}.properties.available"/> + + <echo message="Concat hibernate.cfg.(a){database}.xml using hibernate.properties.(a){database}.xml, hibernate.mapping.(a){database}.xml" /> + +  + <concat destfile="${project.build.directory}/classes/hibernate.cfg.(a){database}.xml"> + <header><![CDATA[<?xml version='1.0' encoding='utf-8'?> +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> +]]></header> + <fileset file="${build.resources.directory}/hibernate.properties.(a){database}.xml" /> + <fileset file="${build.resources.directory}/hibernate.common.xml" /> + <fileset file="${build.resources.directory}/hibernate.mapping.(a){database}.xml" /> + <fileset file="${build.resources.directory}/hibernate.mapping.default.xml" /> + <fileset file="${build.resources.directory}/hibernate.cache.xml" /> + <footer><![CDATA[ </session-factory> +</hibernate-configuration>]]></footer> + </concat> + </sequential> + </macrodef> + + <target name="concat" > + <macro-database-cfg database="db2" /> + <macro-database-cfg database="derby" /> + <macro-database-cfg database="firebird" /> + <macro-database-cfg database="hsqldb"/> + <macro-database-cfg database="ingres" /> + <macro-database-cfg database="interbase" /> + <macro-database-cfg database="mckoi" /> + <macro-database-cfg database="mssql" /> + <macro-database-cfg database="mysql"/> + <macro-database-cfg database="postgresql"/> + <macro-database-cfg database="sapdb" /> + <macro-database-cfg database="sybase"/> + <macro-database-cfg database="oracle" /> + <macro-database-cfg database="postgresql" /> + + <echo message="Copy hibernate.cfg.${database}.xml to hibernate.cfg.xml" /> + <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" tofile="${project.build.directory}/classes/hibernate.cfg.xml"/> + + <loadfile property="hibernate.properties.xml" srcFile="${build.resources.directory}/hibernate.properties.${database}.xml"/> + <echo message="${hibernate.properties.xml}"/> + <echo/> + + </target> + +</project> \ No newline at end of file Modified: jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -13,7 +13,8 @@ <include>jbpm.cfg.xml</include> <include>logging.properties</include> <include>hibernate.cfg.xml</include> - <include>db.properties/*</include> + <include>hibernate.cfg.*.xml</include> + <include>jbpm-*-ds.xml</include> </includes> </fileSet> </fileSets> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.common.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.common.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.common.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,41 @@ + +  + +  + +  + +  +  +  + +  + <property name="hibernate.hbm2ddl.auto">create</property> +  + +  + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> + +  + <property name="hibernate.format_sql">true</property> + <property name="hibernate.use_sql_comments">true</property> + +  + + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.db2.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.db2.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.db2.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.DB2Dialect</property> + +  +  + <property name="hibernate.connection.driver_class">com.ibm.db2.jcc.DB2Driver</property> + <property name="hibernate.connection.url">jdbc:db2://localhost:50000/testing</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.derby.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.derby.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.derby.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.DerbyDialect</property> + +  +  + <property name="hibernate.connection.driver_class">org.apache.derby.jdbc.EmbeddedDriver</property> + <property name="hibernate.connection.url">jdbc:derby:build/derby/jbpmtest;create=true</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.FirebirdDialect</property> + +  +  + <property name="hibernate.connection.driver_class">org.firebirdsql.jdbc.FBDriver</property> + <property name="hibernate.connection.url">jdbc:firebirdsql:localhost:jbpmtest</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,11 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + +  + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbpm</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> +  + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.IngresDialect</property> + +  +  + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.InterbaseDialect</property> + +  +  + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.MckoiDialect</property> + +  +  + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + +  + <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> +  + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,11 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property> + +  + <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property> + <property name="hibernate.connection.url">${jdbc.mysql.url}</property> + <property name="hibernate.connection.username">${jdbc.mysql.username}</property> + <property name="hibernate.connection.password">${jdbc.mysql.password}</property> + <property name="hibernate.query.substitutions">true 1, false 0</property> +  Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> + +  +  + <property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property> + <property name="hibernate.connection.url">${jdbc.oracle.url}</property> + <property name="hibernate.connection.username">${jdbc.oracle.username}</property> + <property name="hibernate.connection.password">${jdbc.oracle.password}</property> +  + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,11 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> + +  + <property name="hibernate.connection.driver_class">org.postgresql.Driver</property> + <property name="hibernate.connection.url">${jdbc.postgresql.url}</property> + <property name="hibernate.connection.username">${jdbc.postgresql.username}</property> + <property name="hibernate.connection.password">${jdbc.postgresql.password}</property> +  + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + +  + <property name="hibernate.dialect">org.hibernate.dialect.SAPDBDialect</property> + +  +  + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> +  + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,23 @@ +  + +  + <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property> + +  + <property name="hibernate.connection.driver_class">${jdbc.sybase.driver}</property> + <property name="hibernate.connection.url">${jdbc.sybase.url}</property> + <property name="hibernate.connection.username">${jdbc.sybase.username}</property> + <property name="hibernate.connection.password">${jdbc.sybase.password}</property> +  + +  + <property name="hibernate.jdbc.use_get_generated_keys">false</property> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <local-tx-datasource> + <jndi-name>JbpmDS</jndi-name> + + <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbpmDB</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + +  + <min-pool-size>1</min-pool-size> + <max-pool-size>5</max-pool-size> + +  + <idle-timeout-minutes>0</idle-timeout-minutes> +  + <track-statements /> +  + <prepared-statement-cache-size>32</prepared-statement-cache-size> + +  + <metadata> + <type-mapping>Hypersonic SQL</type-mapping> + </metadata> + +  + <depends>jboss:service=Hypersonic,database=jbpmDB</depends> + </local-tx-datasource> + + <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbpmDB"> + <attribute name="Database">jbpmDB</attribute> + <attribute name="InProcessMode">true</attribute> + </mbean> + +</datasources> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.mysql.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.mysql.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.mysql.database}</xa-datasource-property> + <user-name>${jdbc.mysql.username}</user-name> + <password>${jdbc.mysql.password}</password> + +  + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> +  + <no-tx-separate-pools /> +  + <track-connection-by-tx /> + +  + <exception-sorter-class-name> + com.mysql.jdbc.integration.jboss.ExtendedMysqlExceptionSorter + </exception-sorter-class-name> + <valid-connection-checker-class-name> + com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker + </valid-connection-checker-class-name> + +  + <metadata> + <type-mapping>mySQL</type-mapping> + </metadata> + </xa-datasource> + +</datasources> \ No newline at end of file Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.postgresql.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.postgresql.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.postgresql.database}</xa-datasource-property> + <user-name>${jdbc.postgresql.username}</user-name> + <password>${jdbc.postgresql.password}</password> + +  + <track-connection-by-tx /> + +  + <metadata> + <type-mapping>PostgreSQL 8.0</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>${jdbc.sybase.datasource}</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.sybase.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.sybase.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.sybase.database}</xa-datasource-property> + <user-name>${jdbc.sybase.username}</user-name> + <password>${jdbc.sybase.password}</password> + +  + <track-connection-by-tx /> + + <exception-sorter-class-name> + org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter + </exception-sorter-class-name> + +  + <metadata> + <type-mapping>Sybase</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Modified: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -25,8 +25,9 @@ <standard-transaction-interceptor /> </command-service> - <hibernate-configuration> - <properties resource="hibernate.properties" /> + <hibernate-configuration> + <mapping resource="hibernate.cfg.xml"/> +  </hibernate-configuration> <hibernate-session-factory />

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3736 - in jbpm4/branches/hbraun: hudson and 1 other directory.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-01-30 09:20:23 -0500 (Fri, 30 Jan 2009) New Revision: 3736 Modified: jbpm4/branches/hbraun/hudson/jbpm4-base.sh jbpm4/branches/hbraun/hudson/jbpm4-db.sh jbpm4/branches/hbraun/hudson/jbpm4-load.sh jbpm4/branches/hbraun/pom.xml jbpm4/branches/hbraun/profiles.xml.example Log: Use default profiles.xml in hudson scripts Modified: jbpm4/branches/hbraun/hudson/jbpm4-base.sh =================================================================== --- jbpm4/branches/hbraun/hudson/jbpm4-base.sh 2009-01-30 10:43:24 UTC (rev 3735) +++ jbpm4/branches/hbraun/hudson/jbpm4-base.sh 2009-01-30 14:20:23 UTC (rev 3736) @@ -10,6 +10,11 @@ DISTRODIR=$JBPMDIR/modules/distribution/target # +# default environment settings +# +cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml + +# # build the tests # cd $JBPMDIR Modified: jbpm4/branches/hbraun/hudson/jbpm4-db.sh =================================================================== --- jbpm4/branches/hbraun/hudson/jbpm4-db.sh 2009-01-30 10:43:24 UTC (rev 3735) +++ jbpm4/branches/hbraun/hudson/jbpm4-db.sh 2009-01-30 14:20:23 UTC (rev 3736) @@ -11,10 +11,9 @@ JBPMDIR=$WORKSPACE/jbpm4 # -# copy the profiles.xml +# default environment settings # -echo copying profiles.xml from resources -cp -f $WORKSPACE/resources/profiles-db.xml $JBPMDIR/profiles.xml +cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml # # build the tests Modified: jbpm4/branches/hbraun/hudson/jbpm4-load.sh =================================================================== --- jbpm4/branches/hbraun/hudson/jbpm4-load.sh 2009-01-30 10:43:24 UTC (rev 3735) +++ jbpm4/branches/hbraun/hudson/jbpm4-load.sh 2009-01-30 14:20:23 UTC (rev 3736) @@ -10,11 +10,11 @@ DISTRODIR=$JBPMDIR/modules/distribution/target # -# copy the profiles.xml +# default environment settings # -echo copying profiles.xml from resources -cp -f $WORKSPACE/resources/profiles-load.xml $JBPMDIR/profiles.xml +cp $JBPMDIR/profiles.xml.example $JBPMDIR/profiles.xml + # # build the tests # Modified: jbpm4/branches/hbraun/pom.xml =================================================================== --- jbpm4/branches/hbraun/pom.xml 2009-01-30 10:43:24 UTC (rev 3735) +++ jbpm4/branches/hbraun/pom.xml 2009-01-30 14:20:23 UTC (rev 3736) @@ -316,9 +316,10 @@  <profiles> + <profile> <id>distro</id> - <modules> + <modules> <module>modules/devguide</module> <module>modules/distro</module> <module>modules/userguide</module> @@ -337,7 +338,7 @@ <profile> <id>load</id> - <modules> + <modules> <module>modules/test-load</module> </modules> </profile> Modified: jbpm4/branches/hbraun/profiles.xml.example =================================================================== --- jbpm4/branches/hbraun/profiles.xml.example 2009-01-30 10:43:24 UTC (rev 3735) +++ jbpm4/branches/hbraun/profiles.xml.example 2009-01-30 14:20:23 UTC (rev 3736) @@ -1,90 +1,97 @@ - <profilesXml 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/xsd/profiles-1.0.0.xsd"> +<profilesXml 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/xsd/profiles-1.0.0.xsd"> - <profiles> + <profiles> -  +  - <profile> - <id>jboss-home-profile</id> - <activation> - <property> - <name>user.name</name> - </property> - </activation> - <properties> - <jboss422.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> - <jboss423.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> - <jboss500.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home> + <profile> + <id>jboss-home-profile</id> + <activation> + <property> + <name>user.name</name> + </property> + </activation> + <properties> - <jdbc.hsql.server>localhost</jdbc.hsql.server> - <jdbc.hsql.port>3306</jdbc.hsql.port> - <jdbc.hsql.database>jbpmtest</jdbc.hsql.database> -  - <jdbc.hsql.url>jdbc:hsqldb:mem:.</jdbc.hsql.url> - <jdbc.hsql.username>sa</jdbc.hsql.username> - <jdbc.hsql.password></jdbc.hsql.password> +  + + <jboss422.home>/Users/hbraun/dev/prj/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> + <jboss423.home>/Users/hbraun/dev/prj/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> + <jboss500.home>/Users/hbraun/dev/prj/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home> -  + + <jdbc.hsql.server>localhost</jdbc.hsql.server> + <jdbc.hsql.port>3306</jdbc.hsql.port> + <jdbc.hsql.database>jbpmtest</jdbc.hsql.database> + <jdbc.hsql.url>jdbc:hsqldb:mem:.</jdbc.hsql.url> + <jdbc.hsql.username>sa</jdbc.hsql.username> + <jdbc.hsql.password></jdbc.hsql.password> - <jdbc.postgresql.server>localhost</jdbc.postgresql.server> - <jdbc.postgresql.port>5432</jdbc.postgresql.port> - <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database> - <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> - <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> - <jdbc.postgresql.password></jdbc.postgresql.password> + <jdbc.mysql.server>localhost</jdbc.mysql.server> + <jdbc.mysql.port>3306</jdbc.mysql.port> + <jdbc.mysql.database>jbpm4</jdbc.mysql.database> + <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url> + <jdbc.mysql.username>jbpmtest</jdbc.mysql.username> + <jdbc.mysql.password></jdbc.mysql.password> - <jdbc.sybase.server>localhost</jdbc.sybase.server> - <jdbc.sybase.port>5000</jdbc.sybase.port> - <jdbc.sybase.database>jbpmtest</jdbc.sybase.database> - <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url> - <jdbc.sybase.username>jbpmtest</jdbc.sybase.username> - <jdbc.sybase.password>jbpmtest</jdbc.sybase.password> - <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> - <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> - --> - </properties> - </profile> + <jdbc.postgresql.server>localhost</jdbc.postgresql.server> + <jdbc.postgresql.port>5432</jdbc.postgresql.port> + <jdbc.postgresql.database>jbpm4</jdbc.postgresql.database> + <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url> + <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> + <jdbc.postgresql.password></jdbc.postgresql.password> - <profile> - <id>oracle-private-properties</id> - <activation> - <property> - <name>database</name> - <value>oracle</value> - </property> - </activation> - <properties> - <jdbc.username>xxxx</jdbc.username> - <jdbc.password>xxxx</jdbc.password> - <jdbc.server>localhost</jdbc.server> - <jdbc.dbname>XE</jdbc.dbname> - </properties> - </profile> + <jdbc.sybase.server>localhost</jdbc.sybase.server> + <jdbc.sybase.port>5000</jdbc.sybase.port> + <jdbc.sybase.database>jbpm4</jdbc.sybase.database> + <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url> + <jdbc.sybase.username>jbpmtest</jdbc.sybase.username> + <jdbc.sybase.password>jbpmtest</jdbc.sybase.password> + <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> + <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> - <profile> - <id>mysql-private-properties</id> - <activation> - <property> - <name>database</name> - <value>mysql</value> - </property> - </activation> - <properties> - <jdbc.username>xxxx</jdbc.username> - <jdbc.password>xxxx</jdbc.password> - <jdbc.server>localhost</jdbc.server> - <jdbc.dbname>JBPM</jdbc.dbname> - </properties> - </profile> + </properties> + </profile> - </profiles> + <profile> + <id>oracle-private-properties</id> + <activation> + <property> + <name>database</name> + <value>oracle</value> + </property> + </activation> + <properties> + <jdbc.username>xxxx</jdbc.username> + <jdbc.password>xxxx</jdbc.password> + <jdbc.server>localhost</jdbc.server> + <jdbc.dbname>XE</jdbc.dbname> + </properties> + </profile> - </profilesXml> + <profile> + <id>mysql-private-properties</id> + <activation> + <property> + <name>database</name> + <value>mysql</value> + </property> + </activation> + <properties> + <jdbc.username>xxxx</jdbc.username> + <jdbc.password>xxxx</jdbc.password> + <jdbc.server>localhost</jdbc.server> + <jdbc.dbname>JBPM</jdbc.dbname> + </properties> + </profile> + + </profiles> + +</profilesXml>

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3735 - in jbpm4/branches/hbraun: eclipse and 331 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-01-30 05:43:24 -0500 (Fri, 30 Jan 2009) New Revision: 3735 Modified: jbpm4/branches/hbraun/ jbpm4/branches/hbraun/eclipse/ jbpm4/branches/hbraun/hudson/ jbpm4/branches/hbraun/modules/ jbpm4/branches/hbraun/modules/api/ jbpm4/branches/hbraun/modules/api/src/ jbpm4/branches/hbraun/modules/api/src/main/ jbpm4/branches/hbraun/modules/api/src/main/java/ jbpm4/branches/hbraun/modules/api/src/main/java/org/ jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/ jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/activity/ jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/client/ jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/cmd/ jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/env/ jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/job/ jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/listener/ jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/model/ jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/processlog/ jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/session/ jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/task/ jbpm4/branches/hbraun/modules/api/src/main/resources/ jbpm4/branches/hbraun/modules/config/ jbpm4/branches/hbraun/modules/config/src/ jbpm4/branches/hbraun/modules/config/src/main/ jbpm4/branches/hbraun/modules/config/src/main/resources/ jbpm4/branches/hbraun/modules/db/ jbpm4/branches/hbraun/modules/db/jbpm4-db.iml jbpm4/branches/hbraun/modules/db/src/ jbpm4/branches/hbraun/modules/db/src/main/ jbpm4/branches/hbraun/modules/db/src/main/ant/ jbpm4/branches/hbraun/modules/db/src/main/resources/ jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/ jbpm4/branches/hbraun/modules/devguide/ jbpm4/branches/hbraun/modules/devguide/src/ jbpm4/branches/hbraun/modules/devguide/src/main/ jbpm4/branches/hbraun/modules/devguide/src/main/diagrams/ jbpm4/branches/hbraun/modules/devguide/src/main/docbook/ jbpm4/branches/hbraun/modules/devguide/src/main/docbook/en/ jbpm4/branches/hbraun/modules/devguide/src/main/docbook/en/images/ jbpm4/branches/hbraun/modules/devguide/src/main/docbook/en/modules/ jbpm4/branches/hbraun/modules/distro/ jbpm4/branches/hbraun/modules/distro/scripts/ jbpm4/branches/hbraun/modules/distro/src/ jbpm4/branches/hbraun/modules/distro/src/main/ jbpm4/branches/hbraun/modules/distro/src/main/resources/ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ jbpm4/branches/hbraun/modules/enterprise/ jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml jbpm4/branches/hbraun/modules/enterprise/scripts/ jbpm4/branches/hbraun/modules/enterprise/src/ jbpm4/branches/hbraun/modules/enterprise/src/main/ jbpm4/branches/hbraun/modules/enterprise/src/main/java/ jbpm4/branches/hbraun/modules/enterprise/src/main/java/org/ jbpm4/branches/hbraun/modules/enterprise/src/main/java/org/jbpm/ jbpm4/branches/hbraun/modules/enterprise/src/main/java/org/jbpm/enterprise/ jbpm4/branches/hbraun/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ jbpm4/branches/hbraun/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/ jbpm4/branches/hbraun/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/ jbpm4/branches/hbraun/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding/ jbpm4/branches/hbraun/modules/enterprise/src/main/resources/ jbpm4/branches/hbraun/modules/enterprise/src/main/resources/META-INF/ jbpm4/branches/hbraun/modules/enterprise/src/test/ jbpm4/branches/hbraun/modules/enterprise/src/test/java/ jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/ jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/ jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/ jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/ jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/ jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/test/ jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/test/enterprise/ jbpm4/branches/hbraun/modules/enterprise/src/test/resources/ jbpm4/branches/hbraun/modules/enterprise/src/test/resources/META-INF/ jbpm4/branches/hbraun/modules/enterprise/src/test/resources/WEB-INF/ jbpm4/branches/hbraun/modules/examples/ jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml jbpm4/branches/hbraun/modules/examples/src/ jbpm4/branches/hbraun/modules/examples/src/eclipse/ jbpm4/branches/hbraun/modules/examples/src/test/ jbpm4/branches/hbraun/modules/examples/src/test/java/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/concurrency/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/end/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/end/multiple/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/end/state/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/esb/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/exclusive/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/hql/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/java/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/script/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/script/expression/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/script/text/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/sql/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/state/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/state/choice/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/state/sequence/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/states/ jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/task/ jbpm4/branches/hbraun/modules/examples/src/test/resources/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/concurrency/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/end/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/end/state/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/esb/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/exclusive/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/hql/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/java/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/script/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/script/expression/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/script/text/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/sql/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/state/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/state/choice/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/state/sequence/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/states/ jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/task/ jbpm4/branches/hbraun/modules/jpdl/ jbpm4/branches/hbraun/modules/jpdl/scripts/ jbpm4/branches/hbraun/modules/jpdl/src/ jbpm4/branches/hbraun/modules/jpdl/src/main/ jbpm4/branches/hbraun/modules/jpdl/src/main/java/ jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/ jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/ jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/el/ jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/ jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/deploy/ jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/impl/ jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/ jbpm4/branches/hbraun/modules/jpdl/src/test/ jbpm4/branches/hbraun/modules/jpdl/src/test/java/ jbpm4/branches/hbraun/modules/jpdl/src/test/java/org/ jbpm4/branches/hbraun/modules/jpdl/src/test/java/org/jbpm/ jbpm4/branches/hbraun/modules/jpdl/src/test/java/org/jbpm/jpdl/ jbpm4/branches/hbraun/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/ jbpm4/branches/hbraun/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ jbpm4/branches/hbraun/modules/jpdl/src/test/java/org/jbpm/test/ jbpm4/branches/hbraun/modules/jpdl/src/test/java/org/jbpm/test/xml/ jbpm4/branches/hbraun/modules/jpdl/src/test/resources/ jbpm4/branches/hbraun/modules/jpdl/src/test/resources/org/ jbpm4/branches/hbraun/modules/jpdl/src/test/resources/org/jbpm/ jbpm4/branches/hbraun/modules/jpdl/src/test/resources/org/jbpm/test/ jbpm4/branches/hbraun/modules/jpdl/src/test/resources/org/jbpm/test/xml/ jbpm4/branches/hbraun/modules/log/ jbpm4/branches/hbraun/modules/log/src/ jbpm4/branches/hbraun/modules/log/src/main/ jbpm4/branches/hbraun/modules/log/src/main/java/ jbpm4/branches/hbraun/modules/log/src/main/java/org/ jbpm4/branches/hbraun/modules/log/src/main/java/org/jbpm/ jbpm4/branches/hbraun/modules/log/src/main/java/org/jbpm/log/ jbpm4/branches/hbraun/modules/pvm/ jbpm4/branches/hbraun/modules/pvm/src/ jbpm4/branches/hbraun/modules/pvm/src/main/ jbpm4/branches/hbraun/modules/pvm/src/main/java/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/ jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/model/ jbpm4/branches/hbraun/modules/pvm/src/main/resources/ jbpm4/branches/hbraun/modules/pvm/src/test/ jbpm4/branches/hbraun/modules/pvm/src/test/java/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/activities/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/builder/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/env/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/cron/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/util/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/println/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/spring/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/tx/ jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/variables/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/api/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/enterprise/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/enterprise/custom/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal/wire/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal/xml/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/spring/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/variables/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/wire/ jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/xml/ jbpm4/branches/hbraun/modules/task/ jbpm4/branches/hbraun/modules/task/pom.xml jbpm4/branches/hbraun/modules/task/src/ jbpm4/branches/hbraun/modules/task/src/main/ jbpm4/branches/hbraun/modules/task/src/main/docs/ jbpm4/branches/hbraun/modules/task/src/main/java/ jbpm4/branches/hbraun/modules/task/src/main/java/org/ jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/ jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/ jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal/ jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal/cmd/ jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal/hibernate/ jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal/model/ jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal/wire/ jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal/wire/binding/ jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor/ jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/session/ jbpm4/branches/hbraun/modules/task/src/main/resources/ jbpm4/branches/hbraun/modules/task/src/test/ jbpm4/branches/hbraun/modules/task/src/test/java/ jbpm4/branches/hbraun/modules/task/src/test/java/org/ jbpm4/branches/hbraun/modules/task/src/test/java/org/jbpm/ jbpm4/branches/hbraun/modules/task/src/test/java/org/jbpm/task/ jbpm4/branches/hbraun/modules/task/src/test/java/org/jbpm/task/internal/ jbpm4/branches/hbraun/modules/task/src/test/java/org/jbpm/task/internal/model/ jbpm4/branches/hbraun/modules/task/src/test/resources/ jbpm4/branches/hbraun/modules/test-base/ jbpm4/branches/hbraun/modules/test-base/src/ jbpm4/branches/hbraun/modules/test-base/src/main/ jbpm4/branches/hbraun/modules/test-base/src/main/java/ jbpm4/branches/hbraun/modules/test-base/src/main/java/org/ jbpm4/branches/hbraun/modules/test-base/src/main/java/org/jbpm/ jbpm4/branches/hbraun/modules/test-base/src/main/java/org/jbpm/test/ jbpm4/branches/hbraun/modules/test-db/ jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml jbpm4/branches/hbraun/modules/test-db/src/ jbpm4/branches/hbraun/modules/test-db/src/main/ jbpm4/branches/hbraun/modules/test-db/src/main/java/ jbpm4/branches/hbraun/modules/test-db/src/main/java/org/ jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm/ jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm/test/ jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm/test/activities/ jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm/test/cfg/ jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm/test/svc/ jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm/test/task/ jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm/test/variables/ jbpm4/branches/hbraun/modules/test-db/src/main/resources/ jbpm4/branches/hbraun/modules/test-load/ jbpm4/branches/hbraun/modules/test-load/src/ jbpm4/branches/hbraun/modules/test-load/src/main/ jbpm4/branches/hbraun/modules/test-load/src/main/parked/ jbpm4/branches/hbraun/modules/test-load/src/main/scripts/ jbpm4/branches/hbraun/modules/test-load/src/test/ jbpm4/branches/hbraun/modules/test-load/src/test/java/ jbpm4/branches/hbraun/modules/test-load/src/test/java/org/ jbpm4/branches/hbraun/modules/test-load/src/test/java/org/jbpm/ jbpm4/branches/hbraun/modules/test-load/src/test/java/org/jbpm/test/ jbpm4/branches/hbraun/modules/test-load/src/test/java/org/jbpm/test/load/ jbpm4/branches/hbraun/modules/test-load/src/test/resources/ jbpm4/branches/hbraun/modules/test-load/src/test/resources/org/ jbpm4/branches/hbraun/modules/test-load/src/test/resources/org/jbpm/ jbpm4/branches/hbraun/modules/test-load/src/test/resources/org/jbpm/test/ jbpm4/branches/hbraun/modules/test-load/src/test/resources/org/jbpm/test/load/ jbpm4/branches/hbraun/modules/test-pojo/ jbpm4/branches/hbraun/modules/test-pojo/src/ jbpm4/branches/hbraun/modules/test-pojo/src/main/ jbpm4/branches/hbraun/modules/test-pojo/src/main/java/ jbpm4/branches/hbraun/modules/test-pojo/src/main/java/org/ jbpm4/branches/hbraun/modules/test-pojo/src/main/java/org/jbpm/ jbpm4/branches/hbraun/modules/test-pojo/src/main/java/org/jbpm/test/ jbpm4/branches/hbraun/modules/test-pojo/src/main/java/org/jbpm/test/activities/ jbpm4/branches/hbraun/modules/test-pojo/src/main/resources/ jbpm4/branches/hbraun/modules/userguide/ jbpm4/branches/hbraun/modules/userguide/src/ jbpm4/branches/hbraun/modules/userguide/src/main/ jbpm4/branches/hbraun/modules/userguide/src/main/diagrams/ jbpm4/branches/hbraun/modules/userguide/src/main/diagrams/bpmn/ jbpm4/branches/hbraun/modules/userguide/src/main/docbook/ jbpm4/branches/hbraun/modules/userguide/src/main/docbook/en/ jbpm4/branches/hbraun/modules/userguide/src/main/docbook/en/images/ jbpm4/branches/hbraun/modules/userguide/src/main/docbook/en/modules/ jbpm4/branches/hbraun/pom.xml Log: Ignore iml files Property changes on: jbpm4/branches/hbraun ___________________________________________________________________ Name: svn:ignore - .settings profiles.xml target + *.iml Property changes on: jbpm4/branches/hbraun/eclipse ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/hudson ___________________________________________________________________ Name: svn:ignore - target ant.properties + *.iml Property changes on: jbpm4/branches/hbraun/modules ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api ___________________________________________________________________ Name: svn:ignore - .settings target + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/activity ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/client ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/cmd ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/env ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/job ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/listener ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/processlog ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/session ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/java/org/jbpm/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/api/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/config ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/config/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/config/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/config/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/db ___________________________________________________________________ Name: svn:ignore - .settings target + *.iml Modified: jbpm4/branches/hbraun/modules/db/jbpm4-db.iml =================================================================== --- jbpm4/branches/hbraun/modules/db/jbpm4-db.iml 2009-01-30 10:09:18 UTC (rev 3734) +++ jbpm4/branches/hbraun/modules/db/jbpm4-db.iml 2009-01-30 10:43:24 UTC (rev 3735) @@ -12,6 +12,7 @@ <orderEntry type="module" module-name="jbpm4-pvm" /> <orderEntry type="module" module-name="jbpm4-api" /> <orderEntry type="module" module-name="jbpm4-task" /> + <orderEntry type="module" module-name="jbpm4-test-base" /> <orderEntry type="module" module-name="jbpm4-jpdl" /> <orderEntry type="module-library"> <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> @@ -95,15 +96,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel-api:jar:2.1.1.RC2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-api/2.1.1.RC2/juel-api-2.1.1.RC2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: stax:stax:jar:1.2.0:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> @@ -178,15 +170,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel-impl:jar:2.1.1.RC2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.1.RC2/juel-impl-2.1.1.RC2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> @@ -215,6 +198,60 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.springframework:spring:jar:2.5.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Property changes on: jbpm4/branches/hbraun/modules/db/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/db/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/db/src/main/ant ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/db/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/devguide ___________________________________________________________________ Name: svn:ignore - target + *.iml Property changes on: jbpm4/branches/hbraun/modules/devguide/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/devguide/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/devguide/src/main/diagrams ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/devguide/src/main/docbook ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/devguide/src/main/docbook/en ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/devguide/src/main/docbook/en/images ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/devguide/src/main/docbook/en/modules ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/distro ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Property changes on: jbpm4/branches/hbraun/modules/distro/scripts ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/distro/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/distro/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/distro/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Modified: jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml =================================================================== --- jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml 2009-01-30 10:09:18 UTC (rev 3734) +++ jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml 2009-01-30 10:43:24 UTC (rev 3735) @@ -14,6 +14,7 @@ <orderEntry type="module" module-name="jbpm4-toplevel" /> <orderEntry type="module" module-name="jbpm4-pvm" /> <orderEntry type="module" module-name="jbpm4-api" /> + <orderEntry type="module" module-name="jbpm4-test-base" /> <orderEntry type="module-library"> <library name="M2 Dep: cargo:cargo:jar:0.5:test"> <CLASSES> @@ -167,15 +168,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> @@ -221,15 +213,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel-api:jar:2.1.1.RC2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-api/2.1.1.RC2/juel-api-2.1.1.RC2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.springframework:spring:jar:2.5.4:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> @@ -286,15 +269,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel-impl:jar:2.1.1.RC2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.1.RC2/juel-impl-2.1.1.RC2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> @@ -314,6 +288,42 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Property changes on: jbpm4/branches/hbraun/modules/enterprise/scripts ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/main/java/org/jbpm/enterprise ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/main/java/org/jbpm/enterprise/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/wire/binding ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/main/resources/META-INF ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/test/enterprise ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/test/resources/META-INF ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/enterprise/src/test/resources/WEB-INF ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples ___________________________________________________________________ Name: svn:ignore - target + *.iml Modified: jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml =================================================================== --- jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml 2009-01-30 10:09:18 UTC (rev 3734) +++ jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml 2009-01-30 10:43:24 UTC (rev 3735) @@ -13,6 +13,7 @@ <orderEntry type="module" module-name="jbpm4-toplevel" /> <orderEntry type="module" module-name="jbpm4-api" /> <orderEntry type="module" module-name="jbpm4-task" /> + <orderEntry type="module" module-name="jbpm4-test-base" /> <orderEntry type="module" module-name="jbpm4-jpdl" /> <orderEntry type="module-library"> <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> @@ -96,15 +97,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel-api:jar:2.1.1.RC2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-api/2.1.1.RC2/juel-api-2.1.1.RC2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: stax:stax:jar:1.2.0:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> @@ -179,15 +171,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel-impl:jar:2.1.1.RC2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.1.RC2/juel-impl-2.1.1.RC2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> @@ -243,6 +226,33 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Property changes on: jbpm4/branches/hbraun/modules/examples/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/eclipse ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/concurrency ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/end ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/end/multiple ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/end/processinstance ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/end/state ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/esb ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/exclusive ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/hql ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/script ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/script/expression ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/script/text ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/sql ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/state ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/state/choice ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/state/sequence ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/states ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/java/org/jbpm/examples/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/concurrency ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/end ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/end/multiple ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/end/state ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/esb ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/exclusive ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/hql ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/script ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/script/expression ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/script/text ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/sql ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/state ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/state/choice ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/state/sequence ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/states ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/examples/src/test/resources/org/jbpm/examples/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/scripts ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/el ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/activity ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/deploy ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/impl ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/main/java/org/jbpm/jpdl/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test/java/org/jbpm/jpdl ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test/java/org/jbpm/test/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test/resources/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test/resources/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test/resources/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/jpdl/src/test/resources/org/jbpm/test/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/log ___________________________________________________________________ Name: svn:ignore - target + *.iml Property changes on: jbpm4/branches/hbraun/modules/log/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/log/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/log/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/log/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/log/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/log/src/main/java/org/jbpm/log ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/cal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/deploy ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/env ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/jms ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/job ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/script ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/stream ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/type ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/matcher ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/util ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/operation ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/java/org/jbpm/pvm/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/activities ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/builder ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/env ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/executionmode ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/object ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/db ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/cron ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/type ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/util ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/println ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/spring ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/tx ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/java/org/jbpm/pvm/variables ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/api ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/api/db ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/enterprise ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/enterprise/custom ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/internal/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/spring ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/pvm/variables ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/pvm/src/test/resources/org/jbpm/xml ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Modified: jbpm4/branches/hbraun/modules/task/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/task/pom.xml 2009-01-30 10:09:18 UTC (rev 3734) +++ jbpm4/branches/hbraun/modules/task/pom.xml 2009-01-30 10:43:24 UTC (rev 3735) @@ -1,18 +1,18 @@ <?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"> + 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 - Task</name> @@ -32,25 +32,14 @@ <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-api</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-log</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-test-base</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-pvm</artifactId> </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> - <dependency> + <dependency> <groupId>juel</groupId> <artifactId>juel</artifactId> </dependency> @@ -61,7 +50,7 @@ <dependency> <groupId>juel</groupId> <artifactId>juel-engine</artifactId> - </dependency> + </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> Property changes on: jbpm4/branches/hbraun/modules/task/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/docs ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal/cmd ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal/hibernate ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal/wire ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal/wire/binding ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/internal/wire/descriptor ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/java/org/jbpm/task/session ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/test/java/org/jbpm/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/test/java/org/jbpm/task/internal ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/test/java/org/jbpm/task/internal/model ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/task/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-base ___________________________________________________________________ Name: svn:ignore - target + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-base/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-base/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-base/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-base/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-base/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-base/src/main/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-db ___________________________________________________________________ Name: svn:ignore - target + *.iml Modified: jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml =================================================================== --- jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml 2009-01-30 10:09:18 UTC (rev 3734) +++ jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml 2009-01-30 10:43:24 UTC (rev 3735) @@ -13,6 +13,7 @@ <orderEntry type="module" module-name="jbpm4-toplevel" exported="" /> <orderEntry type="module" module-name="jbpm4-api" exported="" /> <orderEntry type="module" module-name="jbpm4-task" exported="" /> + <orderEntry type="module" module-name="jbpm4-test-base" exported="" /> <orderEntry type="module" module-name="jbpm4-jpdl" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> @@ -96,15 +97,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: juel:juel-api:jar:2.1.1.RC2:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-api/2.1.1.RC2/juel-api-2.1.1.RC2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: stax:stax:jar:1.2.0:test"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> @@ -179,15 +171,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: juel:juel-impl:jar:2.1.1.RC2:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.1.RC2/juel-impl-2.1.1.RC2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> @@ -243,6 +226,33 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel:jar:2.1.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Property changes on: jbpm4/branches/hbraun/modules/test-db/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-db/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-db/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-db/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm/test/activities ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm/test/cfg ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm/test/svc ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm/test/task ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-db/src/main/java/org/jbpm/test/variables ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-db/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load ___________________________________________________________________ Name: svn:ignore - target + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/main/parked ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/main/scripts ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/test/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/test/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/test/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/test/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/test/java/org/jbpm/test/load ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/test/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/test/resources/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/test/resources/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/test/resources/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-load/src/test/resources/org/jbpm/test/load ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-pojo ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-pojo/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-pojo/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-pojo/src/main/java ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-pojo/src/main/java/org ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-pojo/src/main/java/org/jbpm ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-pojo/src/main/java/org/jbpm/test ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-pojo/src/main/java/org/jbpm/test/activities ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/test-pojo/src/main/resources ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/userguide ___________________________________________________________________ Name: svn:ignore - target .settings + *.iml Property changes on: jbpm4/branches/hbraun/modules/userguide/src ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/userguide/src/main ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/userguide/src/main/diagrams ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/userguide/src/main/diagrams/bpmn ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/userguide/src/main/docbook ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/userguide/src/main/docbook/en ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/userguide/src/main/docbook/en/images ___________________________________________________________________ Name: svn:ignore + *.iml Property changes on: jbpm4/branches/hbraun/modules/userguide/src/main/docbook/en/modules ___________________________________________________________________ Name: svn:ignore + *.iml Modified: jbpm4/branches/hbraun/pom.xml =================================================================== --- jbpm4/branches/hbraun/pom.xml 2009-01-30 10:09:18 UTC (rev 3734) +++ jbpm4/branches/hbraun/pom.xml 2009-01-30 10:43:24 UTC (rev 3735) @@ -30,13 +30,13 @@  <modules> + <module>modules/log</module> <module>modules/api</module> + <module>modules/pvm</module> <module>modules/examples</module> -  <module>modules/jpdl</module> - <module>modules/log</module> - <module>modules/pvm</module> <module>modules/task</module> +  <module>modules/test-base</module> <module>modules/test-db</module>

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3734 - jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-01-30 05:09:18 -0500 (Fri, 30 Jan 2009) New Revision: 3734 Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java Log: added jira issue to the db clean fixme Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2009-01-30 08:07:44 UTC (rev 3733) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2009-01-30 10:09:18 UTC (rev 3734) @@ -170,7 +170,7 @@ Integer recordCount = (Integer) sqlQuery.uniqueResult(); if (recordCount>0) { recordsLeft = true; - log.error("FIXME: "+recordCount+" records left in table "+tableName); + log.error("FIXME: JBPM-2004 "+recordCount+" records left in table "+tableName); } } } finally {

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3733 - in jbpm3/trunk/modules: enterprise/scripts and 11 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-01-30 03:07:44 -0500 (Fri, 30 Jan 2009) New Revision: 3733 Added: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1903/ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1903/ENCAction.java jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1903/JBPM1903Test.java jbpm3/trunk/modules/enterprise/src/test/resources/org/ jbpm3/trunk/modules/enterprise/src/test/resources/org/jbpm/ jbpm3/trunk/modules/enterprise/src/test/resources/org/jbpm/enterprise/ jbpm3/trunk/modules/enterprise/src/test/resources/org/jbpm/enterprise/jbpm1903/ jbpm3/trunk/modules/enterprise/src/test/resources/org/jbpm/enterprise/jbpm1903/processdefinition.xml Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactory.java jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java Log: JBPM-1903 make ENC reachable from within action handlers restore JmsMessageServiceFactory ENC references Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2009-01-30 04:58:08 UTC (rev 3732) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2009-01-30 08:07:44 UTC (rev 3733) @@ -31,9 +31,11 @@ <string name="resource.mail.templates" value="jbpm.mail.templates.xml" />  -  +   <int name="jbpm.byte.block.size" value="1024" singleton="true" /> Modified: jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml =================================================================== --- jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2009-01-30 04:58:08 UTC (rev 3732) +++ jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2009-01-30 08:07:44 UTC (rev 3733) @@ -9,42 +9,31 @@  <project> - + <description>jBPM enterprise test archive builder</description> - +    - + <target name="build-test-jars" description="Build the test deployments"> - - <mkdir dir="${tests.output.dir}/test-libs"/> - + + <mkdir dir="${tests.output.dir}/test-libs" /> +  <war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jbpm/enterprise/config/AppServerConfigurationsTest.class"/> - <include name="org/jbpm/enterprise/ejbtimer/EjbSchedulerTest*.class"/> - <include name="org/jbpm/enterprise/jms/JmsMessageTest*.class"/> - <include name="org/jbpm/enterprise/jta/JtaDbPersistenceTest*.class"/> - </classes> - <lib dir="${tests.output.dir}/test-dependencies"> - <include name="aspectjrt*.jar"/> - <include name="cactus*.jar"/> - <include name="junit*.jar"/> - </lib> - <webinf dir="${tests.resources.dir}/WEB-INF"> - <exclude name="web.xml"/> - </webinf> + <classes dir="${tests.output.dir}/test-classes" includes="org/jbpm/enterprise/**" /> + <lib dir="${tests.output.dir}/test-dependencies" includes="*.jar" /> + <webinf dir="${tests.resources.dir}/WEB-INF" excludes="web.xml" /> </war>  <jar jarfile="${tests.output.dir}/test-libs/fork-join-example.par"> - <fileset dir="${tests.resources.dir}/deployment/fork-join-example"/> + <fileset dir="${tests.resources.dir}/deployment/fork-join-example" /> </jar> - +  - + </target> - + </project> Modified: jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml =================================================================== --- jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml 2009-01-30 04:58:08 UTC (rev 3732) +++ jbpm3/trunk/modules/enterprise/src/main/etc/jbpm.cfg.xml 2009-01-30 08:07:44 UTC (rev 3733) @@ -9,6 +9,9 @@ <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" /> </jbpm-context> +  + <string name="jbpm.classLoader" value="context" /> + <!-- Note, that the default job executor needs to be overwritten with a null value. In the enterprise configuration there should be no job executor. Modified: jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactory.java =================================================================== --- jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactory.java 2009-01-30 04:58:08 UTC (rev 3732) +++ jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactory.java 2009-01-30 08:07:44 UTC (rev 3733) @@ -58,9 +58,9 @@ { private static final long serialVersionUID = 1L; - String connectionFactoryJndiName = "java:JmsXA"; - String destinationJndiName = "queue/JbpmJobQueue"; - String commandDestinationJndiName = "queue/JbpmCommandQueue"; + String connectionFactoryJndiName = "java:comp/env/jms/JbpmConnectionFactory"; + String destinationJndiName = "java:comp/env/jms/JobQueue"; + String commandDestinationJndiName = "java:comp/env/jms/CommandQueue"; boolean isCommitEnabled = false; private ConnectionFactory connectionFactory; Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java 2009-01-30 04:58:08 UTC (rev 3732) +++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java 2009-01-30 08:07:44 UTC (rev 3733) @@ -99,7 +99,8 @@ + "</process-definition>"); long processInstanceId = startProcessInstance("future").getId(); EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END); - assertTrue(hasProcessInstanceEnded(processInstanceId)); + assertTrue("expected process instance " + processInstanceId + " to have ended", + hasProcessInstanceEnded(processInstanceId)); } public void testSchedulePast() throws Exception { @@ -118,7 +119,8 @@ + "</process-definition>"); long processInstanceId = startProcessInstance("past").getId(); EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END); - assertTrue(hasProcessInstanceEnded(processInstanceId)); + assertTrue("expected process instance " + processInstanceId + " to have ended", + hasProcessInstanceEnded(processInstanceId)); } public void testScheduleRepeat() throws Exception { @@ -142,7 +144,8 @@ assertEquals("a", getProcessInstanceState(processInstanceId)); } signalToken(processInstance.getRootToken().getId()); - assertTrue(hasProcessInstanceEnded(processInstanceId)); + assertTrue("expected process instance " + processInstanceId + " to have ended", + hasProcessInstanceEnded(processInstanceId)); } public void testCancel() throws Exception { @@ -174,7 +177,8 @@ EventCallback.waitForEvent(Event.EVENTTYPE_TIMER, 2000); signalToken(rootTokenId); - assertTrue(hasProcessInstanceEnded(processInstanceId)); + assertTrue("expected process instance " + processInstanceId + " to have ended", + hasProcessInstanceEnded(processInstanceId)); } public void testScheduleSequence() throws Exception { @@ -216,7 +220,8 @@ assertEquals(Character.toString(state), getProcessInstanceState(processInstanceId)); } EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END); - assertTrue(hasProcessInstanceEnded(processInstanceId)); + assertTrue("expected process instance " + processInstanceId + " to have ended", + hasProcessInstanceEnded(processInstanceId)); } public void testScheduleFork() throws Exception { @@ -261,7 +266,8 @@ + "</process-definition>"); long processInstanceId = startProcessInstance("fork").getId(); EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END); - assertTrue(hasProcessInstanceEnded(processInstanceId)); + assertTrue("expected process instance " + processInstanceId + " to have ended", + hasProcessInstanceEnded(processInstanceId)); } private ProcessDefinition deployProcessDefinition(String xml) throws RemoteException { @@ -284,7 +290,10 @@ private static final long serialVersionUID = 1L; public Object execute(JbpmContext jbpmContext) throws Exception { - return jbpmContext.loadProcessInstance(processInstanceId).getRootToken().getNode().getName(); + return jbpmContext.loadProcessInstance(processInstanceId) + .getRootToken() + .getNode() + .getName(); } }); } Added: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1903/ENCAction.java =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1903/ENCAction.java (rev 0) +++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1903/ENCAction.java 2009-01-30 08:07:44 UTC (rev 3733) @@ -0,0 +1,25 @@ +package org.jbpm.enterprise.jbpm1903; + +import javax.naming.Context; +import javax.naming.InitialContext; + +import org.jbpm.graph.def.ActionHandler; +import org.jbpm.graph.exe.ExecutionContext; + +public class ENCAction implements ActionHandler { + + private static final long serialVersionUID = 1L; + + public void execute(ExecutionContext executionContext) throws Exception { + Context jndiContext = new InitialContext(); + try { + Object queue = jndiContext.lookup("java:comp/env/jms/JobQueue"); + executionContext.setVariable("queue", queue); + } + finally { + jndiContext.close(); + } + executionContext.leaveNode(); + } + +} Added: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1903/JBPM1903Test.java =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1903/JBPM1903Test.java (rev 0) +++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1903/JBPM1903Test.java 2009-01-30 08:07:44 UTC (rev 3733) @@ -0,0 +1,129 @@ +/* + * 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.enterprise.jbpm1903; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +import javax.jms.JMSException; +import javax.jms.Queue; +import javax.naming.Context; +import javax.naming.InitialContext; + +import junit.framework.Test; + +import org.apache.cactus.ServletTestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.bpm.api.test.IntegrationTestSetup; +import org.jbpm.JbpmContext; +import org.jbpm.command.Command; +import org.jbpm.command.DeployProcessCommand; +import org.jbpm.command.StartProcessInstanceCommand; +import org.jbpm.ejb.LocalCommandService; +import org.jbpm.ejb.LocalCommandServiceHome; +import org.jbpm.graph.exe.ProcessInstance; +import org.jbpm.util.IoUtil; + +/** + * @author Alejandro Guizar + */ +public class JBPM1903Test extends ServletTestCase { + + private LocalCommandService commandService; + private static LocalCommandServiceHome commandServiceHome; + + private static final Log log = LogFactory.getLog(JBPM1903Test.class); + + public static Test suite() throws Exception { + return new IntegrationTestSetup(JBPM1903Test.class, "enterprise-test.war"); + } + + @Override + protected void setUp() throws Exception { + if (commandServiceHome == null) { + Context initialContext = new InitialContext(); + try { + commandServiceHome = (LocalCommandServiceHome) initialContext.lookup("java:comp/env/ejb/CommandServiceBean"); + } + finally { + initialContext.close(); + } + } + commandService = commandServiceHome.create(); + log.info("### " + getName() + " started ###"); + } + + @Override + protected void tearDown() throws Exception { + log.info("### " + getName() + " done ###"); + commandService = null; + } + + public void testENCInActionHandler() throws IOException, JMSException { + byte[] processArchive = createProcessArchive(); + deployProcessDefinition(processArchive); + long processInstanceId = startProcessInstance("jbpm-1903").getId(); + Queue queue = (Queue) getVariable(processInstanceId, "queue"); + assertEquals("JbpmJobQueue", queue.getQueueName()); + } + + private byte[] createProcessArchive() throws IOException { + ByteArrayOutputStream memoryOut = new ByteArrayOutputStream(); + ZipOutputStream zipOut = new ZipOutputStream(memoryOut); + + zipOut.putNextEntry(new ZipEntry("processdefinition.xml")); + InputStream resourceIn = getClass().getResourceAsStream("processdefinition.xml"); + IoUtil.transfer(resourceIn, zipOut); + resourceIn.close(); + + zipOut.putNextEntry(new ZipEntry("classes/org/jbpm/enterprise/jbpm1903/ENCAction.class")); + resourceIn = getClass().getResourceAsStream("ENCAction.class"); + IoUtil.transfer(resourceIn, zipOut); + resourceIn.close(); + + zipOut.close(); + return memoryOut.toByteArray(); + } + + private void deployProcessDefinition(byte[] processArchive) { + commandService.execute(new DeployProcessCommand(processArchive)); + } + + private ProcessInstance startProcessInstance(String processName) { + return (ProcessInstance) commandService.execute(new StartProcessInstanceCommand().processDefinitionName(processName)); + } + + private Object getVariable(final long processInstanceId, final String variableName) { + return commandService.execute(new Command() { + private static final long serialVersionUID = 1L; + + public Object execute(JbpmContext jbpmContext) throws Exception { + ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceId); + return processInstance.getContextInstance().getVariable(variableName); + } + }); + } +} Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java 2009-01-30 04:58:08 UTC (rev 3732) +++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java 2009-01-30 08:07:44 UTC (rev 3733) @@ -37,6 +37,7 @@ import org.jbpm.JbpmContext; import org.jbpm.command.Command; import org.jbpm.command.DeployProcessCommand; +import org.jbpm.command.GetProcessInstanceCommand; import org.jbpm.command.StartProcessInstanceCommand; import org.jbpm.ejb.LocalCommandService; import org.jbpm.ejb.LocalCommandServiceHome; @@ -70,8 +71,7 @@ if (commandServiceHome == null) { Context initialContext = new InitialContext(); try { - commandServiceHome = (LocalCommandServiceHome) initialContext - .lookup("java:comp/env/ejb/CommandServiceBean"); + commandServiceHome = (LocalCommandServiceHome) initialContext.lookup("java:comp/env/ejb/CommandServiceBean"); } finally { initialContext.close(); @@ -88,7 +88,7 @@ } public void testAsyncNode() { - deployProcess("<process-definition name='node'>" + deployProcessDefinition("<process-definition name='node'>" + " <event type='process-end'>" + " <action expression='#{eventCallback.processEnd}'/>" + " </event>" @@ -101,13 +101,14 @@ + " <end-state name='end' />" + "</process-definition>"); - long processId = launchProcess("node").getId(); + long processInstanceId = startProcessInstance("node").getId(); EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END); - assertTrue("Process has ended", hasProcessEnded(processId)); + assertTrue("expected process instance " + processInstanceId + " to have ended", + hasProcessInstanceEnded(processInstanceId)); } public void testAsyncAction() { - deployProcess("<process-definition name='action'>" + deployProcessDefinition("<process-definition name='action'>" + " <start-state name='start'>" + " <transition to='a' />" + " </start-state>" @@ -125,15 +126,16 @@ + " <end-state name='end' />" + "</process-definition>"); - long processId = launchProcess("action").getId(); + long processInstanceId = startProcessInstance("action").getId(); EventCallback.waitForEvent(Event.EVENTTYPE_NODE_ENTER); EventCallback.waitForEvent(Event.EVENTTYPE_NODE_LEAVE); EventCallback.waitForEvent(Event.EVENTTYPE_TRANSITION); - assertTrue("Process has ended", hasProcessEnded(processId)); + assertTrue("expected process instance " + processInstanceId + " to have ended", + hasProcessInstanceEnded(processInstanceId)); } public void testAsyncSequence() { - deployProcess("<process-definition name='sequence'>" + deployProcessDefinition("<process-definition name='sequence'>" + " <event type='process-end'>" + " <action expression='#{eventCallback.processEnd}'/>" + " </event>" @@ -158,9 +160,10 @@ + " <end-state name='end' />" + "</process-definition>"); - long processId = launchProcess("sequence").getId(); + long processInstanceId = startProcessInstance("sequence").getId(); EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END); - assertTrue("Process has ended", hasProcessEnded(processId)); + assertTrue("expected process instance " + processInstanceId + " to have ended", + hasProcessInstanceEnded(processInstanceId)); } public void testAsyncFork() throws Exception { @@ -169,7 +172,7 @@ return; } - deployProcess("<process-definition name='fork'>" + deployProcessDefinition("<process-definition name='fork'>" + " <event type='process-end'>" + " <action expression='#{eventCallback.processEnd}'/>" + " </event>" @@ -204,10 +207,11 @@ + " <end-state name='end' />" + "</process-definition>"); - long processId = launchProcess("fork").getId(); + long processInstanceId = startProcessInstance("fork").getId(); EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END); Thread.sleep(1000); - assertTrue("Process has ended", hasProcessEnded(processId)); + assertTrue("expected process instance " + processInstanceId + " to have ended", + hasProcessInstanceEnded(processInstanceId)); } private String getHibernateDialect() { @@ -215,15 +219,14 @@ private static final long serialVersionUID = 1L; public Object execute(JbpmContext jbpmContext) throws Exception { - DbPersistenceServiceFactory factory = (DbPersistenceServiceFactory) jbpmContext - .getServiceFactory(Services.SERVICENAME_PERSISTENCE); + DbPersistenceServiceFactory factory = (DbPersistenceServiceFactory) jbpmContext.getServiceFactory(Services.SERVICENAME_PERSISTENCE); return factory.getConfiguration().getProperty(Environment.DIALECT); } }); } public void testAsyncExecutions() { - deployProcess("<process-definition name='execution'>" + deployProcessDefinition("<process-definition name='execution'>" + " <event type='process-end'>" + " <action expression='#{eventCallback.processEnd}' />" + " </event>" @@ -254,43 +257,40 @@ + " <end-state name='end' />" + "</process-definition>"); - long[] processIds = new long[processExecutionCount]; + long[] processInstanceIds = new long[processExecutionCount]; for (int i = 0; i < processExecutionCount; i++) { - processIds[i] = launchProcess("execution").getId(); + processInstanceIds[i] = startProcessInstance("execution").getId(); EventCallback.waitForEvent(Event.EVENTTYPE_NODE_ENTER); } for (int i = 0; i < processExecutionCount; i++) { EventCallback.waitForEvent(Event.EVENTTYPE_NODE_LEAVE); } for (int i = 0; i < processExecutionCount; i++) { - waitForProcessEnd(processIds[i]); - assertTrue(hasProcessEnded(processIds[i])); + long processInstanceId = processInstanceIds[i]; + waitForProcessInstanceEnd(processInstanceId); + assertTrue("expected process instance " + processInstanceId + " to have ended", + hasProcessInstanceEnded(processInstanceId)); } } - private ProcessDefinition deployProcess(String xml) { + private ProcessDefinition deployProcessDefinition(String xml) { return (ProcessDefinition) commandService.execute(new DeployProcessCommand(xml)); } - private ProcessInstance launchProcess(String processName) { + private ProcessInstance startProcessInstance(String processName) { StartProcessInstanceCommand command = new StartProcessInstanceCommand(); command.setProcessDefinitionName(processName); command.setVariables(Collections.singletonMap("eventCallback", new EventCallback())); return (ProcessInstance) commandService.execute(command); } - private boolean hasProcessEnded(final long processId) { - Boolean isFinished = (Boolean) commandService.execute(new Command() { - private static final long serialVersionUID = 1L; - - public Object execute(JbpmContext jbpmContext) throws Exception { - return jbpmContext.loadProcessInstance(processId).hasEnded(); - } - }); - return isFinished.booleanValue(); + private boolean hasProcessInstanceEnded(final long processInstanceId) { + ProcessInstance processInstance = (ProcessInstance) commandService.execute(new GetProcessInstanceCommand( + processInstanceId)); + return processInstance.hasEnded(); } - private void waitForProcessEnd(long processId) { + private void waitForProcessInstanceEnd(long processId) { long startTime = System.currentTimeMillis(); do { EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END, 1000); @@ -298,6 +298,6 @@ log.warn("process " + processId + " took too long"); break; } - } while (!hasProcessEnded(processId)); + } while (!hasProcessInstanceEnded(processId)); } } Added: jbpm3/trunk/modules/enterprise/src/test/resources/org/jbpm/enterprise/jbpm1903/processdefinition.xml =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/resources/org/jbpm/enterprise/jbpm1903/processdefinition.xml (rev 0) +++ jbpm3/trunk/modules/enterprise/src/test/resources/org/jbpm/enterprise/jbpm1903/processdefinition.xml 2009-01-30 08:07:44 UTC (rev 3733) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process-definition xmlns="urn:jbpm.org:jpdl-3.2" name="jbpm-1903"> + + <start-state name="start-state1"> + <transition to="node1" /> + </start-state> + + <node name="node1"> + <action class="org.jbpm.enterprise.jbpm1903.ENCAction" /> + <transition to="end-state1" /> + </node> + + <end-state name="end-state1" /> + +</process-definition> \ No newline at end of file

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3732 - in jbpm3/branches/jbpm-3.2.4.SP/modules/core: src/main/java/org/jbpm/graph/node and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-01-29 23:58:08 -0500 (Thu, 29 Jan 2009) New Revision: 3732 Modified: jbpm3/branches/jbpm-3.2.4.SP/modules/core/pom.xml jbpm3/branches/jbpm-3.2.4.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java Log: JBPM-1991 change default parentLockMode from FORCE to UPGRADE Modified: jbpm3/branches/jbpm-3.2.4.SP/modules/core/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.4.SP/modules/core/pom.xml 2009-01-30 03:11:11 UTC (rev 3731) +++ jbpm3/branches/jbpm-3.2.4.SP/modules/core/pom.xml 2009-01-30 04:58:08 UTC (rev 3732) @@ -313,8 +313,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> -  - <exclude>org/jbpm/jpdl/exe/JoinExecutionDbTest.java</exclude>  <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude> </excludes> Modified: jbpm3/branches/jbpm-3.2.4.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java =================================================================== --- jbpm3/branches/jbpm-3.2.4.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-01-30 03:11:11 UTC (rev 3731) +++ jbpm3/branches/jbpm-3.2.4.SP/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-01-30 04:58:08 UTC (rev 3732) @@ -43,7 +43,7 @@ /** * specifies wether what type of hibernate lock should be acquired. - * null value defaults to LockMode.FORCE + * null value defaults to LockMode.UPGRADE */ String parentLockMode; @@ -114,8 +114,9 @@ JbpmContext jbpmContext = executionContext.getJbpmContext(); Session session = (jbpmContext!=null ? jbpmContext.getSession() : null); if (session!=null) { - // force version increment by default (LockMode.FORCE) - LockMode lockMode = parentLockMode != null ? LockMode.parse(parentLockMode) : LockMode.FORCE; + // obtain update lock by default (LockMode.UPGRADE) + LockMode lockMode = parentLockMode != null ? LockMode.parse(parentLockMode) + : LockMode.UPGRADE; log.debug("acquiring " + lockMode + " lock on " + parentToken); // lock updates as appropriate, no need to flush here session.lock(parentToken, lockMode);

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3731 - jbpm3/trunk/modules/core.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-01-29 22:11:11 -0500 (Thu, 29 Jan 2009) New Revision: 3731 Modified: jbpm3/trunk/modules/core/pom.xml Log: JBPM-1782 fix JoinExecutionDbTest on postgresql changing the default join parentLockMode from FORCE to UPGRADE eliminates the SOSE Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2009-01-29 10:58:11 UTC (rev 3730) +++ jbpm3/trunk/modules/core/pom.xml 2009-01-30 03:11:11 UTC (rev 3731) @@ -306,8 +306,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> -  - <exclude>org/jbpm/jpdl/exe/JoinExecutionDbTest.java</exclude>  <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude> </excludes>

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3730 - jbpm3/trunk/modules/enterprise/src/main/resources/META-INF.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-01-29 05:58:11 -0500 (Thu, 29 Jan 2009) New Revision: 3730 Modified: jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/ejb-jar.xml Log: JBPM-1990 ejb-jar.xml spelling error in res-type element Modified: jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/ejb-jar.xml =================================================================== --- jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/ejb-jar.xml 2009-01-29 07:36:26 UTC (rev 3729) +++ jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/ejb-jar.xml 2009-01-29 10:58:11 UTC (rev 3730) @@ -76,7 +76,7 @@ Required for processes that contain asynchronous continuations. </description> <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> - <res-type>javax.jms.ConnnectionFactory</res-type> + <res-type>javax.jms.ConnectionFactory</res-type> <res-auth>Container</res-auth> </resource-ref>

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3729 - in jbpm3/trunk/modules/core/src: main/java/org/jbpm/graph/action and 5 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-01-29 02:36:26 -0500 (Thu, 29 Jan 2009) New Revision: 3729 Added: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/InstantiatorUtil.java Removed: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/StaticUtil.java Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/Script.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Join.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/BeanInstantiator.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ConfigurationPropertyInstantiator.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ConstructorInstantiator.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/DefaultInstantiator.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/Delegation.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/FieldInstantiator.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/Instantiator.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ProcessClassLoader.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/XmlInstantiator.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/CollectionUtil.java jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ExceptionHandlerTest.java Log: JBPM-1991 change default parentLockMode from FORCE to UPGRADE eliminate the many NPEs that appeared in the test log generalize instantiation package Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -1,6 +1,6 @@ package org.jbpm.command; -import java.util.Iterator; +import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -13,15 +13,13 @@ import org.jbpm.taskmgmt.exe.TaskInstance; /** - * abstract base class for "get" commands which also implements default pre-fetching. + * abstract base class for "get" commands which also implements default pre-fetching. Note: + * pre-fetching logs is not possible here, so you have to load Logs explicitly with + * GetProcessInstanceLogCommand * - * Note: pre-fetching logs is not possible here, so you have to load Logs explicitly - * with GetProcessInstanceLogCommand - * * @author Bernd Ruecker (bernd.ruecker(a)camunda.com) */ -public abstract class AbstractGetObjectBaseCommand extends AbstractBaseCommand -{ +public abstract class AbstractGetObjectBaseCommand extends AbstractBaseCommand { static final Log log = LogFactory.getLog(AbstractGetObjectBaseCommand.class); @@ -39,24 +37,19 @@ private transient JbpmContext jbpmContext; - public AbstractGetObjectBaseCommand() - { + public AbstractGetObjectBaseCommand() { } - public AbstractGetObjectBaseCommand(boolean includeAllVariables, boolean includeLogs) - { + public AbstractGetObjectBaseCommand(boolean includeAllVariables, boolean includeLogs) { this.includeAllVariables = includeAllVariables; } - public AbstractGetObjectBaseCommand(String[] variablesToInclude) - { + public AbstractGetObjectBaseCommand(String[] variablesToInclude) { this.variablesToInclude = variablesToInclude; } - public void retrieveTaskInstanceDetails(TaskInstance ti) - { - try - { + public void retrieveTaskInstanceDetails(TaskInstance ti) { + try { ti.getToken().getProcessInstance().getProcessDefinition().getName(); // in TaskInstances created with jbpm 3.1, this association was @@ -69,160 +62,130 @@ retrieveVariables(ti); } - catch (Exception ex) - { + catch (Exception ex) { log.warn("exception while retrieving task instance data for task instance " + ti.getId(), ex); } } - public ProcessInstance retrieveProcessInstance(ProcessInstance pi) - { - try - { + public ProcessInstance retrieveProcessInstance(ProcessInstance pi) { + try { pi.getProcessDefinition().getName(); retrieveToken(pi.getRootToken()); // load at least the super process id and token id - if (pi.getSuperProcessToken() != null) - { + if (pi.getSuperProcessToken() != null) { pi.getSuperProcessToken().getId(); pi.getSuperProcessToken().getProcessInstance().getId(); } retrieveVariables(pi); } - catch (Exception ex) - { - log.warn("exception while retrieving process instance data for process instance " + pi.getId(), ex); + catch (Exception ex) { + log.warn("exception while retrieving process instance data for process instance " + + pi.getId(), ex); } return pi; } - public ProcessDefinition retrieveProcessDefinition(ProcessDefinition pd) - { - try - { + public ProcessDefinition retrieveProcessDefinition(ProcessDefinition pd) { + try { pd.getName(); // often needed to start a process: - Iterator iter = pd.getStartState().getLeavingTransitions().iterator(); - while (iter.hasNext()) - { - Transition t = (Transition)iter.next(); - t.getName(); + for (Transition transition : pd.getStartState().getLeavingTransitions()) { + transition.getName(); } } - catch (Exception ex) - { - log.warn("exception while retrieving process instance data for process definiton " + pd.getName(), ex); + catch (Exception ex) { + log.warn("exception while retrieving process instance data for process definiton " + + pd.getName(), ex); } return pd; } - protected void retrieveToken(Token t) - { - retrieveNode(t.getNode()); - t.getAvailableTransitions(); + protected void retrieveToken(Token token) { + retrieveNode(token.getNode()); + token.getAvailableTransitions(); - // if (includeLogs) - // t.getProcessInstance().getLoggingInstance(). - - Iterator iter = t.getChildren().values().iterator(); - while (iter.hasNext()) - { - retrieveToken((Token)iter.next()); + Map<String, Token> children = token.getChildren(); + if (children != null) { + for (Token childToken : children.values()) { + retrieveToken(childToken); + } } } - protected void retrieveNode(Node n) - { - n.getName(); - n.getLeavingTransitions(); - if (n.getSuperState() != null) - retrieveNode(n.getSuperState()); + protected void retrieveNode(Node node) { + while (node != null) { + node.getName(); + node.getLeavingTransitions(); + node = node.getSuperState(); + } } - public void retrieveVariables(ProcessInstance pi) - { - if (includeAllVariables) - { + public void retrieveVariables(ProcessInstance pi) { + if (includeAllVariables) { pi.getContextInstance().getVariables(); } - else - { - for (int i = 0; i < variablesToInclude.length; i++) - { + else { + for (int i = 0; i < variablesToInclude.length; i++) { pi.getContextInstance().getVariable(variablesToInclude[i]); } } } - public void retrieveVariables(TaskInstance ti) - { - if (includeAllVariables) - { + public void retrieveVariables(TaskInstance ti) { + if (includeAllVariables) { ti.getVariables(); } - else - { - for (int i = 0; i < variablesToInclude.length; i++) - { + else { + for (int i = 0; i < variablesToInclude.length; i++) { ti.getVariable(variablesToInclude[i]); } } } - public boolean isIncludeAllVariables() - { + public boolean isIncludeAllVariables() { return includeAllVariables; } - public void setIncludeAllVariables(boolean includeAllVariables) - { + public void setIncludeAllVariables(boolean includeAllVariables) { this.includeAllVariables = includeAllVariables; } - public String[] getVariablesToInclude() - { + public String[] getVariablesToInclude() { return variablesToInclude; } - public void setVariablesToInclude(String[] variablesToInclude) - { + public void setVariablesToInclude(String[] variablesToInclude) { this.variablesToInclude = variablesToInclude; } - public void setVariablesToInclude(String variableToInclude) - { + public void setVariablesToInclude(String variableToInclude) { this.variablesToInclude = new String[] { variableToInclude }; } - protected JbpmContext getJbpmContext() - { + protected JbpmContext getJbpmContext() { return jbpmContext; } - protected void setJbpmContext(JbpmContext jbpmContext) - { + protected void setJbpmContext(JbpmContext jbpmContext) { this.jbpmContext = jbpmContext; } - + // methods for fluent programming - - public AbstractGetObjectBaseCommand variablesToInclude(String[] variablesToInclude) - { + + public AbstractGetObjectBaseCommand variablesToInclude(String[] variablesToInclude) { setVariablesToInclude(variablesToInclude); return this; } - public AbstractGetObjectBaseCommand variablesToInclude(String variableToInclude) - { + public AbstractGetObjectBaseCommand variablesToInclude(String variableToInclude) { setVariablesToInclude(variableToInclude); return this; } - - public AbstractGetObjectBaseCommand includeAllVariables(boolean includeAllVariables) - { - setIncludeAllVariables( includeAllVariables ); + + public AbstractGetObjectBaseCommand includeAllVariables(boolean includeAllVariables) { + setIncludeAllVariables(includeAllVariables); return this; } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/Script.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/Script.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/action/Script.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -43,17 +43,19 @@ import bsh.TargetError; public class Script extends Action { - + private static final long serialVersionUID = 1L; - + protected String expression = null; protected Set<VariableAccess> variableAccesses = null; public void read(Element scriptElement, JpdlXmlReader jpdlReader) { if (scriptElement.isTextOnly()) { expression = scriptElement.getText(); - } else { - this.variableAccesses = new HashSet<VariableAccess>(jpdlReader.readVariableAccesses(scriptElement)); + } + else { + this.variableAccesses = new HashSet<VariableAccess>( + jpdlReader.readVariableAccesses(scriptElement)); expression = scriptElement.element("expression").getText(); } } @@ -63,11 +65,11 @@ setVariables(outputMap, executionContext); } - public Map<String, Object> eval(Token token) throws DelegationException { + public Map<String, Object> eval(Token token) { return eval(new ExecutionContext(token)); } - public Map<String, Object> eval(ExecutionContext executionContext) throws DelegationException { + public Map<String, Object> eval(ExecutionContext executionContext) { Map<String, Object> inputMap = createInputMap(executionContext); Set<String> outputNames = getOutputNames(); return eval(inputMap, outputNames); @@ -77,18 +79,18 @@ Token token = executionContext.getToken(); Map<String, Object> inputMap = new HashMap<String, Object>(); - inputMap.put( "executionContext", executionContext ); - inputMap.put( "token", token ); - inputMap.put( "node", executionContext.getNode() ); - inputMap.put( "task", executionContext.getTask() ); - inputMap.put( "taskInstance", executionContext.getTaskInstance() ); - - // if no readable variableInstances are specified, + inputMap.put("executionContext", executionContext); + inputMap.put("token", token); + inputMap.put("node", executionContext.getNode()); + inputMap.put("task", executionContext.getTask()); + inputMap.put("taskInstance", executionContext.getTaskInstance()); + + // if no readable variableInstances are specified, ContextInstance contextInstance = executionContext.getContextInstance(); - if (! hasReadableVariable()) { - // we copy all the variableInstances of the context into the interpreter + if (!hasReadableVariable()) { + // we copy all the variableInstances of the context into the interpreter Map<String, Object> variables = contextInstance.getVariables(token); - if ( variables != null ) { + if (variables != null) { for (Map.Entry<String, Object> entry : variables.entrySet()) { String variableName = entry.getKey(); Object variableValue = entry.getValue(); @@ -96,7 +98,8 @@ } } - } else { + } + else { // we only copy the specified variableInstances into the interpreter for (VariableAccess variableAccess : variableAccesses) { if (variableAccess.isReadable()) { @@ -107,15 +110,15 @@ } } } - + return inputMap; } - public Map<String, Object> eval(Map<String, Object> inputMap, Set<String> outputNames) throws DelegationException { + public Map<String, Object> eval(Map<String, Object> inputMap, Set<String> outputNames) { Map<String, Object> outputMap = new HashMap<String, Object>(); - + try { - log.debug("script input: "+inputMap); + log.debug("script input: " + inputMap); Interpreter interpreter = new Interpreter(); for (Map.Entry<String, Object> entry : inputMap.entrySet()) { String inputName = entry.getKey(); @@ -127,12 +130,15 @@ Object outputValue = interpreter.get(outputName); outputMap.put(outputName, outputValue); } - log.debug("script output: "+outputMap); - } catch (ParseException e) { + log.debug("script output: " + outputMap); + } + catch (ParseException e) { throw new DelegationException("parse error occurred", e); - } catch (TargetError e) { + } + catch (TargetError e) { throw new DelegationException("script threw exception", e.getTarget()); - } catch (EvalError e) { + } + catch (EvalError e) { log.warn("exception during evaluation of script expression", e); throw new DelegationException("script evaluation failed", e); } @@ -141,13 +147,13 @@ } public void addVariableAccess(VariableAccess variableAccess) { - if (variableAccesses==null) variableAccesses = new HashSet<VariableAccess>(); + if (variableAccesses == null) variableAccesses = new HashSet<VariableAccess>(); variableAccesses.add(variableAccess); } Set<String> getOutputNames() { Set<String> outputNames = new HashSet<String>(); - if (variableAccesses!=null) { + if (variableAccesses != null) { for (VariableAccess variableAccess : variableAccesses) { if (variableAccess.isWritable()) { outputNames.add(variableAccess.getMappedName()); @@ -158,7 +164,7 @@ } boolean hasReadableVariable() { - if (variableAccesses==null) return false; + if (variableAccesses == null) return false; for (VariableAccess variableAccess : variableAccesses) { if (variableAccess.isReadable()) { return true; @@ -168,14 +174,11 @@ } void setVariables(Map<String, Object> outputMap, ExecutionContext executionContext) { - if ( (outputMap!=null) - && (!outputMap.isEmpty()) - && (executionContext!=null) - ) { + if ((outputMap != null) && (!outputMap.isEmpty()) && (executionContext != null)) { Map<String, String> variableNames = getVariableNames(); ContextInstance contextInstance = executionContext.getContextInstance(); Token token = executionContext.getToken(); - + for (Map.Entry<String, String> entry : variableNames.entrySet()) { String mappedName = entry.getKey(); String variableName = entry.getValue(); @@ -189,7 +192,7 @@ for (VariableAccess variableAccess : variableAccesses) { if (variableAccess.isWritable()) { variableNames.put(variableAccess.getMappedName(), variableAccess.getVariableName()); - } + } } return variableNames; } @@ -197,15 +200,18 @@ public String getExpression() { return expression; } + public void setExpression(String expression) { this.expression = expression; } + public Set<VariableAccess> getVariableAccesses() { return variableAccesses; } + public void setVariableAccesses(Set<VariableAccess> variableAccesses) { this.variableAccesses = variableAccesses; } - + private static final Log log = LogFactory.getLog(Script.class); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Join.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/Join.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -35,21 +35,18 @@ import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.graph.exe.Token; import org.jbpm.jpdl.xml.JpdlXmlReader; +import org.jbpm.util.CollectionUtil; public class Join extends Node { - private static final long serialVersionUID = 1L; - - /** + /** * specifies what type of hibernate lock should be acquired. - * null value defaults to LockMode.FORCE - */ + */ String parentLockMode; /** - * specifies if this joinhandler is a discriminator. - * a descriminator reactivates the parent when the first - * concurrent token enters the join. + * specifies if this join is a discriminator. a descriminator reactivates the parent when the + * first concurrent token enters the join. */ boolean isDiscriminator = false; @@ -62,13 +59,14 @@ * a script that calculates concurrent tokens at runtime. */ Script script = null; - + /** * reactivate the parent if the n-th token arrives in the join. */ int nOutOfM = -1; - + private static final long serialVersionUID = 1L; + public Join() { } @@ -77,17 +75,15 @@ } @Override - public NodeType getNodeType() - { + public NodeType getNodeType() { return NodeType.Join; } public void read(Element element, JpdlXmlReader jpdlReader) { String lock = element.attributeValue("lock"); if (lock != null) { - LockMode lockMode = LockMode.parse(lock); - if (lockMode != null) - parentLockMode = lockMode.toString(); + if (LockMode.parse(lock) != null) + parentLockMode = lock; else if ("pessimistic".equals(lock)) parentLockMode = LockMode.UPGRADE.toString(); else @@ -97,30 +93,25 @@ public void execute(ExecutionContext executionContext) { Token token = executionContext.getToken(); - + boolean isAbleToReactivateParent = token.isAbleToReactivateParent(); - - if (!token.hasEnded()) { - token.end(false); - } - - // if this token is not able to reactivate the parent, - // we don't need to check anything - if ( isAbleToReactivateParent ) { - // the token arrived in the join and can only reactivate - // the parent once + if (!token.hasEnded()) token.end(false); + + // if this token is not able to reactivate the parent, + // we don't need to check anything + if (isAbleToReactivateParent) { + // the token arrived in the join and can only reactivate the parent once token.setAbleToReactivateParent(false); Token parentToken = token.getParent(); - - if ( parentToken != null ) { - + if (parentToken != null) { JbpmContext jbpmContext = executionContext.getJbpmContext(); - Session session = (jbpmContext!=null ? jbpmContext.getSession() : null); - if (session!=null) { - // force version increment by default (LockMode.FORCE) - LockMode lockMode = parentLockMode != null ? LockMode.parse(parentLockMode) : LockMode.FORCE; + Session session = jbpmContext != null ? jbpmContext.getSession() : null; + if (session != null) { + // obtain update lock by default (LockMode.UPGRADE) + LockMode lockMode = parentLockMode != null ? LockMode.parse(parentLockMode) + : LockMode.UPGRADE; log.debug("acquiring " + lockMode + " lock on " + parentToken); // lock updates as appropriate, no need to flush here session.lock(parentToken, lockMode); @@ -129,68 +120,64 @@ boolean reactivateParent = true; // if this is a discriminator - if ( isDiscriminator ) { + if (isDiscriminator) { // reactivate the parent when the first token arrives in the join. // this must be the first token arriving, otherwise isAbleToReactivateParent() // should have been false above. reactivateParent = true; - + } // if a fixed set of tokenNames is specified at design time... - } else if ( tokenNames != null ) { + else if (tokenNames != null) { // check reactivation on the basis of those tokenNames - reactivateParent = mustParentBeReactivated(parentToken, tokenNames.iterator() ); - + reactivateParent = mustParentBeReactivated(parentToken, tokenNames.iterator()); + } // if a script is specified - } else if ( script != null ) { - + else if (script != null) { // check if the script returns a collection or a boolean Object result = null; try { - result = script.eval( token ); - } catch (Exception e) { + result = script.eval(token); + } + catch (Exception e) { this.raiseException(e, executionContext); } - // if the result is a collection - if ( result instanceof Collection ) { - // it must be a collection of tokenNames - Collection<?> runtimeTokenNames = (Collection<?>) result; - reactivateParent = mustParentBeReactivated(parentToken, runtimeTokenNames.iterator() ); - - // if it's a boolean... - } else if ( result instanceof Boolean ) { + // if the result is a collection + if (result instanceof Collection) { + // it must be a collection of tokenNames + Collection<String> runtimeTokenNames = CollectionUtil.checkCollection( + (Collection<?>) result, String.class); + reactivateParent = mustParentBeReactivated(parentToken, runtimeTokenNames.iterator()); + } + // if it's a boolean... + else if (result instanceof Boolean) { // the boolean specifies if the parent needs to be reactivated - reactivateParent = ((Boolean)result).booleanValue(); + reactivateParent = (Boolean) result; } - + } // if a nOutOfM is specified - } else if ( nOutOfM != -1 ) { - + else if (nOutOfM != -1) { int n = 0; - // wheck how many tokens already arrived in the join + // check how many tokens already arrived in the join for (Token concurrentToken : parentToken.getChildren().values()) { - if (equals(concurrentToken.getNode())) { - n++; - } + if (equals(concurrentToken.getNode())) n++; } - if ( n < nOutOfM ) { - reactivateParent = false; - } - + if (n < nOutOfM) reactivateParent = false; + } // if no configuration is specified.. - } else { + else { // the default behaviour is to check all concurrent tokens and reactivate // the parent if the last token arrives in the join - reactivateParent = mustParentBeReactivated(parentToken, parentToken.getChildren().keySet().iterator() ); + reactivateParent = mustParentBeReactivated(parentToken, parentToken.getChildren() + .keySet() + .iterator()); } // if the parent token needs to be reactivated from this join node if (reactivateParent) { - // write to all child tokens that the parent is already reactivated for (Token child : parentToken.getChildren().values()) { child.setAbleToReactivateParent(false); } - // write to all child tokens that the parent is already reactivated ExecutionContext parentContext = new ExecutionContext(parentToken); leave(parentContext); @@ -199,49 +186,54 @@ } } - public boolean mustParentBeReactivated(Token parentToken, Iterator<?> childTokenNameIterator) { - boolean reactivateParent = true; - while ( (childTokenNameIterator.hasNext()) - && (reactivateParent) ){ - String concurrentTokenName = (String) childTokenNameIterator.next(); - - Token concurrentToken = parentToken.getChild( concurrentTokenName ); - + public boolean mustParentBeReactivated(Token parentToken, Iterator<String> childTokenNames) { + while (childTokenNames.hasNext()) { + String concurrentTokenName = childTokenNames.next(); + Token concurrentToken = parentToken.getChild(concurrentTokenName); if (concurrentToken.isAbleToReactivateParent()) { - log.debug("join will not yet reactivate parent: found concurrent token '"+concurrentToken+"'"); - reactivateParent = false; + log.debug("join will not reactivate parent: found concurrent " + concurrentToken); + return false; } } - return reactivateParent; + return true; } public String getParentLockMode() { return parentLockMode; } + public void setParentLockMode(String parentLockMode) { this.parentLockMode = parentLockMode; } + public Script getScript() { return script; } + public void setScript(Script script) { this.script = script; } + public Collection<String> getTokenNames() { return tokenNames; } + public void setTokenNames(Collection<String> tokenNames) { this.tokenNames = tokenNames; } + public boolean isDiscriminator() { return isDiscriminator; } + public void setDiscriminator(boolean isDiscriminator) { this.isDiscriminator = isDiscriminator; } + public int getNOutOfM() { return nOutOfM; } + public void setNOutOfM(int nOutOfM) { this.nOutOfM = nOutOfM; } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/BeanInstantiator.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/BeanInstantiator.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/BeanInstantiator.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -21,6 +21,7 @@ */ package org.jbpm.instantiation; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.apache.commons.logging.Log; @@ -28,47 +29,49 @@ import org.dom4j.Element; public class BeanInstantiator extends FieldInstantiator { - - protected void setPropertyValue(Class clazz, Object newInstance, String propertyName, Element propertyElement) { - try { - // create the setter method name from the property name - String setterMethodName = "set"+propertyName.substring(0,1).toUpperCase()+propertyName.substring(1); - - // find the setter method - Method method = findSetter(clazz, setterMethodName); - // if the setter method was found - if (method!=null) { - // make it accessible - method.setAccessible(true); - // invoke it - Class propertyType = method.getParameterTypes()[0]; - method.invoke(newInstance, new Object[]{ getValue(propertyType, propertyElement) }); - } else { - log.error( "couldn't set property '"+propertyName+"' to value '"+propertyElement.asXML()+"'" ); + protected void setPropertyValue(Object instance, String propertyName, Element propertyElement) { + // create the setter method name from the property name + String setterName = "set" + + Character.toUpperCase(propertyName.charAt(0)) + + propertyName.substring(1); + + // find the setter method + Method method = findSetter(instance.getClass(), setterName); + + // if the setter method was found + if (method != null) { + // make it accessible + method.setAccessible(true); + // invoke it + Class<?> propertyType = method.getParameterTypes()[0]; + Object value = getValue(propertyType, propertyElement); + try { + method.invoke(instance, value); } - } catch (Exception e) { - log.error( "couldn't parse property '"+propertyName+"' to value '"+propertyElement.asXML()+"'", e ); + catch (IllegalAccessException e) { + log.error("property '" + propertyName + "' is inaccesible", e); + } + catch (IllegalArgumentException e) { + log.error("property '" + propertyName + "' cannot be set to value " + value, e); + } + catch (InvocationTargetException e) { + log.error("write method for property '" + propertyName + "' threw exception", e.getCause()); + } } + else { + log.error("property '" + propertyName + "' does not exist or is not writeable"); + } } - - private Method findSetter(Class clazz, String setterMethodName) { - Method method = null; - Method[] methods = clazz.getDeclaredMethods(); - for( int i=0; ( (i<methods.length) - && (method==null) ); i++) { - if ( (setterMethodName.equals(methods[i].getName())) - && (methods[i].getParameterTypes()!=null) - && (methods[i].getParameterTypes().length==1) ) { - method = methods[i]; + + private Method findSetter(Class<?> clazz, String setterName) { + for (Method method : clazz.getDeclaredMethods()) { + if (setterName.equals(method.getName()) && method.getParameterTypes().length == 1) { + return method; } } - if ( (method==null) - && (clazz!=Object.class) - ) { - method = findSetter(clazz.getSuperclass(), setterMethodName); - } - return method; + Class<?> superclass = clazz.getSuperclass(); + return superclass != null ? findSetter(superclass, setterName) : null; } private static final Log log = LogFactory.getLog(BeanInstantiator.class); Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ConfigurationPropertyInstantiator.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ConfigurationPropertyInstantiator.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ConfigurationPropertyInstantiator.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -21,33 +21,41 @@ */ package org.jbpm.instantiation; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jbpm.JbpmException; public class ConfigurationPropertyInstantiator implements Instantiator { - private static final Class[] parameterTypes = new Class[] {String.class}; + private static final Class<?>[] parameterTypes = { String.class }; - public Object instantiate(Class clazz, String configuration) { - Object newInstance = null; + public <T> T instantiate(Class<T> type, String configuration) { + // create a new instance with the default constructor + T instance = InstantiatorUtil.instantiate(type); + try { - // create the object - newInstance = clazz.newInstance(); - // set the configuration with the bean-style setter - Method setter = clazz.getDeclaredMethod( "setConfiguration", parameterTypes ); + Method setter = type.getDeclaredMethod("setConfiguration", parameterTypes); setter.setAccessible(true); - setter.invoke( newInstance, new Object[]{ configuration } ); - - } catch (Exception e) { - log.error( "couldn't instantiate '" + clazz.getName() + "'", e ); - throw new JbpmException( e ); + setter.invoke(instance, configuration); } - return newInstance; + catch (NoSuchMethodException e) { + log.error("configuration setter does not exist", e); + } + catch (IllegalAccessException e) { + log.error("configuration setter is inaccesible", e); + } + catch (IllegalArgumentException e) { + log.error("configuration cannot be set to value " + configuration, e); + } + catch (InvocationTargetException e) { + log.error("configuration setter threw exception", e.getCause()); + } + + return instance; } - + private static final Log log = LogFactory.getLog(ConfigurationPropertyInstantiator.class); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ConstructorInstantiator.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ConstructorInstantiator.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ConstructorInstantiator.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -21,28 +21,10 @@ */ package org.jbpm.instantiation; -import java.lang.reflect.Constructor; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jbpm.JbpmException; - public class ConstructorInstantiator implements Instantiator { - - private static final Class[] parameterTypes = new Class[] {String.class}; - public Object instantiate(Class clazz, String configuration) { - Object newInstance = null; - try { - Constructor constructor = clazz.getDeclaredConstructor( parameterTypes ); - constructor.setAccessible(true); - newInstance = constructor.newInstance( new Object[] { configuration } ); - } catch (Exception e) { - log.error( "couldn't instantiate '" + clazz.getName() + "'", e ); - throw new JbpmException( e ); - } - return newInstance; + public <T> T instantiate(Class<T> type, String configuration) { + return InstantiatorUtil.instantiate(type, configuration); } - private static final Log log = LogFactory.getLog(ConstructorInstantiator.class); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/DefaultInstantiator.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/DefaultInstantiator.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/DefaultInstantiator.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -21,20 +21,11 @@ */ package org.jbpm.instantiation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jbpm.JbpmException; public class DefaultInstantiator implements Instantiator { - public Object instantiate(Class clazz, String configuration) { - try { - return clazz.newInstance(); - } catch (Exception e) { - log.error( "couldn't instantiate '" + clazz.getName() + "'", e ); - throw new JbpmException( e ); - } + public <T> T instantiate(Class<T> type, String configuration) { + return InstantiatorUtil.instantiate(type); } - private static final Log log = LogFactory.getLog(DefaultInstantiator.class); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/Delegation.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/Delegation.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/Delegation.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -24,9 +24,7 @@ import java.io.IOException; import java.io.Serializable; import java.io.StringWriter; -import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.apache.commons.logging.Log; @@ -34,28 +32,30 @@ import org.dom4j.DocumentException; import org.dom4j.DocumentHelper; import org.dom4j.Element; -import org.dom4j.Node; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; -import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmException; +import org.jbpm.graph.def.DelegationException; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.jpdl.xml.JpdlXmlReader; import org.jbpm.jpdl.xml.Parsable; -import org.jbpm.util.ClassLoaderUtil; import org.jbpm.util.EqualsUtil; public class Delegation implements Parsable, Serializable { private static final long serialVersionUID = 1L; - - protected static Map instantiatorCache = new HashMap(); - static { - instantiatorCache.put(null, new FieldInstantiator()); - instantiatorCache.put("field", new FieldInstantiator()); - instantiatorCache.put("bean", new BeanInstantiator()); - instantiatorCache.put("constructor", new ConstructorInstantiator()); - instantiatorCache.put("configuration-property", new ConfigurationPropertyInstantiator()); + + protected static Map<String, Instantiator> instantiatorCache = createInstantiatorCache(); + + private static Map<String, Instantiator> createInstantiatorCache() { + Map<String, Instantiator> instantiators = new HashMap<String, Instantiator>(); + instantiators.put(null, new FieldInstantiator()); + instantiators.put("field", new FieldInstantiator()); + instantiators.put("bean", new BeanInstantiator()); + instantiators.put("constructor", new ConstructorInstantiator()); + instantiators.put("configuration-property", new ConfigurationPropertyInstantiator()); + instantiators.put("xml", new XmlInstantiator()); + return instantiators; } long id = 0; @@ -79,26 +79,27 @@ public void read(Element delegateElement, JpdlXmlReader jpdlReader) { processDefinition = jpdlReader.getProcessDefinition(); className = delegateElement.attributeValue("class"); - if (className==null) { - jpdlReader.addWarning("no class specified in "+delegateElement.asXML()); + if (className == null) { + jpdlReader.addWarning("no class specified in " + delegateElement.asXML()); } - + configType = delegateElement.attributeValue("config-type"); - if ( delegateElement.hasContent() ) { + if (delegateElement.hasContent()) { try { StringWriter stringWriter = new StringWriter(); - // when parsing, it could be to store the config in the database, so we want to make the configuration compact - XMLWriter xmlWriter = new XMLWriter( stringWriter, OutputFormat.createCompactFormat() ); - Iterator iter = delegateElement.content().iterator(); - while (iter.hasNext()) { - Object node = iter.next(); - xmlWriter.write( node ); + // when parsing, it could be to store the config in the database, so we want to make the + // configuration compact + XMLWriter xmlWriter = new XMLWriter(stringWriter, OutputFormat.createCompactFormat()); + for (Object node : delegateElement.content()) { + xmlWriter.write(node); } xmlWriter.flush(); configuration = stringWriter.toString(); - } catch (IOException e) { - jpdlReader.addWarning("io problem while parsing the configuration of "+delegateElement.asXML()); } + catch (IOException e) { + jpdlReader.addWarning("io problem while parsing the configuration of " + + delegateElement.asXML()); + } } } @@ -106,71 +107,66 @@ element.addAttribute("class", className); element.addAttribute("config-type", configType); String configuration = this.configuration; - if (configuration!=null) { + if (configuration != null) { try { - Element actionElement = DocumentHelper.parseText( "<action>"+configuration+"</action>" ).getRootElement(); - Iterator iter = new ArrayList( actionElement.content() ).iterator(); - while (iter.hasNext()) { - Node node = (Node)iter.next(); - node.setParent(null); - element.add( node ); - } - } catch (DocumentException e) { - log.error("couldn't create dom-tree for action configuration '"+configuration+"'", e); + Element actionElement = DocumentHelper.parseText("<action>" + configuration + "</action>") + .getRootElement(); + element.appendContent(actionElement); } + catch (DocumentException e) { + log.error("couldn't create dom-tree for action configuration '" + configuration + "'", e); + } } } public Object getInstance() { - if (instance==null) { + if (instance == null) { instance = instantiate(); } return instance; } public Object instantiate() { - - Object newInstance = null; - - // The thread class loader was set before the instantiation correctly + // The thread class loader was set before the instantiation correctly // to the ProcesClassLoader which can be directly used here // If we would construct a JbpmConfiguration.getProcessClassLoder here // we would have the hierarchy ProcessClassLoader -> ProcessClassLoader -> Context... // this is one ProcessClassLoader too much ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - + // load the class that needs to be instantiated - Class clazz = null; + Class<?> delegationClass = null; try { - clazz = classLoader.loadClass(className); - } catch (ClassNotFoundException e) { - log.error("couldn't load delegation class '"+className+"'", e); + delegationClass = classLoader.loadClass(className); } + catch (ClassNotFoundException e) { + throw new DelegationException("could not load delegation class '" + className + "'", e); + } - Instantiator instantiator = null; - try { - // find the instantiator - instantiator = (Instantiator) instantiatorCache.get(configType); - if (instantiator == null) { + // find the instantiator + Instantiator instantiator = instantiatorCache.get(configType); + if (instantiator == null) { + Class<?> instantiatorClass = null; + try { // load the instantiator class - Class instantiatorClass = classLoader.loadClass(configType); - // instantiate the instantiator with the default constructor + instantiatorClass = classLoader.loadClass(configType); + // create the instantiator with the default constructor instantiator = (Instantiator) instantiatorClass.newInstance(); instantiatorCache.put(configType, instantiator); } - } catch (Exception e) { - log.error(e); - throw new JbpmException("couldn't instantiate custom instantiator '" + configType + "'", e); + catch (ClassNotFoundException e) { + throw new JbpmException("could not load instantiator class '" + configType + "'", e); + } + catch (InstantiationException e) { + throw new JbpmException("could not instantiate " + instantiatorClass, e); + } + catch (IllegalAccessException e) { + throw new JbpmException("could not access " + instantiatorClass, e); + } } - - try { - // instantiate the object - newInstance = instantiator.instantiate(clazz, configuration); - } catch (RuntimeException e) { - log.error("couldn't instantiate delegation class '"+className+"'", e); - } - return newInstance; + // instantiate the object + return instantiator.instantiate(delegationClass, configuration); } // equals /////////////////////////////////////////////////////////////////// @@ -179,36 +175,45 @@ public boolean equals(Object o) { return EqualsUtil.equals(this, o); } - + // getters and setters ////////////////////////////////////////////////////// public String getClassName() { return className; } + public void setClassName(String className) { this.className = className; } + public String getConfiguration() { return configuration; } + public void setConfiguration(String configuration) { this.configuration = configuration; } + public String getConfigType() { return configType; } + public void setConfigType(String instantiatorType) { this.configType = instantiatorType; } + public long getId() { return id; } + public void setId(long id) { this.id = id; } - public ProcessDefinition getProcessDefinition() { + + public ProcessDefinition getProcessDefinition() { return processDefinition; } + public void setProcessDefinition(ProcessDefinition processDefinition) { this.processDefinition = processDefinition; } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/FieldInstantiator.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/FieldInstantiator.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/FieldInstantiator.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -23,13 +23,15 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Queue; import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; @@ -38,170 +40,184 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.dom4j.DocumentException; -import org.dom4j.DocumentHelper; import org.dom4j.Element; -import org.jbpm.JbpmException; import org.jbpm.util.ClassLoaderUtil; +import org.jbpm.util.CollectionUtil; public class FieldInstantiator implements Instantiator { - public Object instantiate(Class clazz, String configuration) { - + public <T> T instantiate(Class<T> type, String configuration) { // create a new instance with the default constructor - Object newInstance = newInstance(clazz); + T instance = InstantiatorUtil.instantiate(type); - if ( (configuration!=null) - && (! "".equals(configuration)) - ) { + if (configuration != null && configuration.length() > 0) { // parse the bean configuration - Element configurationElement = parseConfiguration(configuration); - + Element configurationElement = InstantiatorUtil.parseConfiguration(configuration); + // loop over the configured properties - Iterator iter = configurationElement.elements().iterator(); - while( iter.hasNext() ) { - Element propertyElement = (Element) iter.next(); + for (Object i : configurationElement.elements()) { + Element propertyElement = (Element) i; String propertyName = propertyElement.getName(); - setPropertyValue(clazz, newInstance, propertyName, propertyElement); + setPropertyValue(instance, propertyName, propertyElement); } } - return newInstance; + return instance; } - - protected void setPropertyValue(Class clazz, Object newInstance, String propertyName, Element propertyElement) { - try { - Field f = findField(clazz, propertyName); - f.setAccessible(true); - f.set(newInstance, getValue(f.getType(), propertyElement)); - } catch (Exception e) { - log.error( "couldn't parse set field '"+propertyName+"' to value '"+propertyElement.asXML()+"'", e ); - } - } - private Field findField(Class clazz, String propertyName) throws NoSuchFieldException { - Field f = null; - if (clazz!=null) { + protected void setPropertyValue(Object instance, String propertyName, Element propertyElement) { + Field field = findField(instance.getClass(), propertyName); + if (field != null) { + field.setAccessible(true); + Object value = getValue(field.getType(), propertyElement); try { - f = clazz.getDeclaredField(propertyName); - } catch (NoSuchFieldException e) { - f = findField(clazz.getSuperclass(), propertyName); + field.set(instance, value); } + catch (IllegalArgumentException e) { + log.error("field '" + propertyName + "' cannot be set to value " + value, e); + } + catch (IllegalAccessException e) { + log.error(" field '" + propertyName + "' is inaccessible", e); + } } - return f; } - protected Element parseConfiguration(String configuration) { - Element element = null; + private Field findField(Class<?> clazz, String propertyName) { try { - element = DocumentHelper.parseText( "<action>"+configuration+"</action>" ).getRootElement(); - } catch (DocumentException e) { - log.error( "couldn't parse bean configuration : " + configuration, e ); - throw new JbpmException(e); + return clazz.getDeclaredField(propertyName); } - return element; - } - - protected Object newInstance(Class clazz) { - Object newInstance = null; - try { - newInstance = clazz.newInstance(); - } catch (Exception e) { - log.error( "couldn't instantiate type '" + clazz.getName() + "' with the default constructor" ); - throw new JbpmException(e); + catch (NoSuchFieldException e) { + Class<?> superclass = clazz.getSuperclass(); + return superclass != null ? findField(superclass, propertyName) : null; } - return newInstance; } - public static Object getValue(Class type, Element propertyElement) { - // parse the value + public static Object getValue(Class<?> type, Element propertyElement) { Object value = null; - try { - - if ( type == String.class ) { - value = propertyElement.getText(); - } else if ( (type==Integer.class) || (type==int.class) ) { - value = new Integer( propertyElement.getTextTrim() ); - } else if ( (type==Long.class) || (type==long.class) ) { - value = new Long( propertyElement.getTextTrim() ); - } else if ( (type==Float.class ) || (type==float.class) ) { - value = new Float( propertyElement.getTextTrim() ); - } else if ( (type==Double.class ) || (type==double.class) ) { - value = new Double( propertyElement.getTextTrim() ); - } else if ( (type==Boolean.class ) || (type==boolean.class) ) { - value = Boolean.valueOf( propertyElement.getTextTrim() ); - } else if ( (type==Character.class ) || (type==char.class) ) { - value = new Character( propertyElement.getTextTrim().charAt(0) ); - } else if ( (type==Short.class ) || (type==short.class) ) { - value = new Short( propertyElement.getTextTrim() ); - } else if ( (type==Byte.class ) || (type==byte.class) ) { - value = new Byte( propertyElement.getTextTrim() ); - } else if (type==List.class || type==Collection.class) { - value = getCollection(propertyElement, new ArrayList()); - } else if (type==Set.class) { - value = getCollection(propertyElement, new HashSet()); - } else if (type==SortedSet.class) { - value = getCollection(propertyElement, new TreeSet()); - } else if (Collection.class.isAssignableFrom(type)) { - value = getCollection(propertyElement, (Collection)type.newInstance()); - } else if (type==Map.class) { - value = getMap(propertyElement, new HashMap()); - } else if (type==SortedMap.class) { - value = getMap(propertyElement, new TreeMap()); - } else if (Map.class.isAssignableFrom(type)) { - value = getMap(propertyElement, (Map)type.newInstance()); - } else if ( Element.class.isAssignableFrom(type) ) { - value = propertyElement; - } else { - Constructor constructor = type.getConstructor(new Class[]{String.class}); - if ( (propertyElement.isTextOnly()) - && (constructor!=null) ) { - value = constructor.newInstance(new Object[]{propertyElement.getTextTrim()}); + if (type == String.class) { + value = propertyElement.getText(); + } + else if ((type == Integer.class) || (type == int.class)) { + value = new Integer(propertyElement.getTextTrim()); + } + else if ((type == Long.class) || (type == long.class)) { + value = new Long(propertyElement.getTextTrim()); + } + else if ((type == Float.class) || (type == float.class)) { + value = new Float(propertyElement.getTextTrim()); + } + else if ((type == Double.class) || (type == double.class)) { + value = new Double(propertyElement.getTextTrim()); + } + else if ((type == Boolean.class) || (type == boolean.class)) { + value = Boolean.valueOf(propertyElement.getTextTrim()); + } + else if ((type == Character.class) || (type == char.class)) { + value = new Character(propertyElement.getTextTrim().charAt(0)); + } + else if ((type == Short.class) || (type == short.class)) { + value = new Short(propertyElement.getTextTrim()); + } + else if ((type == Byte.class) || (type == byte.class)) { + value = new Byte(propertyElement.getTextTrim()); + } + else if (type == List.class || type == Collection.class) { + value = getCollection(propertyElement, new ArrayList<Object>()); + } + else if (type == Queue.class) { + value = getCollection(propertyElement, new LinkedList<Object>()); + } + else if (type == Set.class) { + value = getCollection(propertyElement, new HashSet<Object>()); + } + else if (type == SortedSet.class) { + value = getCollection(propertyElement, new TreeSet<Object>()); + } + else if (type == Map.class) { + value = getMap(propertyElement, new HashMap<Object, Object>()); + } + else if (type == SortedMap.class) { + value = getMap(propertyElement, new TreeMap<Object, Object>()); + } + else if (Element.class.isAssignableFrom(type)) { + value = propertyElement; + } + else { + try { + if (Collection.class.isAssignableFrom(type)) { + value = getCollection(propertyElement, CollectionUtil.checkCollection( + (Collection<?>) type.newInstance(), Object.class)); } + else if (Map.class.isAssignableFrom(type)) { + value = getMap(propertyElement, CollectionUtil.checkMap((Map<?, ?>) type.newInstance(), + Object.class, Object.class)); + } + else { + try { + Constructor<?> constructor = type.getConstructor(String.class); + if (propertyElement.isTextOnly()) { + value = constructor.newInstance(propertyElement.getTextTrim()); + } + else { + log.error("element '" + propertyElement.getName() + "' has non-text content"); + } + } + catch (NoSuchMethodException e) { + log.error(type + " does not have a string constructor", e); + } + catch (IllegalArgumentException e) { + log.error(type + " cannot be constructed with value " + propertyElement.getTextTrim(), + e); + } + } } - } catch (Exception e) { - log.error("couldn't parse the bean property value '" + propertyElement.asXML() + "' to a '" + type.getName() + "'" ); - throw new JbpmException( e ); + catch (InstantiationException e) { + log.error("could not instantiate " + type, e); + } + catch (IllegalAccessException e) { + log.error(type + " is inaccessible", e); + } + catch (InvocationTargetException e) { + log.error("constructor for " + type + " threw exception", e.getCause()); + } } return value; } - static Object getMap(Element mapElement, Map map) { - Class keyClass = String.class; - String keyType = mapElement.attributeValue("key-type"); - if (keyType!=null) { - keyClass = ClassLoaderUtil.loadClass(keyType); - } + private static Map<Object, Object> getMap(Element mapElement, Map<Object, Object> map) { + Class<?> keyClass = classForAttributeValue(mapElement, "key-type"); + Class<?> valueClass = classForAttributeValue(mapElement, "value-type"); - Class valueClass = String.class; - String valueType = mapElement.attributeValue("value-type"); - if (valueType!=null) { - valueClass = ClassLoaderUtil.loadClass(valueType); - } - - Iterator iter = mapElement.elementIterator(); - while (iter.hasNext()) { - Element element = (Element) iter.next(); + for (Object o : mapElement.elements()) { + Element element = (Element) o; Element keyElement = element.element("key"); Element valueElement = element.element("value"); - + map.put(getValue(keyClass, keyElement), getValue(valueClass, valueElement)); } return map; } - static Object getCollection(Element collectionElement, Collection collection) { - Class elementClass = String.class; - String elementType = collectionElement.attributeValue("element-type"); - if (elementType!=null) { - elementClass = ClassLoaderUtil.loadClass(elementType); + private static Collection<Object> getCollection(Element collectionElement, + Collection<Object> collection) { + Class<?> elementClass = classForAttributeValue(collectionElement, "element-type"); + + for (Object element : collectionElement.elements()) { + collection.add(getValue(elementClass, (Element) element)); } - Iterator iter = collectionElement.elementIterator(); - while (iter.hasNext()) { - Element element = (Element) iter.next(); - collection.add(getValue(elementClass, element)); - } return collection; } + /** + * Returns the <code>Class</code> associated with the value for the attribute with the given name. + */ + private static Class<?> classForAttributeValue(Element element, String attributeName) { + Class<?> type = String.class; + String attributeValue = element.attributeValue(attributeName); + if (attributeValue != null) { + type = ClassLoaderUtil.loadClass(attributeValue); + } + return type; + } + private static final Log log = LogFactory.getLog(FieldInstantiator.class); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/Instantiator.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/Instantiator.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/Instantiator.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -23,5 +23,5 @@ public interface Instantiator { - Object instantiate(Class clazz, String configuration); + <T> T instantiate(Class<T> type, String configuration); } Added: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/InstantiatorUtil.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/InstantiatorUtil.java (rev 0) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/InstantiatorUtil.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -0,0 +1,89 @@ +/* + * 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.instantiation; + +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; + +import org.dom4j.DocumentException; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.jbpm.JbpmException; + +/** + * @author Alejandro Guizar + */ +class InstantiatorUtil { + + private InstantiatorUtil() { + // hide default constructor to prevent instantiation + } + + public static <T> T instantiate(Class<T> type) { + try { + return type.newInstance(); + } + catch (InstantiationException e) { + throw new JbpmException("could not instantiate " + type, e); + } + catch (IllegalAccessException e) { + throw new JbpmException(type + " is inaccessible", e); + } + } + + public static <T> T instantiate(Class<T> type, Object configuration) { + try { + Constructor<T> constructor = type.getDeclaredConstructor(configuration.getClass()); + constructor.setAccessible(true); + return constructor.newInstance(configuration); + } + catch (NoSuchMethodException e) { + throw new JbpmException(type + + " does not have a " + + configuration.getClass().getSimpleName() + + " constructor", e); + } + catch (InstantiationException e) { + throw new JbpmException("could not instantiate " + type, e); + } + catch (IllegalAccessException e) { + throw new JbpmException(type + " is inaccessible", e); + } + catch (IllegalArgumentException e) { + throw new JbpmException(type + " cannot be constructed with value " + configuration, e); + } + catch (InvocationTargetException e) { + throw new JbpmException("constructor for " + type + " threw exception", e.getCause()); + } + } + + public static Element parseConfiguration(String configuration) { + Element element = null; + try { + element = DocumentHelper.parseText("<action>" + configuration + "</action>").getRootElement(); + } + catch (DocumentException e) { + throw new JbpmException("failed to parse configuration: " + configuration, e); + } + return element; + } +} Property changes on: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/InstantiatorUtil.java ___________________________________________________________________ Name: svn:mergeinfo + Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ProcessClassLoader.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ProcessClassLoader.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ProcessClassLoader.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -34,10 +34,10 @@ import org.jbpm.graph.def.ProcessDefinition; public class ProcessClassLoader extends ClassLoader { - + private ProcessDefinition processDefinition = null; - public ProcessClassLoader( ClassLoader parent, ProcessDefinition processDefinition ) { + public ProcessClassLoader(ClassLoader parent, ProcessDefinition processDefinition) { super(parent); this.processDefinition = processDefinition; } @@ -45,42 +45,49 @@ public URL findResource(String name) { URL url = null; FileDefinition fileDefinition = processDefinition.getFileDefinition(); - if (fileDefinition!=null) { - // if the name of the resources starts with a / + if (fileDefinition != null) { + // if the name of the resources starts with a / if (name.startsWith("/")) { // then we start searching from the root of the process archive - // we know that the leading slashes are removed in the names of the - // file definitions, therefor we skip the leading slashes + // we know that the leading slashes are removed in the names of the + // file definitions, therefore we skip the leading slashes while (name.startsWith("/")) { name = name.substring(1); } - } else { + } + else { // otherwise, (if the resource is relative), we look in the classes // directory in the process archive - name = "classes/"+name; + name = "classes/" + name; } byte[] bytes = null; if (fileDefinition.hasFile(name)) { bytes = fileDefinition.getBytes(name); } - if (bytes!=null) { + if (bytes != null) { try { - url = new URL(null, "processresource://"+processDefinition.getName()+"/classes/"+name, new BytesUrlStreamHandler(bytes)); - } catch (MalformedURLException e) { + url = new URL(null, "processresource://" + + processDefinition.getName() + + "/classes/" + + name, new BytesUrlStreamHandler(bytes)); + } + catch (MalformedURLException e) { throw new JbpmException("couldn't create url", e); } } } return url; } - + public static class BytesUrlStreamHandler extends URLStreamHandler { byte[] bytes; + public BytesUrlStreamHandler(byte[] bytes) { this.bytes = bytes; } + protected URLConnection openConnection(URL u) throws IOException { return new BytesUrlConnection(bytes, u); } @@ -88,47 +95,42 @@ public static class BytesUrlConnection extends URLConnection { byte[] bytes = null; + public BytesUrlConnection(byte[] bytes, URL u) { super(u); this.bytes = bytes; } + public void connect() throws IOException { } + public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(bytes); } } - public Class findClass(String name) throws ClassNotFoundException { - Class clazz = null; + public Class<?> findClass(String className) throws ClassNotFoundException { + FileDefinition fileDefinition = processDefinition.getFileDefinition(); + if (fileDefinition != null) { + String fileName = "classes/" + className.replace('.', '/') + ".class"; + byte[] classBytes = fileDefinition.getBytes(fileName); - FileDefinition fileDefinition = processDefinition.getFileDefinition(); - if (fileDefinition!=null) { - String fileName = "classes/" + name.replace( '.', '/' ) + ".class"; - byte[] classBytes; - try { - classBytes = fileDefinition.getBytes(fileName); - clazz = defineClass(name, classBytes, 0, classBytes.length); - } catch (JbpmException e) { - clazz = null; - } - - // Add the package information - // see https://jira.jboss.org/jira/browse/JBPM-1404 - final int packageIndex = name.lastIndexOf('.'); - if (packageIndex != -1) { - final String packageName = name.substring(0, packageIndex); - final Package classPackage = getPackage(packageName); - if (classPackage == null) { - definePackage(packageName, null, null, null, null, null, null, null); + if (classBytes != null) { + // define the package before defining the class + // see https://jira.jboss.org/jira/browse/JBPM-1404 + int packageIndex = className.lastIndexOf('.'); + + if (packageIndex != -1) { + String packageName = className.substring(0, packageIndex); + + if (getPackage(packageName) == null) { + definePackage(packageName, null, null, null, processDefinition.getName(), + Integer.toString(processDefinition.getVersion()), null, null); + } } + return defineClass(className, classBytes, 0, classBytes.length); } } - - if (clazz==null) { - throw new ClassNotFoundException("class '"+name+"' could not be found by the process classloader"); - } - - return clazz; + throw new ClassNotFoundException(className); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/XmlInstantiator.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/XmlInstantiator.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/XmlInstantiator.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -21,45 +21,9 @@ */ package org.jbpm.instantiation; -import java.lang.reflect.Constructor; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.dom4j.DocumentException; -import org.dom4j.DocumentHelper; -import org.dom4j.Element; -import org.jbpm.JbpmException; - public class XmlInstantiator implements Instantiator { - private static final Class[] parameterTypes = new Class[] {Element.class}; - - public Object instantiate(Class clazz, String configuration) { - Object newInstance = null; - try { - // parse the bean configuration - Element configurationElement = parseConfiguration(configuration); - - Constructor constructor = clazz.getDeclaredConstructor( parameterTypes ); - constructor.setAccessible(true); - newInstance = constructor.newInstance( new Object[] { configurationElement } ); - } catch (Exception e) { - log.error( "couldn't instantiate '" + clazz.getName() + "'", e ); - throw new JbpmException( e ); - } - return newInstance; + public <T> T instantiate(Class<T> type, String configuration) { + return InstantiatorUtil.instantiate(type, InstantiatorUtil.parseConfiguration(configuration)); } - - protected Element parseConfiguration(String configuration) { - Element element = null; - try { - element = DocumentHelper.parseText( "<action>"+configuration+"</action>" ).getRootElement(); - } catch (DocumentException e) { - log.error( "couldn't parse bean configuration : " + configuration, e ); - throw new JbpmException(e); - } - return element; - } - - private static final Log log = LogFactory.getLog(XmlInstantiator.class); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/CollectionUtil.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/CollectionUtil.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/CollectionUtil.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -23,6 +23,7 @@ import java.util.Collection; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -40,7 +41,7 @@ /** * Ensures that all elements of the given collection can be cast to a desired type. * - * @param collection the collection to check + * @param collection the collection to check * @param type the desired type * @return a collection of the desired type * @throws ClassCastException if an element cannot be cast to the desired type @@ -49,8 +50,7 @@ public static <E> Collection<E> checkCollection(Collection<?> collection, Class<E> type) { if (DEBUG) { for (Object element : collection) { - if (element != null && !type.isInstance(element)) - throw new ClassCastException(element.getClass().toString()); + type.cast(element); } } return (Collection<E>) collection; @@ -59,7 +59,7 @@ /** * Ensures that all elements of the given list can be cast to a desired type. * - * @param list the list to check + * @param list the list to check * @param type the desired type * @return a list of the desired type * @throws ClassCastException if an element cannot be cast to the desired type @@ -68,8 +68,7 @@ public static <E> List<E> checkList(List<?> list, Class<E> type) { if (DEBUG) { for (Object element : list) { - if (element != null && !type.isInstance(element)) - throw new ClassCastException(element.getClass().toString()); + type.cast(element); } } return (List<E>) list; @@ -78,7 +77,7 @@ /** * Ensures that all elements of the given set can be cast to a desired type. * - * @param list the set to check + * @param list the set to check * @param type the desired type * @return a set of the desired type * @throws ClassCastException if an element cannot be cast to the desired type @@ -87,10 +86,20 @@ public static <E> Set<E> checkSet(Set<?> set, Class<E> type) { if (DEBUG) { for (Object element : set) { - if (element != null && !type.isInstance(element)) - throw new ClassCastException(element.getClass().toString()); + type.cast(element); } } return (Set<E>) set; } + + @SuppressWarnings("unchecked") + public static <K, V> Map<K, V> checkMap(Map<?, ?> map, Class<K> keyType, Class<V> valueType) { + if (DEBUG) { + for (Map.Entry<?, ?> entry : map.entrySet()) { + keyType.cast(entry.getKey()); + valueType.cast(entry.getValue()); + } + } + return (Map<K, V>) map; + } } Deleted: jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/StaticUtil.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/StaticUtil.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/util/StaticUtil.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -1,96 +0,0 @@ -/* - * 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.util; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -public class StaticUtil { - - /* - public class MyClass ... { - static AType aStaticInMyClass = null; - static AnotherType anotherStaticInMyClass = null; - - static { - new StaticUtil.Initializer(MyClass.class) { - public void init() { - // initialize static members here - aStaticInMyClass = ...; - anotherStaticInMyClass = ...; - } - }; - } - ... - } - */ - - static Map initializers = Collections.synchronizedMap(new HashMap()); - - public abstract static class Initializer { - public Initializer(Class clazz) { - add(clazz, this); - init(); - } - public abstract void init(); - } - - /* - public class MyClass ... { - static AType aStaticInMyClass = null; - static AnotherType anotherStaticInMyClass = null; - - static { - new StaticUtil.Initializer(MyClass.class) { - public void init() { - // initialize static members here - aStaticInMyClass = ...; - anotherStaticInMyClass = ...; - } - }; - } - ... - } - */ - - private StaticUtil() { - // hide default constructor to prevent instantiation - } - - public static void add(Class clazz, Initializer initializer) { - initializers.put(clazz, initializer); - } - - public static void remove(Class clazz) { - initializers.remove(clazz); - } - - public static void reinitialize() { - Iterator iter = initializers.values().iterator(); - while (iter.hasNext()) { - Initializer initializer = (Initializer) iter.next(); - initializer.init(); - } - } -} Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml 2009-01-29 07:36:26 UTC (rev 3729) @@ -1,6 +1,6 @@  - <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property> + <property name="hibernate.dialect">org.hibernate.dialect.MySQL5InnoDBDialect</property>  <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property> Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ExceptionHandlerTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ExceptionHandlerTest.java 2009-01-29 04:23:29 UTC (rev 3728) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ExceptionHandlerTest.java 2009-01-29 07:36:26 UTC (rev 3729) @@ -116,7 +116,7 @@ catch (DelegationException ex) { // check that exception is thrown to the client nested in a DelegationException - assertEquals(NullPointerException.class, ex.getCause().getClass()); + assertEquals(ClassNotFoundException.class, ex.getCause().getClass()); } }

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3728 - in jbpm3/trunk/hudson/hudson-home/jobs: jBPM3-Database-Matrix and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-01-28 23:23:29 -0500 (Wed, 28 Jan 2009) New Revision: 3728 Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml Log: Clarify description Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-01-29 04:13:45 UTC (rev 3727) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-01-29 04:23:29 UTC (rev 3728) @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <matrix-project> <actions class="java.util.concurrent.CopyOnWriteArrayList"/> - <description>Build and test the @version.id@ Matrix</description> + <description>Build and test the @version.id@ Container Matrix</description> <logRotator> <daysToKeep>60</daysToKeep> <numToKeep>-1</numToKeep> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-01-29 04:13:45 UTC (rev 3727) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-01-29 04:23:29 UTC (rev 3728) @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <matrix-project> <actions class="java.util.concurrent.CopyOnWriteArrayList"/> - <description>Build and test the @version.id@ Matrix</description> + <description>Build and test the @version.id@ Database Matrix on JBoss-4.2.2.GA</description> <logRotator> <daysToKeep>60</daysToKeep> <numToKeep>-1</numToKeep>

15 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits January 2009