February 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r4052 - in jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples: end/multiple and 6 other directories.

by do-not-reply＠jboss.org

Author: koen.aers(a)jboss.com Date: 2009-02-26 09:31:06 -0500 (Thu, 26 Feb 2009) New Revision: 4052 Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/process.jpdl.xml Log: changes to process files in to make them compatible with 4.0.0.alpha2 version of gpd Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/process.jpdl.xml 2009-02-26 14:30:35 UTC (rev 4051) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/concurrency/graphbased/process.jpdl.xml 2009-02-26 14:31:06 UTC (rev 4052) @@ -7,21 +7,21 @@ </start> <fork name="fork" g="96,102,48,48"> - <transition to="send invoice" g="120,41"/> + <transition to="send invoice" g="120,41:"/> <transition to="load truck"/> - <transition to="print shipping documents" g="120,213"/> + <transition to="print shipping documents" g="120,213:"/> </fork> <state name="send invoice" g="176,16,149,52"> - <transition to="final join" g="606,41"/> + <transition to="final join" g="606,41:"/> </state> <state name="load truck" g="176,100,149,52"> - <transition to="shipping join" g="377,126"/> + <transition to="shipping join" g="377,126:"/> </state> <state name="print shipping documents" g="176,184,149,58"> - <transition to="shipping join" g="378,213"/> + <transition to="shipping join" g="378,213:"/> </state> <join name="shipping join" g="353,145,48,48"> @@ -29,7 +29,7 @@ </join> <state name="drive truck to destination" g="431,140,148,52"> - <transition to="final join" g="607,165"/> + <transition to="final join" g="607,165:"/> </state> <join name="final join" g="583,73,48,48"> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/process.jpdl.xml 2009-02-26 14:30:35 UTC (rev 4051) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/multiple/process.jpdl.xml 2009-02-26 14:31:06 UTC (rev 4052) @@ -3,17 +3,17 @@ <process name="EndMultiple" xmlns="http://jbpm.org/4/jpdl"> <start g="16,96,48,48"> - <transition to="get return code" /> + <transition to="get return code" name=""/> </start> - <state name="get return code" g="96,94,111,52"> - <transition name="200" to="ok" g="151,60" /> - <transition name="400" to="bad request" /> - <transition name="500" to="internal server error" g="151,183" /> + <state g="96,94,111,52" name="get return code"> + <transition g="151,60:-36,11" name="200" to="ok"/> + <transition g=":-16,-27" name="400" to="bad request"/> + <transition g="151,183:-33,-32" name="500" to="internal server error"/> </state> - <end name="ok" g="238,37,48,48" /> - <end name="bad request" g="238,98,48,48" /> - <end name="internal server error" g="240,160,48,48" /> + <end g="238,37,48,48" name="ok"/> + <end g="238,98,48,48" name="bad request"/> + <end g="240,160,48,48" name="internal server error"/> -</process> +</process> \ No newline at end of file Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/process.jpdl.xml 2009-02-26 14:30:35 UTC (rev 4051) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/end/state/process.jpdl.xml 2009-02-26 14:31:06 UTC (rev 4052) @@ -3,17 +3,17 @@ <process name="EndState" xmlns="http://jbpm.org/4/jpdl"> <start g="16,96,48,48"> - <transition to="get return code"/> + <transition to="get return code" name=""/> </start> - <state name="get return code" g="96,94,110,52"> - <transition name="200" to="ok" g="150,63"/> - <transition name="400" to="bad request" /> - <transition name="500" to="internal server error" g="150,177"/> + <state g="96,94,110,52" name="get return code"> + <transition g="150,63:-36,11" name="200" to="ok"/> + <transition g=":-16,-27" name="400" to="bad request"/> + <transition g="150,177:-33,-32" name="500" to="internal server error"/> </state> - <end name="ok" state="completed" g="239,40,48,48"/> - <end-cancel name="bad request" g="239,97,48,48"/> - <end-error name="internal server error" g="240,154,48,48"/> + <end g="239,40,48,48" name="ok" state="completed"/> + <end-cancel g="239,97,48,48" name="bad request"/> + <end-error g="240,154,48,48" name="internal server error"/> -</process> +</process> \ No newline at end of file Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/process.jpdl.xml 2009-02-26 14:30:35 UTC (rev 4051) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/conditions/process.jpdl.xml 2009-02-26 14:31:06 UTC (rev 4052) @@ -7,13 +7,13 @@ </start> <exclusive name="evaluate document" g="96,102,48,48"> - <transition to="submit document" g="120,60"> + <transition to="submit document" g="120,60:"> <condition expr="#{content=="good"}" /> </transition> <transition to="try again"> <condition expr="#{content=="bad"}" /> </transition> - <transition to="give up" g="120,189" /> + <transition to="give up" g="120,189:" /> </exclusive> <state name="submit document" g="175,35,122,52"/> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml 2009-02-26 14:30:35 UTC (rev 4051) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml 2009-02-26 14:31:06 UTC (rev 4052) @@ -1,19 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<process name="ExclusiveExpression" xmlns="http://jbpm.org/4/jpdl"> - - <start g="16,102,48,48"> - <transition to="evaluate document"/> - </start> - - <exclusive name="evaluate document" expr="#{content}" g="96,102,48,48"> - <transition name="good" to="submit document" g="120,60"/> - <transition name="bad" to="try again"/> - <transition name="ugly" to="give up" g="120,189"/> - </exclusive> - - <state name="submit document" g="175,35,122,52"/> - <state name="try again" g="176,100,122,52"/> - <state name="give up" g="177,164,122,52"/> - -</process> +<?xml version="1.0" encoding="UTF-8"?> + +<process name="ExclusiveExpression" xmlns="http://jbpm.org/4/jpdl"> + + <start g="16,102,48,48"> + <transition to="evaluate document" name=""/> + </start> + + <exclusive expr="#{content}" g="96,102,48,48" name="evaluate document"> + <transition g="120,60:-36,23" name="good" to="submit document"/> + <transition g=":-15,-21" name="bad" to="try again"/> + <transition g="120,189:-35,-41" name="ugly" to="give up"/> + </exclusive> + + <state g="175,35,122,52" name="submit document"/> + <state g="176,100,122,52" name="try again"/> + <state g="177,164,122,52" name="give up"/> + +</process> \ No newline at end of file Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml 2009-02-26 14:30:35 UTC (rev 4051) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml 2009-02-26 14:31:06 UTC (rev 4052) @@ -1,20 +1,20 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<process name="ExclusiveHandler" xmlns="http://jbpm.org/4/jpdl"> - - <start g="16,102,48,48"> - <transition to="evaluate document" /> - </start> - - <exclusive name="evaluate document" g="96,102,48,48"> - <handler class="org.jbpm.examples.exclusive.handler.ContentEvaluation" /> - <transition name="good" to="submit document" g="120,60" /> - <transition name="bad" to="try again" /> - <transition name="ugly" to="give up" g="120,189" /> - </exclusive> - - <state name="submit document" g="175,35,122,52"/> - <state name="try again" g="176,100,122,52"/> - <state name="give up" g="177,164,122,52"/> - -</process> +<?xml version="1.0" encoding="UTF-8"?> + +<process name="ExclusiveHandler" xmlns="http://jbpm.org/4/jpdl"> + + <start g="16,102,48,48"> + <transition to="evaluate document" name=""/> + </start> + + <exclusive g="96,102,48,48" name="evaluate document"> + <handler class="org.jbpm.examples.exclusive.handler.ContentEvaluation"/> + <transition g="120,60:-37,22" name="good" to="submit document"/> + <transition g=":-19,-22" name="bad" to="try again"/> + <transition g="120,189:-33,-39" name="ugly" to="give up"/> + </exclusive> + + <state g="175,35,122,52" name="submit document"/> + <state g="176,100,122,52" name="try again"/> + <state g="177,164,122,52" name="give up"/> + +</process> \ No newline at end of file Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml 2009-02-26 14:30:35 UTC (rev 4051) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/text/process.jpdl.xml 2009-02-26 14:31:06 UTC (rev 4052) @@ -3,7 +3,7 @@ <process name="ScriptText" xmlns="http://jbpm.org/4/jpdl"> <start g="16,22,80,40"> - <transition to="invoke script" g="48,68,48,48"/> + <transition to="invoke script" /> </start> <script name="invoke script" Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/process.jpdl.xml 2009-02-26 14:30:35 UTC (rev 4051) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/state/choice/process.jpdl.xml 2009-02-26 14:31:06 UTC (rev 4052) @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<process name="StateChoice" xmlns="http://jbpm.org/4/jpdl"> - - <start g="16,60,48,48"> - <transition to="wait for response" /> - </start> - - <state name="wait for response" g="96,58,109,52"> - <transition name="accept" to="submit document" g="151,41"/> - <transition name="reject" to="try again" g="151,125"/> - </state> - - <state name="submit document" g="237,16,114,52"/> - <state name="try again" g="237,100,114,52"/> - -</process> +<?xml version="1.0" encoding="UTF-8"?> + +<process name="StateChoice" xmlns="http://jbpm.org/4/jpdl"> + + <start g="16,60,48,48"> + <transition to="wait for response" name=""/> + </start> + + <state g="96,58,109,52" name="wait for response"> + <transition g="151,41:-48,0" name="accept" to="submit document"/> + <transition g="151,125:-47,-17" name="reject" to="try again"/> + </state> + + <state g="237,16,114,52" name="submit document"/> + <state g="237,100,114,52" name="try again"/> + +</process> \ No newline at end of file

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4051 - in jbpm4/branches/ainze/modules/spring: src and 21 other directories.

by do-not-reply＠jboss.org

Author: ainze Date: 2009-02-26 09:30:35 -0500 (Thu, 26 Feb 2009) New Revision: 4051 Added: jbpm4/branches/ainze/modules/spring/src/ jbpm4/branches/ainze/modules/spring/src/main/ jbpm4/branches/ainze/modules/spring/src/main/java/ jbpm4/branches/ainze/modules/spring/src/main/java/org/ jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/ jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/ jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/cfg/ jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/cfg/SpringConfigurationFactoryBean.java jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/test/ jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/test/AbstractTransactionalSpringJbpmTestCase.java jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/test/ jbpm4/branches/ainze/modules/spring/src/main/resources/ jbpm4/branches/ainze/modules/spring/src/test/ jbpm4/branches/ainze/modules/spring/src/test/java/ jbpm4/branches/ainze/modules/spring/src/test/java/org/ jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/ jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/ jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/ jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/ jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/ExclusiveTest.java jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/StateTest.java jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/beans/ jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/beans/InvokeTestBean.java jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/beans/SpringBeanTest.java jbpm4/branches/ainze/modules/spring/src/test/resources/ jbpm4/branches/ainze/modules/spring/src/test/resources/org/ jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/ jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/ jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/ jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/applicationContext.xml jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/beans/ jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/beans/process.jpdl.xml jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/jbpm.cfg.xml Log: initial spring integration Added: jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/cfg/SpringConfigurationFactoryBean.java =================================================================== --- jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/cfg/SpringConfigurationFactoryBean.java (rev 0) +++ jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/cfg/SpringConfigurationFactoryBean.java 2009-02-26 14:30:35 UTC (rev 4051) @@ -0,0 +1,66 @@ +/** + * + */ +package org.jbpm.spring.cfg; + +import org.hibernate.SessionFactory; +import org.jbpm.pvm.internal.cfg.SpringConfiguration; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.FactoryBean; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; + +/** + * Factory that creates a singleton SpringConfiguration. + * + * @author Andries Inze + * + */ +public class SpringConfigurationFactoryBean implements FactoryBean, ApplicationContextAware { + + private String jbpmConfigurationLocation; + private SessionFactory sessionFactory; + + private ApplicationContext applicationContext; + + public Object getObject() throws Exception { + SpringConfiguration result = new SpringConfiguration(jbpmConfigurationLocation); + result.setApplicationContext(applicationContext); + result.setSessionFactory(sessionFactory); + return result; + } + + /** + * {@inheritDoc) + */ + @SuppressWarnings("unchecked") + public Class getObjectType() { + return SpringConfiguration.class; + } + + /** + * {@inheritDoc) + */ + public boolean isSingleton() { + return true; + } + + /** + * @param jbpmConfigurationLocation the jbpmConfigurationLocation to set + */ + public void setJbpmConfigurationLocation(String jbpmConfigurationLocation) { + this.jbpmConfigurationLocation = jbpmConfigurationLocation; + } + + /** + * @param sessionFactory the sessionFactory to set + */ + public void setSessionFactory(SessionFactory sessionFactory) { + this.sessionFactory = sessionFactory; + } + + public void setApplicationContext(ApplicationContext applicationContext) + throws BeansException { + this.applicationContext = applicationContext; + } +} Property changes on: jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/cfg/SpringConfigurationFactoryBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/test/AbstractTransactionalSpringJbpmTestCase.java =================================================================== --- jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/test/AbstractTransactionalSpringJbpmTestCase.java (rev 0) +++ jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/test/AbstractTransactionalSpringJbpmTestCase.java 2009-02-26 14:30:35 UTC (rev 4051) @@ -0,0 +1,59 @@ +/** + * + */ +package org.jbpm.spring.test; + +import java.util.List; + +import org.jbpm.Configuration; +import org.jbpm.ExecutionService; +import org.jbpm.ManagementService; +import org.jbpm.ProcessDefinition; +import org.jbpm.ProcessEngine; +import org.jbpm.ProcessService; +import org.jbpm.TaskService; +import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; + +/** + * Abstract test class that - builds the application context - runs in 1 + * transaction - adds convenience methods: e.g. deploying a process. + * + * @author Andries Inze + * + */ +public abstract class AbstractTransactionalSpringJbpmTestCase extends + AbstractTransactionalDataSourceSpringContextTests { + + private Configuration configuration; + private ProcessEngine processEngine; + + protected ExecutionService executionService; + protected ProcessService processService; + protected TaskService taskService; + protected ManagementService managementService; + protected List<String> taskIds; + + /** + * {@inheritDoc) + */ + protected void injectDependencies() throws Exception { + super.injectDependencies(); + configuration = (Configuration) applicationContext + .getBean("configuration"); + processEngine = configuration.buildProcessEngine(); + executionService = processEngine.getExecutionService(); + processService = processEngine.getProcessService(); + taskService = processEngine.getTaskService(); + managementService = processEngine.getManagementService(); + } + + public void deployJpdlXmlString(String jpdlXmlString) { + processService.createDeployment().addString("xmlstring.jpdl.xml", + jpdlXmlString).deploy().getProcessDefinitions(); + } + + public void deployJpdlResource(String resource) { + processService.createDeployment().addResource(resource).deploy() + .getProcessDefinitions(); + } +} Property changes on: jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/test/AbstractTransactionalSpringJbpmTestCase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/ExclusiveTest.java =================================================================== --- jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/ExclusiveTest.java (rev 0) +++ jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/ExclusiveTest.java 2009-02-26 14:30:35 UTC (rev 4051) @@ -0,0 +1,102 @@ +/* + * 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.spring.test.activities; + +import java.util.HashMap; +import java.util.Map; + +import org.jbpm.Execution; +import org.jbpm.spring.test.AbstractTransactionalSpringJbpmTestCase; + + +/** + * @author Tom Baeyens + */ +public class ExclusiveTest extends AbstractTransactionalSpringJbpmTestCase { + + + @Override + protected String[] getConfigLocations() { + return new String[]{"org/jbpm/spring/test/applicationContext.xml"}; + } + + public void testExclusiveExpression() { + deployJpdlXmlString( + "<process name='Poolcar'>" + + " <start>" + + " <transition to='How far?' />" + + " </start>" + + " <exclusive name='How far?' expr='#{distance}'>" + + " <transition name='far' to='Big car' />" + + " <transition name='nearby' to='Small car' />" + + " </exclusive>" + + " <state name='Big car' />" + + " <state name='Small car' />" + + "</process>" + ); + + Map<String, Object> variables = new HashMap<String, Object>(); + variables.put("distance", "far"); + Execution execution = executionService.startProcessInstanceByKey("Poolcar", variables); + assertEquals("Big car", execution.getActivityName()); + + variables.put("distance", "nearby"); + execution = executionService.startProcessInstanceByKey("Poolcar", variables); + assertEquals("Small car", execution.getActivityName()); + } + + public void testExclusiveWithConditions() { + deployJpdlXmlString( + "<process name='Poolcar'>" + + " <start>" + + " <transition to='How far?' />" + + " </start>" + + " <exclusive name='How far?'>" + + " <transition to='Big car'>" + + " <condition expr='#{distance > 10}' />" + + " </transition>" + + " <transition to='Small car'>" + + " <condition expr='#{distance >= 3}' />" + + " </transition>" + + " <transition to='No car' />" + + " </exclusive>" + + " <state name='Big car' />" + + " <state name='Small car' />" + + " <state name='No car' />" + + "</process>" + ); + + Map<String, Object> variables = new HashMap<String, Object>(); + variables.put("distance", new Integer(69)); + Execution execution = executionService.startProcessInstanceByKey("Poolcar", variables); + assertEquals("Big car", execution.getActivityName()); + + variables.put("distance", new Integer(6)); + execution = executionService.startProcessInstanceByKey("Poolcar", variables); + assertEquals("Small car", execution.getActivityName()); + + variables.put("distance", new Integer(2)); + execution = executionService.startProcessInstanceByKey("Poolcar", variables); + assertEquals("No car", execution.getActivityName()); + } + +} Property changes on: jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/ExclusiveTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/StateTest.java =================================================================== --- jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/StateTest.java (rev 0) +++ jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/StateTest.java 2009-02-26 14:30:35 UTC (rev 4051) @@ -0,0 +1,44 @@ +/** + * + */ +package org.jbpm.spring.test.activities; + +import org.jbpm.Execution; +import org.jbpm.spring.test.AbstractTransactionalSpringJbpmTestCase; + +/** + * @author AIEXM45 + * + */ +public class StateTest extends AbstractTransactionalSpringJbpmTestCase { + + /** + * {@inheritDoc) + */ + @Override + protected String[] getConfigLocations() { + return new String[]{"org/jbpm/spring/test/applicationContext.xml"}; + } + + public void testWaitStatesSequence() { + deployJpdlXmlString("<process name='ThreeStates'>" + + " <start name='a'>" + " <transition to='b' />" + " </start>" + + " <state name='b'>" + " <transition to='c' />" + " </state>" + + " <state name='c'>" + " <transition to='d' />" + " </state>" + + " <end name='d' />" + "</process>"); + + Execution execution = executionService + .startProcessInstanceById("ThreeStates:1"); + assertEquals("b", execution.getActivityName()); + + String executionId = execution.getId(); + execution = executionService.signalExecutionById(executionId); + assertEquals("c", execution.getActivityName()); + + execution = executionService.signalExecutionById(executionId); + assertEquals("d", execution.getActivityName()); + assertTrue(execution.isEnded()); + } + + +} Property changes on: jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/StateTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/beans/InvokeTestBean.java =================================================================== --- jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/beans/InvokeTestBean.java (rev 0) +++ jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/beans/InvokeTestBean.java 2009-02-26 14:30:35 UTC (rev 4051) @@ -0,0 +1,54 @@ +/** + * + */ +package org.jbpm.spring.test.beans; + +import org.jbpm.jpdl.ExclusiveHandler; +import org.jbpm.model.OpenExecution; + +/** + * @author Andries Inze + * + */ +public class InvokeTestBean implements ExclusiveHandler { + + private boolean testMethodHasRun; + private boolean testMethodWithParametersHasRun; + private boolean testSelectHasRun; + + public void testMethod() { + testMethodHasRun = true; + } + + public void testMethodWithParameters(String name) { + if ("a good test".equals(name)) { + testMethodWithParametersHasRun = true; + } + } + + public String select(OpenExecution execution) { + testSelectHasRun = true; + return "yes"; + } + + /** + * @return the testMethodHasRun + */ + public boolean isTestMethodHasRun() { + return testMethodHasRun; + } + + /** + * @return the testMethodWithParametersHasRun + */ + public boolean isTestMethodWithParametersHasRun() { + return testMethodWithParametersHasRun; + } + + /** + * @return the testSelectHasRun + */ + public boolean isTestSelectHasRun() { + return testSelectHasRun; + } +} Property changes on: jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/beans/InvokeTestBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/beans/SpringBeanTest.java =================================================================== --- jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/beans/SpringBeanTest.java (rev 0) +++ jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/beans/SpringBeanTest.java 2009-02-26 14:30:35 UTC (rev 4051) @@ -0,0 +1,35 @@ +/** + * + */ +package org.jbpm.spring.test.beans; + +import org.jbpm.Execution; +import org.jbpm.spring.test.AbstractTransactionalSpringJbpmTestCase; + +/** + * @author AIEXM45 + * + */ +public class SpringBeanTest extends AbstractTransactionalSpringJbpmTestCase { + + /** + * {@inheritDoc) + */ + @Override + protected String[] getConfigLocations() { + return new String[]{"org/jbpm/spring/test/applicationContext.xml"}; + } + + public void testInvokeSpringBean() { + deployJpdlResource("org/jbpm/spring/test/beans/process.jpdl.xml"); + + InvokeTestBean invokeTestBean = (InvokeTestBean) applicationContext.getBean("testBean"); + + Execution execution = executionService + .startProcessInstanceByKey("Spring"); + assertEquals("wait", execution.getActivityName()); + assertTrue(invokeTestBean.isTestMethodHasRun()); + assertTrue(invokeTestBean.isTestMethodWithParametersHasRun()); + assertTrue(invokeTestBean.isTestSelectHasRun()); + } +} Property changes on: jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/beans/SpringBeanTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/applicationContext.xml =================================================================== --- jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/applicationContext.xml (rev 0) +++ jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/applicationContext.xml 2009-02-26 14:30:35 UTC (rev 4051) @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:aop="http://www.springframework.org/schema/aop" + xmlns:context="http://www.springframework.org/schema/context" + xmlns:tx="http://www.springframework.org/schema/tx" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd"> + + <bean id="configuration" class="org.jbpm.spring.cfg.SpringConfigurationFactoryBean"> + <property name="jbpmConfigurationLocation" value="org/jbpm/spring/test/jbpm.cfg.xml" /> + <property name="sessionFactory" ref="sessionFactory" /> + </bean> + + + <bean id="sessionFactory" + class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"> + <property name="dataSource" ref="dataSource" /> + <property name="mappingResources"> + <list> + <value>jbpm.pvm.typedefs.hbm.xml</value> + <value>jbpm.pvm.wire.hbm.xml</value> + <value>jbpm.pvm.definition.hbm.xml</value> + <value>jbpm.pvm.execution.hbm.xml</value> + <value>jbpm.pvm.variable.hbm.xml</value> + <value>jbpm.pvm.history.hbm.xml</value> + <value>jbpm.pvm.job.hbm.xml</value> + <value>jbpm.jpdl.hbm.xml</value> + <value>jbpm.task.hbm.xml</value> + </list> + </property> + <property name="hibernateProperties"> + <props> + <prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop> + <prop key="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</prop> + <prop key="hibernate.cache.use_second_level_cache">true</prop> + <prop key="hibernate.hbm2ddl.auto">create-drop</prop> + <prop key="hibernate.bytecode.use_reflection_optimizer">false</prop> + </props> + </property> + <property name="entityCacheStrategies"> + <props> + <prop key="org.jbpm.pvm.internal.model.ProcessDefinitionImpl">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ActivityImpl">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.TransitionImpl">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.EventImpl">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ExceptionHandlerImpl">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ObjectReference">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.VariableDefinitionImpl">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.TimerDefinitionImpl">read-write</prop> + <prop key="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor">read-write</prop> + </props> + </property> + <property name="collectionCacheStrategies"> + <props> + <prop key="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.exceptionHandlers">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.events">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.activities">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.variableDefinitions">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.timerDefinitions">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ActivityImpl.exceptionHandlers">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ActivityImpl.events">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ActivityImpl.activities">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ActivityImpl.variableDefinitions">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ActivityImpl.timerDefinitions">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ActivityImpl.incomingTransitions">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ActivityImpl.outgoingTransitions">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.TransitionImpl.exceptionHandlers">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.TransitionImpl.events">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.EventImpl.exceptionHandlers">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.EventImpl.listenerReferences">read-write</prop> + <prop key="org.jbpm.pvm.internal.model.ExceptionHandlerImpl.eventListenerReferences">read-write</prop> + <prop key="org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor.argDescriptors">read-write</prop> + <prop key="org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor.operations">read-write</prop> + </props> + </property> + </bean> + + <bean id="transactionManager" + class="org.springframework.orm.hibernate3.HibernateTransactionManager" + scope="singleton"> + <property name="sessionFactory" ref="sessionFactory" /> + </bean> + + <bean id="dataSource" + class="org.springframework.jdbc.datasource.DriverManagerDataSource"> + <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> + <property name="url" value="jdbc:hsqldb:mem:." /> + <property name="username" value="sa" /> + <property name="password" value="" /> + </bean> + + <bean id="testBean" class="org.jbpm.spring.test.beans.InvokeTestBean" /> + +</beans> \ No newline at end of file Property changes on: jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/applicationContext.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/beans/process.jpdl.xml =================================================================== --- jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/beans/process.jpdl.xml (rev 0) +++ jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/beans/process.jpdl.xml 2009-02-26 14:30:35 UTC (rev 4051) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process name="Spring"> + + <start> + <transition to="test" /> + </start> + + <spring name="test"> + <bean>testBean</bean> + <method>testMethod</method> + <transition to="testWithParameters" /> + </spring> + + <spring name="testWithParameters"> + <bean>testBean</bean> + <method>testMethodWithParameters</method> + <parameters> + <string value="a good test" /> + </parameters> + <transition to="exclusive spring test" /> + </spring> + + <exclusive name="exclusive spring test" handler-ref="testBean"> + <transition name="no" to="wait" /> + <transition name="yes" to="wait" /> + </exclusive> + + <state name="wait" /> + +</process> Property changes on: jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/beans/process.jpdl.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/jbpm.cfg.xml =================================================================== --- jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/jbpm.cfg.xml (rev 0) +++ jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/jbpm.cfg.xml 2009-02-26 14:30:35 UTC (rev 4051) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <deployer-manager> + <assign-file-type> + <file extension=".jpdl.xml" type="jpdl" /> + </assign-file-type> + <parse-jpdl /> + <check-process /> + <check-problems /> + <save /> + </deployer-manager> + + <process-service /> + <execution-service /> + <history-service /> + <management-service /> + <task-service /> + + <command-service> + <retry-interceptor /> + <environment-interceptor /> + +  +  + + </command-service> + + <script-manager default-expression-language="juel" + default-script-language="juel" + read-contexts="execution, environment, process-engine" + write-context=""> + <script-language name="juel" factory="com.sun.script.juel.JuelScriptEngineFactory" /> + </script-manager> + + <job-executor auto-start="false" /> + <job-test-helper /> + + <id-generator /> + <types resource="jbpm.pvm.types.xml" /> + + <business-calendar> + <monday hours="9:00-12:00 and 12:30-17:00"/> + <tuesday hours="9:00-12:00 and 12:30-17:00"/> + <wednesday hours="9:00-12:00 and 12:30-17:00"/> + <thursday hours="9:00-12:00 and 12:30-17:00"/> + <friday hours="9:00-12:00 and 12:30-17:00"/> + <holiday period="01/07/2008 - 31/08/2008"/> + </business-calendar> + + </process-engine-context> + + <transaction-context> +  + <hibernate-session current="true" /> + + <transaction /> + <pvm-db-session /> + <job-db-session /> + <task-db-session /> + <message-session /> + <timer-session /> + <history-session /> + </transaction-context> + + +</jbpm-configuration> Property changes on: jbpm4/branches/ainze/modules/spring/src/test/resources/org/jbpm/spring/test/jbpm.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4050 - in jbpm4/branches/ainze/modules: spring and 1 other directory.

by do-not-reply＠jboss.org

Author: ainze Date: 2009-02-26 09:30:04 -0500 (Thu, 26 Feb 2009) New Revision: 4050 Added: jbpm4/branches/ainze/modules/spring/ jbpm4/branches/ainze/modules/spring/pom.xml Log: initial spring integration Added: jbpm4/branches/ainze/modules/spring/pom.xml =================================================================== --- jbpm4/branches/ainze/modules/spring/pom.xml (rev 0) +++ jbpm4/branches/ainze/modules/spring/pom.xml 2009-02-26 14:30:04 UTC (rev 4050) @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>jBPM 4 - Spring</name> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-spring</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + +  + <dependencies> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-api</artifactId> + <version>${version}</version> + </dependency> + + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-base</artifactId> + <version>${version}</version> + </dependency> + + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-pvm</artifactId> + <version>${version}</version> + </dependency> + + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring</artifactId> + <version>2.5.4</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>2.5.4</version> + </dependency> + + </dependencies> + +  + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <testSourceDirectory> + src/main/java + </testSourceDirectory> + <classesDirectory>target/classes</classesDirectory> + <testClassesDirectory> + target/classes + </testClassesDirectory> + </configuration> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Property changes on: jbpm4/branches/ainze/modules/spring/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4049 - in jbpm4/branches/ainze/modules: jpdl/src/main/java/org/jbpm/jpdl/internal/activity and 3 other directories.

by do-not-reply＠jboss.org

Author: ainze Date: 2009-02-26 09:29:20 -0500 (Thu, 26 Feb 2009) New Revision: 4049 Added: jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanActivity.java jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanBinding.java jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/SpringPvmEnvironment.java Modified: jbpm4/branches/ainze/modules/jpdl/pom.xml jbpm4/branches/ainze/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml jbpm4/branches/ainze/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java Log: initial spring integration Modified: jbpm4/branches/ainze/modules/jpdl/pom.xml =================================================================== --- jbpm4/branches/ainze/modules/jpdl/pom.xml 2009-02-26 13:40:29 UTC (rev 4048) +++ jbpm4/branches/ainze/modules/jpdl/pom.xml 2009-02-26 14:29:20 UTC (rev 4049) @@ -63,6 +63,11 @@ </exclusions> <scope>provided</scope> </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.0</version> + </dependency> </dependencies>  Added: jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanActivity.java =================================================================== --- jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanActivity.java (rev 0) +++ jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanActivity.java 2009-02-26 14:29:20 UTC (rev 4049) @@ -0,0 +1,133 @@ +/* + * 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.jpdl.internal.activity; + +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.beanutils.MethodUtils; +import org.jbpm.JbpmException; +import org.jbpm.activity.ActivityExecution; +import org.jbpm.env.Environment; +import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.SpringPvmEnvironment; +import org.jbpm.pvm.internal.wire.Descriptor; +import org.jbpm.pvm.internal.wire.WireContext; +import org.jbpm.pvm.internal.wire.descriptor.ListDescriptor; + +/** + * @author Andries Inze + */ +public class SpringBeanActivity extends JpdlActivity { + + @SuppressWarnings("unused") + private static final Log LOG = Log.getLog(SpringBeanActivity.class + .getName()); + + private static final long serialVersionUID = 1L; + + private String beanName; + private String methodName; + private ListDescriptor parametersListDescriptor; + private String resultVariableName; + + public void execute(ActivityExecution execution) { + Environment environment = Environment.getCurrent(); + + if (!(environment instanceof SpringPvmEnvironment)) { + throw new JbpmException("No spring environment is defined, " + + "which is needed for the " + SpringBeanBinding.TAG); + } + + if (environment == null) { + throw new JbpmException("no environment for jpdl activity " + + SpringBeanBinding.TAG); + } + + if (beanName == null || beanName.equals("")) { + throw new JbpmException("No beanName was specified!"); + } + + SpringPvmEnvironment springEnvironment = (SpringPvmEnvironment) environment; + Object o = springEnvironment.get(beanName); + + if (o == null) { + throw new JbpmException("No bean could be found in the applicationContext with name " + beanName); + } + + + List<Object> parameters = new ArrayList<Object>(); + if (parametersListDescriptor!=null) { + for (Descriptor valueDescriptor : parametersListDescriptor + .getValueDescriptors()) { + String parameterName = valueDescriptor.getName(); + Object value = WireContext.create(valueDescriptor); + parameters.add(value); + } + } + + Object result; + try { + result = MethodUtils.invokeMethod(o, methodName, parameters.toArray()); + } catch (NoSuchMethodException e) { + throw new JbpmException("No method found with beanName: " + beanName + ", methodName=" + methodName + " and parameters=" + parameters); + } catch (IllegalAccessException e) { + throw new JbpmException("Illegal access with beanName: " + beanName + ", methodName=" + methodName + " and parameters=" + parameters); + } catch (InvocationTargetException e) { + throw new JbpmException("InvocationTargetException with beanName: " + beanName + ", methodName=" + methodName + " and parameters=" + parameters); + } + + execution.setVariable(resultVariableName, result); + + execution.historyAutomatic(); + } + + public void setResultVariableName(String resultVariableName) { + this.resultVariableName = resultVariableName; + } + + /** + * @param beanName + * the beanName to set + */ + public void setBeanName(String beanName) { + this.beanName = beanName; + } + + /** + * @param methodName + * the methodName to set + */ + public void setMethodName(String methodName) { + this.methodName = methodName; + } + + /** + * @param parametersListDescriptor + * the parametersListDescriptor to set + */ + public void setParametersListDescriptor( + ListDescriptor parametersListDescriptor) { + this.parametersListDescriptor = parametersListDescriptor; + } +} Property changes on: jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanActivity.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanBinding.java =================================================================== --- jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanBinding.java (rev 0) +++ jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanBinding.java 2009-02-26 14:29:20 UTC (rev 4049) @@ -0,0 +1,120 @@ +/* + * 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.jpdl.internal.activity; + +import java.util.ArrayList; +import java.util.List; + +import org.jbpm.pvm.internal.util.XmlUtil; +import org.jbpm.pvm.internal.wire.Descriptor; +import org.jbpm.pvm.internal.wire.descriptor.ListDescriptor; +import org.jbpm.pvm.internal.wire.xml.WireParser; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.Element; + +/** + * @author Andries Inze + */ +public class SpringBeanBinding extends JpdlActivityBinding { + + public static final String TAG = "spring"; + + public SpringBeanBinding() { + super(TAG); + } + + protected SpringBeanBinding(String tagName) { + super(tagName); + } + + public Object parse(Element element, Parse parse, Parser parser) { + SpringBeanActivity springActivity = createSpringBeanActivity(); + + Element beanElement = XmlUtil.element(element, "bean", true, parse); + if (beanElement != null) { + String bean = XmlUtil.getContentText(beanElement); + springActivity.setBeanName(bean); + } + + Element methodElement = XmlUtil.element(element, "method", true, parse); + if (beanElement != null) { + String method = XmlUtil.getContentText(methodElement); + springActivity.setMethodName(method); + } + + 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) { + WireParser wireParser = WireParser.getInstance(); + Descriptor paramDescriptor = (Descriptor) wireParser.parseElement(paramElement, parse, WireParser.CATEGORY_DESCRIPTOR); + parametersDescriptor.add(paramDescriptor); + } + + ListDescriptor parametersListDescriptor = new ListDescriptor(); + parametersListDescriptor.setValueDescriptors(parametersDescriptor); + springActivity.setParametersListDescriptor(parametersListDescriptor); + } + + // HqlActivity hqlActivity = createHqlActivity(); + // + // Element queryElement = XmlUtil.element(element, "query", true, + // parse); + // if (queryElement!=null) { + // String query = XmlUtil.getContentText(queryElement); + // hqlActivity.setQuery(query); + // } + // + // if (XmlUtil.attributeBoolean(element, "unique", false, parse, + // Boolean.FALSE)) { + // hqlActivity.setResultUnique(true); + // } + // + // String variableName = XmlUtil.attribute(element, "var", true, parse); + // hqlActivity.setResultVariableName(variableName); + // + // 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) { + // WireParser wireParser = WireParser.getInstance(); + // Descriptor paramDescriptor = (Descriptor) + // wireParser.parseElement(paramElement, parse, + // WireParser.CATEGORY_DESCRIPTOR); + // parametersDescriptor.add(paramDescriptor); + // } + // + // ListDescriptor parametersListDescriptor = new ListDescriptor(); + // parametersListDescriptor.setValueDescriptors(parametersDescriptor); + // hqlActivity.setParametersDescriptor(parametersListDescriptor); + // } + // + return springActivity; + } + + protected SpringBeanActivity createSpringBeanActivity() { + return new SpringBeanActivity(); + } +} Property changes on: jbpm4/branches/ainze/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SpringBeanBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/branches/ainze/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/branches/ainze/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2009-02-26 13:40:29 UTC (rev 4048) +++ jbpm4/branches/ainze/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2009-02-26 14:29:20 UTC (rev 4049) @@ -14,4 +14,5 @@ <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.SpringBeanBinding" /> </activities> Modified: jbpm4/branches/ainze/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/branches/ainze/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2009-02-26 13:40:29 UTC (rev 4048) +++ jbpm4/branches/ainze/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2009-02-26 14:29:20 UTC (rev 4049) @@ -85,6 +85,7 @@ <subclass name="org.jbpm.jpdl.internal.activity.TaskActivity" discriminator-value="task"> <property name="assignee" column="TEXT_" /> </subclass> + <subclass name="org.jbpm.jpdl.internal.activity.SpringBeanActivity" discriminator-value="spring" /> </class> </hibernate-mapping> \ No newline at end of file Modified: jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java =================================================================== --- jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java 2009-02-26 13:40:29 UTC (rev 4048) +++ jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java 2009-02-26 14:29:20 UTC (rev 4049) @@ -21,78 +21,113 @@ */ package org.jbpm.pvm.internal.cfg; -import java.util.HashSet; -import java.util.Set; +import java.io.IOException; +import org.hibernate.SessionFactory; +import org.jbpm.ProcessEngine; +import org.jbpm.env.Context; +import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.env.SpringPvmEnvironment; import org.jbpm.pvm.internal.spring.SpringEnvironment; -import org.jbpm.pvm.internal.util.ReflectUtil; +import org.jbpm.pvm.internal.wire.WireContext; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; +import org.springframework.core.io.ClassPathResource; -/** this environment factory will see only the singleton beans. +/** + * this environment factory will see only the singleton beans. * - * The created {@link SpringEnvironment}s will see the prototype - * beans and it will cache them. - * - * @author Tom Baeyens + * The created {@link SpringEnvironment}s will see the prototype beans and it + * will cache them. + * + * @author Andries Inze */ -public class SpringConfiguration implements EnvironmentFactory, ApplicationContextAware { - - // TODO pull up the common behaviour between this class and the SpringEnvironmentContext - - private static final long serialVersionUID = 1L; - - ApplicationContext applicationContext; - - public SpringEnvironment openEnvironment() { - return new SpringEnvironment(this); - } +public class SpringConfiguration extends JbpmConfiguration implements + EnvironmentFactory, ProcessEngine, ApplicationContextAware { - public boolean has(String key) { - return applicationContext.isSingleton(key); - } + private static final long serialVersionUID = 1L; - public Object get(String key) { - if (has(key)) { - return applicationContext.getBean(key); - } - return null; - } + private ApplicationContext applicationContext; - public <T> T get(Class<T> type) { - String name = ReflectUtil.getUnqualifiedClassName(type); - name = name.substring(0, 1).toLowerCase() + name.substring(1); - return (T) get(name); - } + private SessionFactory sessionFactory; - public Set<String> keys() { - HashSet<String> keys = new HashSet<String>(); - for (String key : applicationContext.getBeanDefinitionNames()) { - if (has(key)) { - keys.add(key); - } - } - return keys; - } - - public ApplicationContext getApplicationContext() { - return applicationContext; - } + /** + * Instantiates a new spring configuration. + */ + public SpringConfiguration(String jbpmConfigurationLocation) { + super(); + try { + super.setInputStream(new ClassPathResource( + jbpmConfigurationLocation).getInputStream()); + } catch (IOException e) { + throw new RuntimeException(e); + } + super.buildProcessEngine(); + } - public void setApplicationContext(ApplicationContext applicationContext) { - this.applicationContext = applicationContext; - } + /** + * {@inheritDoc) + */ + @Override + public Environment openEnvironment() { + SpringPvmEnvironment environment = new SpringPvmEnvironment(this, applicationContext); + environment.setSessionFactory(sessionFactory); - - public void close() { - } + // FIXME: All beneath should be a super call - public String getName() { - return null; - } + // set the classloader + ClassLoader classLoader = environmentFactoryCtxWireContext + .getClassLoader(); + if (classLoader != null) { + environment.setClassLoader(classLoader); + } - public Object set(String key, Object value) { - return null; - } + // add the process-engine context + environment.addContext(environmentFactoryCtxWireContext); + + // add the environment block context + WireContext environmentContext = new WireContext(environmentCtxWireDefinition, Context.CONTEXTNAME_TRANSACTION, environment, true); + // add the environment block context to the environment + environment.addContext(environmentContext); + + Environment.pushEnvironment(environment); + try { + // finish the creation of the environment wire context + environmentContext.create(); + + } catch (RuntimeException e) { + Environment.popEnvironment(); + throw e; + } + + // if all went well, return the created environment + return environment; + } + + /** + * {@inheritDoc) + */ + public void setApplicationContext(ApplicationContext applicationContext) { + this.applicationContext = applicationContext; + } + + /** + * Gets the application context. + * + * @return the application context + */ + public ApplicationContext getApplicationContext() { + return applicationContext; + } + + /** + * Sets the session factory. + * + * @param sessionFactory + * the new session factory + */ + public void setSessionFactory(SessionFactory sessionFactory) { + this.sessionFactory = sessionFactory; + } } Added: jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/SpringPvmEnvironment.java =================================================================== --- jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/SpringPvmEnvironment.java (rev 0) +++ jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/SpringPvmEnvironment.java 2009-02-26 14:29:20 UTC (rev 4049) @@ -0,0 +1,64 @@ +package org.jbpm.pvm.internal.env; + +import org.hibernate.SessionFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; +import org.springframework.context.ApplicationContext; + +/** + * The Spring environment resolves beans from the Spring applicationContext. + * + * + * @author Andries Inze + */ +public class SpringPvmEnvironment extends PvmEnvironment { + + /** Needed for serialization. */ + private static final long serialVersionUID = 6616989989982030327L; + + private SessionFactory sessionFactory; + + private ApplicationContext applicationContext; + + public SpringPvmEnvironment(JbpmConfiguration jbpmConfiguration, ApplicationContext applicationContext) { + super(jbpmConfiguration); + this.applicationContext = applicationContext; + } + + @SuppressWarnings("unchecked") + @Override + public <T> T get(Class<T> type) { + if (sessionFactory != null && type.equals(SessionFactory.class)) { + return (T) sessionFactory; + } + return super.get(type); + } + + + + /** + * {@inheritDoc) + */ + @Override + public Object get(String name) { + if (applicationContext.containsBean(name)) { + return applicationContext.getBean(name); + } + return super.get(name); + } + + /** + * Sets the session factory. + * + * @param sessionFactory the new session factory + */ + public void setSessionFactory(SessionFactory sessionFactory) { + this.sessionFactory = sessionFactory; + } + + /** + * @param applicationContext the applicationContext to set + */ + public void setApplicationContext(ApplicationContext applicationContext) { + this.applicationContext = applicationContext; + } +} \ No newline at end of file Property changes on: jbpm4/branches/ainze/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/SpringPvmEnvironment.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4048 - jbpm4/tags/jbpm-4.0.0.Alpha2.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-26 08:40:29 -0500 (Thu, 26 Feb 2009) New Revision: 4048 Modified: jbpm4/tags/jbpm-4.0.0.Alpha2/pom.xml Log: IDM Alpha2 Modified: jbpm4/tags/jbpm-4.0.0.Alpha2/pom.xml =================================================================== --- jbpm4/tags/jbpm-4.0.0.Alpha2/pom.xml 2009-02-26 13:36:31 UTC (rev 4047) +++ jbpm4/tags/jbpm-4.0.0.Alpha2/pom.xml 2009-02-26 13:40:29 UTC (rev 4048) @@ -53,7 +53,7 @@ <hibernate.annotations.version>3.3.1.GA</hibernate.annotations.version> <hsqldb.version>1.8.0.7</hsqldb.version> <izpack.version>4.1.0</izpack.version> - <jboss.identity.version>1.0.0-SNAPSHOT</jboss.identity.version> + <jboss.identity.version>1.0.0.Alpha2</jboss.identity.version> <jboss.j2ee.version>4.2.2.GA</jboss.j2ee.version> <jbossesb.version>4.4.0.GA</jbossesb.version> <jboss.client.version>4.2.2.GA</jboss.client.version>

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4047 - in jbpm4/tags/jbpm-4.0.0.Alpha2: modules/distro and 1 other directory.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-26 08:36:31 -0500 (Thu, 26 Feb 2009) New Revision: 4047 Modified: jbpm4/tags/jbpm-4.0.0.Alpha2/modules/distro/pom.xml jbpm4/tags/jbpm-4.0.0.Alpha2/pom.xml Log: svn merge -r4038:4046 https://svn.jboss.org/repos/jbpm/jbpm4/trunk Modified: jbpm4/tags/jbpm-4.0.0.Alpha2/modules/distro/pom.xml =================================================================== --- jbpm4/tags/jbpm-4.0.0.Alpha2/modules/distro/pom.xml 2009-02-26 13:05:50 UTC (rev 4046) +++ jbpm4/tags/jbpm-4.0.0.Alpha2/modules/distro/pom.xml 2009-02-26 13:36:31 UTC (rev 4047) @@ -80,14 +80,9 @@ <artifactId>jbpm-examples</artifactId> <version>${version}</version> </dependency> - + <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-task</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-db</artifactId> <version>${version}</version> </dependency> Modified: jbpm4/tags/jbpm-4.0.0.Alpha2/pom.xml =================================================================== --- jbpm4/tags/jbpm-4.0.0.Alpha2/pom.xml 2009-02-26 13:05:50 UTC (rev 4046) +++ jbpm4/tags/jbpm-4.0.0.Alpha2/pom.xml 2009-02-26 13:36:31 UTC (rev 4047) @@ -39,6 +39,7 @@ <module>modules/test-base</module> <module>modules/test-db</module> <module>modules/test-pojo</module> + <module>modules/db</module> </modules>  @@ -46,6 +47,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <apache.ant.version>1.7.0</apache.ant.version> <cactus.version>13-1.7.1</cactus.version> + <gpd.version>4.0.0-Alpha2</gpd.version> <gwt.console.version>1.0.0.Beta3M1</gwt.console.version> <hibernate.version>3.2.6.ga</hibernate.version> <hibernate.annotations.version>3.3.1.GA</hibernate.annotations.version> @@ -129,7 +131,7 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-gpd</artifactId> <type>zip</type> - <version>${version}</version> + <version>${gpd.version}</version> </dependency>

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4046 - in jbpm4/trunk: modules/distro and 1 other directory.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-26 08:05:50 -0500 (Thu, 26 Feb 2009) New Revision: 4046 Modified: jbpm4/trunk/modules/distro/pom.xml jbpm4/trunk/pom.xml Log: Remove dependency on the legacy task module andinclud the db module in reactor run Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2009-02-26 11:49:37 UTC (rev 4045) +++ jbpm4/trunk/modules/distro/pom.xml 2009-02-26 13:05:50 UTC (rev 4046) @@ -80,14 +80,9 @@ <artifactId>jbpm-examples</artifactId> <version>${version}</version> </dependency> - + <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-task</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-db</artifactId> <version>${version}</version> </dependency> Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-02-26 11:49:37 UTC (rev 4045) +++ jbpm4/trunk/pom.xml 2009-02-26 13:05:50 UTC (rev 4046) @@ -39,6 +39,7 @@ <module>modules/test-base</module> <module>modules/test-db</module> <module>modules/test-pojo</module> + <module>modules/db</module> </modules>

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4045 - in jbpm3/branches/jbpm-3.2.5.SP: modules/core and 8 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-02-26 06:49:37 -0500 (Thu, 26 Feb 2009) New Revision: 4045 Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/examples/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/identity/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/integration/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/simulation/pom.xml jbpm3/branches/jbpm-3.2.5.SP/modules/userguide/pom.xml jbpm3/branches/jbpm-3.2.5.SP/pom.xml Log: version=3.2.5.SP3 Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml 2009-02-26 11:11:30 UTC (rev 4044) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml 2009-02-26 11:49:37 UTC (rev 4045) @@ -23,7 +23,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.SP2</version> + <version>3.2.5.SP3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml 2009-02-26 11:11:30 UTC (rev 4044) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml 2009-02-26 11:49:37 UTC (rev 4045) @@ -24,7 +24,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.SP2</version> + <version>3.2.5.SP3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml 2009-02-26 11:11:30 UTC (rev 4044) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml 2009-02-26 11:49:37 UTC (rev 4045) @@ -21,7 +21,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.SP2</version> + <version>3.2.5.SP3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml 2009-02-26 11:11:30 UTC (rev 4044) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml 2009-02-26 11:49:37 UTC (rev 4045) @@ -22,7 +22,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.SP2</version> + <version>3.2.5.SP3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/examples/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/examples/pom.xml 2009-02-26 11:11:30 UTC (rev 4044) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/examples/pom.xml 2009-02-26 11:49:37 UTC (rev 4045) @@ -24,7 +24,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.SP2</version> + <version>3.2.5.SP3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/identity/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/identity/pom.xml 2009-02-26 11:11:30 UTC (rev 4044) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/identity/pom.xml 2009-02-26 11:49:37 UTC (rev 4045) @@ -22,7 +22,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.SP2</version> + <version>3.2.5.SP3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/integration/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/integration/pom.xml 2009-02-26 11:11:30 UTC (rev 4044) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/integration/pom.xml 2009-02-26 11:49:37 UTC (rev 4045) @@ -24,7 +24,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.SP2</version> + <version>3.2.5.SP3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/simulation/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/simulation/pom.xml 2009-02-26 11:11:30 UTC (rev 4044) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/simulation/pom.xml 2009-02-26 11:49:37 UTC (rev 4045) @@ -21,7 +21,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.SP2</version> + <version>3.2.5.SP3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/userguide/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/userguide/pom.xml 2009-02-26 11:11:30 UTC (rev 4044) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/userguide/pom.xml 2009-02-26 11:49:37 UTC (rev 4045) @@ -24,7 +24,7 @@ <parent> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> - <version>3.2.5.SP2</version> + <version>3.2.5.SP3</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: jbpm3/branches/jbpm-3.2.5.SP/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-02-26 11:11:30 UTC (rev 4044) +++ jbpm3/branches/jbpm-3.2.5.SP/pom.xml 2009-02-26 11:49:37 UTC (rev 4045) @@ -16,7 +16,7 @@ <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> <packaging>pom</packaging> - <version>3.2.5.SP2</version> + <version>3.2.5.SP3</version>  <parent>

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4044 - in jbpm4/branches/tbaeyens: modules/config/src/main and 12 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-02-26 06:11:30 -0500 (Thu, 26 Feb 2009) New Revision: 4044 Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/ jbpm4/branches/tbaeyens/modules/config/src/main/config/build.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/cache/ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/cache/hashtable.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/db2.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/mysql.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/oracle.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/postgresql.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/sybase.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/db2.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/hsqldb.inmemory.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/mysql.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/oracle.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/postgresql.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/sybase.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/mappings/ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/mappings/jpdl.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/mappings/pvm.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/other/ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/other/format.sql.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/ jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/ jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-hsqldb-ds.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-mysql-ds.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-oracle-ds.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-postgresql-ds.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-sybase-ds.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/jbpm/ jbpm4/branches/tbaeyens/modules/config/src/main/config/jbpm/part1.jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/config/src/main/config/jbpm/part2.jbpm.cfg.xml Removed: jbpm4/branches/tbaeyens/modules/config/src/main/resources/db2/ jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.cfg.xml jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.properties jbpm4/branches/tbaeyens/modules/config/src/main/resources/mysql/ jbpm4/branches/tbaeyens/modules/config/src/main/resources/oracle/ jbpm4/branches/tbaeyens/modules/config/src/main/resources/postgresql/ jbpm4/branches/tbaeyens/modules/config/src/main/resources/sybase/ Modified: jbpm4/branches/tbaeyens/modules/test-db/pom.xml jbpm4/branches/tbaeyens/pom.xml Log: added config tool Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/build.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/build.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/build.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="build.configuration"> + + <property file="build.properties" /> + +  + <property name="dest.dir" value="../resources" /> + <property name="dest.filename" value="jbpm.cfg.xml" /> + <property name="hibernate.format.sql" value="true" /> + <property name="hibernate.cache" value="hashtable" /> + <property name="hibernate.connection.type" value="jdbc" /> + <property name="hibernate.database" value="hsqldb.inmemory" /> + <property name="hibernate.jpdl" value="true" /> + + <target name="build.config.file" description="builds jbpm configuration file"> + <mkdir dir="${dest.dir}" /> + <copy file="jbpm/part1.jbpm.cfg.xml" tofile="${dest.dir}/${dest.filename}" overwrite="true" /> + <concat append="true" destfile="${dest.dir}/${dest.filename}"> + <fileset dir="."> + <include name="hibernate/${hibernate.connection.type}/${hibernate.database}.xml"/> + <include name="hibernate/cache/${hibernate.cache}.xml"/> + </fileset> + </concat> + <condition property="include.hibernate.format.sql"> + <equals arg1="hibernate.format.sql" arg2="true" /> + </condition> + <antcall target="include.hibernate.format.sql" /> + <concat append="true" destfile="${dest.dir}/${dest.filename}"> + <fileset dir="."> + <include name="hibernate/mappings/pvm.xml"/> + </fileset> + </concat> + <condition property="include.jpdl.mappings"> + <equals arg1="${hibernate.jpdl}" arg2="true" /> + </condition> + <antcall target="include.jpdl.mappings" /> + <concat append="true" destfile="${dest.dir}/${dest.filename}"> + <fileset dir="."> + <include name="jbpm/part2.jbpm.cfg.xml"/> + </fileset> + </concat> + </target> + + <target name="include.hibernate.format.sql" if="include.hibernate.format.sql"> + <concat append="true" destfile="${dest.dir}/${dest.filename}"> + <fileset dir="."> + <include name="hibernate/other/format.sql.xml"/> + </fileset> + </concat> + </target> + + <target name="include.jpdl.mappings" if="include.jpdl.mappings"> + <concat append="true" destfile="${dest.dir}/${dest.filename}"> + <fileset dir="."> + <include name="hibernate/mappings/jpdl.xml"/> + </fileset> + </concat> + </target> + +</project> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/build.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/cache/hashtable.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/cache/hashtable.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/cache/hashtable.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,2 @@ + <property name="hibernate.cache.use_second_level_cache" value="true" /> + <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider" /> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/cache/hashtable.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/db2.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/db2.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/db2.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,5 @@ + <property name="hibernate.dialect" value="org.hibernate.dialect.DB2Dialect" /> + <property name="hibernate.connection.datasource">java:JbpmDS</property> + <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> + <property name="jta.UserTransaction">UserTransaction</property> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/db2.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/mysql.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/mysql.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/mysql.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,5 @@ + <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLInnoDBDialect" /> + <property name="hibernate.connection.datasource">java:JbpmDS</property> + <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> + <property name="jta.UserTransaction">UserTransaction</property> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/mysql.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/oracle.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/oracle.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/oracle.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,5 @@ + <property name="hibernate.dialect" value="org.hibernate.dialect.Oracle9Dialect" /> + <property name="hibernate.connection.datasource">java:JbpmDS</property> + <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> + <property name="jta.UserTransaction">UserTransaction</property> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/oracle.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/postgresql.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/postgresql.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/postgresql.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,5 @@ + <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" /> + <property name="hibernate.connection.datasource">java:JbpmDS</property> + <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> + <property name="jta.UserTransaction">UserTransaction</property> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/postgresql.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/sybase.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/sybase.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/sybase.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,5 @@ + <property name="hibernate.dialect" value="org.hibernate.dialect.SybaseDialect" /> + <property name="hibernate.connection.datasource">java:JbpmDS</property> + <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> + <property name="jta.UserTransaction">UserTransaction</property> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/datasource/sybase.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/db2.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/db2.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/db2.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,5 @@ + <property name="hibernate.dialect" value="org.hibernate.dialect.DB2Dialect" /> + <property name="hibernate.connection.driver_class" value="com.ibm.db2.jcc.DB2Driver" /> + <property name="hibernate.connection.url" value="${jdbc.db2.url}" /> + <property name="hibernate.connection.username" value="${jdbc.db2.username}" /> + <property name="hibernate.connection.password" value="${jdbc.db2.password}" /> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/db2.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/hsqldb.inmemory.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/hsqldb.inmemory.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/hsqldb.inmemory.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,6 @@ + <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" /> + <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" /> + <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:." /> + <property name="hibernate.connection.username" value="sa" /> + <property name="hibernate.connection.password" value="" /> + <property name="hibernate.hbm2ddl.auto" value="create-drop" /> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/hsqldb.inmemory.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/mysql.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/mysql.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/mysql.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,5 @@ + <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLInnoDBDialect" /> + <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver" /> + <property name="hibernate.connection.url" value="${jdbc.mysql.url}" /> + <property name="hibernate.connection.username" value="${jdbc.mysql.username}" /> + <property name="hibernate.connection.password" value="${jdbc.mysql.password}" /> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/mysql.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/oracle.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/oracle.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/oracle.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,6 @@ + <property name="hibernate.dialect" value="org.hibernate.dialect.Oracle9Dialect" /> + <property name="hibernate.connection.driver_class" value="oracle.jdbc.driver.OracleDriver" /> + <property name="hibernate.connection.url" value="${jdbc.oracle.url}" /> + <property name="hibernate.connection.username" value="${jdbc.oracle.username}" /> + <property name="hibernate.connection.password" value="${jdbc.oracle.password}" /> + <property name="hibernate.query.substitutions" value="true 1, false 0" /> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/oracle.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/postgresql.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/postgresql.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/postgresql.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,5 @@ + <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" /> + <property name="hibernate.connection.driver_class" value="org.postgresql.Driver" /> + <property name="hibernate.connection.url" value="${jdbc.postgresql.url}" /> + <property name="hibernate.connection.username" value="${jdbc.postgresql.username}" /> + <property name="hibernate.connection.password" value="${jdbc.postgresql.password}" /> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/postgresql.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/sybase.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/sybase.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/sybase.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,5 @@ + <property name="hibernate.dialect" value="org.hibernate.dialect.SybaseDialect" /> + <property name="hibernate.connection.driver_class" value="net.sourceforge.jtds.jdbc.Driver" /> + <property name="hibernate.connection.url" value="${jdbc.sybase.url}" /> + <property name="hibernate.connection.username="${jdbc.sybase.username}" /> + <property name="hibernate.connection.password" value="${jdbc.sybase.password}" /> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/jdbc/sybase.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/mappings/jpdl.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/mappings/jpdl.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/mappings/jpdl.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1 @@ + <mapping resource="jbpm.jpdl.hbm.xml" /> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/mappings/jpdl.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/mappings/pvm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/mappings/pvm.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/mappings/pvm.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,8 @@ + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <mapping resource="jbpm.pvm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/mappings/pvm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/other/format.sql.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/other/format.sql.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/other/format.sql.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1 @@ + <property name="hibernate.format_sql" value="true" /> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/hibernate/other/format.sql.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-hsqldb-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-hsqldb-ds.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-hsqldb-ds.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <local-tx-datasource> + <jndi-name>JbpmDS</jndi-name> + + <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbpm4DB</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + +  + <min-pool-size>1</min-pool-size> + <max-pool-size>5</max-pool-size> + +  + <idle-timeout-minutes>0</idle-timeout-minutes> +  + <track-statements /> +  + <prepared-statement-cache-size>32</prepared-statement-cache-size> + +  + <metadata> + <type-mapping>Hypersonic SQL</type-mapping> + </metadata> + +  + <depends>jboss:service=Hypersonic,database=jbpm4DB</depends> + </local-tx-datasource> + + <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbpm4DB"> + <attribute name="Database">jbpm4DB</attribute> + <attribute name="InProcessMode">true</attribute> + </mbean> + +</datasources> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-hsqldb-ds.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-mysql-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-mysql-ds.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-mysql-ds.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.mysql.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.mysql.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.mysql.database}</xa-datasource-property> + <user-name>${jdbc.mysql.username}</user-name> + <password>${jdbc.mysql.password}</password> + +  + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> +  + <no-tx-separate-pools /> +  + <track-connection-by-tx /> + +  + <exception-sorter-class-name> + com.mysql.jdbc.integration.jboss.ExtendedMysqlExceptionSorter + </exception-sorter-class-name> + <valid-connection-checker-class-name> + com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker + </valid-connection-checker-class-name> + +  + <metadata> + <type-mapping>mySQL</type-mapping> + </metadata> + </xa-datasource> + +</datasources> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-mysql-ds.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-oracle-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-oracle-ds.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-oracle-ds.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + + +<datasources> + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> +  + <isSameRM-override-value>false</isSameRM-override-value> + <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> + <xa-datasource-property name="URL">${jdbc.oracle.url}</xa-datasource-property> + <xa-datasource-property name="User">${jdbc.oracle.username}</xa-datasource-property> + <xa-datasource-property name="Password">${jdbc.oracle.password}</xa-datasource-property> +  +  +  + <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name> +  + <no-tx-separate-pools/> + +  + <metadata> + <type-mapping>Oracle9i</type-mapping> + </metadata> + </xa-datasource> + + <mbean code="org.jboss.resource.adapter.jdbc.vendor.OracleXAExceptionFormatter" + name="jboss.jca:service=OracleXAExceptionFormatter"> + <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends> + </mbean> + +</datasources> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-oracle-ds.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-postgresql-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-postgresql-ds.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-postgresql-ds.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.postgresql.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.postgresql.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.postgresql.database}</xa-datasource-property> + <user-name>${jdbc.postgresql.username}</user-name> + <password>${jdbc.postgresql.password}</password> + +  + <track-connection-by-tx /> + +  + <metadata> + <type-mapping>PostgreSQL 8.0</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-postgresql-ds.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-sybase-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-sybase-ds.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-sybase-ds.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>${jdbc.sybase.datasource}</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.sybase.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.sybase.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.sybase.database}</xa-datasource-property> + <user-name>${jdbc.sybase.username}</user-name> + <password>${jdbc.sybase.password}</password> + +  + <track-connection-by-tx /> + + <exception-sorter-class-name> + org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter + </exception-sorter-class-name> + +  + <metadata> + <type-mapping>Sybase</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/jboss/datasource/jbpm-sybase-ds.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/jbpm/part1.jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/jbpm/part1.jbpm.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/jbpm/part1.jbpm.cfg.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <process-service /> + <execution-service /> + <history-service /> + <management-service /> + <identity-service /> + <task-service /> + + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <hibernate-configuration> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/jbpm/part1.jbpm.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/config/src/main/config/jbpm/part2.jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/config/jbpm/part2.jbpm.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/config/src/main/config/jbpm/part2.jbpm.cfg.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -0,0 +1,53 @@ + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /> + </hibernate-configuration> + + <hibernate-session-factory /> + + <deployer-manager> + <assign-file-type> + <file extension=".jpdl.xml" type="jpdl" /> + </assign-file-type> + <parse-jpdl /> + <check-process /> + <check-problems /> + <save /> + </deployer-manager> + + <script-manager default-expression-language="juel" + default-script-language="juel" + read-contexts="execution, environment, process-engine" + write-context=""> + <script-language name="juel" factory="com.sun.script.juel.JuelScriptEngineFactory" /> + </script-manager> + + <job-executor auto-start="false" /> + <job-test-helper /> + + <id-generator /> + <types resource="jbpm.pvm.types.xml" /> + + <business-calendar> + <monday hours="9:00-12:00 and 12:30-17:00"/> + <tuesday hours="9:00-12:00 and 12:30-17:00"/> + <wednesday hours="9:00-12:00 and 12:30-17:00"/> + <thursday hours="9:00-12:00 and 12:30-17:00"/> + <friday hours="9:00-12:00 and 12:30-17:00"/> + <holiday period="01/07/2008 - 31/08/2008"/> + </business-calendar> + + </process-engine-context> + + <transaction-context> + <hibernate-session /> + <transaction /> + <pvm-db-session /> + <job-db-session /> + <task-db-session /> + <message-session /> + <timer-session /> + <history-session /> + <identity-session realm="realm://jbpm-identity" /> + </transaction-context> + +</jbpm-configuration> Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/config/jbpm/part2.jbpm.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.cfg.xml 2009-02-26 11:08:54 UTC (rev 4043) +++ jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.cfg.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -1,21 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 2.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-2.0.dtd"> - -<hibernate-configuration> - - <session-factory> - <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> - <mapping resource="jbpm.pvm.wire.hbm.xml" /> - <mapping resource="jbpm.pvm.definition.hbm.xml" /> - <mapping resource="jbpm.pvm.execution.hbm.xml" /> - <mapping resource="jbpm.pvm.variable.hbm.xml" /> - <mapping resource="jbpm.pvm.job.hbm.xml" /> - <mapping resource="jbpm.pvm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - </session-factory> - -</hibernate-configuration> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.properties 2009-02-26 11:08:54 UTC (rev 4043) +++ jbpm4/branches/tbaeyens/modules/config/src/main/resources/hibernate.properties 2009-02-26 11:11:30 UTC (rev 4044) @@ -1,8 +0,0 @@ -hibernate.dialect=org.hibernate.dialect.HSQLDialect -hibernate.connection.driver_class=org.hsqldb.jdbcDriver -hibernate.connection.url=jdbc:hsqldb:mem:. -hibernate.connection.username=sa -hibernate.connection.password= -hibernate.hbm2ddl.auto=create-drop -hibernate.cache.use_second_level_cache=true -hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider Modified: jbpm4/branches/tbaeyens/modules/test-db/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/pom.xml 2009-02-26 11:08:54 UTC (rev 4043) +++ jbpm4/branches/tbaeyens/modules/test-db/pom.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -37,6 +37,13 @@ <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-config</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-base</artifactId> <version>${version}</version> </dependency> Modified: jbpm4/branches/tbaeyens/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/pom.xml 2009-02-26 11:08:54 UTC (rev 4043) +++ jbpm4/branches/tbaeyens/pom.xml 2009-02-26 11:11:30 UTC (rev 4044) @@ -31,8 +31,9 @@  <modules> + <module>modules/api</module> + <module>modules/config</module> <module>modules/log</module> - <module>modules/api</module> <module>modules/pvm</module> <module>modules/examples</module> <module>modules/jpdl</module> @@ -388,6 +389,18 @@  <profiles> + + <profile> + <id>all</id> + <modules> + <module>modules/db</module> + <module>modules/devguide</module> + <module>modules/distro</module> + <module>modules/integration</module> + <module>modules/test-load</module> + <module>modules/userguide</module> + </modules> + </profile> <profile> <id>distro</id>

15 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4043 - jbpm3/tags.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-02-26 06:08:54 -0500 (Thu, 26 Feb 2009) New Revision: 4043 Added: jbpm3/tags/jbpm-3.2.5.SP2/ Log: Release jbpm-3.2.5.SP2 Copied: jbpm3/tags/jbpm-3.2.5.SP2 (from rev 4042, jbpm3/branches/jbpm-3.2.5.SP)

15 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits February 2009