October 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r5722 - in jbpm4/branches/tbaeyens: modules and 30 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-10-09 09:49:12 -0400 (Fri, 09 Oct 2009) New Revision: 5722 Added: jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/src/jboss/config/ jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/src/jboss/config/deploy/ jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/ jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-destinations-service.xml jbpm4/branches/tbaeyens/modules/jboss/ jbpm4/branches/tbaeyens/modules/jboss/.classpath jbpm4/branches/tbaeyens/modules/jboss/.project jbpm4/branches/tbaeyens/modules/jboss/pom.xml jbpm4/branches/tbaeyens/modules/jboss/src/ jbpm4/branches/tbaeyens/modules/jboss/src/main/ jbpm4/branches/tbaeyens/modules/jboss/src/main/java/ jbpm4/branches/tbaeyens/modules/jboss/src/main/java/org/ jbpm4/branches/tbaeyens/modules/jboss/src/main/java/org/jbpm/ jbpm4/branches/tbaeyens/modules/jboss/src/main/java/org/jbpm/jboss/ jbpm4/branches/tbaeyens/modules/jboss/src/main/java/org/jbpm/jboss/internal/ jbpm4/branches/tbaeyens/modules/jboss/src/main/java/org/jbpm/jboss/internal/JbpmService.java jbpm4/branches/tbaeyens/modules/jboss/target/ jbpm4/branches/tbaeyens/modules/jboss/target/classes/ jbpm4/branches/tbaeyens/modules/jboss/target/classes/org/ jbpm4/branches/tbaeyens/modules/jboss/target/classes/org/jbpm/ jbpm4/branches/tbaeyens/modules/jboss/target/classes/org/jbpm/jboss/ jbpm4/branches/tbaeyens/modules/jboss/target/classes/org/jbpm/jboss/internal/ jbpm4/branches/tbaeyens/modules/jboss/target/classes/org/jbpm/jboss/internal/JbpmService.class Removed: jbpm4/branches/tbaeyens/modules/integration/.project jbpm4/branches/tbaeyens/modules/integration/jboss4/ jbpm4/branches/tbaeyens/modules/integration/jboss5/ jbpm4/branches/tbaeyens/modules/integration/spi/ Modified: jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/Configuration.java jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java jbpm4/branches/tbaeyens/modules/distro/pom.xml jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/build.xml jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/integration/form-plugin/pom.xml jbpm4/branches/tbaeyens/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/AbstractFormDispatcher.java jbpm4/branches/tbaeyens/modules/integration/graphView-plugin/pom.xml jbpm4/branches/tbaeyens/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java jbpm4/branches/tbaeyens/modules/integration/pom.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/ProcessEngineImpl.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java jbpm4/branches/tbaeyens/pom.xml Log: simplified jboss integration Modified: jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/Configuration.java =================================================================== --- jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/Configuration.java 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/Configuration.java 2009-10-09 13:49:12 UTC (rev 5722) @@ -38,7 +38,7 @@ static Map<String, String> implementationClassNames = null; - Configuration impl; + transient Configuration impl; /** * Cached processEngine instance used by the Modified: jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java =================================================================== --- jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/ProcessEngine.java 2009-10-09 13:49:12 UTC (rev 5722) @@ -83,6 +83,11 @@ * a service method in the same thread. * This method returns the process engine for convenient method concatenations. */ ProcessEngine setJdbcConnection(Connection jdbcConnection); - + + /** perform a user command. that allows users to span a transaction over + * their own updates, as well as the jbpm operations. */ <T> T execute(Command<T> command); + + /** clean shutdown of the engine. */ + void close(); } Modified: jbpm4/branches/tbaeyens/modules/distro/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-10-09 13:49:12 UTC (rev 5722) @@ -65,14 +65,10 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jboss4</artifactId> + <artifactId>jbpm-jboss</artifactId> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jboss5</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-tomcat6</artifactId> </dependency> <dependency> @@ -94,10 +90,6 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-db</artifactId> <classifier>tests</classifier> </dependency> Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/build.xml 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/build.xml 2009-10-09 13:49:12 UTC (rev 5722) @@ -271,7 +271,7 @@ description="Installs jBPM into JBoss">  <copy todir="${jboss.server.config.dir}" overwrite="true"> - <fileset dir="${jbpm.home}/install/src/jboss/config.common" /> + <fileset dir="${jbpm.home}/install/src/jboss/config" /> </copy>  @@ -295,14 +295,10 @@ <fileset dir="${jbpm.home}/lib"> <include name="gwt-console-server-integration.jar" /> <include name="gwt-console-rpc.jar" /> + <include name="jbpm-jboss.jar" /> </fileset> </copy> -  - <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> <fileset dir="${jbpm.home}/lib"> <include name="gwt-console-jbpm.war" /> @@ -332,29 +328,6 @@ <unzip src="${jbpm.home}/lib/report-engine.zip" dest="${birt.dir}"/> <unzip src="${jbpm.home}/lib/jbpm-console-reports.jar" dest="${birt.dir}"/> -  - <copy todir="${jboss.server.config.dir}" overwrite="true"> - <fileset dir="${jbpm.home}/install/src/jboss/config.jboss5" /> - </copy> - - <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> - <fileset dir="${jbpm.home}/lib"> - <include name="jbpm-spi.jar"/> - </fileset> - </copy> - - <copy todir="${jboss.server.config.dir}/deployers/jbpm.deployer" overwrite="true"> - <fileset dir="${jbpm.home}/lib"> - <include name="jbpm-jboss5.jar"/> - </fileset> - </copy> - - <copy todir="${jboss.server.config.dir}/deployers/jbpm.deployer" overwrite="true"> - <fileset dir="${jbpm.home}/lib"> - <include name="jbpm-spi.jar"/> - </fileset> - </copy> - <property name="container.lib.dir" value="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" /> <antcall target="internal.copy.database.driver" /> </target> Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml 2009-10-09 13:49:12 UTC (rev 5722) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbpm-configuration> +<jbpm-configuration jndi-name="java:/ProcessEngine"> <import resource="jbpm.default.cfg.xml" /> <import resource="jbpm.tx.jta.cfg.xml" /> Added: jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-destinations-service.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-destinations-service.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-destinations-service.xml 2009-10-09 13:49:12 UTC (rev 5722) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<server> + +  + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=JbpmCommandQueue" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer"> + jboss.messaging:service=ServerPeer + </depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> + +</server> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-destinations-service.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: jbpm4/branches/tbaeyens/modules/integration/.project =================================================================== --- jbpm4/branches/tbaeyens/modules/integration/.project 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/integration/.project 2009-10-09 13:49:12 UTC (rev 5722) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jbpm-integration</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> Modified: jbpm4/branches/tbaeyens/modules/integration/form-plugin/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/integration/form-plugin/pom.xml 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/integration/form-plugin/pom.xml 2009-10-09 13:49:12 UTC (rev 5722) @@ -30,12 +30,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spi</artifactId> - <scope>provided</scope> - <version>${version}</version> - </dependency> - <dependency> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-server-integration</artifactId> <scope>provided</scope> Modified: jbpm4/branches/tbaeyens/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/AbstractFormDispatcher.java =================================================================== --- jbpm4/branches/tbaeyens/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/AbstractFormDispatcher.java 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/AbstractFormDispatcher.java 2009-10-09 13:49:12 UTC (rev 5722) @@ -21,20 +21,27 @@ */ package org.jbpm.integration.console.forms; -import freemarker.template.DefaultObjectWrapper; -import freemarker.template.Template; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.util.Map; -import org.jbpm.api.Configuration; -import org.jbpm.api.ProcessEngine; -import org.jbpm.integration.spi.mgmt.ServerConfig; -import org.jbpm.integration.spi.mgmt.ServerConfigFactory; - import javax.activation.DataHandler; import javax.activation.DataSource; import javax.naming.InitialContext; -import java.io.*; -import java.util.Map; +import org.jbpm.api.Configuration; +import org.jbpm.api.JbpmException; +import org.jbpm.api.ProcessEngine; + +import freemarker.template.DefaultObjectWrapper; +import freemarker.template.Template; + /** * Base class for freemarker based form dispatcher implementations that should * run on JBoss. Uses {@link org.jbpm.integration.spi.mgmt.ServerConfig} to @@ -50,9 +57,9 @@ protected final static String WEB_CONTEXT = "/gwt-console-server/rs"; protected ProcessEngine processEngine; + protected String webServiceHost = null; + protected String webServicePort = null; - protected ServerConfig serverConfig = null; // lazy - protected static final String FORM_DIRECTIVE_KEY = "form"; protected static final String OUTCOME_DIRECTIVE_NAME = "outcome"; @@ -65,24 +72,28 @@ try { InitialContext ctx = new InitialContext(); this.processEngine = (ProcessEngine) ctx.lookup("java:/ProcessEngine"); + } catch (Exception e) { // Fall back to default mechanism this.processEngine = Configuration.getProcessEngine(); } - } - - protected ServerConfig getServerConfig() { - if (null == serverConfig) { - serverConfig = ServerConfigFactory.getServerConfig(); + + this.webServiceHost = (String) processEngine.get("jbpm.console.webservice.host"); + this.webServicePort = (String) processEngine.get("jbpm.console.webservice.port"); + + if ( (webServiceHost==null) + || (webServicePort==null) + ) { + throw new JbpmException("make sure that strings 'jbpm.console.webservice.host' and 'jbpm.console.webservice.port' are properly configured in the process-engine-context of jbpm.cfg.xml"); } - return serverConfig; } protected StringBuilder getBaseUrl() { StringBuilder spec = new StringBuilder(); spec.append("http://"); - spec.append(getServerConfig().getWebServiceHost()); - spec.append(":").append(getServerConfig().getWebServicePort()); + spec.append(webServiceHost); + spec.append(":"); + spec.append(webServicePort); spec.append(WEB_CONTEXT); return spec; } Modified: jbpm4/branches/tbaeyens/modules/integration/graphView-plugin/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/integration/graphView-plugin/pom.xml 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/integration/graphView-plugin/pom.xml 2009-10-09 13:49:12 UTC (rev 5722) @@ -30,12 +30,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spi</artifactId> - <scope>provided</scope> - <version>${version}</version> - </dependency> - <dependency> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-server-integration</artifactId> <scope>provided</scope> Modified: jbpm4/branches/tbaeyens/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java =================================================================== --- jbpm4/branches/tbaeyens/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java 2009-10-09 13:49:12 UTC (rev 5722) @@ -37,13 +37,12 @@ import org.jboss.bpm.console.client.model.DiagramNodeInfo; import org.jboss.bpm.console.server.plugin.GraphViewerPlugin; import org.jbpm.api.Configuration; +import org.jbpm.api.JbpmException; import org.jbpm.api.ProcessDefinition; import org.jbpm.api.ProcessEngine; import org.jbpm.api.ProcessInstance; import org.jbpm.api.RepositoryService; import org.jbpm.api.model.ActivityCoordinates; -import org.jbpm.integration.spi.mgmt.ServerConfig; -import org.jbpm.integration.spi.mgmt.ServerConfigFactory; /** * @author Heiko.Braun <heiko.braun(a)jboss.com> @@ -53,7 +52,8 @@ protected final static String WEB_CONTEXT = "/gwt-console-server/rs"; protected ProcessEngine processEngine; - protected ServerConfig serverConfig = null; // lazy + protected String webServiceHost = null; + protected String webServicePort = null; public GraphViewerPluginImpl() { initializeProcessEngine(); @@ -63,24 +63,28 @@ try { InitialContext ctx = new InitialContext(); this.processEngine = (ProcessEngine) ctx.lookup("java:/ProcessEngine"); + } catch (Exception e) { // Fall back to default mechanism this.processEngine = Configuration.getProcessEngine(); } - } - - protected ServerConfig getServerConfig() { - if (null == serverConfig) { - serverConfig = ServerConfigFactory.getServerConfig(); + + this.webServiceHost = (String) processEngine.get("jbpm.console.webservice.host"); + this.webServicePort = (String) processEngine.get("jbpm.console.webservice.port"); + + if ( (webServiceHost==null) + || (webServicePort==null) + ) { + throw new JbpmException("make sure that strings 'jbpm.console.webservice.host' and 'jbpm.console.webservice.port' are properly configured in the process-engine-context of jbpm.cfg.xml"); } - return serverConfig; } protected StringBuilder getBaseUrl() { StringBuilder spec = new StringBuilder(); spec.append("http://"); - spec.append(getServerConfig().getWebServiceHost()); - spec.append(":").append(getServerConfig().getWebServicePort()); + spec.append(webServiceHost); + spec.append(":"); + spec.append(webServicePort); spec.append(WEB_CONTEXT); return spec; } Modified: jbpm4/branches/tbaeyens/modules/integration/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/integration/pom.xml 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/integration/pom.xml 2009-10-09 13:49:12 UTC (rev 5722) @@ -117,9 +117,6 @@ </dependencyManagement> <modules> - <module>spi</module> - <module>jboss5</module> - <module>jboss4</module> <module>console</module> <module>form-plugin</module> <module>graphView-plugin</module> Added: jbpm4/branches/tbaeyens/modules/jboss/.classpath =================================================================== --- jbpm4/branches/tbaeyens/modules/jboss/.classpath (rev 0) +++ jbpm4/branches/tbaeyens/modules/jboss/.classpath 2009-10-09 13:49:12 UTC (rev 5722) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Property changes on: jbpm4/branches/tbaeyens/modules/jboss/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/jboss/.project =================================================================== --- jbpm4/branches/tbaeyens/modules/jboss/.project (rev 0) +++ jbpm4/branches/tbaeyens/modules/jboss/.project 2009-10-09 13:49:12 UTC (rev 5722) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jboss</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Property changes on: jbpm4/branches/tbaeyens/modules/jboss/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/jboss/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jboss/pom.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/jboss/pom.xml 2009-10-09 13:49:12 UTC (rev 5722) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>jBPM 4 - JBoss Integration</name> + <description>JBoss jBPM - JBoss Integration</description> + + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jboss</artifactId> + <packaging>jar</packaging> + + <parent> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm</artifactId> + <version>4.2-SNAPSHOT</version> + </parent> + +  + <properties> + </properties> + +  + <dependencies> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + </dependency> + </dependencies> + +</project> Property changes on: jbpm4/branches/tbaeyens/modules/jboss/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/jboss/src/main/java/org/jbpm/jboss/internal/JbpmService.java =================================================================== --- jbpm4/branches/tbaeyens/modules/jboss/src/main/java/org/jbpm/jboss/internal/JbpmService.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/jboss/src/main/java/org/jbpm/jboss/internal/JbpmService.java 2009-10-09 13:49:12 UTC (rev 5722) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jboss.internal; + +import org.jbpm.api.Configuration; +import org.jbpm.api.ProcessEngine; +import org.jbpm.internal.log.Log; + +/** + * @author Tom Baeyens + */ +public class JbpmService { + + private static final Log log = Log.getLog(JbpmService.class.getName()); + + private ProcessEngine processEngine; + + public void start() { + log.debug("JbpmService starting..."); + this.processEngine = Configuration.getProcessEngine(); + log.info("JbpmService started"); + } + + public void stop() { + this.processEngine.close(); + log.info("JbpmService stopped"); + } + + public ProcessEngine getProcessEngine() { + return this.processEngine; + } + + public void setDataSource(Object dataSource) { + } +} Property changes on: jbpm4/branches/tbaeyens/modules/jboss/src/main/java/org/jbpm/jboss/internal/JbpmService.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/jboss/target/classes/org/jbpm/jboss/internal/JbpmService.class =================================================================== (Binary files differ) Property changes on: jbpm4/branches/tbaeyens/modules/jboss/target/classes/org/jbpm/jboss/internal/JbpmService.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/ProcessEngineImpl.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/ProcessEngineImpl.java 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/ProcessEngineImpl.java 2009-10-09 13:49:12 UTC (rev 5722) @@ -23,12 +23,16 @@ import java.io.File; import java.io.InputStream; +import java.io.Serializable; import java.net.URL; import java.sql.Connection; import java.util.ArrayList; import java.util.List; import java.util.Set; +import javax.naming.InitialContext; +import javax.naming.NamingException; + import org.jbpm.api.Configuration; import org.jbpm.api.ExecutionService; import org.jbpm.api.HistoryService; @@ -47,6 +51,7 @@ import org.jbpm.pvm.internal.env.JbpmConfigurationParser; import org.jbpm.pvm.internal.env.PvmEnvironment; import org.jbpm.pvm.internal.env.UserProvidedEnvironmentObject; +import org.jbpm.pvm.internal.jobexecutor.JobExecutor; import org.jbpm.pvm.internal.stream.FileStreamInput; import org.jbpm.pvm.internal.stream.InputStreamInput; import org.jbpm.pvm.internal.stream.ResourceStreamInput; @@ -87,21 +92,22 @@ * * @author Tom Baeyens */ -public class ProcessEngineImpl extends Configuration implements Context, ProcessEngine, EnvironmentFactory { +public class ProcessEngineImpl extends Configuration implements Context, ProcessEngine, EnvironmentFactory, Serializable { private static final long serialVersionUID = 1L; private static final Log log = Log.getLog(ProcessEngineImpl.class.getName()); public static final String JBPM_LIBRARY_VERSION = "4.2-SNAPSHOT"; - protected boolean isConfigured = false; - protected WireContext processEngineWireContext = new WireContext(new WireDefinition(), Context.CONTEXTNAME_PROCESS_ENGINE, true); - protected WireDefinition transactionWireDefinition = new WireDefinition(); + transient protected String jndiName; + transient protected boolean isConfigured = false; + transient protected WireContext processEngineWireContext = new WireContext(new WireDefinition(), Context.CONTEXTNAME_PROCESS_ENGINE, true); + transient protected WireDefinition transactionWireDefinition = new WireDefinition(); - protected ThreadLocal<List<UserProvidedEnvironmentObject>> userProvidedEnvironmentObjectsThreadLocal = new ThreadLocal<List<UserProvidedEnvironmentObject>>(); - protected ThreadLocal<String> authenticatedUserIdThreadLocal = new ThreadLocal<String>(); + transient protected ThreadLocal<List<UserProvidedEnvironmentObject>> userProvidedEnvironmentObjectsThreadLocal = new ThreadLocal<List<UserProvidedEnvironmentObject>>(); + transient protected ThreadLocal<String> authenticatedUserIdThreadLocal = new ThreadLocal<String>(); - protected CommandService userCommandService = null; + transient protected CommandService userCommandService = null; public ProcessEngineImpl() { super((Configuration)null); @@ -111,6 +117,20 @@ if (!isConfigured) { setResource("jbpm.cfg.xml"); } + + if (jndiName!=null) { + try { + InitialContext initialContext = new InitialContext(); + ProcessEngineImpl existing = (ProcessEngineImpl) initialContext.lookup(jndiName); + if (existing!=null) { + log.debug("found existing process engine under "+jndiName); + return existing; + } + } catch (NamingException e) { + log.debug("jndi name "+jndiName+" is not bound"); + } + } + if (log.isTraceEnabled()) { log.trace("created ProcessEngine "+System.identityHashCode(this)); if ( (processEngineWireContext!=null) @@ -133,6 +153,17 @@ } processEngineWireContext.create(); userCommandService = (CommandService) processEngineWireContext.get(CommandService.NAME_TX_REQUIRED_COMMAND_SERVICE); + + if (jndiName!=null) { + try { + log.debug("publishing jBPM ProcessEngine in jndi at "+jndiName); + InitialContext initialContext = new InitialContext(); + initialContext.bind(jndiName, this); + } catch (NamingException e) { + throw new JbpmException("JNDI binding problem", e); + } + } + return this; } @@ -246,6 +277,11 @@ } public void close() { + JobExecutor jobExecutor = get(JobExecutor.class); + if (jobExecutor!=null) { + // stop the job executor and wait till all job executor threads have stopped. + jobExecutor.stop(true); + } processEngineWireContext.fire(WireContext.EVENT_CLOSE, null); } @@ -326,4 +362,11 @@ public <T> T execute(Command<T> command) { return userCommandService.execute(command); } + + public String getJndiName() { + return jndiName; + } + public void setJndiName(String jndiName) { + this.jndiName = jndiName; + } } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java 2009-10-09 13:49:12 UTC (rev 5722) @@ -57,17 +57,31 @@ Element documentElement = document.getDocumentElement(); // if the default environment factory was already set in the parse - ProcessEngineImpl processEngineImpl = (ProcessEngineImpl) parse.contextStackFind(ProcessEngineImpl.class); - if (processEngineImpl==null) { - processEngineImpl = new ProcessEngineImpl(); + ProcessEngineImpl processEngine = (ProcessEngineImpl) parse.contextStackFind(ProcessEngineImpl.class); + if (processEngine==null) { + processEngine = new ProcessEngineImpl(); } + // this code will be called for the original jbpm.cfg.xml document as + // well as for the imported documents. only one of those should specify + // a jndi-name. for sure no 2 config files can specify different jndi-names + String jndiName = XmlUtil.attribute(documentElement, "jndi-name"); + if (jndiName!=null) { + if ( (processEngine.getJndiName()!=null) + && (!jndiName.equals(processEngine.getJndiName())) + ) { + parse.addProblem("duplicate jndi name specification: "+jndiName+" != "+processEngine.getJndiName()); + } else { + processEngine.setJndiName(jndiName); + } + } + for (Element importElement : XmlUtil.elements(documentElement, "import")) { if (importElement.hasAttribute("resource")) { String resource = importElement.getAttribute("resource"); Parse importParse = createParse() .setResource(resource) - .contextStackPush(processEngineImpl) + .contextStackPush(processEngine) .execute(); parse.addProblems(importParse.getProblems()); @@ -76,7 +90,7 @@ Element processEngineElement = XmlUtil.element(documentElement, "process-engine-context"); if (processEngineElement != null) { - WireDefinition processEngineContextDefinition = processEngineImpl.getProcessEngineWireContext().getWireDefinition(); + WireDefinition processEngineContextDefinition = processEngine.getProcessEngineWireContext().getWireDefinition(); parse.contextStackPush(processEngineContextDefinition); try { processEngineContextParser.parseDocumentElement(processEngineElement, parse); @@ -87,7 +101,7 @@ Element txCtxElement = XmlUtil.element(documentElement, "transaction-context"); if (txCtxElement != null) { - WireDefinition transactionContextDefinition = processEngineImpl.getTransactionWireDefinition(); + WireDefinition transactionContextDefinition = processEngine.getTransactionWireDefinition(); parse.contextStackPush(transactionContextDefinition); try { transactionContextParser.parseDocumentElement(txCtxElement, parse); @@ -96,9 +110,9 @@ } } - parse.setDocumentObject(processEngineImpl); + parse.setDocumentObject(processEngine); - return processEngineImpl; + return processEngine; } public Parser getProcessEngineContextParser() { Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java 2009-10-09 13:49:12 UTC (rev 5722) @@ -25,7 +25,6 @@ import org.jbpm.pvm.internal.jobexecutor.JobExecutor; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor; -import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor; import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor; import org.jbpm.pvm.internal.wire.descriptor.JobExecutorDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; Modified: jbpm4/branches/tbaeyens/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/pom.xml 2009-10-08 22:51:44 UTC (rev 5721) +++ jbpm4/branches/tbaeyens/pom.xml 2009-10-09 13:49:12 UTC (rev 5722) @@ -100,6 +100,11 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jboss</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> </dependency> @@ -499,6 +504,7 @@ <id>distro</id> <modules> <module>modules/enterprise</module> + <module>modules/jboss</module> <module>modules/db</module> <module>modules/distro</module> </modules>

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5721 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src: main/java/org/jbpm/jpdl/par and 18 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-10-08 18:51:44 -0400 (Thu, 08 Oct 2009) New Revision: 5721 Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jboss/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jboss/soa/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jboss/soa/esb/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jboss/soa/esb/services/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jboss/soa/esb/services/jbpm/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2574/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2574/JBPM2574Test.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/actual/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/actual/gpd.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/actual/processdefinition.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/gpd.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/processdefinition.xml Removed: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/file/def/FileDefinition.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/par/FileArchiveParser.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/IoUtil.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/file/def/FileDefinitionFileSystemConfigTest.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/processdefinition.xml Log: [JBPM-2574] throw ClassNotFoundException instead of JbpmException when process class loader attempts to load inexistent class Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/file/def/FileDefinition.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/file/def/FileDefinition.java 2009-10-08 11:31:17 UTC (rev 5720) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/file/def/FileDefinition.java 2009-10-08 22:51:44 UTC (rev 5721) @@ -22,7 +22,6 @@ package org.jbpm.file.def; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -48,7 +47,7 @@ public class FileDefinition extends ModuleDefinition { private static final long serialVersionUID = 1L; - + static String getRootDir() { String rootDir = null; if (JbpmConfiguration.Configs.hasObject("jbpm.files.dir")) { @@ -57,13 +56,9 @@ return rootDir; } - String dir = null; + String dir; + Map processFiles; - Map processFiles = null; - - public FileDefinition() { - } - public ModuleInstance createInstance() { return null; } @@ -74,30 +69,60 @@ * add a file to this definition. */ public void addFile(String name, byte[] bytes) { - ByteArrayInputStream bais = new ByteArrayInputStream(bytes); - addFile(name, bais); + try { + if (isStoredOnFileSystem()) { + storeFileInFileSystem(name, bytes); + } + else { + // it is stored in the database + storeFileInDb(name, bytes); + } + } + catch (IOException e) { + throw new JbpmException("file '" + name + "' could not be stored", e); + } } + void storeFileInFileSystem(String name, byte[] bytes) throws IOException { + File filePath = getFilePath(name); + log.trace("storing '" + name + "' to file '" + filePath + "'"); + + FileOutputStream fos = new FileOutputStream(filePath); + fos.write(bytes); + fos.close(); + } + + void storeFileInDb(String name, byte[] bytes) { + if (processFiles == null) { + processFiles = new HashMap(); + } + log.trace("preparing '" + name + "' for storage in the database"); + processFiles.put(name, new ByteArray(name, bytes)); + } + /** * add a file to this definition. */ public void addFile(String name, InputStream is) { try { if (isStoredOnFileSystem()) { - storeFileOnFileSystem(name, is); - - } else { // its stored in the database + storeFileInFileSystem(name, is); + } + else { + // it is stored in the database storeFileInDb(name, is); } - } catch (Exception e) { + } + catch (IOException e) { throw new JbpmException("file '" + name + "' could not be stored", e); } } - void storeFileOnFileSystem(String name, InputStream is) throws FileNotFoundException, IOException { - String fileName = getFilePath(name); - log.trace("storing file '" + name + "' on file system to '" + fileName + "'"); - FileOutputStream fos = new FileOutputStream(fileName); + void storeFileInFileSystem(String name, InputStream is) throws IOException { + File filePath = getFilePath(name); + log.trace("storing '" + name + "' to file '" + filePath + "'"); + + FileOutputStream fos = new FileOutputStream(filePath); IoUtil.transfer(is, fos); fos.close(); } @@ -106,45 +131,39 @@ if (processFiles == null) { processFiles = new HashMap(); } - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - log.trace("preparing file '" + name + "' for storage in the database"); - IoUtil.transfer(is, baos); - processFiles.put(name, new ByteArray(name, baos.toByteArray())); + log.trace("preparing '" + name + "' for storage in the database"); + processFiles.put(name, new ByteArray(name, IoUtil.readBytes(is))); } - // retrieving files ////////////////////////////////////////////////////////// - /** - * retrieve a file of this definition as an inputstream. + * retrieve a file of this definition as an input stream. */ public InputStream getInputStream(String name) { - InputStream inputStream = null; - try { - if (isStoredOnFileSystem()) { - inputStream = getInputStreamFromFileSystem(name); - } else { // its stored in the database - inputStream = getInputStreamFromDb(name); - } - } catch (Exception e) { - throw new JbpmException("couldn't get inputstream for file '" + name + "'", e); + InputStream inputStream; + if (isStoredOnFileSystem()) { + inputStream = getInputStreamFromFileSystem(name); } + else { + // it is stored in the database + inputStream = getInputStreamFromDb(name); + } return inputStream; } public boolean hasFile(String name) { if (isStoredOnFileSystem()) { - return new File(getFilePath(name)).exists(); - } else { - return processFiles == null ? false : processFiles.containsKey(name); + return getFilePath(name).exists(); } + else { + return processFiles != null ? processFiles.containsKey(name) : false; + } } public Map getInputStreamMap() { HashMap result = new HashMap(); if (processFiles != null) { - Iterator iterator = processFiles.keySet().iterator(); - while (iterator.hasNext()) { - String name = (String) iterator.next(); + for (Iterator iter = processFiles.keySet().iterator(); iter.hasNext();) { + String name = (String) iter.next(); result.put(name, getInputStream(name)); } } @@ -154,79 +173,84 @@ public Map getBytesMap() { HashMap result = new HashMap(); if (processFiles != null) { - Iterator iterator = processFiles.keySet().iterator(); - while (iterator.hasNext()) { - String name = (String) iterator.next(); + for (Iterator iter = processFiles.keySet().iterator(); iter.hasNext();) { + String name = (String) iter.next(); result.put(name, getBytes(name)); } } return result; } - private InputStream getInputStreamFromFileSystem(String name) throws FileNotFoundException { - InputStream inputStream = null; - String fileName = getFilePath(name); - log.trace("loading file '" + name + "' from file system '" + fileName + "'"); - inputStream = new FileInputStream(fileName); - return inputStream; + private InputStream getInputStreamFromFileSystem(String name) { + try { + File filePath = getFilePath(name); + if (log.isTraceEnabled()) + log.trace("loading '" + name + "' from file '" + filePath + "'"); + return filePath.canRead() ? new FileInputStream(filePath) : null; + } + catch (FileNotFoundException e) { + return null; + } } private InputStream getInputStreamFromDb(String name) { - InputStream inputStream = null; - log.trace("loading file '" + name + "' from database"); - ByteArray byteArray = getByteArray(name); - if (byteArray != null) { - inputStream = new ByteArrayInputStream(byteArray.getBytes()); - } - return inputStream; + if (log.isTraceEnabled()) log.trace("loading '" + name + "' from database"); + byte[] bytes = getBytesFromDb(name); + return bytes != null ? new ByteArrayInputStream(bytes) : null; } /** * retrieve a file of this definition as a byte array. */ public byte[] getBytes(String name) { - byte[] bytes = null; - try { - if (isStoredOnFileSystem()) { - bytes = getBytesFromFileSystem(name); - } else { // its stored in the database - bytes = getBytesFromDb(name); - } - } catch (Exception e) { - throw new JbpmException("couldn't get value for file '" + name + "'", e); + byte[] bytes; + if (isStoredOnFileSystem()) { + bytes = getBytesFromFileSystem(name); } + else { + // it is stored in the database + bytes = getBytesFromDb(name); + } return bytes; } - byte[] getBytesFromFileSystem(String name) throws IOException { - byte[] bytes = null; + byte[] getBytesFromFileSystem(String name) { InputStream in = getInputStreamFromFileSystem(name); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - IoUtil.transfer(in, out); - bytes = out.toByteArray(); - return bytes; + if (in == null) return null; + + try { + return IoUtil.readBytes(in); + } + catch (IOException e) { + return null; + } + finally { + try { + in.close(); + } + catch (IOException e) { + // disregard exception on close + } + } } byte[] getBytesFromDb(String name) { - byte[] bytes; - ByteArray byteArray = getByteArray(name); - bytes = byteArray.getBytes(); - return bytes; + if (processFiles != null) { + ByteArray byteArray = (ByteArray) processFiles.get(name); + if (byteArray != null) return byteArray.getBytes(); + } + return null; } - ByteArray getByteArray(String name) { - return (ByteArray) (processFiles != null ? processFiles.get(name) : null); - } - boolean isStoredOnFileSystem() { String rootDir = getRootDir(); boolean isStoredOnFileSystem = (rootDir != null); - // if files should be stored on the file system and no directory has been - // created yet... - if ((isStoredOnFileSystem) && (dir == null)) { + // if files should be stored on the file system + // and no directory has been created yet... + if (isStoredOnFileSystem && dir == null) { // create a new directory dir = findNewDirName(); - new File(rootDir + "/" + dir).mkdirs(); + new File(rootDir, dir).mkdirs(); } return isStoredOnFileSystem; } @@ -254,11 +278,15 @@ return newDirName; } - String getFilePath(String name) { - String filePath = getRootDir() + "/" + dir + "/" + name; - new File(filePath).getParentFile().mkdirs(); + File getFilePath(String name) { + File filePath = new File(getRootDir() + + File.separatorChar + + dir + + File.separatorChar + + name); + filePath.getParentFile().mkdirs(); return filePath; } - + private static final Log log = LogFactory.getLog(FileDefinition.class); } Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/par/FileArchiveParser.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/par/FileArchiveParser.java 2009-10-08 11:31:17 UTC (rev 5720) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/jpdl/par/FileArchiveParser.java 2009-10-08 22:51:44 UTC (rev 5721) @@ -21,27 +21,29 @@ */ package org.jbpm.jpdl.par; -import java.util.*; -import org.jbpm.file.def.*; -import org.jbpm.graph.def.*; +import java.util.Iterator; +import java.util.Map; +import org.jbpm.file.def.FileDefinition; +import org.jbpm.graph.def.ProcessDefinition; + public class FileArchiveParser implements ProcessArchiveParser { private static final long serialVersionUID = 1L; public ProcessDefinition readFromArchive(ProcessArchive processArchive, ProcessDefinition processDefinition) { - FileDefinition fileDefinition = (FileDefinition) processDefinition.getDefinition(FileDefinition.class); Map entries = processArchive.getEntries(); - Iterator iter = entries.keySet().iterator(); - while (iter.hasNext()) { - String entryName = (String) iter.next(); + if (!entries.isEmpty()) { + // get or create file definition + FileDefinition fileDefinition = processDefinition.getFileDefinition(); if (fileDefinition == null) { fileDefinition = new FileDefinition(); processDefinition.addDefinition(fileDefinition); } - byte[] entry = (byte[]) entries.get(entryName); - if(entry != null) { - fileDefinition.addFile(entryName, entry); + // add file entries to definition + for (Iterator iter = entries.entrySet().iterator(); iter.hasNext();) { + Map.Entry entry = (Map.Entry) iter.next(); + fileDefinition.addFile((String) entry.getKey(), (byte[]) entry.getValue()); } } return processDefinition; Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/IoUtil.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/IoUtil.java 2009-10-08 11:31:17 UTC (rev 5720) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/util/IoUtil.java 2009-10-08 22:51:44 UTC (rev 5721) @@ -26,40 +26,25 @@ import java.io.InputStream; import java.io.OutputStream; -public class IoUtil -{ +public class IoUtil { + private static final int BUFFERSIZE = 4096; // hide default constructor - private IoUtil() - { + private IoUtil() { } - public static byte[] readBytes(InputStream inputStream) throws IOException - { - if (inputStream == null) - throw new IllegalArgumentException("InputStream cannot be null"); - - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - transfer(inputStream, outputStream); - byte[] bytes = outputStream.toByteArray(); - outputStream.close(); - return bytes; + public static byte[] readBytes(InputStream in) throws IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + transfer(in, out); + return out.toByteArray(); } - public static int transfer(InputStream in, OutputStream out) throws IOException - { - if (in == null || out == null) - throw new IllegalArgumentException("In/OutStream cannot be null"); - + public static int transfer(InputStream in, OutputStream out) throws IOException { int total = 0; byte[] buffer = new byte[BUFFERSIZE]; - int bytesRead = in.read(buffer); - while (bytesRead != -1) - { + for (int bytesRead; (bytesRead = in.read(buffer)) != -1; total += bytesRead) { out.write(buffer, 0, bytesRead); - total += bytesRead; - bytesRead = in.read(buffer); } return total; } Copied: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java (from rev 5670, jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java) =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java 2009-10-08 22:51:44 UTC (rev 5721) @@ -0,0 +1,73 @@ +/* + * 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.jboss.soa.esb.services.jbpm.actionhandlers; + +import java.util.Iterator; +import java.util.Random; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.dom4j.Element; + +import org.jbpm.graph.def.ActionHandler; +import org.jbpm.graph.exe.ExecutionContext; + +/** + * @author Alejandro Guizar + */ +public class EsbActionHandler implements ActionHandler { + + private String esbCategoryName; + private String esbServiceName; + private Element bpmToEsbVars; + private Element esbToBpmVars; + private String exceptionTransition; + + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(EsbActionHandler.class); + + public void execute(ExecutionContext executionContext) { + log.debug("'invoking' " + esbCategoryName + "::" + esbServiceName); + try { + for (Iterator i = bpmToEsbVars.elementIterator(); i.hasNext();) { + Element bpmToEsbVar = (Element) i.next(); + String var = bpmToEsbVar.attributeValue("bpm"); + Object value = executionContext.getVariable(var); + log.debug("read " + value + " from variable " + var); + } + Random random = new Random(); + for (Iterator i = esbToBpmVars.elementIterator(); i.hasNext();) { + Element esbToBpmVar = (Element) i.next(); + String var = esbToBpmVar.attributeValue("bpm"); + byte[] value = new byte[random.nextInt(2048)]; + random.nextBytes(value); + executionContext.setVariable(var, value); + log.debug("wrote " + value.length + " bytes to variable " + var); + } + executionContext.leaveNode(); + } + catch (RuntimeException e) { + executionContext.leaveNode(exceptionTransition); + } + } + +} Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/file/def/FileDefinitionFileSystemConfigTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/file/def/FileDefinitionFileSystemConfigTest.java 2009-10-08 11:31:17 UTC (rev 5720) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/file/def/FileDefinitionFileSystemConfigTest.java 2009-10-08 22:51:44 UTC (rev 5721) @@ -26,24 +26,23 @@ import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; -public class FileDefinitionFileSystemConfigTest extends FileDefinitionDbConfigTest -{ +public class FileDefinitionFileSystemConfigTest extends FileDefinitionDbConfigTest { JbpmContext jbpmContext = null; - protected void setUp() throws Exception - { + protected void setUp() throws Exception { super.setUp(); ProtectionDomain clazz = FileDefinitionFileSystemConfigTest.class.getProtectionDomain(); - JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString( - "<jbpm-configuration>" + - " <jbpm-context name='default.jbpm.context' />" + - " <string name='jbpm.files.dir'>" + clazz.getCodeSource().getLocation().getFile().toString() + "</string>" + - "</jbpm-configuration>"); + JbpmConfiguration jbpmConfiguration = JbpmConfiguration + .parseXmlString("<jbpm-configuration>" + + " <jbpm-context name='default.jbpm.context' />" + + " <string name='jbpm.files.dir'>" + + clazz.getCodeSource().getLocation().getFile().toString() + + "</string>" + + "</jbpm-configuration>"); jbpmContext = jbpmConfiguration.createJbpmContext(); } - protected void tearDown() throws Exception - { + protected void tearDown() throws Exception { jbpmContext.close(); super.tearDown(); } Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java 2009-10-08 11:31:17 UTC (rev 5720) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java 2009-10-08 22:51:44 UTC (rev 5721) @@ -1,67 +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.jbpm2094; - -import java.util.Iterator; -import java.util.Random; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.dom4j.Element; - -import org.jbpm.graph.def.ActionHandler; -import org.jbpm.graph.exe.ExecutionContext; - -/** - * @author Alejandro Guizar - */ -public class EsbActionHandler implements ActionHandler { - - private String esbCategoryName; - private String esbServiceName; - private Element bpmToEsbVars; - private Element esbToBpmVars; - - private static final long serialVersionUID = 1L; - private static final Log log = LogFactory.getLog(EsbActionHandler.class); - - public void execute(ExecutionContext executionContext) throws Exception { - log.debug("simulating invocation of " + esbCategoryName + "::" + esbServiceName); - for (Iterator i = bpmToEsbVars.elementIterator(); i.hasNext();) { - Element bpmToEsbVar = (Element) i.next(); - String var = bpmToEsbVar.attributeValue("bpm"); - Object value = executionContext.getVariable(var); - log.debug("read " + value + " from variable " + var); - } - Random random = new Random(); - for (Iterator i = esbToBpmVars.elementIterator(); i.hasNext();) { - Element esbToBpmVar = (Element) i.next(); - String var = esbToBpmVar.attributeValue("bpm"); - byte[] value = new byte[random.nextInt(2048)]; - random.nextBytes(value); - executionContext.setVariable(var, value); - log.debug("wrote " + value.length + " bytes to variable " + var); - } - executionContext.leaveNode(); - } - -} Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2574/JBPM2574Test.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2574/JBPM2574Test.java (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2574/JBPM2574Test.java 2009-10-08 22:51:44 UTC (rev 5721) @@ -0,0 +1,45 @@ +package org.jbpm.jbpm2574; + +import org.jbpm.JbpmException; +import org.jbpm.db.AbstractDbTestCase; +import org.jbpm.file.def.FileDefinition; +import org.jbpm.graph.def.DelegationException; +import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.ProcessInstance; + +/** + * Attempt to load inexistent class throws {@link JbpmException} instead of + * {@link ClassNotFoundException} + * + * @see <a href="https://jira.jboss.org/jira/browse/JBPM-2574">JBPM-2574</a> + * @author Alejandro Guizar + */ +public class JBPM2574Test extends AbstractDbTestCase { + + private long processDefinitionId; + + protected void setUp() throws Exception { + super.setUp(); + + ProcessDefinition processDefinition = ProcessDefinition + .parseXmlResource("org/jbpm/jbpm2574/processdefinition.xml"); + processDefinition.addDefinition(new FileDefinition()); + jbpmContext.deployProcessDefinition(processDefinition); + processDefinitionId = processDefinition.getId(); + } + + protected void tearDown() throws Exception { + graphSession.deleteProcessDefinition(processDefinitionId); + super.tearDown(); + } + + public void testLoadInexistentClass() { + try { + ProcessInstance processInstance = jbpmContext.newProcessInstance("scripted"); + processInstance.signal(); + } + catch (DelegationException e) { + assert e.getCause() instanceof ClassNotFoundException : e.getCause(); + } + } +} Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java 2009-10-08 11:31:17 UTC (rev 5720) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java 2009-10-08 22:51:44 UTC (rev 5721) @@ -23,17 +23,15 @@ "</process-definition>" ); processDefinition = saveAndReload(processDefinition); - try - { + try { ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.signal(); - + jbpmContext.save(processInstance); - processJobs(5000); + processJobs(60 * 1000); } - finally - { + finally { jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); } } Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml 2009-10-08 11:31:17 UTC (rev 5720) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml 2009-10-08 22:51:44 UTC (rev 5721) @@ -7,7 +7,7 @@ </start-state> <node async="true" name="Receive Order"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_Service1</esbCategoryName> <esbServiceName>Service1</esbServiceName> <bpmToEsbVars> @@ -21,7 +21,7 @@ </node> <node name="Validate Order"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_Service2</esbCategoryName> <esbServiceName>Service2</esbServiceName> <bpmToEsbVars> @@ -41,7 +41,7 @@ </fork> <node async="true" name="Los Angeles WHSE"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_Service5</esbCategoryName> <esbServiceName>Service5</esbServiceName> <bpmToEsbVars> @@ -55,7 +55,7 @@ </node> <node name="Dallas WHSE"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_Service6</esbCategoryName> <esbServiceName>Service6</esbServiceName> <bpmToEsbVars> @@ -69,7 +69,7 @@ </node> <node async="true" name="Atlanta WHSE"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_Service7</esbCategoryName> <esbServiceName>Service7</esbServiceName> <bpmToEsbVars> @@ -87,7 +87,7 @@ </join> <node name="Shipment Notice"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_ResultsService </esbCategoryName> <esbServiceName>ResultsService</esbServiceName> @@ -106,7 +106,7 @@ <end-state name="End"/> <node async="true" name="Inventory Check"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_Service4</esbCategoryName> <esbServiceName>Service4</esbServiceName> <bpmToEsbVars> @@ -120,7 +120,7 @@ </node> <node name="Credit Check"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_Service3</esbCategoryName> <esbServiceName>Service3</esbServiceName> <bpmToEsbVars> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/processdefinition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/processdefinition.xml 2009-10-08 11:31:17 UTC (rev 5720) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/processdefinition.xml 2009-10-08 22:51:44 UTC (rev 5721) @@ -7,7 +7,7 @@ </start-state> <node async="true" name="Receive Order"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_Service1</esbCategoryName> <esbServiceName>Service1</esbServiceName> <bpmToEsbVars> @@ -21,7 +21,7 @@ </node> <node name="Validate Order"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_Service2</esbCategoryName> <esbServiceName>Service2</esbServiceName> <bpmToEsbVars> @@ -47,7 +47,7 @@ </state> <node name="Dallas WHSE"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_Service6</esbCategoryName> <esbServiceName>Service6</esbServiceName> <bpmToEsbVars> @@ -61,7 +61,7 @@ </node> <node async="true" name="Atlanta WHSE"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_Service7</esbCategoryName> <esbServiceName>Service7</esbServiceName> <bpmToEsbVars> @@ -79,7 +79,7 @@ </join> <node name="Shipment Notice"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_ResultsService </esbCategoryName> <esbServiceName>ResultsService</esbServiceName> @@ -98,7 +98,7 @@ <end-state name="End"/> <node async="true" name="Inventory Check"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_Service4</esbCategoryName> <esbServiceName>Service4</esbServiceName> <bpmToEsbVars> @@ -112,7 +112,7 @@ </node> <node name="Credit Check"> - <action class="org.jbpm.jbpm2094.EsbActionHandler"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> <esbCategoryName>BPM_Orchestration2_Service3</esbCategoryName> <esbServiceName>Service3</esbServiceName> <bpmToEsbVars> Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/actual/gpd.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/actual/gpd.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/actual/gpd.xml 2009-10-08 22:51:44 UTC (rev 5721) @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<root-container name="CMTE CNND Ingest Content" width="912" height="1048"> + <node name="Start Content Ingestion" x="242" y="48" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="Categorize Content" x="243" y="128" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + <bendpoint w1="-224" h1="0" w2="-1" h2="-353"/> + </edge> + </node> + <node name="ValidateContent" x="240" y="458" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="RejectContent" x="448" y="384" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="Diff Content" x="240" y="615" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + <bendpoint w1="-221" h1="-1" w2="0" h2="152"/> + </edge> + </node> + <node name="Store Content" x="239" y="763" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + <bendpoint w1="-220" h1="0" w2="0" h2="301"/> + </edge> + </node> + <node name="Content is valid?" x="241" y="535" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + <bendpoint w1="207" h1="0" w2="0" h2="151"/> + </edge> + </node> + <node name="Content is diff?" x="239" y="690" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="Content mapped to category?" x="212" y="211" width="196" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + <bendpoint w1="204" h1="-1" w2="0" h2="-174"/> + </edge> + </node> + <node name="Split Content" x="240" y="840" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + <bendpoint w1="-221" h1="-1" w2="0" h2="377"/> + </edge> + </node> + <node name="More items?" x="240" y="911" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="Diff Item" x="241" y="988" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + <bendpoint w1="-1" h1="31" w2="221" h2="561"/> + <bendpoint w1="-297" h1="31" w2="-75" h2="561"/> + <bendpoint w1="-297" h1="-150" w2="-75" h2="380"/> + <bendpoint w1="-222" h1="-149" w2="0" h2="381"/> + </edge> + </node> + <node name="Store Item" x="20" y="911" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="Has item changed?" x="19" y="988" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="Convert to XML" x="243" y="294" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + <bendpoint w1="-224" h1="0" w2="-1" h2="-187"/> + </edge> + </node> + <node name="Error converting ?" x="242" y="384" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="Generate RSS" x="454" y="911" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="End Content Ingestion" x="453" y="690" width="132" height="36"/> + <node name="Content Rejected" x="626" y="384" width="132" height="36"/> + <node name="ExceptionHandling" x="19" y="458" width="132" height="36"/> +</root-container> Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/actual/processdefinition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/actual/processdefinition.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/actual/processdefinition.xml 2009-10-08 22:51:44 UTC (rev 5721) @@ -0,0 +1,291 @@ +<?xml version="1.0"?> + +<process-definition xmlns="urn:jbpm.org:jpdl-3.2" name="CMTE CNND Ingest Content"> + <event type="process-start"> + <script> + System.out.println("==========> starting process: "+ node); + </script> + </event> + <event type="node-enter"> + <script> + System.out.println("==========> entering node: "+node); + </script> + </event> + + <start-state name="Start Content Ingestion"> + <transition to="Categorize Content" name="to Categorize Content"/> + </start-state> + + <node name="Categorize Content"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> + <esbCategoryName>CMTE CNND</esbCategoryName> + <esbServiceName>Categorize Content</esbServiceName> + <bpmToEsbVars> + <mapping bpm="content_file_name" esb="content_file_name"/> + </bpmToEsbVars> + <esbToBpmVars> + <mapping bpm="content_category_id" esb="content_category_id"/> + <mapping bpm="content_category" esb="content_category"/> + <mapping bpm="full_content_file_name" esb="content_file_name"/> + <mapping bpm="content_file_name" esb="content_file_name"/> + <mapping bpm="content_reject_reason" esb="content_reject_reason"/> + </esbToBpmVars> + <exceptionTransition>exception</exceptionTransition> + </action> + <event type="node-enter"> + <script> + System.out.println("entering node: "+node); + </script> + </event> + <transition to="Content mapped to category?" name=""/> + <transition name="exception" to="ExceptionHandling"/> + </node> + + <node name="ValidateContent"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> + <esbServiceName>Validate Content</esbServiceName> + <esbCategoryName>CMTE CNND</esbCategoryName> + <bpmToEsbVars> + <mapping bpm="content_file_name" esb="content_file_name"/> + <mapping bpm="content_category_id" esb="content_category_id"/> + <mapping bpm="content_category" esb="content_category"/> + </bpmToEsbVars> + <esbToBpmVars> + <mapping bpm="content_is_valid" esb="content_is_valid"/> + <mapping bpm="content_reject_reason" esb="content_reject_reason"/> + </esbToBpmVars> + <exceptionTransition>exception</exceptionTransition> + </action> + <transition to="Content is valid?"/> + <transition name="exception" to="ExceptionHandling"/> + </node> + + <node name="RejectContent"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> + <esbServiceName>Reject Content</esbServiceName> + <esbCategoryName>CMTE CNND</esbCategoryName> + <bpmToEsbVars> + <mapping bpm="content_file_name" esb="content_file_name"/> + <mapping bpm="content_reject_reason" esb="content_reject_reason"/> + </bpmToEsbVars> + </action> + <transition to="Content Rejected"/> + </node> + + <node name="Diff Content"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> + <esbCategoryName>CMTE CNND</esbCategoryName> + <esbServiceName>Diff Content</esbServiceName> + <bpmToEsbVars> + <mapping bpm="content_file_name" esb="content_file_name"/> + <mapping bpm="content_category_id" esb="content_category_id"/> + <mapping bpm="content_category" esb="content_category"/> + </bpmToEsbVars> + <esbToBpmVars> + <mapping bpm="content_hash_code" esb="content_hash_code"/> + <mapping bpm="content_is_diff" esb="content_is_diff"/> + </esbToBpmVars> + <exceptionTransition>exception</exceptionTransition> + </action> + <transition to="Content is diff?"/> + <transition to="ExceptionHandling" name="exception"/> + </node> + + <node name="Store Content"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> + <esbServiceName>Store Content</esbServiceName> + <esbCategoryName>CMTE CNND</esbCategoryName> + <bpmToEsbVars> + <mapping bpm="content_file_name" esb="content_file_name"/> + <mapping bpm="content_category_id" esb="content_category_id"/> + <mapping bpm="content_category" esb="content_category"/> + <mapping bpm="content_hash_code" esb="content_hash_code"/> + </bpmToEsbVars> + <exceptionTransition>exception</exceptionTransition> + </action> + <transition to="Split Content"/> + <transition to="ExceptionHandling" name="exception"/> + </node> + + <decision name="Content is valid?"> + <transition to="Diff Content" name="Yes"> + <condition expression="#{content_is_valid == true}"/> + </transition> + <transition to="RejectContent" name="No"> + <condition expression="#{content_is_valid != true}"/> + </transition> + </decision> + + <decision name="Content is diff?"> + <transition to="Store Content" name="Yes"> + <condition expression="#{content_is_diff == true}"/> + </transition> + <transition to="End Content Ingestion" name="No"> + <condition expression="#{content_is_diff == false}"/> + </transition> + </decision> + + <decision name="Content mapped to category?"> + <transition to="Convert to XML" name="Yes"> + <condition expression="#{content_category != void}"/> + </transition> + <transition to="RejectContent" name="No"> + <condition expression="#{content_category == void}"/> + </transition> + </decision> + + <node name="Split Content"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> + <bpmToEsbVars> + <mapping bpm="content_file_name" esb="content_file_name"/> + <mapping bpm="content_category" esb="content_category"/> + <mapping bpm="content_category_id" esb="content_category_id"/> + </bpmToEsbVars> + <esbCategoryName>CMTE CNND</esbCategoryName> + <esbServiceName>Split Content</esbServiceName> + <esbToBpmVars> + <mapping bpm="split_content_map" esb="split_content_map"/> + </esbToBpmVars> + <exceptionTransition>exception</exceptionTransition> + </action> + <event type="node-leave"> + <script name="Count number of items"> + <expression> + num_items = 0; + cur_item = 0; + if (split_content_map != null) + { + num_items = split_content_map.size(); + } + </expression> + <variable name='split_content_map' access='read' mapped-name='split_content_map'/> + <variable name='num_items' access='write' mapped-name='num_items'/> + <variable name='cur_item' access='write' mapped-name='cur_item'/> + </script> + </event> + <transition to="More items?"/> + <transition to="ExceptionHandling" name="exception"/> + </node> + + <decision name="More items?"> + <transition to="Generate RSS" name="No"> + <condition expression="#{cur_item == num_items}"/> + </transition> + <transition to="Diff Item" name="Yes"> + <condition expression="#{cur_item < num_items}"/> + </transition> + </decision> + + <node name="Diff Item"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> + <esbCategoryName>CMTE CNND</esbCategoryName> + <esbServiceName>Diff Content</esbServiceName> + <bpmToEsbVars> + <mapping bpm="content_file_name" esb="content_file_name"/> + <mapping bpm="content_category" esb="content_category"/> + <mapping bpm="content_category_id" esb="content_category_id"/> + <mapping bpm="content_feed_key" esb="content_feed_key"/> + </bpmToEsbVars> + <esbToBpmVars> + <mapping bpm="content_hash_code" esb="content_hash_code"/> + <mapping bpm="content_is_diff" esb="content_is_diff"/> + </esbToBpmVars> + <exceptionTransition>exception</exceptionTransition> + </action> + <event type="node-enter"> + <script name="Get item from list"> + <expression> + content_feed_key = split_content_map.keySet().toArray()[cur_item]; + content_file_name = split_content_map.get(content_feed_key); + </expression> + <variable name='content_feed_key' access='write' mapped-name='content_feed_key'/> + <variable name='content_file_name' access='write' mapped-name='content_file_name'/> + <variable name='split_content_map' access='read' mapped-name='split_content_map'/> + <variable name='cur_item' access='read' mapped-name='cur_item'/> + </script> + </event> + <event type="node-leave"> + <script name="Increment item counter"> + <expression>cur_item = cur_item + 1;</expression> + <variable name='cur_item' access='read' mapped-name='cur_item'/> + <variable name='cur_item' access='write' mapped-name='cur_item'/> + </script> + </event> + <transition to="Has item changed?"/> + <transition to="ExceptionHandling" name="exception"/> + </node> + + <node name="Store Item"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> + <esbServiceName>Store Content</esbServiceName> + <esbCategoryName>CMTE CNND</esbCategoryName> + <bpmToEsbVars> + <mapping bpm="content_file_name" esb="content_file_name"/> + <mapping bpm="content_category" esb="content_category"/> + <mapping bpm="content_category_id" esb="content_category_id"/> + <mapping bpm="content_hash_code" esb="content_hash_code"/> + <mapping bpm="content_feed_key" esb="content_feed_key"/> + </bpmToEsbVars> + <exceptionTransition>exception</exceptionTransition> + </action> + <transition to="More items?"/> + <transition to="ExceptionHandling" name="exception"/> + </node> + + <decision name="Has item changed?"> + <transition to="Store Item" name="Yes"> + <condition expression="#{content_is_diff == true}"/> + </transition> + <transition to="More items?" name="No"> + <condition expression="#{content_is_diff == false}"/> + </transition> + </decision> + + <node name="Convert to XML"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> + <esbServiceName>Convert Content</esbServiceName> + <esbCategoryName>CMTE CNND</esbCategoryName> + <bpmToEsbVars> + <mapping bpm="content_file_name" esb="content_file_name"/> + <mapping bpm="content_category_id" esb="content_category_id"/> + <mapping bpm="content_category" esb="content_category"/> + </bpmToEsbVars> + <esbToBpmVars> + <mapping bpm="content_file_name" esb="content_file_name"/> + <mapping bpm="content_reject_reason" esb="content_reject_reason"/> + </esbToBpmVars> + <exceptionTransition>exception</exceptionTransition> + </action> + <transition to="Error converting ?" name=""/> + <transition to="ExceptionHandling" name="exception"/> + </node> + + <decision name="Error converting ?"> + <transition to="ValidateContent"> + <condition expression="#{content_reject_reason == void}"/> + </transition> + <transition to="RejectContent" name="Yes"> + <condition expression="#{content_reject_reason != void}"/> + </transition> + </decision> + + <node name="Generate RSS"> + <transition to="End Content Ingestion"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbNotifier"> + <esbServiceName>Generate RSS</esbServiceName> + <esbCategoryName>CMTE CNND</esbCategoryName> + <bpmToEsbVars> + <mapping bpm="full_content_file_name" esb="full_content_file_name"/> + <mapping bpm="content_category_id" esb="content_category_id"/> + <mapping bpm="content_category" esb="content_category"/> + </bpmToEsbVars> + </action> + </transition> + </node> + + <end-state name="End Content Ingestion"/> + + <end-state name="Content Rejected"/> + + <end-state name="ExceptionHandling"/> +</process-definition> \ No newline at end of file Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/gpd.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/gpd.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/gpd.xml 2009-10-08 22:51:44 UTC (rev 5721) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<root-container name="scripted" width="930" height="529"> + <node name="start" x="134" y="48" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="esb" x="135" y="129" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="end" x="134" y="208" width="132" height="36"/> +</root-container> Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/processdefinition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/processdefinition.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2574/processdefinition.xml 2009-10-08 22:51:44 UTC (rev 5721) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process-definition xmlns="" name="scripted"> + + + <start-state name="start"> + <transition to="esb"></transition> + </start-state> + + + <node name="esb"> + <action class="org.jboss.soa.esb.services.jbpm.actionhandlers.EsbActionHandler"> + <esbServiceName> + paybills + </esbServiceName> + <esbCategoryName> + annoyances + </esbCategoryName> + </action> + <transition to="end"></transition> + </node> + + + <end-state name="end"></end-state> + + + <event type="node-enter"> + <action class="org.jbpm.no.such.Class"></action> + </event> + + +</process-definition> \ No newline at end of file

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5720 - jbpm4/branches.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-10-08 07:31:17 -0400 (Thu, 08 Oct 2009) New Revision: 5720 Added: jbpm4/branches/tbaeyens/ Log: creating personal tbaeyens branch Copied: jbpm4/branches/tbaeyens (from rev 5719, jbpm4/trunk)

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5719 - jbpm4/branches.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-10-08 07:29:51 -0400 (Thu, 08 Oct 2009) New Revision: 5719 Removed: jbpm4/branches/tbaeyens/ Log: deleting personal branch

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5718 - in jbpm4/trunk/modules: enterprise/src/test/resources/classloading/META-INF and 55 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-10-08 07:15:04 -0400 (Thu, 08 Oct 2009) New Revision: 5718 Added: jbpm4/trunk/modules/enterprise/src/test/resources/classloading/META-INF/process.png jbpm4/trunk/modules/enterprise/src/test/resources/deployer/META-INF/process.png jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load/executions/process.png Removed: jbpm4/trunk/modules/migration/src/main/xsd/ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/java/ Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml jbpm4/trunk/modules/enterprise/src/test/resources/classloading/META-INF/process.jpdl.xml jbpm4/trunk/modules/enterprise/src/test/resources/deployer/META-INF/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/activity/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/fork/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/custom/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/decision/conditions/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/decision/expression/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/decision/handler/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/eventlistener/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/inline/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/template/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/services/Order.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/sequence/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessDocument.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessReview.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessDocument.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessReview.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/variables/SubProcessDocument.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/variables/SubProcessReview.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/assignee/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/assignmenthandler/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/comments/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/notification/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/reminder/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/variables/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/businesstime/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/event/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/repeat/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.jpdl.xml jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/extended.jpdl.xml jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/invalid.jpdl.xml jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/process.jpdl.xml jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/valid.jpdl.xml jbpm4/trunk/modules/migration/pom.xml jbpm4/trunk/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3Converter.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/ForkTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/HqlEventListenerTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/TaskTimerTaskTest.java jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/async/eventlistener/process.jpdl.xml jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/concurrency/process.jpdl.xml jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/multipleentries/process.jpdl.xml jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/simple/process.jpdl.xml jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/timer/process.jpdl.xml jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/deploy/ImageTest.jpdl.xml jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/process/process.jpdl.xml jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load/executions/process.jpdl.xml jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml Log: JBPM-2565 namespace updates Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -122,7 +122,7 @@ <title>The timer transition example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.timer.transition.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="TimerTransition" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="TimerTransition" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="guardedWait" /> @@ -180,7 +180,7 @@ <title>The timer event example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.timer.event.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="TimerEvent" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="TimerEvent" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="guardedWait" /> @@ -215,7 +215,7 @@ <title>The timer businesstime example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.timer.transition.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="TimerBusinessTime" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="TimerBusinessTime" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="guardedWait" /> @@ -252,7 +252,7 @@ <title>The timer repeat example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.timer.event.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="TimerRepeat" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="TimerRepeat" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="guardedWait" /> @@ -325,7 +325,7 @@ <title>The simple group example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.group.simple.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="GroupSimple" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="GroupSimple" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="evaluate document" /> @@ -386,7 +386,7 @@ <title>The group timer example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.group.timer.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="GroupTimer" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="GroupTimer" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="evaluate document" /> @@ -447,7 +447,7 @@ <title>The group multiple entries example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.group.multipleentries.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="GroupMultipleEntries" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="GroupMultipleEntries" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="choose strategy" /> @@ -506,7 +506,7 @@ </figure> <programlisting> -<process name="GroupConcurrency" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="GroupConcurrency" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="evaluate project" /> Modified: jbpm4/trunk/modules/enterprise/src/test/resources/classloading/META-INF/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/resources/classloading/META-INF/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/enterprise/src/test/resources/classloading/META-INF/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="Classloading" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="Classloading"> <start name="start1" g="105,71,48,48"> <transition name="to invoke class" to="invoke class" g="-84,-18"/> </start> Added: jbpm4/trunk/modules/enterprise/src/test/resources/classloading/META-INF/process.png =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/enterprise/src/test/resources/classloading/META-INF/process.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: jbpm4/trunk/modules/enterprise/src/test/resources/deployer/META-INF/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/resources/deployer/META-INF/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/enterprise/src/test/resources/deployer/META-INF/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="JBPM-Deployer-Test" - xmlns="http://jbpm.org/4.0/jpdl" - version="5" key="JBPM-Deployer-Test_V5"> +<process name="JBPM-Deployer-Test" version="5" key="JBPM-Deployer-Test_V5"> <start g="64,202,48,48" name="start1"> <transition g="-52,-18" name="to state1" to="state1"/> </start> Added: jbpm4/trunk/modules/enterprise/src/test/resources/deployer/META-INF/process.png =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/enterprise/src/test/resources/deployer/META-INF/process.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/activity/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/activity/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/activity/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="AsyncActivity" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="AsyncActivity" xmlns="http://jbpm.org/4.2/jpdl"> <start g="14,28,80,40"> <transition to="generate pdf"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/fork/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/fork/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/fork/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="AsyncFork" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="AsyncFork" xmlns="http://jbpm.org/4.2/jpdl"> <start g="22,69,80,40"> <transition to="fork"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="ConcurrencyGraphBased" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="ConcurrencyGraphBased" xmlns="http://jbpm.org/4.2/jpdl"> <start g="16,102,48,48"> <transition to="fork"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/custom/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/custom/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/custom/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="Custom" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="Custom" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,20,48,48"> <transition to="print dots" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/decision/conditions/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/decision/conditions/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/decision/conditions/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="DecisionConditions" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="DecisionConditions" xmlns="http://jbpm.org/4.2/jpdl"> <start g="16,102,48,48"> <transition to="evaluate document" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/decision/expression/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/decision/expression/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/decision/expression/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="DecisionExpression" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="DecisionExpression" xmlns="http://jbpm.org/4.2/jpdl"> <start g="16,102,48,48"> <transition to="evaluate document"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/decision/handler/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/decision/handler/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/decision/handler/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="DecisionHandler" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="DecisionHandler" xmlns="http://jbpm.org/4.2/jpdl"> <start g="16,102,48,48"> <transition to="evaluate document" name=""/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="EndMultiple" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="EndMultiple" xmlns="http://jbpm.org/4.2/jpdl"> <start g="16,96,48,48"> <transition to="get return code" name=""/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="EndProcessInstance" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="EndProcessInstance" xmlns="http://jbpm.org/4.2/jpdl"> <start g="85,73,80,40"> <transition to="end" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="EndState" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="EndState" xmlns="http://jbpm.org/4.2/jpdl"> <start g="16,96,48,48"> <transition to="get return code"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/eventlistener/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/eventlistener/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/eventlistener/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="EventListener" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="EventListener" xmlns="http://jbpm.org/4.2/jpdl"> <on event="start"> <event-listener class="org.jbpm.examples.eventlistener.LogListener"> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="Hql" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="Hql" xmlns="http://jbpm.org/4.2/jpdl"> <start g="17,20,48,48"> <transition to="get task names" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="Java" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="Java" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,20,48,48"> <transition to="greet" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/inline/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/inline/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/inline/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="InlineMail" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="InlineMail" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,25,80,40"> <transition to="send rectify note" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/template/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/template/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/mail/template/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TemplateMail" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="TemplateMail" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,25,80,40"> <transition to="send rectify note"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="ScriptExpression" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="ScriptExpression" xmlns="http://jbpm.org/4.2/jpdl"> <start g="17,19,48,48"> <transition to="invoke script" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="ScriptText" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="ScriptText" xmlns="http://jbpm.org/4.2/jpdl"> <start g="16,22,80,40"> <transition to="invoke script" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/services/Order.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/services/Order.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/services/Order.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="Order" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="Order" xmlns="http://jbpm.org/4.2/jpdl"> <start g="16,19,48,48"> <transition to="receive confirmation" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="Sql" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="Sql" xmlns="http://jbpm.org/4.2/jpdl"> <start g="16,20,48,48"> <transition to="get task names" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="StateChoice" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="StateChoice" xmlns="http://jbpm.org/4.2/jpdl"> <start g="16,60,48,48"> <transition to="wait for response"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/sequence/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/sequence/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/sequence/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="StateSequence" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="StateSequence" xmlns="http://jbpm.org/4.2/jpdl"> <start g="16,18,48,48"> <transition to="a" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessDocument.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessDocument.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessDocument.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="SubProcessDocument" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="SubProcessDocument" xmlns="http://jbpm.org/4.2/jpdl"> <start g="43,109,48,48"> <transition to="review" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessReview.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessReview.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomeactivity/SubProcessReview.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="SubProcessReview" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="SubProcessReview" xmlns="http://jbpm.org/4.2/jpdl"> <start g="25,101,48,48"> <transition to="get approval"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessDocument.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessDocument.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessDocument.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="SubProcessDocument" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="SubProcessDocument" xmlns="http://jbpm.org/4.2/jpdl"> <start g="36,109,48,48"> <transition to="review" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessReview.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessReview.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/outcomevalue/SubProcessReview.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="SubProcessReview" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="SubProcessReview" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,20,48,48"> <transition to="get approval"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/variables/SubProcessDocument.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/variables/SubProcessDocument.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/variables/SubProcessDocument.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="SubProcessDocument" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="SubProcessDocument" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,20,48,48"> <transition to="review" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/variables/SubProcessReview.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/variables/SubProcessReview.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/subprocess/variables/SubProcessReview.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="SubProcessReview" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="SubProcessReview" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,20,48,48"> <transition to="get approval"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/assignee/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/assignee/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/assignee/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TaskAssignee" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="TaskAssignee" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,20,48,48"> <transition to="review" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/assignmenthandler/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/assignmenthandler/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/assignmenthandler/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TaskAssignmentHandler" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="TaskAssignmentHandler" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,20,48,48"> <transition to="review" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TaskCandidates" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="TaskCandidates" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,20,48,48"> <transition to="review" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/comments/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/comments/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/comments/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TaskComments" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="TaskComments" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,20,48,48"> <transition to="review" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/notification/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/notification/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/notification/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TaskNotification" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="TaskNotification" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,20,48,48"> <transition to="review"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/reminder/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/reminder/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/reminder/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TaskReminder" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="TaskReminder" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,20,48,48"> <transition to="review"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TaskSwimlane" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="TaskSwimlane" xmlns="http://jbpm.org/4.2/jpdl"> <swimlane name="sales representative" candidate-groups="sales-dept" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/variables/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/variables/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/variables/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TaskVariables" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="TaskVariables" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,20,48,48"> <transition to="review" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/taskform/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="VacationRequest" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="VacationRequest" xmlns="http://jbpm.org/4.2/jpdl"> <start form="org/jbpm/examples/taskform/request_vacation.ftl" g="16,56,48,48" name="start"> <transition to="verify_request"/> </start> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/businesstime/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/businesstime/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/businesstime/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TimerBusinessTime" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="TimerBusinessTime" xmlns="http://jbpm.org/4.2/jpdl"> <start g="19,50,48,48"> <transition to="guardedWait" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/event/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/event/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/event/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TimerEvent" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="TimerEvent" xmlns="http://jbpm.org/4.2/jpdl"> <start g="19,50,48,48"> <transition to="guardedWait" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/repeat/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/repeat/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/repeat/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TimerRepeat" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="TimerRepeat" xmlns="http://jbpm.org/4.2/jpdl"> <start g="19,50,48,48"> <transition to="guardedWait" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/timer/transition/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TimerTransition" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="TimerTransition" xmlns="http://jbpm.org/4.2/jpdl"> <start g="19,50,48,48"> <transition to="guardedWait" /> Modified: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/extended.jpdl.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/extended.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/extended.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="Purchase order" xmlns="http://jbpm.org/4.0/jpdl" +<process name="Purchase order" xmlns="http://jbpm.org/4.2/jpdl" xmlns:ext="http://jbpm.org/customextensions"> <start> Modified: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/invalid.jpdl.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/invalid.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/invalid.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="Purchase order" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="Purchase order" xmlns="http://jbpm.org/4.2/jpdl"> <start /> Modified: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="StateSequence" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="StateSequence" xmlns="http://jbpm.org/4.2/jpdl"> <start g="16,18,48,48"> <transition to="a" /> Modified: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/valid.jpdl.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/valid.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/valid.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="Purchase order" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="Purchase order" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="a" /> Modified: jbpm4/trunk/modules/migration/pom.xml =================================================================== --- jbpm4/trunk/modules/migration/pom.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/migration/pom.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -31,6 +31,12 @@  <dependencies> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <version>${version}</version> + </dependency> + <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> @@ -52,21 +58,7 @@ <artifactId>commons-logging</artifactId> <version>1.1.1</version> </dependency> - -  <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-pvm</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jpdl</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.4</version> Modified: jbpm4/trunk/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3Converter.java =================================================================== --- jbpm4/trunk/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3Converter.java 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3Converter.java 2009-10-08 11:15:04 UTC (rev 5718) @@ -49,6 +49,7 @@ import org.jbpm.jpdl.internal.convert.node.VariableAccess; import org.jbpm.jpdl.internal.convert.problem.Problem; import org.jbpm.jpdl.internal.convert.problem.ProblemListener; +import org.jbpm.jpdl.internal.xml.JpdlParser; import org.xml.sax.InputSource; /** @@ -66,8 +67,6 @@ private static final long serialVersionUID = 1L; - private static String JPDL4NS = "http://jbpm.org/4.0/jpdl"; - protected InputSource inputSource; protected Document jpdl3Document; @@ -233,7 +232,7 @@ protected Element parseProcessDefinitionAttributes(Element root) { - Element element = jpdl4Document.addElement("process", JPDL4NS); + Element element = jpdl4Document.addElement("process", JpdlParser.CURRENT_VERSION_NAMESPACE); element.addAttribute("name", root.attributeValue("name")); return element; } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/ForkTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/ForkTest.java 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/ForkTest.java 2009-10-08 11:15:04 UTC (rev 5718) @@ -37,7 +37,7 @@ // Test for JBPM-2297 public void testBasicForkUsage() { deployJpdlXmlString( - "<process name='sboxCreation' xmlns='http://jbpm.org/4.0/jpdl'>" + + "<process name='sboxCreation'>" + "<start name='start'> " + " <transition to='fork (review)'/> " + "</start> " + @@ -73,7 +73,7 @@ private static final String UNSTRUCTURED_CONCURRENT_PROCESS = - "<process name='unstructuredConcurrency' xmlns='http://jbpm.org/4.0/jpdl'>" + + "<process name='unstructuredConcurrency'>" + "<start name='start'> " + " <transition to='theFork'/> " + "</start> " + Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/HqlEventListenerTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/HqlEventListenerTest.java 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/HqlEventListenerTest.java 2009-10-08 11:15:04 UTC (rev 5718) @@ -45,7 +45,7 @@ public void testHql() { deployJpdlXmlString( - "<process name='HqlEventListener' xmlns='http://jbpm.org/4.0/jpdl'>" + + "<process name='HqlEventListener'>" + " <start >" + " <transition to='wait' />" + " </start>" + Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/TaskTimerTaskTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/TaskTimerTaskTest.java 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/timer/TaskTimerTaskTest.java 2009-10-08 11:15:04 UTC (rev 5718) @@ -40,7 +40,7 @@ // Test case for JBPM-2537 public void testTaskClosedWhenTimerFires() { deployJpdlXmlString( - "<process name='test1' xmlns='http://jbpm.org/4.0/jpdl'>" + + "<process name='test1'>" + " <start g='-9,192,48,48' name='start1'>" + " <transition g='-44,-18' name='to task3' to='task3' />" + " </start>" + Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/async/eventlistener/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/async/eventlistener/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/async/eventlistener/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="AsyncEventListener" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="AsyncEventListener"> <start name="start" g="27,27,80,40"> <transition to="wait"> Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/concurrency/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/concurrency/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/concurrency/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="GroupConcurrency" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="GroupConcurrency"> <start> <transition to="evaluate project" /> Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/multipleentries/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/multipleentries/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/multipleentries/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="GroupMultipleEntries" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="GroupMultipleEntries"> <start> <transition to="choose strategy" /> Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/simple/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/simple/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/simple/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="GroupSimple" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="GroupSimple"> <start> <transition to="evaluate document" /> Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/timer/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/timer/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/group/timer/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="GroupTimer" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="GroupTimer"> <start> <transition to="evaluate document" /> Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/deploy/ImageTest.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/deploy/ImageTest.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/deploy/ImageTest.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="ImageTest" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="ImageTest"> <start g="20,20,48,48"> <transition to="wait"/> Modified: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/process/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/process/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/process/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="Resource" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="Resource"> <start> <transition to="get return code" /> Modified: jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load/executions/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load/executions/process.jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load/executions/process.jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="Process" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="Process"> <start> <transition to="a" /> Added: jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load/executions/process.png =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/test-load/src/test/resources/org/jbpm/test/load/executions/process.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml 2009-10-08 06:03:55 UTC (rev 5717) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml 2009-10-08 11:15:04 UTC (rev 5718) @@ -13,7 +13,7 @@ </para> <programlisting><?xml version="1.0" encoding="UTF-8"?> -<process name="Purchase order" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="Purchase order" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="Verify supplier" /> @@ -188,7 +188,7 @@ <title>A sequence of states</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.state.sequence.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="StateSequence" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="StateSequence" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="a" /> @@ -232,7 +232,7 @@ <title>A choice between state</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.state.choice.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="StateChoice" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="StateChoice" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="wait for response" /> @@ -403,7 +403,7 @@ <title>The decision expression example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.decision.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="DecisionExpression" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="DecisionExpression" xmlns="http://jbpm.org/4.2/jpdl"> <start > <transition to="evaluate document"/> @@ -538,7 +538,7 @@ <mediaobject><imageobject><imagedata align="center" fileref="images/process.concurrency.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="ConcurrencyGraphBased" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="ConcurrencyGraphBased" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="fork"/> @@ -596,7 +596,7 @@ <title>The end event</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.end.processinstance.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="EndProcessInstance" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="EndProcessInstance" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="end" /> @@ -713,7 +713,7 @@ <title>Different end states</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.end.state.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="EndState" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="EndState" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="get return code"/> @@ -962,7 +962,7 @@ <title>The task assignment handler example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.task.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="TaskAssignmentHandler" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="TaskAssignmentHandler" xmlns="http://jbpm.org/4.2/jpdl"> <start g="20,20,48,48"> <transition to="review" /> @@ -1098,7 +1098,7 @@ <mediaobject><imageobject><imagedata align="center" fileref="images/process.task.png"/></imageobject></mediaobject> </figure> <para>The task swimlane example has the following process file :</para> - <programlisting><process name="TaskSwimlane" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="TaskSwimlane" xmlns="http://jbpm.org/4.2/jpdl"> <emphasis role="bold"><swimlane name="sales representative" candidate-groups="sales-dept" /></emphasis> @@ -1503,7 +1503,7 @@ <title>The subprocess document example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.task.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="SubProcessDocument" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="SubProcessDocument" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="review" /> @@ -1526,7 +1526,7 @@ <title>The subprocess review example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.subprocess.review.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="SubProcessReview" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="SubProcessReview" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="get approval"/> @@ -1614,7 +1614,7 @@ <title>The subprocess review example process for outcome value</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.subprocess.review.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="SubProcessReview" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="SubProcessReview" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="get approval"/> @@ -1685,7 +1685,7 @@ <title>The subprocess review example process for outcome activity</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.subprocess.outcomeactivity.review.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="SubProcessReview" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="SubProcessReview" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="get approval"/> @@ -1738,7 +1738,7 @@ the example: </para> - <programlisting><process name="Custom" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="Custom" xmlns="http://jbpm.org/4.2/jpdl"> <start > <transition to="print dots" /> @@ -1875,7 +1875,7 @@ <title>A java task</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.java.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="Java" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="Java" xmlns="http://jbpm.org/4.2/jpdl"> <start > <transition to="greet" /> @@ -2036,7 +2036,7 @@ <title>The script.expression example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.script.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="ScriptExpression" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="ScriptExpression" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="invoke script" /> @@ -2141,7 +2141,7 @@ <title>The script.text example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.script.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="ScriptText" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="ScriptText" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="invoke script" /> @@ -2231,7 +2231,7 @@ <title>The hql example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.hql.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="Hql" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="Hql" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="get process names" /> @@ -2366,7 +2366,7 @@ <para> Example usage: <programlisting> -<process name="InlineMail" xmlns="http://jbpm.org/4.0/jpdl"> +<process name="InlineMail" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="send birthday reminder note" /> </start> @@ -2566,7 +2566,7 @@ <title>The event listener example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.eventlistener.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="EventListener" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="EventListener" xmlns="http://jbpm.org/4.2/jpdl"> <on event="start"> <event-listener class="org.jbpm.examples.eventlistener.LogListener"> @@ -2729,7 +2729,7 @@ <title>The async activity example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.async.activity.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="AsyncActivity" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="AsyncActivity" xmlns="http://jbpm.org/4.2/jpdl"> <start> <transition to="generate pdf"/> @@ -2798,7 +2798,7 @@ <title>The async fork example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.async.fork.png"/></imageobject></mediaobject> </figure> - <programlisting><process name="AsyncFork" xmlns="http://jbpm.org/4.0/jpdl"> + <programlisting><process name="AsyncFork" xmlns="http://jbpm.org/4.2/jpdl"> <start > <transition to="fork"/>

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5717 - in jbpm3/branches/jbpm-3.2-soa/modules: core/src/test/java/org/jbpm/context/exe and 2 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-10-08 02:03:55 -0400 (Thu, 08 Oct 2009) New Revision: 5717 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JbpmSchema.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableLongIdDbTest.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableStringIdDbTest.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java Log: [JBPM-2563] workaround for HHH-4457 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JbpmSchema.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JbpmSchema.java 2009-10-07 22:49:40 UTC (rev 5716) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JbpmSchema.java 2009-10-08 06:03:55 UTC (rev 5717) @@ -49,7 +49,10 @@ import org.hibernate.connection.ConnectionProvider; import org.hibernate.connection.ConnectionProviderFactory; import org.hibernate.dialect.Dialect; +import org.hibernate.engine.Mapping; +import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; +import org.hibernate.tool.hbm2ddl.ColumnMetadata; import org.hibernate.tool.hbm2ddl.DatabaseMetadata; import org.hibernate.tool.hbm2ddl.TableMetadata; import org.hibernate.util.JDBCExceptionReporter; @@ -122,8 +125,8 @@ Connection connection = null; try { connection = createConnection(); - return configuration.generateSchemaUpdateScript(getDialect(), - getDatabaseMetadata(connection)); + return configuration + .generateSchemaUpdateScript(getDialect(), getDatabaseMetadata(connection)); } catch (SQLException e) { exceptions.add(e); @@ -307,8 +310,8 @@ DatabaseMetaData metaData = connection.getMetaData(); boolean storesLowerCaseIdentifiers = metaData.storesLowerCaseIdentifiers(); - ResultSet resultSet = metaData.getTables(getDefaultCatalog(), getDefaultSchema(), null, - TABLE_TYPES); + ResultSet resultSet = metaData + .getTables(getDefaultCatalog(), getDefaultSchema(), null, TABLE_TYPES); try { while (resultSet.next()) { String tableName = resultSet.getString("TABLE_NAME"); @@ -339,8 +342,8 @@ connection = createConnection(); DatabaseMetaData metaData = connection.getMetaData(); - ResultSet resultSet = metaData.getTables(getDefaultCatalog(), getDefaultSchema(), - tableName, TABLE_TYPES); + ResultSet resultSet = metaData + .getTables(getDefaultCatalog(), getDefaultSchema(), tableName, TABLE_TYPES); try { return resultSet.next(); } @@ -360,20 +363,24 @@ } public void updateTable(String tableName) { + Table table = findTableMapping(tableName); + Connection connection = null; try { connection = createConnection(); + TableMetadata tableInfo = getTableMetadata(connection, table); - Table table = findTableMapping(tableName); - Iterator script = table.sqlAlterStrings(getDialect(), configuration.buildMapping(), - getTableMetadata(connection, table), getDefaultCatalog(), getDefaultSchema()); - Statement statement = connection.createStatement(); try { - while (script.hasNext()) { - String sql = (String) script.next(); - execute(sql, statement); + if (tableInfo != null) { + for (Iterator script = sqlAlterStrings(table, tableInfo); script.hasNext();) { + String sql = (String) script.next(); + execute(sql, statement); + } } + else { + execute(sqlCreateString(table), statement); + } } finally { statement.close(); @@ -396,23 +403,92 @@ throw new JbpmException("no mapping found for table: " + tableName); } + private TableMetadata getTableMetadata(Connection connection, Table table) + throws SQLException { + String tableSchema = table.getSchema(); + if (tableSchema == null) tableSchema = getDefaultSchema(); + + String tableCatalog = table.getCatalog(); + if (tableCatalog == null) tableCatalog = getDefaultCatalog(); + + return getDatabaseMetadata(connection) + .getTableMetadata(table.getName(), tableSchema, tableCatalog, table.isQuoted()); + } + private DatabaseMetadata getDatabaseMetadata(Connection connection) throws SQLException { return new DatabaseMetadata(connection, getDialect()); } - private TableMetadata getTableMetadata(Connection connection, Table table) - throws SQLException { - String tableSchema = table.getSchema(); - String tableCatalog = table.getCatalog(); - return getDatabaseMetadata(connection).getTableMetadata(table.getName(), - tableSchema != null ? tableSchema : getDefaultSchema(), - tableCatalog != null ? tableCatalog : getDefaultCatalog(), table.isQuoted()); + /** + * Workaround for bug in {@link Table#sqlAlterStrings}. + * + * @param table TODO + * @param tableMetadata TODO + * @see <a + * href="http://opensource.atlassian.com/projects/hibernate/browse/HHH-4457">HHH-4457</a> + */ + private Iterator sqlAlterStrings(Table table, TableMetadata tableMetadata) + throws SQLException { + Dialect dialect = getDialect(); + Mapping mapping = configuration.buildMapping(); + + StringBuffer root = new StringBuffer("alter table ") + .append(table.getQualifiedName(dialect, getDefaultCatalog(), getDefaultSchema())) + .append(' ') + .append(dialect.getAddColumnString()); + int rootLength = root.length(); + + List results = new ArrayList(); + for (Iterator iter = table.getColumnIterator(); iter.hasNext();) { + Column column = (Column) iter.next(); + + ColumnMetadata columnInfo = tableMetadata.getColumnMetadata(column.getName()); + if (columnInfo == null) { + // the column doesn't exist at all + root.setLength(rootLength); + StringBuffer alter = root + .append(' ') + .append(column.getQuotedName(dialect)) + .append(' ') + .append(column.getSqlType(dialect, mapping)); + + String defaultValue = column.getDefaultValue(); + if (defaultValue != null) { + alter.append(" default ").append(defaultValue); + } + + if (column.isNullable()) { + alter.append(dialect.getNullColumnString()); + } + else { + alter.append(" not null"); + } + + boolean useUniqueConstraint = column.isUnique() + && dialect.supportsUnique() + && (!column.isNullable() || dialect.supportsNotNullUnique()); + if (useUniqueConstraint) { + alter.append(" unique"); + } + + if (column.hasCheckConstraint() && dialect.supportsColumnCheck()) { + alter.append(" check(").append(column.getCheckConstraint()).append(")"); + } + + String columnComment = column.getComment(); + if (columnComment != null) { + alter.append(dialect.getColumnComment(columnComment)); + } + + results.add(alter.toString()); + } + } + return results.iterator(); } public void createTable(String tableName) { Table table = findTableMapping(tableName); - String sql = table.sqlCreateString(getDialect(), configuration.buildMapping(), - getDefaultCatalog(), getDefaultSchema()); + String sql = sqlCreateString(table); try { execute(new String[] { sql }); } @@ -422,6 +498,11 @@ } } + private String sqlCreateString(Table table) { + return table + .sqlCreateString(getDialect(), configuration.buildMapping(), getDefaultCatalog(), getDefaultSchema()); + } + public static void main(String[] args) { if (args.length > 0) { String action = args[0]; @@ -454,7 +535,8 @@ System.err.println("JbpmSchema drop [<hibernate.cfg.xml> [<hibernate.properties>]]"); System.err.println("JbpmSchema clean [<hibernate.cfg.xml> [<hibernate.properties>]]"); System.err.println("JbpmSchema update [<hibernate.cfg.xml> [<hibernate.properties>]]"); - System.err.println("JbpmSchema scripts <dir> <prefix> [<hibernate.cfg.xml> [<hibernate.properties>]]"); + System.err + .println("JbpmSchema scripts <dir> <prefix> [<hibernate.cfg.xml> [<hibernate.properties>]]"); System.exit(1); } @@ -491,7 +573,8 @@ private Connection createConnection() throws SQLException { try { - connectionProvider = ConnectionProviderFactory.newConnectionProvider(configuration.getProperties()); + connectionProvider = ConnectionProviderFactory.newConnectionProvider(configuration + .getProperties()); } catch (HibernateException e) { throw new SQLException(e.getMessage()); Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableLongIdDbTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableLongIdDbTest.java 2009-10-07 22:49:40 UTC (rev 5716) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableLongIdDbTest.java 2009-10-08 06:03:55 UTC (rev 5717) @@ -47,7 +47,7 @@ configuration.addClass(CustomLongClass.class); JbpmSchema jbpmSchema = new JbpmSchema(configuration); - jbpmSchema.updateSchema(); + jbpmSchema.createTable("JBPM_TEST_CUSTOMLONGID"); } finally { jbpmContext.close(); Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableStringIdDbTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableStringIdDbTest.java 2009-10-07 22:49:40 UTC (rev 5716) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableStringIdDbTest.java 2009-10-08 06:03:55 UTC (rev 5717) @@ -47,7 +47,7 @@ configuration.addClass(CustomStringClass.class); JbpmSchema jbpmSchema = new JbpmSchema(configuration); - jbpmSchema.updateSchema(); + jbpmSchema.createTable("JBPM_TEST_CUSTOMSTRINGID"); } finally { jbpmContext.close(); Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java 2009-10-07 22:49:40 UTC (rev 5716) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java 2009-10-08 06:03:55 UTC (rev 5717) @@ -78,7 +78,7 @@ .getServiceFactory(Services.SERVICENAME_PERSISTENCE); JbpmSchema jbpmSchema = new JbpmSchema(persistenceServiceFactory.getConfiguration()); - jbpmSchema.updateSchema(); + jbpmSchema.updateTable("JBPM_NODE"); } finally { jbpmContext.close(); Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java 2009-10-07 22:49:40 UTC (rev 5716) +++ jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java 2009-10-08 06:03:55 UTC (rev 5717) @@ -66,7 +66,7 @@ configuration.addResource("taskinstance/CustomTaskInstance.hbm.xml"); JbpmSchema jbpmSchema = new JbpmSchema(configuration); - jbpmSchema.updateSchema(); + jbpmSchema.updateTable("JBPM_TASKINSTANCE"); } return jbpmConfiguration; }

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5716 - in jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal: history/model and 1 other directories.

by do-not-reply＠jboss.org

Author: koen.aers(a)jboss.com Date: 2009-10-07 18:49:40 -0400 (Wed, 07 Oct 2009) New Revision: 5716 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceMigration.java Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/InstanceMigrator.java Log: use HistoryEvent.fire() instead of manually adding details to HistoryProcessInstance Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceMigration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceMigration.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceMigration.java 2009-10-07 22:49:40 UTC (rev 5716) @@ -0,0 +1,71 @@ +/* + * 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.pvm.internal.history.events; + +import org.jbpm.api.ProcessDefinition; +import org.jbpm.api.ProcessInstance; +import org.jbpm.pvm.internal.env.EnvironmentImpl; +import org.jbpm.pvm.internal.history.HistoryEvent; +import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl; +import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceMigrationImpl; +import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.session.DbSession; + + +/** + * @author Koen Aers + */ +public class ProcessInstanceMigration extends HistoryEvent { + + private static final long serialVersionUID = 1L; + + ProcessInstance processInstance; + ProcessDefinition processDefinition; + + public ProcessInstanceMigration(ProcessInstance processInstance, ProcessDefinition processDefinition) { + this.processInstance = processInstance; + this.processDefinition = processDefinition; + } + + public void process() { + + if (processDefinition == null || processInstance == null || !(processInstance instanceof ExecutionImpl)) return; + + DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class); + + HistoryProcessInstanceImpl historyProcessInstance = null; + long processInstanceDbid = ((ExecutionImpl)processInstance).getDbid(); + historyProcessInstance = (HistoryProcessInstanceImpl)dbSession.get(HistoryProcessInstanceImpl.class, processInstanceDbid); + if (historyProcessInstance == null) return; + + String oldVersion = historyProcessInstance.getProcessDefinitionId(); + String newVersion = processDefinition.getId(); + + historyProcessInstance.setProcessDefinitionId(newVersion); + HistoryProcessInstanceMigrationImpl historyProcessInstanceMigration = + new HistoryProcessInstanceMigrationImpl(oldVersion, newVersion); + historyProcessInstance.addDetail(historyProcessInstanceMigration); + + + dbSession.save(historyProcessInstanceMigration); + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ProcessInstanceMigration.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java 2009-10-07 22:48:36 UTC (rev 5715) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java 2009-10-07 22:49:40 UTC (rev 5716) @@ -64,7 +64,6 @@ public void addDetail(HistoryDetailImpl detail) { - details.add(detail); detail.setHistoryProcessInstance(this, nextDetailIndex); nextDetailIndex++; } @@ -112,11 +111,14 @@ public String getState() { return state; } + public void setState(String state) { + this.state = state; + } public String getProcessDefinitionId() { return processDefinitionId; } - public void setState(String state) { - this.state = state; + public void setProcessDefinitionId(String processDefinitionId) { + this.processDefinitionId = processDefinitionId; } public String getEndActivityName() { return endActivityName; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/InstanceMigrator.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/InstanceMigrator.java 2009-10-07 22:48:36 UTC (rev 5715) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/migration/InstanceMigrator.java 2009-10-07 22:49:40 UTC (rev 5716) @@ -4,15 +4,13 @@ import org.jbpm.api.Execution; import org.jbpm.api.ExecutionService; -import org.jbpm.api.HistoryService; import org.jbpm.api.ProcessDefinition; import org.jbpm.api.ProcessDefinitionQuery; import org.jbpm.api.ProcessInstance; import org.jbpm.api.ProcessInstanceQuery; -import org.jbpm.api.history.HistoryProcessInstance; import org.jbpm.pvm.internal.env.EnvironmentImpl; -import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl; -import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceMigrationImpl; +import org.jbpm.pvm.internal.history.HistoryEvent; +import org.jbpm.pvm.internal.history.events.ProcessInstanceMigration; import org.jbpm.pvm.internal.model.Activity; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; @@ -39,7 +37,7 @@ migrateExecutions(processDefinition, processInstance, migrationDescriptor); // migrateSwimlanes(processInstance, migrationDescriptor); // migrateVariables(processInstance, migrationDescriptor); - logMigration(processInstance, processDefinition.getVersion()); + logMigration(processInstance, processDefinition); } private static void migrateExecutions(ProcessDefinition processDefinition, Execution execution, MigrationDescriptor migrationDescriptor) { @@ -61,14 +59,9 @@ } } - private static void logMigration(ProcessInstance processInstance, int lastVersion) { - HistoryService historyService = (HistoryService)EnvironmentImpl.getFromCurrent(HistoryService.class); - HistoryProcessInstance historyProcessInstance = historyService - .createHistoryProcessInstanceQuery() - .processInstanceId(processInstance.getId()) - .uniqueResult(); - if (!(historyProcessInstance instanceof HistoryProcessInstanceImpl)) return; - ((HistoryProcessInstanceImpl)historyProcessInstance).addDetail(new HistoryProcessInstanceMigrationImpl(lastVersion - 1, lastVersion)); + private static void logMigration(ProcessInstance processInstance, ProcessDefinition processDefinition) { + ProcessInstanceMigration processInstanceMigrate = new ProcessInstanceMigration(processInstance, processDefinition); + HistoryEvent.fire(processInstanceMigrate); } private static String getOldVersionId(String processDefinitionName) {

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5715 - in jbpm4/trunk/modules/pvm/src/main: resources and 1 other directory.

by do-not-reply＠jboss.org

Author: koen.aers(a)jboss.com Date: 2009-10-07 18:48:36 -0400 (Wed, 07 Oct 2009) New Revision: 5715 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceMigrationImpl.java jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml Log: keep track of the definition id instead of the version while migrating Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceMigrationImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceMigrationImpl.java 2009-10-07 20:16:32 UTC (rev 5714) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceMigrationImpl.java 2009-10-07 22:48:36 UTC (rev 5715) @@ -29,21 +29,21 @@ private static final long serialVersionUID = 1L; - protected int oldVersion; - protected int newVersion; + protected String oldProcessDefinitionId; + protected String newProcessDefinitionId; public HistoryProcessInstanceMigrationImpl() { } - public HistoryProcessInstanceMigrationImpl(int oldVersion, int newVersion) { + public HistoryProcessInstanceMigrationImpl(String oldProcessDefinitionId, String newProcessDefinitionId) { // superclass has dummy string constructor to differentiate from // the default constructor which is used by hibernate super(null); - this.oldVersion = oldVersion; - this.newVersion = newVersion; + this.oldProcessDefinitionId = oldProcessDefinitionId; + this.newProcessDefinitionId = newProcessDefinitionId; } public String toString() { - return "migrated process instance " + this.historyProcessInstance.getProcessInstanceId() + " from " + oldVersion + " to " + newVersion; + return "migrated process instance " + this.historyProcessInstance.getProcessInstanceId() + " from " + oldProcessDefinitionId + " to " + newProcessDefinitionId; } } Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-10-07 20:16:32 UTC (rev 5714) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-10-07 22:48:36 UTC (rev 5715) @@ -217,8 +217,8 @@ </subclass> <subclass name="HistoryProcessInstanceMigrationImpl" discriminator-value="instance-migration"> - <property name="oldVersion" column="OLD_INT_" /> - <property name="newVersion" column="NEW_INT_" /> + <property name="oldProcessDefinitionId" column="OLD_STR_" /> + <property name="newProcessDefinitionId" column="NEW_STR_" /> </subclass> <subclass name="HistoryPriorityUpdateImpl" discriminator-value="priority-update">

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5714 - jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events.

by do-not-reply＠jboss.org

Author: koen.aers(a)jboss.com Date: 2009-10-07 16:16:32 -0400 (Wed, 07 Oct 2009) New Revision: 5714 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/VariableCreate.java Log: removed unnecessary imports Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/VariableCreate.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/VariableCreate.java 2009-10-07 20:10:20 UTC (rev 5713) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/VariableCreate.java 2009-10-07 20:16:32 UTC (rev 5714) @@ -21,8 +21,6 @@ */ package org.jbpm.pvm.internal.history.events; -import org.jbpm.api.history.HistoryProcessInstance; -import org.jbpm.api.history.HistoryTask; import org.jbpm.pvm.internal.env.EnvironmentImpl; import org.jbpm.pvm.internal.history.HistoryEvent; import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5713 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/model and 2 other directories.

by do-not-reply＠jboss.org

Author: koen.aers(a)jboss.com Date: 2009-10-07 16:10:20 -0400 (Wed, 07 Oct 2009) New Revision: 5713 Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java Log: store and retrieve migration info in parse context map instead of process definition object Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-10-07 19:34:20 UTC (rev 5712) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-10-07 20:10:20 UTC (rev 5713) @@ -27,11 +27,14 @@ import java.util.ArrayList; import java.util.Date; import java.util.Enumeration; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.StringTokenizer; import org.jbpm.api.JbpmException; +import org.jbpm.api.ProcessDefinition; import org.jbpm.api.activity.ActivityBehaviour; import org.jbpm.api.listener.EventListener; import org.jbpm.api.model.Event; @@ -277,8 +280,14 @@ } } - public void parseMigrationDescriptor(Element migrationElement, Parse parse, JpdlProcessDefinition processDefinition) { - processDefinition.setMigrationDescriptor(new MigrationDescriptor()); + @SuppressWarnings("unchecked") + public void parseMigrationDescriptor(Element migrationElement, Parse parse, ProcessDefinition processDefinition) { + Map<ProcessDefinition, MigrationDescriptor> migrations = (Map<ProcessDefinition, MigrationDescriptor>)parse.contextMapGet(Parse.CONTEXT_KEY_MIGRATIONS); + if (migrations == null) { + migrations = new HashMap<ProcessDefinition, MigrationDescriptor>(); + parse.contextMapPut(Parse.CONTEXT_KEY_MIGRATIONS, migrations); + } + migrations.put(processDefinition, new MigrationDescriptor()); } public void parseActivities(Element documentElement, Parse parse, CompositeElementImpl compositeElement) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-10-07 19:34:20 UTC (rev 5712) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ProcessDefinitionImpl.java 2009-10-07 20:10:20 UTC (rev 5713) @@ -30,7 +30,6 @@ import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.client.ClientProcessDefinition; import org.jbpm.pvm.internal.client.ClientProcessInstance; -import org.jbpm.pvm.internal.migration.MigrationDescriptor; import org.jbpm.pvm.internal.task.TaskDefinitionImpl; /** @@ -75,8 +74,6 @@ protected String imageResourceName = null; - protected MigrationDescriptor migrationDescriptor; - public ProcessDefinitionImpl() { this.processDefinition = this; @@ -201,10 +198,4 @@ public void setSuspended(boolean isSuspended) { this.isSuspended = isSuspended; } - public MigrationDescriptor getMigrationDescriptor() { - return migrationDescriptor; - } - public void setMigrationDescriptor(MigrationDescriptor migrationDescriptor) { - this.migrationDescriptor = migrationDescriptor; - } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java 2009-10-07 19:34:20 UTC (rev 5712) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/ProcessDeployer.java 2009-10-07 20:10:20 UTC (rev 5713) @@ -24,6 +24,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.List; +import java.util.Map; import org.jbpm.api.ProcessDefinition; import org.jbpm.api.ProcessDefinitionQuery; @@ -52,6 +53,7 @@ this.parser = parser; } + @SuppressWarnings("unchecked") public void deploy(DeploymentImpl deployment) { for (String resourceName: deployment.getResourceNames()) { @@ -95,13 +97,18 @@ deployment.setProcessDefinitionId(processDefinitionName, processDefinition.getId()); deployment.setProcessDefinitionKey(processDefinitionName, processDefinition.getKey()); deployment.setProcessDefinitionVersion(processDefinitionName, new Long(processDefinition.getVersion())); + + //execute migration + Map<ProcessDefinition, MigrationDescriptor> migrations = (Map<ProcessDefinition, MigrationDescriptor>)parse.contextMapGet(Parse.CONTEXT_KEY_MIGRATIONS); + if (migrations != null) { + MigrationDescriptor migrationDescriptor = migrations.get(processDefinition); + if (migrationDescriptor != null) { + InstanceMigrator.migrateAll(processDefinition, migrationDescriptor); + } + } + } - MigrationDescriptor migrationDescription = processDefinition.getMigrationDescriptor(); - if (migrationDescription != null) { - InstanceMigrator.migrateAll(processDefinition, migrationDescription); - } - deployment.addObject(processDefinitionName, processDefinition); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-10-07 19:34:20 UTC (rev 5712) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-10-07 20:10:20 UTC (rev 5713) @@ -55,6 +55,7 @@ public static final String CONTEXT_KEY_DEPLOYMENT = "deployment"; public static final String CONTEXT_KEY_PROCESS_LANGUAGE_ID = "proclangid"; public static final String CONTEXT_KEY_BINDINGS = "bindings"; + public static final String CONTEXT_KEY_MIGRATIONS = "migrations"; protected Parser parser;

16 years, 6 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 October 2009