JBoss JBPM SVN: r3575 - in jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm: example03 and 1 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-29 06:56:26 -0500 (Mon, 29 Dec 2008)
New Revision: 3575
Removed:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/AutomaticActivity.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/EmbeddedExecutionModeTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/Loan.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/WaitState.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/WaitState.java
Log:
pvm test suite cleanup
Deleted: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/AutomaticActivity.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/AutomaticActivity.java 2008-12-29 11:56:14 UTC (rev 3574)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/AutomaticActivity.java 2008-12-29 11:56:26 UTC (rev 3575)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.example03;
-
-import org.jbpm.activity.Activity;
-import org.jbpm.activity.ActivityExecution;
-
-/** a node behaviour implementation that records its execution and then
- * just proceeds.
- *
- * @author Tom Baeyens
- */
-public class AutomaticActivity implements Activity {
-
- private static final long serialVersionUID = 1L;
-
- public void execute(ActivityExecution execution) throws Exception {
- }
-}
\ No newline at end of file
Deleted: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/EmbeddedExecutionModeTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/EmbeddedExecutionModeTest.java 2008-12-29 11:56:14 UTC (rev 3574)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/EmbeddedExecutionModeTest.java 2008-12-29 11:56:26 UTC (rev 3575)
@@ -1,106 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.example03;
-
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.cfg.Configuration;
-import org.jbpm.test.JbpmTestCase;
-
-/**
- * @author Tom Baeyens
- */
-public class EmbeddedExecutionModeTest extends JbpmTestCase {
-
- SessionFactory sessionFactory;
- Session session;
- Transaction transaction;
-
- public void testLoanApprove() {
- Configuration configuration = new Configuration();
- configuration.configure("org/jbpm/pvm/example03/hibernate.cfg.xml");
- sessionFactory = configuration.buildSessionFactory();
-
- startTransaction();
-
- Loan loan = new Loan("john doe", 234.0);
- session.save(loan);
- assertEquals("evaluate", loan.getState());
-
- newTransaction();
-
- loan = (Loan) session.get(Loan.class, loan.getDbid());
- assertEquals("evaluate", loan.getState());
- loan.approve();
- assertEquals("archive", loan.getState());
-
- newTransaction();
-
- loan = (Loan) session.get(Loan.class, loan.getDbid());
- assertEquals("archive", loan.getState());
- loan.archiveComplete();
- assertEquals("end", loan.getState());
-
- commitTransaction();
- }
-
- public void testLoanReject() {
- Configuration configuration = new Configuration();
- configuration.configure("org/jbpm/pvm/example03/hibernate.cfg.xml");
- sessionFactory = configuration.buildSessionFactory();
-
- startTransaction();
-
- Loan loan = new Loan("john doe", 234.0);
- session.save(loan);
- assertEquals("evaluate", loan.getState());
-
- newTransaction();
-
- loan = (Loan) session.get(Loan.class, loan.getDbid());
- assertEquals("evaluate", loan.getState());
- loan.reject();
- assertEquals("end", loan.getState());
-
- newTransaction();
-
- loan = (Loan) session.get(Loan.class, loan.getDbid());
- assertEquals("end", loan.getState());
- }
-
-
- void newTransaction() {
- commitTransaction();
- startTransaction();
- }
-
- void startTransaction() {
- session = sessionFactory.openSession();
- transaction = session.beginTransaction();
- }
-
- void commitTransaction() {
- transaction.commit();
- session.close();
- }
-}
Deleted: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/Loan.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/Loan.java 2008-12-29 11:56:14 UTC (rev 3574)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/Loan.java 2008-12-29 11:56:26 UTC (rev 3575)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.example03;
-
-
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.pvm.model.ProcessFactory;
-
-/**
- * @author Tom Baeyens
- */
-public class Loan {
-
- /** the loan process definition as a static resource */
- private static final ClientProcessDefinition processDefinition = createLoanProcess();
-
- private static ClientProcessDefinition createLoanProcess() {
- ClientProcessDefinition processDefinition = ProcessFactory.build("loan")
- .node("submit loan request").initial().behaviour(AutomaticActivity.class)
- .transition().to("evaluate")
- .node("evaluate").behaviour(WaitState.class)
- .transition("approve").to("wire money")
- .transition("reject").to("end")
- .node("wire money").behaviour(AutomaticActivity.class)
- .transition().to("archive")
- .node("archive").behaviour(WaitState.class)
- .transition().to("end")
- .node("end").behaviour(WaitState.class)
- .done();
-
- return processDefinition;
- }
-
- /** exposes the process definition to the execution hibernate type */
- private static ClientProcessDefinition getProcessDefinition() {
- return processDefinition;
- }
-
- long dbid;
- String customer;
- double amount;
- ClientExecution execution;
-
- /** constructor for persistence */
- protected Loan() {
- }
-
- public Loan(String customer, double amount) {
- this.customer = customer;
- this.amount = amount;
- this.execution = processDefinition.startProcessInstance();
- }
-
- public void approve() {
- execution.signal("approve");
- }
-
- public void reject() {
- execution.signal("reject");
- }
-
- public void archiveComplete() {
- execution.signal();
- }
-
- public String getState() {
- return execution.getNodeName();
- }
-
- // getters //////////////////////////////////////////////////////////////////
-
- public long getDbid() {
- return dbid;
- }
- public String getCustomer() {
- return customer;
- }
- public double getAmount() {
- return amount;
- }
-}
Deleted: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/WaitState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/WaitState.java 2008-12-29 11:56:14 UTC (rev 3574)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/WaitState.java 2008-12-29 11:56:26 UTC (rev 3575)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.example03;
-
-import java.util.Map;
-
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivity;
-
-/**
- * @author Tom Baeyens
- */
-public class WaitState implements ExternalActivity {
-
- private static final long serialVersionUID = 1L;
-
- public WaitState() {
- }
-
- public void execute(ActivityExecution execution) throws Exception {
- execution.waitForSignal();
- }
-
- public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters) throws Exception {
- execution.take(signalName);
- }
-}
\ No newline at end of file
Deleted: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java 2008-12-29 11:56:14 UTC (rev 3574)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java 2008-12-29 11:56:26 UTC (rev 3575)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.example05;
-
-import org.jbpm.client.ClientExecution;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.test.JbpmTestCase;
-
-
-public class ExternalActivityExampleTest extends JbpmTestCase {
-
- public void testExternalActivityExample() {
- ClientProcessDefinition processDefinition = ProcessFactory.build()
- .node("a").initial().behaviour(new WaitState())
- .transition().to("b")
- .node("b").behaviour(new WaitState())
- .done();
-
- ClientExecution execution = processDefinition.startProcessInstance();
-
- assertEquals("a", execution.getNodeName());
-
- execution.signal();
-
- assertEquals("b", execution.getNodeName());
- }
-
-}
Deleted: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/WaitState.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/WaitState.java 2008-12-29 11:56:14 UTC (rev 3574)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/WaitState.java 2008-12-29 11:56:26 UTC (rev 3575)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.example05;
-
-import java.util.Map;
-
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.activity.ExternalActivity;
-
-public class WaitState implements ExternalActivity {
-
- private static final long serialVersionUID = 1L;
-
- public void execute(ActivityExecution execution) {
- execution.waitForSignal();
- }
-
- public void signal(ActivityExecution execution,
- String signalName,
- Map<String, Object> parameters) {
- execution.take(signalName);
- }
-}
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3574 - in jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm: display and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-29 06:56:14 -0500 (Mon, 29 Dec 2008)
New Revision: 3574
Added:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/display/
Removed:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example01/
Modified:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/display/Display.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/display/DisplayActivityTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/display/TestConsole.java
Log:
pvm test suite cleanup
Copied: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/display (from rev 3570, jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04)
Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/display
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/display/Display.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/Display.java 2008-12-29 09:39:56 UTC (rev 3570)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/display/Display.java 2008-12-29 11:56:14 UTC (rev 3574)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jbpm.pvm.example04;
+package org.jbpm.pvm.display;
import org.jbpm.activity.Activity;
import org.jbpm.activity.ActivityExecution;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/display/DisplayActivityTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java 2008-12-29 09:39:56 UTC (rev 3570)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/display/DisplayActivityTest.java 2008-12-29 11:56:14 UTC (rev 3574)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jbpm.pvm.example04;
+package org.jbpm.pvm.display;
import org.jbpm.Execution;
import org.jbpm.client.ClientProcessDefinition;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/display/TestConsole.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/TestConsole.java 2008-12-29 09:39:56 UTC (rev 3570)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/display/TestConsole.java 2008-12-29 11:56:14 UTC (rev 3574)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jbpm.pvm.example04;
+package org.jbpm.pvm.display;
import java.io.PrintStream;
import java.util.ArrayList;
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3573 - in jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm: api and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-29 06:55:57 -0500 (Mon, 29 Dec 2008)
New Revision: 3573
Removed:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/continuation/
Log:
pvm test suite cleanup
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3572 - in jbpm4/trunk/modules/pvm/src/test: java/org/jbpm/pvm/api and 4 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-29 04:47:06 -0500 (Mon, 29 Dec 2008)
New Revision: 3572
Added:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring/
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring/spring.beans.xml
Removed:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/spring/
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring/spring.beans.xml
Log:
moved spring test
Copied: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring (from rev 3567, jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring)
Deleted: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java 2008-12-29 09:47:06 UTC (rev 3572)
@@ -1,100 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.api.spring;
-
-import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.test.JbpmTestCase;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-
-/**
- * @author Tom Baeyens
- */
-public class SpringTest extends JbpmTestCase {
-
- public void testOne() {
-
- if (true) {
- System.err.println("FIXME: SpringTest");
- return;
- }
-
-
- ClassPathXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/jbpm/pvm/api/spring/spring.beans.xml");
- EnvironmentFactory environmentFactory = (EnvironmentFactory) applicationContext.getBean("environmentFactory");
-
- CommandService commandService = environmentFactory.get(CommandService.class);
-
- assertNull(Environment.getCurrent());
-
- Session session = (Session) commandService.execute(new Command<Object>() {
- public Object execute(Environment environment) throws Exception {
- assertNotNull(environment);
- Session session = environment.get(Session.class);
- assertNotNull(session);
- assertTrue(session.isOpen());
- assertSame(session, environment.get(Session.class));
- return session;
- }
- });
-
- assertFalse(session.isOpen());
-
- assertNull(Environment.getCurrent());
-
- /* TODO translate the DeployerManager to a data structure that is
- * easy to wire up with spring
- ProcessService processService = environmentFactory.get(ProcessService.class);
-
- ProcessDefinition processDefinition = ProcessFactory.build("basic")
- .node("a").initial().behaviour(WaitState.class)
- .transition().to("b")
- .node("b").behaviour(WaitState.class)
- .transition().to("c")
- .node("c").behaviour(AutomaticActivity.class)
- .transition().to("d")
- .node("d").behaviour(AutomaticActivity.class)
- .transition().to("e")
- .node("e").behaviour(WaitState.class)
- .done();
-
- processService.deploy(processDefinition);
-
- Execution execution = processService.startExecution("basic", "one");
-
- assertEquals("a", execution.getNode().getName());
-
- execution = processService.signalExecution("basic", "one");
-
- assertEquals("b", execution.getNode().getName());
-
- execution = processService.signalExecution("basic", "one");
-
- assertEquals("e", execution.getNode().getName());
- */
- }
-
-}
Copied: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java (from rev 3570, jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java (rev 0)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java 2008-12-29 09:47:06 UTC (rev 3572)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.spring;
+
+import org.hibernate.Session;
+import org.jbpm.cmd.Command;
+import org.jbpm.cmd.CommandService;
+import org.jbpm.env.Environment;
+import org.jbpm.env.EnvironmentFactory;
+import org.jbpm.test.JbpmTestCase;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class SpringTest extends JbpmTestCase {
+
+ public void testSpringTransactions() {
+ ClassPathXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/jbpm/pvm/spring/spring.beans.xml");
+ EnvironmentFactory environmentFactory = (EnvironmentFactory) applicationContext.getBean("environmentFactory");
+
+ CommandService commandService = environmentFactory.get(CommandService.class);
+
+ assertNull(Environment.getCurrent());
+
+ Session session = (Session) commandService.execute(new Command<Object>() {
+ public Object execute(Environment environment) throws Exception {
+ assertNotNull(environment);
+ Session session = environment.get(Session.class);
+ assertNotNull(session);
+ assertTrue(session.isOpen());
+ assertSame(session, environment.get(Session.class));
+ return session;
+ }
+ });
+
+ assertFalse(session.isOpen());
+
+ assertNull(Environment.getCurrent());
+
+ /* TODO translate the DeployerManager to a data structure that is
+ * easy to wire up with spring
+ ProcessService processService = environmentFactory.get(ProcessService.class);
+
+ ProcessDefinition processDefinition = ProcessFactory.build("basic")
+ .node("a").initial().behaviour(WaitState.class)
+ .transition().to("b")
+ .node("b").behaviour(WaitState.class)
+ .transition().to("c")
+ .node("c").behaviour(AutomaticActivity.class)
+ .transition().to("d")
+ .node("d").behaviour(AutomaticActivity.class)
+ .transition().to("e")
+ .node("e").behaviour(WaitState.class)
+ .done();
+
+ processService.deploy(processDefinition);
+
+ Execution execution = processService.startExecution("basic", "one");
+
+ assertEquals("a", execution.getNode().getName());
+
+ execution = processService.signalExecution("basic", "one");
+
+ assertEquals("b", execution.getNode().getName());
+
+ execution = processService.signalExecution("basic", "one");
+
+ assertEquals("e", execution.getNode().getName());
+ */
+ }
+
+}
Copied: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring (from rev 3567, jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/spring)
Deleted: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring/spring.beans.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/spring/spring.beans.xml 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring/spring.beans.xml 2008-12-29 09:47:06 UTC (rev 3572)
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
- <!-- SINGLETONS
- SpringEnvironmentFactory will only see the singleton beans.
- -->
-
- <bean id="processService"
- class="org.jbpm.pvm.internal.svc.CommandProcessService"
- scope="singleton">
- <property name="commandService" ref="commandService" />
- </bean>
-
- <bean id="commandService"
- class="org.jbpm.pvm.internal.spring.SpringCommandService"
- scope="singleton">
- <property name="transactionManager" ref="transactionManager" />
- <property name="environmentFactory" ref="environmentFactory"/>
- </bean>
-
- <bean id="transactionManager"
- class="org.springframework.orm.hibernate3.HibernateTransactionManager"
- scope="singleton">
- <property name="sessionFactory" ref="sessionFactory"/>
- </bean>
-
- <bean id="environmentFactory"
- class="org.jbpm.pvm.env.SpringEnvironmentFactory"
- scope="singleton" />
-
- <bean id="sessionFactory"
- class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"
- scope="singleton">
- <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.job.hbm.xml</value>
- </list>
- </property>
- <property name="hibernateProperties"><value>
- 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
- </value></property>
- </bean>
-
- <bean id="hibernateSessionManager"
- class="org.jbpm.pvm.internal.spring.HibernateSessionManager"
- scope="singleton">
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
-
- <!-- PROTOTYPES
- The PVM environment scope will only see prototype beans.
- Each environment will cache the prototype beans that are fetched
- through it.
- -->
-
- <bean id="session"
- factory-bean="hibernateSessionManager"
- factory-method="getSession"
- scope="prototype" />
-
-</beans>
\ No newline at end of file
Copied: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring/spring.beans.xml (from rev 3570, jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/spring/spring.beans.xml)
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring/spring.beans.xml (rev 0)
+++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring/spring.beans.xml 2008-12-29 09:47:06 UTC (rev 3572)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+ <!-- SINGLETONS
+ SpringEnvironmentFactory will only see the singleton beans.
+ -->
+
+ <bean id="processService"
+ class="org.jbpm.pvm.internal.svc.ProcessServiceImpl"
+ scope="singleton">
+ <property name="commandService" ref="commandService" />
+ </bean>
+
+ <bean id="commandService"
+ class="org.jbpm.pvm.internal.spring.SpringCommandService"
+ scope="singleton">
+ <property name="transactionManager" ref="transactionManager" />
+ <property name="environmentFactory" ref="environmentFactory"/>
+ </bean>
+
+ <bean id="transactionManager"
+ class="org.springframework.orm.hibernate3.HibernateTransactionManager"
+ scope="singleton">
+ <property name="sessionFactory" ref="sessionFactory"/>
+ </bean>
+
+ <bean id="environmentFactory"
+ class="org.jbpm.cfg.SpringConfiguration"
+ scope="singleton" />
+
+ <bean id="sessionFactory"
+ class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"
+ scope="singleton">
+ <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.job.hbm.xml</value>
+ </list>
+ </property>
+ <property name="hibernateProperties"><value>
+ 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
+ </value></property>
+ </bean>
+
+ <bean id="hibernateSessionManager"
+ class="org.jbpm.pvm.internal.spring.HibernateSessionManager"
+ scope="singleton">
+ <property name="sessionFactory" ref="sessionFactory" />
+ </bean>
+
+ <!-- PROTOTYPES
+ The PVM environment scope will only see prototype beans.
+ Each environment will cache the prototype beans that are fetched
+ through it.
+ -->
+
+ <bean id="session"
+ factory-bean="hibernateSessionManager"
+ factory-method="getSession"
+ scope="prototype" />
+
+</beans>
\ No newline at end of file
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3571 - in jbpm4/trunk/modules/pvm: src/test/java/org/jbpm/pvm/api and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-29 04:46:15 -0500 (Mon, 29 Dec 2008)
New Revision: 3571
Removed:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/
Modified:
jbpm4/trunk/modules/pvm/pom.xml
Log:
removed obsolete timer integration test
Modified: jbpm4/trunk/modules/pvm/pom.xml
===================================================================
--- jbpm4/trunk/modules/pvm/pom.xml 2008-12-29 09:39:56 UTC (rev 3570)
+++ jbpm4/trunk/modules/pvm/pom.xml 2008-12-29 09:46:15 UTC (rev 3571)
@@ -109,7 +109,6 @@
<exclude>**/AutomaticDecisionDbTest.java</exclude>
<exclude>**/PersistentExecutionModeTest.java</exclude>
<exclude>**/BasicProcessPersistenceTest.java</exclude>
- <exclude>**/TimerIntegrationTest.java</exclude>
<exclude>**/ProcessServiceTest.java</exclude>
<exclude>**/JobExecutorTest.java</exclude>
<exclude>**/ContinuationTest.java</exclude>
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3570 - in jbpm4/trunk/modules/pvm/src/test: resources/org/jbpm/pvm/api/spring and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-29 04:39:56 -0500 (Mon, 29 Dec 2008)
New Revision: 3570
Modified:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java
jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/spring/spring.beans.xml
Log:
fixed spring support
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java 2008-12-29 09:39:40 UTC (rev 3569)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java 2008-12-29 09:39:56 UTC (rev 3570)
@@ -35,14 +35,7 @@
*/
public class SpringTest extends JbpmTestCase {
- public void testOne() {
-
- if (true) {
- System.err.println("FIXME: SpringTest");
- return;
- }
-
-
+ public void testSpringTransactions() {
ClassPathXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/jbpm/pvm/api/spring/spring.beans.xml");
EnvironmentFactory environmentFactory = (EnvironmentFactory) applicationContext.getBean("environmentFactory");
Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/spring/spring.beans.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/spring/spring.beans.xml 2008-12-29 09:39:40 UTC (rev 3569)
+++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/spring/spring.beans.xml 2008-12-29 09:39:56 UTC (rev 3570)
@@ -9,7 +9,7 @@
-->
<bean id="processService"
- class="org.jbpm.pvm.internal.svc.CommandProcessService"
+ class="org.jbpm.pvm.internal.svc.ProcessServiceImpl"
scope="singleton">
<property name="commandService" ref="commandService" />
</bean>
@@ -28,7 +28,7 @@
</bean>
<bean id="environmentFactory"
- class="org.jbpm.pvm.env.SpringEnvironmentFactory"
+ class="org.jbpm.cfg.SpringConfiguration"
scope="singleton" />
<bean id="sessionFactory"
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3569 - in jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm: api and 1 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-29 04:39:40 -0500 (Mon, 29 Dec 2008)
New Revision: 3569
Added:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/
Removed:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/
Modified:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java
Log:
removed api from environment test package
Copied: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env (from rev 3567, jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env)
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2008-12-29 09:39:40 UTC (rev 3569)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jbpm.pvm.api.env;
+package org.jbpm.pvm.env;
import org.jbpm.cfg.JbpmConfiguration;
import org.jbpm.env.Context;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java 2008-12-29 09:39:40 UTC (rev 3569)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jbpm.pvm.api.env;
+package org.jbpm.pvm.env;
import org.jbpm.cfg.JbpmConfiguration;
import org.jbpm.env.Environment;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2008-12-29 09:39:40 UTC (rev 3569)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jbpm.pvm.api.env;
+package org.jbpm.pvm.env;
import org.jbpm.cfg.JbpmConfiguration;
import org.jbpm.env.Environment;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2008-12-29 09:39:40 UTC (rev 3569)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jbpm.pvm.api.env;
+package org.jbpm.pvm.env;
import org.jbpm.cfg.JbpmConfiguration;
import org.jbpm.env.Environment;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2008-12-29 09:39:40 UTC (rev 3569)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jbpm.pvm.api.env;
+package org.jbpm.pvm.env;
import org.jbpm.cfg.JbpmConfiguration;
import org.jbpm.env.Environment;
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3568 - in jbpm4/trunk/modules: enterprise/scripts and 15 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-29 04:27:38 -0500 (Mon, 29 Dec 2008)
New Revision: 3568
Added:
jbpm4/trunk/modules/enterprise/scripts/
jbpm4/trunk/modules/enterprise/src/main/etc/
jbpm4/trunk/modules/enterprise/src/main/etc/ear/
jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/
jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/
jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/
jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/ejb-jar.xml
jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jboss.xml
jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jbosscmp-jdbc.xml
jbpm4/trunk/modules/enterprise/src/main/etc/war/
jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/
jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/jboss-web.xml
jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/web.xml
jbpm4/trunk/modules/enterprise/src/test/resources/cactus.properties
Removed:
jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/ejb-jar.xml
jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/jboss.xml
jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/jbosscmp-jdbc.xml
jbpm4/trunk/modules/pvm/scripts/
jbpm4/trunk/modules/pvm/src/main/docs/
jbpm4/trunk/modules/pvm/src/main/etc/
jbpm4/trunk/modules/pvm/src/test/config/
jbpm4/trunk/modules/pvm/src/test/resources/cactus.properties
jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/
jbpm4/trunk/modules/pvm/src/test/resources/enterprise/WEB-INF/
Modified:
jbpm4/trunk/modules/enterprise/pom.xml
jbpm4/trunk/modules/examples/src/test/resources/logging.properties
jbpm4/trunk/modules/pvm/pom.xml
Log:
moved enterprise stuff to enterprise module
Modified: jbpm4/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/pom.xml 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/enterprise/pom.xml 2008-12-29 09:27:38 UTC (rev 3568)
@@ -102,12 +102,33 @@
<showDeprecation>false</showDeprecation>
</configuration>
</plugin>
+ <!--
<plugin>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
<applicationXml>${basedir}/src/main/etc/ear/META-INF/application.xml</applicationXml>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-jars</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="tests.output.dir" value="${project.build.directory}" />
+ <property name="tests.resources.dir" value="${basedir}/src/test/resources" />
+ <ant antfile="scripts/build-jars-pvm.xml" target="build-jars-pvm" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ -->
</plugins>
</build>
@@ -115,20 +136,4 @@
<profiles>
</profiles>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <quiet>true</quiet>
- <source>1.5</source>
- <verbose>false</verbose>
- <noqualifier>all</noqualifier>
- <excludePackageNames>*.internal:*.test</excludePackageNames>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
</project>
\ No newline at end of file
Copied: jbpm4/trunk/modules/enterprise/scripts (from rev 3567, jbpm4/trunk/modules/pvm/scripts)
Property changes on: jbpm4/trunk/modules/enterprise/scripts
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF (from rev 3567, jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF)
Property changes on: jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/ejb-jar.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/ejb-jar.xml 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/ejb-jar.xml 2008-12-29 09:27:38 UTC (rev 3568)
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<ejb-jar version="2.1"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee">
-
- <description>JBoss jBPM enterprise beans</description>
- <display-name>JBoss jBPM enterprise beans</display-name>
-
- <enterprise-beans>
-
- <session>
- <description>JBoss jBPM Command Executor SLSB</description>
- <display-name>JBoss jBPM Command Executor SLSB</display-name>
- <ejb-name>CommandExecutor</ejb-name>
- <home>org.jbpm.pvm.internal.ejb.RemoteCommandExecutorHome</home>
- <remote>org.jbpm.pvm.internal.ejb.RemoteCommandExecutor</remote>
- <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home>
- <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local>
- <ejb-class>org.jbpm.pvm.internal.ejb.CommandExecutorSLSB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <ejb-local-ref>
- <ejb-ref-name>ejb/LocalTimer</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>org.jbpm.pvm.internal.ejb.LocalTimerHome</local-home>
- <local>org.jbpm.pvm.internal.ejb.LocalTimer</local>
- <ejb-link>Timer</ejb-link>
- </ejb-local-ref>
- </session>
-
- <message-driven>
- <description>JBoss jBPM Command Receiver MDB</description>
- <ejb-name>CommandReceiver</ejb-name>
- <ejb-class>org.jbpm.pvm.internal.ejb.CommandReceiverMDB</ejb-class>
- <transaction-type>Container</transaction-type>
- <message-destination-type>javax.jms.Queue</message-destination-type>
- <ejb-local-ref>
- <ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home>
- <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local>
- <ejb-link>CommandExecutor</ejb-link>
- </ejb-local-ref>
- <resource-ref>
- <res-ref-name>jms/CommandConnectionFactory</res-ref-name>
- <res-type>javax.jms.ConnectionFactory</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <message-destination-ref>
- <message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name>
- <message-destination-type>javax.jms.Queue</message-destination-type>
- <message-destination-usage>Produces</message-destination-usage>
- </message-destination-ref>
- </message-driven>
-
- <entity>
- <display-name>JBoss jBPM Timer EB</display-name>
- <ejb-name>Timer</ejb-name>
- <local-home>org.jbpm.pvm.internal.ejb.LocalTimerHome</local-home>
- <local>org.jbpm.pvm.internal.ejb.LocalTimer</local>
- <ejb-class>org.jbpm.pvm.internal.ejb.TimerEB</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>java.lang.Long</prim-key-class>
- <reentrant>false</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>pvm</abstract-schema-name>
- <cmp-field>
- <field-name>dbid</field-name>
- </cmp-field>
- <cmp-field>
- <field-name>dueDate</field-name>
- </cmp-field>
- <!--
- <cmp-field>
- <field-name>dbversion</field-name>
- </cmp-field>
- -->
- <primkey-field>dbid</primkey-field>
- <ejb-local-ref>
- <ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home>
- <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local>
- <ejb-link>CommandExecutor</ejb-link>
- </ejb-local-ref>
- </entity>
-
- </enterprise-beans>
-
- <assembly-descriptor>
-
- <container-transaction>
- <method>
- <ejb-name>CommandExecutor</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
-
- <container-transaction>
- <method>
- <ejb-name>CommandReceiver</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
-
- <container-transaction>
- <method>
- <ejb-name>Timer</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
-
- </assembly-descriptor>
-
-</ejb-jar>
Deleted: jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/jboss.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/jboss.xml 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/jboss.xml 2008-12-29 09:27:38 UTC (rev 3568)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-
- <enterprise-beans>
-
- <session>
- <ejb-name>CommandExecutor</ejb-name>
- <jndi-name>jbpm/CommandExecutor</jndi-name>
- <local-jndi-name>java:jbpm/CommandExecutor</local-jndi-name>
- </session>
-
- <message-driven>
- <ejb-name>CommandReceiver</ejb-name>
- <destination-jndi-name>queue/JbpmCommandQueue</destination-jndi-name>
- <resource-ref>
- <res-ref-name>jms/CommandConnectionFactory</res-ref-name>
- <jndi-name>java:JmsXA</jndi-name>
- </resource-ref>
- <message-destination-ref>
- <message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name>
- <jndi-name>queue/DLQ</jndi-name>
- </message-destination-ref>
- </message-driven>
-
- <entity>
- <ejb-name>Timer</ejb-name>
- <local-jndi-name>java:jbpm/Timer</local-jndi-name>
- </entity>
-
- </enterprise-beans>
-
-</jboss>
Deleted: jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/jbosscmp-jdbc.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/jbosscmp-jdbc.xml 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/jbosscmp-jdbc.xml 2008-12-29 09:27:38 UTC (rev 3568)
@@ -1,35 +0,0 @@
-<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_4_0.dtd">
-
-<jbosscmp-jdbc>
- <defaults>
- <datasource>java:DefaultDS</datasource>
- <datasource-mapping>Hypersonic SQL</datasource-mapping>
- <create-table>false</create-table>
- </defaults>
- <enterprise-beans>
- <entity>
- <ejb-name>Timer</ejb-name>
- <!--
- <read-only>true</read-only>
- -->
- <table-name>JBPM_JOB</table-name>
- <cmp-field>
- <field-name>dbid</field-name>
- <column-name>DBID_</column-name>
- <auto-increment/>
- </cmp-field>
- <cmp-field>
- <field-name>dueDate</field-name>
- <column-name>DUEDATE_</column-name>
- </cmp-field>
- <!--
- <optimistic-locking>
- <version-column />
- <field-name>dbversion</field-name>
- <column-name>DBVERSION_</column-name>
- </optimistic-locking>
- -->
- </entity>
- </enterprise-beans>
-</jbosscmp-jdbc>
\ No newline at end of file
Copied: jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/ejb-jar.xml (from rev 3567, jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/ejb-jar.xml)
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/ejb-jar.xml (rev 0)
+++ jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/ejb-jar.xml 2008-12-29 09:27:38 UTC (rev 3568)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ejb-jar version="2.1"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee">
+
+ <description>JBoss jBPM enterprise beans</description>
+ <display-name>JBoss jBPM enterprise beans</display-name>
+
+ <enterprise-beans>
+
+ <session>
+ <description>JBoss jBPM Command Executor SLSB</description>
+ <display-name>JBoss jBPM Command Executor SLSB</display-name>
+ <ejb-name>CommandExecutor</ejb-name>
+ <home>org.jbpm.pvm.internal.ejb.RemoteCommandExecutorHome</home>
+ <remote>org.jbpm.pvm.internal.ejb.RemoteCommandExecutor</remote>
+ <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home>
+ <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local>
+ <ejb-class>org.jbpm.pvm.internal.ejb.CommandExecutorSLSB</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/LocalTimer</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <local-home>org.jbpm.pvm.internal.ejb.LocalTimerHome</local-home>
+ <local>org.jbpm.pvm.internal.ejb.LocalTimer</local>
+ <ejb-link>Timer</ejb-link>
+ </ejb-local-ref>
+ </session>
+
+ <message-driven>
+ <description>JBoss jBPM Command Receiver MDB</description>
+ <ejb-name>CommandReceiver</ejb-name>
+ <ejb-class>org.jbpm.pvm.internal.ejb.CommandReceiverMDB</ejb-class>
+ <transaction-type>Container</transaction-type>
+ <message-destination-type>javax.jms.Queue</message-destination-type>
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home>
+ <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local>
+ <ejb-link>CommandExecutor</ejb-link>
+ </ejb-local-ref>
+ <resource-ref>
+ <res-ref-name>jms/CommandConnectionFactory</res-ref-name>
+ <res-type>javax.jms.ConnectionFactory</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
+ </resource-ref>
+ <message-destination-ref>
+ <message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name>
+ <message-destination-type>javax.jms.Queue</message-destination-type>
+ <message-destination-usage>Produces</message-destination-usage>
+ </message-destination-ref>
+ </message-driven>
+
+ <entity>
+ <display-name>JBoss jBPM Timer EB</display-name>
+ <ejb-name>Timer</ejb-name>
+ <local-home>org.jbpm.pvm.internal.ejb.LocalTimerHome</local-home>
+ <local>org.jbpm.pvm.internal.ejb.LocalTimer</local>
+ <ejb-class>org.jbpm.pvm.internal.ejb.TimerEB</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.Long</prim-key-class>
+ <reentrant>false</reentrant>
+ <cmp-version>2.x</cmp-version>
+ <abstract-schema-name>pvm</abstract-schema-name>
+ <cmp-field>
+ <field-name>dbid</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>dueDate</field-name>
+ </cmp-field>
+ <!--
+ <cmp-field>
+ <field-name>dbversion</field-name>
+ </cmp-field>
+ -->
+ <primkey-field>dbid</primkey-field>
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home>
+ <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local>
+ <ejb-link>CommandExecutor</ejb-link>
+ </ejb-local-ref>
+ </entity>
+
+ </enterprise-beans>
+
+ <assembly-descriptor>
+
+ <container-transaction>
+ <method>
+ <ejb-name>CommandExecutor</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Required</trans-attribute>
+ </container-transaction>
+
+ <container-transaction>
+ <method>
+ <ejb-name>CommandReceiver</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Required</trans-attribute>
+ </container-transaction>
+
+ <container-transaction>
+ <method>
+ <ejb-name>Timer</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Required</trans-attribute>
+ </container-transaction>
+
+ </assembly-descriptor>
+
+</ejb-jar>
Property changes on: jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jboss.xml (from rev 3567, jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/jboss.xml)
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jboss.xml (rev 0)
+++ jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jboss.xml 2008-12-29 09:27:38 UTC (rev 3568)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
+<jboss>
+
+ <enterprise-beans>
+
+ <session>
+ <ejb-name>CommandExecutor</ejb-name>
+ <jndi-name>jbpm/CommandExecutor</jndi-name>
+ <local-jndi-name>java:jbpm/CommandExecutor</local-jndi-name>
+ </session>
+
+ <message-driven>
+ <ejb-name>CommandReceiver</ejb-name>
+ <destination-jndi-name>queue/JbpmCommandQueue</destination-jndi-name>
+ <resource-ref>
+ <res-ref-name>jms/CommandConnectionFactory</res-ref-name>
+ <jndi-name>java:JmsXA</jndi-name>
+ </resource-ref>
+ <message-destination-ref>
+ <message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name>
+ <jndi-name>queue/DLQ</jndi-name>
+ </message-destination-ref>
+ </message-driven>
+
+ <entity>
+ <ejb-name>Timer</ejb-name>
+ <local-jndi-name>java:jbpm/Timer</local-jndi-name>
+ </entity>
+
+ </enterprise-beans>
+
+</jboss>
Property changes on: jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jbosscmp-jdbc.xml (from rev 3567, jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/jbosscmp-jdbc.xml)
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jbosscmp-jdbc.xml (rev 0)
+++ jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jbosscmp-jdbc.xml 2008-12-29 09:27:38 UTC (rev 3568)
@@ -0,0 +1,35 @@
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_4_0.dtd">
+
+<jbosscmp-jdbc>
+ <defaults>
+ <datasource>java:DefaultDS</datasource>
+ <datasource-mapping>Hypersonic SQL</datasource-mapping>
+ <create-table>false</create-table>
+ </defaults>
+ <enterprise-beans>
+ <entity>
+ <ejb-name>Timer</ejb-name>
+ <!--
+ <read-only>true</read-only>
+ -->
+ <table-name>JBPM_JOB</table-name>
+ <cmp-field>
+ <field-name>dbid</field-name>
+ <column-name>DBID_</column-name>
+ <auto-increment/>
+ </cmp-field>
+ <cmp-field>
+ <field-name>dueDate</field-name>
+ <column-name>DUEDATE_</column-name>
+ </cmp-field>
+ <!--
+ <optimistic-locking>
+ <version-column />
+ <field-name>dbversion</field-name>
+ <column-name>DBVERSION_</column-name>
+ </optimistic-locking>
+ -->
+ </entity>
+ </enterprise-beans>
+</jbosscmp-jdbc>
\ No newline at end of file
Property changes on: jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jbosscmp-jdbc.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Property changes on: jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF
___________________________________________________________________
Name: svn:mergeinfo
+
Added: jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/jboss-web.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/jboss-web.xml (rev 0)
+++ jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/jboss-web.xml 2008-12-29 09:27:38 UTC (rev 3568)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd" >
+<jboss-web>
+
+ <resource-ref>
+ <res-ref-name>jms/CommandConnectionFactory</res-ref-name>
+ <jndi-name>java:ConnectionFactory</jndi-name>
+ </resource-ref>
+
+ <message-destination-ref>
+ <message-destination-ref-name>jms/CommandQueue</message-destination-ref-name>
+ <jndi-name>queue/JbpmCommandQueue</jndi-name>
+ </message-destination-ref>
+
+</jboss-web>
Added: jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/web.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/web.xml (rev 0)
+++ jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/web.xml 2008-12-29 09:27:38 UTC (rev 3568)
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+
+<web-app version="2.4"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee">
+
+ <servlet>
+ <servlet-name>ServletRedirector</servlet-name>
+ <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ServletRedirector</servlet-name>
+ <url-pattern>/ServletRedirector</url-pattern>
+ </servlet-mapping>
+
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home>
+ <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local>
+ <ejb-link>CommandExecutor</ejb-link>
+ </ejb-local-ref>
+
+ <ejb-local-ref>
+ <ejb-ref-name>ejb/LocalTimer</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <local-home>org.jbpm.pvm.internal.ejb.LocalTimerHome</local-home>
+ <local>org.jbpm.pvm.internal.ejb.LocalTimer</local>
+ <ejb-link>Timer</ejb-link>
+ </ejb-local-ref>
+
+ <resource-ref>
+ <res-ref-name>jms/CommandConnectionFactory</res-ref-name>
+ <res-type>javax.jms.ConnectionFactory</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
+ </resource-ref>
+
+ <message-destination-ref>
+ <message-destination-ref-name>jms/CommandQueue</message-destination-ref-name>
+ <message-destination-type>javax.jms.Queue</message-destination-type>
+ <message-destination-usage>Produces</message-destination-usage>
+ </message-destination-ref>
+
+</web-app>
\ No newline at end of file
Copied: jbpm4/trunk/modules/enterprise/src/test/resources/cactus.properties (from rev 3567, jbpm4/trunk/modules/pvm/src/test/resources/cactus.properties)
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/resources/cactus.properties (rev 0)
+++ jbpm4/trunk/modules/enterprise/src/test/resources/cactus.properties 2008-12-29 09:27:38 UTC (rev 3568)
@@ -0,0 +1 @@
+cactus.contextURL = http://localhost:8080/pvm-enterprise-test
\ No newline at end of file
Property changes on: jbpm4/trunk/modules/enterprise/src/test/resources/cactus.properties
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: jbpm4/trunk/modules/examples/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2008-12-29 09:27:38 UTC (rev 3568)
@@ -14,7 +14,7 @@
# For example, set the com.xyz.foo logger to only log SEVERE messages:
# com.xyz.foo.level = SEVERE
-org.jbpm.level=FINEST
+org.jbpm.level=INFO
org.jbpm.pvm.internal.tx.level=FINE
org.jbpm.pvm.internal.wire.level=FINE
org.jbpm.pvm.internal.util.level=FINE
@@ -22,7 +22,7 @@
org.hibernate.level=INFO
org.hibernate.cfg.HbmBinder.level=SEVERE
org.hibernate.cfg.SettingsFactory.level=SEVERE
-org.hibernate.SQL.level=FINEST
+# org.hibernate.SQL.level=FINEST
# org.hibernate.type.level=FINEST
# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST
# org.hibernate.transaction.level=FINEST
Modified: jbpm4/trunk/modules/pvm/pom.xml
===================================================================
--- jbpm4/trunk/modules/pvm/pom.xml 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/pvm/pom.xml 2008-12-29 09:27:38 UTC (rev 3568)
@@ -95,49 +95,12 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>build-jars</id>
- <phase>test-compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="tests.output.dir" value="${project.build.directory}" />
- <property name="tests.resources.dir" value="${basedir}/src/test/resources" />
- <ant antfile="scripts/build-jars-pvm.xml" target="build-jars-pvm" />
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>rename-tables</id>
- <phase>compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <replace dir="target/classes" includes="**/hibernate.*.hbm.xml" token="table="JBPM_" value="table="${table.prefix}" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<showDeprecation>false</showDeprecation>
</configuration>
</plugin>
<plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <applicationXml>${basedir}/src/main/etc/ear/META-INF/application.xml</applicationXml>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
Deleted: jbpm4/trunk/modules/pvm/src/test/resources/cactus.properties
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/cactus.properties 2008-12-29 01:26:51 UTC (rev 3567)
+++ jbpm4/trunk/modules/pvm/src/test/resources/cactus.properties 2008-12-29 09:27:38 UTC (rev 3568)
@@ -1 +0,0 @@
-cactus.contextURL = http://localhost:8080/pvm-enterprise-test
\ No newline at end of file
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3567 - in jbpm3/branches/aguizar/modules/core: src/main/resources and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-12-28 20:26:51 -0500 (Sun, 28 Dec 2008)
New Revision: 3567
Added:
jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.mapping.sybase.xml
Modified:
jbpm3/branches/aguizar/modules/core/scripts/antrun-jbpm-config.xml
jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.cache.xml
jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.mapping.default.xml
Log:
reference types file from hibernate config only for databases that have custom types
Modified: jbpm3/branches/aguizar/modules/core/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/branches/aguizar/modules/core/scripts/antrun-jbpm-config.xml 2008-12-28 23:46:48 UTC (rev 3566)
+++ jbpm3/branches/aguizar/modules/core/scripts/antrun-jbpm-config.xml 2008-12-29 01:26:51 UTC (rev 3567)
@@ -53,31 +53,25 @@
<available property="@{database}.properties.available" file="${build.resources.directory}/hibernate.properties.(a){database}.xml"/>
<fail message="hibernate.properties.(a){database}.xml not available" unless="@{database}.properties.available"/>
- <condition property="hibernate.mapping.(a){database}.xml" value="hibernate.mapping.(a){database}.xml" else="hibernate.mapping.default.xml">
- <available property="@{database}.mapping.available" file="${build.resources.directory}/hibernate.mapping.(a){database}.xml"/>
- </condition>
-
- <echo message="Concat hibernate.cfg.(a){database}.xml using hibernate.properties.(a){database}.xml, ${hibernate.mapping.(a){database}.xml}" />
-
+ <echo message="Concat hibernate.cfg.(a){database}.xml using hibernate.properties.(a){database}.xml, hibernate.mapping.(a){database}.xml" />
+
<!-- Concat hibernate.cfg.xml -->
<concat destfile="${project.build.directory}/classes/hibernate.cfg.(a){database}.xml">
- <header trimleading="yes"><![CDATA[<?xml version='1.0' encoding='utf-8'?>
-
- <!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
- <hibernate-configuration>
- <session-factory>
- ]]></header>
+ <header><![CDATA[<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE hibernate-configuration PUBLIC
+ "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+ <session-factory>
+]]></header>
<fileset file="${build.resources.directory}/hibernate.properties.(a){database}.xml" />
<fileset file="${build.resources.directory}/hibernate.common.xml" />
- <fileset file="${build.resources.directory}/${hibernate.mapping.(a){database}.xml}" />
+ <fileset file="${build.resources.directory}/hibernate.mapping.(a){database}.xml" />
+ <fileset file="${build.resources.directory}/hibernate.mapping.default.xml" />
<fileset file="${build.resources.directory}/hibernate.cache.xml" />
- <footer trimleading="yes"><![CDATA[
- </session-factory>
- </hibernate-configuration>
- ]]></footer>
+ <footer><![CDATA[ </session-factory>
+</hibernate-configuration>]]></footer>
</concat>
</sequential>
</macrodef>
Modified: jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.cache.xml
===================================================================
--- jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.cache.xml 2008-12-28 23:46:48 UTC (rev 3566)
+++ jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.cache.xml 2008-12-29 01:26:51 UTC (rev 3567)
@@ -1,62 +1,61 @@
- <!-- ################################### -->
- <!-- # cache settings # -->
- <!-- # strategy="nonstrict-read-write" # -->
- <!-- # can be used with hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider # -->
- <!-- ################################### -->
-
- <class-cache class="org.jbpm.context.def.VariableAccess" usage="nonstrict-read-write" />
-
- <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="nonstrict-read-write" />
-
- <collection-cache collection="org.jbpm.graph.action.Script.variableAccesses" usage="nonstrict-read-write" />
-
- <class-cache class="org.jbpm.graph.def.Action" usage="nonstrict-read-write" />
-
- <class-cache class="org.jbpm.graph.def.Event" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.graph.def.Event.actions" usage="nonstrict-read-write" />
-
- <class-cache class="org.jbpm.graph.def.ExceptionHandler" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.graph.def.ExceptionHandler.actions" usage="nonstrict-read-write" />
-
- <class-cache class="org.jbpm.graph.def.Node" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.graph.def.Node.events" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.graph.def.Node.exceptionHandlers" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.graph.def.Node.leavingTransitions" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.graph.def.Node.arrivingTransitions" usage="nonstrict-read-write" />
-
- <class-cache class="org.jbpm.graph.def.ProcessDefinition" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.events" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.exceptionHandlers" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.nodes" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.actions" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.definitions" usage="nonstrict-read-write" />
-
- <collection-cache collection="org.jbpm.graph.def.SuperState.nodes" usage="nonstrict-read-write" />
-
- <class-cache class="org.jbpm.graph.def.Transition" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.graph.def.Transition.events" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.graph.def.Transition.exceptionHandlers" usage="nonstrict-read-write" />
-
- <collection-cache collection="org.jbpm.graph.node.Decision.decisionConditions" usage="nonstrict-read-write" />
-
- <collection-cache collection="org.jbpm.graph.node.ProcessState.variableAccesses" usage="nonstrict-read-write" />
-
- <collection-cache collection="org.jbpm.graph.node.TaskNode.tasks" usage="nonstrict-read-write" />
-
- <class-cache class="org.jbpm.instantiation.Delegation" usage="nonstrict-read-write" />
-
- <class-cache class="org.jbpm.module.def.ModuleDefinition" usage="nonstrict-read-write" />
-
- <collection-cache collection="org.jbpm.taskmgmt.def.Swimlane.tasks" usage="nonstrict-read-write" />
-
- <class-cache class="org.jbpm.taskmgmt.def.TaskController" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.taskmgmt.def.TaskController.variableAccesses" usage="nonstrict-read-write" />
-
- <class-cache class="org.jbpm.taskmgmt.def.Task" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.taskmgmt.def.Task.events" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.taskmgmt.def.Task.exceptionHandlers" usage="nonstrict-read-write" />
-
- <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.swimlanes" usage="nonstrict-read-write" />
- <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.tasks" usage="nonstrict-read-write" />
+ <!-- ################################### -->
+ <!-- # cache settings # -->
+ <!-- # strategy="nonstrict-read-write" # -->
+ <!-- # can be used with hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider # -->
+ <!-- ################################### -->
+ <class-cache class="org.jbpm.context.def.VariableAccess" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.graph.action.Script.variableAccesses" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.graph.def.Action" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.graph.def.Event" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Event.actions" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.graph.def.ExceptionHandler" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.ExceptionHandler.actions" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.graph.def.Node" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Node.events" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Node.exceptionHandlers" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Node.leavingTransitions" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Node.arrivingTransitions" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.graph.def.ProcessDefinition" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.events" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.exceptionHandlers" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.nodes" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.actions" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.definitions" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.graph.def.SuperState.nodes" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.graph.def.Transition" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Transition.events" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Transition.exceptionHandlers" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.graph.node.Decision.decisionConditions" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.graph.node.ProcessState.variableAccesses" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.graph.node.TaskNode.tasks" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.instantiation.Delegation" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.module.def.ModuleDefinition" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.taskmgmt.def.Swimlane.tasks" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.taskmgmt.def.TaskController" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.taskmgmt.def.TaskController.variableAccesses" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.taskmgmt.def.Task" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.taskmgmt.def.Task.events" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.taskmgmt.def.Task.exceptionHandlers" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.swimlanes" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.tasks" usage="nonstrict-read-write" />
Modified: jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.mapping.default.xml
===================================================================
--- jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.mapping.default.xml 2008-12-28 23:46:48 UTC (rev 3566)
+++ jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.mapping.default.xml 2008-12-29 01:26:51 UTC (rev 3567)
@@ -1,143 +1,141 @@
- <!-- ###################### -->
- <!-- # jbpm mapping files # -->
- <!-- ###################### -->
+ <!-- ###################### -->
+ <!-- # jbpm mapping files # -->
+ <!-- ###################### -->
- <!-- hql queries -->
- <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
- <!-- hql queries used in simulation for querying historical data
+ <!-- hql queries -->
+ <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
+ <!-- hql queries used in simulation for querying historical data
uncomment if you want to use the GetSimulationInputCommand
or maybe you also want to use the queries yourself
be patient: the queries need the stddev function to be enabled in your dialect
more information on this can be found here: http://www.camunda.com/business_process_simulation_news/mysql_and_stddev.... -->
- <!--
- <mapping resource="org/jbpm/sim/bam/hibernate.queries.hbm.xml" />
- -->
- <!-- type definitions (absent for most databases) -->
- <mapping resource="org/jbpm/db/hibernate.types.${database}.hbm.xml" />
+ <!--
+ <mapping resource="org/jbpm/sim/bam/hibernate.queries.hbm.xml" />
+ -->
- <!-- graph.action mapping files -->
- <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
+ <!-- graph.action mapping files -->
+ <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
- <!-- graph.def mapping files -->
- <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
- <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
+ <!-- graph.def mapping files -->
+ <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
+ <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
- <!-- ############################################ -->
- <!-- # another mapping file with external dependencies # -->
- <!-- ############################################ -->
- <!-- following mapping file has a dependency on -->
- <!-- 'bsh-{version}.jar'. -->
- <!-- uncomment this if you don't have bsh on your -->
- <!-- classpath. you won't be able to use the -->
- <!-- script element in process definition files -->
- <!-- has to be defined below org/jbpm/graph/def/Action.hbm.xml -->
- <!-- due to the inline collection-cache elements below -->
- <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
+ <!-- ############################################ -->
+ <!-- # another mapping file with external dependencies # -->
+ <!-- ############################################ -->
+ <!-- following mapping file has a dependency on -->
+ <!-- 'bsh-{version}.jar'. -->
+ <!-- uncomment this if you don't have bsh on your -->
+ <!-- classpath. you won't be able to use the -->
+ <!-- script element in process definition files -->
+ <!-- has to be defined below org/jbpm/graph/def/Action.hbm.xml -->
+ <!-- due to the inline collection-cache elements below -->
+ <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
- <!-- graph.node mapping files -->
- <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
+ <!-- graph.node mapping files -->
+ <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
- <!-- context.def mapping files -->
- <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
+ <!-- context.def mapping files -->
+ <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
- <!-- bytes mapping files -->
- <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
+ <!-- bytes mapping files -->
+ <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
- <!-- module.def mapping files -->
- <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
+ <!-- module.def mapping files -->
+ <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
- <!-- file.def mapping files -->
- <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
+ <!-- file.def mapping files -->
+ <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
- <!-- taskmgmt.def mapping files -->
- <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
+ <!-- taskmgmt.def mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
- <!-- scheduler.def mapping files -->
- <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
- <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
+ <!-- scheduler.def mapping files -->
+ <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
+ <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
- <!-- graph.exe mapping files -->
- <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
+ <!-- graph.exe mapping files -->
+ <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
- <!-- module.exe mapping files -->
- <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
+ <!-- module.exe mapping files -->
+ <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
- <!-- context.exe mapping files -->
- <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
+ <!-- context.exe mapping files -->
+ <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
- <!-- job mapping files -->
- <mapping resource="org/jbpm/job/Job.hbm.xml"/>
- <mapping resource="org/jbpm/job/Timer.hbm.xml"/>
- <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/>
- <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/>
- <mapping resource="org/jbpm/job/CleanUpProcessJob.hbm.xml"/>
+ <!-- job mapping files -->
+ <mapping resource="org/jbpm/job/Job.hbm.xml"/>
+ <mapping resource="org/jbpm/job/Timer.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/>
+ <mapping resource="org/jbpm/job/CleanUpProcessJob.hbm.xml"/>
- <!-- taskmgmt.exe mapping files -->
- <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
+ <!-- taskmgmt.exe mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
- <!-- logging mapping files -->
- <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
- <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
- <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>
+ <!-- logging mapping files -->
+ <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
+ <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
+ <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>
Added: jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.mapping.sybase.xml
===================================================================
--- jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.mapping.sybase.xml (rev 0)
+++ jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.mapping.sybase.xml 2008-12-29 01:26:51 UTC (rev 3567)
@@ -0,0 +1,2 @@
+ <!-- sybase type mappings -->
+ <mapping resource="org/jbpm/db/hibernate.types.sybase.hbm.xml" />
\ No newline at end of file
15 years, 4 months
- 1
- 0
JBoss JBPM SVN: r3566 - in jbpm3/branches/aguizar/modules/core/src: main/resources and 2 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-12-28 18:46:48 -0500 (Sun, 28 Dec 2008)
New Revision: 3566
Added:
jbpm3/branches/aguizar/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml
Modified:
jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java
jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.mapping.default.xml
jbpm3/branches/aguizar/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
jbpm3/branches/aguizar/modules/core/src/test/resources/log4j.xml
Log:
JBPM-1818: database-specific type definition files
Modified: jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java
===================================================================
--- jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java 2008-12-28 19:48:15 UTC (rev 3565)
+++ jbpm3/branches/aguizar/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java 2008-12-28 23:46:48 UTC (rev 3566)
@@ -33,14 +33,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.HibernateException;
-import org.hibernate.cfg.Environment;
import org.hibernate.type.Type;
import org.hibernate.usertype.UserType;
import org.hibernate.util.EqualsHelper;
import org.hibernate.util.StringHelper;
-import org.jbpm.JbpmContext;
-import org.jbpm.persistence.db.DbPersistenceServiceFactory;
-import org.jbpm.svc.Services;
/**
* @author Alejandro Guizar
@@ -201,21 +197,10 @@
}
public void setNull(PreparedStatement st, int index) throws HibernateException, SQLException {
- if (getHibernateDialect().indexOf("Sybase") == -1) {
- st.setNull(index, sqlType());
- }
- else {
- // JBPM-1818: workaround for SQL state JZ0SL: "Unsupported SQL type" with jConnect
- st.setCharacterStream(index, null, 0);
- }
+ // JBPM-1818: workaround for SQL state JZ0SL: "Unsupported SQL type" with jConnect
+ st.setCharacterStream(index, null, 0);
}
- private String getHibernateDialect() {
- DbPersistenceServiceFactory factory = (DbPersistenceServiceFactory) JbpmContext
- .getCurrentJbpmContext().getServiceFactory(Services.SERVICENAME_PERSISTENCE);
- return factory.getConfiguration().getProperty(Environment.DIALECT);
- }
-
public Object replace(Object original, Object target, Object owner) throws HibernateException {
return original;
}
Modified: jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.mapping.default.xml
===================================================================
--- jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.mapping.default.xml 2008-12-28 19:48:15 UTC (rev 3565)
+++ jbpm3/branches/aguizar/modules/core/src/main/resources/hibernate.mapping.default.xml 2008-12-28 23:46:48 UTC (rev 3566)
@@ -3,7 +3,7 @@
<!-- # jbpm mapping files # -->
<!-- ###################### -->
- <!-- hql queries and type defs -->
+ <!-- hql queries -->
<mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
<!-- hql queries used in simulation for querying historical data
uncomment if you want to use the GetSimulationInputCommand
@@ -13,6 +13,8 @@
<!--
<mapping resource="org/jbpm/sim/bam/hibernate.queries.hbm.xml" />
-->
+ <!-- type definitions (absent for most databases) -->
+ <mapping resource="org/jbpm/db/hibernate.types.${database}.hbm.xml" />
<!-- graph.action mapping files -->
<mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
Modified: jbpm3/branches/aguizar/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml
===================================================================
--- jbpm3/branches/aguizar/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2008-12-28 19:48:15 UTC (rev 3565)
+++ jbpm3/branches/aguizar/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2008-12-28 23:46:48 UTC (rev 3566)
@@ -6,8 +6,6 @@
<hibernate-mapping>
- <typedef name="text" class="org.jbpm.db.hibernate.TextType" />
-
<!-- related to ProcessDefintion -->
<!-- ########################### -->
Added: jbpm3/branches/aguizar/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml
===================================================================
--- jbpm3/branches/aguizar/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml (rev 0)
+++ jbpm3/branches/aguizar/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml 2008-12-28 23:46:48 UTC (rev 3566)
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+ <typedef name="text" class="org.jbpm.db.hibernate.TextType" />
+</hibernate-mapping>
\ No newline at end of file
Modified: jbpm3/branches/aguizar/modules/core/src/test/resources/log4j.xml
===================================================================
--- jbpm3/branches/aguizar/modules/core/src/test/resources/log4j.xml 2008-12-28 19:48:15 UTC (rev 3565)
+++ jbpm3/branches/aguizar/modules/core/src/test/resources/log4j.xml 2008-12-28 23:46:48 UTC (rev 3566)
@@ -38,9 +38,6 @@
<category name="org.hibernate.SQL">
<priority value="DEBUG" />
</category>
- <category name="org.hibernate.type">
- <priority value="TRACE" />
- </category>
<category name="org.hibernate.connection">
<priority value="TRACE" />
</category>
15 years, 4 months
- 1
- 0