December 2008 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r3505 - in jbpm4/trunk: modules/examples and 4 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-12-22 12:32:29 -0500 (Mon, 22 Dec 2008) New Revision: 3505 Modified: jbpm4/trunk/build.xml jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Blob.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java jbpm4/trunk/pom.xml Log: made examples run on oracle Modified: jbpm4/trunk/build.xml =================================================================== --- jbpm4/trunk/build.xml 2008-12-22 15:37:18 UTC (rev 3504) +++ jbpm4/trunk/build.xml 2008-12-22 17:32:29 UTC (rev 3505) @@ -65,10 +65,6 @@ <delete dir="${distro.installation.dir}/jbpm-${distro.version}" /> <unzip src="modules/distro/target/jbpm-${distro.version}.zip" dest="${distro.installation.dir}" /> <unzip src="${distro.eclipse}" dest="${distro.installation.dir}/jbpm-${distro.version}" /> - <unzip src="${distro.gef}" dest="${distro.installation.dir}/jbpm-${distro.version}" /> - <unzip src="${distro.installation.dir}/jbpm-${distro.version}/gpd/jbpm-gpd-site.zip" - dest="${distro.installation.dir}/jbpm-${distro.version}/eclipse" - overwrite="false" /> <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> <arg line="/C start "${distro.installation.dir}/jbpm-${distro.version}/eclipse/eclipse.exe" "-data" "${distro.installation.dir}/jbpm-${distro.version}/workspace"" /> </exec> Modified: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml 2008-12-22 15:37:18 UTC (rev 3504) +++ jbpm4/trunk/modules/examples/pom.xml 2008-12-22 17:32:29 UTC (rev 3505) @@ -53,11 +53,5 @@ </dependency> </dependencies> - -  - <build> - <plugins> - </plugins> - </build> - + </project> \ No newline at end of file Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2008-12-22 15:37:18 UTC (rev 3504) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2008-12-22 17:32:29 UTC (rev 3505) @@ -22,10 +22,7 @@ package org.jbpm.examples.sql; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Set; import org.jbpm.Execution; import org.jbpm.test.DbTestCase; @@ -42,18 +39,14 @@ Execution execution = executionService.startExecutionByKey("Sql"); String executionId = execution.getId(); - Set<String> variableNames = executionService.getVariableNames(executionId); - Map<String, Object> variables = executionService.getVariables(executionId, variableNames); - - Map<String, Object> expectedVariables = new HashMap<String, Object>(); - List<String> nodeNames = new ArrayList<String>(); - nodeNames.add("get process names"); - nodeNames.add("count nodes"); - expectedVariables.put("nodes with o", nodeNames); - - expectedVariables.put("nodes", new Integer(4)); - - assertEquals(expectedVariables, variables); + List<String> expectedNodeNames = new ArrayList<String>(); + expectedNodeNames.add("get process names"); + expectedNodeNames.add("count nodes"); + Object nodeNames = executionService.getVariable(executionId, "nodes with o"); + assertEquals(expectedNodeNames, nodeNames); + + Object nodes = executionService.getVariable(executionId, "nodes"); + assertEquals("4", nodes.toString()); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Blob.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Blob.java 2008-12-22 15:37:18 UTC (rev 3504) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Blob.java 2008-12-22 17:32:29 UTC (rev 3505) @@ -9,11 +9,17 @@ private static final long serialVersionUID = 1L; - public static final BlobStrategy DEFAULT_BLOB_STRATEGY = new BlobStrategyChopped(); + public static final BlobStrategy DEFAULT_BLOB_STRATEGY = new BlobStrategyBlob(); // MAP WITH HIBERNATE AS COMPONENT protected java.sql.Blob blob; + + // cachedBytes is used by the BlobStrategyBlob as hibernate doesn't allow + // blobs to be read in the same session as they are created in. + // So cachedBytes should not be persisted + protected byte[] cachedBytes; + protected byte[] bytes; protected List<byte[]> chops; protected String fileName; @@ -67,4 +73,10 @@ public void setFileName(String fileName) { this.fileName = fileName; } + public byte[] getCachedBytes() { + return cachedBytes; + } + public void setCachedBytes(byte[] cachedBytes) { + this.cachedBytes = cachedBytes; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java 2008-12-22 15:37:18 UTC (rev 3504) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/BlobStrategyBlob.java 2008-12-22 17:32:29 UTC (rev 3505) @@ -9,11 +9,16 @@ public void set(byte[] bytes, Blob blob) { if (bytes!=null) { + blob.setCachedBytes(bytes); blob.setBlob(Hibernate.createBlob(bytes)); } } public byte[] get(Blob blob) { + if (blob.getCachedBytes()!=null) { + return blob.getCachedBytes(); + } + java.sql.Blob sqlBlob = blob.getBlob(); if (sqlBlob!=null) { try { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2008-12-22 15:37:18 UTC (rev 3504) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2008-12-22 17:32:29 UTC (rev 3505) @@ -31,6 +31,7 @@ import java.util.List; import java.util.Map; +import org.jbpm.JbpmException; import org.jbpm.activity.ActivityExecution; import org.jbpm.activity.ExternalActivity; import org.jbpm.pvm.internal.model.ExecutionImpl; @@ -246,19 +247,13 @@ Variable variable = execution.getVariableObject("v"); assertEquals(BlobVariable.class, variable.getClass()); - BlobVariable blobVariable = (BlobVariable) variable; - List<byte[]> chops = (List<byte[]>) blobVariable.getBlob().getChops(); - int index = 0; - for (byte[] chop: chops) { - byte[] expected = new byte[chop.length]; - System.arraycopy(bytes, index, expected, 0, chop.length); - assertTrue(Arrays.equals(expected, chop)); - index += chop.length; - } - assertEquals(bytes.length, index); - - assertTrue(Arrays.equals(bytes, (byte[]) execution.getVariable("v"))); + BlobVariable blobVariable = (BlobVariable) variable; + + byte[] blobVariableBytes = (byte[]) blobVariable.getValue(); + byte[] expected = bytes; + + assertTrue(Arrays.equals(expected, blobVariableBytes)); } public void testCharsVariable() { @@ -296,7 +291,7 @@ } } - public void testSerializableVariable() { + public void testSerializableVariable() throws Exception { ExecutionImpl execution = (ExecutionImpl) ProcessFactory.build() .node().initial().behaviour(WaitState.class) .done() @@ -309,20 +304,19 @@ assertEquals(BlobVariable.class, variable.getClass()); BlobVariable blobVariable = (BlobVariable) variable; - List<byte[]> chops = (List<byte[]>) blobVariable.getBlob().getChops(); + + // blobVariable.getObject(); is used to get the bare bytes. + // blobVariable.getValue() would also use the converter and + // then the deserialized object is returned + // ...good idea i'll test that as well below :-) + byte[] blobVariableBytes = (byte[]) blobVariable.getObject(); + byte[] expected = serialize(testSerializable); + + assertTrue(Arrays.equals(expected, blobVariableBytes)); - byte[] bytes = serialize(testSerializable); - - int index = 0; - for (byte[] chop: chops) { - byte[] expected = new byte[chop.length]; - System.arraycopy(bytes, index, expected, 0, chop.length); - assertTrue(Arrays.equals(expected, chop)); - index += chop.length; - } - assertEquals(bytes.length, index); - - assertEquals(testSerializable, execution.getVariable("v")); + Object deserialized = blobVariable.getValue(); + assertNotNull(deserialized); + assertEquals(testSerializable, deserialized); } private byte[] serialize(TestSerializable testSerializable) { Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2008-12-22 15:37:18 UTC (rev 3504) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2008-12-22 17:32:29 UTC (rev 3505) @@ -21,10 +21,13 @@ */ package org.jbpm.test; +import java.sql.Types; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.hibernate.Hibernate; +import org.hibernate.SQLQuery; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; @@ -33,6 +36,7 @@ import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.mapping.ForeignKey; import org.hibernate.mapping.Table; +import org.hibernate.type.Type; import org.jbpm.ProcessEngine; import org.jbpm.env.EnvironmentFactory; import org.jbpm.log.Log; @@ -160,8 +164,10 @@ Session session = sessionFactory.openSession(); try { for (String tableName : tableNames) { - String countSql = "select count(*) from "+tableName; - Integer recordCount = (Integer) session.createSQLQuery(countSql).uniqueResult(); + String countSql = "select count(*) recordCount from "+tableName; + SQLQuery sqlQuery = session.createSQLQuery(countSql); + sqlQuery.addScalar("recordCount", Hibernate.INTEGER); + Integer recordCount = (Integer) sqlQuery.uniqueResult(); if (recordCount>0) { recordsLeft = true; log.error("FIXME: "+recordCount+" records left in table "+tableName); Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2008-12-22 15:37:18 UTC (rev 3504) +++ jbpm4/trunk/pom.xml 2008-12-22 17:32:29 UTC (rev 3505) @@ -317,13 +317,20 @@ </build> </profile> - <profile> + <profile> <id>database</id> <activation> <property> <name>database</name> </property> </activation> + <dependencies> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-db</artifactId> + <version>${version}</version> + </dependency> + </dependencies> <build> <plugins>

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3504 - jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/main/java/org/jbpm/graph/node.

by do-not-reply＠jboss.org

Author: mputz Date: 2008-12-22 10:37:18 -0500 (Mon, 22 Dec 2008) New Revision: 3504 Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/main/java/org/jbpm/graph/node/Join.java Log: reintroduced session.flush as a fix for the original issue [JBPM-1085] Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/main/java/org/jbpm/graph/node/Join.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/main/java/org/jbpm/graph/node/Join.java 2008-12-22 15:36:59 UTC (rev 3503) +++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/main/java/org/jbpm/graph/node/Join.java 2008-12-22 15:37:18 UTC (rev 3504) @@ -112,8 +112,8 @@ lockMode = LockMode.parse(parentLockMode); } log.debug("forcing version increment on parent token "+parentToken); - // TODO why is a flush needed?! - // session.flush(); + // [JBPM-1886] reintroduce flush until the workaround of join lock=UPGRADE works (JBPM-1755 needs to be fixed, too) + session.flush(); session.lock(parentToken, lockMode); }

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3503 - in projects/spec/trunk: modules and 4 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-22 10:36:59 -0500 (Mon, 22 Dec 2008) New Revision: 3503 Added: projects/spec/trunk/modules/docs/ projects/spec/trunk/modules/docs/pom.xml projects/spec/trunk/modules/docs/spec-requirements/ projects/spec/trunk/modules/docs/spec-requirements/en/ projects/spec/trunk/modules/docs/spec-requirements/en/images/ projects/spec/trunk/modules/docs/spec-requirements/en/master.xml projects/spec/trunk/modules/docs/spec-requirements/en/modules/ projects/spec/trunk/modules/docs/spec-requirements/en/modules/introduction.xml projects/spec/trunk/modules/docs/spec-requirements/pom.xml Modified: projects/spec/trunk/pom.xml Log: Add docs Added: projects/spec/trunk/modules/docs/pom.xml =================================================================== --- projects/spec/trunk/modules/docs/pom.xml (rev 0) +++ projects/spec/trunk/modules/docs/pom.xml 2008-12-22 15:36:59 UTC (rev 3503) @@ -0,0 +1,101 @@ +<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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <name>JBoss BPM Spec - Documentation</name> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-docs</artifactId> + <packaging>pom</packaging> + + <version>1.0.0-SNAPSHOT</version> + + <parent> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + +  + <modules> + <module>spec-requirements</module> + </modules> + +  + <properties> + <translation>en-US</translation> + </properties> + +  + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.0.0</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.0.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${pom.basedir}/en</sourceDirectory> + <imageResource> + <directory>${pom.basedir}/en</directory> + <includes> + <include>images/**/*</include> + </includes> + </imageResource> +  + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl + </stylesheetResource> + <finalName>${pom.name}.pdf</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl + </stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl + </stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>eclipse</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/main-eclipse.xsl + </stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> +  +  + <docbookVersion>1.72.0</docbookVersion> + </options> + </configuration> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Property changes on: projects/spec/trunk/modules/docs/pom.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Property changes on: projects/spec/trunk/modules/docs/spec-requirements ___________________________________________________________________ Name: svn:ignore + target Added: projects/spec/trunk/modules/docs/spec-requirements/en/master.xml =================================================================== --- projects/spec/trunk/modules/docs/spec-requirements/en/master.xml (rev 0) +++ projects/spec/trunk/modules/docs/spec-requirements/en/master.xml 2008-12-22 15:36:59 UTC (rev 3503) @@ -0,0 +1,42 @@ +<?xml version='1.0' encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" "../../../../docbook-support/support/docbook-dtd/docbookx.dtd" [ +<!ENTITY introduction SYSTEM "modules/introduction.xml"> +]> +<book lang="en"> + <bookinfo> + <title>JBoss BPM Specification</title> + <subtitle>A guide for BPM engine developers</subtitle> + <releaseinfo>1.0.0-Alpha2</releaseinfo> + </bookinfo> + <toc/> + <preface id="target" revision="1"> + <title>Target Audience</title> + <para>JBoss.org BPM project leads who target the SOA Platform with their engine.</para> + </preface> + <preface id="preface" revision="1"> + <title>Preface</title> + <para>This document introduces the unified DocBook system for JBoss.org + documentation based on Maven2. Using this system provides the following benefits:</para> + <itemizedlist> + <listitem> + <para>The DocBook libraries and all other dependencies are stored in Maven plugins located in the <ulink url="http://repository.jboss.org/maven2">JBoss public maven repository</ulink>. This allows the entire build environment to be automatically downloaded and configured from just a single <literal>pom.xml</literal> file stored in a project's <literal>docs</literal> directory.</para> + </listitem> + <listitem> + <para>Styles are also stored in Maven plugins so that they can be managed from a central location. This allows updates to be automatically downloaded when new designs are created or bugs are fixed.</para> + </listitem> + <listitem> + <para>It provides a default style based on the JBoss.org community-driven theme that looks clean, fresh and modern.</para> + </listitem> + <listitem> + <para>Custom styles can easily be created for individual projects, or groups of related projects, to cater for different requirements. For example some projects may have their own logos or wish to have collapsable menus at the start of each chapter. </para> + </listitem> + <listitem> + <para>The build process is simplified and standardized. Just + follow the instructions in this guide to setup your <literal>docs</literal> + directory and copy a very simple <literal>pom.xml</literal> file. </para> + </listitem> + </itemizedlist> + <para>If you have any questions, please feel free to contact <ulink url="mailto:thomas.diesler@jboss.org">Thomas Diesler</ulink> (BPM Procuct Manager) for more information.</para> + </preface> +&introduction; +</book> Property changes on: projects/spec/trunk/modules/docs/spec-requirements/en/master.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/docs/spec-requirements/en/modules/introduction.xml =================================================================== --- projects/spec/trunk/modules/docs/spec-requirements/en/modules/introduction.xml (rev 0) +++ projects/spec/trunk/modules/docs/spec-requirements/en/modules/introduction.xml 2008-12-22 15:36:59 UTC (rev 3503) @@ -0,0 +1,25 @@ +<?xml version='1.0' encoding='UTF-8'?><chapter id="introduction"> + <title>Introduction to DocBook processing</title> + <para>DocBook is an XML format for writing documents. It allows the author to + focus on the content itself during the writing process instead of + worrying about the presentation. </para> + <para>Using standard DocBook tags, we can tag the content according to + its syntatic structure. The DocBook document is then processed using + XSL stylesheets so that each tagged DocBook element is transformed to a + corresponding element in the target output format. For example each <para></para> element in DocBook could be transformed into a <p></p> element in XHTML. </para> + <para>Using different XSL stylesheets, we can generate different + output formats. For example, we can generate both XHTML and PDF outputs from + a single DocBook source. We can also generate multiple versions of XHTML + (or PDF) files each with a different style if necessary.</para> + <para>In the JBoss DocBook system, we provide XSL stylesheets to build XHTML, PDF and Eclipse Help output formats from the DocBook source. The build process is + illustrated in <xref linkend="build.fig"/>. </para> + <figure id="build.fig"> + <title>The DocBook build process </title> + <mediaobject> + <imageobject> + <imagedata align="center" fileref="images/build.png"/> + </imageobject> + </mediaobject> + </figure> + <para>XHTML is used instead of HTML as it ensures that the content is completely separated from its style using Cascading Style Sheets (CSS) and image files.</para> +</chapter> \ No newline at end of file Property changes on: projects/spec/trunk/modules/docs/spec-requirements/en/modules/introduction.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/docs/spec-requirements/pom.xml =================================================================== --- projects/spec/trunk/modules/docs/spec-requirements/pom.xml (rev 0) +++ projects/spec/trunk/modules/docs/spec-requirements/pom.xml 2008-12-22 15:36:59 UTC (rev 3503) @@ -0,0 +1,17 @@ +<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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <name>JBoss BPM Spec - Documentation Requirements</name> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-docs-requirements</artifactId> + <packaging>jdocbook</packaging> + + <parent> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-docs</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + +</project> Property changes on: projects/spec/trunk/modules/docs/spec-requirements/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/spec/trunk/pom.xml =================================================================== --- projects/spec/trunk/pom.xml 2008-12-22 15:32:37 UTC (rev 3502) +++ projects/spec/trunk/pom.xml 2008-12-22 15:36:59 UTC (rev 3503) @@ -1,29 +1,28 @@ <?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"> - +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> <name>JBoss BPM Spec</name> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec</artifactId> <packaging>pom</packaging> - + <version>1.0.0-SNAPSHOT</version> - +  <parent> <groupId>org.jbpm</groupId> @@ -37,18 +36,18 @@ <module>modules/integration</module> <module>modules/cts</module> </modules> - +  <properties> <log4j.version>1.2.14</log4j.version> <jbpm3.version>3.3.1-SNAPSHOT</jbpm3.version> <slf4j.version>1.5.3</slf4j.version> </properties> - +  <dependencyManagement> <dependencies> -  +  <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -81,19 +80,22 @@ <scope>test</scope> </dependency> </dependencies> - + <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbpm/projects/spec</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbpm/projects/spec</developerConnection> - <url>http://fisheye.jboss.com/browse/JbpmSvn/projects/spec</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbpm/projects/spec + </connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbpm/projects/spec + </developerConnection> + <url>http://fisheye.jboss.com/browse/JbpmSvn/projects/spec + </url> </scm> - +  <issueManagement> <system>jira</system> <url>http://jira.jboss.org/jira/browse/JBPM</url> </issueManagement> - +  <licenses> <license> @@ -101,24 +103,13 @@ <url>http://repository.jboss.com/licenses/lgpl.txt</url> </license> </licenses> - +  <distributionManagement>  <site> <id>jbpm.dyndns.org</id> @@ -143,5 +134,19 @@ </snapshots> </repository> </repositories> - + +  + <profiles> + +  + <profile> + <id>release</id> + <modules> + <module>modules/docs</module> + </modules> + </profile> + </profiles> </project>

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3502 - in jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples: end/processinstance and 9 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-12-22 10:32:37 -0500 (Mon, 22 Dec 2008) New Revision: 3502 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/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/exclusive/conditions/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/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/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 Log: example process layout refinements 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 2008-12-22 13:36:21 UTC (rev 3501) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/process.jpdl.xml 2008-12-22 15:32:37 UTC (rev 3502) @@ -2,18 +2,18 @@ <process name="EndMultiple" xmlns="http://jbpm.org/4/jpdl"> - <start g="50,121,48,48"> + <start g="16,96,48,48"> <flow to="get return code" /> </start> - - <state name="get return code" g="200,119,142,52"> - <flow name="200" to="ok" g="270,52"/> + + <state name="get return code" g="96,94,111,52"> + <flow name="200" to="ok" g="151,60" /> <flow name="400" to="bad request" /> - <flow name="500" to="internal server error" g="271,250"/> + <flow name="500" to="internal server error" g="151,183" /> </state> - - <end name="ok" g="459,29,48,48"/> - <end name="bad request" g="459,121,48,48"/> - <end name="internal server error" g="459,227,48,48"/> - + + <end name="ok" g="238,37,48,48" /> + <end name="bad request" g="238,98,48,48" /> + <end name="internal server error" g="240,160,48,48" /> + </process> 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 2008-12-22 13:36:21 UTC (rev 3501) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/processinstance/process.jpdl.xml 2008-12-22 15:32:37 UTC (rev 3502) @@ -6,6 +6,6 @@ <flow to="end" /> </start> - <end name="end" g="302,73,80,40"/> + <end name="end" g="191,73,80,40"/> </process> 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 2008-12-22 13:36:21 UTC (rev 3501) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/process.jpdl.xml 2008-12-22 15:32:37 UTC (rev 3502) @@ -2,18 +2,18 @@ <process name="EndState" xmlns="http://jbpm.org/4/jpdl"> - <start g="50,121,48,48"> - <flow to="get return code" /> + <start g="16,96,48,48"> + <flow to="get return code"/> </start> - <state name="get return code" g="200,119,142,52"> - <flow name="200" to="ok" g="270,52"/> + <state name="get return code" g="96,94,110,52"> + <flow name="200" to="ok" g="150,63"/> <flow name="400" to="bad request" /> - <flow name="500" to="internal server error" g="271,250"/> + <flow name="500" to="internal server error" g="150,177"/> </state> - <end name="ok" state="completed" g="459,29,48,48"/> - <end name="bad request" state="error" g="459,121,48,48"/> - <end name="internal server error" state="error" g="459,227,48,48"/> + <end name="ok" state="completed" g="239,40,48,48"/> + <end name="bad request" state="error" g="239,97,48,48"/> + <end name="internal server error" state="error" g="240,154,48,48"/> </process> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/process.jpdl.xml 2008-12-22 13:36:21 UTC (rev 3501) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/process.jpdl.xml 2008-12-22 15:32:37 UTC (rev 3502) @@ -1,25 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<process name="ExclusiveConditions" xmlns="http://jbpm.org/4/jpdl"> - - <start g="70,143,48,48"> - <flow to="evaluate document" /> - </start> - - <exclusive name="evaluate document" g="256,143,48,48"> - <flow to="submit document"> - <condition expr="#{content=="good"}" /> - </flow> - <flow to="try again" g="280,69"> - <condition expr="#{content=="bad"}" /> - </flow> - <flow to="give up" g="280,278"/> - </exclusive> - - <state name="submit document" g="453,141,163,52"/> - - <state name="try again" g="482,45,106,52"/> - - <state name="give up" g="489,253,92,52"/> - -</process> +<?xml version="1.0" encoding="UTF-8"?> + +<process name="ExclusiveConditions" xmlns="http://jbpm.org/4/jpdl"> + + <start g="16,102,48,48"> + <flow to="evaluate document" /> + </start> + + <exclusive name="evaluate document" g="96,102,48,48"> + <flow to="submit document" g="120,60"> + <condition expr="#{content=="good"}" /> + </flow> + <flow to="try again"> + <condition expr="#{content=="bad"}" /> + </flow> + <flow to="give up" g="120,189" /> + </exclusive> + + <state name="submit document" g="175,35,122,52"/> + <state name="try again" g="176,100,122,52"/> + <state name="give up" g="177,164,122,52"/> + +</process> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml 2008-12-22 13:36:21 UTC (rev 3501) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml 2008-12-22 15:32:37 UTC (rev 3502) @@ -2,20 +2,18 @@ <process name="ExclusiveExpression" xmlns="http://jbpm.org/4/jpdl"> - <start g="70,143,48,48"> - <flow to="evaluate document" /> + <start g="16,102,48,48"> + <flow to="evaluate document"/> </start> - <exclusive name="evaluate document" expr="#{content}" g="256,143,48,48"> - <flow name="good" to="submit document" /> - <flow name="bad" to="try again" g="280,69"/> - <flow name="ugly" to="give up" g="280,278"/> + <exclusive name="evaluate document" expr="#{content}" g="96,102,48,48"> + <flow name="good" to="submit document" g="120,60"/> + <flow name="bad" to="try again"/> + <flow name="ugly" to="give up" g="120,189"/> </exclusive> - <state name="submit document" g="453,141,163,52"/> + <state name="submit document" g="175,35,122,52"/> + <state name="try again" g="176,100,122,52"/> + <state name="give up" g="177,164,122,52"/> - <state name="try again" g="482,45,106,52"/> - - <state name="give up" g="489,253,92,52"/> - </process> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml 2008-12-22 13:36:21 UTC (rev 3501) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml 2008-12-22 15:32:37 UTC (rev 3502) @@ -2,21 +2,19 @@ <process name="ExclusiveHandler" xmlns="http://jbpm.org/4/jpdl"> - <start g="70,143,48,48"> + <start g="16,102,48,48"> <flow to="evaluate document" /> </start> - <exclusive name="evaluate document" g="256,143,48,48"> + <exclusive name="evaluate document" g="96,102,48,48"> <handler class="org.jbpm.examples.exclusive.handler.ContentEvaluation" /> - <flow name="good" to="submit document" /> - <flow name="bad" to="try again" g="280,69"/> - <flow name="ugly" to="give up" g="280,278"/> + <flow name="good" to="submit document" g="120,60" /> + <flow name="bad" to="try again" /> + <flow name="ugly" to="give up" g="120,210" /> </exclusive> - <state name="submit document" g="453,141,163,52"/> + <state name="submit document" g="175,35,122,52"/> + <state name="try again" g="176,100,122,52"/> + <state name="give up" g="177,164,122,52"/> - <state name="try again" g="482,45,106,52"/> - - <state name="give up" g="489,253,92,52"/> - </process> 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 2008-12-22 13:36:21 UTC (rev 3501) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml 2008-12-22 15:32:37 UTC (rev 3502) @@ -2,13 +2,13 @@ <process name="Hql" xmlns="http://jbpm.org/4/jpdl"> - <start g="55,85,48,48"> + <start g="17,20,48,48"> <flow to="get process names" /> </start> <hql name="get process names" var="nodes with o" - g="172,83,174,52"> + g="96,16,115,52"> <query> select node.name from org.jbpm.pvm.internal.model.NodeImpl as node @@ -23,7 +23,7 @@ <hql name="count nodes" var="nodes" unique="true" - g="401,83,128,52"> + g="243,16,95,52"> <query> select count(*) from org.jbpm.pvm.internal.model.NodeImpl @@ -31,6 +31,6 @@ <flow to="wait" /> </hql> - <state name="wait" g="584,85,90,48"/> + <state name="wait" g="370,18,96,48"/> </process> 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 2008-12-22 13:36:21 UTC (rev 3501) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/java/process.jpdl.xml 2008-12-22 15:32:37 UTC (rev 3502) @@ -2,7 +2,7 @@ <process name="Java" xmlns="http://jbpm.org/4/jpdl"> - <start g="48,68,48,48"> + <start g="20,20,48,48"> <flow to="invoke java method" /> </start> @@ -10,7 +10,7 @@ class="org.jbpm.examples.java.JohnDoe" method="hello" var="answer" - g="175,66,187,52"> + g="96,16,127,52"> <field name="state"><string value="fine"/></field> <field name="session"><env type="org.hibernate.Session"/></field> @@ -20,6 +20,6 @@ <flow to="wait" /> </java> - <state name="wait" g="460,66,80,52"/> + <state name="wait" g="255,16,88,52"/> </process> 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 2008-12-22 13:36:21 UTC (rev 3501) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml 2008-12-22 15:32:37 UTC (rev 3502) @@ -2,13 +2,13 @@ <process name="Sql" xmlns="http://jbpm.org/4/jpdl"> - <start g="55,85,48,48"> + <start g="16,20,48,48"> <flow to="get process names" /> </start> <sql name="get process names" var="nodes with o" - g="172,83,174,52"> + g="96,16,126,52"> <query> select NAME_ from JBPM_NODE @@ -23,7 +23,7 @@ <sql name="count nodes" var="nodes" unique="true" - g="401,83,128,52"> + g="254,16,92,52"> <query> select count(*) from JBPM_NODE @@ -31,6 +31,6 @@ <flow to="wait" /> </sql> - <state name="wait" g="584,85,90,48"/> + <state name="wait" g="378,18,94,48"/> </process> 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 2008-12-22 13:36:21 UTC (rev 3501) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/process.jpdl.xml 2008-12-22 15:32:37 UTC (rev 3502) @@ -2,17 +2,16 @@ <process name="StateChoice" xmlns="http://jbpm.org/4/jpdl"> - <start g="92,102,48,48"> + <start g="16,60,48,48"> <flow to="wait for response" /> </start> - <state name="wait for response" g="191,100,163,52"> - <flow name="accept" to="submit document" g="272,203"/> - <flow name="reject" to="try again" g="273,56"/> + <state name="wait for response" g="96,58,109,52"> + <flow name="accept" to="submit document" g="151,41"/> + <flow name="reject" to="try again" g="151,125"/> </state> - <state name="submit document" g="419,178,186,52"/> + <state name="submit document" g="237,16,114,52"/> + <state name="try again" g="237,100,114,52"/> - <state name="try again" g="458,30,110,52"/> - </process> 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 2008-12-22 13:36:21 UTC (rev 3501) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/sequence/process.jpdl.xml 2008-12-22 15:32:37 UTC (rev 3502) @@ -2,18 +2,18 @@ <process name="StateSequence" xmlns="http://jbpm.org/4/jpdl"> - <start g="68,62,48,48"> + <start g="16,18,48,48"> <flow to="a" /> </start> - - <state name="a" g="182,60,92,52"> + + <state name="a" g="96,16,75,52"> <flow to="b" /> </state> - - <state name="b" g="348,60,92,52"> + + <state name="b" g="203,16,73,52"> <flow to="c" /> </state> + + <state name="c" g="308,16,76,52" /> - <state name="c" g="515,60,92,52"/> - -</process> +</process> \ No newline at end of file

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3501 - projects/spec/tags.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-22 08:36:21 -0500 (Mon, 22 Dec 2008) New Revision: 3501 Added: projects/spec/tags/bpm-spec-1.0.0-Alpha1/ Removed: projects/spec/tags/bpm-spec-1.0.0.Alpha1/ Log: Rename to bpm-spec-1.0.0-Alpha1 Copied: projects/spec/tags/bpm-spec-1.0.0-Alpha1 (from rev 3500, projects/spec/tags/bpm-spec-1.0.0.Alpha1)

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3500 - in jbpm4/trunk/modules: examples/src/test/resources/org/jbpm/examples/exclusive/expression and 3 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-12-22 08:03:21 -0500 (Mon, 22 Dec 2008) New Revision: 3500 Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/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/sql/process.jpdl.xml Log: added schema for new node types Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd =================================================================== --- jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2008-12-22 11:21:33 UTC (rev 3499) +++ jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2008-12-22 13:03:21 UTC (rev 3500) @@ -133,6 +133,7 @@ </documentation></annotation> <complexType> <sequence> + <element name="handler" minOccurs="0" type="tns:wireObjectType" /> <element name="flow" minOccurs="0" maxOccurs="unbounded"> <complexType> <complexContent> @@ -141,8 +142,7 @@ <element name="condition" minOccurs="0" maxOccurs="unbounded"> <complexType> <attribute name="expr" type="string"> - <annotation><documentation>The script text that will be evaluated. This - is mutually exclusive with the expression element. + <annotation><documentation>The script text that will be evaluated. </documentation></annotation> </attribute> <attribute name="lang" type="string"> @@ -159,6 +159,15 @@ </element> </sequence> <attributeGroup ref="tns:nodeAttributes" /> + <attribute name="expr" type="string"> + <annotation><documentation>The script that will be evaluated and resolve to + the name of the outgoing flow. + </documentation></annotation> + </attribute> + <attribute name="lang" type="string"> + <annotation><documentation>Identification of the scripting language + to use for the expr attribute.</documentation></annotation> + </attribute> </complexType> </element> @@ -201,6 +210,36 @@ </complexType> </element> + <element name="hql"> + <annotation><documentation>Performs a hibernate query + </documentation></annotation> + <complexType> + <complexContent> + <extension base="tns:qlType"> + <sequence> + <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" /> + </sequence> + <attributeGroup ref="tns:nodeAttributes" /> + </extension> + </complexContent> + </complexType> + </element> + + <element name="sql"> + <annotation><documentation>Performs a hibernate SQL query + </documentation></annotation> + <complexType> + <complexContent> + <extension base="tns:qlType"> + <sequence> + <element ref="tns:flow" minOccurs="0" maxOccurs="unbounded" /> + </sequence> + <attributeGroup ref="tns:nodeAttributes" /> + </extension> + </complexContent> + </complexType> + </element> + <element name="java"> <annotation><documentation>Invokes a method on a java object. Either the java class is instantiated with reflection, or the @@ -340,19 +379,33 @@ </attribute> </complexType> </element> - <element name="object"> - <complexType> - <attribute name="name"> - <annotation><documentation>the name of the string object</documentation></annotation> - </attribute> - <attribute name="class"> - <annotation><documentation>the fully qualified classname</documentation></annotation> - </attribute> - </complexType> - </element> + <element name="object" type="tns:wireObjectType" /> </choice> </group> + <complexType name="wireObjectType"> + <sequence> + <element name="field" minOccurs="0" maxOccurs="unbounded"> + <annotation><documentation>Field injections from the environment + invocation.</documentation></annotation> + <complexType > + <group ref="tns:wireObjectGroup" /> + </complexType> + </element> + </sequence> + <attribute name="object" type="string"> + <annotation><documentation>Name of the object in the environment + </documentation></annotation> + </attribute> + <attribute name="class" type="string"> + <annotation><documentation>The class to instantiate. + </documentation></annotation> + </attribute> + <attribute name="name" type="string"> + <annotation><documentation>The name of this object. + </documentation></annotation> + </attribute> + </complexType> <complexType name="javaType"> <sequence> @@ -405,6 +458,30 @@ </attribute> </complexType> + <complexType name="qlType"> + <sequence> + <element name="query" type="string"> + <annotation><documentation>The query text.</documentation></annotation> + </element> + <element name="parameters" minOccurs="0"> + <annotation><documentation>Query parameters.</documentation></annotation> + <complexType> + <sequence> + <group ref="tns:wireObjectGroup" maxOccurs="unbounded" /> + </sequence> + </complexType> + </element> + </sequence> + <attribute name="var" type="string"> + <annotation><documentation>Name of the variable in which the result + of the script evaluation will be stored</documentation></annotation> + </attribute> + <attribute name="unique" type="string"> + <annotation><documentation>Does this query return a unique result or a list + </documentation></annotation> + </attribute> + </complexType> + <complexType name="esbType"> <sequence> <element name="part" minOccurs="0" maxOccurs="unbounded"> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml 2008-12-22 11:21:33 UTC (rev 3499) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml 2008-12-22 13:03:21 UTC (rev 3500) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="ExclusiveExpression"> +<process name="ExclusiveExpression" xmlns="http://jbpm.org/4/jpdl"> <start g="70,143,48,48"> <flow to="evaluate document" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml 2008-12-22 11:21:33 UTC (rev 3499) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml 2008-12-22 13:03:21 UTC (rev 3500) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="ExclusiveHandler"> +<process name="ExclusiveHandler" xmlns="http://jbpm.org/4/jpdl"> <start g="70,143,48,48"> <flow to="evaluate document" /> 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 2008-12-22 11:21:33 UTC (rev 3499) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml 2008-12-22 13:03:21 UTC (rev 3500) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="Hql"> +<process name="Hql" xmlns="http://jbpm.org/4/jpdl"> <start g="55,85,48,48"> <flow to="get process names" /> 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 2008-12-22 11:21:33 UTC (rev 3499) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml 2008-12-22 13:03:21 UTC (rev 3500) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="Sql"> +<process name="Sql" xmlns="http://jbpm.org/4/jpdl"> <start g="55,85,48,48"> <flow to="get process names" />

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3499 - in jbpm4/trunk: modules/db and 4 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-12-22 06:21:33 -0500 (Mon, 22 Dec 2008) New Revision: 3499 Modified: jbpm4/trunk/build.xml jbpm4/trunk/modules/db/.project jbpm4/trunk/modules/db/pom.xml jbpm4/trunk/modules/db/src/main/ant/build.schema.xml jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties jbpm4/trunk/modules/test-load/pom.xml jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java jbpm4/trunk/pom.xml Log: adding database support Modified: jbpm4/trunk/build.xml =================================================================== --- jbpm4/trunk/build.xml 2008-12-20 17:03:13 UTC (rev 3498) +++ jbpm4/trunk/build.xml 2008-12-22 11:21:33 UTC (rev 3499) @@ -19,7 +19,8 @@ <property name="linux.browser" value="mozilla" /> <property name="distro.installation.dir" value="c:/software" /> <property name="distro.version" value="4.0.0-SNAPSHOT" /> - <property name="distro.eclipse" value="c:/downloads/eclipse/eclipse-SDK-3.4.1-win32.zip" /> + <property name="distro.eclipse" value="c:/downloads/eclipse/eclipse-jee-ganymede-SR1-win32.zip" /> + <property name="distro.gef" value="c:/downloads/eclipse/GEF-runtime-3.4.1.zip" /> <target name="clean"> <exec executable="cmd"> @@ -62,8 +63,12 @@ <target name="distro.install" > <delete dir="${distro.installation.dir}/jbpm-${distro.version}" /> - <unzip dest="${distro.installation.dir}" src="modules/distro/target/jbpm-${distro.version}.zip"/> - <unzip dest="${distro.installation.dir}/jbpm-${distro.version}" src="${distro.eclipse}"/> + <unzip src="modules/distro/target/jbpm-${distro.version}.zip" dest="${distro.installation.dir}" /> + <unzip src="${distro.eclipse}" dest="${distro.installation.dir}/jbpm-${distro.version}" /> + <unzip src="${distro.gef}" dest="${distro.installation.dir}/jbpm-${distro.version}" /> + <unzip src="${distro.installation.dir}/jbpm-${distro.version}/gpd/jbpm-gpd-site.zip" + dest="${distro.installation.dir}/jbpm-${distro.version}/eclipse" + overwrite="false" /> <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> <arg line="/C start "${distro.installation.dir}/jbpm-${distro.version}/eclipse/eclipse.exe" "-data" "${distro.installation.dir}/jbpm-${distro.version}/workspace"" /> </exec> Modified: jbpm4/trunk/modules/db/.project =================================================================== --- jbpm4/trunk/modules/db/.project 2008-12-20 17:03:13 UTC (rev 3498) +++ jbpm4/trunk/modules/db/.project 2008-12-22 11:21:33 UTC (rev 3499) @@ -6,18 +6,18 @@ </projects> <buildSpec> <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> + <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.stp.bpmn.validation.BatchValidationBuilder</name> + <name>org.maven.ide.eclipse.maven2Builder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.maven.ide.eclipse.maven2Nature</nature> - <nature>org.eclipse.stp.bpmn.validation.BatchValidationBuildAbleNature</nature> </natures> </projectDescription> Modified: jbpm4/trunk/modules/db/pom.xml =================================================================== --- jbpm4/trunk/modules/db/pom.xml 2008-12-20 17:03:13 UTC (rev 3498) +++ jbpm4/trunk/modules/db/pom.xml 2008-12-22 11:21:33 UTC (rev 3499) @@ -51,12 +51,6 @@  <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> Modified: jbpm4/trunk/modules/db/src/main/ant/build.schema.xml =================================================================== --- jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2008-12-20 17:03:13 UTC (rev 3498) +++ jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2008-12-22 11:21:33 UTC (rev 3499) @@ -43,10 +43,12 @@ <schemaexport properties="src/main/resources/db.properties/oracle.properties" output="target/classes/create/jbpm.oracle.create.sql" - create="yes" drop="no" config="${cfg}" text="yes" /> + create="yes" drop="no" config="${cfg}" text="yes" + delimiter=";" /> <schemaexport properties="src/main/resources/db.properties/oracle.properties" output="target/classes/drop/jbpm.oracle.drop.sql" - create="no" drop="yes" config="${cfg}" text="yes" /> + create="no" drop="yes" config="${cfg}" text="yes" + delimiter=";" /> <schemaexport properties="src/main/resources/db.properties/postgresql.properties" output="target/classes/create/jbpm.postgresql.create.sql" Modified: jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties 2008-12-20 17:03:13 UTC (rev 3498) +++ jbpm4/trunk/modules/db/src/main/resources/db.properties/oracle.properties 2008-12-22 11:21:33 UTC (rev 3499) @@ -4,10 +4,13 @@ # fetch driver from http://www.oracle.com hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver -hibernate.connection.url=jdbc:oracle:thin:@[jdbc.server]:1521:[jdbc.dbname] -hibernate.connection.username=[jdbc.username] -hibernate.connection.password=[jdbc.password] +hibernate.connection.url=jdbc:oracle:thin:@${jdbc.server}:1521:${jdbc.dbname} +hibernate.connection.username=${jdbc.username} +hibernate.connection.password=${jdbc.password} hibernate.query.substitutions=true 1, false 0 hibernate.cache.use_second_level_cache=true hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider + +# hibernate.hbm2ddl.auto=create-drop + Modified: jbpm4/trunk/modules/test-load/pom.xml =================================================================== --- jbpm4/trunk/modules/test-load/pom.xml 2008-12-20 17:03:13 UTC (rev 3498) +++ jbpm4/trunk/modules/test-load/pom.xml 2008-12-22 11:21:33 UTC (rev 3499) @@ -44,6 +44,12 @@ <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> </dependency> + + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-db</artifactId> + <version>${version}</version> + </dependency>  <dependency> @@ -52,15 +58,7 @@ <version>${version}</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-db</artifactId> - <version>${version}</version> - </dependency> </dependencies> -  - </project> \ No newline at end of file Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java 2008-12-20 17:03:13 UTC (rev 3498) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/JobExecutorTest.java 2008-12-22 11:21:33 UTC (rev 3499) @@ -61,11 +61,11 @@ static Map<String, Set<Long>> exclusiveThreadIds; static List<Integer> failOnceMessageIds; - static int nbrOfTestMessages = 500; - static int timeoutMillis = 10 * 60 * 1000; // 10 minutes + static int nbrOfTestMessages = 10; + static int timeoutMillis = 2 * 60 * 1000; // 10 minutes static int checkInterval = 400; - static int nbrOfTestMessagesPerExecution = 10; - static int nbrOfTestExecutions = 20; + static int nbrOfTestMessagesPerExecution = 5; + static int nbrOfTestExecutions = 5; CommandService commandService; Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2008-12-20 17:03:13 UTC (rev 3498) +++ jbpm4/trunk/pom.xml 2008-12-22 11:21:33 UTC (rev 3499) @@ -158,6 +158,7 @@ <version>${cactus.version}</version> </dependency> </dependencies> + </dependencyManagement> <scm> @@ -263,6 +264,11 @@ <artifactId>maven-taglib-plugin</artifactId> <version>2.3</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.3</version> + </plugin> </plugins> </pluginManagement> </build> @@ -310,8 +316,8 @@ </plugins> </build> </profile> - - <profile> + + <profile> <id>database</id> <activation> <property> @@ -320,12 +326,13 @@ </activation> <build> <plugins> + <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> <id>unpack.jbpm.db</id> - <phase>test-compile</phase> + <phase>validate</phase> <goals> <goal>unpack-dependencies</goal> </goals> @@ -337,32 +344,44 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>resolve props</id> + <phase>compile</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>target/resolved.properties</outputDirectory> + <resources> + <resource> + <directory>target/jbpm-db/db.properties</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> <id>install.hibernate.database.properties</id> - <phase>test-compile</phase> + <phase>compile</phase> <goals> <goal>run</goal> </goals> <configuration> <tasks> - <copy file="target/jbpm-db/db.properties/${database}.properties" + <mkdir dir="target/test-classes" /> + <copy file="target/resolved.properties/${database}.properties" tofile="target/test-classes/hibernate.properties" overwrite="true"/> - <replace file="target/test-classes/hibernate.properties" - token="[hibernate.property.username]" - value="${hibernate.property.username}" /> - <replace file="target/test-classes/hibernate.properties" - token="[hibernate.property.password]" - value="${hibernate.property.password}" /> - <replace file="target/test-classes/hibernate.properties" - token="[hibernate.property.server]" - value="${hibernate.property.server}" /> - <replace file="target/test-classes/hibernate.properties" - token="[hibernate.property.dbname]" - value="${hibernate.property.dbname}" /> </tasks> </configuration> </execution> @@ -378,43 +397,49 @@ <sql src="target/jbpm-db/drop/jbpm.${database}.drop.sql" driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}" - user="${hibernate.connection.username}" - password="${hibernate.connection.password}" /> + userid="${hibernate.connection.username}" + password="${hibernate.connection.password}" + onerror="continue"> + <classpath> + <path refid="maven.test.classpath" /> + </classpath> + </sql> <sql src="target/jbpm-db/create/jbpm.${database}.create.sql" driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}" - user="${hibernate.connection.username}" - password="${hibernate.connection.password}" /> + userid="${hibernate.connection.username}" + password="${hibernate.connection.password}" + onerror="continue"> + <classpath> + <path refid="maven.test.classpath" /> + </classpath> + </sql> </tasks> </configuration> </execution> + <execution> + <id>drop.schema</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property file="target/test-classes/hibernate.properties" /> + <sql src="target/jbpm-db/drop/jbpm.${database}.drop.sql" + driver="${hibernate.connection.driver_class}" + url="${hibernate.connection.url}" + userid="${hibernate.connection.username}" + password="${hibernate.connection.password}"> + <classpath> + <path refid="maven.test.classpath" /> + </classpath> + </sql> + </tasks> + </configuration> + </execution> </executions> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <failIfNoTests>false</failIfNoTests> - <trimStackTrace>false</trimStackTrace> - <systemProperties> - <property> - <name>hibernate.property.username</name> - <value>${hibernate.property.username}</value> - </property> - <property> - <name>hibernate.property.pwd</name> - <value>${hibernate.property.pwd}</value> - </property> - <property> - <name>hibernate.property.server</name> - <value>${hibernate.property.server}</value> - </property> - <property> - <name>hibernate.property.dbname</name> - <value>${hibernate.property.dbname}</value> - </property> - </systemProperties> - </configuration> - </plugin> </plugins> </build> </profile>

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3498 - legacy.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-20 12:03:13 -0500 (Sat, 20 Dec 2008) New Revision: 3498 Added: legacy/jbpm-spec/ Removed: legacy/jboss-bpm/ Log: Rename to jbpm-spec Copied: legacy/jbpm-spec (from rev 3497, legacy/jboss-bpm)

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3497 - projects/spec/tags and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-20 12:00:37 -0500 (Sat, 20 Dec 2008) New Revision: 3497 Added: legacy/jboss-bpm/jbpm-spec-1.0.0-Alpha3/ Removed: projects/spec/tags/jbpm-spec-1.0.0-Alpha3/ Log: Move jboss-bmp to legacy Copied: legacy/jboss-bpm/jbpm-spec-1.0.0-Alpha3 (from rev 3496, projects/spec/tags/jbpm-spec-1.0.0-Alpha3)

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3496 - projects/spec/tags and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-20 12:00:17 -0500 (Sat, 20 Dec 2008) New Revision: 3496 Added: legacy/jboss-bpm/jbpm-spec-1.0.0-Alpha2/ Removed: projects/spec/tags/jbpm-spec-1.0.0-Alpha2/ Log: Move jboss-bmp to legacy Copied: legacy/jboss-bpm/jbpm-spec-1.0.0-Alpha2 (from rev 3495, projects/spec/tags/jbpm-spec-1.0.0-Alpha2)

15 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits December 2008