[jbpm-commits] JBoss JBPM SVN: r1721 - in jbpm4/pvm/trunk: modules/core and 21 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Jul 25 06:51:28 EDT 2008
Author: tom.baeyens at jboss.com
Date: 2008-07-25 06:51:28 -0400 (Fri, 25 Jul 2008)
New Revision: 1721
Added:
jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java
jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java
jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java
jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java
jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java
jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/DbLangExtTests.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/DbModelTests.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/DbSvcTests.java
jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/
jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/model/
jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/svc/
Removed:
jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetJobsCmd.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/langext/
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/pvm/
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring/spring.beans.xml
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/
jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/client/
jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/db/
jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/pvm/
jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/spring2/
Modified:
jbpm4/pvm/trunk/
jbpm4/pvm/trunk/modules/core/pom.xml
jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java
jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/session/PvmDbSession.java
jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.job.hbm.xml
jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/pvm.wire.bindings.xml
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/jobexecutor/JobExecutorTimerSessionTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/DbTests.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/AddressActivity.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/AddressSession.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/LanguageExtensionsDbTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/language.extensions.hbm.xml
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/CommentDbTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/HibernateJobDbSessionTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/ProcessCacheDbTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/ProcessDefinitionDbTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/ProcessExecutionDbTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/SessionFactoryDbTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/WireDbTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/WireTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/ExecutionServiceTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/ManagementServiceTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/ProcessServiceTest.java
jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/timer/TimerIntegrationTest.java
jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/langext/environment.cfg.xml
jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/langext/language.extensions.hbm.xml
jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/svc/environment.cfg.xml
Log:
completed services split and updated some db tests
Property changes on: jbpm4/pvm/trunk
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
Modified: jbpm4/pvm/trunk/modules/core/pom.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/pom.xml 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/pom.xml 2008-07-25 10:51:28 UTC (rev 1721)
@@ -148,9 +148,6 @@
<configuration>
<argLine>${surefire.jvm.args}</argLine>
<excludes>
- <exclude>org/jbpm/db/svc/ManagementServiceTest.java</exclude>
- <exclude>org/jbpm/db/svc/ProcessServiceTest.java</exclude>
- <exclude>org/jbpm/db/svc/ExecutionServiceTest.java</exclude>
<exclude>org/jbpm/enterprise/CommandExecutorTest.java</exclude>
<exclude>org/jbpm/enterprise/TimerTest.java</exclude>
<exclude>org/jbpm/enterprise/EnterpriseTimerSessionTest.java</exclude>
@@ -161,7 +158,7 @@
<exclude>org/jbpm/pvm/samples/ex12/TimerTest.java</exclude>
<exclude>org/jbpm/pvm/samples/ex02/BasicProcessPersistenceTest.java</exclude>
<exclude>org/jbpm/pvm/samples/ex11/AsynchronousContinuationsTest.java</exclude>
- <exclude>org/jbpm/pvm/svc/hibernate/ExecutionTypeTest.java</exclude>
+ <exclude>org/jbpm/svc/hibernate/ExecutionTypeTest.java</exclude>
</excludes>
</configuration>
</plugin>
Deleted: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetJobsCmd.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetJobsCmd.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetJobsCmd.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.internal.cmd;
-
-import java.util.List;
-
-import org.jbpm.pvm.env.Environment;
-import org.jbpm.pvm.job.Job;
-import org.jbpm.pvm.session.PvmDbSession;
-
-/**
- * @author Tom Baeyens
- */
-public class GetJobsCmd implements Command<List<Job>> {
-
- private static final long serialVersionUID = 1L;
-
- public List<Job> execute(Environment environment) throws Exception {
- return environment.get(PvmDbSession.class).findAllJobs();
- }
-
-}
Added: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetMessagesCmd.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.cmd;
+
+import java.util.List;
+
+import org.jbpm.pvm.env.Environment;
+import org.jbpm.pvm.job.Message;
+import org.jbpm.pvm.session.PvmDbSession;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class GetMessagesCmd implements Command<List<Message>> {
+
+ private static final long serialVersionUID = 1L;
+
+ public List<Message> execute(Environment environment) throws Exception {
+ return environment.get(PvmDbSession.class).findMessages();
+ }
+
+}
Copied: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java (from rev 1720, jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetJobsCmd.java)
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.cmd;
+
+import java.util.List;
+
+import org.jbpm.pvm.env.Environment;
+import org.jbpm.pvm.job.Timer;
+import org.jbpm.pvm.session.PvmDbSession;
+
+/**
+ * @author Tom Baeyens
+ */
+public class GetTimersCmd implements Command<List<Timer>> {
+
+ private static final long serialVersionUID = 1L;
+
+ public List<Timer> execute(Environment environment) throws Exception {
+ return environment.get(PvmDbSession.class).findTimers();
+ }
+
+}
Property changes on: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/cmd/GetTimersCmd.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -27,6 +27,8 @@
import org.jbpm.pvm.client.ClientExecution;
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.job.Job;
+import org.jbpm.pvm.job.Message;
+import org.jbpm.pvm.job.Timer;
import org.jbpm.pvm.session.PvmDbSession;
/**
@@ -76,11 +78,16 @@
return (ClientExecution) query.uniqueResult();
}
- public List<Job> findAllJobs() {
+ public List<Timer> findTimers() {
// query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.job.hbm.xml
- return session.getNamedQuery("findAllJobs").list();
+ return session.getNamedQuery("findTimers").list();
}
+ public List<Message> findMessages() {
+ // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.job.hbm.xml
+ return session.getNamedQuery("findMessages").list();
+ }
+
public List<Job> findDeadJobs() {
// query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.job.hbm.xml
return session.getNamedQuery("findDeadJobs").list();
Added: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -0,0 +1,152 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.svc;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jbpm.pvm.Execution;
+import org.jbpm.pvm.ExecutionService;
+import org.jbpm.pvm.internal.cmd.ActivityInstanceCmd;
+import org.jbpm.pvm.internal.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.FindExecutionCmd;
+import org.jbpm.pvm.internal.cmd.GetVariableCmd;
+import org.jbpm.pvm.internal.cmd.GetVariablesCmd;
+import org.jbpm.pvm.internal.cmd.SetVariablesCmd;
+import org.jbpm.pvm.internal.cmd.SignalCmd;
+import org.jbpm.pvm.internal.cmd.StartExecutionCmd;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class CommandExecutionService implements ExecutionService {
+
+ protected CommandService commandService;
+
+ public Execution startExecution(long processDefinitionDbid){
+ return commandService.execute(new StartExecutionCmd(processDefinitionDbid, null, null));
+ }
+
+ public Execution startExecution(long processDefinitionDbid, String executionKey) {
+ return commandService.execute(new StartExecutionCmd(processDefinitionDbid, null, executionKey));
+ }
+
+ public Execution startExecution(long processDefinitionDbid, Map<String, Object> variables){
+ return commandService.execute(new StartExecutionCmd(processDefinitionDbid, variables, null));
+ }
+
+ public Execution startExecution(long processDefinitionDbid, Map<String, Object> variables, String executionKey){
+ return commandService.execute(new StartExecutionCmd(processDefinitionDbid, variables, executionKey));
+ }
+
+ public Execution startExecution(String processDefinitionName) {
+ return commandService.execute(new StartExecutionCmd(processDefinitionName, null, null));
+ }
+
+ public Execution startExecution(String processDefinitionName, Map<String, Object> variables){
+ return commandService.execute(new StartExecutionCmd(processDefinitionName, variables, null));
+ }
+
+ public Execution startExecution(String processDefinitionName, String executionKey) {
+ return commandService.execute(new StartExecutionCmd(processDefinitionName, null, executionKey));
+ }
+
+ public Execution startExecution(String processDefinitionName, Map<String, Object> variables, String executionKey){
+ return commandService.execute(new StartExecutionCmd(processDefinitionName, variables, executionKey));
+ }
+
+ public Execution signalExecution(long executionDbid) {
+ return commandService.execute(new SignalCmd(executionDbid, null, null));
+ }
+
+ public Execution signalExecution(long executionDbid, String signalName) {
+ return commandService.execute(new SignalCmd(executionDbid, signalName, null));
+ }
+
+ public Execution signalExecution(long executionDbid, String signalName, Map<String, Object> parameters) {
+ return commandService.execute(new SignalCmd(executionDbid, signalName, parameters));
+ }
+
+ public Execution signalExecution(long executionDbid, Map<String, Object> parameters) {
+ return commandService.execute(new SignalCmd(executionDbid, null, parameters));
+ }
+
+ public Execution signalExecution(String processDefinitionName, String executionKey) {
+ return commandService.execute(new SignalCmd(processDefinitionName, executionKey, null, null));
+ }
+
+ public Execution signalExecution(String processDefinitionName, String executionKey, String signalName) {
+ return commandService.execute(new SignalCmd(processDefinitionName, executionKey, signalName, null));
+ }
+
+ public Execution signalExecution(String processDefinitionName, String executionKey, String signalName, Map<String, Object> parameters) {
+ return commandService.execute(new SignalCmd(processDefinitionName, executionKey, signalName, parameters));
+ }
+
+ public Execution signalExecution(String processDefinitionName, String executionKey, Map<String, Object> parameters) {
+ return commandService.execute(new SignalCmd(processDefinitionName, executionKey, null, parameters));
+ }
+
+ public Execution signalActivityInstance(long activityInstanceDbid) {
+ return commandService.execute(new ActivityInstanceCmd(activityInstanceDbid, null, null));
+ }
+
+ public Execution signalActivityInstance(long activityInstanceDbid, String signalName) {
+ return commandService.execute(new ActivityInstanceCmd(activityInstanceDbid, signalName, null));
+ }
+
+ public Execution signalActivityInstance(long activityInstanceDbid, String signalName, Map<String, Object> parameters) {
+ return commandService.execute(new ActivityInstanceCmd(activityInstanceDbid, signalName, parameters));
+ }
+
+ public Execution signalActivityInstance(long activityInstanceDbid, Map<String, Object> parameters) {
+ return commandService.execute(new ActivityInstanceCmd(activityInstanceDbid, null, parameters));
+ }
+
+ public Execution findExecution(long executionDbid) {
+ return commandService.execute(new FindExecutionCmd(executionDbid));
+ }
+
+ public Execution findExecution(String processDefinitionName, String key) {
+ return commandService.execute(new FindExecutionCmd(processDefinitionName, key));
+ }
+
+ public Object getVariable(long executionDbid, String variableName) {
+ return commandService.execute(new GetVariableCmd(executionDbid, variableName));
+ }
+
+ public Map<String, Object> getVariables(long executionDbid, List<String> variableNames) {
+ return commandService.execute(new GetVariablesCmd(executionDbid, variableNames));
+ }
+
+ public Execution setVariable(long executionDbid, String name, Object value) {
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put(name, value);
+ return setVariables(executionDbid, variables);
+ }
+
+ public Execution setVariables(long executionDbid, Map<String, Object> variables) {
+ return commandService.execute(new SetVariablesCmd(executionDbid, variables));
+ }
+}
Added: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.svc;
+
+import java.util.List;
+
+import org.jbpm.pvm.ManagementService;
+import org.jbpm.pvm.internal.cmd.CommandService;
+import org.jbpm.pvm.internal.cmd.GetMessagesCmd;
+import org.jbpm.pvm.internal.cmd.GetTimersCmd;
+import org.jbpm.pvm.job.Message;
+import org.jbpm.pvm.job.Timer;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class CommandManagementService implements ManagementService {
+
+ protected CommandService commandService;
+
+ public List<Message> getMessages() {
+ return commandService.execute(new GetMessagesCmd());
+ }
+
+ public List<Timer> getTimers() {
+ return commandService.execute(new GetTimersCmd());
+ }
+
+}
Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -21,28 +21,16 @@
*/
package org.jbpm.pvm.internal.svc;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.jbpm.pvm.Deployment;
-import org.jbpm.pvm.Execution;
import org.jbpm.pvm.ProcessService;
-import org.jbpm.pvm.internal.cmd.ActivityInstanceCmd;
import org.jbpm.pvm.internal.cmd.CommandService;
import org.jbpm.pvm.internal.cmd.DeployCmd;
-import org.jbpm.pvm.internal.cmd.FindExecutionCmd;
import org.jbpm.pvm.internal.cmd.FindLatestProcessDefinitionCmd;
import org.jbpm.pvm.internal.cmd.FindProcessDefinitionCmd;
import org.jbpm.pvm.internal.cmd.FindProcessDefinitionNamesCmd;
import org.jbpm.pvm.internal.cmd.FindProcessDefinitionsCmd;
-import org.jbpm.pvm.internal.cmd.GetJobsCmd;
-import org.jbpm.pvm.internal.cmd.GetVariableCmd;
-import org.jbpm.pvm.internal.cmd.GetVariablesCmd;
-import org.jbpm.pvm.internal.cmd.SetVariablesCmd;
-import org.jbpm.pvm.internal.cmd.SignalCmd;
-import org.jbpm.pvm.internal.cmd.StartExecutionCmd;
-import org.jbpm.pvm.job.Job;
import org.jbpm.pvm.model.ProcessDefinition;
/** {@link ProcessService} implementation that delegates execution of the
@@ -83,116 +71,6 @@
return commandService.execute(new FindProcessDefinitionCmd(processDefinitionDbid));
}
- public Execution startExecution(long processDefinitionDbid){
- return commandService.execute(new StartExecutionCmd(processDefinitionDbid, null, null));
- }
-
- public Execution startExecution(long processDefinitionDbid, String executionKey) {
- return commandService.execute(new StartExecutionCmd(processDefinitionDbid, null, executionKey));
- }
-
- public Execution startExecution(long processDefinitionDbid, Map<String, Object> variables){
- return commandService.execute(new StartExecutionCmd(processDefinitionDbid, variables, null));
- }
-
- public Execution startExecution(long processDefinitionDbid, Map<String, Object> variables, String executionKey){
- return commandService.execute(new StartExecutionCmd(processDefinitionDbid, variables, executionKey));
- }
-
- public Execution startExecution(String processDefinitionName) {
- return commandService.execute(new StartExecutionCmd(processDefinitionName, null, null));
- }
-
- public Execution startExecution(String processDefinitionName, Map<String, Object> variables){
- return commandService.execute(new StartExecutionCmd(processDefinitionName, variables, null));
- }
-
- public Execution startExecution(String processDefinitionName, String executionKey) {
- return commandService.execute(new StartExecutionCmd(processDefinitionName, null, executionKey));
- }
-
- public Execution startExecution(String processDefinitionName, Map<String, Object> variables, String executionKey){
- return commandService.execute(new StartExecutionCmd(processDefinitionName, variables, executionKey));
- }
-
- public Execution signalExecution(long executionDbid) {
- return commandService.execute(new SignalCmd(executionDbid, null, null));
- }
-
- public Execution signalExecution(long executionDbid, String signalName) {
- return commandService.execute(new SignalCmd(executionDbid, signalName, null));
- }
-
- public Execution signalExecution(long executionDbid, String signalName, Map<String, Object> parameters) {
- return commandService.execute(new SignalCmd(executionDbid, signalName, parameters));
- }
-
- public Execution signalExecution(long executionDbid, Map<String, Object> parameters) {
- return commandService.execute(new SignalCmd(executionDbid, null, parameters));
- }
-
- public Execution signalExecution(String processDefinitionName, String executionKey) {
- return commandService.execute(new SignalCmd(processDefinitionName, executionKey, null, null));
- }
-
- public Execution signalExecution(String processDefinitionName, String executionKey, String signalName) {
- return commandService.execute(new SignalCmd(processDefinitionName, executionKey, signalName, null));
- }
-
- public Execution signalExecution(String processDefinitionName, String executionKey, String signalName, Map<String, Object> parameters) {
- return commandService.execute(new SignalCmd(processDefinitionName, executionKey, signalName, parameters));
- }
-
- public Execution signalExecution(String processDefinitionName, String executionKey, Map<String, Object> parameters) {
- return commandService.execute(new SignalCmd(processDefinitionName, executionKey, null, parameters));
- }
-
- public Execution signalActivityInstance(long activityInstanceDbid) {
- return commandService.execute(new ActivityInstanceCmd(activityInstanceDbid, null, null));
- }
-
- public Execution signalActivityInstance(long activityInstanceDbid, String signalName) {
- return commandService.execute(new ActivityInstanceCmd(activityInstanceDbid, signalName, null));
- }
-
- public Execution signalActivityInstance(long activityInstanceDbid, String signalName, Map<String, Object> parameters) {
- return commandService.execute(new ActivityInstanceCmd(activityInstanceDbid, signalName, parameters));
- }
-
- public Execution signalActivityInstance(long activityInstanceDbid, Map<String, Object> parameters) {
- return commandService.execute(new ActivityInstanceCmd(activityInstanceDbid, null, parameters));
- }
-
- public Execution findExecution(long executionDbid) {
- return commandService.execute(new FindExecutionCmd(executionDbid));
- }
-
- public Execution findExecution(String processDefinitionName, String key) {
- return commandService.execute(new FindExecutionCmd(processDefinitionName, key));
- }
-
- public Object getVariable(long executionDbid, String variableName) {
- return commandService.execute(new GetVariableCmd(executionDbid, variableName));
- }
-
- public Map<String, Object> getVariables(long executionDbid, List<String> variableNames) {
- return commandService.execute(new GetVariablesCmd(executionDbid, variableNames));
- }
-
- public Execution setVariable(long executionDbid, String name, Object value) {
- Map<String, Object> variables = new HashMap<String, Object>();
- variables.put(name, value);
- return setVariables(executionDbid, variables);
- }
-
- public Execution setVariables(long executionDbid, Map<String, Object> variables) {
- return commandService.execute(new SetVariablesCmd(executionDbid, variables));
- }
-
- public List<Job> getJobs() {
- return commandService.execute(new GetJobsCmd());
- }
-
public CommandService getCommandService() {
return commandService;
}
Added: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.wire.binding;
+
+import org.jbpm.pvm.internal.cmd.CommandService;
+import org.jbpm.pvm.internal.svc.CommandExecutionService;
+import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.jbpm.pvm.internal.xml.Parser;
+import org.w3c.dom.Element;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class ExecutionServiceBinding extends WireDescriptorBinding {
+
+ public ExecutionServiceBinding() {
+ super("execution-service");
+ }
+
+ public Object parse(Element element, Parse parse, Parser parser) {
+ ObjectDescriptor descriptor = new ObjectDescriptor(CommandExecutionService.class);
+ descriptor.addInjection("commandService", new ContextTypeRefDescriptor(CommandService.class));
+ return descriptor;
+ }
+}
Added: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.wire.binding;
+
+import org.jbpm.pvm.internal.cmd.CommandService;
+import org.jbpm.pvm.internal.svc.CommandManagementService;
+import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.jbpm.pvm.internal.xml.Parser;
+import org.w3c.dom.Element;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class ManagementServiceBinding extends WireDescriptorBinding {
+
+ public ManagementServiceBinding() {
+ super("management-service");
+ }
+
+ public Object parse(Element element, Parse parse, Parser parser) {
+ ObjectDescriptor descriptor = new ObjectDescriptor(CommandManagementService.class);
+ descriptor.addInjection("commandService", new ContextTypeRefDescriptor(CommandService.class));
+ return descriptor;
+ }
+}
Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/session/PvmDbSession.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/session/PvmDbSession.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/session/PvmDbSession.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -23,12 +23,11 @@
import java.util.List;
-import org.jbpm.pvm.Execution;
import org.jbpm.pvm.client.ClientExecution;
import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.job.Job;
-import org.jbpm.pvm.model.ProcessDefinition;
+import org.jbpm.pvm.job.Message;
+import org.jbpm.pvm.job.Timer;
/**
* @author Tom Baeyens, Pascal Verdage
@@ -50,11 +49,13 @@
/** an execution identified by process definition and business key */
ClientExecution findExecution(String processDefinitionName, String key);
- /** all jobs */
- List<Job> findAllJobs();
+ /** timers */
+ List<Timer> findTimers();
+ /** timers */
+ List<Message> findMessages();
+
/** the jobs for which all the retries have failed and which will not be picked up
* any more by the jobImpl executor */
public List<Job> findDeadJobs();
-
}
Modified: jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.job.hbm.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.job.hbm.xml 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.job.hbm.xml 2008-07-25 10:51:28 UTC (rev 1721)
@@ -55,14 +55,21 @@
<!-- ### HibernatePvmDbSession QUERIES ################################## -->
- <query name="findAllJobs">
+ <query name="findTimers">
<![CDATA[
- select job
- from org.jbpm.pvm.internal.job.JobImpl as job
+ select t
+ from org.jbpm.pvm.internal.job.TimerImpl as t
order by dueDate asc
]]>
</query>
+ <query name="findMessages">
+ <![CDATA[
+ select m
+ from org.jbpm.pvm.internal.job.MessageImpl as m
+ ]]>
+ </query>
+
<query name="findDeadJobs">
<![CDATA[
select job
Modified: jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/pvm.wire.bindings.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/pvm.wire.bindings.xml 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/pvm.wire.bindings.xml 2008-07-25 10:51:28 UTC (rev 1721)
@@ -53,6 +53,8 @@
<binding class="org.jbpm.pvm.internal.wire.binding.StandardCommandServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.AsyncCommandServiceBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.ProcessServiceBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" />
<!-- deployers -->
<binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.CreateProcessBinding" />
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/jobexecutor/JobExecutorTimerSessionTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/jobexecutor/JobExecutorTimerSessionTest.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/jobexecutor/JobExecutorTimerSessionTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -27,6 +27,7 @@
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.job.Job;
+import org.jbpm.pvm.job.Timer;
import org.jbpm.pvm.session.PvmDbSession;
import org.jbpm.pvm.session.TimerSession;
@@ -78,9 +79,9 @@
/** return the number of timers among active jobs */
private static int getNbTimer() {
int result = 0;
- List<Job> activeJobs = getPvmDbSession().findAllJobs();
- if (activeJobs != null) {
- for (Job job : activeJobs) {
+ List<Timer> timers = getPvmDbSession().findTimers();
+ if (timers != null) {
+ for (Job job : timers) {
if (job instanceof TimerImpl) {
result++;
}
@@ -134,13 +135,13 @@
if (firstJob instanceof TimerImpl) {
result = (TimerImpl) firstJob;
} else {
- List<Job> jobs = getPvmDbSession().findAllJobs();
- if (jobs != null) {
+ List<Timer> timers = getPvmDbSession().findTimers();
+ if (timers != null) {
Date dueDate = new Date(Long.MAX_VALUE);
- for (Job job : jobs) {
- if (job instanceof TimerImpl && job.getDueDate().before(dueDate)) {
- dueDate = job.getDueDate();
- result = (TimerImpl) job;
+ for (Timer timer : timers) {
+ if (timer instanceof TimerImpl && timer.getDueDate().before(dueDate)) {
+ dueDate = timer.getDueDate();
+ result = (TimerImpl) timer;
}
}
}
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/DbTests.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/DbTests.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/DbTests.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -24,7 +24,11 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.jbpm.pvm.db.langext.DbLangExtTests;
+import org.jbpm.pvm.db.model.DbModelTests;
+import org.jbpm.pvm.db.svc.DbSvcTests;
+
/**
* @author Tom Baeyens
*/
@@ -34,7 +38,9 @@
TestSuite suite = new TestSuite("Test for org.jbpm.pvm");
//$JUnit-BEGIN$
- // TODO
+ suite.addTest(DbLangExtTests.suite());
+ suite.addTest(DbModelTests.suite());
+ suite.addTest(DbSvcTests.suite());
//$JUnit-END$
return suite;
Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext (from rev 1715, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/langext)
Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/AddressActivity.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/langext/AddressActivity.java 2008-07-24 14:46:43 UTC (rev 1715)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/AddressActivity.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -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.db.langext;
+package org.jbpm.pvm.db.langext;
import org.jbpm.pvm.activity.Activity;
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/AddressSession.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/langext/AddressSession.java 2008-07-24 14:46:43 UTC (rev 1715)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/AddressSession.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -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.db.langext;
+package org.jbpm.pvm.db.langext;
import java.util.ArrayList;
import java.util.List;
Added: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/DbLangExtTests.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/DbLangExtTests.java (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/DbLangExtTests.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.db.langext;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class DbLangExtTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for org.jbpm.pvm.db.langext");
+ //$JUnit-BEGIN$
+ suite.addTestSuite(LanguageExtensionsDbTest.class);
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/LanguageExtensionsDbTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/langext/LanguageExtensionsDbTest.java 2008-07-24 14:46:43 UTC (rev 1715)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/LanguageExtensionsDbTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -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.db.langext;
+package org.jbpm.pvm.db.langext;
import java.util.ArrayList;
import java.util.List;
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/language.extensions.hbm.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/langext/language.extensions.hbm.xml 2008-07-24 14:46:43 UTC (rev 1715)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/langext/language.extensions.hbm.xml 2008-07-25 10:51:28 UTC (rev 1721)
@@ -3,7 +3,7 @@
<hibernate-mapping package="org.jbpm.pvm" default-access="field">
- <class name="org.jbpm.db.langext.AddressActivity">
+ <class name="org.jbpm.pvm.db.langext.AddressActivity">
<id name="id" column="DBID_" type="long">
<generator class="native" />
</id>
Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model (from rev 1720, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/pvm)
Property changes on: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/CommentDbTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/pvm/CommentDbTest.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/CommentDbTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -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.db.pvm;
+package org.jbpm.pvm.db.model;
import java.util.Date;
import java.util.List;
Added: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/DbModelTests.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/DbModelTests.java (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/DbModelTests.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.db.model;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class DbModelTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for org.jbpm.pvm.db.model");
+ //$JUnit-BEGIN$
+ suite.addTestSuite(SessionFactoryDbTest.class);
+ suite.addTestSuite(ProcessCacheDbTest.class);
+ suite.addTestSuite(WireDbTest.class);
+ suite.addTestSuite(ProcessExecutionDbTest.class);
+ suite.addTestSuite(CommentDbTest.class);
+ suite.addTestSuite(WireTest.class);
+ suite.addTestSuite(ProcessDefinitionDbTest.class);
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/HibernateJobDbSessionTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/pvm/HibernateJobDbSessionTest.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/HibernateJobDbSessionTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -1,4 +1,4 @@
-package org.jbpm.db.pvm;
+package org.jbpm.pvm.db.model;
import org.jbpm.pvm.test.base.JbpmTestCase;
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/ProcessCacheDbTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/pvm/ProcessCacheDbTest.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/ProcessCacheDbTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -11,7 +11,7 @@
* program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301, USA.
**/
-package org.jbpm.db.pvm;
+package org.jbpm.pvm.db.model;
import java.util.List;
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/ProcessDefinitionDbTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/pvm/ProcessDefinitionDbTest.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/ProcessDefinitionDbTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -11,7 +11,7 @@
* program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301, USA.
**/
-package org.jbpm.db.pvm;
+package org.jbpm.pvm.db.model;
import java.util.Date;
import java.util.List;
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/ProcessExecutionDbTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/pvm/ProcessExecutionDbTest.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/ProcessExecutionDbTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -11,7 +11,7 @@
* program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301, USA.
**/
-package org.jbpm.db.pvm;
+package org.jbpm.pvm.db.model;
import org.jbpm.pvm.test.base.DbTestCase;
import org.jbpm.pvm.internal.model.ExecutionImpl;
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/SessionFactoryDbTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/pvm/SessionFactoryDbTest.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/SessionFactoryDbTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -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.db.pvm;
+package org.jbpm.pvm.db.model;
import org.hibernate.SessionFactory;
import org.jbpm.pvm.test.base.DbTestCase;
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/WireDbTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/pvm/WireDbTest.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/WireDbTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -11,7 +11,7 @@
* program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301, USA.
**/
-package org.jbpm.db.pvm;
+package org.jbpm.pvm.db.model;
import java.util.ArrayList;
import java.util.LinkedList;
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/WireTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/pvm/WireTest.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/model/WireTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -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.db.pvm;
+package org.jbpm.pvm.db.model;
import org.hibernate.Session;
import org.jbpm.pvm.test.base.DbTestCase;
Copied: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc (from rev 1720, jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc)
Added: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/DbSvcTests.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/DbSvcTests.java (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/DbSvcTests.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -0,0 +1,43 @@
+/*
+ * 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.db.svc;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class DbSvcTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for org.jbpm.pvm.db.svc");
+ //$JUnit-BEGIN$
+ suite.addTestSuite(ExecutionServiceTest.class);
+ suite.addTestSuite(ProcessServiceTest.class);
+ suite.addTestSuite(ManagementServiceTest.class);
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/ExecutionServiceTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/ExecutionServiceTest.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/ExecutionServiceTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -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.db.svc;
+package org.jbpm.pvm.db.svc;
import java.util.ArrayList;
import java.util.HashMap;
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/ManagementServiceTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/ManagementServiceTest.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/ManagementServiceTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -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.db.svc;
+package org.jbpm.pvm.db.svc;
import org.jbpm.pvm.test.base.ServiceTestCase;
import org.jbpm.pvm.ManagementService;
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/ProcessServiceTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/db/svc/ProcessServiceTest.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/db/svc/ProcessServiceTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -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.db.svc;
+package org.jbpm.pvm.db.svc;
import java.util.ArrayList;
import java.util.List;
Deleted: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring/spring.beans.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring/spring.beans.xml 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring/spring.beans.xml 2008-07-25 10:51:28 UTC (rev 1721)
@@ -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.internal.spring.SpringEnvironmentFactory"
- scope="singleton" />
-
- <bean id="sessionFactory"
- class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"
- scope="singleton">
- <property name="mappingResources">
- <list>
- <value>org/jbpm/pvm/hibernate.typedefs.hbm.xml</value>
- <value>org/jbpm/pvm/hibernate.wire.hbm.xml</value>
- <value>org/jbpm/pvm/hibernate.definition.hbm.xml</value>
- <value>org/jbpm/pvm/hibernate.execution.hbm.xml</value>
- <value>org/jbpm/pvm/hibernate.variable.hbm.xml</value>
- <value>org/jbpm/pvm/hibernate.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
Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/timer/TimerIntegrationTest.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/timer/TimerIntegrationTest.java 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/timer/TimerIntegrationTest.java 2008-07-25 10:51:28 UTC (rev 1721)
@@ -27,7 +27,6 @@
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.NodeImpl;
import org.jbpm.pvm.internal.util.Clock;
-import org.jbpm.pvm.job.Job;
import org.jbpm.pvm.job.JobTestHelper;
import org.jbpm.pvm.job.Timer;
import org.jbpm.pvm.model.OpenExecution;
@@ -150,9 +149,9 @@
assertNull(child);
// check that timers have been deleted
- List<Job> jobs = Environment.getCurrent().get(PvmDbSession.class).findAllJobs();
- assertNotNull(jobs);
- assertTrue(jobs.isEmpty());
+ List<Timer> timers = Environment.getCurrent().get(PvmDbSession.class).findTimers();
+ assertNotNull(timers);
+ assertTrue(timers.isEmpty());
// check that process is in the right state
execution = loadExecutionFromDb(processInstance.getDbid());
@@ -184,9 +183,9 @@
assertNull(child);
// check that timers have been deleted
- List<Job> jobs = Environment.getCurrent().get(PvmDbSession.class).findAllJobs();
- assertNotNull(jobs);
- assertTrue(jobs.isEmpty());
+ List<Timer> timers = Environment.getCurrent().get(PvmDbSession.class).findTimers();
+ assertNotNull(timers);
+ assertTrue(timers.isEmpty());
// check that process is in the right state
execution = loadExecutionFromDb(processInstance.getDbid());
@@ -293,9 +292,9 @@
assertNull(child);
// check that timers have been deleted
- List<Job> jobs = Environment.getCurrent().get(PvmDbSession.class).findAllJobs();
- assertNotNull(jobs);
- assertTrue(jobs.isEmpty());
+ List<Timer> timers = Environment.getCurrent().get(PvmDbSession.class).findTimers();
+ assertNotNull(timers);
+ assertTrue(timers.isEmpty());
// check that process is in the right state
execution = loadExecutionFromDb(processInstance.getDbid());
@@ -330,9 +329,9 @@
assertNull(child);
// check that timers have been deleted
- List<Job> jobs = Environment.getCurrent().get(PvmDbSession.class).findAllJobs();
- assertNotNull(jobs);
- assertTrue(jobs.isEmpty());
+ List<Timer> timers = Environment.getCurrent().get(PvmDbSession.class).findTimers();
+ assertNotNull(timers);
+ assertTrue(timers.isEmpty());
// check that process is in the right state
execution = loadExecutionFromDb(processInstance.getDbid());
Copied: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db (from rev 1714, jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/db)
Property changes on: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/langext/environment.cfg.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/db/langext/environment.cfg.xml 2008-07-24 14:29:59 UTC (rev 1714)
+++ jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/langext/environment.cfg.xml 2008-07-25 10:51:28 UTC (rev 1721)
@@ -6,7 +6,7 @@
<properties resource="hibernate.properties" />
<mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" />
<cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" usage="nonstrict-read-write" />
- <mapping resource="org/jbpm/db/langext/language.extensions.hbm.xml" />
+ <mapping resource="org/jbpm/pvm/db/langext/language.extensions.hbm.xml" />
</hibernate-configuration>
<hibernate-session-factory />
@@ -19,7 +19,7 @@
<transaction />
<hibernate-session />
<pvm-db-session />
- <object class="org.jbpm.db.langext.AddressSession" />
+ <object class="org.jbpm.pvm.db.langext.AddressSession" />
</environment>
Modified: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/langext/language.extensions.hbm.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/db/langext/language.extensions.hbm.xml 2008-07-24 14:29:59 UTC (rev 1714)
+++ jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/langext/language.extensions.hbm.xml 2008-07-25 10:51:28 UTC (rev 1721)
@@ -3,7 +3,7 @@
<hibernate-mapping package="org.jbpm.pvm" default-access="field">
- <class name="org.jbpm.db.langext.AddressActivity">
+ <class name="org.jbpm.pvm.db.langext.AddressActivity">
<id name="id" column="DBID_" type="long">
<generator class="native" />
</id>
Copied: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/model (from rev 1714, jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/db/pvm)
Property changes on: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/model
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/svc (from rev 1720, jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/client)
Property changes on: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/svc
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/svc/environment.cfg.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/client/environment.cfg.xml 2008-07-25 09:50:20 UTC (rev 1720)
+++ jbpm4/pvm/trunk/modules/core/src/test/resources/org/jbpm/pvm/db/svc/environment.cfg.xml 2008-07-25 10:51:28 UTC (rev 1721)
@@ -12,6 +12,8 @@
</deployer-manager>
<process-service />
+ <execution-service />
+ <management-service />
<command-service>
<retry-interceptor />
More information about the jbpm-commits
mailing list