February 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r3879 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-02-14 05:15:54 -0500 (Sat, 14 Feb 2009) New Revision: 3879 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java Log: JBPM-1914: fix unintended optional dependency regression Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java 2009-02-14 10:09:44 UTC (rev 3878) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java 2009-02-14 10:15:54 UTC (rev 3879) @@ -23,7 +23,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jbpm.JbpmException; import org.jbpm.context.exe.Converter; import org.jbpm.context.exe.JbpmType; import org.jbpm.context.exe.JbpmTypeMatcher; @@ -72,7 +71,10 @@ variableInstanceClass = ClassLoaderUtil.classForName(variableInstanceClassName).asSubclass( VariableInstance.class); } - catch (JbpmException e) { + catch (ConfigurationException e) { + throw e; + } + catch (RuntimeException e) { // Client probably does not need support for this type and omitted the dependency // So let us log and ignore log.debug("could not instantiate jbpm type '" + XmlUtil.toString(jbpmTypeElement) + "': " + e);

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3878 - in jbpm3/trunk/modules/core/src/main: resources/org/jbpm/context/exe and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-02-14 05:09:44 -0500 (Sat, 14 Feb 2009) New Revision: 3878 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/jbpm.varmapping.xml Log: JBPM-1914: fix unintended optional dependency regression Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java 2009-02-14 09:31:01 UTC (rev 3877) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java 2009-02-14 10:09:44 UTC (rev 3878) @@ -44,40 +44,38 @@ public JbpmTypeObjectInfo(Element jbpmTypeElement, ObjectFactoryParser objectFactoryParser) { super(jbpmTypeElement, objectFactoryParser); - Element typeMatcherElement = XmlUtil.element(jbpmTypeElement, "matcher"); - if (typeMatcherElement == null) { - throw new ConfigurationException("matcher is a required element in a jbpm-type: " - + XmlUtil.toString(jbpmTypeElement)); - } - Element typeMatcherBeanElement = XmlUtil.element(typeMatcherElement); - typeMatcherObjectInfo = objectFactoryParser.parse(typeMatcherBeanElement); - - Element converterElement = XmlUtil.element(jbpmTypeElement, "converter"); - if (converterElement != null) { - if (!converterElement.hasAttribute("class")) { - throw new ConfigurationException("class attribute is required in a converter element: " + try { + Element typeMatcherElement = XmlUtil.element(jbpmTypeElement, "matcher"); + if (typeMatcherElement == null) { + throw new ConfigurationException("matcher element is required in <jbpm-type>: " + XmlUtil.toString(jbpmTypeElement)); } - String converterClassName = converterElement.getAttribute("class"); - converter = Converters.getConverterByClassName(converterClassName); - } + Element typeMatcherBeanElement = XmlUtil.element(typeMatcherElement); + typeMatcherObjectInfo = objectFactoryParser.parse(typeMatcherBeanElement); - Element variableInstanceElement = XmlUtil.element(jbpmTypeElement, "variable-instance"); - if (!variableInstanceElement.hasAttribute("class")) { - throw new ConfigurationException( - "class is a required attribute in element variable-instance: " + Element converterElement = XmlUtil.element(jbpmTypeElement, "converter"); + if (converterElement != null) { + if (!converterElement.hasAttribute("class")) { + throw new ConfigurationException("class attribute is required in <converter>: " + XmlUtil.toString(jbpmTypeElement)); - } + } + String converterClassName = converterElement.getAttribute("class"); + converter = Converters.getConverterByClassName(converterClassName); + } - String variableInstanceClassName = variableInstanceElement.getAttribute("class"); - try { + Element variableInstanceElement = XmlUtil.element(jbpmTypeElement, "variable-instance"); + if (!variableInstanceElement.hasAttribute("class")) { + throw new ConfigurationException("class attribute is required in <variable-instance>: " + + XmlUtil.toString(jbpmTypeElement)); + } + String variableInstanceClassName = variableInstanceElement.getAttribute("class"); variableInstanceClass = ClassLoaderUtil.classForName(variableInstanceClassName).asSubclass( VariableInstance.class); } catch (JbpmException e) { // Client probably does not need support for this type and omitted the dependency // So let us log and ignore - log.debug("could not instantiate jbpm type" + XmlUtil.toString(jbpmTypeElement), e); + log.debug("could not instantiate jbpm type '" + XmlUtil.toString(jbpmTypeElement) + "': " + e); // make sure this JbpmType is ignored by always returning false in the JbpmTypeMatcher typeMatcherObjectInfo = NoObjectInfo.getInstance(); converter = null; Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/jbpm.varmapping.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/jbpm.varmapping.xml 2009-02-14 09:31:01 UTC (rev 3877) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/jbpm.varmapping.xml 2009-02-14 10:09:44 UTC (rev 3878) @@ -146,6 +146,15 @@ <variable-instance class="org.jbpm.context.exe.variableinstance.HibernateStringInstance" /> </jbpm-type> +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.SerializableMatcher" /> + </matcher> + <converter class="org.jbpm.context.exe.converter.SerializableToByteArrayConverter" /> + <variable-instance class="org.jbpm.context.exe.variableinstance.ByteArrayInstance" /> + </jbpm-type> +  <jbpm-type> <matcher> @@ -162,15 +171,6 @@ <variable-instance class="org.jbpm.context.exe.variableinstance.JcrNodeInstance" /> </jbpm-type> -  - <jbpm-type> - <matcher> - <bean class="org.jbpm.context.exe.matcher.SerializableMatcher" /> - </matcher> - <converter class="org.jbpm.context.exe.converter.SerializableToByteArrayConverter" /> - <variable-instance class="org.jbpm.context.exe.variableinstance.ByteArrayInstance" /> - </jbpm-type> - </list> </jbpm-types>

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3877 - in jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise: jbpm1903 and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-02-14 04:31:01 -0500 (Sat, 14 Feb 2009) New Revision: 3877 Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/AbstractEnterpriseTestCase.java jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1903/JBPM1903Test.java Log: push up JBPM1903Test.getVariable method Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/AbstractEnterpriseTestCase.java =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/AbstractEnterpriseTestCase.java 2009-02-14 09:30:27 UTC (rev 3876) +++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/AbstractEnterpriseTestCase.java 2009-02-14 09:31:01 UTC (rev 3877) @@ -121,6 +121,17 @@ return processInstance.hasEnded(); } + protected Object getVariable(final long processInstanceId, final String variableName) { + return commandService.execute(new Command() { + private static final long serialVersionUID = 1L; + + public Object execute(JbpmContext jbpmContext) throws Exception { + ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceId); + return processInstance.getContextInstance().getVariable(variableName); + } + }); + } + protected String getHibernateDialect() { return (String) commandService.execute(new Command() { private static final long serialVersionUID = 1L; Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1903/JBPM1903Test.java =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1903/JBPM1903Test.java 2009-02-14 09:30:27 UTC (rev 3876) +++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1903/JBPM1903Test.java 2009-02-14 09:31:01 UTC (rev 3877) @@ -33,10 +33,7 @@ import junit.framework.Test; import org.jboss.bpm.api.test.IntegrationTestSetup; -import org.jbpm.JbpmContext; -import org.jbpm.command.Command; import org.jbpm.enterprise.AbstractEnterpriseTestCase; -import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.util.IoUtil; /** @@ -77,15 +74,4 @@ zipOut.close(); return memoryOut.toByteArray(); } - - private Object getVariable(final long processInstanceId, final String variableName) { - return commandService.execute(new Command() { - private static final long serialVersionUID = 1L; - - public Object execute(JbpmContext jbpmContext) throws Exception { - ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceId); - return processInstance.getContextInstance().getVariable(variableName); - } - }); - } }

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3876 - in jbpm3/trunk/modules/core/src: main/java/org/jbpm/configuration and 10 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-02-14 04:30:27 -0500 (Sat, 14 Feb 2009) New Revision: 3876 Added: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/ContextConverter.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1914/ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1914/JBPM1914Test.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1914/ObjectToStringConverter.java jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm1914/ jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm1914/jbpm.cfg.xml jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm1914/jbpm.varmapping.xml Removed: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/jbpm.converter.properties Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/Converter.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/JbpmType.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/VariableInstance.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/BooleanToStringConverter.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/ByteToLongConverter.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/BytesToByteArrayConverter.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/CharacterToStringConverter.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/DateToLongConverter.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/DoubleToStringConverter.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/FloatToDoubleConverter.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/FloatToStringConverter.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/IntegerToLongConverter.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/ShortToLongConverter.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/Converters.java jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/jbpm.varmapping.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp18InterleavedParallelRoutingTest.java Log: JBPM-1914: prevent ConverterEnumType from retrieving the default JbpmConfiguration in cases where the JbpmContext is closed before the Hibernate session is; generalize converters Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -342,9 +342,6 @@ return objectFactoryImpl; } - /** - * create an ObjectFacotory from an XML string. - */ public static JbpmConfiguration parseXmlString(String xml) { log.debug("creating jbpm configuration from xml string"); InputStream inputStream = null; Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/configuration/JbpmTypeObjectInfo.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -23,6 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jbpm.JbpmException; import org.jbpm.context.exe.Converter; import org.jbpm.context.exe.JbpmType; import org.jbpm.context.exe.JbpmTypeMatcher; @@ -35,71 +36,112 @@ public class JbpmTypeObjectInfo extends AbstractObjectInfo { private static final long serialVersionUID = 1L; - + ObjectInfo typeMatcherObjectInfo = null; - Converter converter = null; - Class variableInstanceClass = null; - + Converter<?, ?> converter = null; + Class<? extends VariableInstance> variableInstanceClass = null; + public JbpmTypeObjectInfo(Element jbpmTypeElement, ObjectFactoryParser objectFactoryParser) { super(jbpmTypeElement, objectFactoryParser); - + + Element typeMatcherElement = XmlUtil.element(jbpmTypeElement, "matcher"); + if (typeMatcherElement == null) { + throw new ConfigurationException("matcher is a required element in a jbpm-type: " + + XmlUtil.toString(jbpmTypeElement)); + } + Element typeMatcherBeanElement = XmlUtil.element(typeMatcherElement); + typeMatcherObjectInfo = objectFactoryParser.parse(typeMatcherBeanElement); + + Element converterElement = XmlUtil.element(jbpmTypeElement, "converter"); + if (converterElement != null) { + if (!converterElement.hasAttribute("class")) { + throw new ConfigurationException("class attribute is required in a converter element: " + + XmlUtil.toString(jbpmTypeElement)); + } + String converterClassName = converterElement.getAttribute("class"); + converter = Converters.getConverterByClassName(converterClassName); + } + + Element variableInstanceElement = XmlUtil.element(jbpmTypeElement, "variable-instance"); + if (!variableInstanceElement.hasAttribute("class")) { + throw new ConfigurationException( + "class is a required attribute in element variable-instance: " + + XmlUtil.toString(jbpmTypeElement)); + } + + String variableInstanceClassName = variableInstanceElement.getAttribute("class"); try { - Element typeMatcherElement = XmlUtil.element(jbpmTypeElement, "matcher"); - if (typeMatcherElement==null) { - throw new ConfigurationException("matcher is a required element in a jbpm-type: "+XmlUtil.toString(jbpmTypeElement)); - } - Element typeMatcherBeanElement = XmlUtil.element(typeMatcherElement); - typeMatcherObjectInfo = objectFactoryParser.parse(typeMatcherBeanElement); - - Element converterElement = XmlUtil.element(jbpmTypeElement, "converter"); - if (converterElement!=null) { - if (! converterElement.hasAttribute("class")) { - throw new ConfigurationException("class attribute is required in a converter element: "+XmlUtil.toString(jbpmTypeElement)); - } - String converterClassName = converterElement.getAttribute("class"); - converter = Converters.getConverterByClassName(converterClassName); - } - - Element variableInstanceElement = XmlUtil.element(jbpmTypeElement, "variable-instance"); - if (! variableInstanceElement.hasAttribute("class")) { - throw new ConfigurationException("class is a required attribute in element variable-instance: "+XmlUtil.toString(jbpmTypeElement)); - } - String variableInstanceClassName = variableInstanceElement.getAttribute("class"); - variableInstanceClass = ClassLoaderUtil.classForName(variableInstanceClassName); - if (! VariableInstance.class.isAssignableFrom(variableInstanceClass)) { - throw new ConfigurationException("variable instance class '"+variableInstanceClassName+"' is not a VariableInstance"); - } - } catch (ConfigurationException e){ - throw e; - } catch (Exception e) { - // NOTE that Error's are not caught because that might halt the JVM and mask the original Error. - // Probably the user doesn't need support for this type and doesn't have a required library in the path. - // So let's log and ignore - log.debug("jbpm variables type "+XmlUtil.toString(jbpmTypeElement)+" couldn't be instantiated properly: "+e.toString()); - // now, let's make sure that this JbpmType is ignored by always returning false in the JbpmTypeMatcher - typeMatcherObjectInfo = new ObjectInfo() { - private static final long serialVersionUID = 1L; - public boolean hasName() {return false;} - public String getName() {return null;} - public boolean isSingleton() {return true;} - public Object createObject(ObjectFactoryImpl objectFactory) { - return new JbpmTypeMatcher() { - private static final long serialVersionUID = 1L; - public boolean matches(Object value) { - return false; - } - }; - } - }; + variableInstanceClass = ClassLoaderUtil.classForName(variableInstanceClassName).asSubclass( + VariableInstance.class); + } + catch (JbpmException e) { + // Client probably does not need support for this type and omitted the dependency + // So let us log and ignore + log.debug("could not instantiate jbpm type" + XmlUtil.toString(jbpmTypeElement), e); + // make sure this JbpmType is ignored by always returning false in the JbpmTypeMatcher + typeMatcherObjectInfo = NoObjectInfo.getInstance(); converter = null; variableInstanceClass = null; } } + static class NoObjectInfo implements ObjectInfo { + + private static final long serialVersionUID = 1L; + + private static ObjectInfo instance; + + private NoObjectInfo() { + // hide default constructor to prevent instantiation + } + + public boolean hasName() { + return false; + } + + public String getName() { + return null; + } + + public boolean isSingleton() { + return true; + } + + public Object createObject(ObjectFactoryImpl objectFactory) { + return NoTypeMatcher.getInstance(); + } + + static ObjectInfo getInstance() { + if (instance == null) { + instance = new NoObjectInfo(); + } + return instance; + } + } + + static class NoTypeMatcher implements JbpmTypeMatcher { + + private static final long serialVersionUID = 1L; + + static final JbpmTypeMatcher instance = new NoTypeMatcher(); + + private NoTypeMatcher() { + // hide default constructor to prevent instantiation + } + + public boolean matches(Object value) { + return false; + } + + static JbpmTypeMatcher getInstance() { + return instance; + } + } + public Object createObject(ObjectFactoryImpl objectFactory) { JbpmTypeMatcher jbpmTypeMatcher = (JbpmTypeMatcher) objectFactory.createObject(typeMatcherObjectInfo); return new JbpmType(jbpmTypeMatcher, converter, variableInstanceClass); } - + private static Log log = LogFactory.getLog(JbpmTypeObjectInfo.class); } Added: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/ContextConverter.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/ContextConverter.java (rev 0) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/ContextConverter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -0,0 +1,36 @@ +/* + * 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.context.exe; + +import org.jbpm.graph.exe.Token; + +/** + * @author Alejandro Guizar + */ +public interface ContextConverter<S, T> extends Converter<S, T> { + + /** + * reverts a persisted object to its original form, + * in the context of the given token. + */ + S revert(T o, Token token); +} Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/Converter.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/Converter.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/Converter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -21,13 +21,13 @@ */ package org.jbpm.context.exe; -import java.io.*; +import java.io.Serializable; /** * converts plain objects to objects that are * persistable via a subclass of VariableInstance. */ -public interface Converter extends Serializable { +public interface Converter<S, T> extends Serializable { /** * is true if this converter supports the given type, false otherwise. @@ -37,10 +37,10 @@ /** * converts a given object to its persistable format. */ - Object convert(Object o); + T convert(S o); /** * reverts a persisted object to its original form. */ - Object revert(Object o); + S revert(T o); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/JbpmType.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/JbpmType.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/JbpmType.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -40,9 +40,9 @@ static Map<ObjectFactory, List<JbpmType>> jbpmTypesCache = new HashMap<ObjectFactory, List<JbpmType>>(); - JbpmTypeMatcher jbpmTypeMatcher = null; - Converter converter = null; - Class<? extends VariableInstance> variableInstanceClass = null; + final JbpmTypeMatcher jbpmTypeMatcher; + final Converter converter; + final Class<? extends VariableInstance> variableInstanceClass; public JbpmType(JbpmTypeMatcher jbpmTypeMatcher, Converter converter, Class<? extends VariableInstance> variableInstanceClass) { @@ -51,6 +51,10 @@ this.variableInstanceClass = variableInstanceClass; } + public Converter getConverter() { + return converter; + } + public boolean matches(Object value) { return jbpmTypeMatcher.matches(value); } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/VariableInstance.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/VariableInstance.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/VariableInstance.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -24,7 +24,6 @@ import java.io.Serializable; import org.jbpm.JbpmException; -import org.jbpm.context.exe.converter.SerializableToByteArrayConverter; import org.jbpm.context.exe.variableinstance.NullInstance; import org.jbpm.context.exe.variableinstance.UnpersistableInstance; import org.jbpm.context.log.VariableCreateLog; @@ -45,7 +44,7 @@ protected Token token = null; protected TokenVariableMap tokenVariableMap = null; protected ProcessInstance processInstance = null; - protected Converter converter = null; + protected Converter<? super Object, ? super Object> converter = null; protected Object valueCache = null; protected boolean isValueCached = false; @@ -64,10 +63,10 @@ variableInstance = createVariableInstance(value); } - variableInstance.token = token; variableInstance.name = name; - variableInstance.processInstance = (token != null ? token.getProcessInstance() : null); if (token != null) { + variableInstance.token = token; + variableInstance.processInstance = token.getProcessInstance(); token.addLog(new VariableCreateLog(variableInstance)); } variableInstance.setValue(value); @@ -140,10 +139,10 @@ return valueCache; } Object value = getObject(); - if ((value != null) && (converter != null)) { - if (converter instanceof SerializableToByteArrayConverter && processInstance != null) { - SerializableToByteArrayConverter s2bConverter = (SerializableToByteArrayConverter) converter; - value = s2bConverter.revert(value, processInstance.getProcessDefinition()); + if (value != null && converter != null) { + if (converter instanceof ContextConverter && token != null) { + ContextConverter<?, ? super Object> contextConverter = (ContextConverter<?, ? super Object>) converter; + value = contextConverter.revert(value, token); } else { value = converter.revert(value); Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/BooleanToStringConverter.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/BooleanToStringConverter.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/BooleanToStringConverter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -21,29 +21,33 @@ */ package org.jbpm.context.exe.converter; -import org.jbpm.context.exe.*; +import org.jbpm.context.exe.Converter; +import org.jbpm.db.hibernate.Converters; -public class BooleanToStringConverter implements Converter { - +public class BooleanToStringConverter implements Converter<Boolean, String> { + private static final long serialVersionUID = 1L; - + public static final String TRUE_TEXT = "T"; public static final String FALSE_TEXT = "F"; + public BooleanToStringConverter() { + Converters.registerConverter("B", this); + } + public boolean supports(Object value) { - if (value==null) return true; - return (value.getClass()==Boolean.class); + return value instanceof Boolean; } - public Object convert(Object o) { + public String convert(Boolean o) { String convertedValue = FALSE_TEXT; - if (((Boolean)o).booleanValue()) { + if (o.booleanValue()) { convertedValue = TRUE_TEXT; } return convertedValue; } - public Object revert(Object o) { + public Boolean revert(String o) { Boolean revertedValue = Boolean.FALSE; if (TRUE_TEXT.equals(o)) { revertedValue = Boolean.TRUE; Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/ByteToLongConverter.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/ByteToLongConverter.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/ByteToLongConverter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -21,22 +21,26 @@ */ package org.jbpm.context.exe.converter; -import org.jbpm.context.exe.*; +import org.jbpm.context.exe.Converter; +import org.jbpm.db.hibernate.Converters; -public class ByteToLongConverter implements Converter { - +public class ByteToLongConverter implements Converter<Byte, Long> { + private static final long serialVersionUID = 1L; + public ByteToLongConverter() { + Converters.registerConverter("E", this); + } + public boolean supports(Object value) { - if (value==null) return true; - return (value.getClass()==Byte.class); + return value instanceof Byte; } - public Object convert(Object o) { - return new Long( ((Number)o).longValue() ); + public Long convert(Byte o) { + return o.longValue(); } - public Object revert(Object o) { - return new Byte(((Long)o).byteValue()); + public Byte revert(Long o) { + return o.byteValue(); } } \ No newline at end of file Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/BytesToByteArrayConverter.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/BytesToByteArrayConverter.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/BytesToByteArrayConverter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -23,22 +23,26 @@ import org.jbpm.bytes.ByteArray; import org.jbpm.context.exe.Converter; +import org.jbpm.db.hibernate.Converters; -public class BytesToByteArrayConverter implements Converter { +public class BytesToByteArrayConverter implements Converter<byte[], ByteArray> { private static final long serialVersionUID = 1L; + public BytesToByteArrayConverter() { + Converters.registerConverter("Y", this); + } + public boolean supports(Object value) { - if (value==null) return true; - return (value.getClass()==byte[].class); + return value instanceof byte[]; } - public Object convert(Object o) { - return new ByteArray((byte[]) o); + public ByteArray convert(byte[] o) { + return new ByteArray(o); } - public Object revert(Object o) { - return ((ByteArray)o).getBytes(); + public byte[] revert(ByteArray o) { + return o.getBytes(); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/CharacterToStringConverter.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/CharacterToStringConverter.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/CharacterToStringConverter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -21,22 +21,26 @@ */ package org.jbpm.context.exe.converter; -import org.jbpm.context.exe.*; +import org.jbpm.context.exe.Converter; +import org.jbpm.db.hibernate.Converters; -public class CharacterToStringConverter implements Converter { +public class CharacterToStringConverter implements Converter<Character, String> { private static final long serialVersionUID = 1L; + public CharacterToStringConverter() { + Converters.registerConverter("C", this); + } + public boolean supports(Object value) { - if (value==null) return true; - return (value.getClass()==Character.class); + return value instanceof Character; } - public Object convert(Object o) { + public String convert(Character o) { return o.toString(); } - public Object revert(Object o) { - return new Character(((String)o).charAt(0)); + public Character revert(String o) { + return o.charAt(0); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/DateToLongConverter.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/DateToLongConverter.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/DateToLongConverter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -21,23 +21,28 @@ */ package org.jbpm.context.exe.converter; -import java.util.*; -import org.jbpm.context.exe.*; +import java.util.Date; -public class DateToLongConverter implements Converter { +import org.jbpm.context.exe.Converter; +import org.jbpm.db.hibernate.Converters; +public class DateToLongConverter implements Converter<Date, Long> { + private static final long serialVersionUID = 1L; + public DateToLongConverter() { + Converters.registerConverter("A", this); + } + public boolean supports(Object value) { - if (value==null) return true; - return (Date.class.isAssignableFrom(value.getClass())); + return value instanceof Date; } - public Object convert(Object o) { - return new Long(((Date)o).getTime()); + public Long convert(Date o) { + return o.getTime(); } - public Object revert(Object o) { - return new Date(((Long)o).longValue()); + public Date revert(Long o) { + return new Date(o); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/DoubleToStringConverter.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/DoubleToStringConverter.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/DoubleToStringConverter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -21,23 +21,27 @@ */ package org.jbpm.context.exe.converter; -import org.jbpm.context.exe.*; +import org.jbpm.context.exe.Converter; +import org.jbpm.db.hibernate.Converters; -public class DoubleToStringConverter implements Converter { +public class DoubleToStringConverter implements Converter<Double, String> { private static final long serialVersionUID = 1L; + public DoubleToStringConverter() { + Converters.registerConverter("D", this); + } + public boolean supports(Object value) { - if (value==null) return true; - return (value.getClass()==Double.class); + return value instanceof Double; } - public Object convert(Object o) { + public String convert(Double o) { return o.toString(); } - public Object revert(Object o) { - return new Double((String)o); + public Double revert(String o) { + return new Double(o); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/FloatToDoubleConverter.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/FloatToDoubleConverter.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/FloatToDoubleConverter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -22,22 +22,26 @@ package org.jbpm.context.exe.converter; import org.jbpm.context.exe.Converter; +import org.jbpm.db.hibernate.Converters; -public class FloatToDoubleConverter implements Converter { +public class FloatToDoubleConverter implements Converter<Float, Double> { private static final long serialVersionUID = 1L; + public FloatToDoubleConverter() { + Converters.registerConverter("G", this); + } + public boolean supports(Object value) { - if (value==null) return true; - return (value.getClass()==Float.class); + return value instanceof Float; } - public Object convert(Object o) { - return new Double(((Float)o).doubleValue()); + public Double convert(Float o) { + return o.doubleValue(); } - public Object revert(Object o) { - return new Float(((Double)o).floatValue()); + public Float revert(Double o) { + return o.floatValue(); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/FloatToStringConverter.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/FloatToStringConverter.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/FloatToStringConverter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -21,23 +21,27 @@ */ package org.jbpm.context.exe.converter; -import org.jbpm.context.exe.*; +import org.jbpm.context.exe.Converter; +import org.jbpm.db.hibernate.Converters; -public class FloatToStringConverter implements Converter { +public class FloatToStringConverter implements Converter<Float, String> { private static final long serialVersionUID = 1L; + public FloatToStringConverter() { + Converters.registerConverter("F", this); + } + public boolean supports(Object value) { - if (value==null) return true; - return (value.getClass()==Float.class); + return value instanceof Float; } - public Object convert(Object o) { + public String convert(Float o) { return o.toString(); } - public Object revert(Object o) { - return new Float((String)o); + public Float revert(String o) { + return new Float(o); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/IntegerToLongConverter.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/IntegerToLongConverter.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/IntegerToLongConverter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -21,22 +21,26 @@ */ package org.jbpm.context.exe.converter; -import org.jbpm.context.exe.*; +import org.jbpm.context.exe.Converter; +import org.jbpm.db.hibernate.Converters; -public class IntegerToLongConverter implements Converter { - +public class IntegerToLongConverter implements Converter<Integer, Long> { + private static final long serialVersionUID = 1L; + public IntegerToLongConverter() { + Converters.registerConverter("I", this); + } + public boolean supports(Object value) { - if (value==null) return true; - return (Integer.class.equals(value.getClass())); + return value instanceof Integer; } - public Object convert(Object o) { - return new Long( ((Number)o).longValue() ); + public Long convert(Integer o) { + return o.longValue(); } - public Object revert(Object o) { - return new Integer(((Long)o).intValue()); + public Integer revert(Long o) { + return o.intValue(); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -32,62 +32,62 @@ import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmException; import org.jbpm.bytes.ByteArray; -import org.jbpm.context.exe.Converter; +import org.jbpm.context.exe.ContextConverter; +import org.jbpm.db.hibernate.Converters; import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.Token; import org.jbpm.util.CustomLoaderObjectInputStream; -public class SerializableToByteArrayConverter implements Converter { +public class SerializableToByteArrayConverter implements ContextConverter<Serializable, ByteArray> { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - public boolean supports(Object value) { - if(value == null) - return true; - return Serializable.class.isAssignableFrom(value.getClass()); - } + public SerializableToByteArrayConverter() { + Converters.registerConverter("R", this); + } - public Object convert(Object o) { - byte[] bytes = null; - try { - ByteArrayOutputStream memoryStream = new ByteArrayOutputStream(); - ObjectOutputStream objectStream = new ObjectOutputStream(memoryStream); - objectStream.writeObject(o); - objectStream.flush(); - bytes = memoryStream.toByteArray(); - } - catch(IOException e) { - throw new JbpmException("couldn't serialize '" + o + "'", e); - } - return new ByteArray(bytes); - } + public boolean supports(Object value) { + return value instanceof Serializable; + } - public Object revert(Object o) { - ByteArray byteArray = (ByteArray) o; - InputStream memoryStream = new ByteArrayInputStream(byteArray.getBytes()); - try { - ObjectInputStream objectStream = new ObjectInputStream(memoryStream); - return objectStream.readObject(); - } - catch(IOException ex) { - throw new JbpmException("failed to read object", ex); - } - catch(ClassNotFoundException ex) { - throw new JbpmException("serialized object class not found", ex); - } - } + public ByteArray convert(Serializable o) { + byte[] bytes = null; + try { + ByteArrayOutputStream memoryStream = new ByteArrayOutputStream(); + ObjectOutputStream objectStream = new ObjectOutputStream(memoryStream); + objectStream.writeObject(o); + objectStream.flush(); + bytes = memoryStream.toByteArray(); + } + catch (IOException e) { + throw new JbpmException("could not serialize: " + o, e); + } + return new ByteArray(bytes); + } - public Object revert(Object o, ProcessDefinition processDefinition) { - ByteArray byteArray = (ByteArray) o; - InputStream memoryStream = new ByteArrayInputStream(byteArray.getBytes()); - try { - ObjectInputStream objectStream = new CustomLoaderObjectInputStream(memoryStream, JbpmConfiguration.getProcessClassLoader(processDefinition)); - return objectStream.readObject(); - } - catch(IOException ex) { - throw new JbpmException("failed to read object", ex); - } - catch(ClassNotFoundException ex) { - throw new JbpmException("serialized object class not found", ex); - } - } + public Serializable revert(ByteArray o) { + return revert(o, null); + } + + public Serializable revert(ByteArray o, Token token) { + InputStream memoryStream = new ByteArrayInputStream(o.getBytes()); + try { + ObjectInputStream objectStream; + if (token != null) { + ProcessDefinition processDefinition = token.getProcessInstance().getProcessDefinition(); + ClassLoader classLoader = JbpmConfiguration.getProcessClassLoader(processDefinition); + objectStream = new CustomLoaderObjectInputStream(memoryStream, classLoader); + } + else { + objectStream = new ObjectInputStream(memoryStream); + } + return (Serializable) objectStream.readObject(); + } + catch (IOException e) { + throw new JbpmException("failed to read object", e); + } + catch (ClassNotFoundException e) { + throw new JbpmException("serialized object class not found", e); + } + } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/ShortToLongConverter.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/ShortToLongConverter.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/converter/ShortToLongConverter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -21,22 +21,27 @@ */ package org.jbpm.context.exe.converter; -import org.jbpm.context.exe.*; +import org.jbpm.context.exe.Converter; +import org.jbpm.db.hibernate.Converters; -public class ShortToLongConverter implements Converter { - +public class ShortToLongConverter implements Converter<Short, Long> { + private static final long serialVersionUID = 1L; + public ShortToLongConverter() { + Converters.registerConverter("H", this); + } + public boolean supports(Object value) { - if (value==null) return true; - return (value.getClass()==Short.class); + if (value == null) return true; + return (value.getClass() == Short.class); } - public Object convert(Object o) { - return new Long( ((Number)o).longValue() ); + public Long convert(Short o) { + return o.longValue(); } - - public Object revert(Object o) { - return new Short(((Long)o).shortValue()); + + public Short revert(Long o) { + return o.shortValue(); } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/Converters.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/Converters.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/hibernate/Converters.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -23,14 +23,12 @@ import java.util.HashMap; import java.util.Map; -import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmException; -import org.jbpm.configuration.ObjectFactory; import org.jbpm.context.exe.Converter; +import org.jbpm.context.exe.JbpmType; import org.jbpm.util.ClassLoaderUtil; /** @@ -38,7 +36,12 @@ */ public class Converters { - private static Map<ObjectFactory, ConverterMaps> converterMapsMap = new HashMap<ObjectFactory, ConverterMaps>(); + // maps class names to unique converter objects + private static final Map<String, Converter<?, ?>> convertersByClassNames = new HashMap<String, Converter<?, ?>>(); + // maps converter database-id-strings to unique converter objects + private static final Map<String, Converter<?, ?>> convertersByDatabaseId = new HashMap<String, Converter<?, ?>>(); + // maps unique converter objects to their database-id-string + private static final Map<Converter<?, ?>, String> convertersIds = new HashMap<Converter<?, ?>, String>(); private Converters() { // hide default constructor to prevent instantiation @@ -46,110 +49,54 @@ // public methods - public static Converter getConverterByClassName(String className) { - Converter converter = getConvertersByClassNames().get(className); + public static Converter<?, ?> getConverterByClassName(String className) { + Converter<?, ?> converter = convertersByClassNames.get(className); if (converter == null) { - throw new JbpmException("converter '" + className + "' is not declared in resource.converter"); + Class<? extends Converter<?, ?>> converterClass = getConverterClass(className); + try { + // the converter will register itself + converter = converterClass.newInstance(); + } + catch (InstantiationException e) { + log.debug("could not instantiate converter '" + className + "': " + e); + } + catch (IllegalAccessException e) { + log.debug("could not access converter: '" + className + "': " + e); + } } return converter; } - public static Converter getConverterByDatabaseId(String converterDatabaseId) { - return getConvertersByDatabaseId().get(converterDatabaseId); + public static Converter<?, ?> getConverterByDatabaseId(String databaseId) { + if (convertersByDatabaseId.isEmpty()) { + JbpmType.getJbpmTypes(); + } + return convertersByDatabaseId.get(databaseId); } - public static String getConverterId(Converter converter) { - return getConvertersIds().get(converter); + public static String getConverterId(Converter<?, ?> converter) { + // the converter has registered itself during instantiation + // hence there is no need to check whether the map is populated already + return convertersIds.get(converter); } - // maps class names to unique converter objects - static Map<String, Converter> getConvertersByClassNames() { - return getConverterMaps().getConvertersByClassNames(); - } + public static void registerConverter(String databaseId, Converter<?, ?> converter) { + if (databaseId.length() != 1) + throw new JbpmException("converter-ids must be of length 1 (to be stored in a char)"); + if (convertersByDatabaseId.containsKey(databaseId)) + throw new JbpmException("duplicate converter id: '" + databaseId + "'"); - // maps converter database-id-strings to unique converter objects - static Map<String, Converter> getConvertersByDatabaseId() { - return getConverterMaps().getConvertersByDatabaseId(); + log.debug("adding converter '" + databaseId + "', '" + converter + "'"); + convertersByClassNames.put(converter.getClass().getName(), converter); + convertersByDatabaseId.put(databaseId, converter); + convertersIds.put(converter, databaseId); } - // maps unique converter objects to their database-id-string - static Map<Converter, String> getConvertersIds() { - return getConverterMaps().getConvertersIds(); + @SuppressWarnings("unchecked") + private static Class<? extends Converter<?, ?>> getConverterClass(String className) { + return (Class<? extends Converter<?, ?>>) ClassLoaderUtil.classForName(className).asSubclass( + Converter.class); } - static ConverterMaps getConverterMaps() { - ObjectFactory objectFactory = JbpmConfiguration.Configs.getObjectFactory(); - ConverterMaps converterMaps; - synchronized (converterMapsMap) { - converterMaps = converterMapsMap.get(objectFactory); - if (converterMaps == null) { - converterMaps = createConverterMaps(objectFactory); - converterMapsMap.put(objectFactory, converterMaps); - } - } - return converterMaps; - } - - static ConverterMaps createConverterMaps(ObjectFactory objectFactory) { - Properties converterProperties; - if (objectFactory.hasObject("resource.converter")) { - String resource = (String) objectFactory.createObject("resource.converter"); - converterProperties = ClassLoaderUtil.getProperties(resource); - } - else { - converterProperties = new Properties(); - } - - ConverterMaps converterMaps = new ConverterMaps(); - for (Map.Entry<Object, Object> entry : converterProperties.entrySet()) { - String databaseId = (String) entry.getKey(); - String className = (String) entry.getValue(); - converterMaps.registerConverter(databaseId, className); - } - - return converterMaps; - } - - static class ConverterMaps { - - private final Map<String, Converter> convertersByClassNames = new HashMap<String, Converter>(); - private final Map<String, Converter> convertersByDatabaseId = new HashMap<String, Converter>(); - private final Map<Converter, String> convertersIds = new HashMap<Converter, String>(); - - public void registerConverter(String databaseId, String className) { - if (databaseId.length() != 1) - throw new JbpmException("converter-ids must be of length 1 (to be stored in a char)"); - if (convertersByDatabaseId.containsKey(databaseId)) - throw new JbpmException("duplicate converter id: '" + databaseId + "'"); - - try { - Class<? extends Converter> converterClass = ClassLoaderUtil.classForName(className) - .asSubclass(Converter.class); - Converter converter = converterClass.newInstance(); - log.debug("adding converter '" + databaseId + "', '" + className + "'"); - convertersByClassNames.put(className, converter); - convertersByDatabaseId.put(databaseId, converter); - convertersIds.put(converter, databaseId); - } - catch (Exception e) { - // NOTE that Errors are not caught because that might mask the original Error - // and halt the JVM - log.debug("couldn't instantiate converter '" + className + "': " + e); - } - } - - public Map<String, Converter> getConvertersByClassNames() { - return convertersByClassNames; - } - - public Map<String, Converter> getConvertersByDatabaseId() { - return convertersByDatabaseId; - } - - public Map<Converter, String> getConvertersIds() { - return convertersIds; - } - } - private static Log log = LogFactory.getLog(Converters.class); } Deleted: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/jbpm.converter.properties =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/jbpm.converter.properties 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/jbpm.converter.properties 2009-02-14 09:30:27 UTC (rev 3876) @@ -1,17 +0,0 @@ -# this file contains the mappings between converter types -# and the char that is used in the database. this mapping -# is used by the ConverterEnumType to store the VariableInstance -# converter field. The Converters class provides singleton access -# to these converter classes. - -B org.jbpm.context.exe.converter.BooleanToStringConverter -Y org.jbpm.context.exe.converter.BytesToByteArrayConverter -E org.jbpm.context.exe.converter.ByteToLongConverter -C org.jbpm.context.exe.converter.CharacterToStringConverter -A org.jbpm.context.exe.converter.DateToLongConverter -D org.jbpm.context.exe.converter.DoubleToStringConverter -F org.jbpm.context.exe.converter.FloatToStringConverter -G org.jbpm.context.exe.converter.FloatToDoubleConverter -I org.jbpm.context.exe.converter.IntegerToLongConverter -R org.jbpm.context.exe.converter.SerializableToByteArrayConverter -H org.jbpm.context.exe.converter.ShortToLongConverter Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/jbpm.varmapping.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/jbpm.varmapping.xml 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/jbpm.varmapping.xml 2009-02-14 09:30:27 UTC (rev 3876) @@ -12,7 +12,7 @@ <jbpm-types> <list name="jbpm.types" singleton="true"> - +  <jbpm-type> <matcher> @@ -22,7 +22,7 @@ </matcher> <variable-instance class="org.jbpm.context.exe.variableinstance.StringInstance" /> </jbpm-type> - +  <jbpm-type> <matcher> @@ -33,7 +33,7 @@ <converter class="org.jbpm.context.exe.converter.BooleanToStringConverter" /> <variable-instance class="org.jbpm.context.exe.variableinstance.StringInstance" /> </jbpm-type> - +  <jbpm-type> <matcher> @@ -44,7 +44,7 @@ <converter class="org.jbpm.context.exe.converter.CharacterToStringConverter" /> <variable-instance class="org.jbpm.context.exe.variableinstance.StringInstance" /> </jbpm-type> - +  <jbpm-type> <matcher> @@ -65,7 +65,7 @@ <converter class="org.jbpm.context.exe.converter.ByteToLongConverter" /> <variable-instance class="org.jbpm.context.exe.variableinstance.LongInstance" /> </jbpm-type> - +  <jbpm-type> <matcher> @@ -76,7 +76,7 @@ <converter class="org.jbpm.context.exe.converter.ShortToLongConverter" /> <variable-instance class="org.jbpm.context.exe.variableinstance.LongInstance" /> </jbpm-type> - +  <jbpm-type> <matcher> @@ -87,7 +87,7 @@ <converter class="org.jbpm.context.exe.converter.IntegerToLongConverter" /> <variable-instance class="org.jbpm.context.exe.variableinstance.LongInstance" /> </jbpm-type> - +  <jbpm-type> <matcher> @@ -97,7 +97,7 @@ </matcher> <variable-instance class="org.jbpm.context.exe.variableinstance.DoubleInstance" /> </jbpm-type> - +  <jbpm-type> <matcher> @@ -108,7 +108,7 @@ <converter class="org.jbpm.context.exe.converter.FloatToDoubleConverter" /> <variable-instance class="org.jbpm.context.exe.variableinstance.DoubleInstance" /> </jbpm-type> - +  <jbpm-type> <matcher> @@ -118,7 +118,7 @@ </matcher> <variable-instance class="org.jbpm.context.exe.variableinstance.DateInstance" /> </jbpm-type> - +  <jbpm-type> <matcher> @@ -129,7 +129,7 @@ <converter class="org.jbpm.context.exe.converter.BytesToByteArrayConverter" /> <variable-instance class="org.jbpm.context.exe.variableinstance.ByteArrayInstance" /> </jbpm-type> - +  <jbpm-type> <matcher> @@ -137,7 +137,7 @@ </matcher> <variable-instance class="org.jbpm.context.exe.variableinstance.HibernateLongInstance" /> </jbpm-type> - +  <jbpm-type> <matcher> @@ -145,16 +145,7 @@ </matcher> <variable-instance class="org.jbpm.context.exe.variableinstance.HibernateStringInstance" /> </jbpm-type> - -  - <jbpm-type> - <matcher> - <bean class="org.jbpm.context.exe.matcher.SerializableMatcher" /> - </matcher> - <converter class="org.jbpm.context.exe.converter.SerializableToByteArrayConverter" /> - <variable-instance class="org.jbpm.context.exe.variableinstance.ByteArrayInstance" /> - </jbpm-type> - +  <jbpm-type> <matcher> @@ -162,15 +153,24 @@ </matcher> <variable-instance class="org.jbpm.context.exe.variableinstance.Ejb3Instance" /> </jbpm-type> - +  <jbpm-type> <matcher> <bean class="org.jbpm.context.exe.matcher.JcrNodeMatcher" /> </matcher> <variable-instance class="org.jbpm.context.exe.variableinstance.JcrNodeInstance" /> - </jbpm-type> - + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.SerializableMatcher" /> + </matcher> + <converter class="org.jbpm.context.exe.converter.SerializableToByteArrayConverter" /> + <variable-instance class="org.jbpm.context.exe.variableinstance.ByteArrayInstance" /> + </jbpm-type> + </list> </jbpm-types> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml 2009-02-14 09:30:27 UTC (rev 3876) @@ -24,7 +24,6 @@  <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties" /> <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties" /> - <string name="resource.converter" value="org/jbpm/context/exe/jbpm.converter.properties" /> <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml" /> <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml" /> <string name="resource.parsers" value="org/jbpm/jpdl/par/jbpm.parsers.xml" /> Added: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1914/JBPM1914Test.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1914/JBPM1914Test.java (rev 0) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1914/JBPM1914Test.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -0,0 +1,82 @@ +/* + * 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.jbpm1914; + +import java.io.IOException; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.Transaction; +import org.jbpm.db.AbstractDbTestCase; +import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.ProcessInstance; + +/** + * Problem in retrieving variables of Serializable objects. + * + * @see <a href="https://jira.jboss.org/jira/browse/JBPM-1914">JBPM-1914</a> + * @author Alejandro Guizar + */ +public class JBPM1914Test extends AbstractDbTestCase { + + @Override + protected String getJbpmTestConfig() { + return "org/jbpm/jbpm1914/jbpm.cfg.xml"; + } + + public void testCustomSerializableVariableClass() throws IOException { + // create and save the process definition + ProcessDefinition processDefinition = ProcessDefinition.parseParResource("org/jbpm/jbpm1024/CustomSerializable.zip"); + graphSession.deployProcessDefinition(processDefinition); + SessionFactory sessionFactory = jbpmContext.getSessionFactory(); + + commitAndCloseSession(); + try { + Session session = sessionFactory.openSession(); + Transaction transaction = session.beginTransaction(); + + jbpmContext = jbpmConfiguration.createJbpmContext(); + jbpmContext.setSession(session); + + // create the process instance + ProcessInstance processInstance = new ProcessInstance(processDefinition); + jbpmContext.save(processInstance); + jbpmContext.close(); + + transaction.commit(); + session.close(); + + // get the custom object from the context instance + beginSessionTransaction(); + processInstance = jbpmContext.loadProcessInstance(processInstance.getId()); + Object customSerializable = processInstance.getContextInstance().getVariable( + "custom serializable"); + assertEquals("org.jbpm.context.exe.CustomSerializableClass", customSerializable.getClass() + .getName()); + assertEquals("1984", customSerializable.toString()); + } + finally { + newTransaction(); + jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); + } + } +} Added: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1914/ObjectToStringConverter.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1914/ObjectToStringConverter.java (rev 0) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1914/ObjectToStringConverter.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -0,0 +1,77 @@ +/* + * 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.jbpm1914; + +import java.lang.reflect.Constructor; + +import org.jbpm.JbpmConfiguration; +import org.jbpm.JbpmException; +import org.jbpm.context.exe.ContextConverter; +import org.jbpm.db.hibernate.Converters; +import org.jbpm.graph.exe.Token; + +/** + * @author Alejandro Guizar + */ +public class ObjectToStringConverter implements ContextConverter<Object, String> { + + private static final long serialVersionUID = 1L; + private static final char SEPARATOR = ';'; + + public ObjectToStringConverter() { + Converters.registerConverter("$", this); + } + + public String convert(Object o) { + return o.getClass().getName() + SEPARATOR + o; + } + + public Object revert(String o) { + return revert(o, null); + } + + public Object revert(String o, Token token) { + int separatorIndex = o.indexOf(SEPARATOR); + try { + ClassLoader classLoader = null; + if (token != null) { + classLoader = JbpmConfiguration.getProcessClassLoader(token.getProcessInstance() + .getProcessDefinition()); + } + Class<?> type = Class.forName(o.substring(0, separatorIndex), true, classLoader); + Constructor<?> constructor = type.getConstructor(String.class); + + return constructor.newInstance(o.substring(separatorIndex + 1)); + } + catch (RuntimeException e) { + throw e; + } + catch (Exception e) { + throw new JbpmException("could not revert: " + o, e); + } + } + + public boolean supports(Object value) { + return true; + } + +} Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp18InterleavedParallelRoutingTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp18InterleavedParallelRoutingTest.java 2009-02-13 17:09:13 UTC (rev 3875) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp18InterleavedParallelRoutingTest.java 2009-02-14 09:30:27 UTC (rev 3876) @@ -69,13 +69,13 @@ private State d = (State) processDefinition.getNode("d"); private State e = (State) processDefinition.getNode("e"); - private static String[][] scenarioSequences = new String[][] { - new String[] {"b", "c", "d"}, - new String[] {"b", "d", "c"}, - new String[] {"c", "b", "d"}, - new String[] {"c", "d", "b"}, - new String[] {"d", "b", "c"}, - new String[] {"d", "c", "b"} + private static String[][] scenarioSequences = { + {"b", "c", "d"}, + {"b", "d", "c"}, + {"c", "b", "d"}, + {"c", "d", "b"}, + {"d", "b", "c"}, + {"d", "c", "b"} }; public class ScenarioInterleaver implements InterleaveStart.Interleaver { Added: jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm1914/jbpm.cfg.xml =================================================================== --- jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm1914/jbpm.cfg.xml (rev 0) +++ jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm1914/jbpm.cfg.xml 2009-02-14 09:30:27 UTC (rev 3876) @@ -0,0 +1,3 @@ +<jbpm-configuration> + <string name="resource.varmapping" value="org/jbpm/jbpm1914/jbpm.varmapping.xml" /> +</jbpm-configuration> \ No newline at end of file Added: jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm1914/jbpm.varmapping.xml =================================================================== --- jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm1914/jbpm.varmapping.xml (rev 0) +++ jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm1914/jbpm.varmapping.xml 2009-02-14 09:30:27 UTC (rev 3876) @@ -0,0 +1,187 @@ + +<jbpm-types> + + <list name="jbpm.types" singleton="true"> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.ClassNameMatcher"> + <field name="className"><string value="java.lang.String" /></field> + </bean> + </matcher> + <variable-instance class="org.jbpm.context.exe.variableinstance.StringInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.ClassNameMatcher"> + <field name="className"><string value="java.lang.Boolean" /></field> + </bean> + </matcher> + <converter class="org.jbpm.context.exe.converter.BooleanToStringConverter" /> + <variable-instance class="org.jbpm.context.exe.variableinstance.StringInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.ClassNameMatcher"> + <field name="className"><string value="java.lang.Character" /></field> + </bean> + </matcher> + <converter class="org.jbpm.context.exe.converter.CharacterToStringConverter" /> + <variable-instance class="org.jbpm.context.exe.variableinstance.StringInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.ClassNameMatcher"> + <field name="className"><string value="java.lang.Long" /></field> + </bean> + </matcher> + <variable-instance class="org.jbpm.context.exe.variableinstance.LongInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.ClassNameMatcher"> + <field name="className"><string value="java.lang.Byte" /></field> + </bean> + </matcher> + <converter class="org.jbpm.context.exe.converter.ByteToLongConverter" /> + <variable-instance class="org.jbpm.context.exe.variableinstance.LongInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.ClassNameMatcher"> + <field name="className"><string value="java.lang.Short" /></field> + </bean> + </matcher> + <converter class="org.jbpm.context.exe.converter.ShortToLongConverter" /> + <variable-instance class="org.jbpm.context.exe.variableinstance.LongInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.ClassNameMatcher"> + <field name="className"><string value="java.lang.Integer" /></field> + </bean> + </matcher> + <converter class="org.jbpm.context.exe.converter.IntegerToLongConverter" /> + <variable-instance class="org.jbpm.context.exe.variableinstance.LongInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.ClassNameMatcher"> + <field name="className"><string value="java.lang.Double" /></field> + </bean> + </matcher> + <variable-instance class="org.jbpm.context.exe.variableinstance.DoubleInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.ClassNameMatcher"> + <field name="className"><string value="java.lang.Float" /></field> + </bean> + </matcher> + <converter class="org.jbpm.context.exe.converter.FloatToDoubleConverter" /> + <variable-instance class="org.jbpm.context.exe.variableinstance.DoubleInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.ClassNameMatcher"> + <field name="className"><string value="java.util.Date" /></field> + </bean> + </matcher> + <variable-instance class="org.jbpm.context.exe.variableinstance.DateInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.ClassNameMatcher"> + <field name="className"><string value="[B" /></field> + </bean> + </matcher> + <converter class="org.jbpm.context.exe.converter.BytesToByteArrayConverter" /> + <variable-instance class="org.jbpm.context.exe.variableinstance.ByteArrayInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.HibernateLongIdMatcher" /> + </matcher> + <variable-instance class="org.jbpm.context.exe.variableinstance.HibernateLongInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.HibernateStringIdMatcher" /> + </matcher> + <variable-instance class="org.jbpm.context.exe.variableinstance.HibernateStringInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.Ejb3Matcher" /> + </matcher> + <variable-instance class="org.jbpm.context.exe.variableinstance.Ejb3Instance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.JcrNodeMatcher" /> + </matcher> + <variable-instance class="org.jbpm.context.exe.variableinstance.JcrNodeInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.ClassNameMatcher"> + <field name="className"><string value="org.jbpm.context.exe.CustomSerializableClass" /></field> + </bean> + </matcher> + <converter class="org.jbpm.jbpm1914.ObjectToStringConverter" /> + <variable-instance class="org.jbpm.context.exe.variableinstance.StringInstance" /> + </jbpm-type> + +  + <jbpm-type> + <matcher> + <bean class="org.jbpm.context.exe.matcher.SerializableMatcher" /> + </matcher> + <converter class="org.jbpm.context.exe.converter.SerializableToByteArrayConverter" /> + <variable-instance class="org.jbpm.context.exe.variableinstance.ByteArrayInstance" /> + </jbpm-type> + + </list> + +</jbpm-types>

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3875 - in jbpm4/trunk/modules: api/src/main/resources and 24 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-02-13 12:09:13 -0500 (Fri, 13 Feb 2009) New Revision: 3875 Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java jbpm4/trunk/modules/api/src/main/resources/cfg.xsd jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/variables/custom.types.jbpm.cfg.xml jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml Log: JBPM-1983 rename context environment to transaction Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -31,10 +31,10 @@ public interface Context { /** key of the process-engine context in the environment */ - String CONTEXTNAME_ENVIRONMENT_FACTORY = "process-engine"; + String CONTEXTNAME_PROCESS_ENGINE = "process-engine"; /** key of the block context in the environment */ - String CONTEXTNAME_ENVIRONMENT = "environment"; + String CONTEXTNAME_TRANSACTION = "transaction"; String getName(); Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -85,9 +85,9 @@ * * <p>A second purpose of the environment is to enable specific to global searching * of resources. E.g. you could search for an 'adminEmailAddress' in the contexts - * 'processDefinition-execution', 'processDefinition-definition' and 'process-engine' in the given order. + * 'execution', 'transaction' and 'process-engine' in the given order. * That way, a global adminEmailAddress can be specified in the process-engine context - * and it can be refined in more specific contexts processDefinition-definition or processDefinition-execution. + * and it can be refined in more specific contexts. * </p> * * <h3>Search order</h3> Modified: jbpm4/trunk/modules/api/src/main/resources/cfg.xsd =================================================================== --- jbpm4/trunk/modules/api/src/main/resources/cfg.xsd 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/api/src/main/resources/cfg.xsd 2009-02-13 17:09:13 UTC (rev 3875) @@ -103,7 +103,7 @@ <element name="context-ref"> <annotation><documentation>The context. This refers to - the environment, process-engine or the wire context. + the contexts transaction or process-engine. </documentation></annotation> <complexType> <attribute name="context-name" type="string"> @@ -121,13 +121,13 @@ </documentation></annotation> <complexType> <sequence> - <element ref="tns:process-engine" /> + <element ref="tns:process-engine-context" /> <element ref="tns:environment" /> </sequence> </complexType> </element> - <element name="process-engine" type="tns:contextType"> + <element name="process-engine-context" type="tns:contextType"> <annotation><documentation>Defines the environment factory context. (Aka application context) </documentation></annotation> Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -104,7 +104,7 @@ <literal><emphasis role="bold">environment.cfg.xml</emphasis>:</literal> <programlisting><jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine> + <process-engine-context> <deployer-manager> <assign-file-type> @@ -145,15 +145,15 @@ <types resource="jbpm.pvm.types.xml" /> <job-executor auto-start="false" /> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <hibernate-session /> <transaction /> <pvm-db-session /> <job-db-session /> <message-session /> - </environment> + </transaction-context> </jbpm-configuration></programlisting> <para>And next to it a hibernate.properties like this</para> Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -24,11 +24,11 @@ 16 |<emphasis role="bold"> </hibernate-configuration></emphasis> 17 | </process-engine> 18 | -19 | <environment> +19 | <transaction-context> 20 |<emphasis role="bold"> <standard-transaction /></emphasis> 21 |<emphasis role="bold"> <hibernate-session /></emphasis> 22 |<emphasis role="bold"> <pvm-db-session /></emphasis> -23 | </environment> +23 | </transaction-context> 24 | 25 | </jbpm-configuration></programlisting> <para><literal>line 04</literal> specifies a hibernate session factory in the Modified: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -9,7 +9,7 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine> + <process-engine-context> <deployer-manager> <check-process /> @@ -41,13 +41,13 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <hibernate-session current="true" /> <pvm-db-session /> <job-db-session /> <ejb-timer-session /> - </environment> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -1,6 +1,6 @@ <jbpm-configuration> - <process-engine> + <process-engine-context> <deployer-manager> <check-process /> @@ -29,13 +29,13 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <hibernate-session current="true" /> <pvm-db-session /> <job-db-session /> <ejb-timer-session /> - </environment> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -2,7 +2,7 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine> + <process-engine-context> <deployer-manager> <assign-file-type> @@ -51,9 +51,9 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <hibernate-session /> <transaction /> <pvm-db-session /> @@ -61,6 +61,6 @@ <task-db-session /> <message-session /> <timer-session /> - </environment> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -2,7 +2,7 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine> + <process-engine-context> <deployer-manager> <assign-file-type> @@ -44,9 +44,9 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <hibernate-session /> <transaction /> <pvm-db-session /> @@ -54,6 +54,6 @@ <task-db-session /> <message-session /> <timer-session /> - </environment> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -190,7 +190,7 @@ environment.addContext(environmentFactoryCtxWireContext); // add the environment block context - WireContext environmentContext = new WireContext(environmentCtxWireDefinition, Context.CONTEXTNAME_ENVIRONMENT, environment, true); + WireContext environmentContext = new WireContext(environmentCtxWireDefinition, Context.CONTEXTNAME_TRANSACTION, environment, true); // add the environment block context to the environment environment.addContext(environmentContext); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/BasicEnvironment.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -77,11 +77,11 @@ } public Context getEnvironmentFactoryContext() { - return getContext(Context.CONTEXTNAME_ENVIRONMENT_FACTORY); + return getContext(Context.CONTEXTNAME_PROCESS_ENGINE); } public Context getEnvironmentContext() { - return getContext(Context.CONTEXTNAME_ENVIRONMENT); + return getContext(Context.CONTEXTNAME_TRANSACTION); } // userId methods /////////////////////////////////////////////////////////// Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -80,7 +80,7 @@ WireDefinition environmentWireDefinition = getBlockWireDefinition(documentElement, parse); // create the application wire context from the definition - WireContext environmentFactoryWireContext = new WireContext(environmentFactoryWireDefinition, Context.CONTEXTNAME_ENVIRONMENT_FACTORY); + WireContext environmentFactoryWireContext = new WireContext(environmentFactoryWireDefinition, Context.CONTEXTNAME_PROCESS_ENGINE); // propagate the parser classloader to the application context environmentFactoryWireContext.setClassLoader(classLoader); @@ -94,7 +94,7 @@ } WireDefinition getApplicationWireDefinition(Element documentElement, Parse parse) { - Element applicationElement = XmlUtil.element(documentElement, Context.CONTEXTNAME_ENVIRONMENT_FACTORY); + Element applicationElement = XmlUtil.element(documentElement, "process-engine-context"); if (applicationElement != null) { return (WireDefinition) environmentFactoryXmlParser.parseDocumentElement(applicationElement, parse); } @@ -102,7 +102,7 @@ } WireDefinition getBlockWireDefinition(Element documentElement, Parse parse) { - Element blockElement = XmlUtil.element(documentElement, Context.CONTEXTNAME_ENVIRONMENT); + Element blockElement = XmlUtil.element(documentElement, "transaction-context"); if (blockElement != null) { return (WireDefinition) environmentXmlParser.parseDocumentElement(blockElement, parse); } Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -36,12 +36,12 @@ public void testBasicEnvironmentOperation() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <object name='a' class='"+Object.class.getName()+"' />" + - " </process-engine>" + - " <environment>" + + " </process-engine-context>" + + " <transaction-context>" + " <object name='b' class='"+Object.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -109,12 +109,12 @@ public void testUnexistingElement() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <object name='a' class='"+Object.class.getName()+"' />" + - " </process-engine>" + - " <environment>" + + " </process-engine-context>" + + " <transaction-context>" + " <object name='b' class='"+Object.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -137,9 +137,9 @@ Environment environment = environmentFactory.openEnvironment(); try { - Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_ENVIRONMENT_FACTORY); + Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_PROCESS_ENGINE); assertNotNull(environmentFactoryCtxt); - Context environmentCtxt = environment.getContext(Context.CONTEXTNAME_ENVIRONMENT); + Context environmentCtxt = environment.getContext(Context.CONTEXTNAME_TRANSACTION); assertNotNull(environmentCtxt); } finally { @@ -159,9 +159,9 @@ Environment environment = environmentFactory.openEnvironment(); try { assertNotNull(environment); - Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_ENVIRONMENT_FACTORY); + Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_PROCESS_ENGINE); assertNotNull(environmentFactoryCtxt); - Context environmentCtxt = environment.getContext(Context.CONTEXTNAME_ENVIRONMENT); + Context environmentCtxt = environment.getContext(Context.CONTEXTNAME_TRANSACTION); assertNotNull(environmentCtxt); } finally { @@ -179,9 +179,9 @@ Environment environment = environmentFactory.openEnvironment(); try { assertNotNull(environment); - Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_ENVIRONMENT_FACTORY); + Context environmentFactoryCtxt = environment.getContext(Context.CONTEXTNAME_PROCESS_ENGINE); assertNotNull(environmentFactoryCtxt); - Context environmentCtxt = environment.getContext(Context.CONTEXTNAME_ENVIRONMENT); + Context environmentCtxt = environment.getContext(Context.CONTEXTNAME_TRANSACTION); assertNotNull(environmentCtxt); } finally { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -38,12 +38,12 @@ public void testEnvironmentDefaultSearchOrder() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <string name='a' value='process-engine-a' />" + - " </process-engine>" + - " <environment>" + + " </process-engine-context>" + + " <transaction-context>" + " <string name='a' value='environment-a' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -60,12 +60,12 @@ public void testEnvironmentGivenSearchOrder() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <string name='a' value='process-engine-a' />" + - " </process-engine>" + - " <environment>" + + " </process-engine-context>" + + " <transaction-context>" + " <string name='a' value='environment-a' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -84,13 +84,13 @@ public void testEnvironmentGivenSearchOrderUnexistingObject() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <string name='a' value='process-engine-a' />" + - " </process-engine>" + - " <environment>" + + " </process-engine-context>" + + " <transaction-context>" + " <string name='a' value='environment-a' />" + " <string name='b' value='environment-b' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -110,12 +110,12 @@ public void testEnvironmentDefaultSearchOrderWithAddedContext() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <string name='a' value='process-engine-a' />" + - " </process-engine>" + - " <environment>" + + " </process-engine-context>" + + " <transaction-context>" + " <string name='a' value='environment-a' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -144,12 +144,12 @@ public void testEnvironmentGivenSearchOrderWithAddedContext() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <string name='a' value='process-engine-a' />" + - " </process-engine>" + - " <environment>" + + " </process-engine-context>" + + " <transaction-context>" + " <string name='a' value='environment-a' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -168,7 +168,7 @@ environment.addContext(addedContext); // only search in context 'process-engine' and 'environment' - String[] searchOrder = new String[]{"environment", "process-engine"}; + String[] searchOrder = new String[]{"transaction", "process-engine"}; assertEquals("environment-a", environment.get("a", searchOrder)); } finally { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -37,12 +37,12 @@ public void testApplicationTypeLookup() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <object class='"+A.class.getName()+"' />" + - " </process-engine>" + - " <environment>" + + " </process-engine-context>" + + " <transaction-context>" + " <string name='a' value='distraction' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -61,12 +61,12 @@ public void testBlockTypeLookup() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <string name='a' value='distraction' />" + - " </process-engine>" + - " <environment>" + + " </process-engine-context>" + + " <transaction-context>" + " <object class='"+A.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -85,12 +85,12 @@ public void testNonExistingTypeLookup() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <string name='a' value='A' />" + - " </process-engine>" + - " <environment>" + + " </process-engine-context>" + + " <transaction-context>" + " <string name='b' value='B' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -34,12 +34,12 @@ public void testNestedEnvironments() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <object name='a' class='"+Object.class.getName()+"' />" + - " </process-engine>" + - " <environment>" + + " </process-engine-context>" + + " <transaction-context>" + " <object name='b' class='"+Object.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -43,14 +43,14 @@ public void dontTestGroovyExpression() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <script-manager default-expression-language='juel'" + " default-script-language='juel'" + " read-contexts='execution, environment, process-engine' " + " write-context='execution'>" + " <script-language name='groovy' factory='com.sun.script.groovy.GroovyScriptEngineFactory' />" + " </script-manager>" + - " </process-engine>" + + " </process-engine-context>" + "</jbpm-configuration>" ); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -39,14 +39,14 @@ public void testJuelExpression() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <script-manager default-expression-language='juel'" + " default-script-language='juel'" + " read-contexts='execution, environment, process-engine' " + " write-context='execution'>" + " <script-language name='juel' factory='com.sun.script.juel.JuelScriptEngineFactory' />" + " </script-manager>" + - " </process-engine>" + + " </process-engine-context>" + "</jbpm-configuration>" ); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -44,12 +44,12 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction name='tx' />" + " <object name='o' class='"+ MyResource.class.getName()+"'>" + " <enlist transaction='tx'/>" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -74,12 +74,12 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction name='tx' />" + " <object name='o' class='"+ MyResource.class.getName()+"'>" + " <enlist transaction='tx'/>" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -104,12 +104,12 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction name='tx' />" + " <object name='o' class='"+ MyResource.class.getName()+"'>" + " <enlist transaction='tx'/>" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -137,12 +137,12 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction name='tx' />" + " <object name='o' class='"+ MyResource.class.getName()+"'>" + " <enlist transaction='tx'/>" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -170,12 +170,12 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction name='transaction' />" + " <object name='o' class='java.lang.Object'>" + " <enlist transaction='transaction'/>" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -194,12 +194,12 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <object name='o' class='"+MyResource.class.getName()+"'>" + " <enlist transaction='tx'/>" + " </object>" + " <object name='tx' class='java.lang.Object'/>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -218,9 +218,9 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -61,7 +61,7 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + " <enlist />" + @@ -72,7 +72,7 @@ " <object name='resourceThree' class='"+TestResource.class.getName()+"'>" + " <enlist />" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); try { @@ -133,7 +133,7 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + " <enlist />" + @@ -144,7 +144,7 @@ " <object name='resourceThree' class='"+TestResource.class.getName()+"'>" + " <enlist />" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); try { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -47,12 +47,12 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + " <enlist />" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); try { @@ -84,7 +84,7 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + " <enlist />" + @@ -95,7 +95,7 @@ " <object name='resourceThree' class='"+TestResource.class.getName()+"'>" + " <enlist />" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); try { @@ -142,7 +142,7 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + " <enlist />" + @@ -153,7 +153,7 @@ " <object name='resourceThree' class='"+TestResource.class.getName()+"'>" + " <enlist />" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); try { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -48,12 +48,12 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + " <enlist />" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); try { @@ -87,7 +87,7 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + " <enlist />" + @@ -98,7 +98,7 @@ " <object name='resourceThree' class='"+TestResource.class.getName()+"'>" + " <enlist />" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); try { @@ -147,7 +147,7 @@ Environment environment = openEnvironment( "<jbpm-configuration>" + " <process-engine/>"+ - " <environment>" + + " <transaction-context>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + " <enlist />" + @@ -158,7 +158,7 @@ " <object name='resourceThree' class='"+TestResource.class.getName()+"'>" + " <enlist />" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); try { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -56,11 +56,11 @@ // In this test, there is no eager initialization WireContext context = new WireContext((WireDefinition) WireParser.getInstance().parseXmlString( - " <environment>" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"'>" + " <subscribe context='foo'/>" + " </object>" + - " </environment>" + " </transaction-context>" )); try{ @@ -78,18 +78,18 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"'>" + " <subscribe />" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); try { - WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_ENVIRONMENT); + WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION); assertNotNull(environment.get("recorder")); // The recorder object will be subscribed to the environment WireScope @@ -128,12 +128,12 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe />" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -162,13 +162,13 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe />" + " </object>" + " <object name='o' class='"+Object.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -203,12 +203,12 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe event='interestingevent'/>" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -216,7 +216,7 @@ try { assertEquals(events.toString(), 0, events.size()); - WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_ENVIRONMENT); + WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION); contextBlockContext.fire("interestingevent", null); assertEquals(events.toString(), 1, events.size()); @@ -239,18 +239,18 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe events='constructing, open, constructed, interestingevent, close'/>" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); try { - WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_ENVIRONMENT); + WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION); assertEquals(events.toString(), 2, events.size()); int index=0; @@ -286,13 +286,13 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe events='constructing, open, constructed, interestingevent, close'/>" + " </object>" + " <object name='o' class='"+Object.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -322,15 +322,15 @@ public void testOtherWireScope() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <object name='factory' class='"+Object.class.getName()+"' />" + - " </process-engine>" + - " <environment>" + + " </process-engine-context>" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe context='process-engine'/>" + " </object>" + " <object name='product' factory='factory' method='getClass' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -372,15 +372,15 @@ public void testOtherWireScopeWithEventFiltering() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <object name='factory' class='"+Object.class.getName()+"' />" + - " </process-engine>" + - " <environment>" + + " </process-engine-context>" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe context='process-engine' events='initializing' />" + " </object>" + " <object name='product' factory='factory' method='getClass' />" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -410,12 +410,12 @@ public void testUnexistingScope() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe context='unexistingcontext' />" + " </object>" + - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); @@ -439,8 +439,8 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='a' class='"+A.class.getName()+"'>" + " <field name='o'>" + " <object name='recorder' class='"+Recorder.class.getName()+"'>" + @@ -448,13 +448,13 @@ " </object>" + " </field>" + " </object>"+ - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); try { - WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_ENVIRONMENT); + WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION); assertNotNull(environment.get("a")); // The recorder object will be subscribed to the environment WireContext @@ -498,8 +498,8 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='a' class='"+A.class.getName()+"'>" + " <field name='o'>" + " <object name='b' class='"+A.class.getName()+"'>" + @@ -511,13 +511,13 @@ " </object>"+ " </field>" + " </object>"+ - " </environment>" + + " </transaction-context>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); try { - WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_ENVIRONMENT); + WireContext contextBlockContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION); assertNotNull(environment.get("a")); // The recorder object will be subscribed to the environment WireContext Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -14,10 +14,10 @@ public void testEnvironmentWire(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context /> " + + " <transaction-context>" + " <env-ref name='e' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); @@ -38,10 +38,10 @@ public void testEnvironmentFactoryWire(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <process-engine-ref name='f' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); @@ -60,12 +60,12 @@ public void testContextRefEnvironmentWire(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + "<jbpm-configuration>" + + " <process-engine-context />" + + " <transaction-context>" + " <context-ref name='c' />" + - " </environment>" + - "</environment-scopes>" + " </transaction-context>" + + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -75,7 +75,7 @@ assertNotNull(c); assertEquals(WireContext.class, c.getClass()); - assertEquals(environment.getContext("environment"), c); + assertEquals(environment.getContext("transaction"), c); } finally { environment.close(); } @@ -85,9 +85,9 @@ public void testContextRefEnvironmentFactoryWire(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine>" + + " <process-engine-context>" + " <context-ref name='c' />" + - " </process-engine>" + + " </process-engine-context>" + " <environment/>" + "</environment-scopes>" ); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -45,15 +45,15 @@ */ public void testMethodWithNoArg() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + "<jbpm-configuration>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent' />" + " </object>" + " <object name='a' class='"+DefaultObservable.class.getName()+"' />" + - " </environment>" + - "</environment-scopes>" + " </transaction-context>" + + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); try { @@ -87,15 +87,15 @@ */ public void testMethodWithBadName() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + "<jbpm-configuration>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='i-am-not-a-method' />" + " </object>" + " <object name='a' class='"+DefaultObservable.class.getName()+"' />" + - " </environment>" + - "</environment-scopes>" + " </transaction-context>" + + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); try { @@ -124,9 +124,9 @@ */ public void testMethodWithOneArg() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + "<jbpm-configuration>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent' >" + " <arg>" + @@ -135,8 +135,8 @@ " </subscribe>" + " </object>" + " <object name='a' class='"+DefaultObservable.class.getName()+"' />" + - " </environment>" + - "</environment-scopes>" + " </transaction-context>" + + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); try { @@ -171,9 +171,9 @@ */ public void testMethodWithTwoArgs() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + "<jbpm-configuration>" + + " <process-engine-context /> "+ + " <transaction-context>" + " <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent' event='ping'>" + " <arg type='java.lang.Object'>" + @@ -193,8 +193,8 @@ " </subscribe>" + " </object>" + " <object name='a' class='"+DefaultObservable.class.getName()+"' />" + - " </environment>" + - "</environment-scopes>" + " </transaction-context>" + + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); try { @@ -231,9 +231,9 @@ */ public void testMethodWithThreeArgs() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + "<jbpm-configuration>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent'>" + " <arg type='java.lang.Object'>" + @@ -248,8 +248,8 @@ " </subscribe>" + " </object>" + " <object name='a' class='"+DefaultObservable.class.getName()+"' />" + - " </environment>" + - "</environment-scopes>" + " </transaction-context>" + + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); try { @@ -284,8 +284,8 @@ public void testMethodWithArgsAndMultipleObjectsSubcription() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent' >" + " <arg>" + @@ -300,7 +300,7 @@ " </object>" + " <object name='a' class='"+DefaultObservable.class.getName()+"' />" + " <object name='b' class='"+DefaultObservable.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); Environment environment = environmentFactory.openEnvironment(); @@ -375,8 +375,8 @@ public void testMethodAndOverLoading() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='l' class='"+OverloadingRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent' >" + " <arg type='java.lang.Object'>" + @@ -385,7 +385,7 @@ " </subscribe>" + " </object>" + " <object name='a' class='"+OverloadingTestClass.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); Environment environment = environmentFactory.openEnvironment(); @@ -430,8 +430,8 @@ public void testMethodAndBadArg() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='l' class='"+OverloadingRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent' >" + " <arg type='java.lang.Integer'>" + @@ -440,7 +440,7 @@ " </subscribe>" + " </object>" + " <object name='a' class='"+OverloadingTestClass.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); Environment environment = environmentFactory.openEnvironment(); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -40,13 +40,13 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"'>" + " <subscribe object='o' />" + " </object>" + " <object name='o' class='"+DefaultObservable.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); @@ -82,13 +82,13 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe object='o' />" + " </object>" + " <object name='o' class='"+DefaultObservable.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); @@ -128,15 +128,15 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe objects='newsletter, blog, newspaper' />" + " </object>" + " <object name='newsletter' class='"+DefaultObservable.class.getName()+"' />" + " <object name='blog' class='"+DefaultObservable.class.getName()+"' />" + " <object name='newspaper' class='"+DefaultObservable.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); @@ -195,12 +195,12 @@ public void testUnexistingObject() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe object='unexistingobject' />" + " </object>" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); @@ -208,7 +208,7 @@ environmentFactory.openEnvironment(); fail("expected exception"); } catch (WireException e) { - assertTextPresent("couldn't initialize object 'recorder': couldn't subscribe to object in context environment: object unexistingobject unavailable", e.getMessage()); + assertTextPresent("couldn't initialize object 'recorder': couldn't subscribe to object in context transaction: object unexistingobject unavailable", e.getMessage()); } } @@ -218,13 +218,13 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe object='o' events='ping, pong' />" + " </object>" + " <object name='o' class='"+DefaultObservable.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); @@ -268,13 +268,13 @@ public void testNotObservableObject() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe object='o' />" + " </object>" + " <object name='o' class='java.lang.Object' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); @@ -282,7 +282,7 @@ environmentFactory.openEnvironment(); fail("expected exception"); } catch (WireException e) { - assertTextPresent("couldn't initialize object 'recorder': couldn't subscribe to object in context environment: object o (java.lang.Object) isn't "+Observable.class.getName(), e.getMessage()); + assertTextPresent("couldn't initialize object 'recorder': couldn't subscribe to object in context transaction: object o (java.lang.Object) isn't "+Observable.class.getName(), e.getMessage()); } environmentFactory.close(); } @@ -290,13 +290,13 @@ public void testNotListener() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='java.lang.Object' init='eager'>" + " <subscribe object='o' />" + " </object>" + " <object name='o' class='" + DefaultObservable.class.getName() +"' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -42,15 +42,15 @@ public void testRegisterToAllDescriptors() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"'>" + // If no object(s) are specified, the subscriber will be informed of // events on *all* descriptors. " <subscribe to='wire-events' />" + " </object>" + " <object name='o' class='"+DefaultObservable.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); @@ -84,8 +84,8 @@ public void testOneObjectDescriptor() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + // only subscribe to wire-events of object o, which means that recorder will // be notified of any event produced by the descriptor of object o @@ -93,7 +93,7 @@ " </object>" + " <object name='o' class='"+DefaultObservable.class.getName()+"' />" + " <object name='p' class='"+Object.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); @@ -141,15 +141,15 @@ public void testMultipleObjectDescriptors() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + // record all wire events coming from the descriptors of objects o and p " <subscribe to='wire-events' objects='o, p' />" + " </object>" + " <object name='o' class='"+DefaultObservable.class.getName()+"' />" + " <object name='p' class='"+Object.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); @@ -217,15 +217,15 @@ public void testOneObjectDescriptorWithEventFilter() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + // record only 'initializing' wire events produced by the descriptor of object o. " <subscribe to='wire-events' object='o' event='initializing' />" + " </object>" + " <object name='o' class='"+DefaultObservable.class.getName()+"' />" + " <object name='p' class='"+Object.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); @@ -258,15 +258,15 @@ public void testMultipleObjectDescriptorsWithEventFilter() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + // record 'constructing' and 'constructed' events fired by descriptors for objects o and p " <subscribe to='wire-events' objects='o, p' events='constructing, constructed' />" + " </object>" + " <object name='o' class='"+DefaultObservable.class.getName()+"' />" + " <object name='p' class='"+Object.class.getName()+"' />" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -48,18 +48,18 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <process-engine />" + - " <environment>" + + " <process-engine-context />" + + " <transaction-context>" + " <object name='recorder' class='"+Recorder.class.getName()+"'>" + " <subscribe />" + " </object>" + - " </environment>" + + " </transaction-context>" + "</environment-scopes>" ); Environment environment = environmentFactory.openEnvironment(); try { - WireContext environmentContext = (WireContext) environment.getContext(Context.CONTEXTNAME_ENVIRONMENT); + WireContext environmentContext = (WireContext) environment.getContext(Context.CONTEXTNAME_TRANSACTION); // this test also checks non-eager-initialized subscription // subscription should only be done when the object is created the first time Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -2,7 +2,7 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine> + <process-engine-context> <deployer-manager> <assign-file-type> @@ -55,16 +55,16 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> + <transaction /> <hibernate-session /> - <transaction /> <pvm-db-session /> <job-db-session /> <message-session /> <timer-session /> <identity-session realm="realm://jbpm-identity" /> - </environment> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -1,6 +1,6 @@ <jbpm-configuration> - <process-engine> + <process-engine-context> <object class="org.jbpm.pvm.internal.hibernate.PvmNamingStrategy" auto-wire="true" /> @@ -27,9 +27,9 @@ <transaction-interceptor /> </command-service> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <transaction /> <hibernate-session /> @@ -38,6 +38,6 @@ <pvm-db-session /> <job-db-session /> - </environment> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -2,7 +2,7 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine> + <process-engine-context> <deployer-manager> <assign-file-type> @@ -36,12 +36,12 @@ </hibernate-configuration> <hibernate-session-factory /> <types resource="jbpm.pvm.types.xml" /> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <transaction /> <hibernate-session /> <pvm-db-session /> - </environment> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -2,7 +2,7 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine> + <process-engine-context> <job-test-helper /> @@ -49,14 +49,14 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <transaction /> <hibernate-session /> <pvm-db-session /> <message-session target="test" /> <timer-session target="test" /> - </environment> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -1,10 +1,10 @@ <jbpm-configuration> - <process-engine> + <process-engine-context> <types resource="jbpm.pvm.types.xml" /> - </process-engine> + </process-engine-context> - <environment> - </environment> + <transaction-context> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -1,6 +1,6 @@ <jbpm-configuration> - <process-engine> + <process-engine-context> <hibernate-configuration> <properties resource="hibernate.properties" /> @@ -17,14 +17,14 @@ <hibernate-session-factory /> <types resource="jbpm.pvm.types.xml" /> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <transaction /> <hibernate-session /> <pvm-db-session /> - </environment> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -1,6 +1,6 @@ <jbpm-configuration> - <process-engine> + <process-engine-context> <job-executor threads="1" auto-start="false" /> @@ -33,9 +33,9 @@  <map name="timerVariables" synchronized="true" /> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <transaction /> <hibernate-session /> @@ -45,5 +45,5 @@ <message-session /> <timer-session /> - </environment> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -1,10 +1,10 @@ <jbpm-configuration> - <process-engine> + <process-engine-context> <types resource="jbpm.pvm.types.xml" /> - </process-engine> + </process-engine-context> - <environment> - </environment> + <transaction-context> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/variables/custom.types.jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/variables/custom.types.jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/variables/custom.types.jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -1,6 +1,6 @@ <jbpm-configuration> - <process-engine> + <process-engine-context> <hibernate-configuration> <properties resource="hibernate.properties" /> @@ -18,14 +18,14 @@ <types> <type name="date" class="java.util.Date" variable-class="org.jbpm.pvm.internal.type.variable.DateVariable" /> </types> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <transaction /> <hibernate-session /> <pvm-db-session /> - </environment> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -2,7 +2,7 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine> + <process-engine-context> <deployer-manager> <assign-file-type> @@ -56,9 +56,9 @@ <holiday period="01/07/2008 - 31/08/2008" /> </business-calendar> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <hibernate-session /> <transaction /> <pvm-db-session /> @@ -66,6 +66,6 @@ <message-session /> <timer-session /> <task-db-session /> - </environment> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java 2009-02-13 17:09:13 UTC (rev 3875) @@ -47,11 +47,11 @@ ProcessEngine processEngine = new Configuration() .setXmlString( "<jbpm-configuration>" + - " <process-engine>" + + " <process-engine-context>" + " <process-service />" + " <execution-service />" + " <management-service />" + - " </process-engine>" + + " </process-engine-context>" + "</jbpm-configuration>" ) .buildProcessEngine(); Modified: jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -2,7 +2,7 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine> + <process-engine-context> <deployer-manager> <assign-file-type> @@ -56,9 +56,9 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <hibernate-session /> <transaction /> <pvm-db-session /> @@ -67,6 +67,6 @@ <message-session /> <timer-session /> <history-session /> - </environment> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml 2009-02-13 16:15:34 UTC (rev 3874) +++ jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml 2009-02-13 17:09:13 UTC (rev 3875) @@ -2,7 +2,7 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine> + <process-engine-context> <deployer-manager> <assign-file-type> @@ -46,15 +46,15 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </process-engine> + </process-engine-context> - <environment> + <transaction-context> <hibernate-session /> <transaction /> <pvm-db-session /> <job-db-session /> <message-session /> <timer-session /> - </environment> + </transaction-context> </jbpm-configuration>

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3874 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/jta.

by do-not-reply＠jboss.org

Author: camunda Date: 2009-02-13 11:15:34 -0500 (Fri, 13 Feb 2009) New Revision: 3874 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java Log: changed log level of commit/rollback events from ERROR to DEBUG since exceptions shoul deither be logged OR thrown Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2009-02-13 16:04:59 UTC (rev 3873) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/persistence/jta/JtaDbPersistenceService.java 2009-02-13 16:15:34 UTC (rev 3874) @@ -99,7 +99,11 @@ "optimistic locking failed, could not commit " + transaction, e); } else { - log.error("transaction commit failed", e); + // Switched to debug because either handle OR log + // an exception is best practice, not both! + // Example: Clustered JobExecutor may have + // Exceptions which should be kept quiet + log.debug("transaction commit failed", e); } return e; } @@ -112,7 +116,11 @@ return null; } catch (Exception e) { - log.error("transaction rollback failed", e); + // Switched to debug because either handle OR log + // an exception is best practice, not both! + // Example: Clustered JobExecutor may have + // Exceptions which should be kept quiet + log.debug("transaction rollback failed", e); return e; } }

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3873 - in jbpm4/trunk/modules: enterprise/src/main/java/org/jbpm/enterprise/mgmt and 27 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-02-13 11:04:59 -0500 (Fri, 13 Feb 2009) New Revision: 3873 Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ProcessManagementImpl.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Services.xml jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml Log: JBPM-1986 renamed startExecutionXxx methods to startProcessInstanceXxx Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -25,63 +25,60 @@ import java.util.Map; import java.util.Set; -import org.jbpm.history.HistoryActivityInstanceQuery; -import org.jbpm.history.HistoryProcessInstanceQuery; - /** manages runtime process executions. * * @author Tom Baeyens */ public interface ExecutionService { - /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. + /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. */ - Execution startExecutionById(String processDefinitionId); + Execution startProcessInstanceById(String processDefinitionId); - /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. + /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. * @param executionKey is a user provided reference for the new execution that must be unique over all * process versions with the same name. */ - Execution startExecutionById(String processDefinitionId, String executionKey); + Execution startProcessInstanceById(String processDefinitionId, String executionKey); - /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. + /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. * @param variables are the initial values of the process variables that will be set before the execution starts. */ - Execution startExecutionById(String processDefinitionId, Map<String, Object> variables); + Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables); - /** starts a new execution for the ProcessDefinition with the given processDefinitionDbid. + /** starts a new process instance for the ProcessDefinition with the given processDefinitionDbid. * @param processDefinitionId the {@link ProcessDefinition#getId() unique id} of the process definition. * @param variables are the initial values of the process variables that will be set before the execution starts. * @param executionKey is a user provided reference for the new execution that must be unique over all * process versions with the same name. */ - Execution startExecutionById(String processDefinitionId, Map<String, Object> variables, String executionKey); + Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String executionKey); - /** starts a new execution in the latest version of the given process definition. + /** starts a new process instance in the latest version of the given process definition. * @param processDefinitionKey is the key of the process definition for which the latest version will be taken. */ - Execution startExecutionByKey(String processDefinitionKey); + Execution startProcessInstanceByKey(String processDefinitionKey); - /** starts a new execution in the latest version of the given processDefinitionName. + /** starts a new process instance in the latest version of the given processDefinitionName. * @param processDefinitionKey is the key of the process definition * for which the latest version will be taken. * @param executionKey is a user provided reference for the new execution * that must be unique over all process versions with the same name. */ - Execution startExecutionByKey(String processDefinitionKey, String executionKey); + Execution startProcessInstanceByKey(String processDefinitionKey, String executionKey); - /** starts a new execution in the latest version of the given processDefinitionName. + /** starts a new process instance in the latest version of the given processDefinitionName. * @param processDefinitionKey is the key of the process definition * for which the latest version will be taken. * @param variables are the initial values of the process variables that * will be set before the execution starts (read: before the initial * activity is executed). */ - Execution startExecutionByKey(String processDefinitionKey, Map<String, Object> variables); + Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables); - /** starts a new execution in the latest version of the given processDefinitionName. + /** starts a new process instance in the latest version of the given processDefinitionName. * @param processDefinitionKey is the key of the process definition for which the latest version will be taken. * @param variables are the initial values of the process variables that will be set before the execution starts. * @param executionKey is a user provided reference for the new execution that must be unique over all * process versions with the same name. */ - Execution startExecutionByKey(String processDefinitionKey, Map<String, Object> variables, String executionKey); + Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String executionKey); /** the execution that is uniquely defined by the process definition and the business key. */ Execution findExecution(String processDefinitionName, String executionKey); Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ProcessManagementImpl.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ProcessManagementImpl.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/mgmt/ProcessManagementImpl.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -122,7 +122,7 @@ public ProcessInstanceRef newInstance(String definitionId) { ExecutionService execService = this.processEngine.getExecutionService(); - Execution exec = execService.startExecutionById(definitionId); + Execution exec = execService.startProcessInstanceById(definitionId); return ModelAdaptor.adoptExecution((OpenExecution)exec); } Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -142,7 +142,7 @@ */ public void testCancel() throws CreateException { // start an execution - environment.get(ExecutionService.class).startExecutionById(processDefinitionId); + environment.get(ExecutionService.class).startProcessInstanceById(processDefinitionId); // wait past the due date, ensure activity did not execute Date executionDate = HappyListener.waitFor(2 * TIMEOUT); Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -133,7 +133,7 @@ environment.get(ProcessService.class).createDeployment().addObject(processDefinition.getName(), processDefinition).deploy(); // start execution - Execution execution = environment.get(ExecutionService.class).startExecutionById( + Execution execution = environment.get(ExecutionService.class).startProcessInstanceById( processDefinition.getId()); TimerImpl timer = new TimerImpl(); @@ -176,7 +176,7 @@ processDefinition).deploy(); // start execution ExecutionService executionService = environment.get(ExecutionService.class); - ExecutionImpl execution = (ExecutionImpl) executionService.startExecutionById(processDefinition + ExecutionImpl execution = (ExecutionImpl) executionService.startProcessInstanceById(processDefinition .getId()); TimerImpl timer = new TimerImpl(); @@ -226,7 +226,7 @@ processDefinition).deploy(); // start execution ExecutionImpl execution = (ExecutionImpl) environment.get(ExecutionService.class) - .startExecutionById(processDefinition.getId()); + .startProcessInstanceById(processDefinition.getId()); TimerImpl timer = new TimerImpl(); timer.setEventName("timeout"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -36,7 +36,7 @@ public void testConcurrencyGraphBased() { deployJpdlResource("org/jbpm/examples/concurrency/graphbased/process.jpdl.xml"); - Execution processInstance = executionService.startExecutionByKey("ConcurrencyGraphBased"); + Execution processInstance = executionService.startProcessInstanceByKey("ConcurrencyGraphBased"); String pid = processInstance.getId(); Set<String> expectedActivityNames = new HashSet<String>(); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -33,7 +33,7 @@ public void testEndMultipleOk() { deployJpdlResource("org/jbpm/examples/end/multiple/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndMultiple"); + Execution execution = executionService.startProcessInstanceByKey("EndMultiple"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "200"); assertTrue(execution.isEnded()); @@ -43,7 +43,7 @@ public void testEndMultipleBadRequest() { deployJpdlResource("org/jbpm/examples/end/multiple/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndMultiple"); + Execution execution = executionService.startProcessInstanceByKey("EndMultiple"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "400"); assertTrue(execution.isEnded()); @@ -53,7 +53,7 @@ public void testEndMultipleInternalServerError() { deployJpdlResource("org/jbpm/examples/end/multiple/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndMultiple"); + Execution execution = executionService.startProcessInstanceByKey("EndMultiple"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "500"); assertTrue(execution.isEnded()); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -33,7 +33,7 @@ public void testEndProcessInstance() { deployJpdlResource("org/jbpm/examples/end/processinstance/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndProcessInstance"); + Execution execution = executionService.startProcessInstanceByKey("EndProcessInstance"); assertTrue(execution.isEnded()); } } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -33,7 +33,7 @@ public void testEndStateCompleted() { deployJpdlResource("org/jbpm/examples/end/state/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndState"); + Execution execution = executionService.startProcessInstanceByKey("EndState"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "200"); assertEquals("completed", execution.getState()); @@ -43,7 +43,7 @@ public void testEndStateErrorBadRequest() { deployJpdlResource("org/jbpm/examples/end/state/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndState"); + Execution execution = executionService.startProcessInstanceByKey("EndState"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "400"); assertEquals("cancel", execution.getState()); @@ -53,7 +53,7 @@ public void testEndStateErrorInternalServerError() { deployJpdlResource("org/jbpm/examples/end/state/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("EndState"); + Execution execution = executionService.startProcessInstanceByKey("EndState"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "500"); assertEquals("error", execution.getState()); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -57,7 +57,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("title", "Internetworking with TCP/IP"); - Execution execution = executionService.startExecutionByKey("Esb", variables); + Execution execution = executionService.startProcessInstanceByKey("Esb", variables); Message message = courier.getMessage(); Body body = message.getBody(); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -38,7 +38,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "good"); - Execution execution = executionService.startExecutionByKey("ExclusiveConditions", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveConditions", variables); assertEquals("submit document", execution.getActivityName()); } @@ -47,7 +47,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "bad"); - Execution execution = executionService.startExecutionByKey("ExclusiveConditions", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveConditions", variables); assertEquals("try again", execution.getActivityName()); } @@ -56,7 +56,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "ugly"); - Execution execution = executionService.startExecutionByKey("ExclusiveConditions", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveConditions", variables); assertEquals("give up", execution.getActivityName()); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -38,7 +38,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "good"); - Execution execution = executionService.startExecutionByKey("ExclusiveExpression", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveExpression", variables); assertEquals("submit document", execution.getActivityName()); } @@ -47,7 +47,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "bad"); - Execution execution = executionService.startExecutionByKey("ExclusiveExpression", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveExpression", variables); assertEquals("try again", execution.getActivityName()); } @@ -56,7 +56,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "ugly"); - Execution execution = executionService.startExecutionByKey("ExclusiveExpression", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveExpression", variables); assertEquals("give up", execution.getActivityName()); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -38,7 +38,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "you're great"); - Execution execution = executionService.startExecutionByKey("ExclusiveHandler", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveHandler", variables); assertEquals("submit document", execution.getActivityName()); } @@ -47,7 +47,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "you gotta improve"); - Execution execution = executionService.startExecutionByKey("ExclusiveHandler", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveHandler", variables); assertEquals("try again", execution.getActivityName()); } @@ -56,7 +56,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("content", "you suck"); - Execution execution = executionService.startExecutionByKey("ExclusiveHandler", variables); + Execution execution = executionService.startProcessInstanceByKey("ExclusiveHandler", variables); assertEquals("give up", execution.getActivityName()); } } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -39,7 +39,7 @@ public void testHql() { deployJpdlResource("org/jbpm/examples/hql/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("Hql"); + Execution execution = executionService.startProcessInstanceByKey("Hql"); String executionId = execution.getId(); Set<String> variableNames = executionService.getVariableNames(executionId); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -33,7 +33,7 @@ public void testJavaInstantiate() { deployJpdlResource("org/jbpm/examples/java/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("Java"); + Execution execution = executionService.startProcessInstanceByKey("Java"); String executionId = execution.getId(); String answer = (String) executionService.getVariable(executionId, "answer"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -40,7 +40,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("person", new Person("Honolulu")); - Execution execution = executionService.startExecutionByKey("ScriptExpression", variables); + Execution execution = executionService.startProcessInstanceByKey("ScriptExpression", variables); String executionId = execution.getId(); String text = (String) executionService.getVariable(executionId, "text"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -39,7 +39,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("person", new Person("Honolulu")); - Execution execution = executionService.startExecutionByKey("ScriptText", variables); + Execution execution = executionService.startProcessInstanceByKey("ScriptText", variables); String executionId = execution.getId(); String text = (String) executionService.getVariable(executionId, "text"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -36,7 +36,7 @@ public void testSql() { deployJpdlResource("org/jbpm/examples/sql/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("Sql"); + Execution execution = executionService.startProcessInstanceByKey("Sql"); String executionId = execution.getId(); List<String> expectedActivityNames = new ArrayList<String>(); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -33,7 +33,7 @@ public void testStateChoiceAccept() { deployJpdlResource("org/jbpm/examples/state/choice/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("StateChoice"); + Execution execution = executionService.startProcessInstanceByKey("StateChoice"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "accept"); assertEquals("submit document", execution.getActivityName()); @@ -42,7 +42,7 @@ public void testStateChoiceReject() { deployJpdlResource("org/jbpm/examples/state/choice/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("StateChoice"); + Execution execution = executionService.startProcessInstanceByKey("StateChoice"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "reject"); assertEquals("try again", execution.getActivityName()); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -33,7 +33,7 @@ public void testWaitStatesSequence() { deployJpdlResource("org/jbpm/examples/state/sequence/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("StateSequence"); + Execution execution = executionService.startProcessInstanceByKey("StateSequence"); assertEquals("a", execution.getActivityName()); String executionId = execution.getId(); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -36,7 +36,7 @@ public void testTask() { deployJpdlResource("org/jbpm/examples/task/process.jpdl.xml"); - Execution execution = executionService.startExecutionByKey("Task"); + Execution execution = executionService.startProcessInstanceByKey("Task"); String executionId = execution.getId(); List<Task> taskList = taskService.getPersonalTaskList("johndoe", 0, 10); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -53,37 +53,37 @@ protected CommandService commandService; - public Execution startExecutionById(String processDefinitionId){ + public Execution startProcessInstanceById(String processDefinitionId){ return commandService.execute(new StartExecutionCmd(processDefinitionId, null, null)); } - public Execution startExecutionById(String processDefinitionId, String executionKey) { + public Execution startProcessInstanceById(String processDefinitionId, String executionKey) { return commandService.execute(new StartExecutionCmd(processDefinitionId, null, executionKey)); } - public Execution startExecutionById(String processDefinitionId, Map<String, Object> variables){ + public Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables){ return commandService.execute(new StartExecutionCmd(processDefinitionId, variables, null)); } - public Execution startExecutionById(String processDefinitionId, Map<String, Object> variables, String executionKey){ + public Execution startProcessInstanceById(String processDefinitionId, Map<String, Object> variables, String executionKey){ return commandService.execute(new StartExecutionCmd(processDefinitionId, variables, executionKey)); } - public Execution startExecutionByKey(String processDefinitionKey) { + public Execution startProcessInstanceByKey(String processDefinitionKey) { return commandService.execute(new StartExecutionInLatestCmd(processDefinitionKey, null, null)); } - public Execution startExecutionByKey(String processDefinitionKey, Map<String, Object> variables){ + public Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables){ return commandService.execute(new StartExecutionInLatestCmd(processDefinitionKey, variables, null)); } - public Execution startExecutionByKey(String processDefinitionKey, String executionKey) { + public Execution startProcessInstanceByKey(String processDefinitionKey, String executionKey) { return commandService.execute(new StartExecutionInLatestCmd(processDefinitionKey, null, executionKey)); } - public Execution startExecutionByKey(String processDefinitionKey, Map<String, Object> variables, String executionKey){ + public Execution startProcessInstanceByKey(String processDefinitionKey, Map<String, Object> variables, String executionKey){ return commandService.execute(new StartExecutionInLatestCmd(processDefinitionKey, variables, executionKey)); } Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -39,7 +39,7 @@ public void testContinuations() { deployProcess(); - Execution execution = executionService.startExecutionByKey("continuations"); + Execution execution = executionService.startProcessInstanceByKey("continuations"); assertEquals("start", execution.getActivityName()); assertEquals(Execution.STATE_ASYNC, execution.getState()); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -50,11 +50,11 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("distance", "far"); - Execution execution = executionService.startExecutionByKey("Poolcar", variables); + Execution execution = executionService.startProcessInstanceByKey("Poolcar", variables); assertEquals("Big car", execution.getActivityName()); variables.put("distance", "nearby"); - execution = executionService.startExecutionByKey("Poolcar", variables); + execution = executionService.startProcessInstanceByKey("Poolcar", variables); assertEquals("Small car", execution.getActivityName()); } @@ -81,15 +81,15 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("distance", new Integer(69)); - Execution execution = executionService.startExecutionByKey("Poolcar", variables); + Execution execution = executionService.startProcessInstanceByKey("Poolcar", variables); assertEquals("Big car", execution.getActivityName()); variables.put("distance", new Integer(6)); - execution = executionService.startExecutionByKey("Poolcar", variables); + execution = executionService.startProcessInstanceByKey("Poolcar", variables); assertEquals("Small car", execution.getActivityName()); variables.put("distance", new Integer(2)); - execution = executionService.startExecutionByKey("Poolcar", variables); + execution = executionService.startProcessInstanceByKey("Poolcar", variables); assertEquals("No car", execution.getActivityName()); } Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -46,7 +46,7 @@ "</process>" ); - Execution execution = executionService.startExecutionById("ThreeStates:1"); + Execution execution = executionService.startProcessInstanceById("ThreeStates:1"); assertEquals("b", execution.getActivityName()); String executionId = execution.getId(); @@ -75,16 +75,16 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("p", "one"); + Execution execution = executionService.startProcessInstanceByKey("p", "one"); assertEquals("ed", execution.getActivityName()); execution = executionService.signalExecutionById("p/one", "left"); assertEquals("b", execution.getActivityName()); - executionService.startExecutionById("p:1", "two"); + executionService.startProcessInstanceById("p:1", "two"); execution = executionService.signalExecutionById("p/two", "middle"); assertEquals("c", execution.getActivityName()); - executionService.startExecutionById("p:1", "three"); + executionService.startProcessInstanceById("p:1", "three"); execution = executionService.signalExecutionById("p/three", "right"); assertEquals("d", execution.getActivityName()); } @@ -106,7 +106,7 @@ "</process>" ); - executionService.startExecutionByKey("p", "one"); + executionService.startProcessInstanceByKey("p", "one"); try { executionService.signalExecutionById("p/one", "left"); } catch (JbpmException e) { @@ -131,7 +131,7 @@ "</process>" ); - executionService.startExecutionByKey("p", "one"); + executionService.startProcessInstanceByKey("p", "one"); Execution execution = executionService.signalExecutionById("p/one", "up"); assertEquals("a", execution.getActivityName()); } @@ -146,7 +146,7 @@ "</process>" ); - executionService.startExecutionByKey("p", "one"); + executionService.startProcessInstanceByKey("p", "one"); Execution execution = executionService.signalExecutionById("p/one"); assertEquals("a", execution.getActivityName()); } Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -39,7 +39,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("p"); + Execution execution = executionService.startProcessInstanceByKey("p"); // take the id and see if the execution service can still find it back execution = executionService.findExecution(execution.getId()); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -51,7 +51,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("ICL", "82436"); + Execution execution = executionService.startProcessInstanceByKey("ICL", "82436"); assertEquals("a", execution.getActivityName()); @@ -80,7 +80,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("ICL", "82436"); + Execution execution = executionService.startProcessInstanceByKey("ICL", "82436"); assertEquals("a", execution.getActivityName()); @@ -106,7 +106,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("ICL", "82436"); + Execution execution = executionService.startProcessInstanceByKey("ICL", "82436"); Map<String,Object> variables = new HashMap<String,Object>(); variables.put("customer", "John Doe"); @@ -139,7 +139,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("p"); + Execution execution = executionService.startProcessInstanceByKey("p"); execution = executionService.signalExecutionById(execution.getId()); assertEquals("a", execution.getActivityName()); } Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -46,7 +46,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("ICL"); + Execution execution = executionService.startProcessInstanceByKey("ICL"); assertNotNull(execution); assertEquals("a", execution.getActivityName()); @@ -62,7 +62,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("ICL"); + Execution execution = executionService.startProcessInstanceByKey("ICL"); assertNotNull(execution); assertEquals("a", execution.getActivityName()); @@ -76,7 +76,7 @@ "</process>" ); - execution = executionService.startExecutionByKey("ICL"); + execution = executionService.startProcessInstanceByKey("ICL"); assertNotNull(execution); assertEquals("b", execution.getActivityName()); @@ -107,7 +107,7 @@ variables.put("b", "text"); // feed the variables in - Execution execution = executionService.startExecutionByKey("ICL", variables); + Execution execution = executionService.startProcessInstanceByKey("ICL", variables); String executionId = execution.getId(); assertEquals("b", execution.getActivityName()); @@ -129,7 +129,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("ICL", "one"); + Execution execution = executionService.startProcessInstanceByKey("ICL", "one"); assertNotNull(execution); assertEquals("ICL/one", execution.getId()); @@ -150,7 +150,7 @@ variables.put("type", "Accident"); variables.put("amount", new Float(763.74)); - Execution execution = executionService.startExecutionByKey("ICL", variables); + Execution execution = executionService.startProcessInstanceByKey("ICL", variables); String executionId = execution.getId(); @@ -178,7 +178,7 @@ ProcessDefinition processDefinition = processService.findProcessDefinitionsByKey("ICL").get(0); // start an execution for the process with the given id - Execution execution = executionService.startExecutionById("ICL:1"); + Execution execution = executionService.startProcessInstanceById("ICL:1"); assertNotNull(execution); // checking the state @@ -210,7 +210,7 @@ variables.put("b", "text"); // provide the variables in the start execution method - Execution execution = executionService.startExecutionById("ICL:1", variables); + Execution execution = executionService.startProcessInstanceById("ICL:1", variables); String executionId = execution.getId(); assertEquals(new Integer(1), executionService.getVariable(executionId, "a")); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -75,7 +75,7 @@ } protected void executeProcess() throws InterruptedException { - Execution execution = executionService.startExecutionByKey("ICL"); + Execution execution = executionService.startProcessInstanceByKey("ICL"); Thread.sleep(50); executionService.signalExecutionById(execution.getId()); Thread.sleep(20); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -52,16 +52,16 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("distance", "far"); - executionService.startExecutionByKey("TRS", variables); + executionService.startProcessInstanceByKey("TRS", variables); variables.put("distance", "nearby"); - executionService.startExecutionByKey("TRS", variables); - executionService.startExecutionByKey("TRS", variables); - executionService.startExecutionByKey("TRS", variables); + executionService.startProcessInstanceByKey("TRS", variables); + executionService.startProcessInstanceByKey("TRS", variables); + executionService.startProcessInstanceByKey("TRS", variables); variables.put("distance", "other country"); - executionService.startExecutionByKey("TRS", variables); - executionService.startExecutionByKey("TRS", variables); + executionService.startProcessInstanceByKey("TRS", variables); + executionService.startProcessInstanceByKey("TRS", variables); Map<String, Integer> choiceDistribution = historyService.choiceDistribution("TRS:1", "How far?"); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -43,9 +43,9 @@ "</process>" ); - executionService.startExecutionByKey("ICL"); - executionService.startExecutionByKey("ICL"); - executionService.startExecutionByKey("ICL"); + executionService.startProcessInstanceByKey("ICL"); + executionService.startProcessInstanceByKey("ICL"); + executionService.startProcessInstanceByKey("ICL"); List<HistoryProcessInstance> historyProcessInstances = historyService .createHistoryProcessInstanceQuery() Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -164,10 +164,10 @@ "</process>") .deploy(); - executionService.startExecutionByKey("deleteme"); - executionService.startExecutionByKey("deleteme"); - executionService.startExecutionByKey("deleteme"); - executionService.startExecutionByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); // delete it all processService.deleteProcessDefinitionCascade("deleteme:33"); @@ -187,10 +187,10 @@ "</process>" ); - executionService.startExecutionByKey("deleteme"); - executionService.startExecutionByKey("deleteme"); - executionService.startExecutionByKey("deleteme"); - executionService.startExecutionByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); + executionService.startProcessInstanceByKey("deleteme"); // delete it all try { @@ -334,7 +334,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("minimal"); + Execution execution = executionService.startProcessInstanceByKey("minimal"); assertEquals("end", execution.getActivityName()); assertTrue(execution.isEnded()); @@ -348,7 +348,7 @@ "</process>" ); - Execution execution = executionService.startExecutionByKey("minimal"); + Execution execution = executionService.startProcessInstanceByKey("minimal"); assertTrue(execution.isEnded()); assertFalse(execution.isActive()); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -44,7 +44,7 @@ "</process>" ); - executionService.startExecutionByKey("var", "one"); + executionService.startProcessInstanceByKey("var", "one"); Set<String> variableNames = executionService.getVariableNames("var/one"); assertNotNull(variableNames); assertEquals(0, variableNames.size()); @@ -68,7 +68,7 @@ Set<String> expectedVariableNames = new HashSet<String>(variables.keySet()); Map<String, Object> expectedVariables = new HashMap<String, Object>(variables); - executionService.startExecutionByKey("var", variables, "one"); + executionService.startProcessInstanceByKey("var", variables, "one"); Set<String> variableNames = executionService.getVariableNames("var/one"); assertNotNull(variableNames); @@ -90,7 +90,7 @@ "</process>" ); - executionService.startExecutionByKey("var", "one"); + executionService.startProcessInstanceByKey("var", "one"); executionService.setVariable("var/one", "msg", "hello"); assertEquals("hello", executionService.getVariable("var/one", "msg")); executionService.setVariable("var/one", "msg", "world"); @@ -107,7 +107,7 @@ "</process>" ); - executionService.startExecutionByKey("var", "one"); + executionService.startProcessInstanceByKey("var", "one"); executionService.setVariable("var/one", "msg", "hello"); assertEquals("hello", executionService.getVariable("var/one", "msg")); executionService.setVariable("var/one", "msg", new Integer(5)); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -42,7 +42,7 @@ "</process>" ); - executionService.startExecutionByKey("var", "one"); + executionService.startProcessInstanceByKey("var", "one"); executionService.setVariable("var/one", "msg", variableValue); assertEquals(variableValue, executionService.getVariable("var/one", "msg")); } Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -101,7 +101,7 @@ public void startExecutions() { for (int i = 0; i < nbrOfExecutions; i++) { - executionService.startExecutionByKey("continuations"); + executionService.startProcessInstanceByKey("continuations"); } } } Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java 2009-02-13 16:04:59 UTC (rev 3873) @@ -99,7 +99,7 @@ } } public void executeProcess() { - Execution execution = executionService.startExecutionByKey("Process"); + Execution execution = executionService.startProcessInstanceByKey("Process"); assertEquals("c", execution.getActivityName()); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId); Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Jpdl.xml 2009-02-13 16:04:59 UTC (rev 3873) @@ -198,7 +198,7 @@ </process></programlisting> <para>After you start an execution like this:</para> - <programlisting>Execution execution = executionService.startExecutionByKey("StateSequence");</programlisting> + <programlisting>Execution execution = executionService.startProcessInstanceByKey("StateSequence");</programlisting> <para>the created process instance will be positioned in state <literal>a</literal>. Providing an external trigger can be done with the <literal>signalExecution</literal> methods.</para> @@ -232,7 +232,7 @@ </process></programlisting> <para>Let's start a new process instance for this process definition:</para> - <programlisting>Execution execution = executionService.startExecutionByKey("StateSequence");</programlisting> + <programlisting>Execution execution = executionService.startProcessInstanceByKey("StateSequence");</programlisting> <para>Now, the execution is arrived in the <literal>wait for response</literal>. The execution will wait there until an external trigger is given. In case a <literal>state</literal> has multiple outgoing flows, the signalName given @@ -598,7 +598,7 @@ </para> <programlisting>Map<String, Object> variables = new HashMap<String, Object>(); variables.put("distance", "far"); -Execution execution = executionService.startExecutionByKey("Poolcar", variables);</programlisting> +Execution execution = executionService.startProcessInstanceByKey("Poolcar", variables);</programlisting> <para>then the new execution will go to activity <literal>Big car</literal>.</para> </section> @@ -768,7 +768,7 @@ </programlisting> <para>Now if we would start an execution and signal it to move out of the <literal>get return code</literal> wait state with the following code, the execution would end with the <literal>bad request</literal> end event.</para> - <programlisting>Execution execution = executionService.startExecutionByKey("EndMultiple"); + <programlisting>Execution execution = executionService.startProcessInstanceByKey("EndMultiple"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "400"); </programlisting> @@ -834,7 +834,7 @@ </programlisting> <para>This time, if we would start an execution and signal it to move out of the <literal>get return code</literal> wait state with the following code, the execution would end with the <literal>cancel</literal> state.</para> - <programlisting>Execution execution = executionService.startExecutionByKey("EndState"); + <programlisting>Execution execution = executionService.startProcessInstanceByKey("EndState"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "400"); </programlisting> Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Services.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Services.xml 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch04-Services.xml 2009-02-13 16:04:59 UTC (rev 3873) @@ -180,13 +180,13 @@ <para>Simplest and most common way to start a new process instance for a process definition is like this: </para> - <programlisting>executionService.startExecutionByKey("ICL");</programlisting> + <programlisting>executionService.startProcessInstanceByKey("ICL");</programlisting> <para>In this case, the service method will first look up the latest version of the processes with key <literal>ICL</literal>. Then a new process instance is started in that latest process definition. </para> <para>When a new version of the insurance claim process - is deployed, all invocations of <literal>startExecutionByKey</literal> + is deployed, all invocations of <literal>startProcessInstanceByKey</literal> will automatically switch to the newly deployed version. </para> </section> @@ -196,7 +196,7 @@ <para>If instead you want to start a new process instance in a very specific version, you can use the id of the process definition like this: </para> - <programlisting>executionService.startExecutionById("ICL:1");</programlisting> + <programlisting>executionService.startProcessInstanceById("ICL:1");</programlisting> </section> <section id="withakey"> @@ -207,7 +207,7 @@ to find such a key in the domain of the business process. For example, an order id or an insurance claim number. </para> - <programlisting>executionService.startExecutionByKey("ICL", "CL92837");</programlisting> + <programlisting>executionService.startProcessInstanceByKey("ICL", "CL92837");</programlisting> <para>The key is used to create the id of the process instance. The format used is <literal>{process-key}/{execution-id}</literal>. So execution created in the previous code snippet will have id @@ -215,7 +215,7 @@ </para> <para>If no user defined key is provided, the DB primary key is taken as the key. In that case, the id can be retrieved like this: - <programlisting>Execution execution = executionService.startExecutionByKey("ICL"); + <programlisting>Execution execution = executionService.startProcessInstanceByKey("ICL"); String executionId = execution.getId();</programlisting> </para> <para>We recommend the use of a user defined keys. Typically in your application @@ -236,7 +236,7 @@ variables.put("type", "Accident"); variables.put("amount", new Float(763.74)); -executionService.startExecutionByKey("ICL", variables);</programlisting> +executionService.startProcessInstanceByKey("ICL", variables);</programlisting> </section> </section> Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-02-13 15:32:36 UTC (rev 3872) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-02-13 16:04:59 UTC (rev 3873) @@ -201,7 +201,7 @@ </process></programlisting> <para>After you start an execution like this:</para> - <programlisting>Execution execution = executionService.startExecutionByKey("StateSequence");</programlisting> + <programlisting>Execution execution = executionService.startProcessInstanceByKey("StateSequence");</programlisting> <para>the created process instance will be positioned in state <literal>a</literal>. Providing an external trigger can be done with the <literal>signalExecution</literal> methods.</para> @@ -235,7 +235,7 @@ </process></programlisting> <para>Let's start a new process instance for this process definition:</para> - <programlisting>Execution execution = executionService.startExecutionByKey("StateSequence");</programlisting> + <programlisting>Execution execution = executionService.startProcessInstanceByKey("StateSequence");</programlisting> <para>Now, the execution is arrived in the <literal>wait for response</literal>. The execution will wait there until an external trigger is given. In case a <literal>state</literal> has multiple outgoing flows, the signalName given @@ -389,7 +389,7 @@ </para> <programlisting>Map<String, Object> variables = new HashMap<String, Object>(); variables.put("distance", "far"); -Execution execution = executionService.startExecutionByKey("Poolcar", variables);</programlisting> +Execution execution = executionService.startProcessInstanceByKey("Poolcar", variables);</programlisting> <para>then the new execution will go to activity <literal>Big car</literal>.</para> </section> @@ -621,7 +621,7 @@ </programlisting> <para>Now if we would start an execution and signal it to move out of the <literal>get return code</literal> wait state with the following code, the execution would end with the <literal>bad request</literal> end event.</para> - <programlisting>Execution execution = executionService.startExecutionByKey("EndMultiple"); + <programlisting>Execution execution = executionService.startProcessInstanceByKey("EndMultiple"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "400"); </programlisting> @@ -687,7 +687,7 @@ </programlisting> <para>This time, if we would start an execution and signal it to move out of the <literal>get return code</literal> wait state with the following code, the execution would end with the <literal>cancel</literal> state.</para> - <programlisting>Execution execution = executionService.startExecutionByKey("EndState"); + <programlisting>Execution execution = executionService.startProcessInstanceByKey("EndState"); String executionId = execution.getId(); execution = executionService.signalExecutionById(executionId, "400"); </programlisting> @@ -870,7 +870,7 @@ </process></programlisting> <para>After starting a process like this </para> - <programlisting>executionService.startExecutionByKey("Task");</programlisting> + <programlisting>executionService.startProcessInstanceByKey("Task");</programlisting> <para>The task list for user johndoe can be obtained from the <literal>TaskService</literal> like this</para> <programlisting>taskService.getPersonalTaskList("johndoe", 0, 10);</programlisting> @@ -977,7 +977,7 @@ <programlisting>Map<String, Object> variables = new HashMap<String, Object>(); variables.put("<emphasis role="bold">person</emphasis>", <emphasis role="bold">new Person("Honolulu")</emphasis>); -executionService.startExecutionByKey("ScriptText", variables);</programlisting> +executionService.startProcessInstanceByKey("ScriptText", variables);</programlisting> <para>After the execution of the script activity, variable <literal>text</literal> will contain 'Send packet to Honolulu'. </para>

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3872 - in jbpm4/trunk/modules: examples/src/test/java/org/jbpm/examples/end/multiple and 43 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-02-13 10:32:36 -0500 (Fri, 13 Feb 2009) New Revision: 3872 Added: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java Removed: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/TestConsoleTestCase.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/EmbeddedExecutionModeTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessAttachmentsTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskListTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskQueryTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java Log: renamed test base classes so that JbpmTestCase becomes the class for our users to use Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import java.util.Set; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class ConcurrencyGraphBasedTest extends DbTestCase { +public class ConcurrencyGraphBasedTest extends JbpmTestCase { public void testConcurrencyGraphBased() { deployJpdlResource("org/jbpm/examples/concurrency/graphbased/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -22,13 +22,13 @@ package org.jbpm.examples.end.multiple; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class EndMultipleTest extends DbTestCase { +public class EndMultipleTest extends JbpmTestCase { public void testEndMultipleOk() { deployJpdlResource("org/jbpm/examples/end/multiple/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -22,13 +22,13 @@ package org.jbpm.examples.end.processinstance; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class EndProcessInstanceTest extends DbTestCase { +public class EndProcessInstanceTest extends JbpmTestCase { public void testEndProcessInstance() { deployJpdlResource("org/jbpm/examples/end/processinstance/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -22,13 +22,13 @@ package org.jbpm.examples.end.state; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class EndStateTest extends DbTestCase { +public class EndStateTest extends JbpmTestCase { public void testEndStateCompleted() { deployJpdlResource("org/jbpm/examples/end/state/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -31,13 +31,13 @@ import org.jboss.soa.esb.message.Body; import org.jboss.soa.esb.message.Message; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class EsbTest extends DbTestCase { +public class EsbTest extends JbpmTestCase { public JbpmMockCourier courier; Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import java.util.Map; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class ExclusiveConditionsTest extends DbTestCase { +public class ExclusiveConditionsTest extends JbpmTestCase { public void testExclusiveConditionsGood() { deployJpdlResource("org/jbpm/examples/exclusive/conditions/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import java.util.Map; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class ExclusiveExpressionTest extends DbTestCase { +public class ExclusiveExpressionTest extends JbpmTestCase { public void testExclusiveExpressionGood() { deployJpdlResource("org/jbpm/examples/exclusive/expression/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import java.util.Map; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class ExclusiveHandlerTest extends DbTestCase { +public class ExclusiveHandlerTest extends JbpmTestCase { public void testExclusiveHandlerGreat() { deployJpdlResource("org/jbpm/examples/exclusive/handler/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -28,13 +28,13 @@ import java.util.Set; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class HqlTest extends DbTestCase { +public class HqlTest extends JbpmTestCase { public void testHql() { deployJpdlResource("org/jbpm/examples/hql/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -22,13 +22,13 @@ package org.jbpm.examples.java; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class JavaInstantiateTest extends DbTestCase { +public class JavaInstantiateTest extends JbpmTestCase { public void testJavaInstantiate() { deployJpdlResource("org/jbpm/examples/java/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -26,13 +26,13 @@ import org.jbpm.Execution; import org.jbpm.examples.script.text.Person; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class ScriptExpressionTest extends DbTestCase { +public class ScriptExpressionTest extends JbpmTestCase { public void testScriptText() { deployJpdlResource("org/jbpm/examples/script/expression/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import java.util.Map; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class ScriptTextTest extends DbTestCase { +public class ScriptTextTest extends JbpmTestCase { public void testScriptText() { deployJpdlResource("org/jbpm/examples/script/text/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import java.util.List; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class SqlTest extends DbTestCase { +public class SqlTest extends JbpmTestCase { public void testSql() { deployJpdlResource("org/jbpm/examples/sql/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -22,13 +22,13 @@ package org.jbpm.examples.state.choice; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class StateChoiceTest extends DbTestCase { +public class StateChoiceTest extends JbpmTestCase { public void testStateChoiceAccept() { deployJpdlResource("org/jbpm/examples/state/choice/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -22,13 +22,13 @@ package org.jbpm.examples.state.sequence; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class StateSequenceTest extends DbTestCase { +public class StateSequenceTest extends JbpmTestCase { public void testWaitStatesSequence() { deployJpdlResource("org/jbpm/examples/state/sequence/process.jpdl.xml"); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import org.jbpm.Execution; import org.jbpm.task.Task; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class TaskTest extends DbTestCase { +public class TaskTest extends JbpmTestCase { public void testTask() { deployJpdlResource("org/jbpm/examples/task/process.jpdl.xml"); Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,12 +25,12 @@ import org.jbpm.jpdl.xml.JpdlParser; import org.jbpm.log.Log; import org.jbpm.pvm.internal.xml.Parse; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public abstract class JpdlTestCase extends JbpmTestCase +public abstract class JpdlTestCase extends BaseJbpmTestCase { static protected Log log = Log.getLog(JpdlTestCase.class.getName()); Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -26,13 +26,13 @@ import org.jbpm.Problem; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.jpdl.xml.JpdlParser; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public abstract class JpdlParseTestCase extends JbpmTestCase { +public abstract class JpdlParseTestCase extends BaseJbpmTestCase { static JpdlParser jpdlParser = new JpdlParser(); Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,12 +25,12 @@ import org.jbpm.Problem; import org.jbpm.jpdl.xml.JpdlParser; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class JpdlXmlTest extends JbpmTestCase { +public class JpdlXmlTest extends BaseJbpmTestCase { public void testValidXml() { List<Problem> problems = new JpdlParser() Modified: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java =================================================================== --- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -54,17 +54,16 @@ try { if (inputStream != null) { LogManager.getLogManager().readConfiguration(inputStream); + + String redirectCommons = LogManager.getLogManager().getProperty("redirect.commons.logging"); + if ( (redirectCommons!=null) + && (! redirectCommons.equalsIgnoreCase("disabled")) + && (! redirectCommons.equalsIgnoreCase("off")) + && (! redirectCommons.equalsIgnoreCase("false")) + ) { + redirectCommonsToJdk14(); + } } - - String redirectCommons = LogManager.getLogManager().getProperty("redirect.commons.logging"); - if ( (redirectCommons!=null) - && (! redirectCommons.equalsIgnoreCase("disabled")) - && (! redirectCommons.equalsIgnoreCase("off")) - && (! redirectCommons.equalsIgnoreCase("false")) - ) { - redirectCommonsToJdk14(); - } - } catch (Exception e) { e.printStackTrace(); throw new RuntimeException("couldn't initialize logging properly", e); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/TestConsoleTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/TestConsoleTestCase.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/TestConsoleTestCase.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -21,13 +21,13 @@ */ package org.jbpm.pvm.activities; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class TestConsoleTestCase extends JbpmTestCase { +public class TestConsoleTestCase extends BaseJbpmTestCase { protected TestConsole testConsole; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -28,13 +28,13 @@ import org.jbpm.model.Transition; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.model.ActivityImpl; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class BuilderTest extends JbpmTestCase { +public class BuilderTest extends BaseJbpmTestCase { public void testBuilderProcessDefinitionProperties() { ClientProcessDefinition processDefinition = ProcessDefinitionBuilder Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens * @author Guillaume Porcher */ -public class BasicEnvironmentTest extends JbpmTestCase { +public class BasicEnvironmentTest extends BaseJbpmTestCase { public void testBasicEnvironmentOperation() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -24,12 +24,12 @@ import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class EnvironmentClassLoaderTest extends JbpmTestCase { +public class EnvironmentClassLoaderTest extends BaseJbpmTestCase { public static class TestClassLoader extends ClassLoader { } Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -27,12 +27,12 @@ import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireDefinition; import org.jbpm.pvm.internal.wire.xml.WireParser; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class EnvironmentSearchOrderTest extends JbpmTestCase +public class EnvironmentSearchOrderTest extends BaseJbpmTestCase { public void testEnvironmentDefaultSearchOrder() { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -24,12 +24,12 @@ import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class EnvironmentTypeLookupTest extends JbpmTestCase { +public class EnvironmentTypeLookupTest extends BaseJbpmTestCase { public static class A { } Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -24,12 +24,12 @@ import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class NestedEnvironmentTest extends JbpmTestCase { +public class NestedEnvironmentTest extends BaseJbpmTestCase { public void testNestedEnvironments() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -31,10 +31,10 @@ import org.jbpm.pvm.activities.TestConsole; import org.jbpm.pvm.activities.WaitState; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; -public class EventPropagationTest extends JbpmTestCase { +public class EventPropagationTest extends BaseJbpmTestCase { TestConsole testConsole; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/EmbeddedExecutionModeTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/EmbeddedExecutionModeTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/EmbeddedExecutionModeTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,12 +25,12 @@ import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class EmbeddedExecutionModeTest extends JbpmTestCase { +public class EmbeddedExecutionModeTest extends BaseJbpmTestCase { SessionFactory sessionFactory; Session session; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -28,13 +28,13 @@ import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.script.ScriptManager; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class GroovyExpressionTest extends JbpmTestCase { +public class GroovyExpressionTest extends BaseJbpmTestCase { public void testGroovyExpression() { System.out.println("FIXME: JBPM-1768 Fix groovy support"); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -28,13 +28,13 @@ import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.script.ScriptManager; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class JuelExpressionTest extends JbpmTestCase { +public class JuelExpressionTest extends BaseJbpmTestCase { public void testJuelExpression() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -27,13 +27,13 @@ import org.jbpm.IdentityService; import org.jbpm.identity.Group; import org.jbpm.identity.User; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class IdentityTest extends DbTestCase { +public class IdentityTest extends JbpmTestCase { public void testSingleUser() throws Exception { IdentityService identityService = processEngine.get(IdentityService.class); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -28,13 +28,13 @@ import org.jbpm.model.OpenProcessDefinition; import org.jbpm.pvm.activities.AutomaticActivity; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class AsyncContinuationsTest extends DbTestCase { +public class AsyncContinuationsTest extends JbpmTestCase { public void testContinuations() { deployProcess(); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -24,12 +24,12 @@ import org.jbpm.Configuration; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class TransactionFailingCommitTest extends JbpmTestCase { +public class TransactionFailingCommitTest extends BaseJbpmTestCase { public static class CommitException extends RuntimeException { private static final long serialVersionUID = 1L; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.internal.tx.StandardTransaction; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class TransactionResourcesCommitTest extends JbpmTestCase { +public class TransactionResourcesCommitTest extends BaseJbpmTestCase { public static Environment openEnvironment(String xmlString) { EnvironmentFactory environmentFactory = (EnvironmentFactory) Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -26,13 +26,13 @@ import org.jbpm.env.EnvironmentFactory; import org.jbpm.env.Transaction; import org.jbpm.pvm.internal.tx.StandardTransaction; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class TransactionResourcesSetRollbackOnlyTest extends JbpmTestCase { +public class TransactionResourcesSetRollbackOnlyTest extends BaseJbpmTestCase { public static Environment openEnvironment(String xmlString) { EnvironmentFactory environmentFactory = (EnvironmentFactory) Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,12 +25,12 @@ import java.util.List; import org.jbpm.pvm.internal.util.Listener; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public abstract class SubscriptionTestCase extends JbpmTestCase { +public abstract class SubscriptionTestCase extends BaseJbpmTestCase { public static class Event { Object source; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -29,12 +29,12 @@ import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.util.Listener; import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class WireObservableTest extends JbpmTestCase +public class WireObservableTest extends BaseJbpmTestCase { public static class Recorder implements Listener { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,12 +25,12 @@ import org.jbpm.Problem; import org.jbpm.pvm.internal.wire.xml.WireParser; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public abstract class WireTestCase extends JbpmTestCase { +public abstract class WireTestCase extends BaseJbpmTestCase { public static WireContext createWireContext(String wireDefinitionXml) { WireDefinition wireDefinition = (WireDefinition) WireParser.getInstance() Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -26,14 +26,14 @@ import org.jbpm.cmd.CommandService; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; import org.springframework.context.support.ClassPathXmlApplicationContext; /** * @author Tom Baeyens */ -public class SpringTest extends JbpmTestCase { +public class SpringTest extends BaseJbpmTestCase { public void testSpringTransactions() { ClassPathXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/jbpm/pvm/spring/spring.beans.xml"); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -27,13 +27,13 @@ import org.jbpm.Configuration; import org.jbpm.JbpmException; import org.jbpm.env.EnvironmentFactory; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public abstract class EnvironmentFactoryTestCase extends JbpmTestCase { +public abstract class EnvironmentFactoryTestCase extends BaseJbpmTestCase { String configResource; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -32,12 +32,12 @@ import org.jbpm.env.Transaction; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.type.variable.StringVariable; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class BasicTransactionTest extends DbTestCase { +public class BasicTransactionTest extends JbpmTestCase { public void testCommit() { commandService.execute(new Command<Object>() { Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java =================================================================== --- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -32,12 +32,12 @@ import org.jbpm.task.internal.model.RoleImpl; import org.jbpm.task.internal.model.SwimlaneImpl; import org.jbpm.task.internal.model.TaskImpl; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class TaskTest extends JbpmTestCase { +public class TaskTest extends BaseJbpmTestCase { public void testTask() { Date now = new Date(); Copied: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java (from rev 3826, jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java) =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java (rev 0) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -0,0 +1,92 @@ +/* + * 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.test; + +import junit.framework.AssertionFailedError; +import junit.framework.TestCase; + +import org.jbpm.env.Environment; +import org.jbpm.log.Jdk14LogFactory; +import org.jbpm.log.Log; +import org.jbpm.log.LogFormatter; + +/** base class for jbpm test cases. + * + * When this class is loaded (defined), then a search for a logging.properties + * file will be done. + * + * If a logging.properties file is present in the root of the classpath, + * it will be used to initialize the java.util.logging logging framework. + * + * If this logging.properties contains property 'redirect.commons.logging' + * then all commons logging will be redirected to java.util.logging during + * this logging initialization. + * + * Apart from logging initialization, this class will add some logging + * to setUp and tearDown. + * + * If the JbpmLogFormatter is used, it will display multiple threads with + * indentation. + * + * @author Tom Baeyens + */ +public abstract class BaseJbpmTestCase extends TestCase { + + static { + Jdk14LogFactory.initializeJdk14Logging(); + } + + static protected Log log = Log.getLog(BaseJbpmTestCase.class.getName()); + + protected void setUp() throws Exception { + assertNull(Environment.getCurrent()); + LogFormatter.resetIndentation(); + log.info("=== starting "+getName()+" ============================="); + } + + protected void tearDown() throws Exception { + log.info("=== ending "+getName()+" =============================\n"); + assertNull(Environment.getCurrent()); + } + + public void assertTextPresent(String expected, String value) { + if ( (value==null) + || (value.indexOf(expected)==-1) + ) { + fail("expected presence of '"+expected+"' but was '"+value+"'"); + } + } + + protected void runTest() throws Throwable { + try { + super.runTest(); + } catch (AssertionFailedError e) { + log.error(""); + log.error("ASSERTION FAILURE: "+e.getMessage(), e); + log.error(""); + throw e; + } catch (Throwable t) { + t.printStackTrace(); + throw t; + } + } +} Deleted: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -1,241 +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.test; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; - -import org.jbpm.Configuration; -import org.jbpm.Execution; -import org.jbpm.ExecutionService; -import org.jbpm.HistoryService; -import org.jbpm.ManagementService; -import org.jbpm.ProcessDefinition; -import org.jbpm.ProcessEngine; -import org.jbpm.ProcessService; -import org.jbpm.TaskService; -import org.jbpm.cmd.CommandService; -import org.jbpm.job.Job; -import org.jbpm.task.Task; - -/** - * @author Tom Baeyens - */ -public abstract class DbTestCase extends JbpmTestCase { - - protected static ProcessEngine processEngine = null; - - protected static ProcessService processService; - protected static ExecutionService executionService; - protected static ManagementService managementService; - protected static TaskService taskService; - protected static HistoryService historyService; - - protected static CommandService commandService; - - /** registered process definitions will be deleted automatically in the tearDown. - * This is a convenience function as each test is expected to clean up the DB. */ - protected List<ProcessDefinition> registeredProcessDefinitions; - /** registered tasks will be deleted automatically in the tearDown. - * This is a convenience function as each test is expected to clean up the DB. */ - protected List<String> registeredTaskIds; - - protected void setUp() throws Exception { - super.setUp(); - initialize(); - } - - protected synchronized void initialize() { - if (processEngine==null) { - - String jbpmTestCfgType = System.getProperty("jbpm.test.cfg.type"); - Configuration configuration = new Configuration(jbpmTestCfgType); - - String jbpmTestCfgResource = System.getProperty("jbpm.test.cfg.resource"); - if (jbpmTestCfgResource!=null) { - configuration.setResource(jbpmTestCfgResource); - } - - processEngine = configuration.buildProcessEngine(); - - processService = processEngine.getProcessService(); - executionService = processEngine.getExecutionService(); - historyService = processEngine.getHistoryService(); - managementService = processEngine.getManagementService(); - taskService = processEngine.getTaskService(); - commandService = processEngine.get(CommandService.class); - } - } - - protected void tearDown() throws Exception { - if (registeredProcessDefinitions!=null) { - for (ProcessDefinition processDefinition : registeredProcessDefinitions) { - processService.deleteProcessDefinitionCascade(processDefinition.getId()); - } - } - - if (registeredTaskIds != null) { - for (String taskId : registeredTaskIds) { - taskService.deleteTask(taskId); - } - } - - Db.verifyClean(processEngine); - - super.tearDown(); - } - - public ProcessDefinition deployJpdlXmlString(String jpdlXmlString) { - List<ProcessDefinition> deployedProcessDefinitions = - processService.createDeployment() - .addString("xmlstring.jpdl.xml", jpdlXmlString) - .deploy() - .getProcessDefinitions(); - - return registerDeployedProcessDefinitions(deployedProcessDefinitions); - } - - public ProcessDefinition deployJpdlResource(String resource) { - List<ProcessDefinition> deployedProcessDefinitions = - processService.createDeployment() - .addResource(resource) - .deploy() - .getProcessDefinitions(); - - return registerDeployedProcessDefinitions(deployedProcessDefinitions); - } - - protected ProcessDefinition addDeployedProcessDefinition(ProcessDefinition deployedProcessDefinition) { - if (registeredProcessDefinitions==null) { - registeredProcessDefinitions = new ArrayList<ProcessDefinition>(); - } - - registeredProcessDefinitions.add(deployedProcessDefinition); - - return deployedProcessDefinition; - } - - protected ProcessDefinition registerDeployedProcessDefinitions(List<ProcessDefinition> deployedProcessDefinitions) { - if (registeredProcessDefinitions==null) { - registeredProcessDefinitions = new ArrayList<ProcessDefinition>(); - } - - registeredProcessDefinitions.addAll(deployedProcessDefinitions); - - if (deployedProcessDefinitions.size()>=1) { - return deployedProcessDefinitions.get(0); - } - - return null; - } - - public void saveAndRegisterTask(Task task) { - taskService.saveTask(task); - - if (registeredTaskIds == null) { - registeredTaskIds = new ArrayList<String>(); - } - registeredTaskIds.add(task.getId()); - } - - public HashSet<String> getActivityNames(String processInstanceId) { - HashSet<String> activityNames = new HashSet<String>(); - - List<Execution> executions = executionService.findExecutions(processInstanceId); - for (Execution execution: executions) { - String activityName = execution.getActivityName(); - if (activityName!=null) { - activityNames.add(activityName); - } - } - - return activityNames; - } - - public Execution findExecution(String processInstanceId, String activityName) { - List<Execution> executions = executionService.findExecutions(processInstanceId); - for (Execution execution: executions) { - if (activityName.equals(execution.getActivityName())) { - return execution; - } - } - - return null; - } - - public static Task getTask(List<Task> taskList, String taskName) { - for (Task task : taskList) { - if (taskName.equals(task.getName())) { - return task; - } - } - return null; - } - - public static void assertContainsTask(List<Task> taskList, String taskName) { - if (getTask(taskList, taskName)==null) { - fail("tasklist doesn't contain task '"+taskName+"': "+taskList); - } - } - - public static Task getTask(List<Task> taskList, String taskName, String assignee) { - for (Task task : taskList) { - if (taskName.equals(task.getName())) { - if (assignee==null) { - if (task.getAssignee()==null) { - return task; - } - } else { - if (assignee.equals(task.getAssignee())) { - return task; - } - } - } - } - return null; - } - - public void executeAsyncMessage(Execution execution) { - List<Job> jobs = managementService - .createJobQuery() - .messages() - .processInstanceId(execution.getId()) - .execute(); - - if (jobs.isEmpty()) { - fail("no async message"); - } - - if (jobs.size()>1) { - fail("more then one async message"); - } - - managementService.executeJob(jobs.get(0).getDbid()); - } - - public static void assertContainsTask(List<Task> taskList, String taskName, String assignee) { - if (getTask(taskList, taskName, assignee)==null) { - fail("tasklist doesn't contain task '"+taskName+"' for assignee '"+assignee+"': "+taskList); - } - } -} Deleted: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -1,72 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.test; - -import junit.framework.AssertionFailedError; -import junit.framework.TestCase; - -import org.jbpm.env.Environment; -import org.jbpm.log.Jdk14LogFactory; -import org.jbpm.log.Log; -import org.jbpm.log.LogFormatter; - -public abstract class JbpmTestCase extends TestCase { - - static { - Jdk14LogFactory.initializeJdk14Logging(); - } - - static protected Log log = Log.getLog(JbpmTestCase.class.getName()); - - protected void setUp() throws Exception { - assertNull(Environment.getCurrent()); - LogFormatter.resetIndentation(); - log.info("=== starting "+getName()+" ============================="); - } - - protected void tearDown() throws Exception { - log.info("=== ending "+getName()+" =============================\n"); - assertNull(Environment.getCurrent()); - } - - public void assertTextPresent(String expected, String value) { - if ( (value==null) - || (value.indexOf(expected)==-1) - ) { - fail("expected presence of '"+expected+"' but was '"+value+"'"); - } - } - - protected void runTest() throws Throwable { - try { - super.runTest(); - } catch (AssertionFailedError e) { - log.error(""); - log.error("ASSERTION FAILURE: "+e.getMessage(), e); - log.error(""); - throw e; - } catch (Throwable t) { - t.printStackTrace(); - throw t; - } - } -} Copied: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java (from rev 3871, jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java) =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java (rev 0) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -0,0 +1,263 @@ +/* + * 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.test; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; + +import org.jbpm.Configuration; +import org.jbpm.Execution; +import org.jbpm.ExecutionService; +import org.jbpm.HistoryService; +import org.jbpm.ManagementService; +import org.jbpm.ProcessDefinition; +import org.jbpm.ProcessEngine; +import org.jbpm.ProcessService; +import org.jbpm.TaskService; +import org.jbpm.cmd.CommandService; +import org.jbpm.job.Job; +import org.jbpm.task.Task; + +/** base class for persistent jBPM tests. + * + * This class exposes a lot of extra convenience methods for testing + * process executions. + * + * The ProcessEngine services will be initialized and available as + * member fields. + * + * This test assumes that each test will clean the DB itself and that + * no data is in the DB tables when the test finishes. + * + * During tearDown, a check will be done if all the DB tables are + * empty. If not, that is logged with a F I X M E and the DB tables + * are cleaned. + * + * Convenience methods {@link #deployJpdlXmlString(String)} and + * {@link #deployJpdlResource(String)} will automatically keep track + * of the deployed process and delete it (and all the related executions) + * before the check is done. + * + * Similarly, the {@link #saveAndRegisterTask(Task)} will delete + * the task before the check is done in the tearDown. + * + * @author Tom Baeyens + */ +public abstract class JbpmTestCase extends BaseJbpmTestCase { + + protected static ProcessEngine processEngine = null; + + protected static ProcessService processService; + protected static ExecutionService executionService; + protected static ManagementService managementService; + protected static TaskService taskService; + protected static HistoryService historyService; + + protected static CommandService commandService; + + /** registered process definitions will be deleted automatically in the tearDown. + * This is a convenience function as each test is expected to clean up the DB. */ + protected List<ProcessDefinition> registeredProcessDefinitions; + /** registered tasks will be deleted automatically in the tearDown. + * This is a convenience function as each test is expected to clean up the DB. */ + protected List<String> registeredTaskIds; + + protected void setUp() throws Exception { + super.setUp(); + initialize(); + } + + protected synchronized void initialize() { + if (processEngine==null) { + + String jbpmTestCfgType = System.getProperty("jbpm.test.cfg.type"); + Configuration configuration = new Configuration(jbpmTestCfgType); + + String jbpmTestCfgResource = System.getProperty("jbpm.test.cfg.resource"); + if (jbpmTestCfgResource!=null) { + configuration.setResource(jbpmTestCfgResource); + } + + processEngine = configuration.buildProcessEngine(); + + processService = processEngine.getProcessService(); + executionService = processEngine.getExecutionService(); + historyService = processEngine.getHistoryService(); + managementService = processEngine.getManagementService(); + taskService = processEngine.getTaskService(); + commandService = processEngine.get(CommandService.class); + } + } + + protected void tearDown() throws Exception { + if (registeredProcessDefinitions!=null) { + for (ProcessDefinition processDefinition : registeredProcessDefinitions) { + processService.deleteProcessDefinitionCascade(processDefinition.getId()); + } + } + + if (registeredTaskIds != null) { + for (String taskId : registeredTaskIds) { + taskService.deleteTask(taskId); + } + } + + Db.verifyClean(processEngine); + + super.tearDown(); + } + + public ProcessDefinition deployJpdlXmlString(String jpdlXmlString) { + List<ProcessDefinition> deployedProcessDefinitions = + processService.createDeployment() + .addString("xmlstring.jpdl.xml", jpdlXmlString) + .deploy() + .getProcessDefinitions(); + + return registerDeployedProcessDefinitions(deployedProcessDefinitions); + } + + public ProcessDefinition deployJpdlResource(String resource) { + List<ProcessDefinition> deployedProcessDefinitions = + processService.createDeployment() + .addResource(resource) + .deploy() + .getProcessDefinitions(); + + return registerDeployedProcessDefinitions(deployedProcessDefinitions); + } + + protected ProcessDefinition addDeployedProcessDefinition(ProcessDefinition deployedProcessDefinition) { + if (registeredProcessDefinitions==null) { + registeredProcessDefinitions = new ArrayList<ProcessDefinition>(); + } + + registeredProcessDefinitions.add(deployedProcessDefinition); + + return deployedProcessDefinition; + } + + protected ProcessDefinition registerDeployedProcessDefinitions(List<ProcessDefinition> deployedProcessDefinitions) { + if (registeredProcessDefinitions==null) { + registeredProcessDefinitions = new ArrayList<ProcessDefinition>(); + } + + registeredProcessDefinitions.addAll(deployedProcessDefinitions); + + if (deployedProcessDefinitions.size()>=1) { + return deployedProcessDefinitions.get(0); + } + + return null; + } + + public void saveAndRegisterTask(Task task) { + taskService.saveTask(task); + + if (registeredTaskIds == null) { + registeredTaskIds = new ArrayList<String>(); + } + registeredTaskIds.add(task.getId()); + } + + public HashSet<String> getActivityNames(String processInstanceId) { + HashSet<String> activityNames = new HashSet<String>(); + + List<Execution> executions = executionService.findExecutions(processInstanceId); + for (Execution execution: executions) { + String activityName = execution.getActivityName(); + if (activityName!=null) { + activityNames.add(activityName); + } + } + + return activityNames; + } + + public Execution findExecution(String processInstanceId, String activityName) { + List<Execution> executions = executionService.findExecutions(processInstanceId); + for (Execution execution: executions) { + if (activityName.equals(execution.getActivityName())) { + return execution; + } + } + + return null; + } + + public static Task getTask(List<Task> taskList, String taskName) { + for (Task task : taskList) { + if (taskName.equals(task.getName())) { + return task; + } + } + return null; + } + + public static void assertContainsTask(List<Task> taskList, String taskName) { + if (getTask(taskList, taskName)==null) { + fail("tasklist doesn't contain task '"+taskName+"': "+taskList); + } + } + + public static Task getTask(List<Task> taskList, String taskName, String assignee) { + for (Task task : taskList) { + if (taskName.equals(task.getName())) { + if (assignee==null) { + if (task.getAssignee()==null) { + return task; + } + } else { + if (assignee.equals(task.getAssignee())) { + return task; + } + } + } + } + return null; + } + + public void executeAsyncMessage(Execution execution) { + List<Job> jobs = managementService + .createJobQuery() + .messages() + .processInstanceId(execution.getId()) + .execute(); + + if (jobs.isEmpty()) { + fail("no async message"); + } + + if (jobs.size()>1) { + fail("more then one async message"); + } + + managementService.executeJob(jobs.get(0).getDbid()); + } + + public static void assertContainsTask(List<Task> taskList, String taskName, String assignee) { + if (getTask(taskList, taskName, assignee)==null) { + fail("tasklist doesn't contain task '"+taskName+"' for assignee '"+assignee+"': "+taskList); + } + } +} Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -27,12 +27,10 @@ */ public class MessageFinder { - protected DbTestCase dbTestCase; + protected JbpmTestCase jbpmTestCase; - public MessageFinder(DbTestCase dbTestCase) { - this.dbTestCase = dbTestCase; + public MessageFinder(JbpmTestCase jbpmTestCase) { + this.jbpmTestCase = jbpmTestCase; } - - } Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import java.util.Map; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class ExclusiveTest extends DbTestCase { +public class ExclusiveTest extends JbpmTestCase { public void testExclusiveExpression() { deployJpdlXmlString( Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -23,12 +23,12 @@ import org.jbpm.Execution; import org.jbpm.JbpmException; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class StateTest extends DbTestCase { +public class StateTest extends JbpmTestCase { public void testWaitStatesSequence() { deployJpdlXmlString( Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -23,12 +23,12 @@ import org.jbpm.Configuration; import org.jbpm.ProcessEngine; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class ConfigurationTest extends JbpmTestCase { +public class ConfigurationTest extends BaseJbpmTestCase { public void testDefaultConfiguration() { ProcessEngine processEngine = new Configuration() Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -22,12 +22,12 @@ package org.jbpm.test.execution; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class FindExecutionTest extends DbTestCase { +public class FindExecutionTest extends JbpmTestCase { public void testFindExecutionById() { deployJpdlXmlString( Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -27,13 +27,13 @@ import java.util.Set; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class SignalExecutionTest extends DbTestCase { +public class SignalExecutionTest extends JbpmTestCase { public void testSignalExecutionByKey() { deployJpdlXmlString( Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -28,13 +28,13 @@ import org.jbpm.Execution; import org.jbpm.ProcessDefinition; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class StartExecutionTest extends DbTestCase { +public class StartExecutionTest extends JbpmTestCase { public void testStartNewExecutionByKey() { deployJpdlXmlString( Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -27,13 +27,13 @@ import org.jbpm.Execution; import org.jbpm.history.HistoryProcessInstance; import org.jbpm.history.HistoryProcessInstanceQuery; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class AvgDurationTest extends DbTestCase { +public class AvgDurationTest extends JbpmTestCase { public void testAvgDuration() throws Exception { deployJpdlXmlString( @@ -59,7 +59,8 @@ executeProcess(); Map<String, Long> avgDurations = historyService.avgDurationPerActivity("ICL:1"); - + + Long avgDurationOne = avgDurations.get("one"); assertNotNull(avgDurationOne); assertTrue(avgDurationOne>50); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import java.util.Map; import org.jbpm.Execution; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class ChoiceDistributionTest extends DbTestCase { +public class ChoiceDistributionTest extends JbpmTestCase { public void testExclusiveExpression() { deployJpdlXmlString( Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import org.jbpm.history.HistoryProcessInstance; import org.jbpm.history.HistoryProcessInstanceQuery; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class ProcessInstanceHistoryTest extends DbTestCase { +public class ProcessInstanceHistoryTest extends JbpmTestCase { public void testProcessInstanceHistory() { deployJpdlXmlString( Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessAttachmentsTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessAttachmentsTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessAttachmentsTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -26,13 +26,13 @@ import java.util.List; import org.jbpm.ProcessDefinition; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class ProcessAttachmentsTest extends DbTestCase { +public class ProcessAttachmentsTest extends JbpmTestCase { public void testProcessWithNameOnly() { byte[] lotOfBytes = generateString("a lot of bytes ", 5000).getBytes(); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import org.jbpm.ProcessDefinition; import org.jbpm.ProcessDefinitionQuery; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class ProcessDefinitionQueryTest extends DbTestCase { +public class ProcessDefinitionQueryTest extends JbpmTestCase { public void testQueryProcessDefinitionsEmpty() { List<ProcessDefinition> processDefinitions = processService Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -27,13 +27,13 @@ import org.jbpm.Execution; import org.jbpm.JbpmException; import org.jbpm.ProcessDefinition; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class ProcessServiceTest extends DbTestCase { +public class ProcessServiceTest extends JbpmTestCase { public void testProcessWithNameOnly() { ProcessDefinition processDefinition = deployJpdlXmlString( Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -24,12 +24,12 @@ import java.util.Date; import org.jbpm.task.Task; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Alejandro Guizar */ -public class TaskCreateUpdateDeleteTest extends DbTestCase { +public class TaskCreateUpdateDeleteTest extends JbpmTestCase { public void testNewTask() { // creation of a new non-persisted task Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskListTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskListTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskListTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -24,13 +24,13 @@ import java.util.List; import org.jbpm.task.Task; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class TaskListTest extends DbTestCase { +public class TaskListTest extends JbpmTestCase { public void testPersonalTaskList() { Task task = taskService.newTask(); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskQueryTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskQueryTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -25,13 +25,13 @@ import org.jbpm.TaskQuery; import org.jbpm.task.Task; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class TaskQueryTest extends DbTestCase { +public class TaskQueryTest extends JbpmTestCase { public void testSimplestTaskQuery() { Task task = taskService.newTask(); Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -26,13 +26,13 @@ import java.util.Map; import java.util.Set; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class BasicVariablesTest extends DbTestCase { +public class BasicVariablesTest extends JbpmTestCase { public void testStartProcessInstanceWithoutVariables() { deployJpdlXmlString( Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -24,13 +24,13 @@ import java.io.Serializable; import java.util.Date; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class VariableBasicTypesTest extends DbTestCase { +public class VariableBasicTypesTest extends JbpmTestCase { public void checkVariableValue(Object variableValue) { deployJpdlXmlString( Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -33,13 +33,13 @@ import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.jobexecutor.JobExecutor; import org.jbpm.pvm.internal.util.ReflectUtil; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class LoadTestCase extends DbTestCase { +public class LoadTestCase extends JbpmTestCase { protected static final long SECOND = 1000; protected static final long MINUTE = 60 * SECOND; Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -32,7 +32,7 @@ import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.session.MessageSession; import org.jbpm.session.PvmDbSession; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java =================================================================== --- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -32,13 +32,13 @@ import org.jbpm.env.Environment; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.jobexecutor.JobExecutor; -import org.jbpm.test.DbTestCase; +import org.jbpm.test.JbpmTestCase; /** * @author Tom Baeyens */ -public class JobExecutorTestCase extends DbTestCase { +public class JobExecutorTestCase extends JbpmTestCase { long timeoutMillis = 20 * 1000; // 20 seconds long checkInterval = 400; Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -29,14 +29,14 @@ import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** shows an automatic decision. * * @author Tom Baeyens */ -public class AutomaticDecisionTest extends JbpmTestCase { +public class AutomaticDecisionTest extends BaseJbpmTestCase { public static class AutomaticCreditRating implements ActivityBehaviour { private static final long serialVersionUID = 1L; Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -32,14 +32,14 @@ import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** shows wait states and automatic activities in a simple * sequence based on transitions. * * @author Tom Baeyens */ -public class BasicExecutionFlowTest extends JbpmTestCase { +public class BasicExecutionFlowTest extends BaseJbpmTestCase { // automatic activity will log an event in a given list Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -35,12 +35,12 @@ import org.jbpm.model.Event; import org.jbpm.model.ObservableElement; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class EventPropagationTest extends JbpmTestCase { +public class EventPropagationTest extends BaseJbpmTestCase { public class Recorder implements EventListener { private static final long serialVersionUID = 1L; Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -38,7 +38,7 @@ import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** shows how actions are listeners to following processDefinition events: * <ul> @@ -50,7 +50,7 @@ * * @author Tom Baeyens */ -public class EventTest extends JbpmTestCase { +public class EventTest extends BaseJbpmTestCase { // activity leave action //////////////////////////////////////////////////////// Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -31,12 +31,12 @@ import org.jbpm.listener.EventListenerExecution; import org.jbpm.model.Event; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class ExceptionHandlerTest extends JbpmTestCase +public class ExceptionHandlerTest extends BaseJbpmTestCase { public static class WaitState implements ExternalActivityBehaviour { Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -31,7 +31,7 @@ import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** shows the basics of the state property on the execution. * @@ -55,7 +55,7 @@ * * @author Tom Baeyens */ -public class ExecutionStateTest extends JbpmTestCase { +public class ExecutionStateTest extends BaseJbpmTestCase { public static class AutomaticActivity implements ActivityBehaviour { private static final long serialVersionUID = 1L; Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -35,7 +35,7 @@ import org.jbpm.model.Activity; import org.jbpm.model.OpenExecution; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** shows how functional activities (activities that have a specific function @@ -50,7 +50,7 @@ * * @author Tom Baeyens */ -public class FunctionalActivityTest extends JbpmTestCase { +public class FunctionalActivityTest extends BaseJbpmTestCase { public static class FunctionalActivity implements ActivityBehaviour, EventListener { private static final long serialVersionUID = 1L; Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -10,9 +10,9 @@ import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; -public class LoopingTest extends JbpmTestCase { +public class LoopingTest extends BaseJbpmTestCase { public static class For implements ExternalActivityBehaviour { private static final long serialVersionUID = 1L; Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -30,12 +30,12 @@ import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class ScopeStateTest extends JbpmTestCase +public class ScopeStateTest extends BaseJbpmTestCase { public static class AutomaticActivity implements ActivityBehaviour { Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -32,13 +32,13 @@ import org.jbpm.model.OpenExecution; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class ScopeVariableDeclarationTest extends JbpmTestCase { +public class ScopeVariableDeclarationTest extends BaseJbpmTestCase { public static class WaitState implements ExternalActivityBehaviour { private static final long serialVersionUID = 1L; Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -30,7 +30,7 @@ import org.jbpm.client.ClientProcessDefinition; import org.jbpm.model.OpenExecution; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @@ -42,7 +42,7 @@ * * @author Tom Baeyens */ -public class ScopeVariableTest extends JbpmTestCase +public class ScopeVariableTest extends BaseJbpmTestCase { public static class WaitState implements ExternalActivityBehaviour { Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -29,12 +29,12 @@ import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class SubProcessTest extends JbpmTestCase +public class SubProcessTest extends BaseJbpmTestCase { public static class SubProcess implements ExternalActivityBehaviour { Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -15,7 +15,7 @@ import org.jbpm.model.OpenExecution; import org.jbpm.model.Transition; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * concurrent execution where synchronization is done by checking if the @@ -23,7 +23,7 @@ * * @author Tom Baeyens */ -public class TransitionBasedConcurrencyTest extends JbpmTestCase { +public class TransitionBasedConcurrencyTest extends BaseJbpmTestCase { public static class Fork implements ActivityBehaviour { private static final long serialVersionUID = 1L; Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -30,12 +30,12 @@ import org.jbpm.listener.EventListenerExecution; import org.jbpm.model.Event; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class TransitionEventsTest extends JbpmTestCase { +public class TransitionEventsTest extends BaseJbpmTestCase { public class Recorder implements EventListener { private static final long serialVersionUID = 1L; Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-02-13 14:40:26 UTC (rev 3871) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-02-13 15:32:36 UTC (rev 3872) @@ -32,12 +32,12 @@ import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; -import org.jbpm.test.JbpmTestCase; +import org.jbpm.test.BaseJbpmTestCase; /** * @author Tom Baeyens */ -public class VariableTest extends JbpmTestCase { +public class VariableTest extends BaseJbpmTestCase { public static class WaitState implements ExternalActivityBehaviour { private static final long serialVersionUID = 1L;

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3871 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/activity and 15 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-02-13 09:40:26 -0500 (Fri, 13 Feb 2009) New Revision: 3871 Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstance.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstanceQuery.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstanceQuery.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java jbpm4/trunk/modules/test-db/.settings/ jbpm4/trunk/modules/test-db/.settings/org.eclipse.jdt.core.prefs jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java Removed: jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryProcessInstanceQuery.java Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstance.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StateActivity.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskEnd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryExclusiveInstanceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.history.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml Log: further work out of first history infrastructure Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ExecutionService.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -25,7 +25,10 @@ import java.util.Map; import java.util.Set; +import org.jbpm.history.HistoryActivityInstanceQuery; +import org.jbpm.history.HistoryProcessInstanceQuery; + /** manages runtime process executions. * * @author Tom Baeyens @@ -120,9 +123,6 @@ /** search for process instances with criteria */ ExecutionQuery createProcessInstanceQuery(); - /** search for process instances in the history */ - HistoryProcessInstanceQuery createHistoryProcessInstanceQuery(); - /** creates or overwrites a variable value on the referenced execution */ Execution setVariable(String executionId, String name, Object value); @@ -140,5 +140,4 @@ /** delete a process instance */ void deleteProcessInstance(String processInstanceId); - } Deleted: jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryProcessInstanceQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryProcessInstanceQuery.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryProcessInstanceQuery.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -1,46 +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; - -import java.util.List; - -import org.jbpm.history.HistoryProcessInstance; - - -/** - * @author Tom Baeyens - */ -public interface HistoryProcessInstanceQuery { - - String PROPERTY_STARTTIME = "startTime"; - String PROPERTY_ENDTIME = "endTime"; - String PROPERTY_ID = "id"; - - HistoryProcessInstanceQuery processDefinitionId(String processDefinitionId); - - HistoryProcessInstanceQuery orderAsc(String property); - HistoryProcessInstanceQuery orderDesc(String property); - - HistoryProcessInstanceQuery page(int firstResult, int maxResults); - - List<HistoryProcessInstance> execute(); -} Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java (rev 0) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -0,0 +1,46 @@ +/* + * 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.util.Map; + +import org.jbpm.history.HistoryActivityInstanceQuery; +import org.jbpm.history.HistoryProcessInstanceQuery; + + +/** + * @author Tom Baeyens + */ +public interface HistoryService { + + /** search for process instances in the history */ + HistoryProcessInstanceQuery createHistoryProcessInstanceQuery(); + + /** search in history activity instance information for a given processDefinition */ + HistoryActivityInstanceQuery createHistoryActivityInstanceQuery(String processDefinitionId); + + /** returns the average duration in milliseconds for each activity in the given process definition */ + Map<String, Long> avgDurationPerActivity(String processDefinitionId); + + /** returns for each transitionName, the number of times that transition was taken */ + Map<String, Integer> choiceDistribution(String processDefinitionId, String activityName); +} Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/ProcessEngine.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -48,6 +48,15 @@ * be associated to the returned execution service. */ ExecutionService getExecutionService(Map<String, Object> txResources); + /** the {@link HistoryService history service} that provides access + * to the history executions repository. */ + HistoryService getHistoryService(); + + /** the {@link HistoryService history service} that provides access + * to the history executions repository. The given transactional resources will only + * be associated to the returned history service. */ + HistoryService getHistoryService(Map<String, Object> txResources); + /** the {@link TaskService task service} that exposes the * runtime human task lists. */ TaskService getTaskService(); Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/activity/ActivityExecution.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -283,6 +283,9 @@ /** marks the end of an activity for history purposes. */ void historyActivityEnd(); + /** marks the end of an activity with a specific transitionName for history purposes. */ + void historyActivityEnd(String transitionName); + /** marks the start of a user task for history purposes. */ void historyTaskStart(String assignee); Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstance.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstance.java (rev 0) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstance.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -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.jbpm.history; + +import java.util.Date; + +/** + * @author Tom Baeyens + */ +public interface HistoryActivityInstance { + + String getActivityName(); + + Date getStartTime(); + + Date getEndTime(); + + long getDuration(); + + String getExecutionId(); + +} \ No newline at end of file Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstance.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstanceQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstanceQuery.java (rev 0) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstanceQuery.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -0,0 +1,56 @@ +/* + * 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.history; + +import java.util.Date; +import java.util.List; + + +/** + * @author Tom Baeyens + */ +public interface HistoryActivityInstanceQuery { + + String PROPERTY_STARTTIME = "startTime"; + String PROPERTY_ENDTIME = "endTime"; + String PROPERTY_EXECUTIONID = "executionId"; + String PROPERTY_ACTIVITYNAME = "activityName"; + String PROPERTY_DURATION = "duration"; + + HistoryActivityInstanceQuery processDefinitionId(String processDefinitionId); + HistoryActivityInstanceQuery executionId(String executionId); + + HistoryActivityInstanceQuery startedAfter(Date time); + HistoryActivityInstanceQuery startedBefore(Date time); + + HistoryActivityInstanceQuery activityName(String activityName); + + HistoryActivityInstanceQuery tookLongerThen(long durationInMillis); + HistoryActivityInstanceQuery tookLessThen(long durationInMillis); + + HistoryActivityInstanceQuery orderAsc(String property); + HistoryActivityInstanceQuery orderDesc(String property); + + HistoryActivityInstanceQuery page(int firstResult, int maxResults); + + List<HistoryActivityInstance> execute(); +} Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryActivityInstanceQuery.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstance.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstance.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstance.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -27,9 +27,14 @@ * @author Tom Baeyens */ public interface HistoryProcessInstance { + + String STATE_ENDED = "ended"; + String STATE_ACTIVE = "active"; - String getId(); + String getProcessInstanceId(); + String getProcessDefinitionId(); + String getKey(); String getState(); Copied: jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstanceQuery.java (from rev 3853, jbpm4/trunk/modules/api/src/main/java/org/jbpm/HistoryProcessInstanceQuery.java) =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstanceQuery.java (rev 0) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstanceQuery.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -0,0 +1,48 @@ +/* + * 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.history; + +import java.util.List; + + + +/** + * @author Tom Baeyens + */ +public interface HistoryProcessInstanceQuery { + + String PROPERTY_STARTTIME = "startTime"; + String PROPERTY_ENDTIME = "endTime"; + String PROPERTY_ID = "id"; + String PROPERTY_STATE = "state"; + String PROPERTY_DURATION = "duration"; + + HistoryProcessInstanceQuery processDefinitionId(String processDefinitionId); + HistoryProcessInstanceQuery state(String state); + + HistoryProcessInstanceQuery orderAsc(String property); + HistoryProcessInstanceQuery orderDesc(String property); + + HistoryProcessInstanceQuery page(int firstResult, int maxResults); + + List<HistoryProcessInstance> execute(); +} Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/history/HistoryProcessInstanceQuery.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StateActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StateActivity.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StateActivity.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -51,7 +51,7 @@ Transition transition = activity.findOutgoingTransition(signalName); if (transition!=null) { - execution.historyActivityEnd(); + execution.historyActivityEnd(signalName); execution.take(transition); } else { execution.waitForSignal(); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -29,6 +29,7 @@ import org.jbpm.Configuration; import org.jbpm.ExecutionService; +import org.jbpm.HistoryService; import org.jbpm.ManagementService; import org.jbpm.ProcessEngine; import org.jbpm.ProcessService; @@ -137,39 +138,36 @@ public ExecutionService getExecutionService() { return environmentFactoryCtxWireContext.get(ExecutionService.class); } - - public ExecutionService getExecutionService(Map<String, Object> txResources) { - // TODO Auto-generated method stub - return null; + public HistoryService getHistoryService() { + return environmentFactoryCtxWireContext.get(HistoryService.class); } - public ManagementService getManagementService() { return environmentFactoryCtxWireContext.get(ManagementService.class); } - - public ManagementService getManagementService(Map<String, Object> txResources) { - // TODO Auto-generated method stub - return null; - } - public ProcessService getProcessService() { return environmentFactoryCtxWireContext.get(ProcessService.class); } - - public ProcessService getProcessService(Map<String, Object> txResources) { - // TODO Auto-generated method stub - return null; - } - public TaskService getTaskService() { return environmentFactoryCtxWireContext.get(TaskService.class); } public TaskService getTaskService(Map<String, Object> txResources) { - // TODO Auto-generated method stub - return null; + throw new UnsupportedOperationException("please implement me"); } + public HistoryService getHistoryService(Map<String, Object> txResources) { + throw new UnsupportedOperationException("please implement me"); + } + public ExecutionService getExecutionService(Map<String, Object> txResources) { + throw new UnsupportedOperationException("please implement me"); + } + public ProcessService getProcessService(Map<String, Object> txResources) { + throw new UnsupportedOperationException("please implement me"); + } + public ManagementService getManagementService(Map<String, Object> txResources) { + throw new UnsupportedOperationException("please implement me"); + } + public static EnvironmentFactory parseXmlString(String xmlString) { JbpmConfiguration jbpmConfiguration = new JbpmConfiguration(); jbpmConfiguration.setXmlString(xmlString); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/ActivityEnd.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -23,6 +23,7 @@ import org.hibernate.Session; import org.jbpm.env.Environment; +import org.jbpm.history.HistoryActivityInstance; import org.jbpm.pvm.internal.history.HistoryEvent; import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; import org.jbpm.pvm.internal.util.Clock; @@ -35,20 +36,30 @@ private static final long serialVersionUID = 1L; + protected String transitionName; + + public ActivityEnd() { + } + + public ActivityEnd(String transitionName) { + this.transitionName = transitionName; + } + public void process() { Session session = Environment.getFromCurrent(Session.class); Long historyActivityInstanceDbId = execution.getHistoryActivityInstanceDbid(); - HistoryActivityInstanceImpl historyActivityInstanceImpl = (HistoryActivityInstanceImpl) + HistoryActivityInstanceImpl historyActivityInstance = (HistoryActivityInstanceImpl) session.load(getHistoryActivityInstanceClass(), historyActivityInstanceDbId); - historyActivityInstanceImpl.setEndTime(Clock.getCurrentTime()); - updateActivitySpecificProperties(historyActivityInstanceImpl); - session.update(historyActivityInstanceImpl); + historyActivityInstance.setEndTime(Clock.getCurrentTime()); + historyActivityInstance.setTransitionName(transitionName); + updateActivitySpecificProperties(historyActivityInstance); + session.update(historyActivityInstance); } protected Class<? extends HistoryActivityInstanceImpl> getHistoryActivityInstanceClass() { return HistoryActivityInstanceImpl.class; } - protected void updateActivitySpecificProperties(HistoryActivityInstanceImpl historyActivityInstanceImpl) { + protected void updateActivitySpecificProperties(HistoryActivityInstance historyActivityInstanceImpl) { } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskEnd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskEnd.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/events/TaskEnd.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -21,6 +21,7 @@ */ package org.jbpm.pvm.internal.history.events; +import org.jbpm.history.HistoryActivityInstance; import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; import org.jbpm.pvm.internal.history.model.HistoryTaskInstanceImpl; @@ -42,8 +43,8 @@ return HistoryTaskInstanceImpl.class; } - protected void updateActivitySpecificProperties(HistoryActivityInstanceImpl historyActivityInstanceImpl) { + protected void updateActivitySpecificProperties(HistoryActivityInstance historyActivityInstanceImpl) { HistoryTaskInstanceImpl historyTaskInstanceImpl = (HistoryTaskInstanceImpl) historyActivityInstanceImpl; - historyTaskInstanceImpl.setOutcome(outcome); + historyTaskInstanceImpl.setTransitionName(outcome); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -23,6 +23,7 @@ import java.util.Date; +import org.jbpm.history.HistoryActivityInstance; import org.jbpm.history.HistoryProcessInstance; import org.jbpm.pvm.internal.model.ActivityImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; @@ -31,7 +32,7 @@ * * @author Tom Baeyens */ -public class HistoryActivityInstanceImpl { +public class HistoryActivityInstanceImpl implements HistoryActivityInstance { protected long dbid; protected int dbversion; @@ -45,6 +46,8 @@ protected Date endTime; protected long duration; + protected String transitionName; + public HistoryActivityInstanceImpl() { } @@ -88,4 +91,10 @@ public void setExecutionId(String executionId) { this.executionId = executionId; } + public String getTransitionName() { + return transitionName; + } + public void setTransitionName(String transitionName) { + this.transitionName = transitionName; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryExclusiveInstanceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryExclusiveInstanceImpl.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryExclusiveInstanceImpl.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -30,8 +30,6 @@ */ public class HistoryExclusiveInstanceImpl extends HistoryAutomaticInstanceImpl { - protected String transitionName; - public HistoryExclusiveInstanceImpl() { } @@ -40,7 +38,4 @@ this.transitionName = transitionName; } - public String getTransitionName() { - return transitionName; - } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryProcessInstanceImpl.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -39,7 +39,8 @@ protected int dbversion; protected ProcessDefinitionImpl processDefinition; - protected String id; + protected String processDefinitionId; + protected String processInstanceId; protected String key; protected String state; protected Date startTime; @@ -54,8 +55,9 @@ public HistoryProcessInstanceImpl(ExecutionImpl processInstance) { this.processDefinition = processInstance.getProcessDefinition(); + this.processDefinitionId = processDefinition.getId(); this.dbid = processInstance.getDbid(); - this.id = processInstance.getId(); + this.processInstanceId = processInstance.getId(); this.key = processInstance.getKey(); this.state = "active"; this.startTime = Clock.getCurrentTime(); @@ -82,8 +84,8 @@ public long getDuration() { return duration; } - public String getId() { - return id; + public String getProcessInstanceId() { + return processInstanceId; } public String getKey() { return key; @@ -91,4 +93,7 @@ public String getState() { return state; } + public String getProcessDefinitionId() { + return processDefinitionId; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryTaskInstanceImpl.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -31,8 +31,6 @@ public class HistoryTaskInstanceImpl extends HistoryActivityInstanceImpl { protected String assignee; - protected String outcome; - public HistoryTaskInstanceImpl() { } @@ -40,8 +38,4 @@ super(historyProcessInstanceImpl, execution); this.assignee = assignee; } - - public void setOutcome(String outcome) { - this.outcome = outcome; - } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -974,6 +974,10 @@ fireHistoryEvent(new ActivityEnd()); } + public void historyActivityEnd(String transitionName) { + fireHistoryEvent(new ActivityEnd(transitionName)); + } + public void historyTaskStart(String assignee) { fireHistoryEvent(new TaskStart(assignee)); } Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.query; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.Query; +import org.hibernate.Session; +import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; +import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; + +/** + * @author Tom Baeyens + */ +public class AvgDurationPerActivityQueryCmd implements Command<Object> { + + private static final long serialVersionUID = 1L; + + protected String processDefinitionId; + + public AvgDurationPerActivityQueryCmd(String processDefinitionId) { + this.processDefinitionId = processDefinitionId; + } + + public Object execute(Environment environment) throws Exception { + Session session = environment.get(Session.class); + + Query query = session.createQuery( + "select distinct hai.activityName " + + "from "+HistoryActivityInstanceImpl.class.getName()+" as hai " + + "where hai.historyProcessInstance.processDefinitionId = :processDefinitionId" + ); + query.setString("processDefinitionId", processDefinitionId); + + Map<String, Long> avgDuration = new HashMap<String, Long>(); + + List<String> activityNames = query.list(); + for (String activityName: activityNames) { + query = session.createQuery( + "select avg(hai.duration) " + + "from "+HistoryActivityInstanceImpl.class.getName()+" as hai " + + "where hai.historyProcessInstance.processDefinitionId = :processDefinitionId " + + " and hai.activityName = :activityName" + ); + query.setString("processDefinitionId", processDefinitionId); + query.setString("activityName", activityName); + + Number number = (Number) query.uniqueResult(); + avgDuration.put(activityName, new Long(number.longValue())); + } + + return avgDuration; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/AvgDurationPerActivityQueryCmd.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.query; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hibernate.Query; +import org.hibernate.Session; +import org.jbpm.cmd.Command; +import org.jbpm.env.Environment; +import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; + + +/** + * @author Tom Baeyens + */ +public class ChoiceDistributionQueryCmd implements Command<Object> { + + private static final long serialVersionUID = 1L; + + protected String processDefinitionId; + protected String activityName; + + public ChoiceDistributionQueryCmd(String processDefinitionId, String activityName) { + this.processDefinitionId = processDefinitionId; + this.activityName = activityName; + } + + public Object execute(Environment environment) { + Session session = environment.get(Session.class); + + Query query = session.createQuery( + "select hai.transitionName, count(hai) " + + "from "+HistoryActivityInstanceImpl.class.getName()+" as hai " + + "where hai.historyProcessInstance.processDefinitionId = :processDefinitionId " + + " and hai.activityName = :activityName " + + "group by hai.transitionName " + ); + query.setString("processDefinitionId", processDefinitionId); + query.setString("activityName", activityName); + + List<Object[]> transitionCounts = query.list(); + + Map<String, Integer> choiceDistributionCounts = new HashMap<String, Integer>(); + + for (Object[] pair: transitionCounts) { + String transitionName = (String) pair[0]; + Number number = (Number) pair[1]; + + choiceDistributionCounts.put(transitionName, new Integer(number.intValue())); + } + + return choiceDistributionCounts; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/ChoiceDistributionQueryCmd.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -0,0 +1,167 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.query; + +import java.util.Date; +import java.util.List; + +import org.hibernate.Query; +import org.jbpm.JbpmException; +import org.jbpm.cmd.CommandService; +import org.jbpm.history.HistoryActivityInstance; +import org.jbpm.history.HistoryActivityInstanceQuery; +import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; + + +/** + * @author Tom Baeyens + */ +public class HistoryActivityInstanceQueryImpl extends AbstractQuery implements HistoryActivityInstanceQuery { + + private static final long serialVersionUID = 1L; + + protected String processDefinitionId; + protected Long tookLessThen; + protected Long tookLongerThen; + protected Date startedBefore; + protected Date startedAfter; + protected String executionId; + protected String activityName; + + public HistoryActivityInstanceQueryImpl(CommandService commandService, String processInstanceId) { + super(commandService); + if (processInstanceId==null) { + throw new JbpmException("processInstanceId is null"); + } + this.processDefinitionId = processInstanceId; + } + + public String hql() { + StringBuffer hql = new StringBuffer(); + hql.append("select hai "); + hql.append("from "); + hql.append(HistoryActivityInstanceImpl.class.getName()); + hql.append(" as hai "); + + if (processDefinitionId!=null) { + appendWhereClause(" hai.historyActivityInstance.processDefinitionId = '"+processDefinitionId+"' ", hql); + } + + if (tookLessThen!=null) { + appendWhereClause(" hai.duration < :tookLessThen ", hql); + } + + if (tookLongerThen!=null) { + appendWhereClause(" hai.duration > :tookLongerThen ", hql); + } + + if (startedBefore!=null) { + appendWhereClause(" hai.startTime < :startedBefore ", hql); + } + + if (startedAfter!=null) { + appendWhereClause(" hai.startTime > :startedAfter ", hql); + } + + if (executionId!=null) { + appendWhereClause(" hai.executionId = '"+executionId+"'", hql); + } + + if (activityName!=null) { + appendWhereClause(" hai.activityName = '"+activityName+"'", hql); + } + + return hql().toString(); + } + + protected void applyParameters(Query query) { + if (tookLessThen!=null) { + query.setLong("tookLessThen", tookLessThen); + } + + if (tookLongerThen!=null) { + query.setLong("tookLongerThen", tookLongerThen); + } + + if (startedBefore!=null) { + query.setTime("startedBefore", startedBefore); + } + + if (startedAfter!=null) { + query.setTime("startedAfter", startedAfter); + } + } + + public List<HistoryActivityInstance> execute() { + return (List) commandService.execute(this); + } + + public HistoryActivityInstanceQuery activityName(String activityName) { + this.activityName = activityName; + return this; + } + + public HistoryActivityInstanceQuery executionId(String executionId) { + this.executionId = executionId; + return this; + } + + public HistoryActivityInstanceQuery orderAsc(String property) { + addOrderByClause("hai."+property+" asc"); + return this; + } + + public HistoryActivityInstanceQuery orderDesc(String property) { + addOrderByClause("hai."+property+" desc"); + return this; + } + + public HistoryActivityInstanceQuery page(int firstResult, int maxResults) { + this.page = new Page(firstResult, maxResults); + return this; + } + + public HistoryActivityInstanceQuery processDefinitionId(String processDefinitionId) { + this.processDefinitionId = processDefinitionId; + return this; + } + + public HistoryActivityInstanceQuery startedAfter(Date time) { + this.startedAfter = time; + return this; + } + + public HistoryActivityInstanceQuery startedBefore(Date time) { + this.startedBefore = time; + return this; + } + + public HistoryActivityInstanceQuery tookLessThen(long durationInMillis) { + this.tookLessThen = durationInMillis; + return this; + } + + public HistoryActivityInstanceQuery tookLongerThen(long durationInMillis) { + this.tookLongerThen = durationInMillis; + return this; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryActivityInstanceQueryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/HistoryProcessInstanceQueryImpl.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -24,8 +24,8 @@ import java.util.List; import org.hibernate.Query; -import org.jbpm.HistoryProcessInstanceQuery; import org.jbpm.cmd.CommandService; +import org.jbpm.history.HistoryProcessInstanceQuery; import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl; @@ -37,6 +37,7 @@ private static final long serialVersionUID = 1L; protected String processDefinitionId; + protected String state; public HistoryProcessInstanceQueryImpl(CommandService commandService) { super(commandService); @@ -50,9 +51,13 @@ hql.append(" as hpi "); if (processDefinitionId!=null) { - appendWhereClause(" hpi.processDefinition.id = '"+processDefinitionId+"' ", hql); + appendWhereClause(" hpi.processDefinitionId = '"+processDefinitionId+"' ", hql); } + if (state!=null) { + appendWhereClause(" hpi.state = '"+state+"' ", hql); + } + return hql.toString(); } @@ -82,4 +87,9 @@ this.processDefinitionId = processDefinitionId; return this; } + + public HistoryProcessInstanceQuery state(String state) { + this.state = state; + return this; + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ExecutionServiceImpl.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -29,8 +29,9 @@ import org.jbpm.Execution; import org.jbpm.ExecutionQuery; import org.jbpm.ExecutionService; -import org.jbpm.HistoryProcessInstanceQuery; import org.jbpm.cmd.CommandService; +import org.jbpm.history.HistoryActivityInstanceQuery; +import org.jbpm.history.HistoryProcessInstanceQuery; import org.jbpm.pvm.internal.cmd.DeleteProcessInstance; import org.jbpm.pvm.internal.cmd.FindExecutionsCmd; import org.jbpm.pvm.internal.cmd.FindExecutionCmd; @@ -41,6 +42,7 @@ import org.jbpm.pvm.internal.cmd.StartExecutionCmd; import org.jbpm.pvm.internal.cmd.StartExecutionInLatestCmd; import org.jbpm.pvm.internal.query.ExecutionQueryImpl; +import org.jbpm.pvm.internal.query.HistoryActivityInstanceQueryImpl; import org.jbpm.pvm.internal.query.HistoryProcessInstanceQueryImpl; @@ -172,8 +174,4 @@ cmd.setVariables(variables); return commandService.execute(cmd); } - - public HistoryProcessInstanceQuery createHistoryProcessInstanceQuery() { - return new HistoryProcessInstanceQueryImpl(commandService); - } } Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.svc; + +import java.util.Map; + +import org.jbpm.HistoryService; +import org.jbpm.cmd.CommandService; +import org.jbpm.history.HistoryActivityInstanceQuery; +import org.jbpm.history.HistoryProcessInstanceQuery; +import org.jbpm.pvm.internal.query.AvgDurationPerActivityQueryCmd; +import org.jbpm.pvm.internal.query.ChoiceDistributionQueryCmd; +import org.jbpm.pvm.internal.query.HistoryActivityInstanceQueryImpl; +import org.jbpm.pvm.internal.query.HistoryProcessInstanceQueryImpl; + + +/** + * @author Tom Baeyens + */ +public class HistoryServiceImpl implements HistoryService { + + protected CommandService commandService; + + public Map<String, Long> avgDurationPerActivity(String processDefinitionId) { + return (Map) commandService.execute(new AvgDurationPerActivityQueryCmd(processDefinitionId)); + } + + public Map<String, Integer> choiceDistribution(String processDefinitionId, String activityName) { + return (Map) commandService.execute(new ChoiceDistributionQueryCmd(processDefinitionId, activityName)); + } + + public HistoryProcessInstanceQuery createHistoryProcessInstanceQuery() { + return new HistoryProcessInstanceQueryImpl(commandService); + } + + public HistoryActivityInstanceQuery createHistoryActivityInstanceQuery(String processDefinitionId) { + return new HistoryActivityInstanceQueryImpl(commandService, processDefinitionId); + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/HistoryServiceImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.wire.binding; + +import org.jbpm.cmd.CommandService; +import org.jbpm.pvm.internal.svc.HistoryServiceImpl; +import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor; +import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.Element; + + +/** + * @author Tom Baeyens + */ +public class HistoryServiceBinding extends WireDescriptorBinding { + + public HistoryServiceBinding() { + super("history-service"); + } + + public Object parse(Element element, Parse parse, Parser parser) { + ObjectDescriptor descriptor = new ObjectDescriptor(HistoryServiceImpl.class); + descriptor.addInjection("commandService", new ContextTypeRefDescriptor(CommandService.class)); + return descriptor; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HistoryServiceBinding.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.history.hbm.xml 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.history.hbm.xml 2009-02-13 14:40:26 UTC (rev 3871) @@ -5,19 +5,21 @@  <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> - <id name="id" column="ID_"> + <id name="processInstanceId" column="ID_"> <generator class="assigned" /> </id> <version name="dbversion" column="DBVERSION_" /> + <property name="processDefinitionId" column="PROCDEFID_" /> <property name="key" column="KEY_" /> <property name="startTime" column="START_" type="timestamp" /> <property name="endTime" column="END_" type="timestamp" /> <property name="duration" column="DURATION_" /> + <property name="state" column="STATE_" /> <many-to-one name="processDefinition" class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" - column="PROCESS_" + column="PROCDEF_" foreign-key="FK_HISTPI_PROCDEF" index="IDX_HISTPI_PROCDEF" /> @@ -56,16 +58,14 @@ <property name="startTime" column="START_" type="timestamp" /> <property name="endTime" column="END_" type="timestamp" /> <property name="duration" column="DURATION_" /> + <property name="transitionName" column="TRANSITION_" /> <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> - <subclass name="HistoryExclusiveInstanceImpl" discriminator-value="EXCL"> - <property name="transitionName" column="TRANSITION_" /> - </subclass> + <subclass name="HistoryExclusiveInstanceImpl" discriminator-value="EXCL" /> </subclass> <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> <property name="assignee" column="ASSIGNEE_" /> - <property name="outcome" column="TRANSITION_" /> </subclass> </class> Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml 2009-02-13 14:40:26 UTC (rev 3871) @@ -61,6 +61,7 @@ <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" />  <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -28,6 +28,7 @@ import org.jbpm.Configuration; import org.jbpm.Execution; import org.jbpm.ExecutionService; +import org.jbpm.HistoryService; import org.jbpm.ManagementService; import org.jbpm.ProcessDefinition; import org.jbpm.ProcessEngine; @@ -48,6 +49,7 @@ protected static ExecutionService executionService; protected static ManagementService managementService; protected static TaskService taskService; + protected static HistoryService historyService; protected static CommandService commandService; @@ -78,6 +80,7 @@ processService = processEngine.getProcessService(); executionService = processEngine.getExecutionService(); + historyService = processEngine.getHistoryService(); managementService = processEngine.getManagementService(); taskService = processEngine.getTaskService(); commandService = processEngine.get(CommandService.class); Added: jbpm4/trunk/modules/test-db/.settings/org.eclipse.jdt.core.prefs =================================================================== --- jbpm4/trunk/modules/test-db/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ jbpm4/trunk/modules/test-db/.settings/org.eclipse.jdt.core.prefs 2009-02-13 14:40:26 UTC (rev 3871) @@ -0,0 +1,5 @@ +#Fri Feb 13 11:21:25 CET 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.source=1.5 Added: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java (rev 0) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -0,0 +1,85 @@ +/* + * 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.test.history; + +import java.util.List; +import java.util.Map; + +import org.jbpm.Execution; +import org.jbpm.history.HistoryProcessInstance; +import org.jbpm.history.HistoryProcessInstanceQuery; +import org.jbpm.test.DbTestCase; + + +/** + * @author Tom Baeyens + */ +public class AvgDurationTest extends DbTestCase { + + public void testAvgDuration() throws Exception { + deployJpdlXmlString( + "<process name='Insurance claim' key='ICL'>" + + " <start>" + + " <flow to='one' />" + + " </start>" + + " <state name='one'>" + + " <flow to='two' />" + + " </state>" + + " <state name='two'>" + + " <flow to='three' />" + + " </state>" + + " <state name='three'>" + + " <flow to='end' />" + + " </state>" + + " <end name='end' />" + + "</process>" + ); + + executeProcess(); + executeProcess(); + executeProcess(); + + Map<String, Long> avgDurations = historyService.avgDurationPerActivity("ICL:1"); + + Long avgDurationOne = avgDurations.get("one"); + assertNotNull(avgDurationOne); + assertTrue(avgDurationOne>50); + Long avgDurationTwo = avgDurations.get("two"); + assertNotNull(avgDurationTwo); + assertTrue(avgDurationTwo>20); + Long avgDurationThree = avgDurations.get("three"); + assertNotNull(avgDurationThree); + assertTrue(avgDurationThree>0); + + assertEquals(3, avgDurations.size()); + } + + protected void executeProcess() throws InterruptedException { + Execution execution = executionService.startExecutionByKey("ICL"); + Thread.sleep(50); + executionService.signalExecutionById(execution.getId()); + Thread.sleep(20); + executionService.signalExecutionById(execution.getId()); + executionService.signalExecutionById(execution.getId()); + } + +} Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java (rev 0) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -0,0 +1,75 @@ +/* + * 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.test.history; + +import java.util.HashMap; +import java.util.Map; + +import org.jbpm.Execution; +import org.jbpm.test.DbTestCase; + + +/** + * @author Tom Baeyens + */ +public class ChoiceDistributionTest extends DbTestCase { + + public void testExclusiveExpression() { + deployJpdlXmlString( + "<process name='Transport Selection' key='TRS'>" + + " <start>" + + " <flow to='How far?' />" + + " </start>" + + " <exclusive name='How far?' expr='#{distance}'>" + + " <flow name='far' to='Big car' />" + + " <flow name='nearby' to='Small car' />" + + " <flow name='other country' to='Airoplane' />" + + " </exclusive>" + + " <state name='Big car' />" + + " <state name='Small car' />" + + " <state name='Airoplane' />" + + "</process>" + ); + + Map<String, Object> variables = new HashMap<String, Object>(); + variables.put("distance", "far"); + executionService.startExecutionByKey("TRS", variables); + + variables.put("distance", "nearby"); + executionService.startExecutionByKey("TRS", variables); + executionService.startExecutionByKey("TRS", variables); + executionService.startExecutionByKey("TRS", variables); + + variables.put("distance", "other country"); + executionService.startExecutionByKey("TRS", variables); + executionService.startExecutionByKey("TRS", variables); + + Map<String, Integer> choiceDistribution = historyService.choiceDistribution("TRS:1", "How far?"); + + assertEquals(1, (int)choiceDistribution.get("far")); + assertEquals(3, (int)choiceDistribution.get("nearby")); + assertEquals(2, (int)choiceDistribution.get("other country")); + + } + + +} Property changes on: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-02-13 14:40:26 UTC (rev 3871) @@ -23,8 +23,8 @@ import java.util.List; -import org.jbpm.HistoryProcessInstanceQuery; import org.jbpm.history.HistoryProcessInstance; +import org.jbpm.history.HistoryProcessInstanceQuery; import org.jbpm.test.DbTestCase; @@ -33,7 +33,7 @@ */ public class ProcessInstanceHistoryTest extends DbTestCase { - public void testSignalExecutionByKey() { + public void testProcessInstanceHistory() { deployJpdlXmlString( "<process name='Insurance claim' key='ICL'>" + " <start>" + @@ -47,13 +47,19 @@ executionService.startExecutionByKey("ICL"); executionService.startExecutionByKey("ICL"); - List<HistoryProcessInstance> historyProcessInstances = executionService + List<HistoryProcessInstance> historyProcessInstances = historyService .createHistoryProcessInstanceQuery() .processDefinitionId("ICL:1") .orderAsc(HistoryProcessInstanceQuery.PROPERTY_STARTTIME) .execute(); assertEquals(3, historyProcessInstances.size()); + + for (HistoryProcessInstance historyProcessInstance: historyProcessInstances) { + assertTrue(historyProcessInstance.getProcessInstanceId().startsWith("ICL")); + assertEquals(HistoryProcessInstance.STATE_ENDED, historyProcessInstance.getState()); + assertNotNull(historyProcessInstance.getStartTime()); + assertNotNull(historyProcessInstance.getEndTime()); + } } - } Modified: jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-02-13 14:19:06 UTC (rev 3870) +++ jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-02-13 14:40:26 UTC (rev 3871) @@ -16,7 +16,9 @@ <process-service /> <execution-service /> + <history-service /> <management-service /> + <identity-service /> <task-service /> <command-service>

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r3870 - jbpm4/trunk/modules/jpdl/src/main/resources.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-13 09:19:06 -0500 (Fri, 13 Feb 2009) New Revision: 3870 Modified: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.common.xml Log: revert hbm2ddl.auto settings Modified: jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.common.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.common.xml 2009-02-13 13:55:54 UTC (rev 3869) +++ jbpm4/trunk/modules/jpdl/src/main/resources/hibernate.common.xml 2009-02-13 14:19:06 UTC (rev 3870) @@ -19,7 +19,7 @@   - <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.hbm2ddl.auto">create</property>

17 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits February 2009