JBoss JBPM SVN: r2194 - projects.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-12 09:15:36 -0400 (Fri, 12 Sep 2008)
New Revision: 2194
Added:
projects/spec/
Removed:
projects/api/
Log:
Restore jbpm-spec/trunk
Copied: projects/spec (from rev 2193, projects/api)
17 years, 7 months
JBoss JBPM SVN: r2193 - in projects/api: tags and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-12 09:09:43 -0400 (Fri, 12 Sep 2008)
New Revision: 2193
Added:
projects/api/tags/jbpm-spec-1.0.0-Alpha1/
Removed:
projects/api/branches/jbpm-api-1.0.0-Alpha1/
Log:
Release jbpm-spec-1.0.0-Alpha1
Copied: projects/api/tags/jbpm-spec-1.0.0-Alpha1 (from rev 2192, projects/api/branches/jbpm-api-1.0.0-Alpha1)
17 years, 7 months
JBoss JBPM SVN: r2192 - in projects/api/branches/jbpm-api-1.0.0-Alpha1: modules/api and 11 other directories.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-12 09:08:50 -0400 (Fri, 12 Sep 2008)
New Revision: 2192
Added:
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/ArchiveDeployer.java
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestSetup.java
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/JBossArchiveDeployer.java
Modified:
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/.classpath
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/.project
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/pom.xml
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/api10/.classpath
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/api10/.project
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/api10/pom.xml
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/jpdl32/.classpath
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/jpdl32/.project
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/jpdl32/pom.xml
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/pom.xml
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/stp/.classpath
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/stp/.project
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/stp/pom.xml
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/xpdl21/.classpath
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/xpdl21/.project
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/xpdl21/pom.xml
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/ri/.classpath
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/ri/.project
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/ri/pom.xml
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/client/.classpath
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/client/.project
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/client/pom.xml
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/pom.xml
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/server/.classpath
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/server/.project
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/server/pom.xml
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/testsuite/.classpath
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/testsuite/.project
projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/testsuite/pom.xml
projects/api/branches/jbpm-api-1.0.0-Alpha1/pom.xml
Log:
Use org.jbpm:jbpm.spec
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/.classpath
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/.classpath 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/.classpath 2008-09-12 13:08:50 UTC (rev 2192)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/.project
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/.project 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/.project 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>bpm-api</name>
+ <name>jbpm-spec-api</name>
<comment></comment>
<projects>
</projects>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/pom.xml
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/pom.xml 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/pom.xml 2008-09-12 13:08:50 UTC (rev 2192)
@@ -12,15 +12,15 @@
<!-- $Id$ -->
<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>JBossBPM - Spec API</name>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
+ <name>jBPM Spec - API</name>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-api</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-spec</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec</artifactId>
<version>1.0.0-Alpha1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Added: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/ArchiveDeployer.java
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/ArchiveDeployer.java (rev 0)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/ArchiveDeployer.java 2008-09-12 13:08:50 UTC (rev 2192)
@@ -0,0 +1,41 @@
+/*
+ * 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.bpm.test;
+
+import java.net.URL;
+
+/**
+ * An archive deployer
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 16-May-2006
+ */
+public interface ArchiveDeployer
+{
+ /** Deploy the given archive
+ */
+ void deploy(URL archive) throws Exception;
+
+ /** Undeploy the given archive
+ */
+ void undeploy(URL archive) throws Exception;
+}
Property changes on: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/ArchiveDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java (rev 0)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java 2008-09-12 13:08:50 UTC (rev 2192)
@@ -0,0 +1,145 @@
+/*
+ * 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.bpm.test;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Hashtable;
+
+import javax.management.MBeanServerConnection;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * An integration test helper that deals with test deployment/undeployment, etc.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Oct-2004
+ */
+public class IntegrationTestHelper
+{
+ private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory";
+ private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory";
+
+ private static MBeanServerConnection server;
+ private static String testArchiveDir;
+ private static String testResourcesDir;
+
+ /** Deploy the given archive
+ */
+ public void deploy(String archive) throws Exception
+ {
+ URL url = getArchiveFile(archive).toURL();
+ getDeployer().deploy(url);
+ }
+
+ /** Undeploy the given archive
+ */
+ public void undeploy(String archive) throws Exception
+ {
+ URL url = getArchiveFile(archive).toURL();
+ getDeployer().undeploy(url);
+ }
+
+ @SuppressWarnings("unchecked")
+ public static MBeanServerConnection getServer()
+ {
+ if (server == null)
+ {
+ Hashtable jndiEnv = null;
+ try
+ {
+ InitialContext iniCtx = new InitialContext();
+ jndiEnv = iniCtx.getEnvironment();
+ server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor");
+ }
+ catch (NamingException ex)
+ {
+ throw new RuntimeException("Cannot obtain MBeanServerConnection using jndi props: " + jndiEnv, ex);
+ }
+ }
+ return server;
+ }
+
+ private ArchiveDeployer getDeployer()
+ {
+ return new JBossArchiveDeployer(getServer());
+ }
+
+ /** Try to discover the URL for the deployment archive */
+ public URL getArchiveURL(String archive) throws MalformedURLException
+ {
+ return getArchiveFile(archive).toURL();
+ }
+
+ /** Try to discover the File for the deployment archive */
+ public File getArchiveFile(String archive)
+ {
+ File file = new File(archive);
+ if (file.exists())
+ return file;
+
+ file = new File(getTestArchiveDir() + "/" + archive);
+ if (file.exists())
+ return file;
+
+ String notSet = (getTestArchiveDir() == null ? " System property '" + SYSPROP_TEST_ARCHIVE_DIRECTORY + "' not set." : "");
+ throw new IllegalArgumentException("Cannot obtain '" + getTestArchiveDir() + "/" + archive + "'." + notSet);
+ }
+
+ /** Try to discover the URL for the test resource */
+ public URL getResourceURL(String resource) throws MalformedURLException
+ {
+ return getResourceFile(resource).toURL();
+ }
+
+ /** Try to discover the File for the test resource */
+ public File getResourceFile(String resource)
+ {
+ File file = new File(resource);
+ if (file.exists())
+ return file;
+
+ file = new File(getTestResourcesDir() + "/" + resource);
+ if (file.exists())
+ return file;
+
+ throw new IllegalArgumentException("Cannot obtain '" + getTestResourcesDir() + "/" + resource + "'");
+ }
+
+ public static String getTestArchiveDir()
+ {
+ if (testArchiveDir == null)
+ testArchiveDir = System.getProperty(SYSPROP_TEST_ARCHIVE_DIRECTORY, "target/test-libs");
+
+ return testArchiveDir;
+ }
+
+ public static String getTestResourcesDir()
+ {
+ if (testResourcesDir == null)
+ testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY, "target/test-resource");
+
+ return testResourcesDir;
+ }
+}
Property changes on: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestSetup.java
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestSetup.java (rev 0)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestSetup.java 2008-09-12 13:08:50 UTC (rev 2192)
@@ -0,0 +1,159 @@
+/*
+ * 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.bpm.test;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.management.MBeanServerConnection;
+import javax.naming.NamingException;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * A test setup that deploys/undeploys archives
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Oct-2004
+ */
+public class IntegrationTestSetup extends TestSetup
+{
+ private IntegrationTestHelper delegate = new IntegrationTestHelper();
+ private String[] archives = new String[0];
+ private ClassLoader originalClassLoader;
+
+ public IntegrationTestSetup(Class<?> testClass, String archiveList)
+ {
+ super(new TestSuite(testClass));
+ getArchiveArray(archiveList);
+ }
+
+ public IntegrationTestSetup(Test test, String archiveList)
+ {
+ super(test);
+ getArchiveArray(archiveList);
+ }
+
+ public IntegrationTestSetup(Test test)
+ {
+ super(test);
+ }
+
+ public File getArchiveFile(String archive)
+ {
+ return delegate.getArchiveFile(archive);
+ }
+
+ public URL getArchiveURL(String archive) throws MalformedURLException
+ {
+ return delegate.getArchiveFile(archive).toURL();
+ }
+
+ public File getResourceFile(String resource)
+ {
+ return delegate.getResourceFile(resource);
+ }
+
+ public URL getResourceURL(String resource) throws MalformedURLException
+ {
+ return delegate.getResourceFile(resource).toURL();
+ }
+
+ private void getArchiveArray(String archiveList)
+ {
+ if (archiveList != null)
+ {
+ StringTokenizer st = new StringTokenizer(archiveList, ", ");
+ archives = new String[st.countTokens()];
+
+ for (int i = 0; i < archives.length; i++)
+ archives[i] = st.nextToken();
+ }
+ }
+
+ protected void setUp() throws Exception
+ {
+ List<URL> clientJars = new ArrayList<URL>();
+ for (int i = 0; i < archives.length; i++)
+ {
+ String archive = archives[i];
+ try
+ {
+ delegate.deploy(archive);
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+ delegate.undeploy(archive);
+ }
+
+ if (archive.endsWith("-client.jar"))
+ {
+ URL archiveURL = getArchiveURL(archive);
+ clientJars.add(archiveURL);
+ }
+ }
+
+ ClassLoader parent = Thread.currentThread().getContextClassLoader();
+ originalClassLoader = parent;
+
+ // add client jars to the class loader
+ if (!clientJars.isEmpty())
+ {
+ URL[] urls = new URL[clientJars.size()];
+ for (int i = 0; i < clientJars.size(); i++)
+ {
+ urls[i] = clientJars.get(i);
+ }
+ URLClassLoader cl = new URLClassLoader(urls, parent);
+ Thread.currentThread().setContextClassLoader(cl);
+ }
+ }
+
+ protected void tearDown() throws Exception
+ {
+ try
+ {
+ for (int i = 0; i < archives.length; i++)
+ {
+ String archive = archives[archives.length - i - 1];
+ delegate.undeploy(archive);
+ }
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(originalClassLoader);
+ }
+ }
+
+ public MBeanServerConnection getServer() throws NamingException
+ {
+ return IntegrationTestHelper.getServer();
+ }
+}
Property changes on: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestSetup.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/JBossArchiveDeployer.java
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/JBossArchiveDeployer.java (rev 0)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/JBossArchiveDeployer.java 2008-09-12 13:08:50 UTC (rev 2192)
@@ -0,0 +1,60 @@
+/*
+ * 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.bpm.test;
+
+import java.net.URL;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+/**
+ * An archive deployer that deals with test deployment/undeployment, etc.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Oct-2004
+ */
+public class JBossArchiveDeployer implements ArchiveDeployer
+{
+ private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
+
+ private MBeanServerConnection server;
+
+ public JBossArchiveDeployer(MBeanServerConnection server)
+ {
+ this.server = server;
+ }
+
+ public void deploy(URL url) throws Exception
+ {
+ invokeMainDeployer("deploy", url);
+ }
+
+ public void undeploy(URL url) throws Exception
+ {
+ invokeMainDeployer("undeploy", url);
+ }
+
+ private void invokeMainDeployer(String methodName, URL url) throws Exception
+ {
+ server.invoke(new ObjectName(MAIN_DEPLOYER), methodName, new Object[] { url }, new String[] { "java.net.URL" });
+ }
+}
Property changes on: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/api/src/main/java/org/jboss/bpm/test/JBossArchiveDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/api10/.classpath
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/api10/.classpath 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/api10/.classpath 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <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>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/api10/.project
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/api10/.project 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/api10/.project 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>bpm-dialect-api10</name>
+ <name>jbpm-spec-dialect-api10</name>
<comment></comment>
<projects>
</projects>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/api10/pom.xml
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/api10/pom.xml 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/api10/pom.xml 2008-09-12 13:08:50 UTC (rev 2192)
@@ -13,15 +13,15 @@
<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>JBossBPM - Spec Dialect API-1.0</name>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-api10</artifactId>
+ <name>jBPM Spec - Dialect API-1.0</name>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-api10</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialects</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialects</artifactId>
<version>1.0.0-Alpha1</version>
</parent>
</project>
\ No newline at end of file
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/jpdl32/.classpath
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/jpdl32/.classpath 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/jpdl32/.classpath 2008-09-12 13:08:50 UTC (rev 2192)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/jpdl32/.project
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/jpdl32/.project 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/jpdl32/.project 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>bpm-dialect-jpdl32</name>
+ <name>jbpm-spec-dialect-jpdl32</name>
<comment></comment>
<projects>
</projects>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/jpdl32/pom.xml
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/jpdl32/pom.xml 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/jpdl32/pom.xml 2008-09-12 13:08:50 UTC (rev 2192)
@@ -13,15 +13,15 @@
<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>JBossBPM - Spec Dialect jPDL-3.2</name>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-jpdl32</artifactId>
+ <name>jBPM Spec - Dialect jPDL-3.2</name>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-jpdl32</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialects</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialects</artifactId>
<version>1.0.0-Alpha1</version>
</parent>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/pom.xml
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/pom.xml 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/pom.xml 2008-09-12 13:08:50 UTC (rev 2192)
@@ -12,15 +12,15 @@
<!-- $Id$ -->
<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>JBossBPM - Spec Dialects</name>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialects</artifactId>
+ <name>jBPM Spec - Dialects</name>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialects</artifactId>
<packaging>pom</packaging>
<!-- Parent -->
<parent>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-spec</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec</artifactId>
<version>1.0.0-Alpha1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -36,16 +36,16 @@
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-ri</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-ri</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/stp/.classpath
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/stp/.classpath 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/stp/.classpath 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/stp/.project
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/stp/.project 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/stp/.project 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>bpm-dialect-stp</name>
+ <name>jbpm-spec-dialect-stp</name>
<comment></comment>
<projects>
</projects>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/stp/pom.xml
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/stp/pom.xml 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/stp/pom.xml 2008-09-12 13:08:50 UTC (rev 2192)
@@ -12,15 +12,15 @@
<!-- $Id$ -->
<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>JBossBPM - Spec Dialect STP-0.7.1</name>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-stp</artifactId>
+ <name>jBPM Spec - Dialect STP-0.7.1</name>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-stp</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialects</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialects</artifactId>
<version>1.0.0-Alpha1</version>
</parent>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/xpdl21/.classpath
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/xpdl21/.classpath 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/xpdl21/.classpath 2008-09-12 13:08:50 UTC (rev 2192)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/xpdl21/.project
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/xpdl21/.project 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/xpdl21/.project 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>bpm-dialect-xpdl21</name>
+ <name>jbpm-spec-dialect-xpdl21</name>
<comment></comment>
<projects>
</projects>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/xpdl21/pom.xml
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/xpdl21/pom.xml 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/dialects/xpdl21/pom.xml 2008-09-12 13:08:50 UTC (rev 2192)
@@ -13,15 +13,15 @@
<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>JBossBPM - Spec Dialect XPDL-2.1</name>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-xpdl21</artifactId>
+ <name>jBPM Spec - Dialect XPDL-2.1</name>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-xpdl21</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialects</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialects</artifactId>
<version>1.0.0-Alpha1</version>
</parent>
</project>
\ No newline at end of file
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/ri/.classpath
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/ri/.classpath 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/ri/.classpath 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <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>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/ri/.project
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/ri/.project 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/ri/.project 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>bpm-ri</name>
+ <name>jbpm-spec-ri</name>
<comment></comment>
<projects>
</projects>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/ri/pom.xml
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/ri/pom.xml 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/ri/pom.xml 2008-09-12 13:08:50 UTC (rev 2192)
@@ -14,15 +14,15 @@
<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>JBossBPM - Spec RI</name>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-ri</artifactId>
+ <name>jBPM Spec - RI</name>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-ri</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-spec</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec</artifactId>
<version>1.0.0-Alpha1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -30,8 +30,8 @@
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-api</artifactId>
<version>${version}</version>
<scope>compile</scope>
</dependency>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/client/.classpath
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/client/.classpath 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/client/.classpath 2008-09-12 13:08:50 UTC (rev 2192)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/client/.project
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/client/.project 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/client/.project 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>bpm-sample-airticket-client</name>
+ <name>jbpm-spec-sample-airticket-client</name>
<comment></comment>
<projects>
</projects>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/client/pom.xml
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/client/pom.xml 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/client/pom.xml 2008-09-12 13:08:50 UTC (rev 2192)
@@ -14,23 +14,23 @@
<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>JBossBPM - Spec Samples Airticket (Client)</name>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-sample-airticket-client</artifactId>
+ <name>jBPM Spec - Samples Airticket (Client)</name>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-sample-airticket-client</artifactId>
<packaging>war</packaging>
<!-- Parent -->
<parent>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-sample-airticket</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-sample-airticket</artifactId>
<version>1.0.0-Alpha1</version>
</parent>
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-sample-airticket-server</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-sample-airticket-server</artifactId>
<version>${version}</version>
</dependency>
</dependencies>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/pom.xml
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/pom.xml 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/pom.xml 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,15 +1,15 @@
<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>JBossBPM - Spec Samples Airticket</name>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-sample-airticket</artifactId>
+ <name>jBPM Spec - Samples Airticket</name>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-sample-airticket</artifactId>
<packaging>pom</packaging>
<!-- Parent -->
<parent>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-spec</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec</artifactId>
<version>1.0.0-Alpha1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -23,12 +23,12 @@
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-ri</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-ri</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/server/.classpath
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/server/.classpath 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/server/.classpath 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/server/.project
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/server/.project 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/server/.project 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>bpm-sample-airticket-server</name>
+ <name>jbpm-spec-sample-airticket-server</name>
<comment></comment>
<projects>
</projects>
@@ -11,12 +11,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
+ <name>org.eclipse.stp.bpmn.validation.BatchValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.stp.bpmn.validation.BatchValidationBuilder</name>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/server/pom.xml
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/server/pom.xml 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/samples/airticket/server/pom.xml 2008-09-12 13:08:50 UTC (rev 2192)
@@ -14,27 +14,27 @@
<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>JBossBPM - Spec Samples Airticket (Server)</name>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-sample-airticket-server</artifactId>
+ <name>jBPM Spec - Samples Airticket (Server)</name>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-sample-airticket-server</artifactId>
<!-- Parent -->
<parent>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-sample-airticket</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-sample-airticket</artifactId>
<version>1.0.0-Alpha1</version>
</parent>
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-api10</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-api10</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-stp</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-stp</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/testsuite/.classpath
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/testsuite/.classpath 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/testsuite/.classpath 2008-09-12 13:08:50 UTC (rev 2192)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/testsuite/.project
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/testsuite/.project 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/testsuite/.project 2008-09-12 13:08:50 UTC (rev 2192)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>bpm-testsuite</name>
+ <name>jbpm-spec-testsuite</name>
<comment></comment>
<projects>
</projects>
@@ -11,12 +11,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
+ <name>org.eclipse.stp.bpmn.validation.BatchValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.stp.bpmn.validation.BatchValidationBuilder</name>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/testsuite/pom.xml
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/testsuite/pom.xml 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/modules/testsuite/pom.xml 2008-09-12 13:08:50 UTC (rev 2192)
@@ -13,15 +13,15 @@
<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>JBossBPM - Spec Testsuite</name>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-testsuite</artifactId>
+ <name>jBPM Spec - CTS</name>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-cts</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-spec</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec</artifactId>
<version>1.0.0-Alpha1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -31,8 +31,8 @@
<!-- Compile Dependencies -->
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-api</artifactId>
<version>${version}</version>
</dependency>
@@ -45,29 +45,29 @@
<!-- Runtime Dependencies -->
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-ri</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-ri</artifactId>
<version>${version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-api10</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-api10</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-stp</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-stp</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-jpdl32</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-jpdl32</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-xpdl21</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-xpdl21</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: projects/api/branches/jbpm-api-1.0.0-Alpha1/pom.xml
===================================================================
--- projects/api/branches/jbpm-api-1.0.0-Alpha1/pom.xml 2008-09-12 12:14:23 UTC (rev 2191)
+++ projects/api/branches/jbpm-api-1.0.0-Alpha1/pom.xml 2008-09-12 13:08:50 UTC (rev 2192)
@@ -13,16 +13,16 @@
<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>JBossBPM - Spec</name>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-spec</artifactId>
+ <name>jBPM Spec</name>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec</artifactId>
<packaging>pom</packaging>
<version>1.0.0-Alpha1</version>
<!-- Parent -->
<parent>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-parent</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-parent</artifactId>
<version>1.0.0.GA</version>
</parent>
@@ -50,33 +50,33 @@
<dependencies>
<!-- JBossBPM Dependencies -->
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-api</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-ri</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-ri</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-api10</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-api10</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-stp</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-stp</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-jpdl32</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-jpdl32</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-dialect-xpdl21</artifactId>
+ <groupId>org.jbpm.spec</groupId>
+ <artifactId>jbpm-spec-dialect-xpdl21</artifactId>
<version>${version}</version>
</dependency>
17 years, 7 months
JBoss JBPM SVN: r2191 - maven/parent/trunk.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-12 08:14:23 -0400 (Fri, 12 Sep 2008)
New Revision: 2191
Modified:
maven/parent/trunk/pom.xml
Log:
Use org.jbpm:jbpm-parent
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2008-09-12 12:00:37 UTC (rev 2190)
+++ maven/parent/trunk/pom.xml 2008-09-12 12:14:23 UTC (rev 2191)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<name>JBossBPM - Parent</name>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-parent</artifactId>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-parent</artifactId>
<packaging>pom</packaging>
<version>1.0.0.GA</version>
@@ -87,6 +87,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<failIfNoTests>false</failIfNoTests>
+ <trimStackTrace>false</trimStackTrace>
<systemProperties>
<property>
<name>log4j.output.dir</name>
17 years, 7 months
JBoss JBPM SVN: r2190 - in projects/api: tags and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-12 08:00:37 -0400 (Fri, 12 Sep 2008)
New Revision: 2190
Added:
projects/api/branches/jbpm-api-1.0.0-Alpha1/
Removed:
projects/api/tags/jboss-bpm-1.0.0-Alpha1/
Log:
Move jboss-bpm-1.0.0-Alpha1 to jbpm-api-1.0.0.Alpha1
Copied: projects/api/branches/jbpm-api-1.0.0-Alpha1 (from rev 2189, projects/api/tags/jboss-bpm-1.0.0-Alpha1)
17 years, 7 months
JBoss JBPM SVN: r2189 - projects.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-12 07:56:19 -0400 (Fri, 12 Sep 2008)
New Revision: 2189
Added:
projects/api/
Removed:
projects/spec/
Log:
Move jbossbpm/spec to projects/api
Copied: projects/api (from rev 2188, projects/spec)
17 years, 7 months
JBoss JBPM SVN: r2188 - /.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-12 07:55:58 -0400 (Fri, 12 Sep 2008)
New Revision: 2188
Added:
projects/
Removed:
jbossbpm/
Log:
Move jbossbpm/spec to projects/api
Copied: projects (from rev 2187, jbossbpm)
17 years, 7 months
JBoss JBPM SVN: r2187 - in jbpm3/trunk/modules/core/src: test/java/org/jbpm/jbpm1072 and 4 other directories.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-12 03:40:23 -0400 (Fri, 12 Sep 2008)
New Revision: 2187
Modified:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1452/JBPM1452Test.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/FlushDbTest.java
Log:
Remove all references to dropSchema
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2008-09-12 07:18:04 UTC (rev 2186)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2008-09-12 07:40:23 UTC (rev 2187)
@@ -43,32 +43,32 @@
private JbpmConfiguration jbpmConfiguration;
- protected JbpmContext jbpmContext = null;
- protected SchemaExport schemaExport = null;
+ protected JbpmContext jbpmContext;
+ protected SchemaExport schemaExport;
- protected Session session = null;
- protected GraphSession graphSession = null;
- protected TaskMgmtSession taskMgmtSession = null;
- protected ContextSession contextSession = null;
- protected JobSession jobSession = null;
- protected LoggingSession loggingSession = null;
+ protected Session session;
+ protected GraphSession graphSession;
+ protected TaskMgmtSession taskMgmtSession;
+ protected ContextSession contextSession;
+ protected JobSession jobSession;
+ protected LoggingSession loggingSession;
protected JobExecutor jobExecutor;
public void setUp() throws Exception
{
+ log.debug("### starting " + getClass().getName() + "." + getName() + " ####################################################");
createSchema();
createJbpmContext();
initializeMembers();
- log.debug("### starting " + getClass().getName() + "." + getName() + " ####################################################");
}
public void tearDown() throws Exception
{
- log.debug("### " + getClass().getName() + "." + getName() + " done ####################################################");
resetMembers();
closeJbpmContext();
super.tearDown();
+ log.debug("### " + getClass().getName() + "." + getName() + " done ####################################################");
}
public void beginSessionTransaction()
@@ -139,11 +139,17 @@
getJbpmConfiguration().dropSchema();
}
+ protected String getJbpmTestConfig()
+ {
+ return "org/jbpm/db/jbpm.db.test.cfg.xml";
+ }
+
protected JbpmConfiguration getJbpmConfiguration()
{
if (jbpmConfiguration == null)
{
- jbpmConfiguration = JbpmConfiguration.getInstance("org/jbpm/db/jbpm.db.test.cfg.xml");
+ String jbpmTestConfiguration = getJbpmTestConfig();
+ jbpmConfiguration = JbpmConfiguration.getInstance(jbpmTestConfiguration);
}
return jbpmConfiguration;
}
@@ -155,7 +161,8 @@
protected void closeJbpmContext()
{
- jbpmContext.close();
+ if (jbpmContext != null)
+ jbpmContext.close();
}
protected void startJobExecutor()
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java 2008-09-12 07:18:04 UTC (rev 2186)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java 2008-09-12 07:40:23 UTC (rev 2187)
@@ -1,12 +1,9 @@
package org.jbpm.jbpm1072;
-import java.sql.SQLException;
-
-import junit.framework.TestCase;
-
import org.jbpm.EventCallback;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
+import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.ProcessDefinition;
@@ -22,15 +19,14 @@
* @author Jiri Pechanec
* @author Alejandro Guizar
*/
-public class JBPM1072Test extends TestCase {
+public class JBPM1072Test extends AbstractDbTestCase
+{
private static final int EXECUTOR_COUNT = 20;
public static final String PROCESS_NAME = "TestProcess";
private JobExecutor[] executors = new JobExecutor[EXECUTOR_COUNT];
- private static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
-
public static final String PROCESS_DEFINITION = "<?xml version='1.0' encoding='UTF-8'?>"
+ "<process-definition name='" + PROCESS_NAME + "'>"
+ "<event type='process-end'>"
@@ -54,20 +50,10 @@
+ "<end-state name='end-state1' />"
+ "</process-definition>";
- protected void setUp() throws SQLException
+ @Override
+ protected JbpmConfiguration getJbpmConfiguration()
{
- jbpmConfiguration.createSchema();
-
- // deploy process definition
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
- try
- {
- jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(PROCESS_DEFINITION));
- }
- finally
- {
- jbpmContext.close();
- }
+ return JbpmConfiguration.getInstance();
}
public void testMultipleJobExecutors()
@@ -81,10 +67,11 @@
}
// kick off process instance
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ JbpmContext jbpmContext = getJbpmConfiguration().createJbpmContext();
try
{
- ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate(PROCESS_NAME);
+ jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(PROCESS_DEFINITION));
+ ProcessInstance processInstance = jbpmContext.newProcessInstance(PROCESS_NAME);
processInstance.getContextInstance().setVariable("eventCallback", new EventCallback());
processInstance.signal();
}
@@ -112,11 +99,6 @@
assertEquals(1, SimpleAction2.getExecutionCount());
}
- protected void tearDown()
- {
- jbpmConfiguration.dropSchema();
- }
-
public static class SimpleAction implements ActionHandler
{
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1452/JBPM1452Test.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1452/JBPM1452Test.java 2008-09-12 07:18:04 UTC (rev 2186)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1452/JBPM1452Test.java 2008-09-12 07:40:23 UTC (rev 2187)
@@ -21,11 +21,9 @@
*/
package org.jbpm.jbpm1452;
-import junit.framework.TestCase;
-
import org.jbpm.JbpmConfiguration;
-import org.jbpm.JbpmContext;
import org.jbpm.configuration.ObjectFactory;
+import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
@@ -36,28 +34,17 @@
*
* @author Alejandro Guizar
*/
-public class JBPM1452Test extends TestCase
+public class JBPM1452Test extends AbstractDbTestCase
{
-
- private JbpmContext jbpmContext;
-
- private static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString(
- "<jbpm-configuration>" +
- " <null name='jbpm.job.executor' />" +
- "</jbpm-configuration>");
-
- public void setUp() throws Exception
+ @Override
+ protected JbpmConfiguration getJbpmConfiguration()
{
- jbpmConfiguration.createSchema();
- jbpmContext = jbpmConfiguration.createJbpmContext();
+ return JbpmConfiguration.parseXmlString(
+ "<jbpm-configuration>" +
+ " <null name='jbpm.job.executor' />" +
+ "</jbpm-configuration>");
}
- public void tearDown() throws Exception
- {
- jbpmContext.close();
- jbpmConfiguration.dropSchema();
- }
-
public void testNoJobExecutor()
{
// check the job executor is properly nullified
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java 2008-09-12 07:18:04 UTC (rev 2186)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java 2008-09-12 07:40:23 UTC (rev 2187)
@@ -3,12 +3,10 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
+import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ExecutionContext;
@@ -22,32 +20,28 @@
*
* @author Tom Baeyens
*/
-public class JBPM983Test extends TestCase
+public class JBPM983Test extends AbstractDbTestCase
{
private static Log log = LogFactory.getLog(JBPM983Test.class);
- protected static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance("org/jbpm/jbpm.test.cfg.xml");
-
- protected void setUp() throws Exception
+ @Override
+ protected String getJbpmTestConfig()
{
- jbpmConfiguration.createSchema();
+ return "org/jbpm/jbpm.test.cfg.xml";
+ }
- JobExecutor jobExecutor = jbpmConfiguration.getJobExecutor();
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JobExecutor jobExecutor = getJbpmConfiguration().getJobExecutor();
jobExecutor.setNbrOfThreads(5);
jobExecutor.start();
-
- log.debug("");
- log.debug("### starting " + getName() + " ####################################################");
}
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
- log.debug("### " + getName() + " done ####################################################");
- log.debug("");
-
- jbpmConfiguration.getJobExecutor().stop();
-
- jbpmConfiguration.dropSchema();
+ getJbpmConfiguration().getJobExecutor().stop();
+ super.tearDown();
}
static String SUBPROCESS_XML = "<?xml version='1.0' encoding='UTF-8'?>"
@@ -119,11 +113,11 @@
public void testConcurrentJobs() throws Exception
{
- assertTrue(jbpmConfiguration.getJobExecutor().getNbrOfThreads() > 1);
+ assertTrue(getJbpmConfiguration().getJobExecutor().getNbrOfThreads() > 1);
log.info("### TEST: deploy + start processes ###");
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ JbpmContext jbpmContext = getJbpmConfiguration().createJbpmContext();
try
{
jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(SUBPROCESS_XML));
@@ -144,7 +138,7 @@
{
log.info("#################### TEST: starting process " + i + " ####################");
- jbpmContext = jbpmConfiguration.createJbpmContext();
+ jbpmContext = getJbpmConfiguration().createJbpmContext();
try
{
ProcessInstance pi = jbpmContext.newProcessInstanceForUpdate("superprocess");
@@ -165,7 +159,7 @@
long piId = piIds[i];
waitFor(piId);
- jbpmContext = jbpmConfiguration.createJbpmContext();
+ jbpmContext = getJbpmConfiguration().createJbpmContext();
try
{
ProcessInstance pi = jbpmContext.loadProcessInstance(piId);
@@ -204,7 +198,7 @@
fail();
}
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ JbpmContext jbpmContext = getJbpmConfiguration().createJbpmContext();
try
{
if (jbpmContext.loadProcessInstance(piId).hasEnded())
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java 2008-09-12 07:18:04 UTC (rev 2186)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java 2008-09-12 07:40:23 UTC (rev 2187)
@@ -4,57 +4,62 @@
import java.util.HashSet;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
+import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.graph.exe.ProcessInstance;
-public class JobLoadJoinTest extends TestCase {
+public class JobLoadJoinTest extends AbstractDbTestCase
+{
private static Log log = LogFactory.getLog(JobLoadJoinTest.class);
- private static JbpmConfiguration jbpmConfiguration =
- JbpmConfiguration.getInstance("org/jbpm/job/executor/loadtests.jbpm.cfg.xml");
-
static Set finishedProcesses = Collections.synchronizedSet(new HashSet());
long start;
- protected void setUp() throws Exception {
- jbpmConfiguration.createSchema();
- start = System.currentTimeMillis();
+ @Override
+ protected String getJbpmTestConfig()
+ {
+ return "org/jbpm/job/executor/loadtests.jbpm.cfg.xml";
}
- protected void tearDown() throws Exception {
- jbpmConfiguration.dropSchema();
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ start = System.currentTimeMillis();
}
- private boolean timeIsUp(int maxWait) {
- return System.currentTimeMillis() - start > maxWait;
+ private boolean timeout(int maxWait)
+ {
+ return System.currentTimeMillis() - start > maxWait;
}
- public void testJobLoadWithJoin() throws Exception {
+ public void testJobLoadWithJoin() throws Exception
+ {
int processes = 20;
- int maxWait = 20000;
+ int maxWait = 20000;
deployProcess();
- jbpmConfiguration.startJobExecutor();
-
+ getJbpmConfiguration().startJobExecutor();
+
Set expectedProcesses = new HashSet();
- for (int i = 0; i < processes; i++) {
+ for (int i = 0; i < processes; i++)
+ {
Integer number = new Integer(i);
expectedProcesses.add(number);
- Thread thread = new StartNewExecutionThread(number);
+ Thread thread = new StartNewExecutionThread(getJbpmConfiguration(), number);
thread.start();
}
-
- while (! expectedProcesses.equals(finishedProcesses) && !timeIsUp(maxWait)) {
+
+ while (!expectedProcesses.equals(finishedProcesses) && !timeout(maxWait))
+ {
Thread.sleep(200);
}
log.info("number of finished processes: " + finishedProcesses);
@@ -62,32 +67,6 @@
assertEquals(expectedProcesses, finishedProcesses);
}
- public static class StartNewExecutionThread extends Thread {
- Integer number;
- public StartNewExecutionThread(Integer number) {
- this.number = number;
- }
- public void run() {
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
- try {
- ProcessInstance processInstance = jbpmContext.newProcessInstance("asyncjoin");
- processInstance.getContextInstance().setVariable("number", number);
- jbpmContext.save(processInstance);
- } finally {
- jbpmContext.close();
- }
- }
- }
-
- public static class ProcessFinished implements ActionHandler {
- private static final long serialVersionUID = 1L;
- public void execute(ExecutionContext executionContext) throws Exception {
- Integer number = (Integer) executionContext.getVariable("number");
- log.info("process "+number+" finished");
- finishedProcesses.add(number);
- }
- }
-
public void deployProcess() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
"<process-definition name='asyncjoin' initial='yenom'>" +
@@ -116,11 +95,54 @@
" </event>" +
"</process-definition>"
);
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
- try {
+
+ JbpmContext jbpmContext = getJbpmConfiguration().createJbpmContext();
+ try
+ {
jbpmContext.deployProcessDefinition(processDefinition);
- } finally {
+ }
+ finally
+ {
jbpmContext.close();
}
}
+
+ public static class StartNewExecutionThread extends Thread
+ {
+ Integer number;
+ JbpmConfiguration jbpmConfiguration;
+
+ public StartNewExecutionThread(JbpmConfiguration jbpmConfiguration, Integer number)
+ {
+ this.jbpmConfiguration = jbpmConfiguration;
+ this.number = number;
+ }
+
+ public void run()
+ {
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ try
+ {
+ ProcessInstance processInstance = jbpmContext.newProcessInstance("asyncjoin");
+ processInstance.getContextInstance().setVariable("number", number);
+ jbpmContext.save(processInstance);
+ }
+ finally
+ {
+ jbpmContext.close();
+ }
+ }
+ }
+
+ public static class ProcessFinished implements ActionHandler
+ {
+ private static final long serialVersionUID = 1L;
+
+ public void execute(ExecutionContext executionContext) throws Exception
+ {
+ Integer number = (Integer)executionContext.getVariable("number");
+ log.info("process " + number + " finished");
+ finishedProcesses.add(number);
+ }
+ }
}
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.java 2008-09-12 07:18:04 UTC (rev 2186)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.java 2008-09-12 07:40:23 UTC (rev 2187)
@@ -8,88 +8,66 @@
import org.apache.commons.logging.LogFactory;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
+import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.graph.exe.ProcessInstance;
-import junit.framework.TestCase;
-
-public class JobLoadSubProcessTest extends TestCase {
-
+public class JobLoadSubProcessTest extends AbstractDbTestCase
+{
// TODO see JobLoadJoinTest, but instead of the joins, use a process with a sub process
private static Log log = LogFactory.getLog(JobLoadSubProcessTest.class);
static Set finishedProcesses = Collections.synchronizedSet(new HashSet());
long start;
- private static JbpmConfiguration jbpmConfiguration =
- JbpmConfiguration.getInstance("org/jbpm/job/executor/loadtests.jbpm.cfg.xml");
-
- protected void setUp() throws Exception {
- jbpmConfiguration.createSchema();
- start = System.currentTimeMillis();
+ @Override
+ protected String getJbpmTestConfig()
+ {
+ return "org/jbpm/job/executor/loadtests.jbpm.cfg.xml";
}
- protected void tearDown() throws Exception {
- jbpmConfiguration.dropSchema();
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ start = System.currentTimeMillis();
}
- private boolean timeIsUp(int maxWait) {
- return System.currentTimeMillis() - start > maxWait;
+ private boolean timeIsUp(int maxWait)
+ {
+ return System.currentTimeMillis() - start > maxWait;
}
- public void testJobLoadWithJoin() throws Exception {
+ public void testJobLoadWithJoin() throws Exception
+ {
int processes = 1;
- int maxWait = 20000;
+ int maxWait = 20000;
deployProcesses();
- jbpmConfiguration.startJobExecutor();
-
+ getJbpmConfiguration().startJobExecutor();
+
Set expectedProcesses = new HashSet();
- for (int i = 0; i < processes; i++) {
+ for (int i = 0; i < processes; i++)
+ {
Integer number = new Integer(i);
expectedProcesses.add(number);
- Thread thread = new StartNewExecutionThread(number);
+ Thread thread = new StartNewExecutionThread(getJbpmConfiguration(), number);
thread.start();
}
-
- while (! expectedProcesses.equals(finishedProcesses) && !timeIsUp(maxWait)) {
+
+ while (!expectedProcesses.equals(finishedProcesses) && !timeIsUp(maxWait))
+ {
Thread.sleep(200);
}
log.info("number of finished processes: " + finishedProcesses);
log.info("number of expected processes: " + expectedProcesses);
assertEquals(expectedProcesses, finishedProcesses);
}
-
- public static class StartNewExecutionThread extends Thread {
- Integer number;
- public StartNewExecutionThread(Integer number) {
- this.number = number;
- }
- public void run() {
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
- try {
- ProcessInstance processInstance = jbpmContext.newProcessInstance("asyncmaster");
- processInstance.getContextInstance().setVariable("number", number);
- jbpmContext.save(processInstance);
- } finally {
- jbpmContext.close();
- }
- }
- }
- public static class ProcessFinished implements ActionHandler {
- private static final long serialVersionUID = 1L;
- public void execute(ExecutionContext executionContext) throws Exception {
- Integer number = (Integer) executionContext.getVariable("number");
- log.info("process "+number+" finished");
- finishedProcesses.add(number);
- }
- }
-
- public void deployProcesses() {
+ public void deployProcesses()
+ {
String subProcess =
"<process-definition name='asyncsub' initial='ssarg'>" +
" <node name='ssarg' async='true'>" +
@@ -100,6 +78,7 @@
" <action class='"+ProcessFinished.class.getName()+"' />" +
" </event>" +
"</process-definition>";
+
String masterProcess =
"<process-definition name='asyncmaster' initial='yenom'>" +
" <node name='yenom' async='true'>" +
@@ -116,13 +95,55 @@
" <action class='"+ProcessFinished.class.getName()+"' />" +
" </event>" +
"</process-definition>";
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
- try {
+
+ JbpmContext jbpmContext = getJbpmConfiguration().createJbpmContext();
+ try
+ {
jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(subProcess));
jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(masterProcess));
- } finally {
+ }
+ finally
+ {
jbpmContext.close();
}
}
-
+
+ public static class StartNewExecutionThread extends Thread
+ {
+ JbpmConfiguration jbpmConfiguration;
+ Integer number;
+
+ public StartNewExecutionThread(JbpmConfiguration jbpmConfiguration, Integer number)
+ {
+ this.jbpmConfiguration = jbpmConfiguration;
+ this.number = number;
+ }
+
+ public void run()
+ {
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ try
+ {
+ ProcessInstance processInstance = jbpmContext.newProcessInstance("asyncmaster");
+ processInstance.getContextInstance().setVariable("number", number);
+ jbpmContext.save(processInstance);
+ }
+ finally
+ {
+ jbpmContext.close();
+ }
+ }
+ }
+
+ public static class ProcessFinished implements ActionHandler
+ {
+ private static final long serialVersionUID = 1L;
+
+ public void execute(ExecutionContext executionContext) throws Exception
+ {
+ Integer number = (Integer)executionContext.getVariable("number");
+ log.info("process " + number + " finished");
+ finishedProcesses.add(number);
+ }
+ }
}
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/FlushDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/FlushDbTest.java 2008-09-12 07:18:04 UTC (rev 2186)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/FlushDbTest.java 2008-09-12 07:40:23 UTC (rev 2187)
@@ -3,72 +3,76 @@
import java.sql.Connection;
import java.sql.DriverManager;
-import junit.framework.TestCase;
-
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
+import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.svc.Services;
-public class FlushDbTest extends TestCase {
+public class FlushDbTest extends AbstractDbTestCase
+{
+ private JbpmConfiguration jbpmConfiguration;
+
+ @Override
+ protected JbpmConfiguration getJbpmConfiguration()
+ {
+ if (jbpmConfiguration == null)
+ {
+ StringBuffer configurationText = new StringBuffer(
+ "<jbpm-configuration>" +
+ " <jbpm-context> " +
+ " <service name='persistence'>" +
+ " <factory> " +
+ " <bean class='org.jbpm.persistence.db.DbPersistenceServiceFactory'>" +
+ " <field name='isTransactionEnabled'><boolean value='false'/></field> " +
+ " </bean> " +
+ " </factory> " +
+ " </service>" +
+ " <service name='tx' factory='org.jbpm.tx.TxServiceFactory' /> " +
+ " <service name='message' factory='org.jbpm.msg.db.DbMessageServiceFactory' />" +
+ " <service name='scheduler' factory='org.jbpm.scheduler.db.DbSchedulerServiceFactory' />" +
+ " <service name='logging' factory='org.jbpm.logging.db.DbLoggingServiceFactory' /> " +
+ " <service name='authentication' factory='org.jbpm.security.authentication.DefaultAuthenticationServiceFactory' />" +
+ " </jbpm-context> ");
- static JbpmConfiguration jbpmConfiguration = createJbpmConfiguration();
+ // make custom jbpm configuration aware of hibernate.properties
+ if (FlushDbTest.class.getClassLoader().getResource("hibernate.properties") != null)
+ configurationText.append(" <string name='resource.hibernate.properties' value='hibernate.properties' />");
- private static JbpmConfiguration createJbpmConfiguration() {
- StringBuffer configurationText = new StringBuffer(
- "<jbpm-configuration>" +
- " <jbpm-context> " +
- " <service name='persistence'>" +
- " <factory> " +
- " <bean class='org.jbpm.persistence.db.DbPersistenceServiceFactory'>" +
- " <field name='isTransactionEnabled'><boolean value='false'/></field> " +
- " </bean> " +
- " </factory> " +
- " </service>" +
- " <service name='tx' factory='org.jbpm.tx.TxServiceFactory' /> " +
- " <service name='message' factory='org.jbpm.msg.db.DbMessageServiceFactory' />" +
- " <service name='scheduler' factory='org.jbpm.scheduler.db.DbSchedulerServiceFactory' />" +
- " <service name='logging' factory='org.jbpm.logging.db.DbLoggingServiceFactory' /> " +
- " <service name='authentication' factory='org.jbpm.security.authentication.DefaultAuthenticationServiceFactory' />" +
- " </jbpm-context> ");
-
- // make custom jbpm configuration aware of hibernate.properties
- if (FlushDbTest.class.getClassLoader().getResource("hibernate.properties") != null)
- configurationText.append(" <string name='resource.hibernate.properties' value='hibernate.properties' />");
-
- configurationText.append("</jbpm-configuration>");
- return JbpmConfiguration.parseXmlString(configurationText.toString());
+ configurationText.append("</jbpm-configuration>");
+ jbpmConfiguration = JbpmConfiguration.parseXmlString(configurationText.toString());
+ }
+ return jbpmConfiguration;
}
- // static DataSource dataSource = new Jdbc.MockDataSource();
+ public void testProcessDeployment() throws Exception
+ {
+ getJbpmConfiguration().createSchema();
- public void testProcessDeployment() throws Exception {
- jbpmConfiguration.createSchema();
-
- /* getConfiguration() relies on JbpmConfiguration.Configs, which accesses either the current context or
- * the default jbpm configuration resource, but has no access to a custom jbpm configuration.
- * Because createSchema() accesses the hibernate configuration under an open context, calling getConfiguration()
- * afterwards results in obtaining a hibernate configuration aware of the custom jbpm configuration */
- DbPersistenceServiceFactory dbPersistenceServiceFactory = (DbPersistenceServiceFactory) jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
+ /*
+ * getConfiguration() relies on JbpmConfiguration.Configs, which accesses either the current context or the default jbpm configuration resource, but has no access
+ * to a custom jbpm configuration. Because createSchema() accesses the hibernate configuration under an open context, calling getConfiguration() afterwards results
+ * in obtaining a hibernate configuration aware of the custom jbpm configuration
+ */
+ DbPersistenceServiceFactory dbPersistenceServiceFactory = (DbPersistenceServiceFactory)getJbpmConfiguration().getServiceFactory(Services.SERVICENAME_PERSISTENCE);
Configuration configuration = dbPersistenceServiceFactory.getConfiguration();
SessionFactory sessionFactory = dbPersistenceServiceFactory.getSessionFactory();
-
- try {
+
+ try
+ {
String dbDriverClass = configuration.getProperty("hibernate.connection.driver_class");
String dbUrl = configuration.getProperty("hibernate.connection.url");
String dbUserName = configuration.getProperty("hibernate.connection.username");
String dbPassword = configuration.getProperty("hibernate.connection.password");
-
+
Class.forName(dbDriverClass);
- Connection connection = DriverManager.getConnection(dbUrl, dbUserName, dbPassword);
+ Connection connection = DriverManager.getConnection(dbUrl, dbUserName, dbPassword);
connection.setAutoCommit(false);
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ JbpmContext jbpmContext = getJbpmConfiguration().createJbpmContext();
jbpmContext.setConnection(connection);
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition name='hello' />"
- );
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition name='hello' />");
jbpmContext.deployProcessDefinition(processDefinition);
jbpmContext.close();
connection.commit();
@@ -76,15 +80,16 @@
connection = DriverManager.getConnection(dbUrl, dbUserName, dbPassword);
connection.setAutoCommit(false);
- jbpmContext = jbpmConfiguration.createJbpmContext();
+ jbpmContext = getJbpmConfiguration().createJbpmContext();
jbpmContext.setConnection(connection);
jbpmContext.newProcessInstanceForUpdate("hello");
jbpmContext.close();
connection.commit();
connection.close();
-
- } finally {
- jbpmConfiguration.dropSchema();
+
+ }
+ finally
+ {
sessionFactory.close();
}
}
17 years, 7 months
JBoss JBPM SVN: r2186 - jbpm3/trunk/modules/distribution/scripts.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-09-12 03:18:04 -0400 (Fri, 12 Sep 2008)
New Revision: 2186
Modified:
jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
Log:
disabled automatic schema creation in distribution
Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-12 07:16:36 UTC (rev 2185)
+++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-12 07:18:04 UTC (rev 2186)
@@ -69,16 +69,19 @@
<property name="hsqldb.cfg.xml" value="${deploy.artifacts.resources}/jbpm-core-config/hibernate.cfg.hsqldb.xml"/>
<macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties"/>
+ <macro-disable file="${hsqldb.cfg.xml}" section="Automatic schema creation"/>
<macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties"/>
<macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties"/>
<property name="mysql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-core-config/hibernate.cfg.mysql.xml"/>
<macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties"/>
+ <macro-disable file="${mysql.cfg.xml}" section="Automatic schema creation"/>
<macro-enable file="${mysql.cfg.xml}" section="DataSource properties"/>
<macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties"/>
<property name="postgresql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-core-config/hibernate.cfg.postgresql.xml"/>
<macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties"/>
+ <macro-disable file="${postgresql.cfg.xml}" section="Automatic schema creation"/>
<macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/>
<macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/>
17 years, 7 months
JBoss JBPM SVN: r2185 - in jbpm3/trunk/modules: core/src/main/java/org/jbpm and 14 other directories.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-09-12 03:16:36 -0400 (Fri, 12 Sep 2008)
New Revision: 2185
Added:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/EventCallback.java
Removed:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/EventCallback.java
jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/test/
Modified:
jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml
jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/JbpmExpressionEvaluator.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/JbpmVariableResolver.java
jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml
jbpm3/trunk/modules/core/src/test/java/org/jbpm/SerializabilityTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1135/JBPM1135Test.java
jbpm3/trunk/modules/enterprise/jar/pom.xml
jbpm3/trunk/modules/enterprise/jar/scripts/antrun-test-jars.xml
jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java
jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/scheduler/ejbtimer/ExecuteTimerCommand.java
jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/msg/jms/JmsMessageTest.java
jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java
Log:
[JBPM-1709] moved EventCallback to core jar, so it can be shared between core and enterprise tests
removed enterprise-test.jar
EventCallback move also addresses sporadic class loading exception probably caused by continuously reloading enterprise-test.jar
Modified: jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml 2008-09-12 07:16:36 UTC (rev 2185)
@@ -21,14 +21,4 @@
<jndi-name>java:JmsXA</jndi-name>
</resource-ref>
- <ejb-local-ref>
- <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
- <local-jndi-name>java:ejb/TimerEntityBean</local-jndi-name>
- </ejb-local-ref>
-
- <message-destination-ref>
- <message-destination-ref-name>jms/JobQueue</message-destination-ref-name>
- <jndi-name>queue/JbpmJobQueue</jndi-name>
- </message-destination-ref>
-
</jboss-web>
Copied: jbpm3/trunk/modules/core/src/main/java/org/jbpm/EventCallback.java (from rev 2154, jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/test/EventCallback.java)
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/EventCallback.java (rev 0)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/EventCallback.java 2008-09-12 07:16:36 UTC (rev 2185)
@@ -0,0 +1,118 @@
+/*
+ * 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;
+
+import java.io.Serializable;
+
+import javax.transaction.Status;
+import javax.transaction.Synchronization;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.jbpm.graph.def.Event;
+
+public class EventCallback implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private static final Log log = LogFactory.getLog(EventCallback.class);
+
+ public void processStart() {
+ registerNotification(Event.EVENTTYPE_PROCESS_START);
+ }
+
+ public void processEnd() {
+ registerNotification(Event.EVENTTYPE_PROCESS_END);
+ }
+
+ public void nodeEnter() {
+ registerNotification(Event.EVENTTYPE_NODE_ENTER);
+ }
+
+ public void nodeLeave() {
+ registerNotification(Event.EVENTTYPE_NODE_LEAVE);
+ }
+
+ public void taskCreate() {
+ registerNotification(Event.EVENTTYPE_TASK_CREATE);
+ }
+
+ public void taskEnd() {
+ registerNotification(Event.EVENTTYPE_TASK_END);
+ }
+
+ public void timerCreate() {
+ registerNotification(Event.EVENTTYPE_TIMER_CREATE);
+ }
+
+ public void timer() {
+ registerNotification(Event.EVENTTYPE_TIMER);
+ }
+
+ public void transition() {
+ registerNotification(Event.EVENTTYPE_TRANSITION);
+ }
+
+ private static void registerNotification(final String event) {
+ Synchronization notification = new Synchronization() {
+
+ public void beforeCompletion() {}
+
+ public void afterCompletion(int status) {
+ if (status == Status.STATUS_COMMITTED) {
+ String canonEvent = event.intern();
+ log.debug("notifying " + canonEvent + "@" + Integer.toHexString(System.identityHashCode(canonEvent)));
+ synchronized (canonEvent) {
+ canonEvent.notify();
+ }
+ }
+ }
+
+ };
+ JbpmContext.getCurrentJbpmContext()
+ .getSession()
+ .getTransaction()
+ .registerSynchronization(notification);
+ }
+
+ public static void waitForEvent(String event) {
+ waitForEvent(event, 10000);
+ }
+
+ public static void waitForEvent(String event, long timeout) {
+ String canonEvent = event.intern();
+ long startTime = System.currentTimeMillis();
+ log.debug("waiting for " + canonEvent + "@" + Integer.toHexString(System.identityHashCode(canonEvent)));
+ try {
+ synchronized (canonEvent) {
+ canonEvent.wait(timeout);
+ }
+ }
+ catch (InterruptedException e) {
+ // reassert interruption
+ Thread.currentThread().interrupt();
+ }
+ if (System.currentTimeMillis() - startTime >= timeout) {
+ log.debug("event '" + canonEvent + "' took longer than " + timeout + " ms to occur");
+ }
+ }
+}
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/core/src/main/java/org/jbpm/EventCallback.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2008-09-12 07:16:36 UTC (rev 2185)
@@ -202,7 +202,17 @@
jobExecutor.addMonitoredJobId(getName(), job.getId());
}
} finally {
- jbpmContext.close();
+ try {
+ jbpmContext.close();
+ } catch (JbpmPersistenceException e) {
+ // if this is a stale object exception, keep it quiet
+ if (Services.isCausedByStaleState(e)) {
+ log.debug("optimistic locking failed, couldn't get next due date");
+ nextDueDate = null;
+ } else {
+ throw e;
+ }
+ }
}
return nextDueDate;
}
@@ -211,10 +221,10 @@
long interval = currentIdleInterval;
Date nextDueDate = getNextDueDate();
if (nextDueDate!=null) {
- long currentTimeMillis = System.currentTimeMillis();
- long nextDueDateTime = nextDueDate.getTime();
- if (nextDueDateTime < currentTimeMillis+currentIdleInterval) {
- interval = nextDueDateTime-currentTimeMillis;
+ long currentTime = System.currentTimeMillis();
+ long nextDueTime = nextDueDate.getTime();
+ if (nextDueTime < currentTime+currentIdleInterval) {
+ interval = nextDueTime-currentTime;
}
}
if (interval<0) {
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/LockMonitorThread.java 2008-09-12 07:16:36 UTC (rev 2185)
@@ -10,6 +10,8 @@
import org.jbpm.JbpmContext;
import org.jbpm.db.JobSession;
import org.jbpm.job.Job;
+import org.jbpm.persistence.JbpmPersistenceException;
+import org.jbpm.svc.Services;
public class LockMonitorThread extends Thread {
@@ -76,9 +78,13 @@
} finally {
try {
jbpmContext.close();
- } catch (RuntimeException e) {
- log.error("problem committing job execution transaction", e);
- throw e;
+ } catch (JbpmPersistenceException e) {
+ // if this is a stale object exception, keep it quiet
+ if (Services.isCausedByStaleState(e)) {
+ log.debug("optimistic locking failed, couldn't unlock overdue jobs");
+ } else {
+ throw e;
+ }
}
}
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/JbpmExpressionEvaluator.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/JbpmExpressionEvaluator.java 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/JbpmExpressionEvaluator.java 2008-09-12 07:16:36 UTC (rev 2185)
@@ -49,16 +49,15 @@
}
static String translateExpressionToDollars(String expression) {
- char[] chars = expression.toCharArray();
- int index = 0;
- while (index!=-1) {
- index = expression.indexOf("#{", index);
- if (index!=-1) {
- chars[index] = '$';
- index++;
- }
- }
- return new String(chars);
+ int hashIndex = expression.indexOf("#{");
+ if (hashIndex == -1) return expression;
+
+ char[] expressionChars = expression.toCharArray();
+ do {
+ expressionChars[hashIndex] = '$';
+ hashIndex = expression.indexOf("#{", hashIndex + 2);
+ } while (hashIndex != -1);
+ return new String(expressionChars);
}
public static VariableResolver getUsedVariableResolver() {
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/JbpmVariableResolver.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/JbpmVariableResolver.java 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/jpdl/el/impl/JbpmVariableResolver.java 2008-09-12 07:16:36 UTC (rev 2185)
@@ -61,11 +61,6 @@
SwimlaneInstance swimlaneInstance = taskMgmtInstance.getSwimlaneInstance(name);
value = (swimlaneInstance!=null ? swimlaneInstance.getActorId() : null);
- } else if ( (contextInstance!=null)
- && (contextInstance.hasTransientVariable(name))
- ) {
- value = contextInstance.getTransientVariable(name);
-
} else if (JbpmConfiguration.Configs.hasObject(name)) {
value = JbpmConfiguration.Configs.getObject(name);
}
Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/core/src/main/resources/hibernate.common.xml 2008-09-12 07:16:36 UTC (rev 2185)
@@ -17,9 +17,10 @@
<!-- # common settings # -->
<!-- ################################### -->
- <!-- Create schema on demand -->
+ <!-- Automatic schema creation (begin) -->
<property name="hibernate.hbm2ddl.auto">create</property>
-
+ <!-- Automatic schema creation (end) -->
+
<!-- Simple memory-only cache -->
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/SerializabilityTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/SerializabilityTest.java 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/SerializabilityTest.java 2008-09-12 07:16:36 UTC (rev 2185)
@@ -116,7 +116,8 @@
"org.jbpm.util.CustomLoaderObjectInputStream",
"org.jbpm.web.JobExecutorLauncher",
"org.jbpm.web.JbpmConfigurationCloser",
- "org.jbpm.JbpmContextTestHelper"
+ "org.jbpm.JbpmContextTestHelper",
+ "org.jbpm.EventCallback$1"
}));
public void testForNonSerializableClasses() {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java 2008-09-12 07:16:36 UTC (rev 2185)
@@ -4,6 +4,7 @@
import junit.framework.TestCase;
+import org.jbpm.EventCallback;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ActionHandler;
@@ -11,7 +12,6 @@
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.job.executor.EventCallback;
import org.jbpm.job.executor.JobExecutor;
/**
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1135/JBPM1135Test.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1135/JBPM1135Test.java 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1135/JBPM1135Test.java 2008-09-12 07:16:36 UTC (rev 2185)
@@ -21,11 +21,11 @@
*/
package org.jbpm.jbpm1135;
+import org.jbpm.EventCallback;
import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.job.executor.EventCallback;
/**
* JobSession.deleteJobsForProcessInstance doesn't work if jbpm isn't the transaction manager
Deleted: jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/EventCallback.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/EventCallback.java 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/EventCallback.java 2008-09-12 07:16:36 UTC (rev 2185)
@@ -1,105 +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.job.executor;
-
-import java.io.Serializable;
-
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jbpm.JbpmContext;
-import org.jbpm.graph.def.Event;
-
-public class EventCallback implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private static final Log log = LogFactory.getLog(EventCallback.class);
-
- public void processStart() {
- registerNotification(Event.EVENTTYPE_PROCESS_START);
- }
-
- public void processEnd() {
- registerNotification(Event.EVENTTYPE_PROCESS_END);
- }
-
- public void nodeEnter() {
- registerNotification(Event.EVENTTYPE_NODE_ENTER);
- }
-
- public void nodeLeave() {
- registerNotification(Event.EVENTTYPE_NODE_LEAVE);
- }
-
- public void taskCreate() {
- registerNotification(Event.EVENTTYPE_TASK_CREATE);
- }
-
- public void taskEnd() {
- registerNotification(Event.EVENTTYPE_TASK_END);
- }
-
- public void timerCreate() {
- registerNotification(Event.EVENTTYPE_TIMER_CREATE);
- }
-
- public void timer() {
- registerNotification(Event.EVENTTYPE_TIMER);
- }
-
- private static void registerNotification(final String event) {
- Synchronization notification = new Synchronization() {
-
- public void beforeCompletion() {
- // nothing to do here
- }
-
- public void afterCompletion(int status) {
- if (status == Status.STATUS_COMMITTED) {
- log.info("delivering " + event + " notification");
- synchronized (event) {
- event.notify();
- }
- }
- }
-
- };
- JbpmContext.getCurrentJbpmContext()
- .getSession()
- .getTransaction()
- .registerSynchronization(notification);
- }
-
- public static void waitForEvent(String event) {
- synchronized (event) {
- try {
- event.wait(30000);
- }
- catch (InterruptedException e) {
- // reassert interruption
- Thread.currentThread().interrupt();
- }
- }
- }
-}
\ No newline at end of file
Modified: jbpm3/trunk/modules/enterprise/jar/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-09-12 07:16:36 UTC (rev 2185)
@@ -166,14 +166,6 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- https://jira.jboss.org/jira/browse/JBPM-1708 -->
- <exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude>
- <!-- https://jira.jboss.org/jira/browse/JBPM-1709 -->
- <exclude>org/jbpm/msg/jms/AsyncProcessingTest.java</exclude>
- </excludes>
- </configuration>
</plugin>
</plugins>
</build>
Modified: jbpm3/trunk/modules/enterprise/jar/scripts/antrun-test-jars.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/scripts/antrun-test-jars.xml 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/enterprise/jar/scripts/antrun-test-jars.xml 2008-09-12 07:16:36 UTC (rev 2185)
@@ -22,10 +22,7 @@
<!-- enterprise-test -->
<war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jbpm/**" />
- <exclude name="org/jbpm/enterprise/test/**" />
- </classes>
+ <classes dir="${tests.output.dir}/test-classes" />
<lib dir="${tests.output.dir}/test-dependencies">
<include name="aspectjrt*.jar"/>
<include name="cactus*.jar"/>
@@ -36,12 +33,6 @@
</webinf>
</war>
- <jar destfile="${tests.output.dir}/test-libs/enterprise-test.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jbpm/enterprise/test/**" />
- </fileset>
- </jar>
-
<!-- Please add alphabetically -->
</target>
Modified: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java 2008-09-12 07:16:36 UTC (rev 2185)
@@ -30,11 +30,17 @@
jobSession.deleteJob(job);
}
}
+ catch (RuntimeException e) {
+ // nothing to do but clean up and exit
+ throw e;
+ }
catch (Exception e) {
- log.debug("exception while executing " + job, e);
+ // save data about recoverable error condition
+ log.error("exception while executing " + job, e);
StringWriter memoryWriter = new StringWriter();
e.printStackTrace(new PrintWriter(memoryWriter));
job.setException(memoryWriter.toString());
+ job.setRetries(job.getRetries() - 1);
}
return job;
}
Modified: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/scheduler/ejbtimer/ExecuteTimerCommand.java
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/scheduler/ejbtimer/ExecuteTimerCommand.java 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/scheduler/ejbtimer/ExecuteTimerCommand.java 2008-09-12 07:16:36 UTC (rev 2185)
@@ -7,7 +7,6 @@
import org.apache.commons.logging.LogFactory;
import org.jbpm.JbpmContext;
import org.jbpm.command.Command;
-import org.jbpm.db.JobSession;
import org.jbpm.job.Timer;
public class ExecuteTimerCommand implements Command {
@@ -21,8 +20,7 @@
}
public Object execute(JbpmContext jbpmContext) throws Exception {
- JobSession jobSession = jbpmContext.getJobSession();
- Timer timer = jobSession.loadTimer(timerId);
+ Timer timer = jbpmContext.getJobSession().loadTimer(timerId);
timer.setLockOwner(getClass().getName()); // prevent others from removing timer
log.debug("executing " + timer);
try {
@@ -30,11 +28,17 @@
jbpmContext.getServices().getSchedulerService().deleteTimer(timer);
}
}
+ catch (RuntimeException e) {
+ // nothing to do but clean up and exit
+ throw e;
+ }
catch (Exception e) {
- log.debug("exception while executing " + timer, e);
+ // save data about recoverable error condition
+ log.error("exception while executing " + timer, e);
StringWriter memoryWriter = new StringWriter();
e.printStackTrace(new PrintWriter(memoryWriter));
timer.setException(memoryWriter.toString());
+ timer.setRetries(timer.getRetries() - 1);
}
return timer;
}
Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/msg/jms/JmsMessageTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/msg/jms/JmsMessageTest.java 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/msg/jms/JmsMessageTest.java 2008-09-12 07:16:36 UTC (rev 2185)
@@ -22,11 +22,6 @@
package org.jbpm.msg.jms;
import java.util.Collections;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.TreeSet;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -37,6 +32,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jbpm.EventCallback;
import org.jbpm.IntegrationTestSetup;
import org.jbpm.JbpmContext;
import org.jbpm.command.Command;
@@ -44,9 +40,6 @@
import org.jbpm.command.StartProcessInstanceCommand;
import org.jbpm.ejb.LocalCommandService;
import org.jbpm.ejb.LocalCommandServiceHome;
-import org.jbpm.enterprise.test.ActionRecorder;
-import org.jbpm.enterprise.test.EventCallback;
-import org.jbpm.enterprise.test.Recorder;
import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
@@ -65,7 +58,7 @@
static final int maxWaitTime = 30000;
public static Test suite() throws Exception {
- return new IntegrationTestSetup(JmsMessageTest.class, "enterprise-test.war, enterprise-test.jar");
+ return new IntegrationTestSetup(JmsMessageTest.class, "enterprise-test.war");
}
protected void setUp() throws Exception {
@@ -102,32 +95,32 @@
+ "</process-definition>");
long processId = launchProcess("node").getId();
EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END);
- assertTrue(isProcessFinished(processId));
+ assertTrue(hasProcessEnded(processId));
}
public void testAsyncAction() {
- Recorder.resetCollections();
- deleteAllJobs();
deployProcess("<process-definition name='action'>"
- + " <event type='process-end'>"
- + " <action expression='#{eventCallback.processEnd}'/>"
- + " </event>"
+ " <start-state name='start'>"
+ " <transition to='a' />"
+ " </start-state>"
+ " <node name='a'>"
+ " <event type='node-enter'>"
- + " <action name='X' async='true' class='" + ActionRecorder.class.getName() + "' />"
+ + " <action async='true' expression='#{eventCallback.nodeEnter}' />"
+ " </event>"
- + " <transition to='end' />"
+ + " <event type='node-leave'>"
+ + " <action async='true' expression='#{eventCallback.nodeLeave}' />"
+ + " </event>"
+ + " <transition to='end'>"
+ + " <action async='true' expression='#{eventCallback.transition}' />"
+ + " </transition>"
+ " </node>"
+ " <end-state name='end' />"
+ "</process-definition>");
long processId = launchProcess("action").getId();
- assertTrue(isProcessFinished(processId));
- // action continues in the background
- processAllJobs(maxWaitTime);
- assertEquals(Collections.singleton(processId + "X"), Recorder.collectedResults);
+ EventCallback.waitForEvent(Event.EVENTTYPE_NODE_ENTER);
+ EventCallback.waitForEvent(Event.EVENTTYPE_NODE_LEAVE);
+ EventCallback.waitForEvent(Event.EVENTTYPE_TRANSITION);
+ assertTrue(hasProcessEnded(processId));
}
public void testAsyncSequence() {
@@ -157,7 +150,7 @@
+ "</process-definition>");
long processId = launchProcess("sequence").getId();
EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END);
- assertTrue(isProcessFinished(processId));
+ assertTrue(hasProcessEnded(processId));
}
public void testAsyncFork() {
@@ -197,62 +190,48 @@
+ "</process-definition>");
long processId = launchProcess("fork").getId();
EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END);
- assertTrue(isProcessFinished(processId));
+ assertTrue(hasProcessEnded(processId));
}
public void testAsyncExecutions() {
- Recorder.resetCollections();
- deleteAllJobs();
- deployProcess("<process-definition name='executions'>" +
- " <start-state>" +
- " <transition to='a' />" +
- " </start-state>" +
- " <node name='a' async='true'>" +
- " <action class='"+Recorder.class.getName()+"' />" +
- " <transition to='b' />" +
- " </node>" +
- " <node name='b' async='true'>" +
- " <event type='node-enter'>" +
- " <action name='X' async='true' class='"+ActionRecorder.class.getName()+"' />" +
- " </event>" +
- " <action class='"+Recorder.class.getName()+"' />" +
- " <transition to='c' />" +
- " </node>" +
- " <node name='c' async='true'>" +
- " <action class='"+Recorder.class.getName()+"' />" +
- " <transition to='d'>" +
- " <action name='Y' async='true' class='"+ActionRecorder.class.getName()+"' />" +
- " </transition>" +
- " </node>" +
- " <node name='d' async='true'>" +
- " <action class='"+Recorder.class.getName()+"' />" +
- " <transition to='e' />" +
- " <event type='node-leave'>" +
- " <action name='Z' async='true' class='"+ActionRecorder.class.getName()+"' />" +
- " </event>" +
- " </node>" +
- " <node name='e' async='true'>" +
- " <action class='"+Recorder.class.getName()+"' />" +
- " <transition to='end' />" +
- " </node>" +
- " <end-state name='end'/>" +
- "</process-definition>");
- launchProcesses("executions");
- processAllJobs(maxWaitTime);
- Set expectedResults = new TreeSet();
- for (Iterator i = Recorder.collectedProcessInstanceIds.iterator(); i.hasNext();) {
- Long processInstanceId = (Long) i.next();
- expectedResults.add(processInstanceId+"a");
- expectedResults.add(processInstanceId+"b");
- expectedResults.add(processInstanceId+"c");
- expectedResults.add(processInstanceId+"d");
- expectedResults.add(processInstanceId+"e");
- expectedResults.add(processInstanceId+"X");
- expectedResults.add(processInstanceId+"Y");
- expectedResults.add(processInstanceId+"Z");
+ deployProcess("<process-definition name='execution'>"
+ + " <event type='process-end'>"
+ + " <action expression='#{eventCallback.processEnd}' />"
+ + " </event>"
+ + " <start-state>"
+ + " <transition to='a' />"
+ + " </start-state>"
+ + " <node name='a' async='true'>"
+ + " <transition to='b' />"
+ + " </node>"
+ + " <node name='b'>"
+ + " <event type='node-enter'>"
+ + " <action async='true' expression='#{eventCallback.nodeEnter}' />"
+ + " </event>"
+ + " <transition to='c' />"
+ + " </node>"
+ + " <node name='c' async='true'>"
+ + " <transition to='d' />"
+ + " </node>"
+ + " <node name='d'>"
+ + " <transition to='e' />"
+ + " <event type='node-leave'>"
+ + " <action async='true' expression='#{eventCallback.nodeLeave}' />"
+ + " </event>"
+ + " </node>"
+ + " <node name='e' async='true'>"
+ + " <transition to='end' />"
+ + " </node>"
+ + " <end-state name='end' />"
+ + "</process-definition>");
+ long[] processIds = new long[processExecutionCount];
+ for (int i = 0; i < processExecutionCount; i++) {
+ processIds[i] = launchProcess("execution").getId();
}
- assertEquals(processExecutionCount, Recorder.collectedProcessInstanceIds.size());
- assertEquals(expectedResults, Recorder.collectedResults);
+ for (int i = 0; i < processExecutionCount; i++) {
+ waitForProcessEnd(processIds[i]);
+ assertTrue(hasProcessEnded(processIds[i]));
+ }
}
private ProcessDefinition deployProcess(String xml) {
@@ -266,13 +245,7 @@
return (ProcessInstance) commandService.execute(command);
}
- private void launchProcesses(String processName) {
- for (int i=0; i<processExecutionCount; i++) {
- launchProcess(processName);
- }
- }
-
- private boolean isProcessFinished(final long processId) {
+ private boolean hasProcessEnded(final long processId) {
Boolean isFinished = (Boolean) commandService.execute(new Command() {
private static final long serialVersionUID = 1L;
public Object execute(JbpmContext jbpmContext) throws Exception {
@@ -282,57 +255,16 @@
return isFinished.booleanValue();
}
- private void deleteAllJobs() {
- commandService.execute(new Command() {
- private static final long serialVersionUID = 1L;
- public Object execute(JbpmContext jbpmContext) throws Exception {
- int jobCount = jbpmContext.getSession()
- .createQuery("delete from org.jbpm.job.Job")
- .executeUpdate();
- log.debug(jobCount + " jobs deleted");
- return null;
+ private void waitForProcessEnd(long processId) {
+ long startTime = System.currentTimeMillis();
+ while (!hasProcessEnded(processId)) {
+ if (System.currentTimeMillis() - startTime > maxWaitTime) {
+ log.warn("process " + processId + " took too long");
+ break;
}
- });
- }
-
- private void processAllJobs(long maxWait) {
- // install a timer that will interrupt if it takes too long
- // if that happens, it will lead to an interrupted exception and the test will fail
- TimerTask interruptTask = new TimerTask() {
- Thread testThread = Thread.currentThread();
- public void run() {
- log.debug("test "+getName()+" took too long: interrupting...");
- testThread.interrupt();
- }
- };
- Timer timer = new Timer();
- timer.schedule(interruptTask, maxWait);
-
- try {
- while (getAvailableJobCount() > 0) {
- log.debug("waiting for job listener to process more jobs");
- Thread.sleep(200);
- }
- } catch (InterruptedException e) {
- fail("test execution exceeded treshold of "+maxWait+" milliseconds");
- } finally {
- timer.cancel();
+ EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END, 500);
}
}
- private int getAvailableJobCount() {
- Number jobCount = (Number) commandService.execute(new Command() {
- private static final long serialVersionUID = 1L;
- public Object execute(JbpmContext jbpmContext) throws Exception {
- Object jobCount = jbpmContext.getSession()
- .createQuery("select count(*) from org.jbpm.job.Job")
- .uniqueResult();
- log.debug(jobCount + " jobs remaining");
- return jobCount;
- }
- });
- return jobCount.intValue();
- }
-
private static Log log = LogFactory.getLog(JmsMessageTest.class);
}
Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java 2008-09-12 07:05:33 UTC (rev 2184)
+++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java 2008-09-12 07:16:36 UTC (rev 2185)
@@ -32,6 +32,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jbpm.EventCallback;
import org.jbpm.IntegrationTestSetup;
import org.jbpm.JbpmContext;
import org.jbpm.command.Command;
@@ -39,7 +40,6 @@
import org.jbpm.command.StartProcessInstanceCommand;
import org.jbpm.ejb.LocalCommandService;
import org.jbpm.ejb.LocalCommandServiceHome;
-import org.jbpm.enterprise.test.EventCallback;
import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
@@ -58,8 +58,7 @@
private static final Log log = LogFactory.getLog(EjbSchedulerTest.class);
public static Test suite() throws Exception {
- return new IntegrationTestSetup(EjbSchedulerTest.class,
- "enterprise-test.war, enterprise-test.jar");
+ return new IntegrationTestSetup(EjbSchedulerTest.class, "enterprise-test.war");
}
protected void setUp() throws Exception {
17 years, 7 months