|
From: <do-...@jb...> - 2008-07-04 16:32:22
|
Author: tho...@jb...
Date: 2008-07-04 12:20:03 -0400 (Fri, 04 Jul 2008)
New Revision: 1528
Added:
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ProcessInstanceManagerImpl.java
Removed:
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ProcessInstanceFactoryImpl.java
Modified:
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ExecutionImpl.java
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ExecutionManagerImpl.java
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java
jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/runtime/ActivityWrapper.java
jbpm3/trunk/modules/jpdl/core/src/main/resources/jbpm-beans.xml
Log:
Cleanup API
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ExecutionImpl.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ExecutionImpl.java 2008-07-04 16:19:53 UTC (rev 1527)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ExecutionImpl.java 2008-07-04 16:20:03 UTC (rev 1528)
@@ -28,10 +28,10 @@
import java.util.Iterator;
import java.util.Set;
-import org.jboss.bpm.client.Execution;
-import org.jboss.bpm.client.ExecutionContext;
import org.jboss.bpm.client.ProcessInstance;
import org.jboss.bpm.client.internal.AbstractExecution;
+import org.jboss.bpm.process.Execution;
+import org.jboss.bpm.process.ExecutionContext;
import org.jboss.bpm.process.Node;
/**
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ExecutionManagerImpl.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ExecutionManagerImpl.java 2008-07-04 16:19:53 UTC (rev 1527)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ExecutionManagerImpl.java 2008-07-04 16:20:03 UTC (rev 1528)
@@ -23,10 +23,10 @@
// $Id$
-import org.jboss.bpm.client.Execution;
import org.jboss.bpm.client.ExecutionManager;
import org.jboss.bpm.client.ProcessEngine;
import org.jboss.bpm.client.ProcessInstance;
+import org.jboss.bpm.process.Execution;
import org.jbpm.integration.def.ProcessDefinitionImpl;
/**
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java 2008-07-04 16:19:53 UTC (rev 1527)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java 2008-07-04 16:20:03 UTC (rev 1528)
@@ -26,7 +26,7 @@
import org.jboss.bpm.client.ExecutionManager;
import org.jboss.bpm.client.ProcessDefinitionManager;
import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.bpm.client.ProcessInstanceFactory;
+import org.jboss.bpm.client.ProcessInstanceManager;
/**
* A process engine with public access
@@ -42,9 +42,9 @@
this.processDefinitionManager = processDefinitionManager;
}
- public void setProcessInstanceFactory(ProcessInstanceFactory processInstanceFactory)
+ public void setProcessInstanceManager(ProcessInstanceManager processInstanceManager)
{
- this.processInstanceFactory = processInstanceFactory;
+ this.processInstanceManager = processInstanceManager;
}
public void setExecutionManager(ExecutionManager executionManager)
Deleted: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ProcessInstanceFactoryImpl.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ProcessInstanceFactoryImpl.java 2008-07-04 16:19:53 UTC (rev 1527)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ProcessInstanceFactoryImpl.java 2008-07-04 16:20:03 UTC (rev 1528)
@@ -1,50 +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.integration.client;
-
-// $Id$
-
-import org.jboss.bpm.client.ProcessEngine;
-import org.jboss.bpm.client.ProcessInstance;
-import org.jboss.bpm.client.ProcessInstanceFactory;
-import org.jboss.bpm.process.ProcessDefinition;
-
-/**
- * TODO
- *
- * @author tho...@jb...
- * @since 18-Jun-2008
- */
-public class ProcessInstanceFactoryImpl extends ProcessInstanceFactory
-{
- public void setProcessEngine(ProcessEngine engine)
- {
- this.engine = engine;
- }
-
- @Override
- protected ProcessInstance createProcessInstanceOverride(ProcessDefinition pdef)
- {
- ProcessInstance pinst = new ProcessInstanceImpl(pdef);
- return pinst;
- }
-}
Copied: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ProcessInstanceManagerImpl.java (from rev 1525, jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ProcessInstanceFactoryImpl.java)
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ProcessInstanceManagerImpl.java (rev 0)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/client/ProcessInstanceManagerImpl.java 2008-07-04 16:20:03 UTC (rev 1528)
@@ -0,0 +1,50 @@
+/*
+ * 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.integration.client;
+
+// $Id$
+
+import org.jboss.bpm.client.ProcessEngine;
+import org.jboss.bpm.client.ProcessInstance;
+import org.jboss.bpm.client.ProcessInstanceManager;
+import org.jboss.bpm.process.ProcessDefinition;
+
+/**
+ * TODO
+ *
+ * @author tho...@jb...
+ * @since 18-Jun-2008
+ */
+public class ProcessInstanceManagerImpl extends ProcessInstanceManager
+{
+ public void setProcessEngine(ProcessEngine engine)
+ {
+ this.engine = engine;
+ }
+
+ @Override
+ protected ProcessInstance createProcessInstanceOverride(ProcessDefinition pdef)
+ {
+ ProcessInstance pinst = new ProcessInstanceImpl(pdef);
+ return pinst;
+ }
+}
Modified: jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/runtime/ActivityWrapper.java
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/runtime/ActivityWrapper.java 2008-07-04 16:19:53 UTC (rev 1527)
+++ jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/runtime/ActivityWrapper.java 2008-07-04 16:20:03 UTC (rev 1528)
@@ -23,7 +23,7 @@
// $Id$
-import org.jboss.bpm.client.Execution;
+import org.jboss.bpm.process.Execution;
import org.jboss.bpm.runtime.Activity;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.def.Action;
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/jbpm-beans.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/jbpm-beans.xml 2008-07-04 16:19:53 UTC (rev 1527)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/jbpm-beans.xml 2008-07-04 16:20:03 UTC (rev 1528)
@@ -7,7 +7,7 @@
<!-- The process engine -->
<bean name="jBPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl">
<property name="processDefinitionManager"><inject bean="jBPMProcessDefinitionManager"/></property>
- <property name="processInstanceFactory"><inject bean="jBPMProcessInstanceFactory"/></property>
+ <property name="processInstanceManager"><inject bean="jBPMProcessInstanceManager"/></property>
<property name="executionManager"><inject bean="jBPMExecutionManager"/></property>
</bean>
@@ -17,7 +17,7 @@
</bean>
<!-- The process instance manager -->
- <bean name="jBPMProcessInstanceFactory" class="org.jbpm.integration.client.ProcessInstanceFactoryImpl">
+ <bean name="jBPMProcessInstanceManager" class="org.jbpm.integration.client.ProcessInstanceManagerImpl">
<property name="processEngine"><inject bean="jBPMProcessEngine" state="Instantiated"/></property>
</bean>
|
