[jbpm-commits] JBoss JBPM SVN: r3380 - in jbpm4/trunk/modules: jpdl/src/main/resources and 1 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-12-14 13:40:16 -0500 (Sun, 14 Dec 2008) New Revision: 3380 Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlBinding.java jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java Log: added hql activity example Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlBinding.java 2008-12-14 09:31:04 UTC (rev 3379) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/HqlBinding.java 2008-12-14 18:40:16 UTC (rev 3380) @@ -48,19 +48,20 @@ HqlActivity hqlActivity = new HqlActivity(); Element queryElement = XmlUtil.element(element, "query", true, parse); - if (queryElement==null) { + if (queryElement!=null) { String query = XmlUtil.getContentText(queryElement); hqlActivity.setQuery(query); } - if (XmlUtil.attributeBoolean(element, "unique", false, parse, Boolean.TRUE)) { + if (XmlUtil.attributeBoolean(element, "unique", false, parse, Boolean.FALSE)) { hqlActivity.setResultUnique(true); } String variableName = XmlUtil.attribute(element, "var", true, parse); hqlActivity.setResultVariableName(variableName); - List<Element> paramElements = XmlUtil.elements(element, "param"); + Element parametersElement = XmlUtil.element(element, "parameters"); + List<Element> paramElements = XmlUtil.elements(parametersElement); if (!paramElements.isEmpty()) { List<Descriptor> parametersDescriptor = new ArrayList<Descriptor>(); for (Element paramElement: paramElements) { Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2008-12-14 09:31:04 UTC (rev 3379) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2008-12-14 18:40:16 UTC (rev 3380) @@ -6,4 +6,5 @@ <activity binding="org.jbpm.jpdl.activity.EndBinding" /> <activity binding="org.jbpm.jpdl.activity.ForkBinding" /> <activity binding="org.jbpm.jpdl.activity.JoinBinding" /> + <activity binding="org.jbpm.jpdl.activity.HqlBinding" /> </activities> Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2008-12-14 09:31:04 UTC (rev 3379) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2008-12-14 18:40:16 UTC (rev 3380) @@ -19,8 +19,8 @@ <subclass name="org.jbpm.jpdl.activity.StartActivity" discriminator-value="start" /> <subclass name="org.jbpm.jpdl.activity.ExclusiveConditionActivity" discriminator-value="excl-cond" /> <subclass name="org.jbpm.jpdl.activity.ExclusiveExpressionActivity" discriminator-value="excl-expr"> - <property name="expr" column="EXPR_" /> - <property name="lang" column="LANG_" /> + <property name="expr" column="TEXT_" /> + <property name="lang" column="TEXT2_" /> </subclass> <subclass name="org.jbpm.jpdl.activity.ExclusiveHandlerActivity" discriminator-value="excl-handler"> <property name="exclusiveHandlerName" column="TEXT_" /> @@ -38,6 +38,17 @@ </subclass> <subclass name="org.jbpm.jpdl.activity.ForkActivity" discriminator-value="fork" /> <subclass name="org.jbpm.jpdl.activity.JoinActivity" discriminator-value="join" /> + <subclass name="org.jbpm.jpdl.activity.HqlActivity" discriminator-value="hql"> + <property name="query" column="TEXT_" /> + <property name="resultVariableName" column="TEXT2_" /> + <property name="isResultUnique" column="ISUNIQ_" /> + <many-to-one name="parametersDescriptor" + column="PARAMDESCR_" + cascade="all" + class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor" + foreign-key="FK_ACT_PARAMDESCR" + index="IDX_ACT_PARAMDESCR" /> + </subclass> </class> </hibernate-mapping> \ No newline at end of file Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java 2008-12-14 09:31:04 UTC (rev 3379) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java 2008-12-14 18:40:16 UTC (rev 3380) @@ -252,7 +252,9 @@ // add the descriptor WireDefinition wireDefinition = parse.findObject(WireDefinition.class); - wireDefinition.addDescriptor(descriptor); + if (wireDefinition!=null) { + wireDefinition.addDescriptor(descriptor); + } } return object; }