February 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r3789 - in jbpm4/trunk: modules/distro and 8 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-06 08:47:20 -0500 (Fri, 06 Feb 2009) New Revision: 3789 Added: jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-destinations-service.xml jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml Modified: jbpm4/trunk/modules/distro/pom.xml jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/trunk/modules/enterprise/pom.xml jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jbosscmp-jdbc.xml jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java jbpm4/trunk/pom.xml Log: Fix enterprise tests and update excludes Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2009-02-06 09:53:33 UTC (rev 3788) +++ jbpm4/trunk/modules/distro/pom.xml 2009-02-06 13:47:20 UTC (rev 3789) @@ -60,6 +60,17 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-enterprise</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-enterprise</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-task</artifactId> <version>${version}</version> </dependency> @@ -155,8 +166,4 @@ </plugins> </build> -  - <reporting> - </reporting> - </project> Modified: jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-02-06 09:53:33 UTC (rev 3788) +++ jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-02-06 13:47:20 UTC (rev 3789) @@ -50,14 +50,14 @@ </includes> <unpack>true</unpack> </dependencySet> -  + </dependencySet> </dependencySets> Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-06 09:53:33 UTC (rev 3788) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-06 13:47:20 UTC (rev 3789) @@ -24,7 +24,7 @@ <jar src="@{deploy.artifacts.dir}/lib/ant.jar" stage="both" /> <jar src="@{deploy.artifacts.dir}/lib/ant-launcher.jar" stage="both" /> -  +  <listeners> <listener installer="AntActionInstallerListener" /> </listeners> @@ -65,7 +65,7 @@ <name>jbossSelection</name> <value>jboss500</value> </condition> - +  <condition type="variable" id="isHypersonic"> <name>dbSelection</name> @@ -100,7 +100,7 @@  <packs> - +  - + <pack name="jBPM4 Standalone" required="yes" preselected="yes"> <description>The jBPM4 Standalone Components</description> @@ -120,8 +120,8 @@ jbpm4/config --> <file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config" - unpack="true" override="true" /> - + unpack="true" override="true" /> +  @@ -132,8 +132,8 @@ jbpm4/lib --> <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true"> - <include name="*.jar" /> - </fileset> + <include name="*.jar" /> + </fileset> </pack>  <pack name="jBPM4 JBoss Integration" required="no" preselected="yes"> - + <description>The jBPM4 JBoss Integration</description> - +  <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> - <include name="hibernate.properties"/> - <include name="jbpm.cfg.xml"/> + <include name="hibernate.properties"/> <include name="logging.properties"/> </fileset> + +  + <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <include name="jbpm.cfg.xml"/> + </fileset> + +  + <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/" override="true"> + <include name="jbpm-destinations-service.xml"/> + </fileset> +  - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> <include name="jbpm-log.jar" /> <include name="jbpm-api.jar" /> <include name="jbpm-pvm.jar" /> <include name="jbpm-jpdl.jar" /> - <include name="jbpm-task.jar" /> + <include name="jbpm-task.jar" /> </fileset> - +   @@ -173,10 +183,10 @@   - +   - +  <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true"> <include name="hibernate.cfg.hsqldb.xml"/> @@ -188,23 +198,23 @@ <include name="jbpm-postgresql-ds.xml"/> <include name="jbpm-sybase-ds.xml"/> </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" /> + <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" />  - +  <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" /> + <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>  - +  - +  - + <pack name="Optional Components" required="no" preselected="no"> <description>Optional jBPM4 Components</description> </pack> Modified: jbpm4/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm4/trunk/modules/enterprise/pom.xml 2009-02-06 09:53:33 UTC (rev 3788) +++ jbpm4/trunk/modules/enterprise/pom.xml 2009-02-06 13:47:20 UTC (rev 3789) @@ -18,7 +18,7 @@ <name>jBPM 4 - Enterprise</name> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-enterprise</artifactId> - <packaging>ejb</packaging> + <packaging>jar</packaging>  <parent> @@ -56,24 +56,37 @@  <build> + + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + <testResources> <testResource> + <directory>src/test/resources</directory> <filtering>true</filtering> - <directory>src/test/resources</directory> </testResource> </testResources> <plugins> + <plugin> - <artifactId>maven-compiler-plugin</artifactId> + <artifactId>maven-jar-plugin</artifactId> <configuration> - <showDeprecation>false</showDeprecation> + <excludes> + <exclude>jbpm.cfg.xml</exclude> + <exclude>jbpm-destinations-service.xml</exclude> + </excludes> </configuration> </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> + <execution> <id>assembly-test-dependencies</id> <phase>generate-test-resources</phase> @@ -88,7 +101,23 @@ <descriptor>scripts/assembly-test-dependencies.xml</descriptor> </descriptors> </configuration> - </execution> + </execution> + + <execution> + <id>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> @@ -112,6 +141,16 @@ </execution> </executions> </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/jbpm/enterprise/internal/ejb/TimerTest.java</exclude> + <exclude>org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> @@ -134,7 +173,7 @@ </plugins> </build> </profile> - + </profiles> </project> \ No newline at end of file Added: jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml =================================================================== --- jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml (rev 0) +++ jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml 2009-02-06 13:47:20 UTC (rev 3789) @@ -0,0 +1,18 @@ +<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.cfg.xml</include> + <include>jbpm-destinations-service.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Modified: jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml 2009-02-06 09:53:33 UTC (rev 3788) +++ jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml 2009-02-06 13:47:20 UTC (rev 3789) @@ -43,7 +43,7 @@ <message-destination> <message-destination-name>CommandQueue</message-destination-name> - <jndi-name>queue/tSestQueue</jndi-name> + <jndi-name>queue/JbpmCommandQueue</jndi-name> </message-destination> </assembly-descriptor> Modified: jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jbosscmp-jdbc.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jbosscmp-jdbc.xml 2009-02-06 09:53:33 UTC (rev 3788) +++ jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jbosscmp-jdbc.xml 2009-02-06 13:47:20 UTC (rev 3789) @@ -3,7 +3,7 @@ <jbosscmp-jdbc> <defaults> - <datasource>java:DefaultDS</datasource> + <datasource>java:/JbpmDS</datasource> <create-table>false</create-table> <remove-table>false</remove-table> <pk-constraint>false</pk-constraint> Added: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-destinations-service.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-destinations-service.xml (rev 0) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-destinations-service.xml 2009-02-06 13:47:20 UTC (rev 3789) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + +<server> +  + + <mbean code="org.jboss.mq.server.jmx.Queue" + name="jboss.mq.destination:service=Queue,name=JbpmCommandQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> + +</server> Added: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2009-02-06 13:47:20 UTC (rev 3789) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + +  + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine> + + <deployer-manager> + <check-process /> + <check-problems /> + <save /> + </deployer-manager> + + <process-service /> + <execution-service /> + <management-service /> + <ejb-local-command-service /> + + <hibernate-configuration resource="hibernate.cfg.xml"/> + + <hibernate-session-factory /> + + <id-generator /> + <types resource="jbpm.pvm.types.xml" /> + + <business-calendar> + <monday hours="9:00-12:00 and 12:30-17:00"/> + <tuesday hours="9:00-12:00 and 12:30-17:00"/> + <wednesday hours="9:00-12:00 and 12:30-17:00"/> + <thursday hours="9:00-12:00 and 12:30-17:00"/> + <friday hours="9:00-12:00 and 12:30-17:00"/> + <holiday period="01/07/2008 - 31/08/2008"/> + </business-calendar> + + </process-engine> + + <environment> + <hibernate-session current="true" /> + <pvm-db-session /> + <job-db-session /> + <ejb-timer-session /> + </environment> + +</jbpm-configuration> Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java 2009-02-06 09:53:33 UTC (rev 3788) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java 2009-02-06 13:47:20 UTC (rev 3789) @@ -59,7 +59,7 @@ } catch (InterruptedException e) { log.info("wait interrupted"); - } + } return executionDate; } } Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java 2009-02-06 09:53:33 UTC (rev 3788) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java 2009-02-06 13:47:20 UTC (rev 3789) @@ -59,7 +59,7 @@ } catch (InterruptedException e) { log.info("wait interrupted"); - } + } return executionDate; } } Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-02-06 09:53:33 UTC (rev 3788) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-02-06 13:47:20 UTC (rev 3789) @@ -145,7 +145,7 @@ environment.get(ExecutionService.class).startExecutionById(processDefinitionId); // wait past the due date, ensure activity did not execute - Date executionDate = HappyListener.waitFor(2 * TIMEOUT); + Date executionDate = HappyListener.waitFor(2 * TIMEOUT); assertNull(executionDate); } Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-02-06 09:53:33 UTC (rev 3788) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-02-06 13:47:20 UTC (rev 3789) @@ -143,6 +143,7 @@ environment.get(CommandService.class).execute(new CreateTimerCmd(timer)); Date executionDate = HappyListener.waitFor(); + assertNotNull(executionDate); assertTrue(dueDate.compareTo(executionDate) <= 0); } @@ -186,6 +187,7 @@ commandService.execute(new CreateTimerCmd(timer)); Date executionDate = NoisyListener.waitFor(); + assertNotNull(executionDate); assertTrue(dueDate.compareTo(executionDate) <= 0); Object variableValue = executionService.getVariable(execution.getId(), "executionDate"); Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-02-06 09:53:33 UTC (rev 3788) +++ jbpm4/trunk/pom.xml 2009-02-06 13:47:20 UTC (rev 3789) @@ -37,7 +37,7 @@ <module>modules/examples</module> <module>modules/jpdl</module> <module>modules/task</module> -  + <module>modules/enterprise</module> <module>modules/test-base</module> <module>modules/test-db</module> <module>modules/test-pojo</module>

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3788 - in jbpm4/trunk: modules/db and 14 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-06 04:53:33 -0500 (Fri, 06 Feb 2009) New Revision: 3788 Removed: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/jpdl/src/test/resources/logging.properties Modified: jbpm4/trunk/modules/db/jbpm4-db.iml jbpm4/trunk/modules/distro/pom.xml jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml jbpm4/trunk/modules/enterprise/scripts/antrun-test-jars.xml jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/web.xml jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml jbpm4/trunk/modules/examples/jbpm4-examples.iml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java jbpm4/trunk/modules/pvm/src/test/resources/META-INF/persistence.xml jbpm4/trunk/modules/test-db/jpm4-test-db.iml jbpm4/trunk/pom.xml Log: Install jdbc driver dependencies into AS. Cleanup enterprise module. Partly fix enterprise tests Modified: jbpm4/trunk/modules/db/jbpm4-db.iml =================================================================== --- jbpm4/trunk/modules/db/jbpm4-db.iml 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/db/jbpm4-db.iml 2009-02-06 09:53:33 UTC (rev 3788) @@ -8,8 +8,12 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="jbpm4-toplevel" /> - <orderEntry type="module-library"> + <orderEntry type="module" module-name="jbpm4-toplevel" exported="" /> + <orderEntry type="module" module-name="jbpm4-pvm" exported="" /> + <orderEntry type="module" module-name="jbpm4-task" exported="" /> + <orderEntry type="module" module-name="jbpm4-jpdl" exported="" /> + <orderEntry type="module" module-name="jbpm4-test-base" exported="" /> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> @@ -18,7 +22,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <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!/" /> @@ -27,7 +31,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.jar!/" /> @@ -36,7 +40,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> @@ -45,7 +49,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <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!/" /> @@ -54,7 +58,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: stax:stax-api:jar:1.0.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" /> @@ -63,7 +67,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> @@ -72,7 +76,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> @@ -81,7 +85,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> @@ -90,7 +94,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <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!/" /> @@ -99,7 +103,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> @@ -108,7 +112,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> @@ -117,7 +121,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> @@ -126,7 +130,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> @@ -137,7 +141,7 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> @@ -146,7 +150,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> @@ -155,7 +159,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" /> @@ -164,7 +168,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <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!/" /> @@ -173,7 +177,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: jboss.jbossts:jbossts-common:jar:4.4.0.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" /> @@ -182,7 +186,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> @@ -193,7 +197,7 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> + <orderEntry type="module-library" exported=""> <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!/" /> @@ -202,51 +206,203 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + <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: org.springframework:spring:jar:2.5.4:compile"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + <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: juel:juel:jar:2.1.0:compile"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + <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> - <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javassist:javassist:jar:3.4.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.activation:activation:jar:1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/distro/pom.xml 2009-02-06 09:53:33 UTC (rev 3788) @@ -79,14 +79,19 @@ <artifactId>standalone-compiler</artifactId> </dependency> -  <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-workspace</artifactId> - <version>1.0</version> - <type>zip</type> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> </dependency> - --> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> + <dependency> + <groupId>net.sourceforge.jtds</groupId> + <artifactId>jtds</artifactId> + </dependency> </dependencies>  @@ -96,36 +101,6 @@ <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-2</version> <executions> -   Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-06 09:53:33 UTC (rev 3788) @@ -158,9 +158,10 @@ <include name="bpm-process-deployer.xml" /> </fileset--> <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-api.jar" /> <include name="jbpm-pvm.jar" /> + <include name="jbpm-jpdl.jar" /> <include name="jbpm-task.jar" /> </fileset> Modified: jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml =================================================================== --- jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml 2009-02-06 09:53:33 UTC (rev 3788) @@ -11,7 +11,9 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm4-pvm" /> <orderEntry type="module" module-name="jbpm4-toplevel" /> + <orderEntry type="module" module-name="jbpm4-test-base" /> <orderEntry type="module-library"> <library name="M2 Dep: cargo:cargo:jar:0.5:test"> <CLASSES> @@ -192,15 +194,6 @@ </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: asm:asm:jar:1.5.3:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> @@ -210,15 +203,6 @@ </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: net.sf.ehcache:ehcache:jar:1.2.3:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> @@ -321,6 +305,185 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:test"> + <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: javassist:javassist:jar:3.4.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/trunk/modules/enterprise/scripts/antrun-test-jars.xml =================================================================== --- jbpm4/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2009-02-06 09:53:33 UTC (rev 3788) @@ -33,8 +33,8 @@ <jar destfile="${build.dir}/test-libs/jbpm-enterprise-test.jar"> <fileset dir="${build.dir}/test-classes"> - <include name="environment.cfg.xml" /> - <include name="hibernate.properties" /> +  <include name="org/jbpm/enterprise/internal/custom/*" /> </fileset> </jar> Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/CommandExecutorSLSB.java 2009-02-06 09:53:33 UTC (rev 3788) @@ -46,7 +46,7 @@ * executor builds an environment factory from a configuration file loaded as a * classpath resource. The environment entry <code>ConfigurationResource</code> * specifies the name of the resource to access; the default is - * <code>enterprise.environment.cfg.xml</code>. + * <code>jbpm.cfg.xml</code>. * </p> * * <h3>JNDI-bound environment factory</h3> @@ -164,7 +164,7 @@ } private static String getConfigResource(Context context) throws NamingException { - String resource = "environment.cfg.xml"; + String resource = "jbpm.cfg.xml"; try { resource = (String) context.lookup("java:comp/env/ConfigurationResource"); } Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/test/enterprise/EnvironmentServletTestCase.java 2009-02-06 09:53:33 UTC (rev 3788) @@ -43,7 +43,7 @@ private static final Map<String, EnvironmentFactory> environmentFactories = new HashMap<String, EnvironmentFactory>(); public EnvironmentServletTestCase() { - this("environment.cfg.xml"); + this("jbpm.cfg.xml"); } public EnvironmentServletTestCase(String configResource) { Modified: jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/web.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/web.xml 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/web.xml 2009-02-06 09:53:33 UTC (rev 3788) @@ -14,16 +14,16 @@ <ejb-local-ref> <ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name> <ejb-ref-type>Session</ejb-ref-type> - <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home> - <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local> + <local-home>org.jbpm.enterprise.internal.ejb.LocalCommandExecutorHome</local-home> + <local>org.jbpm.enterprise.internal.ejb.LocalCommandExecutor</local> <ejb-link>CommandExecutor</ejb-link> </ejb-local-ref> <ejb-local-ref> <ejb-ref-name>ejb/LocalTimer</ejb-ref-name> <ejb-ref-type>Entity</ejb-ref-type> - <local-home>org.jbpm.pvm.internal.ejb.LocalTimerHome</local-home> - <local>org.jbpm.pvm.internal.ejb.LocalTimer</local> + <local-home>org.jbpm.enterprise.internal.ejb.LocalTimerHome</local-home> + <local>org.jbpm.enterprise.internal.ejb.LocalTimer</local> <ejb-link>Timer</ejb-link> </ejb-local-ref> Modified: jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml 2009-02-06 09:53:33 UTC (rev 3788) @@ -13,17 +13,8 @@ <management-service /> <ejb-local-command-service /> - <hibernate-configuration> - <properties resource="hibernate.properties" /> - <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" /> - <cache-configuration resource="jbpm.pvm.cache.xml" - usage="nonstrict-read-write" /> - </hibernate-configuration> + <hibernate-configuration resource="hibernate.cfg.xml"/> + <hibernate-session-factory /> <id-generator /> Modified: jbpm4/trunk/modules/examples/jbpm4-examples.iml =================================================================== --- jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-02-06 09:53:33 UTC (rev 3788) @@ -9,7 +9,11 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="jbpm4-task" /> + <orderEntry type="module" module-name="jbpm4-pvm" /> <orderEntry type="module" module-name="jbpm4-toplevel" /> + <orderEntry type="module" module-name="jbpm4-jpdl" /> + <orderEntry type="module" module-name="jbpm4-test-base" /> <orderEntry type="module-library"> <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> <CLASSES> @@ -29,192 +33,322 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:compile"> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + <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: commons-logging:commons-logging:jar:1.0.4:compile"> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: stax:stax-api:jar:1.0.1:compile"> + <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:compile"> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: stax:stax:jar:1.2.0:compile"> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:compile"> + <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: jboss.jbossts:jbossts-common:jar:4.4.0.GA:compile"> + <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: stax:stax-api:jar:1.0.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <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"> + <library name="M2 Dep: javassist:javassist:jar:3.4.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <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!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <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"> + <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile"> + <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.springframework:spring:jar:2.5.4:compile"> + <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> + <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> + <orderEntry type="module-library"> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:test"> + <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> </CLASSES> <JAVADOC /> @@ -222,32 +356,54 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <library name="M2 Dep: jboss.jbossts:jbossts-common:jar:4.4.0.GA:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml 2009-02-06 09:53:33 UTC (rev 3788) @@ -25,20 +25,7 @@ <standard-transaction-interceptor /> </command-service> - <hibernate-configuration> - <mapping resource="hibernate.cfg.xml"/> -  - </hibernate-configuration> + <hibernate-configuration resource="hibernate.cfg.xml"/> <hibernate-session-factory /> Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-02-06 09:53:33 UTC (rev 3788) @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - - <process-engine> - - <deployer-manager> - <assign-file-type> - <file extension=".jpdl.xml" type="jpdl" /> - </assign-file-type> - <parse-jpdl /> - <check-process /> - <check-problems /> - <save /> - </deployer-manager> - - <process-service /> - <execution-service /> - <management-service /> - <task-service /> - - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <properties resource="hibernate.properties" /> - <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.jpdl.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <cache-configuration resource="jbpm.pvm.cache.xml" - usage="nonstrict-read-write" /> - </hibernate-configuration> - - <hibernate-session-factory /> - - <job-executor auto-start="false" /> - <job-test-helper /> - - <id-generator /> - <types resource="jbpm.pvm.types.xml" /> - - <business-calendar> - <monday hours="9:00-12:00 and 12:30-17:00"/> - <tuesday hours="9:00-12:00 and 12:30-17:00"/> - <wednesday hours="9:00-12:00 and 12:30-17:00"/> - <thursday hours="9:00-12:00 and 12:30-17:00"/> - <friday hours="9:00-12:00 and 12:30-17:00"/> - <holiday period="01/07/2008 - 31/08/2008"/> - </business-calendar> - - </process-engine> - - <environment> - <hibernate-session /> - <transaction /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - </environment> - -</jbpm-configuration> Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/logging.properties =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/logging.properties 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/jpdl/src/test/resources/logging.properties 2009-02-06 09:53:33 UTC (rev 3788) @@ -1,28 +0,0 @@ -handlers= java.util.logging.ConsoleHandler -# to add the error triggered file handler -# handlers= java.util.logging.ConsoleHandler org.jbpm.util.ErrorTriggeredFileHandler - -redirect.commons.logging = enabled - -java.util.logging.ConsoleHandler.level = FINEST -java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter - -# org.jbpm.util.ErrorTriggeredFileHandler.size = 500 -# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF -# org.jbpm.util.ErrorTriggeredFileHandler.pattern = %h/jbpm%u.log - -# For example, set the com.xyz.foo logger to only log SEVERE messages: -# com.xyz.foo.level = SEVERE - -org.jbpm.level=FINEST -org.jbpm.pvm.internal.tx.level=FINE -org.jbpm.pvm.internal.wire.level=FINE -org.jbpm.pvm.internal.util.level=FINE - -org.hibernate.level=FINEST -org.hibernate.cfg.HbmBinder.level=SEVERE -org.hibernate.cfg.SettingsFactory.level=SEVERE -# org.hibernate.SQL.level=FINEST -# org.hibernate.type.level=FINEST -# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST -# org.hibernate.transaction.level=FINEST Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java 2009-02-06 09:53:33 UTC (rev 3788) @@ -74,11 +74,11 @@ protected String name; /** maps file names to stream source */ - protected Map<String, StreamInput> files; + protected Map<String, StreamInput> files = new HashMap<String,StreamInput>(); /** maps file names to dom so that duplicate xml parsing can be avoided. */ - protected Map<String, Document> fileDocuments; + protected Map<String, Document> fileDocuments = new HashMap<String, Document>(); /** maps file names to file types */ - protected Map<String, String> fileTypes; + protected Map<String, String> fileTypes = new HashMap<String,String>(); /** generic pool of objects. * 1) users can supply objects directly to a deployment like Modified: jbpm4/trunk/modules/pvm/src/test/resources/META-INF/persistence.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/META-INF/persistence.xml 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/pvm/src/test/resources/META-INF/persistence.xml 2009-02-06 09:53:33 UTC (rev 3788) @@ -5,59 +5,59 @@ http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0"> - <persistence-unit name="jboss-identity-model1" transaction-type="RESOURCE_LOCAL"> + <persistence-unit name="jboss-identity-model1" transaction-type="RESOURCE_LOCAL"> - <provider>org.hibernate.ejb.HibernatePersistence</provider> + <provider>org.hibernate.ejb.HibernatePersistence</provider> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateRealm</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateRealm</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName</class> - <exclude-unlisted-classes>true</exclude-unlisted-classes> - <properties> - <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:unit-testing-jpa1"/> - <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.hbm2ddl.auto" value="create"/> - <property name="hibernate.connection.username" value="sa"/> - <property name="hibernate.connection.password" value=""/> - </properties> + <exclude-unlisted-classes>true</exclude-unlisted-classes> + <properties> + <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:unit-testing-jpa1"/> + <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> + <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> + <property name="hibernate.hbm2ddl.auto" value="create"/> + <property name="hibernate.connection.username" value="sa"/> + <property name="hibernate.connection.password" value=""/> + </properties> - </persistence-unit> + </persistence-unit> - <persistence-unit name="jboss-identity-model2" transaction-type="RESOURCE_LOCAL"> + <persistence-unit name="jboss-identity-model2" transaction-type="RESOURCE_LOCAL"> - <provider>org.hibernate.ejb.HibernatePersistence</provider> + <provider>org.hibernate.ejb.HibernatePersistence</provider> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateRealm</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType</class> - <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateRealm</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType</class> + <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName</class> - <exclude-unlisted-classes>true</exclude-unlisted-classes> - <properties> - <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:unit-testing-jpa2"/> - <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.hbm2ddl.auto" value="update"/> - <property name="hibernate.connection.username" value="sa"/> - <property name="hibernate.connection.password" value=""/> - </properties> + <exclude-unlisted-classes>true</exclude-unlisted-classes> + <properties> + <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:unit-testing-jpa2"/> + <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> + <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> + <property name="hibernate.hbm2ddl.auto" value="update"/> + <property name="hibernate.connection.username" value="sa"/> + <property name="hibernate.connection.password" value=""/> + </properties> - </persistence-unit> + </persistence-unit> </persistence> \ No newline at end of file Modified: jbpm4/trunk/modules/test-db/jpm4-test-db.iml =================================================================== --- jbpm4/trunk/modules/test-db/jpm4-test-db.iml 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/modules/test-db/jpm4-test-db.iml 2009-02-06 09:53:33 UTC (rev 3788) @@ -10,6 +10,10 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="jbpm4-toplevel" /> + <orderEntry type="module" module-name="jbpm4-pvm" /> + <orderEntry type="module" module-name="jbpm4-task" /> + <orderEntry type="module" module-name="jbpm4-jpdl" /> + <orderEntry type="module" module-name="jbpm4-test-base" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> <CLASSES> @@ -195,59 +199,211 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:test"> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + <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> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.springframework:spring:jar:2.5.4:test"> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" /> + <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: org.livetribe:livetribe-jsr223:jar:2.0.5:test"> + <library name="M2 Dep: juel:juel:jar:2.1.0:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + <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-engine:jar:2.1.0:test"> + <library name="M2 Dep: juel:juel-impl: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!/" /> + <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" exported=""> - <library name="M2 Dep: juel:juel:jar:2.1.0:test"> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: juel:juel-impl:jar:2.1.0:test"> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javassist:javassist:jar:3.4.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.activation:activation:jar:1.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-02-06 01:25:49 UTC (rev 3787) +++ jbpm4/trunk/pom.xml 2009-02-06 09:53:33 UTC (rev 3788) @@ -63,6 +63,12 @@ <servlet-api.version>2.5</servlet-api.version> <spring.version>2.5.4</spring.version> <stax.api.version>1.0.1</stax.api.version> + +  + <hsqldb.version>1.8.0.7</hsqldb.version> + <mysql.connector.version>5.0.8</mysql.connector.version> + <postgresql.version>8.3-603.jdbc3</postgresql.version> + <jtds.version>1.2.2</jtds.version> </properties>  @@ -197,6 +203,28 @@ <artifactId>servlet-api</artifactId> <version>${servlet-api.version}</version> </dependency> + +  + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>${hsqldb.version}</version> + </dependency> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>${mysql.connector.version}</version> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${postgresql.version}</version> + </dependency> + <dependency> + <groupId>net.sourceforge.jtds</groupId> + <artifactId>jtds</artifactId> + <version>${jtds.version}</version> + </dependency> </dependencies> </dependencyManagement>

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3787 - in jbpm3/trunk/modules/core: scripts and 8 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-02-05 20:25:49 -0500 (Thu, 05 Feb 2009) New Revision: 3787 Added: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2017/ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2017/JBPM2017Test.java jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2017/ jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2017/quote.txt Removed: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2017/JBPM2017Test.java jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2017/quote.txt Modified: jbpm3/trunk/modules/core/pom.xml jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java jbpm3/trunk/modules/core/src/main/resources/hibernate.cache.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.mapping.default.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.mapping.sybase.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableQueryDbTest.java Log: JBPM-2017: merge r3786 from https://svn.jboss.org/repos/jbpm/jbpm3/branches/jbpm-3.2.5.SP Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2009-02-06 00:35:08 UTC (rev 3786) +++ jbpm3/trunk/modules/core/pom.xml 2009-02-06 01:25:49 UTC (rev 3787) @@ -10,7 +10,7 @@   - + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -47,10 +47,10 @@ <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -112,7 +112,7 @@ <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> - +  <dependency> <groupId>hsqldb</groupId> @@ -332,7 +332,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <excludes> + <excludes>  <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude> </excludes> Modified: jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml =================================================================== --- jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml 2009-02-06 00:35:08 UTC (rev 3786) +++ jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml 2009-02-06 01:25:49 UTC (rev 3787) @@ -53,8 +53,12 @@ <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" /> - + <condition property="hibernate.mapping.(a){database}.xml" value="hibernate.mapping.(a){database}.xml" else="hibernate.mapping.default.xml"> + <available property="@{database}.mapping.available" file="${build.resources.directory}/hibernate.mapping.(a){database}.xml"/> + </condition> + + <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'?> @@ -67,8 +71,7 @@ ]]></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.mapping.(a){database}.xml}" /> <fileset file="${build.resources.directory}/hibernate.cache.xml" /> <footer><![CDATA[ </session-factory> </hibernate-configuration>]]></footer> Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java 2009-02-06 00:35:08 UTC (rev 3786) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java 2009-02-06 01:25:49 UTC (rev 3787) @@ -34,18 +34,18 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; import org.hibernate.type.Type; -import org.hibernate.usertype.UserType; +import org.hibernate.usertype.EnhancedUserType; import org.hibernate.util.EqualsHelper; import org.hibernate.util.StringHelper; /** * @author Alejandro Guizar */ -public class TextType implements UserType, Serializable { +public class TextType implements EnhancedUserType, Serializable { private transient Log log; - private static final boolean IS_VALUE_TRACING_ENABLED = LogFactory.getLog(StringHelper - .qualifier(Type.class.getName())).isTraceEnabled(); + private static final boolean IS_VALUE_TRACING_ENABLED = LogFactory.getLog( + StringHelper.qualifier(Type.class.getName())).isTraceEnabled(); private static final long serialVersionUID = 1L; @@ -127,8 +127,7 @@ Reader charReader = rs.getCharacterStream(name); // if the corresponding SQL value is NULL, the reader we got is NULL as well - if (charReader == null || rs.wasNull()) - return null; + if (charReader == null || rs.wasNull()) return null; // Fetch Reader content up to the end - and put characters in a StringBuffer StringBuffer sbuf = new StringBuffer(); @@ -173,19 +172,23 @@ } } catch (RuntimeException re) { - log().info("could not bind value '" + nullSafeToString(value) - + "' to parameter: " - + index - + "; " - + re.getMessage()); + log().info( + "could not bind value '" + + nullSafeToString(value) + + "' to parameter: " + + index + + "; " + + re.getMessage()); throw re; } catch (SQLException se) { - log().info("could not bind value '" + nullSafeToString(value) - + "' to parameter: " - + index - + "; " - + se.getMessage()); + log().info( + "could not bind value '" + + nullSafeToString(value) + + "' to parameter: " + + index + + "; " + + se.getMessage()); throw se; } } @@ -217,6 +220,18 @@ return Types.CLOB; } + public String objectToSQLString(Object value) { + return '\'' + (String) value + '\''; + } + + public Object fromXMLString(String xml) { + return xml == null || xml.length() == 0 ? null : fromStringValue(xml); + } + + public String toXMLString(Object value) { + return toString(value); + } + public String nullSafeToString(Object value) throws HibernateException { return value == null ? null : toString(value); } @@ -224,4 +239,8 @@ public String toString(Object val) { return (String) val; } + + public Object fromStringValue(String xml) { + return xml; + } } Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.cache.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.cache.xml 2009-02-06 00:35:08 UTC (rev 3786) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.cache.xml 2009-02-06 01:25:49 UTC (rev 3787) @@ -1,10 +1,10 @@ -  -  -  -  -  +  +  +  +  + <class-cache class="org.jbpm.context.def.VariableAccess" usage="nonstrict-read-write" /> <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="nonstrict-read-write" /> Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.mapping.default.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.mapping.default.xml 2009-02-06 00:35:08 UTC (rev 3786) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.mapping.default.xml 2009-02-06 01:25:49 UTC (rev 3787) @@ -1,15 +1,16 @@ -     <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> -  + +   @@ -27,16 +28,13 @@ <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/> <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/> -  -  -  -  -  -  -  -  -  -  +  +  +  +  <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>  Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.mapping.sybase.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.mapping.sybase.xml 2009-02-06 00:35:08 UTC (rev 3786) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.mapping.sybase.xml 2009-02-06 01:25:49 UTC (rev 3787) @@ -1,2 +1,142 @@ +  +  +  + +  + <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> +  - <mapping resource="org/jbpm/db/hibernate.types.sybase.hbm.xml" /> \ No newline at end of file + <mapping resource="org/jbpm/db/hibernate.types.sybase.hbm.xml" /> + +  +  + +  + <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/> + +  + <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/> + <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/> + +  +  +  +  + <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> + +  + <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> + +  + <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> + <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/> + +  + <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/> + +  + <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/> + +  + <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/> + +  + <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/> + +  + <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/> + <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/> + +  + <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/> + +  + <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/> + +  + <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml" /> + <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> + +  + <mapping resource="org/jbpm/job/Job.hbm.xml"/> + <mapping resource="org/jbpm/job/Timer.hbm.xml"/> + <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> + <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> + <mapping resource="org/jbpm/job/CleanUpProcessJob.hbm.xml"/> + +  + <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> + +  + <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> + <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> + <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml 2009-02-06 00:35:08 UTC (rev 3786) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml 2009-02-06 01:25:49 UTC (rev 3787) @@ -8,7 +8,7 @@ <subclass name="org.jbpm.context.exe.variableinstance.HibernateStringInstance" extends="org.jbpm.context.exe.VariableInstance" discriminator-value="I"> - <any name="value" id-type="string" cascade="save-update"> + <any name="value" id-type="text" cascade="save-update"> <column name="STRINGIDCLASS_" /> <column name="STRINGVALUE_"/> </any> Copied: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml (from rev 3786, jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml) =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml (rev 0) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml 2009-02-06 01:25:49 UTC (rev 3787) @@ -0,0 +1,17 @@ +<?xml version="1.0"?> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping auto-import="false" default-access="field"> + <subclass name="org.jbpm.context.exe.variableinstance.HibernateStringInstance" + extends="org.jbpm.context.exe.VariableInstance" + discriminator-value="I"> +  + <any name="value" id-type="org.jbpm.db.hibernate.TextType" cascade="save-update"> + <column name="STRINGIDCLASS_" /> + <column name="STRINGVALUE_"/> + </any> + </subclass> +</hibernate-mapping> Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableQueryDbTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableQueryDbTest.java 2009-02-06 00:35:08 UTC (rev 3786) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableQueryDbTest.java 2009-02-06 01:25:49 UTC (rev 3787) @@ -1,7 +1,7 @@ package org.jbpm.context.exe; +import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.Set; import org.hibernate.Query; @@ -9,18 +9,14 @@ import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; -public class VariableQueryDbTest extends AbstractDbTestCase -{ +public class VariableQueryDbTest extends AbstractDbTestCase { - public void testStringVariableQuery() - { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition name='variables'>" + - " <start-state name='start'/>" + - "</process-definition>"); + public void testStringVariableQuery() { + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition name='variables'>" + + " <start-state name='start'/>" + + "</process-definition>"); jbpmContext.deployProcessDefinition(processDefinition); - try - { + try { newTransaction(); ProcessInstance one = jbpmContext.newProcessInstanceForUpdate("variables"); @@ -37,43 +33,41 @@ newTransaction(); - Query query = session.createQuery("select pi " + "from org.jbpm.context.exe.variableinstance.StringInstance si " + " join si.processInstance pi " - + "where si.name = 'category'" + " and si.value = 'overpaid'"); + Query query = session.createQuery("select pi.id " + + "from org.jbpm.context.exe.variableinstance.StringInstance si " + + "join si.processInstance pi " + + "where si.name = 'category'" + + " and si.value like 'overpaid'"); - Set expectedPids = new HashSet(); - expectedPids.add(new Long(one.getId())); - expectedPids.add(new Long(two.getId())); + Set<Long> expectedPids = new HashSet<Long>(); + expectedPids.add(one.getId()); + expectedPids.add(two.getId()); - Set retrievedPids = new HashSet(); - Iterator iter = query.list().iterator(); - while (iter.hasNext()) - { - ProcessInstance pi = (ProcessInstance)iter.next(); - retrievedPids.add(new Long(pi.getId())); + Set<Long> retrievedPids = new HashSet<Long>(); + for (Object result : query.list()) { + retrievedPids.add((Long) result); } assertEquals(expectedPids, retrievedPids); newTransaction(); - query = session.createQuery("select pi from org.jbpm.context.exe.variableinstance.StringInstance si join si.processInstance pi " - + "where si.name = 'category' and si.value = 'underpaid'"); + query = session.createQuery("select pi.id " + + "from org.jbpm.context.exe.variableinstance.StringInstance si " + + "join si.processInstance pi " + + "where si.name = 'category'" + + " and si.value like 'underpaid'"); - expectedPids = new HashSet(); - expectedPids.add(new Long(three.getId())); + expectedPids = Collections.singleton(three.getId()); - retrievedPids = new HashSet(); - iter = query.list().iterator(); - while (iter.hasNext()) - { - ProcessInstance pi = (ProcessInstance)iter.next(); - retrievedPids.add(new Long(pi.getId())); + retrievedPids = new HashSet<Long>(); + for (Object result : query.list()) { + retrievedPids.add((Long) result); } assertEquals(expectedPids, retrievedPids); } - finally - { + finally { jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); } } Copied: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2017 (from rev 3786, jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2017) Deleted: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2017/JBPM2017Test.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2017/JBPM2017Test.java 2009-02-06 00:35:08 UTC (rev 3786) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2017/JBPM2017Test.java 2009-02-06 01:25:49 UTC (rev 3787) @@ -1,72 +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.jbpm2017; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringWriter; - -import org.jbpm.db.AbstractDbTestCase; -import org.jbpm.graph.def.ProcessDefinition; -import org.jbpm.graph.exe.ProcessInstance; - -/** - * STRINGVALUE_ column in JBPM_VARIABLEINSTANCE table should be text, not varchar(255) - * - * https://jira.jboss.org/jira/browse/JBPM-2017 - * - * @author Alejandro Guizar - */ -public class JBPM2017Test extends AbstractDbTestCase { - - public void testTextVariable() throws IOException { - String processName = getName(); - ProcessDefinition processDefinition = ProcessDefinition.createNewProcessDefinition(); - processDefinition.setName(processName); - jbpmContext.deployProcessDefinition(processDefinition); - - newTransaction(); - try { - ProcessInstance processInstance = jbpmContext.newProcessInstance(processName); - String quote = readString(getClass().getResourceAsStream("quote.txt")); - processInstance.getContextInstance().setVariable("quote", quote); - - processInstance = saveAndReload(processInstance); - assertEquals(quote, processInstance.getContextInstance().getVariable("quote")); - } - finally { - graphSession.deleteProcessDefinition(processDefinition.getId()); - } - } - - private static String readString(InputStream in) throws IOException { - StringWriter writer = new StringWriter(); - Reader reader = new InputStreamReader(in); - for (int ch; (ch = reader.read()) != -1;) { - writer.write(ch); - } - in.close(); - return writer.toString(); - } -} Copied: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2017/JBPM2017Test.java (from rev 3786, jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2017/JBPM2017Test.java) =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2017/JBPM2017Test.java (rev 0) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2017/JBPM2017Test.java 2009-02-06 01:25:49 UTC (rev 3787) @@ -0,0 +1,72 @@ +/* + * 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.jbpm2017; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringWriter; + +import org.jbpm.db.AbstractDbTestCase; +import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.ProcessInstance; + +/** + * STRINGVALUE_ column in JBPM_VARIABLEINSTANCE table should be text, not varchar(255) + * + * https://jira.jboss.org/jira/browse/JBPM-2017 + * + * @author Alejandro Guizar + */ +public class JBPM2017Test extends AbstractDbTestCase { + + public void testTextVariable() throws IOException { + String processName = getName(); + ProcessDefinition processDefinition = ProcessDefinition.createNewProcessDefinition(); + processDefinition.setName(processName); + jbpmContext.deployProcessDefinition(processDefinition); + + newTransaction(); + try { + ProcessInstance processInstance = jbpmContext.newProcessInstance(processName); + String quote = readString(getClass().getResourceAsStream("quote.txt")); + processInstance.getContextInstance().setVariable("quote", quote); + + processInstance = saveAndReload(processInstance); + assertEquals(quote, processInstance.getContextInstance().getVariable("quote")); + } + finally { + graphSession.deleteProcessDefinition(processDefinition.getId()); + } + } + + private static String readString(InputStream in) throws IOException { + StringWriter writer = new StringWriter(); + Reader reader = new InputStreamReader(in); + for (int ch; (ch = reader.read()) != -1;) { + writer.write(ch); + } + in.close(); + return writer.toString(); + } +} Copied: jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2017 (from rev 3786, jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2017) Deleted: jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2017/quote.txt =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2017/quote.txt 2009-02-06 00:35:08 UTC (rev 3786) +++ jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2017/quote.txt 2009-02-06 01:25:49 UTC (rev 3787) @@ -1,12 +0,0 @@ -For the first time in a long time I thought about Maman. I felt as if I understood why at the end -of her life she had taken a 'fiance', why she had played at beginning again. Even there, in that -home where lives were fading out, evening was a kind of wistful respite. So close to death, Maman -must have felt free then and ready to live it all again. Nobody, nobody had the right to cry over -her. And I felt ready to live it all again too. As if the blind rage had washed me clean, rid me -of hope; for the first time, in that night alive with signs and stars, I opened myself to the -gentle indifference of the world. Finding it so much like myself - so like a brother, really - I -felt I had been happy and that I was happy again. For everything to be consummated, for me to feel -less alone, I had only to wish that there be a large crowd of spectators the day of my execution -and that they greet me with cries of hate. - -From "The Stranger" by Albert Camus. \ No newline at end of file Copied: jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2017/quote.txt (from rev 3786, jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2017/quote.txt) =================================================================== --- jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2017/quote.txt (rev 0) +++ jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2017/quote.txt 2009-02-06 01:25:49 UTC (rev 3787) @@ -0,0 +1,12 @@ +For the first time in a long time I thought about Maman. I felt as if I understood why at the end +of her life she had taken a 'fiance', why she had played at beginning again. Even there, in that +home where lives were fading out, evening was a kind of wistful respite. So close to death, Maman +must have felt free then and ready to live it all again. Nobody, nobody had the right to cry over +her. And I felt ready to live it all again too. As if the blind rage had washed me clean, rid me +of hope; for the first time, in that night alive with signs and stars, I opened myself to the +gentle indifference of the world. Finding it so much like myself - so like a brother, really - I +felt I had been happy and that I was happy again. For everything to be consummated, for me to feel +less alone, I had only to wish that there be a large crowd of spectators the day of my execution +and that they greet me with cries of hate. + +From "The Stranger" by Albert Camus. \ No newline at end of file

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3786 - in jbpm3/branches/jbpm-3.2.5.SP/modules/core: scripts and 8 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-02-05 19:35:08 -0500 (Thu, 05 Feb 2009) New Revision: 3786 Added: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2017/ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2017/JBPM2017Test.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2017/ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2017/quote.txt Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.cache.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.default.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.sybase.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/context/exe/VariableQueryDbTest.java Log: JBPM-2017: change type of JBPM_VARIABLEINSTANCE.STRINGVALUE_ column to text, was varchar(255) due to incorrect mappings Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml 2009-02-05 12:54:37 UTC (rev 3785) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml 2009-02-06 00:35:08 UTC (rev 3786) @@ -10,7 +10,7 @@   - + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -47,10 +47,10 @@ <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -112,7 +112,7 @@ <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> - +  <dependency> <groupId>hsqldb</groupId> @@ -332,7 +332,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <excludes> + <excludes>  <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude> </excludes> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml 2009-02-05 12:54:37 UTC (rev 3785) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml 2009-02-06 00:35:08 UTC (rev 3786) @@ -53,8 +53,12 @@ <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" /> - + <condition property="hibernate.mapping.(a){database}.xml" value="hibernate.mapping.(a){database}.xml" else="hibernate.mapping.default.xml"> + <available property="@{database}.mapping.available" file="${build.resources.directory}/hibernate.mapping.(a){database}.xml"/> + </condition> + + <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'?> @@ -67,8 +71,7 @@ ]]></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.mapping.(a){database}.xml}" /> <fileset file="${build.resources.directory}/hibernate.cache.xml" /> <footer><![CDATA[ </session-factory> </hibernate-configuration>]]></footer> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java 2009-02-05 12:54:37 UTC (rev 3785) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java 2009-02-06 00:35:08 UTC (rev 3786) @@ -34,18 +34,18 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; import org.hibernate.type.Type; -import org.hibernate.usertype.UserType; +import org.hibernate.usertype.EnhancedUserType; import org.hibernate.util.EqualsHelper; import org.hibernate.util.StringHelper; /** * @author Alejandro Guizar */ -public class TextType implements UserType, Serializable { +public class TextType implements EnhancedUserType, Serializable { private transient Log log; - private static final boolean IS_VALUE_TRACING_ENABLED = LogFactory.getLog(StringHelper - .qualifier(Type.class.getName())).isTraceEnabled(); + private static final boolean IS_VALUE_TRACING_ENABLED = LogFactory.getLog( + StringHelper.qualifier(Type.class.getName())).isTraceEnabled(); private static final long serialVersionUID = 1L; @@ -127,8 +127,7 @@ Reader charReader = rs.getCharacterStream(name); // if the corresponding SQL value is NULL, the reader we got is NULL as well - if (charReader == null || rs.wasNull()) - return null; + if (charReader == null || rs.wasNull()) return null; // Fetch Reader content up to the end - and put characters in a StringBuffer StringBuffer sbuf = new StringBuffer(); @@ -173,19 +172,23 @@ } } catch (RuntimeException re) { - log().info("could not bind value '" + nullSafeToString(value) - + "' to parameter: " - + index - + "; " - + re.getMessage()); + log().info( + "could not bind value '" + + nullSafeToString(value) + + "' to parameter: " + + index + + "; " + + re.getMessage()); throw re; } catch (SQLException se) { - log().info("could not bind value '" + nullSafeToString(value) - + "' to parameter: " - + index - + "; " - + se.getMessage()); + log().info( + "could not bind value '" + + nullSafeToString(value) + + "' to parameter: " + + index + + "; " + + se.getMessage()); throw se; } } @@ -217,6 +220,18 @@ return Types.CLOB; } + public String objectToSQLString(Object value) { + return '\'' + (String) value + '\''; + } + + public Object fromXMLString(String xml) { + return xml == null || xml.length() == 0 ? null : fromStringValue(xml); + } + + public String toXMLString(Object value) { + return toString(value); + } + public String nullSafeToString(Object value) throws HibernateException { return value == null ? null : toString(value); } @@ -224,4 +239,8 @@ public String toString(Object val) { return (String) val; } + + public Object fromStringValue(String xml) { + return xml; + } } Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.cache.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.cache.xml 2009-02-05 12:54:37 UTC (rev 3785) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.cache.xml 2009-02-06 00:35:08 UTC (rev 3786) @@ -1,10 +1,10 @@ -  -  -  -  -  +  +  +  +  + <class-cache class="org.jbpm.context.def.VariableAccess" usage="nonstrict-read-write" /> <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="nonstrict-read-write" /> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.default.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.default.xml 2009-02-05 12:54:37 UTC (rev 3785) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.default.xml 2009-02-06 00:35:08 UTC (rev 3786) @@ -1,15 +1,16 @@ -     <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> -  + +   @@ -27,16 +28,13 @@ <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/> <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/> -  -  -  -  -  -  -  -  -  -  +  +  +  +  <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>  Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.sybase.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.sybase.xml 2009-02-05 12:54:37 UTC (rev 3785) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.sybase.xml 2009-02-06 00:35:08 UTC (rev 3786) @@ -1,2 +1,142 @@ +  +  +  + +  + <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> +  - <mapping resource="org/jbpm/db/hibernate.types.sybase.hbm.xml" /> \ No newline at end of file + <mapping resource="org/jbpm/db/hibernate.types.sybase.hbm.xml" /> + +  +  + +  + <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/> + +  + <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/> + <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/> + +  +  +  +  + <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> + +  + <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> + +  + <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> + <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/> + +  + <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/> + +  + <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/> + +  + <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/> + +  + <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/> + +  + <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/> + <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/> + +  + <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/> + +  + <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/> + +  + <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml" /> + <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> + +  + <mapping resource="org/jbpm/job/Job.hbm.xml"/> + <mapping resource="org/jbpm/job/Timer.hbm.xml"/> + <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> + <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> + <mapping resource="org/jbpm/job/CleanUpProcessJob.hbm.xml"/> + +  + <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> + +  + <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> + <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> + <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml 2009-02-05 12:54:37 UTC (rev 3785) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml 2009-02-06 00:35:08 UTC (rev 3786) @@ -8,7 +8,7 @@ <subclass name="org.jbpm.context.exe.variableinstance.HibernateStringInstance" extends="org.jbpm.context.exe.VariableInstance" discriminator-value="I"> - <any name="value" id-type="string" cascade="save-update"> + <any name="value" id-type="text" cascade="save-update"> <column name="STRINGIDCLASS_" /> <column name="STRINGVALUE_"/> </any> Added: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml 2009-02-06 00:35:08 UTC (rev 3786) @@ -0,0 +1,17 @@ +<?xml version="1.0"?> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping auto-import="false" default-access="field"> + <subclass name="org.jbpm.context.exe.variableinstance.HibernateStringInstance" + extends="org.jbpm.context.exe.VariableInstance" + discriminator-value="I"> +  + <any name="value" id-type="org.jbpm.db.hibernate.TextType" cascade="save-update"> + <column name="STRINGIDCLASS_" /> + <column name="STRINGVALUE_"/> + </any> + </subclass> +</hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/context/exe/VariableQueryDbTest.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/context/exe/VariableQueryDbTest.java 2009-02-05 12:54:37 UTC (rev 3785) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/context/exe/VariableQueryDbTest.java 2009-02-06 00:35:08 UTC (rev 3786) @@ -1,7 +1,7 @@ package org.jbpm.context.exe; +import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.Set; import org.hibernate.Query; @@ -9,18 +9,14 @@ import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; -public class VariableQueryDbTest extends AbstractDbTestCase -{ +public class VariableQueryDbTest extends AbstractDbTestCase { - public void testStringVariableQuery() - { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition name='variables'>" + - " <start-state name='start'/>" + - "</process-definition>"); + public void testStringVariableQuery() { + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition name='variables'>" + + " <start-state name='start'/>" + + "</process-definition>"); jbpmContext.deployProcessDefinition(processDefinition); - try - { + try { newTransaction(); ProcessInstance one = jbpmContext.newProcessInstanceForUpdate("variables"); @@ -37,43 +33,41 @@ newTransaction(); - Query query = session.createQuery("select pi " + "from org.jbpm.context.exe.variableinstance.StringInstance si " + " join si.processInstance pi " - + "where si.name = 'category'" + " and si.value = 'overpaid'"); + Query query = session.createQuery("select pi.id " + + "from org.jbpm.context.exe.variableinstance.StringInstance si " + + "join si.processInstance pi " + + "where si.name = 'category'" + + " and si.value like 'overpaid'"); - Set expectedPids = new HashSet(); - expectedPids.add(new Long(one.getId())); - expectedPids.add(new Long(two.getId())); + Set<Long> expectedPids = new HashSet<Long>(); + expectedPids.add(one.getId()); + expectedPids.add(two.getId()); - Set retrievedPids = new HashSet(); - Iterator iter = query.list().iterator(); - while (iter.hasNext()) - { - ProcessInstance pi = (ProcessInstance)iter.next(); - retrievedPids.add(new Long(pi.getId())); + Set<Long> retrievedPids = new HashSet<Long>(); + for (Object result : query.list()) { + retrievedPids.add((Long) result); } assertEquals(expectedPids, retrievedPids); newTransaction(); - query = session.createQuery("select pi from org.jbpm.context.exe.variableinstance.StringInstance si join si.processInstance pi " - + "where si.name = 'category' and si.value = 'underpaid'"); + query = session.createQuery("select pi.id " + + "from org.jbpm.context.exe.variableinstance.StringInstance si " + + "join si.processInstance pi " + + "where si.name = 'category'" + + " and si.value like 'underpaid'"); - expectedPids = new HashSet(); - expectedPids.add(new Long(three.getId())); + expectedPids = Collections.singleton(three.getId()); - retrievedPids = new HashSet(); - iter = query.list().iterator(); - while (iter.hasNext()) - { - ProcessInstance pi = (ProcessInstance)iter.next(); - retrievedPids.add(new Long(pi.getId())); + retrievedPids = new HashSet<Long>(); + for (Object result : query.list()) { + retrievedPids.add((Long) result); } assertEquals(expectedPids, retrievedPids); } - finally - { + finally { jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); } } Added: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2017/JBPM2017Test.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2017/JBPM2017Test.java (rev 0) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2017/JBPM2017Test.java 2009-02-06 00:35:08 UTC (rev 3786) @@ -0,0 +1,72 @@ +/* + * 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.jbpm2017; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringWriter; + +import org.jbpm.db.AbstractDbTestCase; +import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.ProcessInstance; + +/** + * STRINGVALUE_ column in JBPM_VARIABLEINSTANCE table should be text, not varchar(255) + * + * https://jira.jboss.org/jira/browse/JBPM-2017 + * + * @author Alejandro Guizar + */ +public class JBPM2017Test extends AbstractDbTestCase { + + public void testTextVariable() throws IOException { + String processName = getName(); + ProcessDefinition processDefinition = ProcessDefinition.createNewProcessDefinition(); + processDefinition.setName(processName); + jbpmContext.deployProcessDefinition(processDefinition); + + newTransaction(); + try { + ProcessInstance processInstance = jbpmContext.newProcessInstance(processName); + String quote = readString(getClass().getResourceAsStream("quote.txt")); + processInstance.getContextInstance().setVariable("quote", quote); + + processInstance = saveAndReload(processInstance); + assertEquals(quote, processInstance.getContextInstance().getVariable("quote")); + } + finally { + graphSession.deleteProcessDefinition(processDefinition.getId()); + } + } + + private static String readString(InputStream in) throws IOException { + StringWriter writer = new StringWriter(); + Reader reader = new InputStreamReader(in); + for (int ch; (ch = reader.read()) != -1;) { + writer.write(ch); + } + in.close(); + return writer.toString(); + } +} Added: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2017/quote.txt =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2017/quote.txt (rev 0) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2017/quote.txt 2009-02-06 00:35:08 UTC (rev 3786) @@ -0,0 +1,12 @@ +For the first time in a long time I thought about Maman. I felt as if I understood why at the end +of her life she had taken a 'fiance', why she had played at beginning again. Even there, in that +home where lives were fading out, evening was a kind of wistful respite. So close to death, Maman +must have felt free then and ready to live it all again. Nobody, nobody had the right to cry over +her. And I felt ready to live it all again too. As if the blind rage had washed me clean, rid me +of hope; for the first time, in that night alive with signs and stars, I opened myself to the +gentle indifference of the world. Finding it so much like myself - so like a brother, really - I +felt I had been happy and that I was happy again. For everything to be consummated, for me to feel +less alone, I had only to wish that there be a large crowd of spectators the day of my execution +and that they greet me with cries of hate. + +From "The Stranger" by Albert Camus. \ No newline at end of file

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3785 - in jbpm4/trunk/modules: test-base/src/main/java/org/jbpm/test and 1 other directory.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-05 07:54:37 -0500 (Thu, 05 Feb 2009) New Revision: 3785 Removed: jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.user.bindings.xml Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.identity.cfg.xml jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestSetup.java Log: Remove legacy elements from pvm module Deleted: jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml 2009-02-05 09:39:23 UTC (rev 3784) +++ jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml 2009-02-05 12:54:37 UTC (rev 3785) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - - <process-engine> - - <deployer-manager> - <assign-file-type> - <file extension=".jpdl.xml" type="jpdl" /> - </assign-file-type> - <check-process /> - <check-problems /> - <save /> - </deployer-manager> - - <process-service /> - <execution-service /> - <management-service /> - - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <properties resource="hibernate.properties" /> - <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" /> - <cache-configuration resource="jbpm.pvm.cache.xml" - usage="nonstrict-read-write" /> - </hibernate-configuration> - - <hibernate-session-factory /> - - <job-executor auto-start="false" /> - <job-test-helper /> - - <id-generator /> - <types resource="jbpm.pvm.types.xml" /> - - <business-calendar> - <monday hours="9:00-12:00 and 12:30-17:00"/> - <tuesday hours="9:00-12:00 and 12:30-17:00"/> - <wednesday hours="9:00-12:00 and 12:30-17:00"/> - <thursday hours="9:00-12:00 and 12:30-17:00"/> - <friday hours="9:00-12:00 and 12:30-17:00"/> - <holiday period="01/07/2008 - 31/08/2008"/> - </business-calendar> - - </process-engine> - - <environment> - <hibernate-session /> - <transaction /> - <pvm-db-session /> - <job-db-session /> - <message-session /> - <timer-session /> - </environment> - -</jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.identity.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.identity.cfg.xml 2009-02-05 09:39:23 UTC (rev 3784) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.identity.cfg.xml 2009-02-05 12:54:37 UTC (rev 3785) @@ -2,311 +2,311 @@ <jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> - <realms> - <realm> - <id>realm://jbpm-identity</id> - <repository-id-ref>jBPM Identity DB</repository-id-ref> - <identity-type-mappings> - <identity-mapping>IDENTITY</identity-mapping> - </identity-type-mappings> - </realm> - </realms> - - <repositories> - <repository> - <id>jBPM Identity DB</id> - <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> - <options> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </repository> - </repositories> - - <stores> - <attribute-stores/> - <identity-stores> - <identity-store> - <id>Hibernate Identity Store</id> - <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>IDENTITY</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>COMMUNITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>OFFICE</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>SECURITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>PROJECT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>PEOPLE</identity-object-type-ref> - </relationship> - </relationships> - <credentials> - <credential-type>PASSWORD</credential-type> - </credentials> - <attributes> - <attribute> - <name>picture</name> - <mapping>user.picture</mapping> - <type>binary</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - </attributes> - <options/> - </identity-object-type> - <identity-object-type> - <name>ORGANIZATION</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DIVISION</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>ORGANIZATION_UNIT</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DIVISION</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>OFFICE</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>PEOPLE</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>PROJECT</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>DIVISION</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>DEPARTMENT</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>PROJECT</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>PEOPLE</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>ADMINISTRATION</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>COMMUNITY</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>OFFICE</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>SECURITY</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>SYSTEM</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>SECURITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>COMMUNITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - </supported-identity-object-types> - <options> - <option> - <name>persistenceUnit</name> - <value>jboss-identity-model1</value> - </option> - <option> - <name>populateRelationshipTypes</name> - <value>true</value> - </option> - <option> - <name>populateIdentityObjectTypes</name> - <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - <option> - <name>isRealmAware</name> - <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </identity-store> - </identity-stores> - </stores> + <realms> + <realm> + <id>realm://jbpm-identity</id> + <repository-id-ref>jBPM Identity DB</repository-id-ref> + <identity-type-mappings> + <identity-mapping>IDENTITY</identity-mapping> + </identity-type-mappings> + </realm> + </realms> + + <repositories> + <repository> + <id>jBPM Identity DB</id> + <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> + <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + </repositories> + + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>Hibernate Identity Store</id> + <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>IDENTITY</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>COMMUNITY</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>OFFICE</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>SECURITY</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>PROJECT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>PEOPLE</identity-object-type-ref> + </relationship> + </relationships> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes> + <attribute> + <name>picture</name> + <mapping>user.picture</mapping> + <type>binary</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + </attribute> + </attributes> + <options/> + </identity-object-type> + <identity-object-type> + <name>ORGANIZATION</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>IDENTITY</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>DIVISION</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>ORGANIZATION_UNIT</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>IDENTITY</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>DIVISION</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>OFFICE</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>PEOPLE</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>PROJECT</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>DIVISION</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>IDENTITY</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>DEPARTMENT</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>IDENTITY</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>PROJECT</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>IDENTITY</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>PEOPLE</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>IDENTITY</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>ADMINISTRATION</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>IDENTITY</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>COMMUNITY</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>IDENTITY</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>OFFICE</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>IDENTITY</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>SECURITY</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>IDENTITY</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>SYSTEM</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>IDENTITY</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>SECURITY</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>COMMUNITY</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>ORGANIZATION</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>persistenceUnit</name> + <value>jboss-identity-model1</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + <option> + <name>isRealmAware</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> </jboss-identity> \ No newline at end of file Deleted: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.user.bindings.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.user.bindings.xml 2009-02-05 09:39:23 UTC (rev 3784) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.user.bindings.xml 2009-02-05 12:54:37 UTC (rev 3785) @@ -1,5 +0,0 @@ -<wire-bindings> - - <binding class="org.jbpm.pvm.api.timer.TestTimerSessionBinding" /> - -</wire-bindings> Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2009-02-05 09:39:23 UTC (rev 3784) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2009-02-05 12:54:37 UTC (rev 3785) @@ -39,7 +39,7 @@ /** * @author Tom Baeyens */ -public class DbTestCase extends JbpmTestCase { +public abstract class DbTestCase extends JbpmTestCase { protected static ProcessEngine processEngine = null; Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java 2009-02-05 09:39:23 UTC (rev 3784) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java 2009-02-05 12:54:37 UTC (rev 3785) @@ -40,7 +40,7 @@ * * @author Tom Baeyens */ -public class EnvironmentDbTestCase extends EnvironmentTestCase { +public abstract class EnvironmentDbTestCase extends EnvironmentTestCase { Transaction transaction = null; Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java 2009-02-05 09:39:23 UTC (rev 3784) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java 2009-02-05 12:54:37 UTC (rev 3785) @@ -39,7 +39,7 @@ static Map<String, EnvironmentFactory> environmentFactories = new HashMap<String, EnvironmentFactory>(); public EnvironmentFactoryTestCase() { - this("environment.cfg.xml"); + this("jbpm.cfg.xml"); } public EnvironmentFactoryTestCase(String configResource) { Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestSetup.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestSetup.java 2009-02-05 09:39:23 UTC (rev 3784) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentFactoryTestSetup.java 2009-02-05 12:54:37 UTC (rev 3785) @@ -21,6 +21,7 @@ * @author Guillaume Porcher * */ +@Deprecated public class EnvironmentFactoryTestSetup extends TestSetup { private String configResource;

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3784 - jbpm4/trunk.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-05 04:39:23 -0500 (Thu, 05 Feb 2009) New Revision: 3784 Modified: jbpm4/trunk/profiles.xml.example Log: Added default oracle jdbc setings to profiles.example.xml Modified: jbpm4/trunk/profiles.xml.example =================================================================== --- jbpm4/trunk/profiles.xml.example 2009-02-05 09:09:21 UTC (rev 3783) +++ jbpm4/trunk/profiles.xml.example 2009-02-05 09:39:23 UTC (rev 3784) @@ -57,41 +57,16 @@ <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.oracle.server>localhost</jdbc.oracle.server> + <jdbc.oracle.port>5432</jdbc.oracle.port> + <jdbc.oracle.database>jbpm4</jdbc.oracle.database> + <jdbc.oracle.username>jbpmtest</jdbc.oracle.username> + <jdbc.oracle.password></jdbc.oracle.password> + <jdbc.oracle.url>jdbc:oracle:thin:${jdbc.oracle.user}/${jdbc.oracle.password}@${jdbc.oracle.database}</jdbc.oracle.url> - <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> - <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>

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3783 - jbpm4/trunk/hudson/jboss/bin.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-05 04:09:21 -0500 (Thu, 05 Feb 2009) New Revision: 3783 Modified: jbpm4/trunk/hudson/jboss/bin/http-spider.sh Log: Cleanup http-spider.sh Modified: jbpm4/trunk/hudson/jboss/bin/http-spider.sh =================================================================== --- jbpm4/trunk/hudson/jboss/bin/http-spider.sh 2009-02-05 09:03:10 UTC (rev 3782) +++ jbpm4/trunk/hudson/jboss/bin/http-spider.sh 2009-02-05 09:09:21 UTC (rev 3783) @@ -34,7 +34,7 @@ while [ $COUNTER -lt $NUM_RETRIES ]; do if wget --spider --timeout=$TIMEOUT --tries=1 $1 &> /dev/null; then touch $2/spider.success - echo "Try $COUNTER: '$1' is available" > ./spider.success + echo "Try $COUNTER: '$1' is available" > $2/spider.success exit 0 else echo "Try $COUNTER: '$1' does not respond, wait another $SLEEP_TIME seconds" @@ -44,7 +44,7 @@ done touch $2/spider.failed -echo "Unable to connect to $1, exiting..." > spider.failed +echo "Unable to connect to $1, exiting..." > $2/spider.failed exit 0

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3782 - in jbpm4/trunk/hudson: jboss/bin and 1 other directory.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-05 04:03:10 -0500 (Thu, 05 Feb 2009) New Revision: 3782 Modified: jbpm4/trunk/hudson/hudson-home/command.sh jbpm4/trunk/hudson/jboss/bin/http-spider.sh Log: Remove stdout output from spider.sh Modified: jbpm4/trunk/hudson/hudson-home/command.sh =================================================================== --- jbpm4/trunk/hudson/hudson-home/command.sh 2009-02-05 04:26:50 UTC (rev 3781) +++ jbpm4/trunk/hudson/hudson-home/command.sh 2009-02-05 09:03:10 UTC (rev 3782) @@ -87,6 +87,8 @@ # Was it successfully started? $JBPMDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE if [ -e $WORKSPACE/spider.failed ]; then + echo "JBoss could not be started:" + cat $WORKSPACE/spider.failed tail -n 100 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR exit 1 Modified: jbpm4/trunk/hudson/jboss/bin/http-spider.sh =================================================================== --- jbpm4/trunk/hudson/jboss/bin/http-spider.sh 2009-02-05 04:26:50 UTC (rev 3781) +++ jbpm4/trunk/hudson/jboss/bin/http-spider.sh 2009-02-05 09:03:10 UTC (rev 3782) @@ -30,22 +30,18 @@ echo "Check HTTP connection on $1" -if [ -b $WGET ]; then - COUNTER=0 - while [ $COUNTER -lt $NUM_RETRIES ]; do - if wget --spider --timeout=$TIMEOUT --tries=1 $1 &> /dev/null; then - touch $2/spider.success - echo "Try $COUNTER: '$1' is available" > ./spider.success - exit 0 - else - echo "Try $COUNTER: '$1' does not respond, wait another $SLEEP_TIME seconds" - fi - sleep $SLEEP_TIME - let COUNTER=COUNTER+1 - done -else - echo "$WGET can not be found, exiting" -fi +COUNTER=0 +while [ $COUNTER -lt $NUM_RETRIES ]; do + if wget --spider --timeout=$TIMEOUT --tries=1 $1 &> /dev/null; then + touch $2/spider.success + echo "Try $COUNTER: '$1' is available" > ./spider.success + exit 0 + else + echo "Try $COUNTER: '$1' does not respond, wait another $SLEEP_TIME seconds" + fi + sleep $SLEEP_TIME + let COUNTER=COUNTER+1 +done touch $2/spider.failed echo "Unable to connect to $1, exiting..." > spider.failed

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3781 - jbpm3/branches/jbpm-3.2.5.SP/hudson.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-02-04 23:26:50 -0500 (Wed, 04 Feb 2009) New Revision: 3781 Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa Log: fix local qa sybase server Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa 2009-02-04 23:48:32 UTC (rev 3780) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa 2009-02-05 04:26:50 UTC (rev 3781) @@ -18,7 +18,7 @@ <jdbc.mysql.username>jbpmtest</jdbc.mysql.username> <jdbc.mysql.password></jdbc.mysql.password> - <jdbc.sybase.server>localhost</jdbc.sybase.server> + <jdbc.sybase.server>192.168.0.101</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>

17 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r3780 - in jbpm3/branches/jbpm-3.2.5.SP: hudson and 12 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-02-04 18:48:32 -0500 (Wed, 04 Feb 2009) New Revision: 3780 Added: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.sybase.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/ant/JbpmSchemaTask.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSession.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.cache.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.common.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.default.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.properties.sybase.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-mysql-ds.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-postgresql-ds.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-sybase-ds.xml jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/log4j.xml jbpm3/branches/jbpm-3.2.5.SP/modules/db/scripts/antrun-jbpmschema.xml jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/main/etc/jbpm.cfg.xml jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/web.xml jbpm3/branches/jbpm-3.2.5.SP/pom.xml jbpm3/branches/jbpm-3.2.5.SP/profiles.xml.example Log: JBPM-1818: merge -r3601:3602 from https://svn.jboss.org/repos/jbpm/jbpm3/trunk in order to enable enterprise tests fix references in test web descriptors Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh 2009-02-04 23:48:32 UTC (rev 3780) @@ -70,6 +70,14 @@ rm $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/slf4j-api.jar fi +# FIXME: find out whether jTDS can be made to work with XA data source +# https://jira.jboss.org/jira/browse/JBPM-1818 +SYBASE_JDBC_DRIVER=~/.m2/repository/com/sybase/jconnect/6.0.5/jconnect-6.0.5.jar +if [ -f $SYBASE_JDBC_DRIVER ]; then + echo "cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" + cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar +fi + # # start jbossas # Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/hudson/profiles.xml.local.qa 2009-02-04 23:48:32 UTC (rev 3780) @@ -11,30 +11,30 @@ </property> </activation> <properties> - - <jdbc.mysql.url>jdbc:mysql://localhost:3306/jbpmtest</jdbc.mysql.url> <jdbc.mysql.server>localhost</jdbc.mysql.server> <jdbc.mysql.port>3306</jdbc.mysql.port> <jdbc.mysql.database>jbpmtest</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.url>jdbc:jtds:sybase://192.168.0.101:5000/jbpmtest</jdbc.sybase.url> - <jdbc.sybase.server>192.168.0.101</jdbc.sybase.server> + + <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> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/scripts/antrun-jbpm-config.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -53,31 +53,25 @@ <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"/> - <condition property="hibernate.mapping.(a){database}.xml" value="hibernate.mapping.(a){database}.xml" else="hibernate.mapping.default.xml"> - <available property="@{database}.mapping.available" file="${build.resources.directory}/hibernate.mapping.(a){database}.xml"/> - </condition> - - <echo message="Concat hibernate.cfg.(a){database}.xml using hibernate.properties.(a){database}.xml, ${hibernate.mapping.(a){database}.xml}" /> - + <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 trimleading="yes"><![CDATA[<?xml version='1.0' encoding='utf-8'?> - - <!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - - <hibernate-configuration> - <session-factory> - ]]></header> + <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.(a){database}.xml" /> + <fileset file="${build.resources.directory}/hibernate.mapping.default.xml" /> <fileset file="${build.resources.directory}/hibernate.cache.xml" /> - <footer trimleading="yes"><![CDATA[ - </session-factory> - </hibernate-configuration> - ]]></footer> + <footer><![CDATA[ </session-factory> +</hibernate-configuration>]]></footer> </concat> </sequential> </macrodef> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/ant/JbpmSchemaTask.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/ant/JbpmSchemaTask.java 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/ant/JbpmSchemaTask.java 2009-02-04 23:48:32 UTC (rev 3780) @@ -69,13 +69,14 @@ } else if ("update".equalsIgnoreCase(action)) { - PrintStream sysout = System.out; + PrintStream fileOut = null; + PrintStream systemOut = System.out; try { if (output != null) { - PrintStream prstr = new PrintStream(new FileOutputStream(output)); - System.setOut(prstr); + fileOut = new PrintStream(new FileOutputStream(output)); + System.setOut(fileOut); } SchemaUpdate schemaUpdate = getSchemaUpdate(configuration); schemaUpdate.execute(true, false); @@ -83,7 +84,11 @@ } finally { - System.setOut(sysout); + if (fileOut != null) + { + System.setOut(systemOut); + fileOut.close(); + } } } else @@ -113,9 +118,16 @@ if (inStream == null) throw new IllegalArgumentException("Cannot read properties: " + properties); - Properties properties = new Properties(); - properties.load(inStream); - configuration.setProperties(properties); + try + { + Properties properties = new Properties(); + properties.load(inStream); + configuration.setProperties(properties); + } + finally + { + inStream.close(); + } } return configuration; } Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSession.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSession.java 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSession.java 2009-02-04 23:48:32 UTC (rev 3780) @@ -34,14 +34,14 @@ /** * represents the connection to the jbpm database. * - * You can obtain a DbSession with + * You can obtain a JbpmSession with * <pre> - * DbSession dbSession = dbSessionFactory.openDbSession(); + * JbpmSession jbpmSession = jbpmSessionFactory.openJbpmSession(); * </pre> * or * <pre> * Connection jdbcConnection = ...; - * DbSession dbSession = dbSessionFactory.openDbSession(jdbcConnection); + * JbpmSession jbpmSession = jbpmSessionFactory.openJbpmSession(jdbcConnection); * </pre> * The actual database operations are defined in the module sessions : * <ul> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/JbpmSessionFactory.java 2009-02-04 23:48:32 UTC (rev 3780) @@ -51,8 +51,8 @@ * <pre> * static JbpmSessionFactory jbpmSessionFactory = JbpmSessionFactory.buildJbpmSessionFactory(); * </pre> - * and store it somewhere static. It takes quite some time to create a DbSessionFactory, - * but you only have to do it once. After that, creating DbSession's is really fast. + * and store it somewhere static. It takes quite some time to create a JbpmSessionFactory, + * but you only have to do it once. After that, creating JbpmSession's is really fast. * * @deprecated use {@link org.jbpm.JbpmContext} and {@link org.jbpm.JbpmConfiguration} instead. */ @@ -76,6 +76,7 @@ JbpmSchema jbpmSchema = null; static JbpmSessionFactory instance = null; + /** * a singleton is kept in JbpmSessionFactory as a convenient central location. */ @@ -170,15 +171,15 @@ /** * obtains a jdbc connection as specified in the hibernate configurations and - * creates a DbSession with it. + * creates a JbpmSession with it. */ public JbpmSession openJbpmSession() { return openJbpmSession((Connection)null); } /** - * creates a DbSession around the given connection. Note that you are - * responsible for closing the connection so closing the DbSession will + * creates a JbpmSession around the given connection. Note that you are + * responsible for closing the connection so closing the JbpmSession will * not close the jdbc connection. */ public JbpmSession openJbpmSession(Connection jdbcConnection) { @@ -225,13 +226,6 @@ } /** - * clears the process definitions from hibernate's second level cache. - public void evictCachedProcessDefinitions() { - sessionFactory.evict(ProcessDefinition.class); - } - */ - - /** * checks if the given class is persistable with hibernate and has an id of type long. */ public boolean isHibernatableWithLongId(Class clazz) { Copied: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java (from rev 3602, jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java) =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java (rev 0) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java 2009-02-04 23:48:32 UTC (rev 3780) @@ -0,0 +1,227 @@ +/* + * 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.db.hibernate; + +import java.io.IOException; +import java.io.Reader; +import java.io.Serializable; +import java.io.StringReader; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.HibernateException; +import org.hibernate.type.Type; +import org.hibernate.usertype.UserType; +import org.hibernate.util.EqualsHelper; +import org.hibernate.util.StringHelper; + +/** + * @author Alejandro Guizar + */ +public class TextType implements UserType, Serializable { + + private transient Log log; + private static final boolean IS_VALUE_TRACING_ENABLED = LogFactory.getLog(StringHelper + .qualifier(Type.class.getName())).isTraceEnabled(); + + private static final long serialVersionUID = 1L; + + private Log log() { + if (log == null) { + log = LogFactory.getLog(getClass()); + } + return log; + } + + public Object assemble(Serializable cached, Object owner) throws HibernateException { + if (cached == null) { + return null; + } + else { + return deepCopy(cached); + } + } + + public Object deepCopy(Object value) throws HibernateException { + return value; + } + + public Serializable disassemble(Object value) throws HibernateException { + if (value == null) { + return null; + } + else { + return (Serializable) deepCopy(value); + } + } + + public boolean equals(Object x, Object y) throws HibernateException { + return EqualsHelper.equals(x, y); + } + + public int hashCode(Object x) throws HibernateException { + return x.hashCode(); + } + + public boolean isMutable() { + return false; + } + + public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws HibernateException, + SQLException { + return nullSafeGet(rs, names[0]); + } + + public Object nullSafeGet(ResultSet rs, String name) throws HibernateException, SQLException { + try { + Object value = get(rs, name); + if (value == null) { + if (IS_VALUE_TRACING_ENABLED) { + log().trace("returning null as column: " + name); + } + return null; + } + else { + if (IS_VALUE_TRACING_ENABLED) { + log().trace("returning '" + toString(value) + "' as column: " + name); + } + return value; + } + } + catch (RuntimeException re) { + log().info("could not read column value from result set: " + name + "; " + re.getMessage()); + throw re; + } + catch (SQLException se) { + log().info("could not read column value from result set: " + name + "; " + se.getMessage()); + throw se; + } + } + + public Object get(ResultSet rs, String name) throws HibernateException, SQLException { + // retrieve the value of the designated column in the current row of the + // result set as a character reader + Reader charReader = rs.getCharacterStream(name); + + // if the corresponding SQL value is NULL, the reader we got is NULL as well + if (charReader == null || rs.wasNull()) + return null; + + // Fetch Reader content up to the end - and put characters in a StringBuffer + StringBuffer sbuf = new StringBuffer(); + try { + char[] cbuf = new char[1024]; + for (int amountRead; (amountRead = charReader.read(cbuf)) != -1;) { + sbuf.append(cbuf, 0, amountRead); + } + } + catch (IOException ioe) { + throw new HibernateException("IOException occurred reading text", ioe); + } + finally { + try { + charReader.close(); + } + catch (IOException e) { + throw new HibernateException("IOException occurred closing stream", e); + } + } + + // Return StringBuffer content as a large String + return sbuf.toString(); + } + + public void nullSafeSet(PreparedStatement st, Object value, int index) throws HibernateException, + SQLException { + try { + if (value == null) { + if (IS_VALUE_TRACING_ENABLED) { + log().trace("binding null to parameter: " + index); + } + + setNull(st, index); + } + else { + if (IS_VALUE_TRACING_ENABLED) { + log().trace("binding '" + toString(value) + "' to parameter: " + index); + } + + set(st, value, index); + } + } + catch (RuntimeException re) { + log().info("could not bind value '" + nullSafeToString(value) + + "' to parameter: " + + index + + "; " + + re.getMessage()); + throw re; + } + catch (SQLException se) { + log().info("could not bind value '" + nullSafeToString(value) + + "' to parameter: " + + index + + "; " + + se.getMessage()); + throw se; + } + } + + public void set(PreparedStatement st, Object value, int index) throws HibernateException, + SQLException { + String str = (String) value; + st.setCharacterStream(index, new StringReader(str), str.length()); + } + + public void setNull(PreparedStatement st, int index) throws HibernateException, SQLException { + // JBPM-1818: workaround for SQL state JZ0SL: "Unsupported SQL type" with jConnect + st.setCharacterStream(index, null, 0); + } + + public Object replace(Object original, Object target, Object owner) throws HibernateException { + return original; + } + + public Class returnedClass() { + return String.class; + } + + public int[] sqlTypes() { + return new int[] { sqlType() }; + } + + public int sqlType() { + return Types.CLOB; + } + + public String nullSafeToString(Object value) throws HibernateException { + return value == null ? null : toString(value); + } + + public String toString(Object val) { + return (String) val; + } +} Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.cache.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.cache.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.cache.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -1,62 +1,61 @@ -  -  -  -  -  - - <class-cache class="org.jbpm.context.def.VariableAccess" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.action.Script.variableAccesses" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.Action" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.Event" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Event.actions" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.ExceptionHandler" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ExceptionHandler.actions" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.Node" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Node.events" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Node.exceptionHandlers" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Node.leavingTransitions" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Node.arrivingTransitions" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.ProcessDefinition" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.events" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.exceptionHandlers" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.nodes" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.actions" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.definitions" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.def.SuperState.nodes" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.Transition" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Transition.events" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Transition.exceptionHandlers" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.node.Decision.decisionConditions" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.node.ProcessState.variableAccesses" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.node.TaskNode.tasks" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.instantiation.Delegation" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.module.def.ModuleDefinition" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.taskmgmt.def.Swimlane.tasks" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.taskmgmt.def.TaskController" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.taskmgmt.def.TaskController.variableAccesses" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.taskmgmt.def.Task" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.taskmgmt.def.Task.events" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.taskmgmt.def.Task.exceptionHandlers" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.swimlanes" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.tasks" usage="nonstrict-read-write" /> +  +  +  +  +  + <class-cache class="org.jbpm.context.def.VariableAccess" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.action.Script.variableAccesses" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.Action" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.Event" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Event.actions" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.ExceptionHandler" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ExceptionHandler.actions" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.Node" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Node.events" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Node.exceptionHandlers" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Node.leavingTransitions" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Node.arrivingTransitions" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.ProcessDefinition" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.events" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.exceptionHandlers" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.nodes" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.actions" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.definitions" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.def.SuperState.nodes" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.Transition" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Transition.events" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Transition.exceptionHandlers" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.node.Decision.decisionConditions" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.node.ProcessState.variableAccesses" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.node.TaskNode.tasks" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.instantiation.Delegation" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.module.def.ModuleDefinition" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.taskmgmt.def.Swimlane.tasks" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.taskmgmt.def.TaskController" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.taskmgmt.def.TaskController.variableAccesses" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.taskmgmt.def.Task" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.taskmgmt.def.Task.events" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.taskmgmt.def.Task.exceptionHandlers" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.swimlanes" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.tasks" usage="nonstrict-read-write" /> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.common.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.common.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.common.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -1,6 +1,6 @@   -  -  +  +  +  -  - <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> -  + <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> +  -  +  -  - <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/> +  + <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/> -  - <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/> - <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/> +  + <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/> + <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/> -  -  -  -  -  -  -  -  -  -  - <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> +  +  +  +  +  +  +  +  +  +  + <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> -  - <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> +  + <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> -  - <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> - <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/> +  + <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> + <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/> -  - <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/> +  + <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/> -  - <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/> +  + <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/> -  - <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/> +  + <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/> -  - <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/> +  + <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/> -  - <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/> - <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/> +  + <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/> + <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/> -  - <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/> - <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/> - <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/> - <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/> +  + <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/> -  - <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/> +  + <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/> -  - <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> +  + <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> -  - <mapping resource="org/jbpm/job/Job.hbm.xml"/> - <mapping resource="org/jbpm/job/Timer.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> - <mapping resource="org/jbpm/job/CleanUpProcessJob.hbm.xml"/> +  + <mapping resource="org/jbpm/job/Job.hbm.xml"/> + <mapping resource="org/jbpm/job/Timer.hbm.xml"/> + <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> + <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> + <mapping resource="org/jbpm/job/CleanUpProcessJob.hbm.xml"/> -  - <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> +  + <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> -  - <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> - <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> - <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/> +  + <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> + <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> + <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/> Copied: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.sybase.xml (from rev 3602, jbpm3/trunk/modules/core/src/main/resources/hibernate.mapping.sybase.xml) =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.sybase.xml (rev 0) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.mapping.sybase.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -0,0 +1,2 @@ +  + <mapping resource="org/jbpm/db/hibernate.types.sybase.hbm.xml" /> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.properties.sybase.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.properties.sybase.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.properties.sybase.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -13,8 +13,11 @@ <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property>  - <property name="hibernate.connection.driver_class">net.sourceforge.jtds.jdbc.Driver</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> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-mysql-ds.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-mysql-ds.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-mysql-ds.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -5,7 +5,9 @@ <jndi-name>JbpmDS</jndi-name> <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class> - <xa-datasource-property name="URL">${jdbc.mysql.url}</xa-datasource-property> + <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> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-postgresql-ds.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-postgresql-ds.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-postgresql-ds.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -8,8 +8,8 @@ <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> - <xa-datasource-property name="User">${jdbc.postgresql.username}</xa-datasource-property> - <xa-datasource-property name="Password">${jdbc.postgresql.password}</xa-datasource-property> + <user-name>${jdbc.postgresql.username}</user-name> + <password>${jdbc.postgresql.password}</password>  <track-connection-by-tx /> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-sybase-ds.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-sybase-ds.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-sybase-ds.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -5,13 +5,16 @@ <xa-datasource> <jndi-name>JbpmDS</jndi-name> - <xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</xa-datasource-class> + <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> - <xa-datasource-property name="User">${jdbc.sybase.username}</xa-datasource-property> - <xa-datasource-property name="Password">${jdbc.sybase.password}</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> Copied: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml (from rev 3602, jbpm3/trunk/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping> + <typedef name="text" class="org.jbpm.db.hibernate.TextType" /> +</hibernate-mapping> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/log4j.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/log4j.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/log4j.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -38,9 +38,6 @@ <category name="org.hibernate.SQL"> <priority value="DEBUG" /> </category> - <category name="org.hibernate.type"> - <priority value="TRACE" /> - </category> <category name="org.hibernate.connection"> <priority value="TRACE" /> </category> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/db/scripts/antrun-jbpmschema.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/db/scripts/antrun-jbpmschema.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/db/scripts/antrun-jbpmschema.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -39,7 +39,7 @@ <jbpmschema output="${scriptsdir}/jbpm.jpdl.mssql.sql" config="hibernate.cfg.mssql.xml" action="create"/> <jbpmschema output="${scriptsdir}/jbpm.jpdl.mysql.sql" config="hibernate.cfg.mysql.xml" action="create" delimiter=";"/> <jbpmschema output="${scriptsdir}/jbpm.jpdl.oracle.sql" config="hibernate.cfg.oracle.xml" action="create" delimiter=";"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.sql" config="hibernate.cfg.postgresql.xml" action="create"/> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.sql" config="hibernate.cfg.postgresql.xml" action="create" delimiter=";"/> <jbpmschema output="${scriptsdir}/jbpm.jpdl.sapdb.sql" config="hibernate.cfg.sapdb.xml" action="create"/> <jbpmschema output="${scriptsdir}/jbpm.jpdl.sybase.sql" config="hibernate.cfg.sybase.xml" action="create"/> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -171,14 +171,6 @@ </configuration> </plugin> <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>jbpm.cfg.xml</exclude> - </excludes> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.security.args}</argLine> @@ -337,9 +329,6 @@ <excludes>  <exclude>org/jbpm/enterprise/deployment/DeploymentPARTest.java</exclude> - <exclude>org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java</exclude> - <exclude>org/jbpm/enterprise/jta/JtaDbPersistenceTest.java</exclude> - <exclude>org/jbpm/enterprise/jms/JmsMessageTest.java</exclude> </excludes> </configuration> </plugin> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/main/etc/jbpm.cfg.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/main/etc/jbpm.cfg.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/main/etc/jbpm.cfg.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -15,7 +15,7 @@  <null name="jbpm.job.executor" /> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/jboss-web.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -1,31 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE jboss-web PUBLIC - "-//JBoss//DTD Web Application 2.4//EN" - "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd" > +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + <jboss-web> <resource-ref> <res-ref-name>jdbc/JbpmDataSource</res-ref-name> - <jndi-name>java:/JbpmDS</jndi-name> + <jndi-name>java:JbpmDS</jndi-name> </resource-ref> <resource-ref> <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> <jndi-name>java:JmsXA</jndi-name> </resource-ref> - - <ejb-ref> + + <ejb-local-ref> <ejb-ref-name>ejb/CommandServiceBean</ejb-ref-name> - <jndi-name>java:ejb/CommandServiceBean</jndi-name> - </ejb-ref> + <local-jndi-name>java:ejb/CommandServiceBean</local-jndi-name> + </ejb-local-ref> - <ejb-ref> - <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> - <jndi-name>java:ejb/TimerEntityBean</jndi-name> - </ejb-ref> - <message-destination-ref> <message-destination-ref-name>jms/JobQueue</message-destination-ref-name> <jndi-name>queue/JbpmJobQueue</jndi-name> </message-destination-ref> + </jboss-web> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/web.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/web.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/src/test/resources/enterprise/WEB-INF/web.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -14,20 +14,13 @@ <url-pattern>/ServletRedirector</url-pattern> </servlet-mapping> - <ejb-ref> + <ejb-local-ref> <ejb-ref-name>ejb/CommandServiceBean</ejb-ref-name> <ejb-ref-type>Session</ejb-ref-type> - <home>org.jbpm.ejb.RemoteCommandServiceHome</home> - <remote>org.jbpm.ejb.RemoteCommandService</remote> - </ejb-ref> + <local-home>org.jbpm.ejb.LocalCommandServiceHome</local-home> + <local>org.jbpm.ejb.LocalCommandService</local> + </ejb-local-ref> - <ejb-ref> - <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> - <ejb-ref-type>Entity</ejb-ref-type> - <home>org.jbpm.ejb.TimerEntityHome</home> - <remote>org.jbpm.ejb.TimerEntity</remote> - </ejb-ref> - <resource-ref> <res-ref-name>jdbc/JbpmDataSource</res-ref-name> <res-type>javax.sql.DataSource</res-type> Modified: jbpm3/branches/jbpm-3.2.5.SP/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-02-04 23:48:32 UTC (rev 3780) @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -  -  -  -  -  -  -  -  + + + + + + + + -  + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss jBPM3</name> @@ -585,11 +585,18 @@ </activation> <dependencies> <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> + <groupId>com.sybase</groupId> + <artifactId>jconnect</artifactId> + <version>6.0.5</version> <scope>test</scope> </dependency> </dependencies> + <repositories> + <repository> + <id>qa.jboss.com</id> + <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url> + </repository> + </repositories> </profile>  Modified: jbpm3/branches/jbpm-3.2.5.SP/profiles.xml.example =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/profiles.xml.example 2009-02-04 20:34:27 UTC (rev 3779) +++ jbpm3/branches/jbpm-3.2.5.SP/profiles.xml.example 2009-02-04 23:48:32 UTC (rev 3780) @@ -16,26 +16,28 @@ <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>  </properties> </profile>

17 years, 3 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits February 2009