December 2008 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r3374 - projects/spec/trunk/modules/integration/jboss42.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-12 11:27:59 -0500 (Fri, 12 Dec 2008) New Revision: 3374 Modified: projects/spec/trunk/modules/integration/jboss42/pom.xml Log: Fix groupId Modified: projects/spec/trunk/modules/integration/jboss42/pom.xml =================================================================== --- projects/spec/trunk/modules/integration/jboss42/pom.xml 2008-12-12 16:20:41 UTC (rev 3373) +++ projects/spec/trunk/modules/integration/jboss42/pom.xml 2008-12-12 16:27:59 UTC (rev 3374) @@ -16,7 +16,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBoss BPM Spec - Integration JBoss42</name> - <groupId>org.jbpm.jbpm3</groupId> + <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec-integration-jboss42</artifactId> <packaging>jar</packaging>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3373 - projects/spec/trunk/modules/integration/jboss42.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-12 11:20:41 -0500 (Fri, 12 Dec 2008) New Revision: 3373 Modified: projects/spec/trunk/modules/integration/jboss42/pom.xml Log: Fix dependency on jbpm3 integration Modified: projects/spec/trunk/modules/integration/jboss42/pom.xml =================================================================== --- projects/spec/trunk/modules/integration/jboss42/pom.xml 2008-12-12 16:03:05 UTC (rev 3372) +++ projects/spec/trunk/modules/integration/jboss42/pom.xml 2008-12-12 16:20:41 UTC (rev 3373) @@ -83,7 +83,7 @@  <dependency> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>bpm-spec-integration-jbpm3</artifactId> + <artifactId>jbpm-integration-spec</artifactId> <version>${jbpm3.version}</version> <scope>test</scope> </dependency>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3372 - jbpm3/trunk/hudson.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-12 11:03:05 -0500 (Fri, 12 Dec 2008) New Revision: 3372 Modified: jbpm3/trunk/hudson/profiles.xml.local.qa jbpm3/trunk/hudson/profiles.xml.redhat.qa Log: [JBPM-1408] setup sybase access Modified: jbpm3/trunk/hudson/profiles.xml.local.qa =================================================================== --- jbpm3/trunk/hudson/profiles.xml.local.qa 2008-12-12 15:53:32 UTC (rev 3371) +++ jbpm3/trunk/hudson/profiles.xml.local.qa 2008-12-12 16:03:05 UTC (rev 3372) @@ -19,20 +19,22 @@ <jdbc.mysql.username>jbpmtest</jdbc.mysql.username> <jdbc.mysql.password></jdbc.mysql.password> + <jdbc.sybase.url>jdbc:jtds:sybase://192.168.0.101:5000/jbpmtest</jdbc.sybase.url> + <jdbc.sybase.server>192.168.0.101</jdbc.sybase.server> + <jdbc.sybase.port>5000</jdbc.sybase.port> + <jdbc.sybase.database>jbpmtest</jdbc.sybase.database> + <jdbc.sybase.username>jbpmtest</jdbc.sybase.username> + <jdbc.sybase.password>jbpmtest</jdbc.sybase.password> + +  - <jdbc.sybase.url>jdbc:jtds:sybase://192.168.0.101:5000/jbpmtest</jdbc.sybase.url> - <jdbc.sybase.server>192.168.0.101</jdbc.sybase.server> - <jdbc.sybase.port>5000</jdbc.sybase.port> - <jdbc.sybase.database>jbpmtest</jdbc.sybase.database> - <jdbc.sybase.username>jbpmtest</jdbc.sybase.username> - <jdbc.sybase.password>jbpmtest</jdbc.sybase.password> - </properties> </profile> Modified: jbpm3/trunk/hudson/profiles.xml.redhat.qa =================================================================== --- jbpm3/trunk/hudson/profiles.xml.redhat.qa 2008-12-12 15:53:32 UTC (rev 3371) +++ jbpm3/trunk/hudson/profiles.xml.redhat.qa 2008-12-12 16:03:05 UTC (rev 3372) @@ -19,20 +19,20 @@ <jdbc.mysql.username>jbpm3</jdbc.mysql.username> <jdbc.mysql.password>jbpm3</jdbc.mysql.password> -  </properties> </profile>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3371 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/command.

by do-not-reply＠jboss.org

Author: camunda Date: 2008-12-12 10:53:32 -0500 (Fri, 12 Dec 2008) New Revision: 3371 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelProcessInstanceCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelTokenCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelWorkOnTaskCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeployProcessCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionsCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceLogCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstancesCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskListCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/NewProcessInstanceCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartProcessInstanceCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartWorkOnTaskCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/TaskInstanceEndCommand.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/VariablesCommand.java Log: JBPM-1905: added return values to setter (for fluent programming) and set ambiguous attribute names to deprecated + created new better attributes. Fixed some typos. Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -15,7 +15,8 @@ /** * abstract base class for "get" commands which also implements default pre-fetching. * - * Note: prefetching logs is not possible here, so you have to load Loags explicit with GetProcessInstanceLogCommand + * Note: pre-fetching logs is not possible here, so you have to load Logs explicitly + * with GetProcessInstanceLogCommand * * @author Bernd Ruecker (bernd.ruecker(a)camunda.com) */ Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -47,16 +47,18 @@ return transitionName; } - public void setTransitionName(String transitionName) { + public BatchSignalCommand setTransitionName(String transitionName) { this.transitionName = transitionName; + return this; } public Date getInStateAtLeastSince() { return inStateAtLeastSince; } - public void setInStateAtLeastSince(Date inStateAtLeastSince) { + public BatchSignalCommand setInStateAtLeastSince(Date inStateAtLeastSince) { this.inStateAtLeastSince = inStateAtLeastSince; + return this; } @Override Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelProcessInstanceCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelProcessInstanceCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelProcessInstanceCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -4,32 +4,35 @@ import org.jbpm.JbpmContext; import org.jbpm.graph.exe.ProcessInstance; +import org.jbpm.graph.exe.Token; /** + * Cancel the given {@link ProcessInstance} with all {@link Token}s. * + * <b>Maybe running sub process instances are currently not canceled.</b> + * * @author Bernd Ruecker (bernd.ruecker(a)camunda.com) - * */ public class CancelProcessInstanceCommand extends AbstractCancelCommand implements Command { private static final long serialVersionUID = 7145293049356621597L; - private long processId; + private long processInstanceId; public CancelProcessInstanceCommand() { } - public CancelProcessInstanceCommand(long processId) + public CancelProcessInstanceCommand(long processInstanceId) { - this.processId = processId; + this.processInstanceId = processInstanceId; } public Object execute(JbpmContext jbpmContext) throws Exception { this.jbpmContext = jbpmContext; - cancelProcess(processId); + cancelProcess(processInstanceId); this.jbpmContext = null; return null; } @@ -41,15 +44,13 @@ log.info("cancel process instance " + pi.getId()); // Record a standardized variable that we can use to determine that this - // process has been 'cancelled' and not just ended. - pi.getContextInstance().createVariable("cancelled", new Date()); + // process has been 'canceled' and not just ended. + pi.getContextInstance().createVariable("canceled", new Date()); try { // End the process instance and any open tokens - // TODO: better implementation (also cancel sub processes etc.) - // see http://intranet.computation.de/bugs/view_bug.php?bug_id=295 - + // TODO: Think about maybe canceling sub processes? cancelToken(pi.getRootToken()); cancelTokens(pi.getRootToken().getChildren().values()); @@ -64,14 +65,31 @@ } } + public long getProcessInstanceId() + { + return processInstanceId; + } + + public CancelProcessInstanceCommand setProcessInstanceId(long processInstanceId) + { + this.processInstanceId = processInstanceId; + return this; + } + + /** + * @deprecated use getProcessInstanceId instead + */ public long getProcessId() { - return processId; + return processInstanceId; } + /** + * @deprecated use setProcessInstanceId instead + */ public void setProcessId(long processId) { - this.processId = processId; + this.processInstanceId = processId; } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelTokenCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelTokenCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelTokenCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -37,9 +37,10 @@ return tokenId; } - public void setTokenId(long tokenId) + public CancelTokenCommand setTokenId(long tokenId) { this.tokenId = tokenId; + return this; } } \ No newline at end of file Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelWorkOnTaskCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelWorkOnTaskCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelWorkOnTaskCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -40,9 +40,10 @@ return taskInstanceId; } - public void setTaskInstanceId(long taskInstanceId) + public CancelWorkOnTaskCommand setTaskInstanceId(long taskInstanceId) { this.taskInstanceId = taskInstanceId; + return this; } @Override Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeployProcessCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeployProcessCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeployProcessCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -78,12 +78,13 @@ return par; } - public void setPar(byte[] par) + public DeployProcessCommand setPar(byte[] par) { this.par = par; if (par == null || par.length == 0) throw new IllegalArgumentException("Cannot process null process archive"); + return this; } public String getXml() @@ -91,11 +92,12 @@ return xml; } - public void setXml(String xml) + public DeployProcessCommand setXml(String xml) { this.xml = xml; if (xml == null || xml.length() == 0) throw new IllegalArgumentException("Cannot process null process definition"); + return this; } } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -46,9 +46,10 @@ return name; } - public void setName(String name) + public GetProcessDefinitionCommand setName(String name) { this.name = name; + return this; } public int getVersion() @@ -56,9 +57,10 @@ return version; } - public void setVersion(int version) + public GetProcessDefinitionCommand setVersion(int version) { this.version = version; + return this; } @Override Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionsCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionsCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionsCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -50,10 +50,12 @@ return onlyLatest; } - public void setOnlyLatest(boolean onlyLatest) + public GetProcessDefinitionsCommand setOnlyLatest(boolean onlyLatest) { this.onlyLatest = onlyLatest; + return this; } + @Override public String getAdditionalToStringInformation() { Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -59,9 +59,10 @@ return processInstanceId; } - public void setProcessInstanceId(long processInstanceId) + public GetProcessInstanceCommand setProcessInstanceId(long processInstanceId) { this.processInstanceId = processInstanceId; + return this; } public long getTaskInstanceId() @@ -69,9 +70,10 @@ return taskInstanceId; } - public void setTaskInstanceId(long taskInstanceId) + public GetProcessInstanceCommand setTaskInstanceId(long taskInstanceId) { this.taskInstanceId = taskInstanceId; + return this; } public long getTokenId() @@ -79,9 +81,10 @@ return tokenId; } - public void setTokenId(long tokenId) + public GetProcessInstanceCommand setTokenId(long tokenId) { this.tokenId = tokenId; + return this; } @Override Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceLogCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceLogCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceLogCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -85,9 +85,10 @@ return processInstanceId; } - public void setProcessInstanceId(long processInstanceId) + public GetProcessInstanceLogCommand setProcessInstanceId(long processInstanceId) { this.processInstanceId = processInstanceId; + return this; } @Override Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstancesCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstancesCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstancesCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -38,9 +38,9 @@ /* * if given, only processes with this name are retrieved */ - private String processName; + private String processDefinitionName; - private long processId = -1; + private long processInstanceId = -1; /* * if given, only processes with this name are retrieved */ @@ -85,11 +85,11 @@ } // name - if (processId != -1) + if (processInstanceId != -1) { queryText.append(getConcatExpression()).append(" pi.processDefinition.id = :processId "); } - else if (processName != null && processName.length() > 0) + else if (processDefinitionName != null && processDefinitionName.length() > 0) { queryText.append(getConcatExpression()).append(" pi.processDefinition.name = :processDefinitionName "); } @@ -114,13 +114,13 @@ query.setTimestamp("until", untilStartDate); } - if (processId != -1) + if (processInstanceId != -1) { - query.setLong("processId", processId); + query.setLong("processId", processInstanceId); } - if (processName != null && processName.length() > 0) + if (processDefinitionName != null && processDefinitionName.length() > 0) { - query.setString("processDefinitionName", processName); + query.setString("processDefinitionName", processDefinitionName); } if (stateName != null && stateName.length() > 0) @@ -157,9 +157,10 @@ return fromStartDate; } - public void setFromStartDate(Date fromStartDate) + public GetProcessInstancesCommand setFromStartDate(Date fromStartDate) { this.fromStartDate = fromStartDate; + return this; } public boolean isOnlyRunning() @@ -167,29 +168,48 @@ return onlyRunning; } - public void setOnlyRunning(boolean onlyRunning) + public GetProcessInstancesCommand setOnlyRunning(boolean onlyRunning) { this.onlyRunning = onlyRunning; + return this; } + /** + * @deprecated + */ public String getProcessName() { - return processName; + return processDefinitionName; } + /** + * @deprecated + */ public void setProcessName(String processName) { - this.processName = processName; + this.processDefinitionName = processName; } + public String getProcessDefinitionName() + { + return processDefinitionName; + } + + public GetProcessInstancesCommand setProcessDefinitionName(String processName) + { + this.processDefinitionName = processName; + return this; + } + public String getStateName() { return stateName; } - public void setStateName(String stateName) + public GetProcessInstancesCommand setStateName(String stateName) { this.stateName = stateName; + return this; } public Date getUntilStartDate() @@ -197,9 +217,10 @@ return untilStartDate; } - public void setUntilStartDate(Date untilStartDate) + public GetProcessInstancesCommand setUntilStartDate(Date untilStartDate) { this.untilStartDate = untilStartDate; + return this; } public String getVersion() @@ -207,26 +228,44 @@ return version; } - public void setVersion(String version) + public GetProcessInstancesCommand setVersion(String version) { this.version = version; + return this; } + public long getProcessInstanceId() + { + return processInstanceId; + } + + public GetProcessInstancesCommand setProcessInstanceId(long processId) + { + this.processInstanceId = processId; + return this; + } + + /** + * @deprecated + */ public long getProcessId() { - return processId; + return processInstanceId; } + /** + * @deprecated + */ public void setProcessId(long processId) { - this.processId = processId; + this.processInstanceId = processId; } - + @Override public String getAdditionalToStringInformation() { - return "processInstanceId=" + processId - + ";processDefinitionName=" + processName + return "processInstanceId=" + processInstanceId + + ";processDefinitionName=" + processDefinitionName + ";version=" + version + ";stateName=" + stateName + ";fromStartDate=" + fromStartDate Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -100,9 +100,10 @@ return taskInstanceId; } - public void setTaskInstanceId(long taskInstanceId) + public GetTaskInstanceCommand setTaskInstanceId(long taskInstanceId) { this.taskInstanceId = taskInstanceId; + return this; } public long getTokenId() @@ -110,9 +111,10 @@ return tokenId; } - public void setTokenId(long tokenId) + public GetTaskInstanceCommand setTokenId(long tokenId) { this.tokenId = tokenId; + return this; } public long getProcessInstanceId() @@ -120,9 +122,10 @@ return processInstanceId; } - public void setProcessInstanceId(long processInstanceId) + public GetTaskInstanceCommand setProcessInstanceId(long processInstanceId) { this.processInstanceId = processInstanceId; + return this; } @Override Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskListCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskListCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskListCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -84,14 +84,16 @@ return actor; } - public void setActor(String actor) + public GetTaskListCommand setActor(String actor) { this.actor = new String[] { actor }; + return this; } - public void setActor(String[] actor) + public GetTaskListCommand setActor(String[] actor) { this.actor = actor; + return this; } @Override Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/NewProcessInstanceCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/NewProcessInstanceCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/NewProcessInstanceCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -121,16 +121,34 @@ return actorId; } - public void setActorId(String actorId) + public NewProcessInstanceCommand setActorId(String actorId) { this.actorId = actorId; + return this; } + public long getProcessDefinitionId() + { + return processDefinitionId; + } + + public NewProcessInstanceCommand setProcessDefinitionId(long processId) + { + this.processDefinitionId = processId; + return this; + } + + /** + * @deprecated use getProcessDefinitionId instead + */ public long getProcessId() { return processDefinitionId; } + /** + * @deprecated use setProcessDefinitionId instead + */ public void setProcessId(long processId) { this.processDefinitionId = processId; @@ -141,9 +159,10 @@ return processDefinitionName; } - public void setProcessName(String processName) + public NewProcessInstanceCommand setProcessName(String processName) { this.processDefinitionName = processName; + return this; } public boolean isCreateStartTask() @@ -151,9 +170,10 @@ return createStartTask; } - public void setCreateStartTask(boolean createStartTask) + public NewProcessInstanceCommand setCreateStartTask(boolean createStartTask) { this.createStartTask = createStartTask; + return this; } public Map getVariables() @@ -161,9 +181,10 @@ return variables; } - public void setVariables(Map variables) + public NewProcessInstanceCommand setVariables(Map variables) { this.variables = variables; + return this; } public String getKey() @@ -171,9 +192,10 @@ return key; } - public void setKey(String key) + public NewProcessInstanceCommand setKey(String key) { this.key = key; + return this; } @Override Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -39,6 +39,7 @@ { private static final long serialVersionUID = 1L; + private static Log log = LogFactory.getLog(SignalCommand.class); private long tokenId = 0; @@ -120,9 +121,10 @@ return tokenId; } - public void setTokenId(long tokenId) + public SignalCommand setTokenId(long tokenId) { this.tokenId = tokenId; + return this; } public String getTransitionName() @@ -130,21 +132,21 @@ return transitionName; } - public void setTransitionName(String transitionName) + public SignalCommand setTransitionName(String transitionName) { this.transitionName = transitionName; + return this; } - private static Log log = LogFactory.getLog(SignalCommand.class); - public Map getVariables() { return variables; } - public void setVariables(Map variables) + public SignalCommand setVariables(Map variables) { this.variables = variables; + return this; } public String getExpectedStateName() @@ -152,9 +154,10 @@ return expectedStateName; } - public void setExpectedStateName(String expectedStateName) + public SignalCommand setExpectedStateName(String expectedStateName) { this.expectedStateName = expectedStateName; + return this; } @Override Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartProcessInstanceCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartProcessInstanceCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartProcessInstanceCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -40,9 +40,10 @@ return startTransitionName; } - public void setStartTransitionName(String startTransitionName) + public StartProcessInstanceCommand setStartTransitionName(String startTransitionName) { this.startTransitionName = startTransitionName; + return this; } @Override Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartWorkOnTaskCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartWorkOnTaskCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartWorkOnTaskCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -54,9 +54,10 @@ return overwriteSwimlane; } - public void setOverwriteSwimlane(boolean overwriteSwimlane) + public StartWorkOnTaskCommand setOverwriteSwimlane(boolean overwriteSwimlane) { this.overwriteSwimlane = overwriteSwimlane; + return this; } public long getTaskInstanceId() @@ -64,14 +65,16 @@ return taskInstanceId; } - public void setTaskInstanceId(long taskInstanceId) + public StartWorkOnTaskCommand setTaskInstanceId(long taskInstanceId) { this.taskInstanceId = taskInstanceId; + return this; } - public void setActorId(String actorId) + public StartWorkOnTaskCommand setActorId(String actorId) { this.actorId = actorId; + return this; } public String getActorId() Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/TaskInstanceEndCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/TaskInstanceEndCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/TaskInstanceEndCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -95,9 +95,10 @@ return taskInstanceId; } - public void setTaskInstanceId(long taskInstanceId) + public TaskInstanceEndCommand setTaskInstanceId(long taskInstanceId) { this.taskInstanceId = taskInstanceId; + return this; } public String getTransitionName() @@ -105,9 +106,10 @@ return transitionName; } - public void setTransitionName(String transitionName) + public TaskInstanceEndCommand setTransitionName(String transitionName) { this.transitionName = transitionName; + return this; } public Map getVariables() @@ -115,9 +117,10 @@ return variables; } - public void setVariables(Map variables) + public TaskInstanceEndCommand setVariables(Map variables) { this.variables = variables; + return this; } @Override Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/VariablesCommand.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/VariablesCommand.java 2008-12-12 15:48:10 UTC (rev 3370) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/VariablesCommand.java 2008-12-12 15:53:32 UTC (rev 3371) @@ -67,9 +67,10 @@ return taskInstanceId; } - public void setTaskInstanceId(long taskInstanceId) + public VariablesCommand setTaskInstanceId(long taskInstanceId) { this.taskInstanceId = taskInstanceId; + return this; } public long getTokenId() @@ -77,9 +78,10 @@ return tokenId; } - public void setTokenId(long tokenId) + public VariablesCommand setTokenId(long tokenId) { this.tokenId = tokenId; + return this; } public Map getVariables() @@ -87,9 +89,10 @@ return variables; } - public void setVariables(Map variables) + public VariablesCommand setVariables(Map variables) { this.variables = variables; + return this; } @Override

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3370 - jbpm3/branches.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-12 10:48:10 -0500 (Fri, 12 Dec 2008) New Revision: 3370 Removed: jbpm3/branches/jpdl-3.2.2-SOA-4.2/ Log: Remove jpdl-3.2.2-SOA-4.2, jbpm-3.3.x-SOA-4.2 is current

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3369 - jbpm3/trunk/modules/enterprise.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-12 10:32:18 -0500 (Fri, 12 Dec 2008) New Revision: 3369 Modified: jbpm3/trunk/modules/enterprise/pom.xml Log: [JBPM-1818] Use Sybase instance that supports XA Transaction Modified: jbpm3/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm3/trunk/modules/enterprise/pom.xml 2008-12-12 14:05:57 UTC (rev 3368) +++ jbpm3/trunk/modules/enterprise/pom.xml 2008-12-12 15:32:18 UTC (rev 3369) @@ -332,6 +332,7 @@ <configuration> <excludes>  + <exclude>org/jbpm/enterprise/deployment/DeploymentPARTest.java</exclude> <exclude>org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java</exclude> <exclude>org/jbpm/enterprise/jta/JtaDbPersistenceTest.java</exclude> <exclude>org/jbpm/enterprise/jms/JmsMessageTest.java</exclude>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3368 - jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1778.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-12 09:05:57 -0500 (Fri, 12 Dec 2008) New Revision: 3368 Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1778/JBPM1778Test.java Log: [JBPM-1778] Add a nonempty map test Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1778/JBPM1778Test.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1778/JBPM1778Test.java 2008-12-12 14:00:33 UTC (rev 3367) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1778/JBPM1778Test.java 2008-12-12 14:05:57 UTC (rev 3368) @@ -4,8 +4,6 @@ import java.util.Map; import org.jbpm.AbstractJbpmTestCase; -import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.taskmgmt.exe.TaskMgmtInstance; @@ -19,37 +17,47 @@ */ public class JBPM1778Test extends AbstractJbpmTestCase { - public void testEmptyMapVariables() { - JbpmContext jbpmContext = JbpmConfiguration.getInstance().createJbpmContext(); - try - { - HashMap<String, String> vars = new HashMap<String, String>(); - // vars.put("uno", "dos"); - - ProcessDefinition pd = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='s' />" + - " </start-state>" + - " <state name='s'>" + - " <transition to='end' />" + - " </state>" + - " <end-state name='end' />" + - "</process-definition>"); - - ProcessInstance pi = pd.createProcessInstance(vars); - TaskMgmtInstance tmi = pi.getTaskMgmtInstance(); - tmi.createStartTaskInstance(); + ProcessDefinition pd = getProcessDEfinition(); + + ProcessInstance pi = pd.createProcessInstance(new HashMap<String, String>()); + TaskMgmtInstance tmi = pi.getTaskMgmtInstance(); + tmi.createStartTaskInstance(); - Map piVars = pi.getContextInstance().getVariables(); - assertNotNull("ProcessInstance vars not null", piVars); - assertEquals("ProcessInstance vars empty", 0, piVars.size()); - } - finally - { - jbpmContext.close(); - } + Map piVars = pi.getContextInstance().getVariables(); + assertNotNull("ProcessInstance vars not null", piVars); + assertEquals("ProcessInstance vars empty", 0, piVars.size()); } + + public void testNonEmptyMapVariables() + { + ProcessDefinition pd = getProcessDEfinition(); + + HashMap<String, String> vars = new HashMap<String, String>(); + vars.put("uno", "dos"); + + ProcessInstance pi = pd.createProcessInstance(vars); + TaskMgmtInstance tmi = pi.getTaskMgmtInstance(); + tmi.createStartTaskInstance(); + + Map piVars = pi.getContextInstance().getVariables(); + assertNotNull("ProcessInstance vars not null", piVars); + assertEquals("ProcessInstance vars not empty", 1, piVars.size()); + } + + private ProcessDefinition getProcessDEfinition() + { + ProcessDefinition pd = ProcessDefinition.parseXmlString( + "<process-definition>" + + " <start-state>" + + " <transition to='s' />" + + " </start-state>" + + " <state name='s'>" + + " <transition to='end' />" + + " </state>" + + " <end-state name='end' />" + + "</process-definition>"); + return pd; + } }

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3367 - in jbpm3/trunk/modules/core/src: main/java/org/jbpm/graph/exe and 2 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-12 09:00:33 -0500 (Fri, 12 Dec 2008) New Revision: 3367 Added: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1778/ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1778/JBPM1778Test.java Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/ContextInstance.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java Log: [JBPM-1778] Empty map variables on process creation is set as null Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/ContextInstance.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/ContextInstance.java 2008-12-12 13:05:58 UTC (rev 3366) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/context/exe/ContextInstance.java 2008-12-12 14:00:33 UTC (rev 3367) @@ -40,7 +40,8 @@ * More information on context and process variableInstances can be found in * <a href="../../../../../userguide/en/html/reference.html#context">the userguide, section context</a> */ -public class ContextInstance extends ModuleInstance { +public class ContextInstance extends ModuleInstance +{ private static final long serialVersionUID = 1L; @@ -49,336 +50,372 @@ // maps variablenames (String) to values (Object) protected transient Map transientVariables = null; protected transient List updatedVariableContainers = null; - - public ContextInstance() { + + public ContextInstance() + { } // normal variableInstances (persistent) //////////////////////////////////// - /** - * creates a variable on the root-token (= process-instance scope) and - * calculates the actual VariableInstance-type from the value. + /* + * creates a variable on the root-token (= process-instance scope) and calculates the actual VariableInstance-type from the value. */ - public void createVariable(String name, Object value) { + public void createVariable(String name, Object value) + { setVariableLocally(name, value, getRootToken()); } - /** - * sets the variable on the root token, creates the variable if necessary and - * calculates the actual VariableInstance-type from the value. + /* + * sets the variable on the root token, creates the variable if necessary and calculates the actual VariableInstance-type from the value. */ - public void setVariableLocally(String name, Object value) { + public void setVariableLocally(String name, Object value) + { setVariableLocally(name, value, getRootToken()); } - /** - * creates a variable in the scope of the given token and calculates the - * actual VariableInstance-type from the value. + /* + * creates a variable in the scope of the given token and calculates the actual VariableInstance-type from the value. */ - public void createVariable(String name, Object value, Token token) { + public void createVariable(String name, Object value, Token token) + { setVariableLocally(name, value, token); } - /** - * creates a variable in the scope of the given token and calculates the - * actual VariableInstance-type from the value. + /* + * creates a variable in the scope of the given token and calculates the actual VariableInstance-type from the value. */ - public void setVariableLocally(String name, Object value, Token token) { + public void setVariableLocally(String name, Object value, Token token) + { TokenVariableMap tokenVariableMap = createTokenVariableMap(token); tokenVariableMap.setVariableLocally(name, value); } - /** + /* * gets all the variableInstances on the root-token (= process-instance scope). */ - public Map getVariables() { + public Map getVariables() + { return getVariables(getRootToken()); } - /** + /* * retrieves all the variableInstances in scope of the given token. */ - public Map getVariables(Token token) { + public Map getVariables(Token token) + { Map variables = null; TokenVariableMap tokenVariableMap = getTokenVariableMap(token); - if (tokenVariableMap != null) { + if (tokenVariableMap != null) + { variables = tokenVariableMap.getVariables(); } return variables; } - /** + /* * adds all the variableInstances on the root-token (= process-instance scope). */ - public void addVariables(Map variables) { + public void addVariables(Map variables) + { setVariables(variables, getRootToken()); } - /** - * The method setVariables is the same as the {@link #addVariables(Map, Token)}, - * but it was added for more consistency. + /* + * The method setVariables is the same as the {@link #addVariables(Map, Token)}, but it was added for more consistency. */ - public void setVariables(Map variables) { + public void setVariables(Map variables) + { setVariables(variables, getRootToken()); } - /** - * adds all the variableInstances to the scope of the given token. - * This method delegates to {@link #setVariables(Map, Token)}. - * The method setVariables was added for more consistency. + /* + * adds all the variableInstances to the scope of the given token. This method delegates to {@link #setVariables(Map, Token)}. The method setVariables was added for + * more consistency. */ - public void addVariables(Map variables, Token token) { + public void addVariables(Map variables, Token token) + { setVariables(variables, token); } - /** - * adds all the variableInstances to the scope of the given token. - * The method setVariables is the same as the {@link #addVariables(Map, Token)}, - * but it was added for more consistency. + /* + * adds all the variableInstances to the scope of the given token. The method setVariables is the same as the {@link #addVariables(Map, Token)}, but it was added for + * more consistency. */ - public void setVariables(Map variables, Token token) { + public void setVariables(Map variables, Token token) + { + // [JBPM-1778] Empty map variables on process creation is set as null + TokenVariableMap tokenVariableMap = getOrCreateTokenVariableMap(token); Iterator iter = variables.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = (Map.Entry) iter.next(); - String name = (String) entry.getKey(); + while (iter.hasNext()) + { + Map.Entry entry = (Map.Entry)iter.next(); + String name = (String)entry.getKey(); Object value = entry.getValue(); - setVariable(name, value, token); + tokenVariableMap.setVariable(name, value); } } - /** - * gets the variable with the given name on the root-token (= process-instance - * scope). + /* + * gets the variable with the given name on the root-token (= process-instance scope). */ - public Object getVariable(String name) { + public Object getVariable(String name) + { return getVariable(name, getRootToken()); } - /** - * retrieves a variable in the scope of the token. If the given token does not - * have a variable for the given name, the variable is searched for up the - * token hierarchy. + /* + * retrieves a variable in the scope of the token. If the given token does not have a variable for the given name, the variable is searched for up the token + * hierarchy. */ - public Object getVariable(String name, Token token) { + public Object getVariable(String name, Token token) + { Object variable = null; TokenVariableMap tokenVariableMap = getTokenVariableMap(token); - if (tokenVariableMap != null) { + if (tokenVariableMap != null) + { variable = tokenVariableMap.getVariable(name); } return variable; } - /** - * retrieves a variable which is local to the token. - * Method {@link #getVariableLocally(String, Token)} is the same - * as this method and it was added for naming consistency. + /* + * retrieves a variable which is local to the token. Method {@link #getVariableLocally(String, Token)} is the same as this method and it was added for naming + * consistency. */ - public Object getLocalVariable(String name, Token token) { + public Object getLocalVariable(String name, Token token) + { return getVariableLocally(name, token); } - /** - * retrieves a variable which is local to the token. - * this method was added for naming consistency. it is the same - * as {@link #getLocalVariable(String, Token)}. + /* + * retrieves a variable which is local to the token. this method was added for naming consistency. it is the same as {@link #getLocalVariable(String, Token)}. */ - public Object getVariableLocally(String name, Token token) { + public Object getVariableLocally(String name, Token token) + { Object variable = null; - if (tokenVariableMaps!=null && tokenVariableMaps.containsKey(token)) { - TokenVariableMap tokenVariableMap = (TokenVariableMap) tokenVariableMaps.get(token); - if (tokenVariableMap != null) { + if (tokenVariableMaps != null && tokenVariableMaps.containsKey(token)) + { + TokenVariableMap tokenVariableMap = (TokenVariableMap)tokenVariableMaps.get(token); + if (tokenVariableMap != null) + { variable = tokenVariableMap.getVariableLocally(name); } } return variable; } - /** + /* * sets a variable on the process instance scope. */ - public void setVariable(String name, Object value) { + public void setVariable(String name, Object value) + { setVariable(name, value, getRootToken()); } - /** - * sets a variable. If a variable exists in the scope given by the token, that - * variable is updated. Otherwise, the variable is created on the root token - * (=process instance scope). + /* + * sets a variable. If a variable exists in the scope given by the token, that variable is updated. Otherwise, the variable is created on the root token (=process + * instance scope). */ - public void setVariable(String name, Object value, Token token) { + public void setVariable(String name, Object value, Token token) + { TokenVariableMap tokenVariableMap = getOrCreateTokenVariableMap(token); tokenVariableMap.setVariable(name, value); } - /** - * checks if a variable is present with the given name on the root-token (= - * process-instance scope). + /* + * checks if a variable is present with the given name on the root-token (= process-instance scope). */ - public boolean hasVariable(String name) { + public boolean hasVariable(String name) + { return hasVariable(name, getRootToken()); } - /** - * checks if a variable is present with the given name in the scope of the - * token. + /* + * checks if a variable is present with the given name in the scope of the token. */ - public boolean hasVariable(String name, Token token) { + public boolean hasVariable(String name, Token token) + { boolean hasVariable = false; TokenVariableMap tokenVariableMap = getTokenVariableMap(token); - if (tokenVariableMap != null) { + if (tokenVariableMap != null) + { hasVariable = tokenVariableMap.hasVariable(name); } return hasVariable; } - /** + /* * deletes the given variable on the root-token (=process-instance scope). */ - public void deleteVariable(String name) { + public void deleteVariable(String name) + { deleteVariable(name, getRootToken()); } - /** - * deletes a variable from the given token. For safety reasons, this method does - * not propagate the deletion to parent tokens in case the given token does not contain - * the variable. + /* + * deletes a variable from the given token. For safety reasons, this method does not propagate the deletion to parent tokens in case the given token does not contain + * the variable. */ - public void deleteVariable(String name, Token token) { + public void deleteVariable(String name, Token token) + { TokenVariableMap tokenVariableMap = getTokenVariableMap(token); - if (tokenVariableMap != null) { + if (tokenVariableMap != null) + { tokenVariableMap.deleteVariable(name); } } // transient variableInstances ////////////////////////////////////////////// - /** + /* * retrieves the transient variable for the given name. */ - public Object getTransientVariable(String name) { + public Object getTransientVariable(String name) + { Object transientVariable = null; - if (transientVariables!= null) { + if (transientVariables != null) + { transientVariable = transientVariables.get(name); } return transientVariable; } - /** + /* * sets the transient variable for the given name to the given value. */ - public void setTransientVariable(String name, Object value) { - if (transientVariables == null) { + public void setTransientVariable(String name, Object value) + { + if (transientVariables == null) + { transientVariables = new HashMap(); } transientVariables.put(name, value); } - /** + /* * tells if a transient variable with the given name is present. */ - public boolean hasTransientVariable(String name) { - if (transientVariables == null) { + public boolean hasTransientVariable(String name) + { + if (transientVariables == null) + { return false; } return transientVariables.containsKey(name); } - /** - * retrieves all the transient variableInstances map. note that no deep copy is - * performed, changing the map leads to changes in the transient variableInstances of + /* + * retrieves all the transient variableInstances map. note that no deep copy is performed, changing the map leads to changes in the transient variableInstances of * this context instance. */ - public Map getTransientVariables() { + public Map getTransientVariables() + { return transientVariables; } - /** + /* * replaces the transient variableInstances with the given map. */ - public void setTransientVariables(Map transientVariables) { + public void setTransientVariables(Map transientVariables) + { this.transientVariables = transientVariables; } - /** + /* * removes the transient variable. */ - public void deleteTransientVariable(String name) { + public void deleteTransientVariable(String name) + { if (transientVariables == null) return; transientVariables.remove(name); } - - Token getRootToken() { + Token getRootToken() + { return processInstance.getRootToken(); } - /** - * searches for the first token-variable-map for the given token - * and creates it on the root token if it doesn't exist. + /* + * searches for the first token-variable-map for the given token and creates it on the root token if it doesn't exist. */ - public TokenVariableMap getOrCreateTokenVariableMap(Token token) { - if (token==null) { + public TokenVariableMap getOrCreateTokenVariableMap(Token token) + { + if (token == null) + { throw new JbpmException("can't get variables for token 'null'"); } // if the given token has a variable map TokenVariableMap tokenVariableMap = null; - if ( (tokenVariableMaps!=null) - && (tokenVariableMaps.containsKey(token)) - ) { - tokenVariableMap = (TokenVariableMap) tokenVariableMaps.get(token); + if ((tokenVariableMaps != null) && (tokenVariableMaps.containsKey(token))) + { + tokenVariableMap = (TokenVariableMap)tokenVariableMaps.get(token); - } else if (!token.isRoot()) { + } + else if (!token.isRoot()) + { tokenVariableMap = getOrCreateTokenVariableMap(token.getParent()); - - } else { + + } + else + { tokenVariableMap = createTokenVariableMap(token); } - + return tokenVariableMap; } - TokenVariableMap createTokenVariableMap(Token token) { - if (tokenVariableMaps==null) { + TokenVariableMap createTokenVariableMap(Token token) + { + if (tokenVariableMaps == null) + { tokenVariableMaps = new HashMap(); } - TokenVariableMap tokenVariableMap = (TokenVariableMap) tokenVariableMaps.get(token); - if (tokenVariableMap==null) { + TokenVariableMap tokenVariableMap = (TokenVariableMap)tokenVariableMaps.get(token); + if (tokenVariableMap == null) + { tokenVariableMap = new TokenVariableMap(token, this); tokenVariableMaps.put(token, tokenVariableMap); } return tokenVariableMap; } - /** - * looks for the first token-variable-map that is found - * up the token-parent hirarchy. + /* + * looks for the first token-variable-map that is found up the token-parent hirarchy. */ - public TokenVariableMap getTokenVariableMap(Token token) { + public TokenVariableMap getTokenVariableMap(Token token) + { TokenVariableMap tokenVariableMap = null; - if (tokenVariableMaps!=null) { - if (tokenVariableMaps.containsKey(token)) { - tokenVariableMap = (TokenVariableMap) tokenVariableMaps.get(token); - } else if (! token.isRoot()) { + if (tokenVariableMaps != null) + { + if (tokenVariableMaps.containsKey(token)) + { + tokenVariableMap = (TokenVariableMap)tokenVariableMaps.get(token); + } + else if (!token.isRoot()) + { tokenVariableMap = getTokenVariableMap(token.getParent()); } } return tokenVariableMap; } - public VariableInstance getVariableInstance(String name, Token token) { + public VariableInstance getVariableInstance(String name, Token token) + { VariableInstance variableInstance = null; TokenVariableMap tokenVariableMap = getTokenVariableMap(token); - if (tokenVariableMap!=null) { + if (tokenVariableMap != null) + { tokenVariableMap.getVariableInstances(); } return variableInstance; } - public Map getTokenVariableMaps() { + public Map getTokenVariableMaps() + { return tokenVariableMaps; } } 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 13:05:58 UTC (rev 3366) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java 2008-12-12 14:00:33 UTC (rev 3367) @@ -60,20 +60,20 @@ private static final long serialVersionUID = 1L; - long id = 0; - int version = 0; - protected String key = null; - protected Date start = null; - protected Date end = null; - protected ProcessDefinition processDefinition = null; - protected Token rootToken = null; - protected Token superProcessToken = null; - protected boolean isSuspended = false; - protected Map instances = null; - protected Map transientInstances = null; - protected List runtimeActions = null; + long id; + int version; + protected String key; + protected Date start; + protected Date end; + protected ProcessDefinition processDefinition; + protected Token rootToken; + protected Token superProcessToken; + protected boolean isSuspended; + protected Map instances; + protected Map transientInstances; + protected List runtimeActions; /** not persisted */ - protected List cascadeProcessInstances = null; + protected List cascadeProcessInstances; // constructors ///////////////////////////////////////////////////////////// Added: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1778/JBPM1778Test.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1778/JBPM1778Test.java (rev 0) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1778/JBPM1778Test.java 2008-12-12 14:00:33 UTC (rev 3367) @@ -0,0 +1,55 @@ +package org.jbpm.jbpm1778; + +import java.util.HashMap; +import java.util.Map; + +import org.jbpm.AbstractJbpmTestCase; +import org.jbpm.JbpmConfiguration; +import org.jbpm.JbpmContext; +import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.ProcessInstance; +import org.jbpm.taskmgmt.exe.TaskMgmtInstance; + +/** + * Empty map variables on process creation is set as null + * + * https://jira.jboss.org/jira/browse/JBPM-1778 + * + * @author Thomas.Diesler(a)jboss.com + */ +public class JBPM1778Test extends AbstractJbpmTestCase +{ + + public void testEmptyMapVariables() + { + JbpmContext jbpmContext = JbpmConfiguration.getInstance().createJbpmContext(); + try + { + HashMap<String, String> vars = new HashMap<String, String>(); + // vars.put("uno", "dos"); + + ProcessDefinition pd = ProcessDefinition.parseXmlString( + "<process-definition>" + + " <start-state>" + + " <transition to='s' />" + + " </start-state>" + + " <state name='s'>" + + " <transition to='end' />" + + " </state>" + + " <end-state name='end' />" + + "</process-definition>"); + + ProcessInstance pi = pd.createProcessInstance(vars); + TaskMgmtInstance tmi = pi.getTaskMgmtInstance(); + tmi.createStartTaskInstance(); + + Map piVars = pi.getContextInstance().getVariables(); + assertNotNull("ProcessInstance vars not null", piVars); + assertEquals("ProcessInstance vars empty", 0, piVars.size()); + } + finally + { + jbpmContext.close(); + } + } +} Property changes on: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1778/JBPM1778Test.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3366 - in jbpm3/trunk: modules/distribution and 2 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-12 08:05:58 -0500 (Fri, 12 Dec 2008) New Revision: 3366 Modified: jbpm3/trunk/modules/distribution/pom.xml jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/trunk/pom.xml Log: [JBPM-1866] add javadoc to installer Modified: jbpm3/trunk/modules/distribution/pom.xml =================================================================== --- jbpm3/trunk/modules/distribution/pom.xml 2008-12-12 12:32:08 UTC (rev 3365) +++ jbpm3/trunk/modules/distribution/pom.xml 2008-12-12 13:05:58 UTC (rev 3366) @@ -10,8 +10,7 @@   -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss jBPM3 - Distribution</name> <groupId>org.jbpm.jbpm3</groupId> @@ -50,7 +49,7 @@ <classifier>config</classifier> <version>${version}</version> </dependency> - + <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-db</artifactId> @@ -122,66 +121,80 @@ <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec-dialect-api10</artifactId> </dependency> - +  <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jsf-console</artifactId> - <type>war</type> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jsf-console</artifactId> + <type>war</type> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>gwt-console</artifactId> <type>war</type> </dependency> - <dependency> + <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>gwt-console-server</artifactId> <type>war</type> </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>gwt-console-server</artifactId> - <classifier>report</classifier> - <type>zip</type> - </dependency> - <dependency> + <dependency> <groupId>org.jbpm.jbpm3</groupId> + <artifactId>gwt-console-server</artifactId> + <classifier>report</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl-designer-site</artifactId> <type>zip</type> </dependency> - <dependency> - <groupId>org.jbpm</groupId> - <artifactId>report-server</artifactId> - <type>war</type> - </dependency> + <dependency> + <groupId>org.jbpm</groupId> + <artifactId>report-server</artifactId> + <type>war</type> + </dependency> -  +  <dependency> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-jpdl</artifactId> + <artifactId>jbpm-enterprise</artifactId> <classifier>sources</classifier> <version>${version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jsf-console</artifactId> + <artifactId>jbpm-identity</artifactId> <classifier>sources</classifier> - <version>${jbpm.jsf-console.version}</version> + <version>${version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-enterprise</artifactId> + <artifactId>jbpm-jpdl</artifactId> <classifier>sources</classifier> <version>${version}</version> </dependency> + +  <dependency> <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-enterprise</artifactId> + <classifier>javadoc</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-identity</artifactId> - <classifier>sources</classifier> + <classifier>javadoc</classifier> <version>${version}</version> </dependency> - + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>javadoc</classifier> + <version>${version}</version> + </dependency> +  <dependency> <groupId>org.apache.ant</groupId> Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-12 12:32:08 UTC (rev 3365) +++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-12 13:05:58 UTC (rev 3366) @@ -70,8 +70,9 @@ <unpack>true</unpack> </dependencySet> -  +  <dependencySet> +  <outputDirectory>src</outputDirectory> <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> @@ -80,6 +81,17 @@ </includes> <unpack>false</unpack> </dependencySet> + +  + <dependencySet> + <outputDirectory>javadoc</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.jbpm:*:jar:javadoc</include> + </includes> + <unpack>false</unpack> + </dependencySet> </dependencySets> <fileSets> 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:32:08 UTC (rev 3365) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-12 13:05:58 UTC (rev 3366) @@ -118,23 +118,29 @@ <file src="@{deploy.artifacts.dir}/etc/release.notes.html" targetdir="$INSTALL_PATH" override="true" /> <file src="@{deploy.artifacts.dir}/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH" override="true" /> -  +  <file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config" unpack="true" override="true" /> <file src="@{deploy.artifacts.dir}/etc/version.info.xml" targetdir="$INSTALL_PATH/config" override="true" /> -  +  <file src="@{deploy.artifacts.dir}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database" unpack="true" override="true" /> -  - <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide" - unpack="true" override="true" /> - <file src="@{deploy.artifacts.dir}/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH" - override="true" /> +  + <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide" unpack="true" override="true" /> + <fileset dir="@{deploy.artifacts.dir}/javadoc" targetdir="$INSTALL_PATH/docs" override="true"/> -  +  <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/designer" override="true"> <include name="jbpm-jpdl-designer-site.zip" /> </fileset> @@ -142,7 +148,9 @@ override="true" /> <fileset dir="@{deploy.artifacts.dir}/examples" targetdir="$INSTALL_PATH/examples" override="true"/> -  +  <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true"> <include name="bpm-spec-api.jar" /> <include name="activation.jar" /> @@ -167,7 +175,9 @@ <include name="log4j.jar" /> </fileset> -  +  <fileset dir="@{deploy.artifacts.dir}/src" targetdir="$INSTALL_PATH/src" override="true"> <include name="jsf-console-sources.jar" /> <include name="jbpm-jpdl-sources.jar" /> Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2008-12-12 12:32:08 UTC (rev 3365) +++ jbpm3/trunk/pom.xml 2008-12-12 13:05:58 UTC (rev 3366) @@ -10,8 +10,7 @@   -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss jBPM3</name> <groupId>org.jbpm.jbpm3</groupId> @@ -29,20 +28,23 @@  <modules> <module>modules/core</module> - <module>modules/db</module> <module>modules/identity</module> <module>modules/enterprise</module> <module>modules/examples</module> <module>modules/simulation</module> <module>modules/integration</module> + +  </modules>  <properties> <apache.ant.version>1.7.0</apache.ant.version> <apache.cactus.version>1.8.0</apache.cactus.version> - <apache.jackrabbit.version>1.4.5</apache.jackrabbit.version> + <apache.jackrabbit.version>1.4.5</apache.jackrabbit.version> <birt.version>2.2.2</birt.version> <bsh.version>1.3.0</bsh.version> <commons.fileupload.version>1.2.1</commons.fileupload.version> @@ -93,7 +95,7 @@  <dependencyManagement> <dependencies> -  +  <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jsf-console</artifactId> @@ -106,14 +108,14 @@ <version>${jbpm.gwt-console.version}</version> <type>war</type> </dependency> - <dependency> + <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>gwt-console-server</artifactId> <classifier>report</classifier> <version>${jbpm.gwt-console.version}</version> <type>zip</type> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>gwt-console-server</artifactId> <version>${jbpm.gwt-console.version}</version> @@ -125,12 +127,12 @@ <version>${jbpm.designer.version}</version> <type>zip</type> </dependency> - <dependency> - <groupId>org.jbpm</groupId> - <artifactId>report-server</artifactId> - <version>${report-server.version}</version> - <type>war</type> - </dependency> + <dependency> + <groupId>org.jbpm</groupId> + <artifactId>report-server</artifactId> + <version>${report-server.version}</version> + <type>war</type> + </dependency>  <dependency> @@ -156,7 +158,7 @@ <artifactId>bsh</artifactId> <version>${bsh.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.eclipse.birt</groupId> <artifactId>report-engine</artifactId> <type>zip</type> @@ -436,9 +438,6 @@ <build> <plugins> <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <testFailureIgnore>false</testFailureIgnore> @@ -465,32 +464,23 @@ <profile> <id>distro</id> <modules> - <module>modules/distribution</module> -  + <module>modules/distribution</module> </modules> <build> <plugins> <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>skiptests</id> - <build> - <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3365 - jbpm3/trunk/modules/distribution/src/main/resources/installer.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-12-12 07:32:08 -0500 (Fri, 12 Dec 2008) New Revision: 3365 Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml Log: Don't unpack gwt-console-server.war 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:28:35 UTC (rev 3364) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-12 12:32:08 UTC (rev 3365) @@ -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="false" override="true" /> + <file src="@{deploy.artifacts.dir}/lib/gwt-console-server.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" 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

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits December 2008