[jbpm-commits] JBoss JBPM SVN: r3659 - in jbpm4/trunk/modules: config/src/main/resources and 24 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-01-16 05:07:28 -0500 (Fri, 16 Jan 2009) New Revision: 3659 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/builder/VariableBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TypesBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TypesDescriptor.java Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VariableTypesBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/VariableTypeResolverDescriptor.java Modified: jbpm4/trunk/modules/api/src/main/resources/cfg.xsd jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.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/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/builder/CompositeBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/DefaultTypeSet.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.definition.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.types.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.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/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml Log: changed variable-types to types and other type cleanup in the context of creating VariableBuilder Modified: jbpm4/trunk/modules/api/src/main/resources/cfg.xsd =================================================================== --- jbpm4/trunk/modules/api/src/main/resources/cfg.xsd 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/api/src/main/resources/cfg.xsd 2009-01-16 10:07:28 UTC (rev 3659) @@ -818,7 +818,7 @@ </complexType> </element> - <element name="variable-types"> + <element name="types"> <annotation><documentation>Specifies automatic variable type resolution, transforming variable values of any java class into their persistable format. When the type of a variable needs to be automatically detected. Each of the type elements will @@ -1142,7 +1142,7 @@ <element ref="tns:job-test-helper" /> <element ref="tns:command-service" /> <element ref="tns:transaction" /> - <element ref="tns:variable-types" /> + <element ref="tns:types" /> </choice> </group> Modified: jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/config/src/main/resources/jbpm.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -43,7 +43,7 @@ <job-test-helper /> <id-generator /> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/> 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-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -142,7 +142,7 @@ &lt;hibernate-session-factory /&gt; &lt;id-generator /&gt; - &lt;variable-types resource=&quot;jbpm.pvm.types.xml&quot; /&gt; + &lt;types resource=&quot;jbpm.pvm.types.xml&quot; /&gt; &lt;job-executor auto-start=&quot;false&quot; /&gt; &lt;/process-engine&gt; Modified: jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -27,7 +27,7 @@ <hibernate-session-factory /> <id-generator /> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -52,7 +52,7 @@ <job-test-helper /> <id-generator /> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/> Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -45,7 +45,7 @@ <job-test-helper /> <id-generator /> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/> Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/builder/CompositeBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/builder/CompositeBuilder.java 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/builder/CompositeBuilder.java 2009-01-16 10:07:28 UTC (rev 3659) @@ -52,16 +52,11 @@ } public CompositeBuilder variable(String name, String type) { - variable(name, type, null); - return this; + return startVariable(name, type).endVariable(); } - - public CompositeBuilder variable(String name, String type, Descriptor descriptor) { - VariableDefinitionImpl variableDefinition = compositeElement.createVariableDefinition(); - variableDefinition.setDestination(name); - variableDefinition.setTypeName(type); - variableDefinition.setSourceDescriptor(descriptor); - return this; + + public VariableBuilder startVariable(String name, String type) { + return new VariableBuilder(this); } public ActivityBuilder startActivity() { Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/builder/VariableBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/builder/VariableBuilder.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/builder/VariableBuilder.java 2009-01-16 10:07:28 UTC (rev 3659) @@ -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.pvm.builder; + +import org.jbpm.pvm.internal.model.VariableDefinitionImpl; +import org.jbpm.pvm.internal.wire.Descriptor; + + +/** + * @author Tom Baeyens + */ +public class VariableBuilder { + + protected CompositeBuilder compositeBuilder; + protected VariableDefinitionImpl variableDefinition; + + public VariableBuilder(CompositeBuilder compositeBuilder) { + this.compositeBuilder = compositeBuilder; + variableDefinition = compositeBuilder.compositeElement.createVariableDefinition(); + } + + public VariableBuilder name(String name) { + variableDefinition.setName(name); + return this; + } + + public VariableBuilder type(String type) { + variableDefinition.setTypeName(type); + return this; + } + + public VariableBuilder initialValue(Descriptor initialValueDescriptor) { + variableDefinition.setInDescriptor(initialValueDescriptor); + return this; + } + + public VariableBuilder initialExpression(String initialExpression) { + variableDefinition.setInExpression(initialExpression); + return this; + } + + public VariableBuilder initialVariable(String initialVariable) { + variableDefinition.setInVariableName(initialVariable); + return this; + } + + public VariableBuilder outVariable(String outVariable) { + variableDefinition.setOutVariableName(outVariable); + return this; + } + + public CompositeBuilder endVariable() { + return compositeBuilder; + } + +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/builder/VariableBuilder.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/EnvironmentDefaults.java 2009-01-16 10:07:28 UTC (rev 3659) @@ -47,11 +47,4 @@ return ScriptManager.getDefaultScriptManager(); } - public static TypeSet getTypeSet() { - TypeSet typeSet = Environment.getFromCurrent(TypeSet.class); - if (typeSet!=null) { - return typeSet; - } - return DefaultTypeSet.getDefaultTypeSet(); - } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-01-16 10:07:28 UTC (rev 3659) @@ -39,8 +39,8 @@ import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.type.Converter; import org.jbpm.pvm.internal.type.Type; -import org.jbpm.pvm.internal.type.Variable; import org.jbpm.pvm.internal.type.TypeSet; +import org.jbpm.pvm.internal.type.Variable; import org.jbpm.pvm.internal.type.variable.NullVariable; import org.jbpm.pvm.internal.type.variable.UnpersistableVariable; import org.jbpm.session.TimerSession; @@ -75,10 +75,10 @@ } variables = new HashMap<String, Variable>(); for (VariableDefinitionImpl variableDefinition: variableDefinitions) { - String key = variableDefinition.getKey(); - Object value = variableDefinition.getSourceValue(outerExecution); - Type type = variableDefinition.getType(); - createVariable(key, value, type); + String key = variableDefinition.getName(); + Object value = variableDefinition.getInValue(outerExecution); + String typeName = variableDefinition.getTypeName(); + createVariable(key, value, typeName); } } } @@ -92,10 +92,10 @@ } for (VariableDefinitionImpl variableDefinition: variableDefinitions) { - String destination = variableDefinition.getDestination(); + String destination = variableDefinition.getOutVariableName(); if (destination!=null) { - String key = variableDefinition.getKey(); - Object value = variableDefinition.getDestinationValue(this); + String key = variableDefinition.getName(); + Object value = variableDefinition.getOutValue(this); outerExecution.setVariable(key, value); } } @@ -104,36 +104,27 @@ public void createVariable(String key, Object value) { - createVariable(key, value, null, null); + createVariable(key, value, null); } public void createVariable(String key, Object value, String typeName) { - createVariable(key, value, typeName, null); - } - - public void createVariable(String key, Object value, Type type) { - createVariable(key, value, null, type); - } - - public void createVariable(String key, Object value, String typeName, Type type) { if (isEnded()) { throw new JbpmException("can't create variable '"+key+"' on "+this+": "+state); } log.debug("create variable '"+key+"' in '"+this+"' with value '"+value+"'"); + Type type = null; + if (type==null) { - Environment environment = Environment.getCurrent(); - if (environment!=null) { - TypeSet typeSet = environment.get(TypeSet.class); - if (typeSet!=null) { - if (typeName!=null) { - type = typeSet.findTypeByName(typeName); - } - if (type==null) { - type = typeSet.findTypeByMatch(key, value); - } + TypeSet typeSet = Environment.getFromCurrent(TypeSet.class, false); + if (typeSet!=null) { + if (typeName!=null) { + type = typeSet.findTypeByName(typeName); } + if (type==null) { + type = typeSet.findTypeByMatch(key, value); + } } } @@ -193,7 +184,7 @@ variable.setValue(value); } else if (getParentVariableScope()==null) { - createVariable(key, value, null, null); + createVariable(key, value, null); } else { getParentVariableScope().setVariable(key,value); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java 2009-01-16 10:07:28 UTC (rev 3659) @@ -23,9 +23,6 @@ import java.io.Serializable; -import org.jbpm.pvm.internal.env.EnvironmentDefaults; -import org.jbpm.pvm.internal.type.Type; -import org.jbpm.pvm.internal.type.TypeSet; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; @@ -45,97 +42,82 @@ protected long dbid; protected int dbversion; - protected String key; - protected String description; - - protected String source; - protected String sourceExpression; - protected Descriptor sourceDescriptor; + protected String name; + protected String typeName; - protected String destination; - protected String destinationExpression; + protected String inVariableName; + protected String inExpression; + protected Descriptor inDescriptor; - protected Type type; + protected String outVariableName; + protected String outExpression; - public Object getSourceValue(ExecutionImpl execution) { - if (sourceDescriptor!=null) { - return WireContext.create(sourceDescriptor); + public Object getInValue(ExecutionImpl execution) { + if (inDescriptor!=null) { + return WireContext.create(inDescriptor); } - if (source!=null) { - return execution.getVariable(key); + if (inVariableName!=null) { + return execution.getVariable(name); } - if (sourceExpression!=null) { - // TODO add variable source expression resolution - return null; + if (inExpression!=null) { + throw new UnsupportedOperationException("TODO add variable in expression resolution"); } return null; } - public Object getDestinationValue(ScopeInstanceImpl scopeInstanceImpl) { - if (destinationExpression!=null) { - // TODO add variable destination expression resolution - return null; + public Object getOutValue(ScopeInstanceImpl scopeInstanceImpl) { + if (outExpression!=null) { + throw new UnsupportedOperationException("TODO add variable out expression resolution"); } - if (key!=null) { - return scopeInstanceImpl.getVariable(key); + if (name!=null) { + return scopeInstanceImpl.getVariable(name); } return null; } - public void setTypeName(String typeName) { - TypeSet typeSet = EnvironmentDefaults.getTypeSet(); - type = typeSet.findTypeByName(typeName); - } - public long getDbid() { return dbid; } - public String getKey() { - return key; + public String getName() { + return name; } - public void setKey(String key) { - this.key = key; + public void setName(String name) { + this.name = name; } - public String getDescription() { - return description; + public String getInVariableName() { + return inVariableName; } - public void setDescription(String description) { - this.description = description; + public void setInVariableName(String inVariableName) { + this.inVariableName = inVariableName; } - public String getSource() { - return source; + public String getInExpression() { + return inExpression; } - public void setSource(String source) { - this.source = source; + public void setInExpression(String inExpression) { + this.inExpression = inExpression; } - public String getSourceExpression() { - return sourceExpression; + public Descriptor getInDescriptor() { + return inDescriptor; } - public void setSourceExpression(String sourceExpression) { - this.sourceExpression = sourceExpression; + public void setInDescriptor(Descriptor inDescriptor) { + this.inDescriptor = inDescriptor; } - public Descriptor getSourceDescriptor() { - return sourceDescriptor; + public String getOutVariableName() { + return outVariableName; } - public void setSourceDescriptor(Descriptor sourceDescriptor) { - this.sourceDescriptor = sourceDescriptor; + public void setOutVariableName(String outVariableName) { + this.outVariableName = outVariableName; } - public String getDestination() { - return destination; + public String getOutExpression() { + return outExpression; } - public void setDestination(String destination) { - this.destination = destination; + public void setOutExpression(String outExpression) { + this.outExpression = outExpression; } - public String getDestinationExpression() { - return destinationExpression; + public String getTypeName() { + return typeName; } - public void setDestinationExpression(String destinationExpression) { - this.destinationExpression = destinationExpression; + public void setTypeName(String typeName) { + this.typeName = typeName; } - public Type getType() { - return type; - } - public void setType(Type type) { - this.type = type; - } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/DefaultTypeSet.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/DefaultTypeSet.java 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/DefaultTypeSet.java 2009-01-16 10:07:28 UTC (rev 3659) @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.log.Log; /** * @author Tom Baeyens @@ -34,14 +33,8 @@ private static final long serialVersionUID = 1L; - private static final Log log = Log.getLog(DefaultTypeSet.class.getName()); - protected List<TypeMapping> typeMappings; - public static TypeSet getDefaultTypeSet() { - return null; - } - public Type findTypeByMatch(String key, Object value) { if (typeMappings!=null) { for (TypeMapping typeMapping: typeMappings) { Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TypesBinding.java (from rev 3641, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VariableTypesBinding.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TypesBinding.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TypesBinding.java 2009-01-16 10:07:28 UTC (rev 3659) @@ -0,0 +1,202 @@ +/* + * 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 java.io.File; +import java.net.URL; +import java.util.List; + +import org.jbpm.pvm.internal.stream.FileStreamInput; +import org.jbpm.pvm.internal.stream.ResourceStreamInput; +import org.jbpm.pvm.internal.stream.StreamInput; +import org.jbpm.pvm.internal.stream.UrlStreamInput; +import org.jbpm.pvm.internal.type.Converter; +import org.jbpm.pvm.internal.type.Matcher; +import org.jbpm.pvm.internal.type.Type; +import org.jbpm.pvm.internal.type.TypeMapping; +import org.jbpm.pvm.internal.type.matcher.ClassNameMatcher; +import org.jbpm.pvm.internal.type.matcher.HibernateLongIdMatcher; +import org.jbpm.pvm.internal.type.matcher.HibernateStringIdMatcher; +import org.jbpm.pvm.internal.type.matcher.SerializableMatcher; +import org.jbpm.pvm.internal.util.ReflectUtil; +import org.jbpm.pvm.internal.util.XmlUtil; +import org.jbpm.pvm.internal.wire.descriptor.TypesDescriptor; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.Element; + +/** parses a descriptor for Boolean.TRUE. + * + * See schema docs for more details. + * + * @author Tom Baeyens + */ +public class TypesBinding extends WireDescriptorBinding { + + public TypesBinding() { + super("types"); + } + + public Object parse(Element element, Parse parse, Parser parser) { + StreamInput streamSource = null; + if (element.hasAttribute("file")) { + String fileName = element.getAttribute("file"); + File file = new File(fileName); + if (file.exists() && file.isFile()) { + streamSource = new FileStreamInput(file); + parser.importStream(streamSource, element, parse); + } else { + parse.addProblem("file "+fileName+" isn't a file"); + } + } + + if (element.hasAttribute("resource")) { + String resource = element.getAttribute("resource"); + streamSource = new ResourceStreamInput(resource, parse.getClassLoader()); + parser.importStream(streamSource, element, parse); + } + + if (element.hasAttribute("url")) { + String urlText = element.getAttribute("url"); + try { + URL url = new URL(urlText); + streamSource = new UrlStreamInput(url); + parser.importStream(streamSource, element, parse); + } catch (Exception e) { + parse.addProblem("couldn't open url "+urlText, e); + } + } + + TypesDescriptor typesDescriptor = new TypesDescriptor(); + + List<Element> typeElements = XmlUtil.elements(element, "type"); + for (Element typeElement: typeElements) { + TypeMapping typeMapping = parseTypeMapping(typeElement, parse, parser); + typesDescriptor.addTypeMapping(typeMapping); + } + return typesDescriptor; + } + + protected TypeMapping parseTypeMapping(Element element, Parse parse, Parser parser) { + TypeMapping typeMapping = new TypeMapping(); + Type type = new Type(); + typeMapping.setType(type); + + // type name + if (element.hasAttribute("name")) { + type.setName(element.getAttribute("name")); + } + + String hibernateSessionFactoryName = XmlUtil.attribute(element, "hibernate-session-factory"); + + // first we get the matcher + Matcher matcher = null; + if (element.hasAttribute("class")) { + String className = element.getAttribute("class"); + + // if type="serializable" + if ("serializable".equals(className)) { + matcher = new SerializableMatcher(); + + // if type="persistable" + } else if ("persistable".equals(className)) { + if (element.hasAttribute("id-type")) { + String idType = element.getAttribute("id-type"); + if ("long".equalsIgnoreCase(idType)) { + matcher = new HibernateLongIdMatcher(hibernateSessionFactoryName); + } else if ("string".equalsIgnoreCase(idType)) { + matcher = new HibernateStringIdMatcher(hibernateSessionFactoryName); + } else { + parse.addProblem("id-type was not 'long' or 'string': "+idType); + } + } else { + parse.addProblem("id-type is required in a persistable type"); + } + + // otherwise, we expect type="some.java.ClassName" + } else { + matcher = new ClassNameMatcher(className); + } + + } else { + // look for the matcher element + Element matcherElement = XmlUtil.element(element, "matcher"); + Element matcherObjectElement = XmlUtil.element(matcherElement); + if (matcherObjectElement!=null) { + try { + matcher = (Matcher) parser.parseElement(matcherObjectElement, parse); + } catch (ClassCastException e) { + parse.addProblem("matcher is not a "+Matcher.class.getName()+": "+(matcher!=null ? matcher.getClass().getName() : "null")); + } + } else { + parse.addProblem("no matcher specified in "+XmlUtil.toString(element)); + } + } + + typeMapping.setMatcher(matcher); + + // parsing the converter + Converter converter = null; + if (element.hasAttribute("converter")) { + String converterClassName = element.getAttribute("converter"); + ClassLoader classLoader = parse.getClassLoader(); + try { + Class<?> converterClass = ReflectUtil.loadClass(classLoader, converterClassName); + converter = (Converter) converterClass.newInstance(); + } catch (Exception e) { + parse.addProblem("couldn't instantiate converter "+converterClassName); + } + } else { + // look for the matcher element + Element converterElement = XmlUtil.element(element, "converter"); + Element converterObjectElement = XmlUtil.element(converterElement); + if (converterObjectElement!=null) { + try { + converter = (Converter) parser.parseElement(converterObjectElement, parse); + } catch (ClassCastException e) { + parse.addProblem("converter is not a "+Converter.class.getName()+": "+(converter!=null ? converter.getClass().getName() : "null")); + } + } + } + + type.setConverter(converter); + + // parsing the variable class + + Class<?> variableClass = null; + if (element.hasAttribute("variable-class")) { + String variableClassName = element.getAttribute("variable-class"); + ClassLoader classLoader = parse.getClassLoader(); + try { + variableClass = ReflectUtil.loadClass(classLoader, variableClassName); + } catch (Exception e) { + parse.addProblem("couldn't instantiate variable-class "+variableClassName, e); + } + } else { + parse.addProblem("variable-class is required on a type: "+XmlUtil.toString(element)); + } + + type.setVariableClass(variableClass); + + return typeMapping; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TypesBinding.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VariableTypesBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VariableTypesBinding.java 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/VariableTypesBinding.java 2009-01-16 10:07:28 UTC (rev 3659) @@ -1,202 +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.pvm.internal.wire.binding; - -import java.io.File; -import java.net.URL; -import java.util.List; - -import org.jbpm.pvm.internal.stream.FileStreamInput; -import org.jbpm.pvm.internal.stream.ResourceStreamInput; -import org.jbpm.pvm.internal.stream.StreamInput; -import org.jbpm.pvm.internal.stream.UrlStreamInput; -import org.jbpm.pvm.internal.type.Converter; -import org.jbpm.pvm.internal.type.Matcher; -import org.jbpm.pvm.internal.type.Type; -import org.jbpm.pvm.internal.type.TypeMapping; -import org.jbpm.pvm.internal.type.matcher.ClassNameMatcher; -import org.jbpm.pvm.internal.type.matcher.HibernateLongIdMatcher; -import org.jbpm.pvm.internal.type.matcher.HibernateStringIdMatcher; -import org.jbpm.pvm.internal.type.matcher.SerializableMatcher; -import org.jbpm.pvm.internal.util.ReflectUtil; -import org.jbpm.pvm.internal.util.XmlUtil; -import org.jbpm.pvm.internal.wire.descriptor.VariableTypeResolverDescriptor; -import org.jbpm.pvm.internal.xml.Parse; -import org.jbpm.pvm.internal.xml.Parser; -import org.w3c.dom.Element; - -/** parses a descriptor for Boolean.TRUE. - * - * See schema docs for more details. - * - * @author Tom Baeyens - */ -public class VariableTypesBinding extends WireDescriptorBinding { - - public VariableTypesBinding() { - super("variable-types"); - } - - public Object parse(Element element, Parse parse, Parser parser) { - StreamInput streamSource = null; - if (element.hasAttribute("file")) { - String fileName = element.getAttribute("file"); - File file = new File(fileName); - if (file.exists() && file.isFile()) { - streamSource = new FileStreamInput(file); - parser.importStream(streamSource, element, parse); - } else { - parse.addProblem("file "+fileName+" isn't a file"); - } - } - - if (element.hasAttribute("resource")) { - String resource = element.getAttribute("resource"); - streamSource = new ResourceStreamInput(resource, parse.getClassLoader()); - parser.importStream(streamSource, element, parse); - } - - if (element.hasAttribute("url")) { - String urlText = element.getAttribute("url"); - try { - URL url = new URL(urlText); - streamSource = new UrlStreamInput(url); - parser.importStream(streamSource, element, parse); - } catch (Exception e) { - parse.addProblem("couldn't open url "+urlText, e); - } - } - - VariableTypeResolverDescriptor variableTypeResolverDescriptor = new VariableTypeResolverDescriptor(); - - List<Element> typeElements = XmlUtil.elements(element, "type"); - for (Element typeElement: typeElements) { - TypeMapping typeMapping = parseTypeMapping(typeElement, parse, parser); - variableTypeResolverDescriptor.addTypeMapping(typeMapping); - } - return variableTypeResolverDescriptor; - } - - protected TypeMapping parseTypeMapping(Element element, Parse parse, Parser parser) { - TypeMapping typeMapping = new TypeMapping(); - Type type = new Type(); - typeMapping.setType(type); - - // type name - if (element.hasAttribute("name")) { - type.setName(element.getAttribute("name")); - } - - String hibernateSessionFactoryName = XmlUtil.attribute(element, "hibernate-session-factory"); - - // first we get the matcher - Matcher matcher = null; - if (element.hasAttribute("class")) { - String className = element.getAttribute("class"); - - // if type="serializable" - if ("serializable".equals(className)) { - matcher = new SerializableMatcher(); - - // if type="persistable" - } else if ("persistable".equals(className)) { - if (element.hasAttribute("id-type")) { - String idType = element.getAttribute("id-type"); - if ("long".equalsIgnoreCase(idType)) { - matcher = new HibernateLongIdMatcher(hibernateSessionFactoryName); - } else if ("string".equalsIgnoreCase(idType)) { - matcher = new HibernateStringIdMatcher(hibernateSessionFactoryName); - } else { - parse.addProblem("id-type was not 'long' or 'string': "+idType); - } - } else { - parse.addProblem("id-type is required in a persistable type"); - } - - // otherwise, we expect type="some.java.ClassName" - } else { - matcher = new ClassNameMatcher(className); - } - - } else { - // look for the matcher element - Element matcherElement = XmlUtil.element(element, "matcher"); - Element matcherObjectElement = XmlUtil.element(matcherElement); - if (matcherObjectElement!=null) { - try { - matcher = (Matcher) parser.parseElement(matcherObjectElement, parse); - } catch (ClassCastException e) { - parse.addProblem("matcher is not a "+Matcher.class.getName()+": "+(matcher!=null ? matcher.getClass().getName() : "null")); - } - } else { - parse.addProblem("no matcher specified in "+XmlUtil.toString(element)); - } - } - - typeMapping.setMatcher(matcher); - - // parsing the converter - Converter converter = null; - if (element.hasAttribute("converter")) { - String converterClassName = element.getAttribute("converter"); - ClassLoader classLoader = parse.getClassLoader(); - try { - Class<?> converterClass = ReflectUtil.loadClass(classLoader, converterClassName); - converter = (Converter) converterClass.newInstance(); - } catch (Exception e) { - parse.addProblem("couldn't instantiate converter "+converterClassName); - } - } else { - // look for the matcher element - Element converterElement = XmlUtil.element(element, "converter"); - Element converterObjectElement = XmlUtil.element(converterElement); - if (converterObjectElement!=null) { - try { - converter = (Converter) parser.parseElement(converterObjectElement, parse); - } catch (ClassCastException e) { - parse.addProblem("converter is not a "+Converter.class.getName()+": "+(converter!=null ? converter.getClass().getName() : "null")); - } - } - } - - type.setConverter(converter); - - // parsing the variable class - - Class<?> variableClass = null; - if (element.hasAttribute("variable-class")) { - String variableClassName = element.getAttribute("variable-class"); - ClassLoader classLoader = parse.getClassLoader(); - try { - variableClass = ReflectUtil.loadClass(classLoader, variableClassName); - } catch (Exception e) { - parse.addProblem("couldn't instantiate variable-class "+variableClassName, e); - } - } else { - parse.addProblem("variable-class is required on a type: "+XmlUtil.toString(element)); - } - - type.setVariableClass(variableClass); - - return typeMapping; - } -} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TypesDescriptor.java (from rev 3653, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/VariableTypeResolverDescriptor.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TypesDescriptor.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TypesDescriptor.java 2009-01-16 10:07:28 UTC (rev 3659) @@ -0,0 +1,53 @@ +/* + * 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.descriptor; + +import org.jbpm.pvm.internal.type.DefaultTypeSet; +import org.jbpm.pvm.internal.type.TypeMapping; +import org.jbpm.pvm.internal.wire.WireContext; +import org.jbpm.pvm.internal.wire.WireDefinition; + +/** + * @author Tom Baeyens + */ +public class TypesDescriptor extends AbstractDescriptor { + + private static final long serialVersionUID = 1L; + + DefaultTypeSet defaultTypeSet = new DefaultTypeSet(); + + public Object construct(WireContext wireContext) { + return defaultTypeSet; + } + + public Class< ? > getType(WireDefinition wireDefinition) { + return DefaultTypeSet.class; + } + + public void addTypeMapping(TypeMapping typeMapping) { + defaultTypeSet.addTypeMapping(typeMapping); + } + + public DefaultTypeSet getDefaultTypeSet() { + return defaultTypeSet; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/TypesDescriptor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/VariableTypeResolverDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/VariableTypeResolverDescriptor.java 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/VariableTypeResolverDescriptor.java 2009-01-16 10:07:28 UTC (rev 3659) @@ -1,49 +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.pvm.internal.wire.descriptor; - -import org.jbpm.pvm.internal.type.DefaultTypeSet; -import org.jbpm.pvm.internal.type.TypeMapping; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.wire.WireDefinition; - -/** - * @author Tom Baeyens - */ -public class VariableTypeResolverDescriptor extends AbstractDescriptor { - - private static final long serialVersionUID = 1L; - - DefaultTypeSet defaultTypeSet = new DefaultTypeSet(); - - public Object construct(WireContext wireContext) { - return defaultTypeSet; - } - - public Class< ? > getType(WireDefinition wireDefinition) { - return DefaultTypeSet.class; - } - - public void addTypeMapping(TypeMapping typeMapping) { - defaultTypeSet.addTypeMapping(typeMapping); - } -} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2009-01-16 10:07:28 UTC (rev 3659) @@ -174,7 +174,7 @@ scope(); } VariableDefinitionImpl variableDefinition = compositeElement.createVariableDefinition(); - variableDefinition.setKey(key); + variableDefinition.setName(key); return this; } @@ -184,8 +184,8 @@ scope(); } VariableDefinitionImpl variableDefinition = scope.createVariableDefinition(); - variableDefinition.setKey(sourceDescriptor.getName()); - variableDefinition.setSourceDescriptor(sourceDescriptor); + variableDefinition.setName(sourceDescriptor.getName()); + variableDefinition.setInDescriptor(sourceDescriptor); return this; } Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.definition.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.definition.hbm.xml 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.definition.hbm.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -347,23 +347,19 @@ <generator class="native" /> </id> <version name="dbversion" column="DBVERSION_" /> - <property name="key" column="KEY_"/> - <property name="description" column="DESCR_"/> + <property name="name" column="NAME_"/> + <property name="typeName" column="TYPE_"/> - <property name="source" column="SRC_" /> - <property name="sourceExpression" column="SRCEXPR_" /> - <many-to-one name="sourceDescriptor" - column="SRCDESCR_" + <property name="inVariableName" column="INVAR_" /> + <property name="inExpression" column="INEXPR_" /> + <many-to-one name="inDescriptor" + column="INDESCR_" class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" cascade="all" - foreign-key="FK_VARDEF_SRCDES" - index="IDX_VARDEF_SRCDES"/> - <property name="destination" column="DEST_" /> - <property name="destinationExpression" column="DESTEXPR_" /> - <component name="type" class="org.jbpm.pvm.internal.type.Type"> - <property name="variableClass" type="class" column="TYPE_VARCLASS_" /> - <property name="converter" type="converter" column="TYPE_CONVERTER_" /> - </component> + foreign-key="FK_VARDEF_INDES" + index="IDX_VARDEF_INDES"/> + <property name="outVariableName" column="OUTVAR_" /> + <property name="outExpression" column="OUTEXPR_" /> </class> <!-- ### TIMER DEFINITION ############################################### --> Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.types.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.types.xml 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.types.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -1,4 +1,4 @@ -<variable-types> +<types> <!-- types stored in a native column --> <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> @@ -31,4 +31,4 @@ <!-- TODO: add JCR node support --> <!-- TODO: add collection support --> -</variable-types> +</types> 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-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -50,7 +50,7 @@ <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> <!-- dynamic type mapping configuration --> - <binding class="org.jbpm.pvm.internal.wire.binding.VariableTypesBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> <!-- services --> <binding class="org.jbpm.pvm.internal.wire.binding.StandardCommandServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.AsyncCommandServiceBinding" /> Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java 2009-01-16 10:07:28 UTC (rev 3659) @@ -59,13 +59,12 @@ /** * @author Guillaume Porcher * - * This class uses process annotations to test wire descriptors persistence + * This class uses process annotations to test wire descriptors + * persistence */ -public class WireDbTest extends EnvironmentDbTestCase -{ +public class WireDbTest extends EnvironmentDbTestCase { - public void testCharacterDescriptor() - { + public void testCharacterDescriptor() { DbSession dbSession = environment.get(DbSession.class); CharacterDescriptor descriptor = new CharacterDescriptor(); @@ -76,31 +75,29 @@ newTransaction(); dbSession = environment.get(DbSession.class); - descriptor = (CharacterDescriptor)dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); + descriptor = (CharacterDescriptor) dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); assertEquals("n", descriptor.getName()); assertEquals('c', descriptor.construct(null)); } - public void testByteDescriptor() - { + public void testByteDescriptor() { DbSession dbSession = environment.get(DbSession.class); ByteDescriptor descriptor = new ByteDescriptor(); descriptor.setName("n"); - descriptor.setValue((byte)6); + descriptor.setValue((byte) 6); dbSession.save(descriptor); newTransaction(); dbSession = environment.get(DbSession.class); - descriptor = (ByteDescriptor)dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); + descriptor = (ByteDescriptor) dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); assertEquals("n", descriptor.getName()); - assertEquals((byte)6, descriptor.construct(null)); + assertEquals((byte) 6, descriptor.construct(null)); } - public void testClassDescriptor() - { + public void testClassDescriptor() { DbSession dbSession = environment.get(DbSession.class); ClassDescriptor descriptor = new ClassDescriptor(); @@ -112,13 +109,12 @@ newTransaction(); dbSession = environment.get(DbSession.class); - descriptor = (ClassDescriptor)dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); + descriptor = (ClassDescriptor) dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); assertEquals("n", descriptor.getName()); assertEquals(EventImpl.class, WireContext.create(descriptor)); } - public void testDoubleDescriptor() - { + public void testDoubleDescriptor() { DbSession dbSession = environment.get(DbSession.class); DoubleDescriptor descriptor = new DoubleDescriptor(); @@ -130,13 +126,12 @@ newTransaction(); dbSession = environment.get(DbSession.class); - descriptor = (DoubleDescriptor)dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); + descriptor = (DoubleDescriptor) dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); assertEquals("n", descriptor.getName()); assertEquals(6.666, descriptor.construct(null)); } - public void testFalseDescriptor() - { + public void testFalseDescriptor() { DbSession dbSession = environment.get(DbSession.class); FalseDescriptor descriptor = new FalseDescriptor(); @@ -146,31 +141,29 @@ newTransaction(); dbSession = environment.get(DbSession.class); - descriptor = (FalseDescriptor)dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); + descriptor = (FalseDescriptor) dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); assertEquals("n", descriptor.getName()); assertEquals(Boolean.FALSE, descriptor.construct(null)); } - public void testFloatDescriptor() - { + public void testFloatDescriptor() { DbSession dbSession = environment.get(DbSession.class); FloatDescriptor descriptor = new FloatDescriptor(); descriptor.setName("n"); - descriptor.setValue((float)6.666); + descriptor.setValue((float) 6.666); dbSession.save(descriptor); newTransaction(); dbSession = environment.get(DbSession.class); - descriptor = (FloatDescriptor)dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); + descriptor = (FloatDescriptor) dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); assertEquals("n", descriptor.getName()); - assertEquals((float)6.666, descriptor.construct(null)); + assertEquals((float) 6.666, descriptor.construct(null)); } - public void testIntegerDescriptor() - { + public void testIntegerDescriptor() { DbSession dbSession = environment.get(DbSession.class); IntegerDescriptor descriptor = new IntegerDescriptor(); @@ -182,13 +175,12 @@ newTransaction(); dbSession = environment.get(DbSession.class); - descriptor = (IntegerDescriptor)dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); + descriptor = (IntegerDescriptor) dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); assertEquals("n", descriptor.getName()); assertEquals(6, descriptor.construct(null)); } - public void testLongDescriptor() - { + public void testLongDescriptor() { DbSession dbSession = environment.get(DbSession.class); LongDescriptor descriptor = new LongDescriptor(); @@ -200,13 +192,12 @@ newTransaction(); dbSession = environment.get(DbSession.class); - descriptor = (LongDescriptor)dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); + descriptor = (LongDescriptor) dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); assertEquals("n", descriptor.getName()); assertEquals(6L, descriptor.construct(null)); } - public void testNullDescriptor() - { + public void testNullDescriptor() { DbSession dbSession = environment.get(DbSession.class); NullDescriptor descriptor = new NullDescriptor(); @@ -216,31 +207,29 @@ newTransaction(); dbSession = environment.get(DbSession.class); - descriptor = (NullDescriptor)dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); + descriptor = (NullDescriptor) dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); assertEquals("n", descriptor.getName()); assertNull(descriptor.construct(null)); } - public void testShortDescriptor() - { + public void testShortDescriptor() { DbSession dbSession = environment.get(DbSession.class); ShortDescriptor descriptor = new ShortDescriptor(); descriptor.setName("n"); - descriptor.setValue((short)6); + descriptor.setValue((short) 6); dbSession.save(descriptor); newTransaction(); dbSession = environment.get(DbSession.class); - descriptor = (ShortDescriptor)dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); + descriptor = (ShortDescriptor) dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); assertEquals("n", descriptor.getName()); - assertEquals((short)6, descriptor.construct(null)); + assertEquals((short) 6, descriptor.construct(null)); } - public void testStringDescriptor() - { + public void testStringDescriptor() { DbSession dbSession = environment.get(DbSession.class); StringDescriptor descriptor = new StringDescriptor(); @@ -251,13 +240,12 @@ newTransaction(); dbSession = environment.get(DbSession.class); - descriptor = (StringDescriptor)dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); + descriptor = (StringDescriptor) dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); assertEquals("n", descriptor.getName()); assertEquals("s", descriptor.construct(null)); } - public void testTrueDescriptor() - { + public void testTrueDescriptor() { DbSession dbSession = environment.get(DbSession.class); TrueDescriptor descriptor = new TrueDescriptor(); @@ -267,14 +255,13 @@ newTransaction(); dbSession = environment.get(DbSession.class); - descriptor = (TrueDescriptor)dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); + descriptor = (TrueDescriptor) dbSession.get(AbstractDescriptor.class, descriptor.getDbid()); assertEquals("n", descriptor.getName()); assertEquals(Boolean.TRUE, descriptor.construct(null)); } - public void testRefDescriptor() - { - DbSession dbSession = (DbSession)environment.get(DbSession.class); + public void testRefDescriptor() { + DbSession dbSession = (DbSession) environment.get(DbSession.class); assertNotNull(dbSession); WireProperties configurations = new WireProperties(); @@ -293,7 +280,7 @@ newTransaction(); - dbSession = (DbSession)environment.get(DbSession.class); + dbSession = (DbSession) environment.get(DbSession.class); configurations = dbSession.get(WireProperties.class, configurations.getDbid()); @@ -304,9 +291,8 @@ /** * Check that list descriptors are persisted */ - public void testListDescriptor() - { - DbSession dbSession = (DbSession)environment.get(DbSession.class); + public void testListDescriptor() { + DbSession dbSession = (DbSession) environment.get(DbSession.class); assertNotNull(dbSession); StringDescriptor stringD = new StringDescriptor(); @@ -330,14 +316,14 @@ newTransaction(); - dbSession = (DbSession)environment.get(DbSession.class); + dbSession = (DbSession) environment.get(DbSession.class); - OpenProcessDefinition p = (OpenProcessDefinition)dbSession.get(ProcessDefinitionImpl.class, processDefinition.getDbid()); + OpenProcessDefinition p = (OpenProcessDefinition) dbSession.get(ProcessDefinitionImpl.class, processDefinition.getDbid()); assertNotNull(p); assertNotSame(processDefinition, p); - List<String> result = (List<String>)p.getProperty("list"); + List<String> result = (List<String>) p.getProperty("list"); assertNotNull(result); assertEquals(2, result.size()); assertEquals("value", result.get(0)); @@ -349,9 +335,8 @@ /** * Check that set descriptors are persisted */ - public void testSetDescriptor() - { - DbSession dbSession = (DbSession)environment.get(DbSession.class); + public void testSetDescriptor() { + DbSession dbSession = (DbSession) environment.get(DbSession.class); assertNotNull(dbSession); StringDescriptor stringD = new StringDescriptor(); @@ -375,14 +360,14 @@ newTransaction(); - dbSession = (DbSession)environment.get(DbSession.class); + dbSession = (DbSession) environment.get(DbSession.class); - OpenProcessDefinition p = (OpenProcessDefinition)dbSession.get(ProcessDefinitionImpl.class, processDefinition.getDbid()); + OpenProcessDefinition p = (OpenProcessDefinition) dbSession.get(ProcessDefinitionImpl.class, processDefinition.getDbid()); assertNotNull(p); assertNotSame(processDefinition, p); - Set<String> result = (Set<String>)p.getProperty("set"); + Set<String> result = (Set<String>) p.getProperty("set"); assertNotNull(result); assertTrue(result.contains("value")); assertTrue(result.contains("value2")); @@ -394,9 +379,8 @@ /** * Check that map descriptors are persisted */ - public void testMapDescriptor() - { - DbSession dbSession = (DbSession)environment.get(DbSession.class); + public void testMapDescriptor() { + DbSession dbSession = (DbSession) environment.get(DbSession.class); assertNotNull(dbSession); StringDescriptor keyD = new StringDescriptor(); @@ -431,14 +415,14 @@ newTransaction(); - dbSession = (DbSession)environment.get(DbSession.class); + dbSession = (DbSession) environment.get(DbSession.class); - OpenProcessDefinition p = (OpenProcessDefinition)dbSession.get(ProcessDefinitionImpl.class, processDefinition.getDbid()); + OpenProcessDefinition p = (OpenProcessDefinition) dbSession.get(ProcessDefinitionImpl.class, processDefinition.getDbid()); assertNotNull(p); assertNotSame(processDefinition, p); - Map<String, String> result = (Map<String, String>)p.getProperty("map"); + Map<String, String> result = (Map<String, String>) p.getProperty("map"); assertNotNull(result); assertEquals(2, result.size()); assertEquals("value", result.get("key")); @@ -450,9 +434,8 @@ /** * Check that map descriptors are persisted */ - public void testObjectDescriptor() - { - DbSession dbSession = (DbSession)environment.get(DbSession.class); + public void testObjectDescriptor() { + DbSession dbSession = (DbSession) environment.get(DbSession.class); assertNotNull(dbSession); ObjectDescriptor objDefault = new ObjectDescriptor(); @@ -483,16 +466,15 @@ objStaticMethod.addArgDescriptor(argStaticMethod); - OpenProcessDefinition processDefinition = ProcessFactory.build().property(objDefault).property(objConstr).property(objStaticMethod) - .node().initial().done(); + OpenProcessDefinition processDefinition = ProcessFactory.build().property(objDefault).property(objConstr).property(objStaticMethod).node().initial().done(); dbSession.save(processDefinition); newTransaction(); - dbSession = (DbSession)environment.get(DbSession.class); + dbSession = (DbSession) environment.get(DbSession.class); - OpenProcessDefinition p = (OpenProcessDefinition)dbSession.get(ProcessDefinitionImpl.class, processDefinition.getDbid()); + OpenProcessDefinition p = (OpenProcessDefinition) dbSession.get(ProcessDefinitionImpl.class, processDefinition.getDbid()); assertNotNull(p); assertNotSame(processDefinition, p); @@ -507,16 +489,15 @@ /** * Check that map descriptors are persisted */ - public void testFieldOperation() - { - DbSession dbSession = (DbSession)environment.get(DbSession.class); + public void testFieldOperation() { + DbSession dbSession = (DbSession) environment.get(DbSession.class); assertNotNull(dbSession); ObjectDescriptor objDescr = new ObjectDescriptor(VariableDefinitionImpl.class.getName()); objDescr.setName("object"); FieldOperation fieldOp = new FieldOperation(); - fieldOp.setFieldName("key"); + fieldOp.setFieldName("name"); StringDescriptor varNameDescriptor = new StringDescriptor(); varNameDescriptor.setValue("varName"); @@ -531,24 +512,23 @@ newTransaction(); - dbSession = (DbSession)environment.get(DbSession.class); + dbSession = (DbSession) environment.get(DbSession.class); - OpenProcessDefinition p = (OpenProcessDefinition)dbSession.get(ProcessDefinitionImpl.class, processDefinition.getDbid()); + OpenProcessDefinition p = (OpenProcessDefinition) dbSession.get(ProcessDefinitionImpl.class, processDefinition.getDbid()); assertNotNull(p); assertNotSame(processDefinition, p); assertNotNull(p.getProperty("object")); assertTrue(p.getProperty("object") instanceof VariableDefinitionImpl); - assertEquals("varName", ((VariableDefinitionImpl)p.getProperty("object")).getKey()); + assertEquals("varName", ((VariableDefinitionImpl) p.getProperty("object")).getName()); } /** * Check that map descriptors are persisted */ - public void testPropertyOperation() - { - DbSession dbSession = (DbSession)environment.get(DbSession.class); + public void testPropertyOperation() { + DbSession dbSession = (DbSession) environment.get(DbSession.class); assertNotNull(dbSession); ObjectDescriptor objDescr = new ObjectDescriptor(); @@ -556,7 +536,7 @@ objDescr.setClassName(VariableDefinitionImpl.class.getName()); PropertyOperation propertyOp = new PropertyOperation(); - propertyOp.setPropertyName("key"); + propertyOp.setPropertyName("name"); StringDescriptor varNameDescriptor = new StringDescriptor(); varNameDescriptor.setValue("varName"); @@ -571,15 +551,15 @@ newTransaction(); - dbSession = (DbSession)environment.get(DbSession.class); + dbSession = (DbSession) environment.get(DbSession.class); - OpenProcessDefinition p = (OpenProcessDefinition)dbSession.get(ProcessDefinitionImpl.class, processDefinition.getDbid()); + OpenProcessDefinition p = (OpenProcessDefinition) dbSession.get(ProcessDefinitionImpl.class, processDefinition.getDbid()); assertNotNull(p); assertNotSame(processDefinition, p); assertNotNull(p.getProperty("object")); assertTrue(p.getProperty("object") instanceof VariableDefinitionImpl); - assertEquals("varName", ((VariableDefinitionImpl)p.getProperty("object")).getKey()); + assertEquals("varName", ((VariableDefinitionImpl) p.getProperty("object")).getName()); } } Modified: jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -41,7 +41,7 @@ <job-test-helper /> <id-generator /> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/> Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -41,7 +41,7 @@ <job-test-helper /> <id-generator /> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/> 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-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -35,7 +35,7 @@ usage="nonstrict-read-write" /> </hibernate-configuration> <hibernate-session-factory /> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> </process-engine> <environment> 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-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -38,7 +38,7 @@ </hibernate-configuration> <hibernate-session-factory /> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/> 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-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -1,7 +1,7 @@ <jbpm-configuration> <process-engine> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> </process-engine> <environment> 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-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -15,7 +15,7 @@ </hibernate-configuration> <hibernate-session-factory /> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> </process-engine> 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-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -24,7 +24,7 @@ <hibernate-session-factory /> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> <!-- used in JobExecutorTest --> <list name="processedMessageIds" synchronized="true" /> 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-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -1,7 +1,7 @@ <jbpm-configuration> <process-engine> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> </process-engine> <environment> 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-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/variables/custom.types.jbpm.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -15,9 +15,9 @@ </hibernate-configuration> <hibernate-session-factory /> - <variable-types> + <types> <type name="date" class="java.util.Date" variable-class="org.jbpm.pvm.internal.type.variable.DateVariable" /> - </variable-types> + </types> </process-engine> <environment> Modified: jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -45,7 +45,7 @@ <!-- TODO reintroduce id-generator after lifecycle issue is fixed <id-generator /> --> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00" /> Modified: jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/test-db/src/main/resources/jbpm.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -52,7 +52,7 @@ <job-test-helper /> <id-generator /> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/> Modified: jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml 2009-01-16 09:49:14 UTC (rev 3658) +++ jbpm4/trunk/modules/test-load/src/test/resources/jbpm.cfg.xml 2009-01-16 10:07:28 UTC (rev 3659) @@ -44,7 +44,7 @@ <job-test-helper /> <id-generator /> - <variable-types resource="jbpm.pvm.types.xml" /> + <types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/>