JBoss JBPM SVN: r3364 - in jbpm3/trunk/modules/distribution: src/main/resources/installer and 1 other directory.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-12 07:28:35 -0500 (Fri, 12 Dec 2008)
New Revision: 3364
Modified:
jbpm3/trunk/modules/distribution/jbpm3-distribution.iml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
Log:
Don't unpack gwt-console-server.war
Modified: jbpm3/trunk/modules/distribution/jbpm3-distribution.iml
===================================================================
--- jbpm3/trunk/modules/distribution/jbpm3-distribution.iml 2008-12-12 12:25:27 UTC (rev 3363)
+++ jbpm3/trunk/modules/distribution/jbpm3-distribution.iml 2008-12-12 12:28:35 UTC (rev 3364)
@@ -8,12 +8,13 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="jbpm3-toplevel" />
<orderEntry type="module" module-name="report-server" />
- <orderEntry type="module" module-name="jbpm3-toplevel" />
+ <orderEntry type="module" module-name="gwt-parent" />
+ <orderEntry type="module" module-name="jbpm3-enterprise" />
+ <orderEntry type="module" module-name="jbpm3-identity" />
+ <orderEntry type="module" module-name="jbpm3-core" />
<orderEntry type="module" module-name="gwt-war" />
- <orderEntry type="module" module-name="gwt-server" />
- <orderEntry type="module" module-name="gwt-rpc" />
- <orderEntry type="module" module-name="jbpm3-identity" />
<orderEntry type="module-library">
<library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile">
<CLASSES>
@@ -781,6 +782,82 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jbpm.jbpm3:bpm-spec-integration-jboss42:jar:config:3.3.1-SNAPSHOT:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/bpm-spec-integration-jboss42/3.3.1-SNAPSHOT/bpm-spec-integration-jboss42-3.3.1-SNAPSHOT-config.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jbpm.jbpm3:bpm-spec-integration-jbpm3:jar:config:3.3.1-SNAPSHOT:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/bpm-spec-integration-jbpm3/3.3.1-SNAPSHOT/bpm-spec-integration-jbpm3-3.3.1-SNAPSHOT-config.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jbpm.jbpm3:bpm-spec-integration-jboss42:jar:3.3.1-SNAPSHOT:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/bpm-spec-integration-jboss42/3.3.1-SNAPSHOT/bpm-spec-integration-jboss42-3.3.1-SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/bpm-spec-integration-jboss42/3.3.1-SNAPSHOT/bpm-spec-integration-jboss42-3.3.1-SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jbpm.jbpm3:bpm-spec-integration-jbpm3:jar:3.3.1-SNAPSHOT:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/bpm-spec-integration-jbpm3/3.3.1-SNAPSHOT/bpm-spec-integration-jbpm3-3.3.1-SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm3/bpm-spec-integration-jbpm3/3.3.1-SNAPSHOT/bpm-spec-integration-jbpm3-3.3.1-SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-12 12:25:27 UTC (rev 3363)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-12 12:28:35 UTC (rev 3364)
@@ -300,7 +300,7 @@
<pack name="GWT-Console" parent="jBPM3 JBoss Integration" required="no" preselected="yes">
<description>GWT-Console (Preview, use at your own risk)</description>
<file src="@{deploy.artifacts.dir}/lib/gwt-console.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
- <file src="@{deploy.artifacts.dir}/lib/gwt-console-server.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/gwt-console-server.war" unpack="true" override="true" />
+ <file src="@{deploy.artifacts.dir}/lib/gwt-console-server.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/gwt-console-server.war" unpack="false" override="true" />
<file src="@{deploy.artifacts.dir}/lib/report-server.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
<file src="@{deploy.artifacts.dir}/lib/gwt-console-server-report.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" />
<file src="@{deploy.artifacts.dir}/lib/report-engine.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" />
17 years, 4 months
JBoss JBPM SVN: r3363 - projects/gwt-console/trunk/server/src/main/webapp/WEB-INF.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-12 07:25:27 -0500 (Fri, 12 Dec 2008)
New Revision: 3363
Modified:
projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml
Log:
JBPM-1911:GWT Console does not deploy in JBoss500
Modified: projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml 2008-12-12 12:24:47 UTC (rev 3362)
+++ projects/gwt-console/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml 2008-12-12 12:25:27 UTC (rev 3363)
@@ -1,19 +1,21 @@
<?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//DTD Web Application 2.4//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
<jboss-web>
+ <class-loading>
+ <loader-repository>
+ org.bpm.console.server:gwt-consoler-server.war
+ </loader-repository>
+ </class-loading>
+
<security-domain>java:/jaas/jbpm-console</security-domain>
<context-root>gwt-console-server</context-root>
- <loader-repository>
- org.bpm.console.server:gwt-consoler-server.war
- </loader-repository>
-
<!--resource-ref>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
<jndi-name>java:/JbpmDS</jndi-name>
17 years, 4 months
JBoss JBPM SVN: r3362 - projects/report-server/trunk/server/src/main/webapp/WEB-INF.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-12 07:24:47 -0500 (Fri, 12 Dec 2008)
New Revision: 3362
Modified:
projects/report-server/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml
Log:
Fix jbos-web.xml
Modified: projects/report-server/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- projects/report-server/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml 2008-12-12 12:15:47 UTC (rev 3361)
+++ projects/report-server/trunk/server/src/main/webapp/WEB-INF/jboss-web.xml 2008-12-12 12:24:47 UTC (rev 3362)
@@ -1,19 +1,21 @@
<?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//DTD Web Application 2.4//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
<jboss-web>
+ <class-loading>
+ <loader-repository>
+ org.bpm.console.server:report-server.war
+ </loader-repository>
+ </class-loading>
+
<security-domain>java:/jaas/jbpm-console</security-domain>
<context-root>report-server</context-root>
- <loader-repository>
- org.bpm.console.server:report-server.war
- </loader-repository>
-
<!--resource-ref>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
<jndi-name>java:/JbpmDS</jndi-name>
17 years, 4 months
JBoss JBPM SVN: r3361 - projects/spec/trunk/modules/api.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-12 07:15:47 -0500 (Fri, 12 Dec 2008)
New Revision: 3361
Modified:
projects/spec/trunk/modules/api/.classpath
Log:
Use JSE1.6
Modified: projects/spec/trunk/modules/api/.classpath
===================================================================
--- projects/spec/trunk/modules/api/.classpath 2008-12-12 11:57:30 UTC (rev 3360)
+++ projects/spec/trunk/modules/api/.classpath 2008-12-12 12:15:47 UTC (rev 3361)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
17 years, 4 months
JBoss JBPM SVN: r3360 - projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-12 06:57:30 -0500 (Fri, 12 Dec 2008)
New Revision: 3360
Modified:
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/UserManagementImpl.java
Log:
Spec integration - all good
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java 2008-12-12 11:54:52 UTC (rev 3359)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java 2008-12-12 11:57:30 UTC (rev 3360)
@@ -59,7 +59,7 @@
public List<ProcessDefinitionRef> getProcessDefinitions()
{
- log.info("getProcessDefinitions");
+ log.debug("getProcessDefinitions");
List<ProcessDefinitionRef> results = new ArrayList<ProcessDefinitionRef>();
ProcessDefinitionService pdService = getProcessDefinitionService();
@@ -69,7 +69,7 @@
ObjectName procDefKey = itKey.next();
ProcessDefinition procDef = pdService.getProcessDefinition(procDefKey);
- log.info(procDef);
+ log.debug(procDef);
ProcessDefinitionRef pdRef = adaptProcessDefinition(procDef);
results.add(pdRef);
@@ -80,7 +80,7 @@
public ProcessDefinitionRef getProcessDefinition(long procDefId)
{
ProcessDefinition procDef = getProcessDefinitionInternal(procDefId);
- log.info("getProcessDefinition: " + procDef);
+ log.debug("getProcessDefinition: " + procDef);
return procDef != null ? new ProcessDefinitionRef(procDefId, procDef.getName(), procDef.getVersion()) : null;
}
@@ -88,7 +88,7 @@
public List<ProcessDefinitionRef> removeProcessDefinition(long procDefId)
{
ProcessDefinition procDef = getProcessDefinitionInternal(procDefId);
- log.info("removeDefinition: " + procDef);
+ log.debug("removeDefinition: " + procDef);
if (procDef != null)
{
@@ -101,7 +101,7 @@
public ProcessInstanceRef newInstance(long procDefId)
{
ProcessDefinition procDef = getProcessDefinitionInternal(procDefId);
- log.info("newInstance: " + procDef);
+ log.debug("newInstance: " + procDef);
if (procDef == null)
throw new IllegalStateException("Cannot obtain process definition: " + procDefId);
@@ -109,7 +109,7 @@
ProcessInstance proc = procDef.newInstance();
proc.startProcess();
- log.info("Started: " + proc);
+ log.debug("Started: " + proc);
ProcessInstanceRef procRef = adaptProcess(proc);
return procRef;
@@ -122,7 +122,7 @@
if (procDef == null)
throw new IllegalStateException("Cannot obtain process definition: " + procDefId);
- log.info("getProcessInstances: " + procDef);
+ log.debug("getProcessInstances: " + procDef);
ProcessInstanceService procService = getProcessInstanceService();
Iterator<ObjectName> itProc = procService.getInstance(procDef.getKey(), null).iterator();
@@ -131,7 +131,7 @@
ObjectName procID = itProc.next();
ProcessInstance proc = procService.getInstance(procID);
- log.info(proc);
+ log.debug(proc);
ProcessStatus status = proc.getProcessStatus();
if (status == ProcessStatus.Active || status == ProcessStatus.Suspended)
@@ -146,7 +146,7 @@
public ProcessInstanceRef getProcessInstance(long procID)
{
ProcessInstance proc = getProcessById(procID);
- log.info("getProcessInstance: " + proc);
+ log.debug("getProcessInstance: " + proc);
ProcessInstanceRef procRef = adaptProcess(proc);
return procRef;
@@ -155,7 +155,7 @@
public void setProcessState(long procID, STATE nextState)
{
ProcessInstance proc = getProcessById(procID);
- log.info("setProcessState " + nextState + " on: " + proc);
+ log.debug("setProcessState " + nextState + " on: " + proc);
ProcessInstanceRef procRef = adaptProcess(proc);
procRef.setState(nextState);
@@ -197,7 +197,7 @@
if (token == null)
throw new IllegalStateException("Cannot obtain token: " + tokenId);
- log.info("signalToken: " + token);
+ log.debug("signalToken: " + token);
// Signal the token
token.signal(name);
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java 2008-12-12 11:54:52 UTC (rev 3359)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java 2008-12-12 11:57:30 UTC (rev 3360)
@@ -55,7 +55,7 @@
public TaskRef getTaskById(long taskId)
{
- log.info("getTaskById: " + taskId);
+ log.debug("getTaskById: " + taskId);
ObjectName taskKey = getTaskKey(taskId);
TaskInstanceService taskService = getTaskService();
@@ -66,13 +66,13 @@
public List<TaskRef> getTasksByActor(String actor)
{
- log.info("getTasksByActor: " + actor);
+ log.debug("getTasksByActor: " + actor);
List<TaskRef> taskRefs = new ArrayList<TaskRef>();
TaskInstanceService taskService = getTaskService();
for (TaskInstance task : taskService.getTasksByActor(actor))
{
- log.info(task);
+ log.debug(task);
taskRefs.add(adaptTask(task));
}
return taskRefs;
@@ -80,7 +80,7 @@
public void closeTask(long taskId, String signalName)
{
- log.info("closeTask: " + taskId + "," + signalName);
+ log.debug("closeTask: " + taskId + "," + signalName);
ObjectName taskKey = getTaskKey(taskId);
TaskInstanceService taskService = getTaskService();
@@ -89,7 +89,7 @@
public void reassignTask(long taskId, String actor)
{
- log.info("reassignTask: " + taskId + "," + actor);
+ log.debug("reassignTask: " + taskId + "," + actor);
ObjectName taskKey = getTaskKey(taskId);
TaskInstanceService taskService = getTaskService();
@@ -142,7 +142,7 @@
private ObjectName getTaskKey(long taskId)
{
- return ObjectNameFactory.create("Task:id= " + taskId);
+ return ObjectNameFactory.create("Task:id=" + taskId);
}
private TaskInstanceService getTaskService()
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/UserManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/UserManagementImpl.java 2008-12-12 11:54:52 UTC (rev 3359)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/UserManagementImpl.java 2008-12-12 11:57:30 UTC (rev 3360)
@@ -41,24 +41,24 @@
public List<String> getGroupsForActor(String actor)
{
- log.info("getGroupsForActor: " + actor);
+ log.debug("getGroupsForActor: " + actor);
IdentityService identService = getIdentityService();
List<String> groups = identService.getGroupsByActor(actor);
- log.info(groups);
+ log.debug(groups);
return groups;
}
public List<String> getActorsForGroup(String group)
{
- log.info("getActorsForGroup: " + group);
+ log.debug("getActorsForGroup: " + group);
IdentityService identService = getIdentityService();
List<String> actors = identService.getActorsByGroup(group);
- log.info(actors);
+ log.debug(actors);
return actors;
}
17 years, 4 months
JBoss JBPM SVN: r3359 - projects/gwt-console/tags.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-12 06:54:52 -0500 (Fri, 12 Dec 2008)
New Revision: 3359
Removed:
projects/gwt-console/tags/gwt-console-1.0.0.CR1/
Log:
delete CR1, it's too early
17 years, 4 months
JBoss JBPM SVN: r3358 - in projects/gwt-console/trunk/server/src: test/java/org/jboss/bpm/console/server and 1 other directory.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-12 06:25:39 -0500 (Fri, 12 Dec 2008)
New Revision: 3358
Modified:
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3CommandDelegate.java
projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/ProcessManagementTest.java
projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/TaskManagementTest.java
Log:
Spec compliance: Starting new instances will issue a default signal
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3CommandDelegate.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3CommandDelegate.java 2008-12-12 11:24:54 UTC (rev 3357)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3CommandDelegate.java 2008-12-12 11:25:39 UTC (rev 3358)
@@ -53,176 +53,179 @@
*/
class JBPM3CommandDelegate
{
- private LocalCommandService facade;
- private static final String DEFAULT_JNDI_NAME = "java:ejb/CommandServiceBean";
+ private LocalCommandService facade;
+ private static final String DEFAULT_JNDI_NAME = "java:ejb/CommandServiceBean";
- /*
+ /*
* Lookup with particluar JNDI name.
* @param jndiName
*/
- public JBPM3CommandDelegate(String jndiName)
- {
- ejbLookup(jndiName);
- }
+ public JBPM3CommandDelegate(String jndiName)
+ {
+ ejbLookup(jndiName);
+ }
- /*
+ /*
* Lookup using default JNDI name.
* @see #DEFAULT_JNDI_NAME
*/
- public JBPM3CommandDelegate()
- {
- ejbLookup(DEFAULT_JNDI_NAME);
- }
+ public JBPM3CommandDelegate()
+ {
+ ejbLookup(DEFAULT_JNDI_NAME);
+ }
- private void ejbLookup(String jndiName)
- {
- try
- {
- LocalCommandServiceHome home = (LocalCommandServiceHome)ServiceLocator.getEjbLocalHome(jndiName);
- this.facade = home.create();
- }
- catch (CreateException e)
- {
- throw new RuntimeException("Failed to create LocalCommandService", e);
- }
- }
+ private void ejbLookup(String jndiName)
+ {
+ try
+ {
+ LocalCommandServiceHome home = (LocalCommandServiceHome)ServiceLocator.getEjbLocalHome(jndiName);
+ this.facade = home.create();
+ }
+ catch (CreateException e)
+ {
+ throw new RuntimeException("Failed to create LocalCommandService", e);
+ }
+ }
- public List<ProcessDefinition> getActualDefinitions()
- {
- List<ProcessDefinition> defs = (List<ProcessDefinition>)facade.execute(new GetProcessDefinitionsCommand(false));
- return defs;
- }
+ public List<ProcessDefinition> getActualDefinitions()
+ {
+ List<ProcessDefinition> defs = (List<ProcessDefinition>)facade.execute(new GetProcessDefinitionsCommand(false));
+ return defs;
+ }
- public ProcessDefinition getActualDefinition(String name)
- {
- ProcessDefinition def = (ProcessDefinition)facade.execute(new GetProcessDefinitionCommand(name));
- return def;
- }
+ public ProcessDefinition getActualDefinition(String name)
+ {
+ ProcessDefinition def = (ProcessDefinition)facade.execute(new GetProcessDefinitionCommand(name));
+ return def;
+ }
- public ProcessDefinition getActualDefinition(long processId)
- {
- List<ProcessDefinition> defs = getActualDefinitions();
+ public ProcessDefinition getActualDefinition(long processId)
+ {
+ List<ProcessDefinition> defs = getActualDefinitions();
- ProcessDefinition match = null;
- for (ProcessDefinition p0 : defs)
- {
- if (processId == p0.getId())
+ ProcessDefinition match = null;
+ for (ProcessDefinition p0 : defs)
{
- match = p0;
- break;
+ if (processId == p0.getId())
+ {
+ match = p0;
+ break;
+ }
}
- }
- if (null == match)
- throw new IllegalArgumentException("No process definition with ID " + processId);
+ if (null == match)
+ throw new IllegalArgumentException("No process definition with ID " + processId);
- return match;
- }
+ return match;
+ }
- public void removeActualDefinition(long processId)
- {
- ProcessDefinition def = getActualDefinition(processId);
- facade.execute(new DeleteProcessDefinitionCommand(processId));
- }
+ public void removeActualDefinition(long processId)
+ {
+ ProcessDefinition def = getActualDefinition(processId);
+ facade.execute(new DeleteProcessDefinitionCommand(processId));
+ }
- public org.jbpm.graph.exe.ProcessInstance getActualInstance(long instanceId)
- {
- ProcessInstance instance = (ProcessInstance)facade.execute(new GetProcessInstanceCommand(instanceId));
- return instance;
- }
+ public org.jbpm.graph.exe.ProcessInstance getActualInstance(long instanceId)
+ {
+ ProcessInstance instance = (ProcessInstance)facade.execute(new GetProcessInstanceCommand(instanceId));
+ return instance;
+ }
- public List<ProcessInstance> getActualInstances(long processId)
- {
- ProcessDefinition p0 = getActualDefinition(processId);
- GetProcessInstancesCommand command = new GetProcessInstancesCommand();
- command.setProcessId(processId);
+ public List<ProcessInstance> getActualInstances(long processId)
+ {
+ ProcessDefinition p0 = getActualDefinition(processId);
+ GetProcessInstancesCommand command = new GetProcessInstancesCommand();
+ command.setProcessId(processId);
- List<ProcessInstance> instances = (List<ProcessInstance>)facade.execute(command);
+ List<ProcessInstance> instances = (List<ProcessInstance>)facade.execute(command);
- return instances;
- }
+ return instances;
+ }
- public ProcessInstance startNewInstance(long processId)
- {
- NewProcessInstanceCommand command = new NewProcessInstanceCommand();
- command.setProcessId(processId);
- ProcessInstance instance = (ProcessInstance)facade.execute(command);
- return instance;
- }
+ public ProcessInstance startNewInstance(long processId)
+ {
+ NewProcessInstanceCommand command = new NewProcessInstanceCommand();
+ command.setProcessId(processId);
+ ProcessInstance instance = (ProcessInstance)facade.execute(command);
- public ProcessDefinition deploy(byte[] data)
- {
- ProcessDefinition p0 = (ProcessDefinition)facade.execute(new DeployProcessCommand(data));
- return p0;
- }
+ // default signal to behave spec compliant
+ instance.signal();
+ return instance;
+ }
- public List<TaskInstance> getActualTasksForActor(String actorName)
- {
+ public ProcessDefinition deploy(byte[] data)
+ {
+ ProcessDefinition p0 = (ProcessDefinition)facade.execute(new DeployProcessCommand(data));
+ return p0;
+ }
- List<String> groupNames = getGroupsForActor(actorName);
+ public List<TaskInstance> getActualTasksForActor(String actorName)
+ {
- String[] actors = new String[groupNames.size() + 1];
- int i = 0;
- for (String s : groupNames)
- {
- actors[i] = s;
- i++;
- }
+ List<String> groupNames = getGroupsForActor(actorName);
- actors[i] = actorName; // all groups & the username
+ String[] actors = new String[groupNames.size() + 1];
+ int i = 0;
+ for (String s : groupNames)
+ {
+ actors[i] = s;
+ i++;
+ }
- List<TaskInstance> tasks = new ArrayList<TaskInstance>();
- GetTaskListCommand command = new GetTaskListCommand(actors);
- tasks.addAll((List<TaskInstance>)facade.execute(command));
- return tasks;
- }
+ actors[i] = actorName; // all groups & the username
- public List<String> getGroupsForActor(String actorName)
- {
- List<String> groupNames = (List<String>)facade.execute(new GetGroupMembershipCommand(actorName));
- return groupNames;
- }
+ List<TaskInstance> tasks = new ArrayList<TaskInstance>();
+ GetTaskListCommand command = new GetTaskListCommand(actors);
+ tasks.addAll((List<TaskInstance>)facade.execute(command));
+ return tasks;
+ }
- public List<String> getActorsForGroup(String groupName)
- {
- List<String> actorIds = (List<String>)facade.execute(new GetUsersForGroupCommand(groupName));
- return actorIds;
- }
+ public List<String> getGroupsForActor(String actorName)
+ {
+ List<String> groupNames = (List<String>)facade.execute(new GetGroupMembershipCommand(actorName));
+ return groupNames;
+ }
- public TaskInstance getTaskById(long taskId)
- {
- // include variables, but no logs
- return (TaskInstance)facade.execute(new GetTaskInstanceCommand(taskId, true, false));
- }
+ public List<String> getActorsForGroup(String groupName)
+ {
+ List<String> actorIds = (List<String>)facade.execute(new GetUsersForGroupCommand(groupName));
+ return actorIds;
+ }
- public void assignTask(long taskId, String actorId)
- {
- if (actorId != null)
- {
- StartWorkOnTaskCommand command = new StartWorkOnTaskCommand(taskId, true);
- command.setActorId(actorId);
+ public TaskInstance getTaskById(long taskId)
+ {
+ // include variables, but no logs
+ return (TaskInstance)facade.execute(new GetTaskInstanceCommand(taskId, true, false));
+ }
+
+ public void assignTask(long taskId, String actorId)
+ {
+ if (actorId != null)
+ {
+ StartWorkOnTaskCommand command = new StartWorkOnTaskCommand(taskId, true);
+ command.setActorId(actorId);
+ facade.execute(command);
+ }
+ else
+ {
+ CancelWorkOnTaskCommand command = new CancelWorkOnTaskCommand(taskId);
+ facade.execute(command);
+ }
+ }
+
+ public void signalToken(long tokenId, String signalName)
+ {
+ SignalCommand command = new SignalCommand(tokenId, signalName);
facade.execute(command);
- }
- else
- {
- CancelWorkOnTaskCommand command = new CancelWorkOnTaskCommand(taskId);
- facade.execute(command);
- }
- }
+ }
- public void signalToken(long tokenId, String signalName)
- {
- SignalCommand command = new SignalCommand(tokenId, signalName);
- facade.execute(command);
- }
+ public void endTask(long taskId, String signalName)
+ {
+ TaskInstanceEndCommand command = new TaskInstanceEndCommand();
+ command.setTaskInstanceId(taskId);
+ command.setTransitionName(signalName);
- public void endTask(long taskId, String signalName)
- {
- TaskInstanceEndCommand command = new TaskInstanceEndCommand();
- command.setTaskInstanceId(taskId);
- command.setTransitionName(signalName);
-
- facade.execute(command);
- }
+ facade.execute(command);
+ }
}
Modified: projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/ProcessManagementTest.java
===================================================================
--- projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/ProcessManagementTest.java 2008-12-12 11:24:54 UTC (rev 3357)
+++ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/ProcessManagementTest.java 2008-12-12 11:25:39 UTC (rev 3358)
@@ -28,13 +28,13 @@
/**
* Tests process management functionality.
- *
+ *
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class ProcessManagementTest extends BaseTC
{
- /*
- * Checks the following reqiorements:<br>
+ /*
+ * Checks the following requirements:<br>
* <ul>
* <li> Process deployment
* <li> Create instance
@@ -42,62 +42,84 @@
* <li> End an instance
* </ul>
*/
- public void testProcessDefinitionList() throws Exception
- {
- String response = HTTP.get(SERVER_URL + "/process/definitions", DEFAULT_CREDENTIALS);
+ public void testProcessDefinitionList() throws Exception
+ {
+ String response = HTTP.get(SERVER_URL + "/process/definitions", DEFAULT_CREDENTIALS);
- ProcessDefinitionRefWrapper dto = unmarshallProcessDefinitionList(response);
+ ProcessDefinitionRefWrapper dto = unmarshallProcessDefinitionList(response);
- ProcessDefinitionRef match = null;
- for (ProcessDefinitionRef def : dto.getDefinitions())
- {
- if (def.equals(testDeploymentRef))
- match = def;
- }
+ ProcessDefinitionRef match = null;
+ for (ProcessDefinitionRef def : dto.getDefinitions())
+ {
+ if (def.equals(testDeploymentRef))
+ match = def;
+ }
- assertNotNull(match);
+ assertNotNull(match);
- }
+ }
- /*
+ /*
* Test instance creation, suspend, resume and deletion.
*/
- public void testInstanceOperations() throws Exception
- {
- ProcessInstanceRef newInstanceRef = createNewProcessInstance();
+ public void testInstanceOperations() throws Exception
+ {
+ ProcessInstanceRef newInstanceRef = createNewProcessInstance();
- // ------- Suspend it
+ // ------- Suspend it
- newInstanceRef.setState(ProcessInstanceRef.STATE.SUSPENDED);
- HTTP.post(SERVER_URL + "/process/instances/" + newInstanceRef.getInstanceId() + "/state/" + newInstanceRef.getState(), EMPTY, DEFAULT_CREDENTIALS);
+ newInstanceRef.setState(ProcessInstanceRef.STATE.SUSPENDED);
+ HTTP.post(SERVER_URL + "/process/instances/" + newInstanceRef.getInstanceId() + "/state/" + newInstanceRef.getState(), EMPTY, DEFAULT_CREDENTIALS);
- // ------- Verify
+ // ------- Verify
- ProcessInstanceRefWrapper instanceList = getInstanceList(testDeploymentRef);
- assertFalse(instanceList.getInstances().isEmpty());
- assertTrue(instanceList.getTotalCount() == 1);
+ ProcessInstanceRefWrapper instanceList = getInstanceList(testDeploymentRef);
+ assertFalse(instanceList.getInstances().isEmpty());
+ assertTrue(instanceList.getTotalCount() == 1);
- ProcessInstanceRef match = null;
- for (ProcessInstanceRef ref : instanceList.getInstances())
- {
- if (ref.equals(newInstanceRef))
+ ProcessInstanceRef match = null;
+ for (ProcessInstanceRef ref : instanceList.getInstances())
{
- match = ref;
- break;
+ if (ref.equals(newInstanceRef))
+ {
+ match = ref;
+ break;
+ }
}
- }
- assertNotNull(match);
- assertEquals(ProcessInstanceRef.STATE.SUSPENDED, match.getState());
+ assertNotNull(match);
+ assertEquals(ProcessInstanceRef.STATE.SUSPENDED, match.getState());
- // end and verify
- newInstanceRef.setState(ProcessInstanceRef.STATE.ENDED);
- HTTP.post(SERVER_URL + "/process/instances/" + newInstanceRef.getInstanceId() + "/state/" + newInstanceRef.getState(), EMPTY, DEFAULT_CREDENTIALS);
+ // end and verify
+ newInstanceRef.setState(ProcessInstanceRef.STATE.ENDED);
+ HTTP.post(SERVER_URL + "/process/instances/" + newInstanceRef.getInstanceId() + "/state/" + newInstanceRef.getState(), EMPTY, DEFAULT_CREDENTIALS);
- // refresh instance list
- instanceList = getInstanceList(testDeploymentRef);
- assertTrue(instanceList.getInstances().isEmpty());
+ // refresh instance list
+ instanceList = getInstanceList(testDeploymentRef);
+ assertTrue(instanceList.getInstances().isEmpty());
- }
+ }
+ public void testSignaling() throws Exception
+ {
+ /*
+ // signal it to move to task node
+ String url = "/jbpm3/tokens/"+newInstanceRef.getRootToken().getId()+"/transition/default";
+ HTTP.post(
+ SERVER_URL + url, EMPTY, DEFAULT_CREDENTIALS
+ );
+
+ // refresh instance ref
+ newInstanceRef = getInstance(testDeploymentRef, newInstanceId);
+ assertNotNull(newInstanceRef);
+
+ // same token?
+ assertTrue(previousTokenId == newInstanceRef.getRootToken().getId());
+
+ // did it really move?
+ assertFalse( previousNodeName.equals( newInstanceRef.getRootToken().getCurrentNodeName()));
+
+ */
+
+ }
}
Modified: projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/TaskManagementTest.java
===================================================================
--- projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/TaskManagementTest.java 2008-12-12 11:24:54 UTC (rev 3357)
+++ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/TaskManagementTest.java 2008-12-12 11:25:39 UTC (rev 3358)
@@ -48,28 +48,8 @@
public void testTaskOperations() throws Exception
{
ProcessInstanceRef newInstanceRef = createNewProcessInstance();
- long newInstanceId = newInstanceRef.getInstanceId();
- String previousNodeName = newInstanceRef.getRootToken().getCurrentNodeName();
- long previousTokenId = newInstanceRef.getRootToken().getId();
-
assertEquals(newInstanceRef.getState(), ProcessInstanceRef.STATE.RUNNING);
- // signal it to move to task node
- String url = "/jbpm3/tokens/"+newInstanceRef.getRootToken().getId()+"/transition/default";
- HTTP.post(
- SERVER_URL + url, EMPTY, DEFAULT_CREDENTIALS
- );
-
- // refresh instance ref
- newInstanceRef = getInstance(testDeploymentRef, newInstanceId);
- assertNotNull(newInstanceRef);
-
- // same token?
- assertTrue(previousTokenId == newInstanceRef.getRootToken().getId());
-
- // did it really move?
- assertFalse( previousNodeName.equals( newInstanceRef.getRootToken().getCurrentNodeName()));
-
// has a task been created?
String taskListResponse = HTTP.get(
SERVER_URL + "/tasks/actor/admin", DEFAULT_CREDENTIALS // 'user' is the actual actorname
17 years, 4 months
JBoss JBPM SVN: r3357 - projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-12 06:24:54 -0500 (Fri, 12 Dec 2008)
New Revision: 3357
Added:
projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/Base64Coder.java
Modified:
projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/HTTP.java
Log:
Use fifferent base64 encoder
Added: projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/Base64Coder.java
===================================================================
--- projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/Base64Coder.java (rev 0)
+++ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/Base64Coder.java 2008-12-12 11:24:54 UTC (rev 3357)
@@ -0,0 +1,147 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.console.server;
+
+/**
+ * A Base64 Encoder/Decoder.
+ */
+public class Base64Coder
+{
+
+ // Mapping table from 6-bit nibbles to Base64 characters.
+ private static char[] map1 = new char[64];
+ static {
+ int i=0;
+ for (char c='A'; c<='Z'; c++) map1[i++] = c;
+ for (char c='a'; c<='z'; c++) map1[i++] = c;
+ for (char c='0'; c<='9'; c++) map1[i++] = c;
+ map1[i++] = '+'; map1[i++] = '/'; }
+
+ // Mapping table from Base64 characters to 6-bit nibbles.
+ private static byte[] map2 = new byte[128];
+ static {
+ for (int i=0; i<map2.length; i++) map2[i] = -1;
+ for (int i=0; i<64; i++) map2[map1[i]] = (byte)i; }
+
+ /**
+ * Encodes a string into Base64 format.
+ * No blanks or line breaks are inserted.
+ * @param s a String to be encoded.
+ * @return A String with the Base64 encoded data.
+ */
+ public static String encodeString (String s) {
+ return new String(encode(s.getBytes())); }
+
+ /**
+ * Encodes a byte array into Base64 format.
+ * No blanks or line breaks are inserted.
+ * @param in an array containing the data bytes to be encoded.
+ * @return A character array with the Base64 encoded data.
+ */
+ public static char[] encode (byte[] in) {
+ return encode(in,in.length); }
+
+ /**
+ * Encodes a byte array into Base64 format.
+ * No blanks or line breaks are inserted.
+ * @param in an array containing the data bytes to be encoded.
+ * @param iLen number of bytes to process in <code>in</code>.
+ * @return A character array with the Base64 encoded data.
+ */
+ public static char[] encode (byte[] in, int iLen) {
+ int oDataLen = (iLen*4+2)/3; // output length without padding
+ int oLen = ((iLen+2)/3)*4; // output length including padding
+ char[] out = new char[oLen];
+ int ip = 0;
+ int op = 0;
+ while (ip < iLen) {
+ int i0 = in[ip++] & 0xff;
+ int i1 = ip < iLen ? in[ip++] & 0xff : 0;
+ int i2 = ip < iLen ? in[ip++] & 0xff : 0;
+ int o0 = i0 >>> 2;
+ int o1 = ((i0 & 3) << 4) | (i1 >>> 4);
+ int o2 = ((i1 & 0xf) << 2) | (i2 >>> 6);
+ int o3 = i2 & 0x3F;
+ out[op++] = map1[o0];
+ out[op++] = map1[o1];
+ out[op] = op < oDataLen ? map1[o2] : '='; op++;
+ out[op] = op < oDataLen ? map1[o3] : '='; op++; }
+ return out; }
+
+ /**
+ * Decodes a string from Base64 format.
+ * @param s a Base64 String to be decoded.
+ * @return A String containing the decoded data.
+ * @throws IllegalArgumentException if the input is not valid Base64 encoded data.
+ */
+ public static String decodeString (String s) {
+ return new String(decode(s)); }
+
+ /**
+ * Decodes a byte array from Base64 format.
+ * @param s a Base64 String to be decoded.
+ * @return An array containing the decoded data bytes.
+ * @throws IllegalArgumentException if the input is not valid Base64 encoded data.
+ */
+ public static byte[] decode (String s) {
+ return decode(s.toCharArray()); }
+
+ /**
+ * Decodes a byte array from Base64 format.
+ * No blanks or line breaks are allowed within the Base64 encoded data.
+ * @param in a character array containing the Base64 encoded data.
+ * @return An array containing the decoded data bytes.
+ * @throws IllegalArgumentException if the input is not valid Base64 encoded data.
+ */
+ public static byte[] decode (char[] in) {
+ int iLen = in.length;
+ if (iLen%4 != 0) throw new IllegalArgumentException ("Length of Base64 encoded input string is not a multiple of 4.");
+ while (iLen > 0 && in[iLen-1] == '=') iLen--;
+ int oLen = (iLen*3) / 4;
+ byte[] out = new byte[oLen];
+ int ip = 0;
+ int op = 0;
+ while (ip < iLen) {
+ int i0 = in[ip++];
+ int i1 = in[ip++];
+ int i2 = ip < iLen ? in[ip++] : 'A';
+ int i3 = ip < iLen ? in[ip++] : 'A';
+ if (i0 > 127 || i1 > 127 || i2 > 127 || i3 > 127)
+ throw new IllegalArgumentException ("Illegal character in Base64 encoded data.");
+ int b0 = map2[i0];
+ int b1 = map2[i1];
+ int b2 = map2[i2];
+ int b3 = map2[i3];
+ if (b0 < 0 || b1 < 0 || b2 < 0 || b3 < 0)
+ throw new IllegalArgumentException ("Illegal character in Base64 encoded data.");
+ int o0 = ( b0 <<2) | (b1>>>4);
+ int o1 = ((b1 & 0xf)<<4) | (b2>>>2);
+ int o2 = ((b2 & 3)<<6) | b3;
+ out[op++] = (byte)o0;
+ if (op<oLen) out[op++] = (byte)o1;
+ if (op<oLen) out[op++] = (byte)o2; }
+ return out; }
+
+ // Dummy constructor.
+ private Base64Coder() {}
+
+} // end class Base64Coder
\ No newline at end of file
Modified: projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/HTTP.java
===================================================================
--- projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/HTTP.java 2008-12-12 11:16:41 UTC (rev 3356)
+++ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/HTTP.java 2008-12-12 11:24:54 UTC (rev 3357)
@@ -167,7 +167,7 @@
private static void applyCredentials(String[] credentials, HttpURLConnection conn)
{
String userPassword = credentials[0]+":"+credentials[1];
- String encoding = new sun.misc.BASE64Encoder().encode (userPassword.getBytes());
+ String encoding = new String(Base64Coder.encode (userPassword.getBytes()));
conn.setRequestProperty ("Authorization", "Basic " + encoding);
}
17 years, 4 months
JBoss JBPM SVN: r3356 - projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-12 06:16:41 -0500 (Fri, 12 Dec 2008)
New Revision: 3356
Modified:
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
Log:
Use getProcessInstanceService
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java 2008-12-12 11:15:48 UTC (rev 3355)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java 2008-12-12 11:16:41 UTC (rev 3356)
@@ -41,7 +41,7 @@
*/
public class ManagementFactoryImpl extends ManagementFactory
{
- private boolean useSpecIntegration = Boolean.getBoolean(ManagementFactory.class.getName()+".spec");
+ private boolean useSpecIntegration = true;
public ProcessManagement createProcessManagement()
{
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java 2008-12-12 11:15:48 UTC (rev 3355)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java 2008-12-12 11:16:41 UTC (rev 3356)
@@ -124,7 +124,7 @@
log.info("getProcessInstances: " + procDef);
- ProcessInstanceService procService = getProcessService();
+ ProcessInstanceService procService = getProcessInstanceService();
Iterator<ObjectName> itProc = procService.getInstance(procDef.getKey(), null).iterator();
while (itProc.hasNext())
{
@@ -177,7 +177,7 @@
public void signalToken(long tokenId, String name)
{
Token token = null;
- ProcessInstanceService procService = getProcessService();
+ ProcessInstanceService procService = getProcessInstanceService();
Iterator<ObjectName> itProc = procService.getInstance().iterator();
while (token == null && itProc.hasNext())
{
@@ -236,7 +236,7 @@
return new ProcessDefinitionRef(procDefID, procDef.getName(), procDef.getVersion());
}
- private ProcessInstanceService getProcessService()
+ private ProcessInstanceService getProcessInstanceService()
{
ProcessEngine engine = ProcessEngineFactory.getProcessEngine();
ProcessInstanceService pService = engine.getService(ProcessInstanceService.class);
@@ -246,7 +246,7 @@
private ProcessInstance getProcessById(long procID)
{
ProcessInstance proc = null;
- ProcessInstanceService procService = getProcessService();
+ ProcessInstanceService procService = getProcessInstanceService();
Iterator<ObjectName> it = procService.getInstance().iterator();
while (it.hasNext())
{
17 years, 4 months
JBoss JBPM SVN: r3355 - in jbpm3/trunk/modules: integration/src/main/java/org/jbpm/integration/spec/model and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-12 06:15:48 -0500 (Fri, 12 Dec 2008)
New Revision: 3355
Modified:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java
Log:
Support ProcessState.Ready
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2008-12-12 09:36:19 UTC (rev 3354)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2008-12-12 11:15:48 UTC (rev 3355)
@@ -127,7 +127,6 @@
// initialize the members
this.processDefinition = processDefinition;
this.rootToken = new Token(this);
- this.start = Clock.getCurrentTime();
this.key = key;
// if this process instance is created in the context of a persistent operation
@@ -179,6 +178,8 @@
public void fireStartEvent(Node initialNode)
{
+ this.start = Clock.getCurrentTime();
+
// fire the process start event
if (initialNode != null)
{
Modified: jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java 2008-12-12 09:36:19 UTC (rev 3354)
+++ jbpm3/trunk/modules/integration/src/main/java/org/jbpm/integration/spec/model/ProcessInstanceImpl.java 2008-12-12 11:15:48 UTC (rev 3355)
@@ -108,7 +108,8 @@
org.jbpm.graph.exe.ProcessInstance oldProcInst = getDelegate();
- ProcessStatus status = ProcessStatus.None;
+ long procID = oldProcInst.getId();
+ ProcessStatus status = procID > 0 ? ProcessStatus.Ready : ProcessStatus.None;
if (oldProcInst.getStart() != null)
status = ProcessStatus.Active;
@@ -183,7 +184,7 @@
ExecutionContext bpmContext = ctxService.getExecutionContext(true);
try
{
- // Register the Process
+ // Register the Process implicitly
ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class);
if (procService.getInstance(getKey()) == null)
procService.registerInstance(this);
17 years, 4 months