JBoss JBPM SVN: r5924 - in jbpm4/trunk/modules: jpdl/src/main/java/org/jbpm/jpdl/internal/activity and 6 other directories.
by do-not-reply＠jboss.org
Author: jbarrez
Date: 2009-12-08 08:28:56 -0500 (Tue, 08 Dec 2009)
New Revision: 5924
Modified:
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/task/TaskCompletionTest.java
jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/task/TaskOutcomesTest.java
jbpm4/trunk/modules/test-db/src/test/resources/logging.properties
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Services.xml
Log:
Fix for JBPM-2492 : improve task outcomes
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml 2009-12-08 03:33:29 UTC (rev 5923)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml 2009-12-08 13:28:56 UTC (rev 5924)
@@ -745,13 +745,6 @@
</para>
</section>
-
- <section>
- <title>Task outcomes</title>
- <para>Task outcomes might be changed as it is still being discussed
- <ulink url="http://www.jboss.org/index.html?module=bb&op=viewtopic&p=4241828">here</ulink>
- </para>
- </section>
<section id="taskforms">
<title>Task forms</title>
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java 2009-12-08 03:33:29 UTC (rev 5923)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/TaskActivity.java 2009-12-08 13:28:56 UTC (rev 5924)
@@ -21,12 +21,12 @@
*/
package org.jbpm.jpdl.internal.activity;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.jbpm.api.JbpmException;
import org.jbpm.api.activity.ActivityExecution;
-import org.jbpm.api.task.Task;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
@@ -38,6 +38,7 @@
import org.jbpm.pvm.internal.task.ParticipationImpl;
import org.jbpm.pvm.internal.task.SwimlaneDefinitionImpl;
import org.jbpm.pvm.internal.task.SwimlaneImpl;
+import org.jbpm.pvm.internal.task.TaskConstants;
import org.jbpm.pvm.internal.task.TaskDefinitionImpl;
import org.jbpm.pvm.internal.task.TaskImpl;
@@ -111,36 +112,72 @@
execution.fire(signalName, activity);
- DbSession taskDbSession = EnvironmentImpl
- .getFromCurrent(DbSession.class);
+ DbSession taskDbSession = EnvironmentImpl .getFromCurrent(DbSession.class);
TaskImpl task = (TaskImpl) taskDbSession.findTaskByExecution(execution);
task.setSignalling(false);
Transition transition = null;
List<Transition> outgoingTransitions = activity.getOutgoingTransitions();
- if ( (outgoingTransitions!=null)
- && (!outgoingTransitions.isEmpty())
- ) {
- transition = activity.findOutgoingTransition(signalName);
- if (transition==null) {
- if (Task.STATE_COMPLETED.equals(signalName)) {
- if (outgoingTransitions.size()==1) {
+
+ if ( (outgoingTransitions!=null) && (!outgoingTransitions.isEmpty()) ) {
+
+ // Lookup the outgoing transition
+
+ boolean noOutcomeSpecified =TaskConstants.NO_TASK_OUTCOME_SPECIFIED.equals(signalName);
+ if (noOutcomeSpecified && activity.findOutgoingTransition(signalName) == null) {
+ // When no specific outcome was specified, the unnamed transition
+ // is looked up (name is null). If a null outcome was specifically
+ // used, then the else clause will be used (but the result is the same)
+ // Note: the second part of the if clause is to avoid the siutation
+ // where the user would have chosen the same name as the constant
+ transition = activity.findOutgoingTransition(null);
+ } else {
+ transition = activity.findOutgoingTransition(signalName);
+ }
+
+ // If no transition has been found, we check if we have a special case
+ // in which we can still deduce the outgoing transition
+
+ if (transition==null) { // no unnamed transition found
+
+ if (signalName == null) {
+
+ // null was explicitely given as outcome
+ throw new JbpmException("No unnamed transitions were found for the task '" + getTaskDefinition().getName() + "'");
+
+ } else if (noOutcomeSpecified) { // Special case: complete(id)
+
+ if (outgoingTransitions.size() == 1) { // If only 1 transition, take that one
transition = outgoingTransitions.get(0);
} else {
- transition = activity.getDefaultOutgoingTransition();
+ throw new JbpmException("No unnamed transitions were found for the task '" + getTaskDefinition().getName() + "'");
}
+
} else {
- // if a user specified outcome was provided and it doesn't
- // match with an outgoing transition name, then an exception is
- // thrown since this is likely a programmatic error.
- throw new JbpmException("No outcome named '" + signalName + "' was found.");
+ // Likely a programmatic error.
+ throw new JbpmException("No transition named '" + signalName + "' was found.");
}
+
}
+
if (transition!=null) {
execution.take(transition);
}
+
}
}
+
+ /**
+ * Checks if the given collection of transitions are all named or not.
+ */
+ private boolean allTransitionsNamed(Collection<Transition> transitions) {
+ for (Transition transition : transitions) {
+ if (transition.getName() == null) {
+ return false;
+ }
+ }
+ return true;
+ }
public TaskDefinitionImpl getTaskDefinition() {
return taskDefinition;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java 2009-12-08 03:33:29 UTC (rev 5923)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CompleteTaskCmd.java 2009-12-08 13:28:56 UTC (rev 5924)
@@ -35,11 +35,18 @@
protected String taskId;
protected String outcome;
+ protected boolean outcomeSpecified;
public CompleteTaskCmd(String taskId, String outcome) {
this.taskId = taskId;
this.outcome = outcome;
+ this.outcomeSpecified = true;
}
+
+ public CompleteTaskCmd(String taskId) {
+ this.taskId = taskId;
+ this.outcomeSpecified = false;
+ }
public Void execute(Environment environment) throws Exception {
DbSession dbSession = environment.get(DbSession.class);
@@ -54,10 +61,10 @@
throw new JbpmException("No task with id " + taskId + " was found");
}
- if (outcome==null) {
+ if (outcomeSpecified) {
+ task.complete(outcome);
+ } else {
task.complete();
- } else {
- task.complete(outcome);
}
dbSession.delete(task);
return null;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java 2009-12-08 03:33:29 UTC (rev 5923)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetOutcomes.java 2009-12-08 13:28:56 UTC (rev 5924)
@@ -60,8 +60,7 @@
}
Set<String> outcomes = new HashSet<String>();
- outcomes.add(Task.STATE_COMPLETED);
-
+
ExecutionImpl execution = (task!=null ? task.getExecution() : null);
ActivityImpl activity = (execution!=null ? execution.getActivity() : null);
List<Transition> outgoingTransitions = (activity!=null ? activity.getOutgoingTransitions() : null);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-12-08 03:33:29 UTC (rev 5923)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-12-08 13:28:56 UTC (rev 5924)
@@ -85,7 +85,7 @@
}
public void completeTask(String taskId) {
- commandService.execute(new CompleteTaskCmd(taskId, null));
+ commandService.execute(new CompleteTaskCmd(taskId));
}
public void completeTask(String taskId, Map<String, Object> variables) {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-12-08 03:33:29 UTC (rev 5923)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-12-08 13:28:56 UTC (rev 5924)
@@ -181,10 +181,10 @@
}
// completion ///////////////////////////////////////////////////////////////
-
+
public void complete() {
- complete(Task.STATE_COMPLETED);
- }
+ complete(TaskConstants.NO_TASK_OUTCOME_SPECIFIED);
+ }
public void complete(String outcome) {
historyTaskComplete(outcome);
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/task/TaskCompletionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/task/TaskCompletionTest.java 2009-12-08 03:33:29 UTC (rev 5923)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/task/TaskCompletionTest.java 2009-12-08 13:28:56 UTC (rev 5924)
@@ -53,14 +53,6 @@
" <end name='theEnd' />" +
"</process>";
- public void testCompletionWithNoOutcome() {
- Ids ids = deployAndStartProcessInstance();
- taskService.completeTask(ids.taskId);
- assertExecutionInOneOrMoreActivitiesActive(ids.processInstanceId, "stateOne", "stateTwo");
- assertNoOpenTasks(ids.processInstanceId);
- assertHistoryTaskCreated(ids.processInstanceId, null);
- }
-
public void testCompletionWithNullOrEmptyId() {
try {
taskService.completeTask(null);
@@ -116,7 +108,7 @@
Ids ids = deployAndStartProcessInstance();
Map<String, Object> vars = new HashMap<String, Object>();
vars.put("testVar", "testValue");
- taskService.completeTask(ids.taskId, vars);
+ taskService.completeTask(ids.taskId, "one",vars);
assertEquals("testValue", executionService.getVariable(ids.processInstanceId, "testVar"));
assertNoOpenTasks(ids.processInstanceId);
Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/task/TaskOutcomesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/task/TaskOutcomesTest.java 2009-12-08 03:33:29 UTC (rev 5923)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/task/TaskOutcomesTest.java 2009-12-08 13:28:56 UTC (rev 5924)
@@ -34,240 +34,387 @@
* @author Tom Baeyens
*/
public class TaskOutcomesTest extends JbpmTestCase {
-
- public void testTaskSingleUnnamedTransition() {
- deployJpdlXmlString(
- "<process name='UnnamedTransition'>" +
- " <start>" +
- " <transition to='review' />" +
- " </start>" +
- " <task name='review' " +
- " assignee='johndoe'>" +
- " <transition to='wait' />" +
- " </task>" +
- " <state name='wait'/>" +
- "</process>"
- );
+
+ private static final String UNNAMED_TRANSITION_PROCESS_NAME = "UnnamedTransition";
+
+ private static final String UNNAMED_TRANSITION_PROCESS =
+ "<process name='" + UNNAMED_TRANSITION_PROCESS_NAME +"'>" +
+ " <start>" +
+ " <transition to='review' />" +
+ " </start>" +
+ " <task name='review' " +
+ " assignee='johndoe'>" +
+ " <transition to='wait' />" +
+ " </task>" +
+ " <state name='wait'/>" +
+ "</process>";
+
+ private static final String NAMED_TRANSITION_PROCESS_NAME = "NamedTransition";
+
+ private static final String NAMED_TRANSITION_PROCESS =
+ "<process name='" + NAMED_TRANSITION_PROCESS_NAME +"'>" +
+ " <start>" +
+ " <transition to='review' />" +
+ " </start>" +
+ " <task name='review' " +
+ " assignee='johndoe'>" +
+ " <transition name='theOneAndOnly' to='wait' />" +
+ " </task>" +
+ " <state name='wait'/>" +
+ "</process>";
+
+ private static final String NO_TRANSITION_PROCESS_NAME = "NoTransition";
+
+ private static final String NO_TRANSITION_PROCESS =
+ "<process name='" + NO_TRANSITION_PROCESS_NAME + "'>" +
+ " <start>" +
+ " <transition to='review' />" +
+ " </start>" +
+ " <task name='review' " +
+ " assignee='johndoe'>" +
+ " </task>" +
+ " <state name='wait'/>" +
+ "</process>";
+
+ private static final String MULTIPLE_NAMED_TRANSITIONS_PROCESS_NAME = "MultipleTransitions";
+
+ private static final String MULTIPLE_NAMED_TRANSITIONS_PROCESS =
+ "<process name='" + MULTIPLE_NAMED_TRANSITIONS_PROCESS_NAME + "'>" +
+ " <start>" +
+ " <transition to='review' />" +
+ " </start>" +
+ " <task name='review' " +
+ " assignee='johndoe'>" +
+ " <transition name='left' to='wait1' />" +
+ " <transition name='middle' to='wait2' />" +
+ " <transition name='right' to='wait3' />" +
+ " </task>" +
+ " <state name='wait1'/>" +
+ " <state name='wait2'/>" +
+ " <state name='wait3'/>" +
+ "</process>";
+
+ private static final String MULTIPLE_NOT_ALL_NAMED_TRANSITIONS_PROCESS_NAME = "MultipleTransitionsWithUnnamed";
+
+ private static final String MULTIPLE_NOT_ALL_NAMED_TRANSITIONS_PROCESS =
+ "<process name='" + MULTIPLE_NOT_ALL_NAMED_TRANSITIONS_PROCESS_NAME + "'>" +
+ " <start>" +
+ " <transition to='review' />" +
+ " </start>" +
+ " <task name='review' " +
+ " assignee='johndoe'>" +
+ " <transition name='left' to='wait1' />" +
+ " <transition to='wait2' />" +
+ " <transition name='right' to='wait3' />" +
+ " </task>" +
+ " <state name='wait1'/>" +
+ " <state name='wait2'/>" +
+ " <state name='wait3'/>" +
+ "</process>";
+
+
+ public void testGetOutcomesNoTransition() {
+ deployJpdlXmlString(NO_TRANSITION_PROCESS);
+ executionService.startProcessInstanceByKey(NO_TRANSITION_PROCESS_NAME);
- ProcessInstance processInstance = executionService.startProcessInstanceByKey("UnnamedTransition");
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+ Set<String> outcomes = taskService.getOutcomes(task.getId());
- Task task = taskService
- .createTaskQuery()
- .assignee("johndoe")
- .uniqueResult();
-
- taskService.completeTask(task.getId());
-
- processInstance = executionService.findProcessInstanceById(processInstance.getId());
-
- assertNotNull(processInstance.findActiveExecutionIn("wait"));
+ Set<String> expectedOutcomes = new HashSet<String>();
+ assertEquals(expectedOutcomes, outcomes);
}
- public void testTaskTakeSingleNamedTransition() {
- deployJpdlXmlString(
- "<process name='NamedTransition'>" +
- " <start>" +
- " <transition to='review' />" +
- " </start>" +
- " <task name='review' " +
- " assignee='johndoe'>" +
- " <transition name='theOneAndOnly' to='wait' />" +
- " </task>" +
- " <state name='wait'/>" +
- "</process>"
- );
+ public void testGetOutcomesSingleUnnamedTransition() {
+ deployJpdlXmlString(UNNAMED_TRANSITION_PROCESS);
+ executionService.startProcessInstanceByKey(UNNAMED_TRANSITION_PROCESS_NAME);
- ProcessInstance processInstance = executionService.startProcessInstanceByKey("NamedTransition");
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
- Task task = taskService
- .createTaskQuery()
- .assignee("johndoe")
- .uniqueResult();
+ Set<String> outcomes = taskService.getOutcomes(task.getId());
+ Set<String> expectedOutcomes = new HashSet<String>();
+ expectedOutcomes.add(null);
- taskService.completeTask(task.getId());
-
- processInstance = executionService.findProcessInstanceById(processInstance.getId());
-
- assertNotNull(processInstance.findActiveExecutionIn("wait"));
+ assertEquals(expectedOutcomes, outcomes);
}
- public void testTaskTakeSingleNamedTransitionWithMatchingOutcome() {
- deployJpdlXmlString(
- "<process name='MatchingOutdome'>" +
- " <start>" +
- " <transition to='review' />" +
- " </start>" +
- " <task name='review' " +
- " assignee='johndoe'>" +
- " <transition name='theOneAndOnly' to='wait' />" +
- " </task>" +
- " <state name='wait'/>" +
- "</process>"
- );
+ public void testGetOutcomesSingleNamedTransition() {
+ deployJpdlXmlString(NAMED_TRANSITION_PROCESS);
+ executionService.startProcessInstanceByKey(NAMED_TRANSITION_PROCESS_NAME);
- ProcessInstance processInstance = executionService.startProcessInstanceByKey("MatchingOutdome");
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+ Set<String> outcomes = taskService.getOutcomes(task.getId());
- Task task = taskService
- .createTaskQuery()
- .assignee("johndoe")
- .uniqueResult();
+ Set<String> expectedOutcomes = new HashSet<String>();
+ expectedOutcomes.add("theOneAndOnly");
- taskService.completeTask(task.getId(), "theOneAndOnly");
-
- processInstance = executionService.findProcessInstanceById(processInstance.getId());
-
- assertNotNull(processInstance.findActiveExecutionIn("wait"));
+ assertEquals(expectedOutcomes, outcomes);
}
- public void testTaskTakeSingleNamedTransitionWithUnmatchingOutcome() {
- deployJpdlXmlString(
- "<process name='UnmatchingOutcome'>" +
- " <start>" +
- " <transition to='review' />" +
- " </start>" +
- " <task name='review' " +
- " assignee='johndoe'>" +
- " <transition to='wait' />" +
- " </task>" +
- " <state name='wait'/>" +
- "</process>"
- );
+ public void testGetOutcomesMultipleTransitionsAllNamed() {
+ deployJpdlXmlString(MULTIPLE_NAMED_TRANSITIONS_PROCESS);
+ executionService.startProcessInstanceByKey(MULTIPLE_NAMED_TRANSITIONS_PROCESS_NAME);
- ProcessInstance processInstance = executionService.startProcessInstanceByKey("UnmatchingOutcome");
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+ Set<String> outcomes = taskService.getOutcomes(task.getId());
- Task task = taskService
- .createTaskQuery()
- .assignee("johndoe")
- .uniqueResult();
+ Set<String> expectedOutcomes = new HashSet<String>();
+ expectedOutcomes.add("left");
+ expectedOutcomes.add("right");
+ expectedOutcomes.add("middle");
- try {
- taskService.completeTask(task.getId(), "Refused");
- fail();
- } catch (JbpmException e) {
- // exception should be thrown
- }
-
+ assertEquals(expectedOutcomes, outcomes);
}
-
- public void testGetOutcomesNoTransition() {
- deployJpdlXmlString(
- "<process name='UnmatchingOutcome'>" +
- " <start>" +
- " <transition to='review' />" +
- " </start>" +
- " <task name='review' " +
- " assignee='johndoe'>" +
- " </task>" +
- " <state name='wait'/>" +
- "</process>"
- );
+
+ public void testGetOutcomesMultipleTransitionsNotAllNamed() {
+ deployJpdlXmlString(MULTIPLE_NOT_ALL_NAMED_TRANSITIONS_PROCESS);
+ executionService.startProcessInstanceByKey(MULTIPLE_NOT_ALL_NAMED_TRANSITIONS_PROCESS_NAME);
- ProcessInstance processInstance = executionService.startProcessInstanceByKey("UnmatchingOutcome");
-
- Task task = taskService
- .createTaskQuery()
- .assignee("johndoe")
- .uniqueResult();
-
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
Set<String> outcomes = taskService.getOutcomes(task.getId());
Set<String> expectedOutcomes = new HashSet<String>();
- expectedOutcomes.add(Task.STATE_COMPLETED);
+ expectedOutcomes.add("left");
+ expectedOutcomes.add(null);
+ expectedOutcomes.add("right");
assertEquals(expectedOutcomes, outcomes);
}
- public void testGetOutcomesSingleUnnamedTransition() {
- deployJpdlXmlString(
- "<process name='UnmatchingOutcome'>" +
- " <start>" +
- " <transition to='review' />" +
- " </start>" +
- " <task name='review' " +
- " assignee='johndoe'>" +
- " <transition to='wait' />" +
- " </task>" +
- " <state name='wait'/>" +
- "</process>"
- );
+ /**
+ * If a task has one outgoing transition without a name then
+ * taskService.completeTask(taskId) will take that outgoing transition
+ */
+ public void testCompleteTaskWithOneUnnamedTransitionById() {
+ deployJpdlXmlString(UNNAMED_TRANSITION_PROCESS);
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey(UNNAMED_TRANSITION_PROCESS_NAME);
- ProcessInstance processInstance = executionService.startProcessInstanceByKey("UnmatchingOutcome");
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+ taskService.completeTask(task.getId());
- Task task = taskService
- .createTaskQuery()
- .assignee("johndoe")
- .uniqueResult();
+ processInstance = executionService.findProcessInstanceById(processInstance.getId());
+ assertNotNull(processInstance.findActiveExecutionIn("wait"));
+ }
+
+ /**
+ * If a task has one outgoing transition without a name then
+ * taskService.completeTask(taskId, null) will take that outgoing transition
+ */
+ public void testCompleteTaskWithOneUnnamedTransitionByIdAndNullTransition() {
+ deployJpdlXmlString(UNNAMED_TRANSITION_PROCESS);
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey(UNNAMED_TRANSITION_PROCESS_NAME);
- Set<String> outcomes = taskService.getOutcomes(task.getId());
+ Task task = taskService.createTaskQuery().assignee("johndoe") .uniqueResult();
+ taskService.completeTask(task.getId(), (String) null);
- Set<String> expectedOutcomes = new HashSet<String>();
- expectedOutcomes.add(Task.STATE_COMPLETED);
- expectedOutcomes.add(null);
+ processInstance = executionService.findProcessInstanceById(processInstance.getId());
+ assertNotNull(processInstance.findActiveExecutionIn("wait"));
+ }
+
+ /**
+ * If a task has one outgoing transition without a name then
+ * taskService.completeTask(taskId, "anyvalue") will result in an exception
+ */
+ public void testCompleteTaskWithOneUnnamedTransitionByIdAndWrongTransition() {
+ deployJpdlXmlString(UNNAMED_TRANSITION_PROCESS);
+ executionService.startProcessInstanceByKey(UNNAMED_TRANSITION_PROCESS_NAME);
- assertEquals(expectedOutcomes, outcomes);
+ Task task = taskService.createTaskQuery().assignee("johndoe") .uniqueResult();
+ try {
+ taskService.completeTask(task.getId(), "anyValue");
+ fail();
+ } catch (JbpmException e) {
+ // Exception is expected
+ e.printStackTrace();
+ }
+ assertNotNull("After completion with an invalid outcome, the task should remain unchanged",
+ taskService.createTaskQuery().assignee("johndoe") .uniqueResult());
}
- public void testGetOutcomesSingleNamedTransition() {
- deployJpdlXmlString(
- "<process name='UnmatchingOutcome'>" +
- " <start>" +
- " <transition to='review' />" +
- " </start>" +
- " <task name='review' " +
- " assignee='johndoe'>" +
- " <transition name='toedeloe' to='wait' />" +
- " </task>" +
- " <state name='wait'/>" +
- "</process>"
- );
+ /**
+ * If a task has one named transition, then taskService.completeTask(id)
+ * will take that transition since there is only one.
+ */
+ public void testCompleteTaskWithSingleNamedTransitionById() {
+ deployJpdlXmlString(NAMED_TRANSITION_PROCESS);
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey(NAMED_TRANSITION_PROCESS_NAME);
- ProcessInstance processInstance = executionService.startProcessInstanceByKey("UnmatchingOutcome");
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+
+ taskService.completeTask(task.getId());
+ processInstance = executionService.findProcessInstanceById(processInstance.getId());
+ assertNotNull(processInstance.findActiveExecutionIn("wait"));
+ }
+
+ /**
+ * If a task has one named transition, then taskService.completeTask(id, null)
+ * will result in an exception since there is no unnamed transition.
+ */
+ public void testCompleteTaskWithSingleNamedTransitionByIdAndNullTransition() {
+ deployJpdlXmlString(NAMED_TRANSITION_PROCESS);
+ executionService.startProcessInstanceByKey(NAMED_TRANSITION_PROCESS_NAME);
- Task task = taskService
- .createTaskQuery()
- .assignee("johndoe")
- .uniqueResult();
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+ try {
+ taskService.completeTask(task.getId(), (String) null);
+ fail();
+ } catch(JbpmException e) {
+ // Exception is expected
+ }
+ assertNotNull(taskService.createTaskQuery().assignee("johndoe").uniqueResult());
+ }
+
+ /**
+ * If a task has one named transition, then
+ * taskService.completeTask(taskId, "anyvalue") will result in an exception
+ */
+ public void testCompleteTaskWithSingleNamedTransitionByIdAndWrongTransition() {
+ deployJpdlXmlString(NAMED_TRANSITION_PROCESS);
+ executionService.startProcessInstanceByKey(NAMED_TRANSITION_PROCESS_NAME);
- Set<String> outcomes = taskService.getOutcomes(task.getId());
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+
+ try {
+ taskService.completeTask(task.getId(), "anyValue");
+ fail();
+ } catch (JbpmException e) {
+ // Exception is expected
+ }
+ assertNotNull("After completion with an invalid outcome, the task should remain unchanged",
+ taskService.createTaskQuery().assignee("johndoe") .uniqueResult());
+ }
+
+ public void testCompleteTaskWithSingleNamedTransitionByIdAndTransition() {
+ deployJpdlXmlString(NAMED_TRANSITION_PROCESS);
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey(NAMED_TRANSITION_PROCESS_NAME);
- Set<String> expectedOutcomes = new HashSet<String>();
- expectedOutcomes.add(Task.STATE_COMPLETED);
- expectedOutcomes.add("toedeloe");
-
- assertEquals(expectedOutcomes, outcomes);
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+ taskService.completeTask(task.getId(), "theOneAndOnly");
+ assertActivityActive(processInstance.getId(), "wait");
}
- public void testGetOutcomesMultipleTransitions() {
- deployJpdlXmlString(
- "<process name='UnmatchingOutcome'>" +
- " <start>" +
- " <transition to='review' />" +
- " </start>" +
- " <task name='review' " +
- " assignee='johndoe'>" +
- " <transition name='left' to='wait' />" +
- " <transition name='right' to='wait' />" +
- " <transition name='middle' to='wait' />" +
- " </task>" +
- " <state name='wait'/>" +
- "</process>"
- );
+ /**
+ * If a task has multiple outgoing transitions (but not all are named), then
+ * taskService.completeTask(taskId) will take the transition without a name
+ */
+ public void testCompleteTaskWithMultipleTransitionsNotAllNamedById() {
+ deployJpdlXmlString(MULTIPLE_NOT_ALL_NAMED_TRANSITIONS_PROCESS);
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey(MULTIPLE_NOT_ALL_NAMED_TRANSITIONS_PROCESS_NAME);
- ProcessInstance processInstance = executionService.startProcessInstanceByKey("UnmatchingOutcome");
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+ taskService.completeTask(task.getId());
+ assertActivityActive(processInstance.getId(), "wait2");
+ }
+
+ /**
+ * If a task has multiple outgoing transitions (but not all are named), then
+ * taskService.completeTask(taskId, null) will take the transition without a name
+ */
+ public void testCompleteTaskWithMultipleTransitionsNotAllNamedByIdAndNullTransition() {
+ deployJpdlXmlString(MULTIPLE_NOT_ALL_NAMED_TRANSITIONS_PROCESS);
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey(MULTIPLE_NOT_ALL_NAMED_TRANSITIONS_PROCESS_NAME);
- Task task = taskService
- .createTaskQuery()
- .assignee("johndoe")
- .uniqueResult();
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+ taskService.completeTask(task.getId(), (String) null);
+ assertActivityActive(processInstance.getId(), "wait2");
+ }
+
+ /**
+ * If a task has multiple outgoing transitions (but not all are named), then
+ * taskService.completeTask(taskId, "anyvalue") will result in an exception
+ */
+ public void testCompleteTaskWithMultipleTransitionsNotAllNamedByIdAndWrongTransition() {
+ deployJpdlXmlString(MULTIPLE_NOT_ALL_NAMED_TRANSITIONS_PROCESS);
+ executionService.startProcessInstanceByKey(MULTIPLE_NOT_ALL_NAMED_TRANSITIONS_PROCESS_NAME);
- Set<String> outcomes = taskService.getOutcomes(task.getId());
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
- Set<String> expectedOutcomes = new HashSet<String>();
- expectedOutcomes.add(Task.STATE_COMPLETED);
- expectedOutcomes.add("left");
- expectedOutcomes.add("right");
- expectedOutcomes.add("middle");
-
- assertEquals(expectedOutcomes, outcomes);
+ try {
+ taskService.completeTask(task.getId(), "anyValue");
+ fail();
+ } catch (JbpmException e) {
+ // Exception is expected
+ }
+ assertNotNull("After completion with an invalid outcome, the task should remain unchanged",
+ taskService.createTaskQuery().assignee("johndoe") .uniqueResult());
}
+
+ /**
+ * If a task has multiple outgoing transitions (but not all are named), then
+ * taskService.completeTask(taskId, "correctTransition") will take the correct transition
+ */
+ public void testCompleteTaskWithMultipleTransitionsNotAllNamedByIdAndTransition() {
+ deployJpdlXmlString(MULTIPLE_NOT_ALL_NAMED_TRANSITIONS_PROCESS);
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey(MULTIPLE_NOT_ALL_NAMED_TRANSITIONS_PROCESS_NAME);
+
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+ taskService.completeTask(task.getId(), "right");
+ assertActivityActive(processInstance.getId(), "wait3");
+ }
+
+ /**
+ * If a task has multiple outgoing transitions (all are named), then
+ * taskService.completeTask(taskId) will result in an exception .
+ */
+ public void testCompleteTaskWithMultipleTransitionsAllNamedById() {
+ deployJpdlXmlString(MULTIPLE_NAMED_TRANSITIONS_PROCESS);
+ executionService.startProcessInstanceByKey(MULTIPLE_NAMED_TRANSITIONS_PROCESS_NAME);
+
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+ try {
+ taskService.completeTask(task.getId());
+ fail();
+ } catch (JbpmException e) {
+ // Exception is expected
+ }
+ }
+
+ /**
+ * If a task has multiple outgoing transitions (all are named), then
+ * taskService.completeTask(taskId, null) will result in an exception
+ */
+ public void testCompleteTaskWithMultipleTransitionsAllNamedByIdAndNullTransition() {
+ deployJpdlXmlString(MULTIPLE_NAMED_TRANSITIONS_PROCESS);
+ executionService.startProcessInstanceByKey(MULTIPLE_NAMED_TRANSITIONS_PROCESS_NAME);
+
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+ try {
+ taskService.completeTask(task.getId());
+ } catch (JbpmException e) {
+ // Exception is expected
+ }
+ assertNotNull(taskService.createTaskQuery().assignee("johndoe") .uniqueResult());
+ }
+
+ /**
+ * If a task has multiple outgoing transitions (all are named), then
+ * taskService.completeTask(taskId, "anyvalue") will result in an exception
+ */
+ public void testCompleteTaskWithMultipleTransitionsAllNamedByIdAndWrongTransition() {
+ deployJpdlXmlString(MULTIPLE_NAMED_TRANSITIONS_PROCESS);
+ executionService.startProcessInstanceByKey(MULTIPLE_NAMED_TRANSITIONS_PROCESS_NAME);
+
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+ try {
+ taskService.completeTask(task.getId());
+ fail();
+ } catch (JbpmException e) {
+ // Exception is expected
+ }
+ assertNotNull("After completion with an invalid outcome, the task should remain unchanged",
+ taskService.createTaskQuery().assignee("johndoe") .uniqueResult());
+ }
+
+ /**
+ * If a task has multiple outgoing transitions (all are named), then
+ * taskService.completeTask(taskId, "Accept") will take the 'Accept' transition
+ */
+ public void testCompleteTaskWithMultipleTransitionsAllNamedByIdAndTransition() {
+ deployJpdlXmlString(MULTIPLE_NAMED_TRANSITIONS_PROCESS);
+ ProcessInstance pi = executionService.startProcessInstanceByKey(MULTIPLE_NAMED_TRANSITIONS_PROCESS_NAME);
+
+ Task task = taskService.createTaskQuery().assignee("johndoe").uniqueResult();
+ taskService.completeTask(task.getId(), "left");
+ assertActivityActive(pi.getId(), "wait1");
+ }
+
}
Modified: jbpm4/trunk/modules/test-db/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/logging.properties 2009-12-08 03:33:29 UTC (rev 5923)
+++ jbpm4/trunk/modules/test-db/src/test/resources/logging.properties 2009-12-08 13:28:56 UTC (rev 5924)
@@ -10,9 +10,9 @@
# org.jbpm.pvm.internal.util.level=FINE
org.hibernate.level=INFO
-org.hibernate.cfg.SettingsFactory.level=SEVERE
-org.hibernate.cfg.HbmBinder.level=SEVERE
-org.hibernate.SQL.level=FINEST
-org.hibernate.type.level=FINEST
+#org.hibernate.cfg.SettingsFactory.level=SEVERE
+#org.hibernate.cfg.HbmBinder.level=SEVERE
+#org.hibernate.SQL.level=FINEST
+#org.hibernate.type.level=FINEST
# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST
# org.hibernate.transaction.level=FINEST
\ No newline at end of file
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Services.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Services.xml 2009-12-08 03:33:29 UTC (rev 5923)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Services.xml 2009-12-08 13:28:56 UTC (rev 5924)
@@ -380,8 +380,66 @@
variables.put("category", "small");
variables.put("lires", 923874893);
taskService.setVariables(taskId, variables);</programlisting>
- <para>and complete tasks</para>
- <programlisting>taskService.completeTask(taskId);</programlisting>
+ <para>The taskService is also used to complete tasks</para>
+ <programlisting>
+taskService.completeTask(taskId);
+taskService.completeTask(taskId, variables);
+taskService.completeTask(taskId, outcome);
+taskService.completeTask(taskId, outcome, variables);
+</programlisting>
+ <para>
+ The API allows to provide a map of variables that will be added as process
+ variables before the task is completed. It is also possible to provide
+ an 'outcome', that will be used to determine which outgoing transition
+ will be chosen. The logic is as follows:
+ </para>
+ <para>
+ <emphasis role="bold">
+ If a task has one outgoing transition without a name then:
+ </emphasis>
+ <itemizedlist>
+ <listitem>taskService.getOutcomes() returns a collection that includes one null value</listitem>
+ <listitem>taskService.completeTask(taskId) will take that outgoing transition</listitem>
+ <listitem>taskService.completeTask(taskId, null) will take that outgoing transition</listitem>
+ <listitem>taskService.completeTask(taskId, "anyvalue") will result in an exception</listitem>
+ </itemizedlist>
+ </para>
+ <para>
+ <emphasis role="bold">
+ If a task has one outgoing transition with a name then:
+ </emphasis>
+ <itemizedlist>
+ <listitem>gtaskService.etOutcomes() returns a collection that includes only the name of the transition</listitem>
+ <listitem>taskService.completeTask(taskId) will take the single outgoing transition</listitem>
+ <listitem>taskService.completeTask(taskId, null) will will result in an exception (as there is no transition without a name)</listitem>
+ <listitem>taskService.completeTask(taskId, "anyvalue") will result in an exception</listitem>
+ <listitem>taskService.completeTask(taskId, "myName") will take the transition with the given name</listitem>
+ </itemizedlist>
+ </para>
+ <para>
+ <emphasis role="bold">
+ If a task has multiple outgoing transitions. One transition has no a name and the other transition have a name:
+ </emphasis>
+ <itemizedlist>
+ <listitem>taskService.getOutcomes() returns a collection that includes a null value and the names of the other transitions</listitem>
+ <listitem>taskService.completeTask(taskId) will take the transition without a name</listitem>
+ <listitem>taskService.completeTask(taskId, null) will take the transition without a name</listitem>
+ <listitem>taskService.completeTask(taskId, "anyvalue") will result in an exception</listitem>
+ <listitem>taskService.completeTask(taskId, "myName") will take the 'myName' transition</listitem>
+ </itemizedlist>
+ </para>
+ <para>
+ <emphasis role="bold">
+ If a task has multiple outgoing transitions and all of them are uniquely named, then:
+ </emphasis>
+ <itemizedlist>
+ <listitem>taskService.getOutcomes() returns a collection that includes all the names of all the transitions</listitem>
+ <listitem>taskService.completeTask(taskId) will result in an exception, since there is no transition without a name</listitem>
+ <listitem>taskService.completeTask(taskId, null) will result in an exception, since there is no unnamed transition</listitem>
+ <listitem>taskService.completeTask(taskId, "anyvalue") will result in an exception</listitem>
+ <listitem>taskService.completeTask(taskId, "myName") will take the 'myName' transition</listitem>
+ </itemizedlist>
+ </para>
<para>Tasks can also be offered to a set of candidates. Candidates can be
users or groups. Users can take tasks for which they are a candidate. Taking
a task means that this user will be set as the assignee. After that, other users
16 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5923 - in jbpm3/branches/jbpm-3.2-soa: modules/core/src/main/java/org/jbpm/web and 2 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-12-07 22:33:29 -0500 (Mon, 07 Dec 2009)
New Revision: 5923
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/web/JbpmConfigurationCloser.java
jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/branches/jbpm-3.2-soa/pom.xml
Log:
JBPM-2678: bump jsf-console dependency to 3.2.8
install gpd-deployer along with jsf-console
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/web/JbpmConfigurationCloser.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/web/JbpmConfigurationCloser.java 2009-12-08 03:30:51 UTC (rev 5922)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/web/JbpmConfigurationCloser.java 2009-12-08 03:33:29 UTC (rev 5923)
@@ -27,8 +27,10 @@
import org.jbpm.JbpmConfiguration;
/**
- * Closes the jBPM configuration on servlet context destruction. <h3>Configuration</h3> Servlet
- * context init parameters
+ * <p>
+ * Closes the jBPM configuration on servlet context destruction.
+ * </p>
+ * <h3>Configuration</h3> Servlet context initialization parameters
* <table border="1">
* <tr>
* <th>Name</th>
@@ -37,7 +39,7 @@
* </tr>
* <tr>
* <td>jbpm.configuration.resource</td>
- * <td>name of the resource that defines the jBPM configuration</td>
+ * <td>name of classpath resource containing the configuration</td>
* <td>jbpm.cfg.xml</td>
* </tr>
* </table>
@@ -49,7 +51,8 @@
private JbpmConfiguration jbpmConfiguration;
public void contextInitialized(ServletContextEvent event) {
- String resource = event.getServletContext().getInitParameter("jbpm.configuration.resource");
+ String resource = event.getServletContext()
+ .getInitParameter("jbpm.configuration.resource");
jbpmConfiguration = JbpmConfiguration.getInstance(resource);
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-12-08 03:30:51 UTC (rev 5922)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-12-08 03:33:29 UTC (rev 5923)
@@ -105,6 +105,11 @@
<artifactId>jsf-console</artifactId>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gpd-deployer</artifactId>
+ <type>war</type>
+ </dependency>
<!-- Sources -->
<dependency>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-12-08 03:30:51 UTC (rev 5922)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-12-08 03:33:29 UTC (rev 5923)
@@ -119,42 +119,40 @@
<description>The jBPM3 Standalone Components</description>
<!-- jbpm3/ -->
- <file src="@{project.build.assemblyDirectory}/etc/release.notes.html" targetdir="$INSTALL_PATH"
- override="true" />
- <file src="@{project.build.assemblyDirectory}/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH"
- override="true" />
+ <file src="@{project.build.assemblyDirectory}/etc/release.notes.html"
+ targetdir="$INSTALL_PATH" />
+ <file src="@{project.build.assemblyDirectory}/etc/JBossORG-EULA.txt"
+ targetdir="$INSTALL_PATH" />
<!-- jbpm3/config -->
- <file src="@{project.build.assemblyDirectory}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config"
- unpack="true" override="true" />
- <file src="@{project.build.assemblyDirectory}/etc/version.info.xml" targetdir="$INSTALL_PATH/config"
- override="true" />
+ <file src="@{project.build.assemblyDirectory}/lib/jbpm-jpdl-config.jar"
+ targetdir="$INSTALL_PATH/config" unpack="true" />
+ <file src="@{project.build.assemblyDirectory}/etc/version.info.xml"
+ targetdir="$INSTALL_PATH/config" />
<!-- jbpm3/database -->
- <file src="@{project.build.assemblyDirectory}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database"
- unpack="true" override="true" />
+ <file src="@{project.build.assemblyDirectory}/lib/jbpm-db.jar"
+ targetdir="$INSTALL_PATH/database" unpack="true" />
<!-- jbpm3/designer -->
- <fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="$INSTALL_PATH/designer"
- override="true">
+ <fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="$INSTALL_PATH/designer">
<include name="jbpm-jpdl-designer-site.zip" />
</fileset>
- <file src="@{project.build.assemblyDirectory}/etc/version.info.xml" targetdir="$INSTALL_PATH/src/resources/gpd"
- override="true" />
+ <file src="@{project.build.assemblyDirectory}/etc/version.info.xml"
+ targetdir="$INSTALL_PATH/src/resources/gpd" />
<!-- jbpm3/examples -->
<fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-examples-dist"
- targetdir="$INSTALL_PATH/examples" override="true" />
+ targetdir="$INSTALL_PATH/examples" />
<!-- jbpm3/docs -->
- <file src="@{project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide"
- unpack="true" override="true" />
- <fileset dir="@{project.build.assemblyDirectory}/javadoc" targetdir="$INSTALL_PATH/docs"
- override="true" />
+ <file src="@{project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook"
+ targetdir="$INSTALL_PATH/docs/userguide" unpack="true" />
+ <fileset dir="@{project.build.assemblyDirectory}/javadoc"
+ targetdir="$INSTALL_PATH/docs" />
<!-- jbpm3/lib -->
- <fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="$INSTALL_PATH/lib"
- override="true">
+ <fileset dir="@{project.build.assemblyDirectory}/lib" targetdir="$INSTALL_PATH/lib">
<include name="antlr.jar" />
<include name="asm.jar" />
<include name="bsh.jar" />
@@ -169,12 +167,12 @@
<include name="jbpm-identity.jar" />
<include name="junit.jar" />
<include name="jsf-console.war" />
+ <include name="gpd-deployer.war" />
<include name="log4j.jar" />
</fileset>
<!-- jbpm3/src - Must be called 'src' because the GPD has a dependency on it -->
- <fileset dir="@{project.build.assemblyDirectory}/src" targetdir="$INSTALL_PATH/src"
- override="true">
+ <fileset dir="@{project.build.assemblyDirectory}/src" targetdir="$INSTALL_PATH/src">
<include name="jsf-console-sources.jar" />
<include name="jbpm-jpdl-sources.jar" />
<include name="jbpm-enterprise-sources.jar" />
@@ -191,31 +189,30 @@
<description>The jBPM3 JBoss Integration</description>
<!-- jbpm/jbpm-service.sar -->
- <fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-enterprise-config"
- targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
- override="true">
+ <fileset
+ dir="@{project.build.assemblyDirectory}/resources/jbpm-enterprise-config"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar">
<include name="jbpm.cfg.xml" />
<include name="hibernate.extra.hbm.xml" />
</fileset>
<fileset dir="@{project.build.assemblyDirectory}/lib"
- targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
- override="true">
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar">
<include name="jbpm-jpdl.jar" />
<include name="jbpm-identity.jar" />
</fileset>
<file src="@{project.build.assemblyDirectory}/lib/jbpm-identity-service.zip"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
- unpack="true" override="true" />
+ unpack="true" />
<!-- jbpm/jbpm-enterprise.jar -->
<file src="@{project.build.assemblyDirectory}/lib/jbpm-enterprise.jar"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar"
- unpack="true" override="true" />
+ unpack="true" />
<!-- jbpm/jbpm-userguide.war -->
<file src="@{project.build.assemblyDirectory}/lib/jbpm-userguide.jdocbook"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
- unpack="true" override="true" />
+ unpack="true" />
<!-- jbpm-mq-service -->
<file src="@{resources.directory}/destination/jbpm-mq-service.xml"
@@ -232,7 +229,7 @@
<!-- Database configs to docs/examples/jbpm -->
<fileset dir="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config"
- targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true">
+ targetdir="${jbossInstallPath}/docs/examples/jbpm">
<include name="hibernate.cfg.db2.xml" />
<include name="hibernate.cfg.hsqldb.xml" />
<include name="hibernate.cfg.mssql.xml" />
@@ -284,7 +281,8 @@
<singlefile condition="isMySQL"
src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
- <file condition="isMySQL" src="@{project.build.assemblyDirectory}/lib/mysql-connector-java.jar"
+ <file condition="isMySQL"
+ src="@{project.build.assemblyDirectory}/lib/mysql-connector-java.jar"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" />
<!-- Database Oracle -->
@@ -302,8 +300,8 @@
<singlefile condition="isPostgreSQL"
src="@{project.build.assemblyDirectory}/resources/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
- <file condition="isPostgreSQL" src="@{project.build.assemblyDirectory}/lib/postgresql.jar"
- targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" />
+ <file condition="isPostgreSQL"
+ src="@{project.build.assemblyDirectory}/lib/postgresql.jar" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib" />
<!-- Database Sybase -->
<file condition="isSybase"
@@ -319,12 +317,16 @@
* JSF Console *
********************************
-->
- <pack name="JSF-Console" parent="jBPM3 JBoss Integration" required="no" preselected="yes">
+ <pack name="JSF-Console" parent="jBPM3 JBoss Integration" required="no"
+ preselected="yes">
<description>JSF-Console</description>
<!-- jbpm/jsf-console.war -->
<file src="@{project.build.assemblyDirectory}/lib/jsf-console.war"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jsf-console.war"
- unpack="true" override="true" />
+ unpack="true" />
+ <file src="@{project.build.assemblyDirectory}/lib/gpd-deployer.war"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/gpd-deployer.war"
+ unpack="true" />
</pack>
<!--
@@ -337,17 +339,21 @@
</pack>
<!-- JBoss-5.0.1 -->
- <pack name="Download JBoss-5.0.1" required="no" parent="Optional Components" preselected="no">
+ <pack name="Download JBoss-5.0.1" required="no" parent="Optional Components"
+ preselected="no">
<description>Download and Install JBoss-5.0.1</description>
<!-- http://jira.codehaus.org/browse/IZPACK-158 -->
- <file src="@{resources.directory}/installer/download-helper.xml" targetdir="$INSTALL_PATH/uninstall" />
+ <file src="@{resources.directory}/installer/download-helper.xml"
+ targetdir="$INSTALL_PATH/uninstall" />
</pack>
<!-- Eclipse-3.4.2 -->
- <pack name="Download Eclipse-3.4.2" required="no" parent="Optional Components" preselected="no">
+ <pack name="Download Eclipse-3.4.2" required="no" parent="Optional Components"
+ preselected="no">
<description>Download and Install Eclipse-3.4.2</description>
<!-- http://jira.codehaus.org/browse/IZPACK-158 -->
- <file src="@{resources.directory}/installer/download-helper.xml" targetdir="$INSTALL_PATH/uninstall" />
+ <file src="@{resources.directory}/installer/download-helper.xml"
+ targetdir="$INSTALL_PATH/uninstall" />
</pack>
</packs>
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-12-08 03:30:51 UTC (rev 5922)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-12-08 03:33:29 UTC (rev 5923)
@@ -62,7 +62,7 @@
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
<jboss.j2ee.version>4.0.2</jboss.j2ee.version>
<jbpm.designer.version>3.1.7</jbpm.designer.version>
- <jbpm.jsf-console.version>3.2.7</jbpm.jsf-console.version>
+ <jbpm.jsf-console.version>3.2.8</jbpm.jsf-console.version>
<jdocbook.version>2.1.2</jdocbook.version>
<junit.version>3.8.1</junit.version>
<mvel.version>1.3.1-java1.4</mvel.version>
@@ -100,6 +100,12 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gpd-deployer</artifactId>
+ <version>${jbpm.jsf-console.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl-designer-site</artifactId>
<version>${jbpm.designer.version}</version>
<type>zip</type>
16 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5922 - in projects/jsf-console/branches/jsf-console-3.2-soa: console and 6 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-12-07 22:30:51 -0500 (Mon, 07 Dec 2009)
New Revision: 5922
Added:
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/index.html
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/jbpm.css
Modified:
projects/jsf-console/branches/jsf-console-3.2-soa/console/.classpath
projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml
Log:
JBPM-2678: fix gpd-deployer context path
provide separate deployment page
validate basic auth works fine
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/.classpath
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/.classpath 2009-12-07 21:10:03 UTC (rev 5921)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/.classpath 2009-12-08 03:30:51 UTC (rev 5922)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2009-12-07 21:10:03 UTC (rev 5921)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2009-12-08 03:30:51 UTC (rev 5922)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.2.9</version>
+ <version>3.2.8</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml 2009-12-07 21:10:03 UTC (rev 5921)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml 2009-12-08 03:30:51 UTC (rev 5922)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.2.9</version>
+ <version>3.2.8</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java 2009-12-07 21:10:03 UTC (rev 5921)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java 2009-12-08 03:30:51 UTC (rev 5922)
@@ -22,162 +22,147 @@
package org.jbpm.web;
import java.io.IOException;
+import java.io.InputStream;
import java.io.PrintWriter;
import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
import java.util.zip.ZipInputStream;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.jbpm.JbpmConfiguration;
-import org.jbpm.JbpmContext;
-import org.jbpm.graph.def.ProcessDefinition;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.fileupload.FileItemIterator;
+import org.apache.commons.fileupload.FileItemStream;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jbpm.JbpmConfiguration;
+import org.jbpm.JbpmContext;
+import org.jbpm.graph.def.ProcessDefinition;
+
public class ProcessUploadServlet extends javax.servlet.http.HttpServlet {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- private JbpmConfiguration jbpmConfiguration;
+ private JbpmConfiguration jbpmConfiguration;
- public void init() throws ServletException {
- String jbpmCfgResource = getServletContext().getInitParameter("jbpm.configuration.resource");
- jbpmConfiguration = JbpmConfiguration.getInstance(jbpmCfgResource);
- }
+ public void init() throws ServletException {
+ String jbpmCfgResource = getServletContext().getInitParameter("jbpm.configuration.resource");
+ jbpmConfiguration = JbpmConfiguration.getInstance(jbpmCfgResource);
+ }
- protected void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
- if (log.isTraceEnabled()) log.trace("handling status request");
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ if (log.isTraceEnabled()) log.trace("handling status request");
- PrintWriter out = response.getWriter();
- writeHeader(out);
- out.println("<h3>Deploy a process</h3>");
- out.println("<form name='deploy-form' method='post' enctype='multipart/form-data'>");
- out.println(" <p>Process Archive: <input name='process-archive' type='file'/>");
- out.println(" <p><input name='deploy-button' type='submit' value='Deploy'/>");
- out.println("</form>");
- writeTrailer(out);
- }
+ PrintWriter out = response.getWriter();
+ writeHeader(out);
+ out.println("<p>GPD deployer is operational</p>");
+ writeTrailer(out);
+ }
- protected void doPost(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
- if (log.isTraceEnabled()) log.trace("handling upload request");
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ if (log.isTraceEnabled()) log.trace("handling upload request");
- FileItem processItem = parseRequest(request, response);
- if (processItem == null) return; // error has been sent
+ try {
+ InputStream processStream = parseRequest(request, response);
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ try {
+ ProcessDefinition processDefinition = parseProcessArchive(processStream);
+ deployProcessDefinition(processDefinition, response);
+ }
+ finally {
+ jbpmContext.close();
+ }
+ }
+ catch (FileUploadException e) {
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
+ }
+ }
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
- try {
- ProcessDefinition processDefinition = parseProcessArchive(processItem);
- deployProcessDefinition(processDefinition, response);
- }
- finally {
- jbpmContext.close();
- }
- }
+ private void writeHeader(PrintWriter out) throws MalformedURLException {
+ out.println("<html>");
+ out.println("<head>");
+ out.println("<title>Process Deployment</title>");
+ out.print("<link rel='stylesheet' type='text/css' href='");
+ out.print(getServletContext().getContextPath());
+ out.println("/jbpm.css'/>");
+ out.println("</head>");
+ out.println("<body>");
+ }
- private void writeHeader(PrintWriter out) throws MalformedURLException {
- out.println("<html>");
- out.println("<head>");
- out.println("<title>Process Deployment</title>");
- URL css = getServletContext().getResource("/ua/jbpm.css");
- if (css != null) {
- out.print("<link rel='stylesheet' type='text/css' href='");
- out.print(css.toString());
- out.println("'/>");
- }
- out.println("</head>");
- out.println("<body>");
- }
+ private void writeTrailer(PrintWriter out) {
+ out.println("</body>");
+ out.println("</html>");
+ }
- private void writeTrailer(PrintWriter out) {
- out.println("</body>");
- out.println("</html>");
- }
+ private InputStream parseRequest(HttpServletRequest request,
+ HttpServletResponse response) throws IOException, FileUploadException {
+ // check if request is multipart content
+ if (!ServletFileUpload.isMultipartContent(request))
+ throw new FileUploadException("request does not carry multipart content");
- private FileItem parseRequest(HttpServletRequest request, HttpServletResponse response)
- throws IOException {
- // check if request is multipart content
- if (!ServletFileUpload.isMultipartContent(request)) {
- response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Not a multipart request");
- return null;
- }
+ // Create a new file upload handler
+ ServletFileUpload upload = new ServletFileUpload();
+ // Parse the request
+ for (FileItemIterator i = upload.getItemIterator(request); i.hasNext();) {
+ FileItemStream part = i.next();
+ if (!part.isFormField()) {
+ if (log.isTraceEnabled())
+ log.trace("retrieved file " + part.getName());
+ return part.openStream();
+ }
+ }
- // Create a factory for disk-based file items
- FileItemFactory factory = new DiskFileItemFactory();
- // Create a new file upload handler
- ServletFileUpload upload = new ServletFileUpload(factory);
- try {
- // Parse the request
- List items = upload.parseRequest(request);
- if (items.isEmpty()) {
- response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Request is empty");
- return null;
- }
- FileItem item = (FileItem) items.get(0);
- if (item.isFormField()) {
- response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Field '" + item.getFieldName()
- + "' is not an input file");
- return null;
- }
- return item;
- }
- catch (FileUploadException e) {
- log.error("failed to parse request", e);
- response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Failed to parse request");
- return null;
- }
- }
+ // no file found, bang
+ throw new FileUploadException("request contains no file");
+ }
- private ProcessDefinition parseProcessArchive(FileItem fileItem) throws IOException {
- if (log.isTraceEnabled()) log.trace("parsing process archive " + fileItem.getName());
+ private ProcessDefinition parseProcessArchive(InputStream processStream)
+ throws IOException {
+ ZipInputStream processArchiveStream = new ZipInputStream(processStream);
+ try {
+ ProcessDefinition processDefinition = ProcessDefinition.parseParZipInputStream(processArchiveStream);
+ if (log.isTraceEnabled())
+ log.trace("parsed process definition " + processDefinition.getName());
+ return processDefinition;
+ }
+ finally {
+ processArchiveStream.close();
+ }
+ }
- ZipInputStream processStream = new ZipInputStream(fileItem.getInputStream());
- try {
- ProcessDefinition processDefinition = ProcessDefinition.parseParZipInputStream(processStream);
- if (log.isTraceEnabled())
- log.trace("parsed process definition " + processDefinition.getName());
- return processDefinition;
- }
- finally {
- processStream.close();
- }
- }
+ private void deployProcessDefinition(ProcessDefinition processDefinition,
+ HttpServletResponse response) throws IOException {
+ String processName = processDefinition.getName();
+ JbpmContext jbpmContext = jbpmConfiguration.getCurrentJbpmContext();
+ try {
+ jbpmContext.deployProcessDefinition(processDefinition);
- private void deployProcessDefinition(ProcessDefinition processDefinition,
- HttpServletResponse response) throws IOException {
- String processName = processDefinition.getName();
- JbpmContext jbpmContext = jbpmConfiguration.getCurrentJbpmContext();
- try {
- jbpmContext.deployProcessDefinition(processDefinition);
+ if (log.isTraceEnabled())
+ log.trace("deployed process definition " + processName);
- if (log.isTraceEnabled()) log.trace("deployed process definition " + processName);
- PrintWriter out = response.getWriter();
- writeHeader(out);
- out.println("<h3>Deployment report</h3>");
- out.print("<p>Deployed process ");
- out.print(processName);
- out.println(" successfully</p>");
- writeTrailer(out);
- }
- catch (RuntimeException e) {
- jbpmContext.setRollbackOnly();
+ PrintWriter out = response.getWriter();
+ writeHeader(out);
+ out.println("<h3>Deployment report</h3>");
+ out.print("<p>Process <em>");
+ out.print(processName);
+ out.println("</em> was deployed successfully</p>");
+ out.print("<p><a href='");
+ out.print(getServletContext().getContextPath());
+ out.println("/index.html'>Deploy another process</a></p>");
+ writeTrailer(out);
+ }
+ catch (RuntimeException e) {
+ jbpmContext.setRollbackOnly();
- log.error("failed to deploy process definition " + processName, e);
- response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
- "Failed to deploy process");
- }
- }
+ log.error("failed to deploy process definition " + processName, e);
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Failed to deploy process");
+ }
+ }
- private static final Log log = LogFactory.getLog(ProcessUploadServlet.class);
+ private static final Log log = LogFactory.getLog(ProcessUploadServlet.class);
}
\ No newline at end of file
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml 2009-12-07 21:10:03 UTC (rev 5921)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml 2009-12-08 03:30:51 UTC (rev 5922)
@@ -9,7 +9,6 @@
<name> is one of the names configured in your login-config.xml.
-->
<security-domain>java:/jaas/jbpm-console</security-domain>
- <context-root>jbpm-console</context-root>
<resource-ref>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
Added: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/index.html
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/index.html (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/index.html 2009-12-08 03:30:51 UTC (rev 5922)
@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>Process Deployment</title>
+<link rel="stylesheet" type="text/css" href="jbpm.css" />
+</head>
+<body>
+<h3>Deploy a Process</h3>
+<form action="upload" method="post" enctype="multipart/form-data">
+<p>Process archive: <input type="file" name="process-archive" /></p>
+<p><input type="submit" name="deploy-button" value="Deploy" /></p>
+</form>
+</body>
+</html>
\ No newline at end of file
Added: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/jbpm.css
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/jbpm.css (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/jbpm.css 2009-12-08 03:30:51 UTC (rev 5922)
@@ -0,0 +1,567 @@
+/**********************************************************
+ General styles
+***********************************************************/
+body {
+ font-weight:normal;
+ font-family:verdana,sans-serif;
+ font-size:10pt;
+ background-repeat:no-repeat;
+ margin:0;
+ border-width:0;
+ padding:0;
+}
+
+html {
+ background-attachment:scroll;
+ background-repeat:no-repeat;
+ margin:0;
+ padding:0;
+ border-width:0;
+}
+
+button, input, select, option, textarea {
+ font-family:arial,helvetica,sans-serif;
+ font-weight:normal;
+ font-size:10pt;
+ line-height:normal;
+}
+
+select {
+ vertical-align:top;
+}
+
+form {
+ display:inline;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ display:inline;
+}
+
+h1 {
+ font-size:16pt;
+}
+
+h2 {
+ font-size:14pt;
+}
+
+h3 {
+ font-size:12pt;
+}
+
+h4 {
+ font-size:10pt;
+}
+
+h5 {
+ font-size:8pt;
+}
+
+h6 {
+ font-size:6pt;
+}
+
+a {
+ cursor: pointer;
+ color: rgb(110, 110, 170);
+ text-decoration: underline;
+}
+
+a:hover {
+ color: rgb(160, 160, 255);
+}
+
+div.hr {
+ border-style:none;
+ border-width:0;
+ background:#c0c0c0;
+ margin-left:3px;
+ margin-right:3px;
+ height:2px;
+ font-size:0;
+ margin-top:6px;
+ margin-bottom:10px;
+}
+
+b {
+ font-weight:bold;
+}
+
+table.layout {
+ margin:0;
+ padding:0;
+ border-collapse:collapse;
+}
+
+table.layout td {
+ margin:0;
+ padding:0;
+}
+
+table.layout td.layoutmenu {
+ vertical-align:top;
+ margin:0;
+ padding:0;
+ width:240px;
+ background:#dddddd;
+ border-right-width:1px;
+ border-right-style:solid;
+ border-right-color:#000000;
+ border-top-width:1px;
+ border-top-style:solid;
+ border-top-color:#000000;
+ border-bottom-width:1px;
+ border-bottom-style:solid;
+ border-bottom-color:#000000;
+ border-collapse:collapse;
+}
+
+table.layout td.layoutbody {
+ vertical-align:top;
+ padding:10px;
+ background:#ffffff;
+ width:100%;
+ border-top-width:1px;
+ border-top-style:solid;
+ border-top-color:#000000;
+ border-bottom-width:1px;
+ border-bottom-style:solid;
+ border-bottom-color:#000000;
+ border-collapse:collapse;
+}
+
+table.layout td.layoutheader {
+ background:#dddddd;
+ border-top-width:1px;
+ border-top-style:solid;
+ border-top-color:#000000;
+ border-bottom-width:1px;
+ border-bottom-style:solid;
+ border-bottom-color:#000000;
+ border-collapse:collapse;
+}
+
+table.layout td.layoutfooter {
+ text-align:center;
+ font-size:10px;
+ background:#dddddd;
+ border-top-width:1px;
+ border-top-style:solid;
+ border-top-color:#000000;
+ border-bottom-width:1px;
+ border-bottom-style:solid;
+ border-bottom-color:#000000;
+ border-collapse:collapse;
+}
+
+table.leftmenu {
+ border-width:0;
+ border-bottom-width:1px;
+ border-collapse:collapse;
+ border-color:#000000;
+ width:200px;
+}
+
+tr.leftmenuheader th.nf {
+ border-top-width:1px;
+ border-top-style:solid;
+ border-top-color:#000000;
+}
+
+tr.leftmenuheader th {
+ padding-left:3px;
+ padding-right:3px;
+ background-color:#990000;
+ color:#ffff99;
+ font-size:12px;
+ border-bottom-width:1px;
+ border-bottom-style:solid;
+ border-bottom-color:#000000;
+}
+
+tr.leftmenu th {
+ vertical-align:top;
+ padding:3px;
+ text-align:left;
+ text-decoration:none;
+ font-size:11px;
+ white-space:nowrap;
+ background:#444444;
+ color:#ffffff;
+}
+
+tr.leftmenu td {
+ vertical-align:top;
+ padding:3px;
+ text-align:left;
+ text-decoration:none;
+ font-size:12px;
+ white-space:nowrap;
+ background:#dddddd;
+}
+
+tr.leftmenu td ul {
+ /*list-style-position:inside;*/
+ margin:0;
+ padding:0;
+ padding-left:16px;
+ vertical-align:bottom;
+ list-style-image:url( "../images/bullet.gif" );
+}
+
+.statusSuspended {
+ color:#aa6600;
+ font-weight:bold;
+}
+
+.statusRunning {
+ color:#00cc00;
+ font-weight:bold;
+}
+
+.statusEnded {
+ color:#cc0000;
+ font-weight:bold;
+}
+
+.statusNotstarted {
+ color:#0066aa;
+ font-weight:bold;
+}
+
+a.headermenu {
+ padding-left:8px;
+ padding-right:8px;
+ text-decoration:none;
+ color:#cc0000;
+ border-left-width:1px;
+ border-left-style:solid;
+ border-left-color:#888888;
+}
+
+a.headermenufirst {
+ padding-left:8px;
+ padding-right:8px;
+ text-decoration:none;
+ color:#cc0000;
+}
+
+a.headermenu:hover, a.headermenufirst:hover {
+ background:#ffffff;
+ color:#cc0000;
+}
+
+table.results {
+ border-width:1px;
+ border-style:solid;
+ border-color:#000000;
+ border-collapse:collapse;
+ margin-left:auto;
+ margin-right:auto;
+}
+
+table.results td, table.results th {
+ padding:3px;
+ font-size:11px;
+}
+
+table.results thead tr {
+ cursor:default;
+}
+
+table.results thead tr th {
+ text-align:left;
+ background-color:#990000;
+ color:#ffff99;
+ font-size:12px;
+ border-bottom-style:solid;
+ border-bottom-width:1px;
+ border-bottom-color:#000000;
+}
+
+table.results thead tr th b {
+ font-weight:normal;
+}
+
+table.results thead tr td {
+ text-align:left;
+ background-color:#dddddd;
+ color:#990000;
+ font-weight:bold;
+ border-bottom-style:solid;
+ border-bottom-width:1px;
+ border-bottom-color:#000000;
+}
+
+table.results tbody.results tr {
+ background-color:#dddddd;
+}
+
+table.results tbody.results tr.even {
+ background-color:#ddddbb;
+}
+
+table.results tbody.results tr.odd {
+ background-color:#ffffdd;
+}
+
+table.results tbody.filter td {
+ text-align:left;
+ font-size:10px;
+ padding-bottom:1px;
+ padding-top:1px;
+ font-weight:normal;
+ background-color:#cccccc;
+ border-bottom-style:solid;
+ border-bottom-width:1px;
+ border-bottom-color:#000000;
+}
+
+table.results td {
+ border-right-width:1px;
+ border-right-style:solid;
+ border-right-color:#000000;
+}
+
+table.results tbody.results th {
+ padding:3px;
+ text-align:left;
+ text-decoration:none;
+ font-size:11px;
+ white-space:nowrap;
+ background:#444444;
+ color:#ffffff;
+}
+
+table.results tbody.action tr {
+ background-color:#dddddd;
+}
+
+table.results tbody.action tr td {
+ border-top-color:#000000;
+ border-top-style:solid;
+ border-top-width:1px;
+}
+
+table.msgs {
+ margin-left:auto;
+ margin-right:auto;
+ margin-bottom:15px;
+ border-width:1px;
+ border-style:solid;
+ border-collapse:collapse;
+ border-color:#000000;
+ font-size:10px;
+ width:400px;
+}
+
+table.msgs td {
+ padding-left:8px;
+ padding-right:8px;
+ border-bottom-width:1px;
+ border-bottom-color:#000000;
+ border-bottom-style:dotted;
+}
+
+table.msgs thead th {
+ font-size:11px;
+}
+
+table.error thead th {
+ background-color:#cc0000;
+ color:#ffffff;
+}
+
+table.fatal thead th {
+ background-color:#cc0000;
+ color:#ffffff;
+}
+
+table.warn thead th {
+ background-color:#cccc00;
+ color:#ffffff;
+}
+
+table.info thead th {
+ background-color:#0000cc;
+ color:#ffffff;
+}
+
+.hidden {
+ display:none;
+}
+
+div.pbox, div.pbox_s, div.pbox_e {
+ position:absolute;
+ border-width:1px;
+ border-style:solid;
+}
+
+div.pbox {
+ border-color:#0000ff;
+}
+
+div.pbox_s {
+ border-color:#aa6600;
+}
+
+div.pbox_e {
+ border-color:#cc0000;
+}
+
+div.pboxs, div.pboxs_s, div.pboxs_e {
+ position:absolute;
+ border-right-width:1px;
+ border-right-style:solid;
+ border-bottom-width:1px;
+ border-bottom-style:solid;
+}
+
+div.pboxs {
+ border-right-color:#9999ff;
+ border-bottom-color:#9999ff;
+}
+
+div.pboxs_s {
+ border-right-color:#ffaa99;
+ border-bottom-color:#ffaa99;
+}
+
+div.pboxs_e {
+ border-right-color:#660000;
+ border-bottom-color:#660000;
+}
+
+div.pboxce {
+ position:absolute;
+ overflow:hidden;
+}
+
+div.pboxc, div.pboxc_s, div.pboxc_e {
+ cursor:default;
+ font-size:10px;
+ white-space:nowrap;
+ color:#ffffff;
+ padding-left:3px;
+ padding-right:3px;
+ border-width:1px;
+ border-style:solid;
+}
+
+div.pboxc {
+ border-color:#0000ff;
+ background-color:#0000ff;
+}
+
+div.pboxc_s {
+ border-color:#aa6600;
+ background-color:#aa6600;
+}
+
+div.pboxc_e {
+ border-color:#cc0000;
+ background-color:#cc0000;
+}
+
+div.pboxc a, div.pboxc_s a, div.pboxc_e a {
+ color:#ffffff;
+ text-decoration:none;
+}
+
+div.pboxc a:hover, div.pboxc_s a:hover, div.pboxc_e a:hover {
+ text-decoration:underline;
+}
+
+span.comment {
+ display:block;
+ padding-top:3px;
+ padding-bottom:3px;
+ padding-left:4px;
+ padding-right:4px;
+ border-width:1px;
+ border-color:#990000;
+ border-style:solid;
+ border-collapse:collapse;
+ margin-left:5px;
+ margin-right:5px;
+ background-color:#ffffff;
+ font-family:arial,helvetica,sans-serif;
+ margin-top:4px;
+ margin-bottom:4px;
+ overflow:auto;
+}
+
+textarea.comment {
+ width:480px;
+ height:80px;
+}
+
+/* task forms */
+
+table.dataform {
+ border-style:solid;
+ border-width:1px;
+ border-collapse:collapse;
+ border-color:#000000;
+ margin-left:auto;
+ margin-right:auto;
+}
+
+table.dataform td, table.dataform th {
+ padding-top:3px;
+ padding-bottom:3px;
+ padding-left:5px;
+ padding-right:5px;
+}
+
+table.dataform thead tr th {
+ text-align:left;
+ background-color:#990000;
+ color:#ffff99;
+ font-weight:bold;
+ border-bottom-style:solid;
+ border-bottom-width:1px;
+ border-bottom-color:#000000;
+}
+
+table.dataform tbody th {
+ text-align:left;
+ text-decoration:none;
+ font-size:11px;
+ white-space:nowrap;
+ background:#444444;
+ color:#ffffff;
+ border-bottom-style:solid;
+ border-bottom-width:1px;
+ border-bottom-color:#000000;
+ border-collapse:collapse;
+ width:130px;
+}
+
+table.dataform tbody td {
+ text-align:left;
+ text-decoration:none;
+ font-size:11px;
+ white-space:nowrap;
+ background:#dddddd;
+ color:#000000;
+ border-bottom-style:solid;
+ border-bottom-width:1px;
+ border-bottom-color:#000000;
+ border-collapse:collapse;
+ width:260px;
+}
+
+a.pager {
+ color:#aaaaff;
+}
+
+a.pager:hover {
+ color:#ffffff;
+}
+
+span.pager {
+ font-weight:normal;
+ color:#999999;
+}
\ No newline at end of file
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml 2009-12-07 21:10:03 UTC (rev 5921)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml 2009-12-08 03:30:51 UTC (rev 5922)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.2.9</version>
+ <version>3.2.8</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2009-12-07 21:10:03 UTC (rev 5921)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2009-12-08 03:30:51 UTC (rev 5922)
@@ -16,7 +16,7 @@
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
<packaging>pom</packaging>
- <version>3.2.9</version>
+ <version>3.2.8</version>
<!-- Parent -->
<parent>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml 2009-12-07 21:10:03 UTC (rev 5921)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml 2009-12-08 03:30:51 UTC (rev 5922)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.2.9</version>
+ <version>3.2.8</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
16 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5921 - in projects/jsf-console/branches/jsf-console-3.2-soa: console and 11 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-12-07 16:10:03 -0500 (Mon, 07 Dec 2009)
New Revision: 5921
Added:
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.classpath
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.project
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/BootstrapListener.java
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/web.xml
Removed:
projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/java/
projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/classes/
Modified:
projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml
projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
Log:
JBPM-2678: create separate gpd-deployer module
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2009-12-07 11:32:49 UTC (rev 5920)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2009-12-07 21:10:03 UTC (rev 5921)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- ====================================================================== -->
- <!-- jBPM: Workflow in Java -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
- <!-- $Id$ -->
+<!-- $Id$ -->
<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">
@@ -29,14 +29,6 @@
<dependencies>
<!-- Compile Dependencies -->
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-jbpm4jsf</artifactId>
<version>${project.version}</version>
@@ -59,11 +51,6 @@
<artifactId>jbpm-jpdl</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<profiles>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml 2009-12-07 11:32:49 UTC (rev 5920)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml 2009-12-07 21:10:03 UTC (rev 5921)
@@ -24,13 +24,13 @@
</servlet-mapping>
<context-param>
- <description> Use Documents Saved as *.xhtml </description>
+ <description>Use Documents Saved as *.xhtml</description>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
<context-param>
- <description> Facelets debug output </description>
+ <description>Facelets debug output</description>
<param-name>facelets.DEVELOPMENT</param-name>
<param-value>false</param-value>
</context-param>
@@ -40,21 +40,6 @@
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
- <servlet>
- <description>
- Server counterpart for the Graphical Process Designer deployment feature.
- SECURITY WARNING. GPD deployment is a development aid, not for use in production.
- Make sure you either secure or remove this servlet prior to production deployment.
- </description>
- <servlet-name>GPD Deployer Servlet</servlet-name>
- <servlet-class>org.jbpm.web.ProcessUploadServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>GPD Deployer Servlet</servlet-name>
- <url-pattern>/upload/*</url-pattern>
- </servlet-mapping>
-
<!--
This role list should be changed to include all the relevant roles for your environment.
-->
Property changes on: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer
___________________________________________________________________
Name: svn:ignore
+ .settings
target
Added: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.classpath
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.classpath (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.classpath 2009-12-07 21:10:03 UTC (rev 5921)
@@ -0,0 +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.4"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.project
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.project (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/.project 2009-12-07 21:10:03 UTC (rev 5921)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>gpd-deployer</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml 2009-12-07 21:10:03 UTC (rev 5921)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<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 - GPD Deployer</name>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gpd-deployer</artifactId>
+ <packaging>war</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console-parent</artifactId>
+ <version>3.2.9</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-jpdl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Property changes on: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/BootstrapListener.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/BootstrapListener.java (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/BootstrapListener.java 2009-12-07 21:10:03 UTC (rev 5921)
@@ -0,0 +1,81 @@
+/*
+ * 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.jbpm.web;
+
+import org.jbpm.JbpmConfiguration;
+import org.jbpm.JbpmContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContextEvent;
+
+/**
+ * Eagerly initializes the hibernate session factory.
+ * <p>
+ * Building the session factory in advance prevents the webapp from making a
+ * noticeable pause upon the first login. This is particularly desirable in
+ * applications configured to create the database schema on startup by setting
+ * property <code>hibernate.hbm2ddl.auto</code> to <code>create</code>.
+ * </p>
+ * <h3>Configuration</h3> Servlet context initialization parameters
+ * <table border="1">
+ * <tr>
+ * <th>Name</th>
+ * <th>Description</th>
+ * <th>Default value</th>
+ * </tr>
+ * <tr>
+ * <td>jbpm.configuration.resource</td>
+ * <td>name of classpath resource containing the configuration</td>
+ * <td>jbpm.cfg.xml</td>
+ * </tr>
+ * </table>
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class BootstrapListener implements ServletContextListener {
+
+ private static final Log log = LogFactory.getLog(BootstrapListener.class);
+
+ public void contextInitialized(ServletContextEvent event) {
+ String jbpmCfgResource = event.getServletContext()
+ .getInitParameter("jbpm.configuration.resource");
+ JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance(jbpmCfgResource);
+
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ try {
+ log.info("bootstrap hibernate session factory");
+ jbpmContext.getSessionFactory();
+ }
+ catch (RuntimeException e) {
+ jbpmContext.setRollbackOnly();
+ throw e;
+ }
+ finally {
+ jbpmContext.close();
+ }
+ }
+
+ public void contextDestroyed(ServletContextEvent servletContextEvent) {
+ }
+}
Property changes on: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/BootstrapListener.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java 2009-12-07 21:10:03 UTC (rev 5921)
@@ -0,0 +1,183 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.web;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import java.util.zip.ZipInputStream;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+
+import org.jbpm.JbpmConfiguration;
+import org.jbpm.JbpmContext;
+import org.jbpm.graph.def.ProcessDefinition;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class ProcessUploadServlet extends javax.servlet.http.HttpServlet {
+
+ private static final long serialVersionUID = 1L;
+
+ private JbpmConfiguration jbpmConfiguration;
+
+ public void init() throws ServletException {
+ String jbpmCfgResource = getServletContext().getInitParameter("jbpm.configuration.resource");
+ jbpmConfiguration = JbpmConfiguration.getInstance(jbpmCfgResource);
+ }
+
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ if (log.isTraceEnabled()) log.trace("handling status request");
+
+ PrintWriter out = response.getWriter();
+ writeHeader(out);
+ out.println("<h3>Deploy a process</h3>");
+ out.println("<form name='deploy-form' method='post' enctype='multipart/form-data'>");
+ out.println(" <p>Process Archive: <input name='process-archive' type='file'/>");
+ out.println(" <p><input name='deploy-button' type='submit' value='Deploy'/>");
+ out.println("</form>");
+ writeTrailer(out);
+ }
+
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ if (log.isTraceEnabled()) log.trace("handling upload request");
+
+ FileItem processItem = parseRequest(request, response);
+ if (processItem == null) return; // error has been sent
+
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ try {
+ ProcessDefinition processDefinition = parseProcessArchive(processItem);
+ deployProcessDefinition(processDefinition, response);
+ }
+ finally {
+ jbpmContext.close();
+ }
+ }
+
+ private void writeHeader(PrintWriter out) throws MalformedURLException {
+ out.println("<html>");
+ out.println("<head>");
+ out.println("<title>Process Deployment</title>");
+ URL css = getServletContext().getResource("/ua/jbpm.css");
+ if (css != null) {
+ out.print("<link rel='stylesheet' type='text/css' href='");
+ out.print(css.toString());
+ out.println("'/>");
+ }
+ out.println("</head>");
+ out.println("<body>");
+ }
+
+ private void writeTrailer(PrintWriter out) {
+ out.println("</body>");
+ out.println("</html>");
+ }
+
+ private FileItem parseRequest(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
+ // check if request is multipart content
+ if (!ServletFileUpload.isMultipartContent(request)) {
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Not a multipart request");
+ return null;
+ }
+
+ // Create a factory for disk-based file items
+ FileItemFactory factory = new DiskFileItemFactory();
+ // Create a new file upload handler
+ ServletFileUpload upload = new ServletFileUpload(factory);
+ try {
+ // Parse the request
+ List items = upload.parseRequest(request);
+ if (items.isEmpty()) {
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Request is empty");
+ return null;
+ }
+ FileItem item = (FileItem) items.get(0);
+ if (item.isFormField()) {
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Field '" + item.getFieldName()
+ + "' is not an input file");
+ return null;
+ }
+ return item;
+ }
+ catch (FileUploadException e) {
+ log.error("failed to parse request", e);
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Failed to parse request");
+ return null;
+ }
+ }
+
+ private ProcessDefinition parseProcessArchive(FileItem fileItem) throws IOException {
+ if (log.isTraceEnabled()) log.trace("parsing process archive " + fileItem.getName());
+
+ ZipInputStream processStream = new ZipInputStream(fileItem.getInputStream());
+ try {
+ ProcessDefinition processDefinition = ProcessDefinition.parseParZipInputStream(processStream);
+ if (log.isTraceEnabled())
+ log.trace("parsed process definition " + processDefinition.getName());
+ return processDefinition;
+ }
+ finally {
+ processStream.close();
+ }
+ }
+
+ private void deployProcessDefinition(ProcessDefinition processDefinition,
+ HttpServletResponse response) throws IOException {
+ String processName = processDefinition.getName();
+ JbpmContext jbpmContext = jbpmConfiguration.getCurrentJbpmContext();
+ try {
+ jbpmContext.deployProcessDefinition(processDefinition);
+
+ if (log.isTraceEnabled()) log.trace("deployed process definition " + processName);
+ PrintWriter out = response.getWriter();
+ writeHeader(out);
+ out.println("<h3>Deployment report</h3>");
+ out.print("<p>Deployed process ");
+ out.print(processName);
+ out.println(" successfully</p>");
+ writeTrailer(out);
+ }
+ catch (RuntimeException e) {
+ jbpmContext.setRollbackOnly();
+
+ log.error("failed to deploy process definition " + processName, e);
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ "Failed to deploy process");
+ }
+ }
+
+ private static final Log log = LogFactory.getLog(ProcessUploadServlet.class);
+}
\ No newline at end of file
Property changes on: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/ProcessUploadServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml 2009-12-07 21:10:03 UTC (rev 5921)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web PUBLIC
+ "-//JBoss//DTD Web Application 2.4//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <!--
+ Specify the security domain to use. This will be java:/jaas/<name> where
+ <name> is one of the names configured in your login-config.xml.
+ -->
+ <security-domain>java:/jaas/jbpm-console</security-domain>
+ <context-root>jbpm-console</context-root>
+
+ <resource-ref>
+ <res-ref-name>jdbc/JbpmDataSource</res-ref-name>
+ <jndi-name>java:JbpmDS</jndi-name>
+ </resource-ref>
+</jboss-web>
Property changes on: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/web.xml 2009-12-07 21:10:03 UTC (rev 5921)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <servlet>
+ <description>Server counterpart for the Graphical Process Designer
+ deployment feature.</description>
+ <servlet-name>GPD Deployer Servlet</servlet-name>
+ <servlet-class>org.jbpm.web.ProcessUploadServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>GPD Deployer Servlet</servlet-name>
+ <url-pattern>/upload/*</url-pattern>
+ </servlet-mapping>
+
+ <security-role>
+ <description>This role list should be changed to include all the relevant
+ roles for your environment.</description>
+ <role-name>admin</role-name>
+ </security-role>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Secure Area</web-resource-name>
+ <description>If you are deploying to JBoss AS, be sure to specify the
+ security domain in jboss-web.xml.</description>
+ <url-pattern>/upload/*</url-pattern>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <description>Optionally customize the role name to require a login before
+ access is allowed to the application.</description>
+ <role-name>admin</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>jBPM GPD Deployer</realm-name>
+ </login-config>
+
+ <resource-ref>
+ <description>Logical name of the data source that provides connections to
+ the persistence service. Must match the hibernate.connection.datasource
+ property in the Hibernate configuration file.</description>
+ <res-ref-name>jdbc/JbpmDataSource</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+</web-app>
Property changes on: projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/webapp/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2009-12-07 11:32:49 UTC (rev 5920)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2009-12-07 21:10:03 UTC (rev 5921)
@@ -29,6 +29,7 @@
<modules>
<module>console</module>
<module>jbpm4jsf</module>
+ <module>gpd-deployer</module>
</modules>
<!-- Properties -->
16 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5920 - jbpm4/trunk.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-12-07 06:32:49 -0500 (Mon, 07 Dec 2009)
New Revision: 5920
Modified:
jbpm4/trunk/pom.xml
Log:
Update console to 1.3.0-SNAPSHOT
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-12-05 03:36:23 UTC (rev 5919)
+++ jbpm4/trunk/pom.xml 2009-12-07 11:32:49 UTC (rev 5920)
@@ -53,7 +53,7 @@
<drools.version>5.0.1</drools.version>
<aspectjrt.version>1.5.3</aspectjrt.version>
<freemarker.version>2.3.15</freemarker.version>
- <gwt.console.version>1.2.1</gwt.console.version>
+ <gwt.console.version>1.3.0-SNAPSHOT</gwt.console.version>
<jbpm.gpd.version>4.2</jbpm.gpd.version>
<hibernate.version>3.3.1.GA</hibernate.version>
<slf4j.version>1.5.2</slf4j.version>
16 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5919 - jbpm3/branches/jbpm-3.2-soa/modules/core.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-12-04 22:36:23 -0500 (Fri, 04 Dec 2009)
New Revision: 5919
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
Log:
JBPM-2678: restore hsqldb test dependency
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2009-12-04 16:12:00 UTC (rev 5918)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2009-12-05 03:36:23 UTC (rev 5919)
@@ -96,6 +96,11 @@
<artifactId>jaxen</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Plugins -->
16 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5918 - in jbpm4/trunk: modules/devguide/src/main/docbook/en/modules and 11 other directories.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-12-04 11:12:00 -0500 (Fri, 04 Dec 2009)
New Revision: 5918
Added:
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/rulesdecision/
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/rulesdecision/RulesDecisionTest.java
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/rulesdecision/
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/rulesdecision/isImportant.drl
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/rulesdecision/process.jpdl.xml
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/RulesDecisionActivity.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/RulesDecisionBinding.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/rules/
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/rules/ExecutionGlobals.java
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/rules/Outcome.java
Modified:
jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
jbpm4/trunk/modules/examples/pom.xml
jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.bindings.xml
jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.cfg.xml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RulesDeployer.java
jbpm4/trunk/pom.xml
Log:
JBPM-2006 drools integration
Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml
===================================================================
--- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml 2009-12-04 15:36:10 UTC (rev 5917)
+++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-Incubation.xml 2009-12-04 16:12:00 UTC (rev 5918)
@@ -317,7 +317,7 @@
<!-- ### GROUP ########################################################## -->
<section id="group">
- <title><literal>group</literal></title>
+ <title><literal>group</literal> activity</title>
<para>A <literal>group</literal> groups a set of activities in a process. Contained groups must
be hierarchically nested. A group corresponds to a BPMN expanded sub process.
@@ -615,8 +615,110 @@
Don't tell anyone cause this is not BPMN compliant.
</para>
</section>
-
</section>
+
+
+ <!-- ### RULES DEPLOYER ####################################################### -->
+ <section id="rulesdeployer">
+ <title>Rules deployer</title>
+ <para>The rules deployer is a convenience integration between jBPM and
+ <ulink url="http://drools.org">Drools</ulink>. It creates a KownledgeBase based
+ on all .drl files that are included in a business archive deployment.
+ That KnowledgeBase is then stored in the repository cache. So one
+ KnowledgeBase is maintained in memory the process-engine-context. Activities
+ like the <link linkend="rulesdecision">rules decision</link> leverage
+ this KnowledgeBase.
+ </para>
+ </section>
+
+ <!-- ### RULES DECISION ####################################################### -->
+ <section id="rulesdecision">
+ <title><literal>rules-decision</literal> activity</title>
+ <para>A rules-decision is an automatic activity that will select a single outgoing
+ transition based on the evaluation of rules.
+ </para>
+ <para>Rules for a rules decision are to be deployed as part of the business
+ archive. Those rules can use all process variables as globals in rule definitions.
+ The <literal>rule-decision</literal> activity will use a stateless knowledge
+ session on the knowledgebase. The execution arriving in the <literal>rules-decision</literal>
+ is executed on the stateless drools knowledge session.
+ </para>
+ <para>Let's look at the next example how that works in practice. We'll start
+ with the <literal>RulesDecision</literal> process</para>
+ <programlisting><process name="RulesDecision">
+
+ <start>
+ <transition to="isImportant" />
+ </start>
+
+ <emphasis role="bold"><rules-decision name="isImportant">
+ <transition name="dunno" to="analyseManually" />
+ <transition name="important" to="processWithPriority" />
+ <transition name="irrelevant" to="processWhenResourcesAvailable" />
+ </rules-decision></emphasis>
+
+ <state name="analyseManually" />
+ <state name="processWithPriority" />
+ <state name="processWhenResourcesAvailable" />
+
+</process></programlisting>
+ <para>The following <literal>isImportant.drl</literal> is included in the
+ business archive deployment.
+ </para>
+ <programlisting>global java.lang.Integer amount;
+global java.lang.String product;
+global org.jbpm.jpdl.internal.rules.Outcome outcome;
+
+rule "LessThen3IsIrrelevant"
+ when
+ eval(amount < 3)
+ then
+ outcome.set("irrelevant");
+end
+
+rule "MoreThen24IsImportant"
+ when
+ eval(amount > 24)
+ then
+ outcome.set("important");
+end
+
+rule "TwelveTempranillosIsImportant"
+ when
+ eval(product == "Tempranillo")
+ eval(amount > 12)
+ then
+ outcome.set("important");
+end</programlisting>
+ <para>First you see that amount and product are defined as globals.
+ Those will resolve by the <literal>rules-decision</literal> to the
+ process variables with those respective names.
+ </para>
+ <para><literal>outcome</literal> is a special global variable that is
+ used to indicate the transition to take in the consequence. Also,
+ if no outcome is specified by the rules, the default transition will be taken.
+ </para>
+ <para>So let's start a new process instance and set 2 variables
+ <literal>product</literal> and <literal>amount</literal> with respective
+ values <literal>shoe</literal> and <literal>32</literal>:</para>
+ <programlisting>Map<String, Object> variables = new HashMap<String, Object>();
+variables.put("amount", 32);
+variables.put("product", "shoe");
+
+ProcessInstance processInstance =
+ executionService.startProcessInstanceByKey("RulesDecision", variables);</programlisting>
+ <para>After starting the process instance method returns, the process instance
+ will have arrived in the activity <literal>processWithPriority</literal> </para>
+ <para>In similar style, a new RulesDecision process instance with
+ <literal>2 missiles</literal> will go to
+ activity <literal>processWhenResourcesAvailable</literal> </para>
+ <para>A RulesDecision process instance with
+ <literal>15 shoes</literal> will go to
+ activity <literal>analyseManually</literal> </para>
+ <para>And a RulesDecision process instance with
+ <literal>13 Tempranillo</literal>s will go to
+ activity <literal>analyseManually</literal> </para>
+ </section>
<section>
<title>Creating identity groups</title>
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-12-04 15:36:10 UTC (rev 5917)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-12-04 16:12:00 UTC (rev 5918)
@@ -210,16 +210,24 @@
<fileset dir="${jbpm.home}/lib">
<include name="activation.jar" />
<include name="antlr.jar" />
+ <include name="antlr-runtime.jar" />
<include name="commons-collections.jar" />
+ <include name="core.jar" />
<include name="dom4j.jar" />
+ <include name="drools-api.jar" />
+ <include name="drools-core.jar" />
+ <include name="drools-compiler.jar" />
<include name="freemarker.jar" />
<include name="hibernate-core.jar" />
<include name="hibernate-cglib-repack.jar" />
+ <include name="janino.jar" />
<include name="javassist.jar" />
<include name="jta.jar" />
<include name="juel*.jar" />
<include name="livetribe-jsr223.jar" />
<include name="mail.jar" />
+ <include name="joda-time.jar" />
+ <include name="mvel2.jar" />
<include name="slf4j-api.jar" />
<include name="slf4j-jdk14.jar" />
</fileset>
@@ -453,22 +461,30 @@
<fileset dir="${jbpm.home}/lib">
<include name="activation.jar" />
<include name="antlr.jar" />
+ <include name="antlr-runtime.jar" />
<include name="bsh.jar" />
<include name="commons-collections.jar" />
<include name="commons-logging.jar" />
+ <include name="core.jar" />
<include name="dom4j.jar" />
+ <include name="drools-api.jar" />
+ <include name="drools-core.jar" />
+ <include name="drools-compiler.jar" />
<include name="freemarker.jar" />
<include name="groovy-all.jar" />
<include name="hibernate-core.jar" />
<include name="hibernate-cglib-repack.jar" />
+ <include name="janino.jar" />
<include name="javassist.jar" />
<include name="jbpm-spi.jar" />
<include name="jbpm-tomcat6.jar" />
+ <include name="joda-time.jar" />
<include name="jta.jar" />
<include name="juel*.jar" />
<include name="livetribe-jsr223.jar" />
<include name="log4j.jar" />
<include name="mail.jar" />
+ <include name="mvel2.jar" />
<include name="slf4j-api.jar" />
<include name="slf4j-jdk14.jar" />
<include name="gwt-console-server-integration.jar" />
Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml 2009-12-04 15:36:10 UTC (rev 5917)
+++ jbpm4/trunk/modules/examples/pom.xml 2009-12-04 16:12:00 UTC (rev 5918)
@@ -60,12 +60,18 @@
<artifactId>wstx-lgpl</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-compiler</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.subethamail</groupId>
<artifactId>subethasmtp-wiser</artifactId>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/rulesdecision/RulesDecisionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/rulesdecision/RulesDecisionTest.java (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/rulesdecision/RulesDecisionTest.java 2009-12-04 16:12:00 UTC (rev 5918)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.examples.rulesdecision;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jbpm.api.ProcessInstance;
+import org.jbpm.test.JbpmTestCase;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class RulesDecisionTest extends JbpmTestCase {
+
+ String deploymentId;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ deploymentId = repositoryService.createDeployment()
+ .addResourceFromClasspath("org/jbpm/examples/rulesdecision/process.jpdl.xml")
+ .addResourceFromClasspath("org/jbpm/examples/rulesdecision/isImportant.drl")
+ .deploy();
+ }
+
+ protected void tearDown() throws Exception {
+ repositoryService.deleteDeploymentCascade(deploymentId);
+
+ super.tearDown();
+ }
+
+
+ public void testImportantOrder() {
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("amount", 32);
+ variables.put("product", "shoe");
+
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey("RulesDecision", variables);
+
+ assertTrue(processInstance.isActive("processWithPriority"));
+ }
+
+ public void testIrrelevantOrder() {
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("amount", 2);
+ variables.put("product", "missiles");
+
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey("RulesDecision", variables);
+
+ assertTrue(processInstance.isActive("processWhenResourcesAvailable"));
+ }
+
+ public void testUndefinedImportance() {
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("amount", 15);
+ variables.put("product", "shoe");
+
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey("RulesDecision", variables);
+
+ assertTrue(processInstance.isActive("analyseManually"));
+ }
+
+ public void test13TempranillosIsImportant() {
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("amount", 13);
+ variables.put("product", "Tempranillo");
+
+ ProcessInstance processInstance = executionService.startProcessInstanceByKey("RulesDecision", variables);
+
+ assertTrue(processInstance.isActive("processWithPriority"));
+ }
+}
Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/rulesdecision/RulesDecisionTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/rulesdecision/isImportant.drl
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/rulesdecision/isImportant.drl (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/rulesdecision/isImportant.drl 2009-12-04 16:12:00 UTC (rev 5918)
@@ -0,0 +1,25 @@
+global java.lang.Integer amount;
+global java.lang.String product;
+global org.jbpm.jpdl.internal.rules.Outcome outcome;
+
+rule "LessThen3IsIrrelevant"
+ when
+ eval(amount < 3)
+ then
+ outcome.set("irrelevant");
+end
+
+rule "MoreThen24IsImportant"
+ when
+ eval(amount > 24)
+ then
+ outcome.set("important");
+end
+
+rule "TwelveTempranillosIsImportant"
+ when
+ eval(product == "Tempranillo")
+ eval(amount > 12)
+ then
+ outcome.set("important");
+end
Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/rulesdecision/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/rulesdecision/process.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/rulesdecision/process.jpdl.xml 2009-12-04 16:12:00 UTC (rev 5918)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="RulesDecision">
+
+ <start>
+ <transition to="isImportant" />
+ </start>
+
+ <rules-decision name="isImportant">
+ <transition name="dunno" to="analyseManually" />
+ <transition name="important" to="processWithPriority" />
+ <transition name="irrelevant" to="processWhenResourcesAvailable" />
+ </rules-decision>
+
+ <state name="analyseManually" />
+ <state name="processWithPriority" />
+ <state name="processWhenResourcesAvailable" />
+
+</process>
Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/rulesdecision/process.jpdl.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/RulesDecisionActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/RulesDecisionActivity.java (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/RulesDecisionActivity.java 2009-12-04 16:12:00 UTC (rev 5918)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jpdl.internal.activity;
+
+import org.drools.KnowledgeBase;
+import org.drools.runtime.StatelessKnowledgeSession;
+import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.jpdl.internal.rules.ExecutionGlobals;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+import org.jbpm.pvm.internal.repository.RulesDeployer;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class RulesDecisionActivity extends JpdlActivity {
+
+ private static final long serialVersionUID = 1L;
+
+ public void execute(ActivityExecution execution) throws Exception {
+ String deploymentId = ((ExecutionImpl)execution).getProcessDefinition().getDeploymentId();
+ KnowledgeBase knowledgeBase = RulesDeployer.getKnowledgeBase(deploymentId);
+
+ StatelessKnowledgeSession knowledgeSession =
+ knowledgeBase.newStatelessKnowledgeSession();
+
+ ExecutionGlobals executionGlobals = new ExecutionGlobals(execution);
+ knowledgeSession.getGlobals().setDelegate(executionGlobals);
+ knowledgeSession.execute(execution);
+ if (!executionGlobals.getOutcome().isDefined()) {
+ execution.takeDefaultTransition();
+ } else {
+ execution.take(executionGlobals.getOutcome().get());
+ }
+ }
+}
Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/RulesDecisionActivity.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/RulesDecisionBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/RulesDecisionBinding.java (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/RulesDecisionBinding.java 2009-12-04 16:12:00 UTC (rev 5918)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jpdl.internal.activity;
+
+import org.jbpm.jpdl.internal.xml.JpdlParser;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.w3c.dom.Element;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class RulesDecisionBinding extends JpdlBinding {
+
+ public RulesDecisionBinding() {
+ super("rules-decision");
+ }
+
+ public Object parseJpdl(Element element, Parse parse, JpdlParser parser) {
+ return new RulesDecisionActivity();
+ }
+}
Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/RulesDecisionBinding.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/rules/ExecutionGlobals.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/rules/ExecutionGlobals.java (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/rules/ExecutionGlobals.java 2009-12-04 16:12:00 UTC (rev 5918)
@@ -0,0 +1,43 @@
+package org.jbpm.jpdl.internal.rules;
+
+import org.drools.runtime.Globals;
+import org.jbpm.api.Execution;
+import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+
+public class ExecutionGlobals implements Globals {
+
+ private static final Log log = Log.getLog(ExecutionGlobals.class.getName());
+
+ ExecutionImpl execution;
+ Outcome outcome = new Outcome();
+
+ public ExecutionGlobals(Execution execution) {
+ this.execution = (ExecutionImpl) execution;
+ }
+
+ public Object get(String variableName) {
+ if ("execution".equals(variableName)) {
+ log.info("returning execution");
+ return execution;
+ }
+ if ("outcome".equals(variableName)) {
+ log.info("returning outcome");
+ return outcome;
+ }
+ Object variableValue = execution.getVariable(variableName);
+ log.info("returning variable "+variableName+": "+variableValue);
+ return variableValue;
+ }
+
+ public void set(String variableName, Object value) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setDelegate(Globals globals) {
+ throw new UnsupportedOperationException();
+ }
+ public Outcome getOutcome() {
+ return outcome;
+ }
+}
Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/rules/ExecutionGlobals.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/rules/Outcome.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/rules/Outcome.java (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/rules/Outcome.java 2009-12-04 16:12:00 UTC (rev 5918)
@@ -0,0 +1,24 @@
+package org.jbpm.jpdl.internal.rules;
+
+import org.jbpm.internal.log.Log;
+
+public class Outcome {
+
+ private static final Log log = Log.getLog(Outcome.class.getName());
+
+ String outcome = null;
+
+ public void set(String outcome) {
+ log.info("outcome is being set to "+outcome);
+ this.outcome = outcome;
+ }
+
+ public boolean isDefined() {
+ return (outcome!=null);
+ }
+
+ public String get() {
+ log.info("outcome "+outcome+" is being fetched");
+ return outcome;
+ }
+}
Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/rules/Outcome.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.bindings.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.bindings.xml 2009-12-04 15:36:10 UTC (rev 5917)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.bindings.xml 2009-12-04 16:12:00 UTC (rev 5918)
@@ -19,6 +19,7 @@
<activity binding="org.jbpm.jpdl.internal.activity.CustomBinding" />
<activity binding="org.jbpm.jpdl.internal.activity.AssignBinding" />
<activity binding="org.jbpm.jpdl.internal.activity.PassthroughBinding" />
+ <activity binding="org.jbpm.jpdl.internal.activity.RulesDecisionBinding" />
<eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" />
<eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" />
Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.cfg.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.cfg.xml 2009-12-04 15:36:10 UTC (rev 5917)
+++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.cfg.xml 2009-12-04 16:12:00 UTC (rev 5918)
@@ -6,6 +6,7 @@
<deployer-manager>
<jpdl-deployer />
+ <object class="org.jbpm.pvm.internal.repository.RulesDeployer" />
</deployer-manager>
</process-engine-context>
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RulesDeployer.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RulesDeployer.java 2009-12-04 15:36:10 UTC (rev 5917)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RulesDeployer.java 2009-12-04 16:12:00 UTC (rev 5918)
@@ -24,6 +24,7 @@
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactory;
import org.drools.builder.KnowledgeBuilder;
+import org.drools.builder.KnowledgeBuilderError;
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.builder.ResourceType;
import org.drools.io.ResourceFactory;
@@ -38,9 +39,9 @@
public static final String CACHEKEY_KNOWLEDGEBASE = "KnowledgeBase";
public void deploy(DeploymentImpl deployment) {
+ KnowledgeBuilder knowledgeBuilder = null;
+
for (String resourceName: deployment.getResourceNames()) {
-
- KnowledgeBuilder knowledgeBuilder = null;
if (resourceName.endsWith(".drl")) {
if (knowledgeBuilder==null) {
knowledgeBuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
@@ -50,21 +51,32 @@
knowledgeBuilder.add(ResourceFactory.newByteArrayResource(drlBytes), ResourceType.DRL);
}
-
- if (knowledgeBuilder!=null) {
- if (knowledgeBuilder.hasErrors()) {
-
- } else {
- KnowledgeBase knowledgeBase = KnowledgeBaseFactory.newKnowledgeBase();
- knowledgeBase.addKnowledgePackages(knowledgeBuilder.getKnowledgePackages());
-
- RepositoryCache repositoryCache = EnvironmentImpl.getFromCurrent(RepositoryCache.class);
- repositoryCache.set(deployment.getId(), CACHEKEY_KNOWLEDGEBASE, knowledgeBase);
+ }
+
+ if (knowledgeBuilder!=null) {
+ if (knowledgeBuilder.hasErrors()) {
+ for (KnowledgeBuilderError error: knowledgeBuilder.getErrors()) {
+ deployment.addProblem("drl problem: "+error.getMessage());
}
+ } else {
+ KnowledgeBase knowledgeBase = KnowledgeBaseFactory.newKnowledgeBase();
+ knowledgeBase.addKnowledgePackages(knowledgeBuilder.getKnowledgePackages());
+
+ RepositoryCache repositoryCache = EnvironmentImpl.getFromCurrent(RepositoryCache.class);
+ repositoryCache.set(deployment.getId(), CACHEKEY_KNOWLEDGEBASE, knowledgeBase);
}
}
}
+
+ public static KnowledgeBase getKnowledgeBase(String deploymentId) {
+ return getKnowledgeBase(deploymentId, CACHEKEY_KNOWLEDGEBASE);
+ }
+ public static KnowledgeBase getKnowledgeBase(String deploymentId, String knowledgeBaseName) {
+ RepositoryCache repositoryCache = EnvironmentImpl.getFromCurrent(RepositoryCache.class);
+ return (KnowledgeBase) repositoryCache.get(deploymentId, knowledgeBaseName);
+ }
+
public void updateResource(DeploymentImpl deployment, String resourceName, byte[] bytes) {
if (resourceName.endsWith(".drl")) {
throw new UnsupportedOperationException("drl resource updates is not implemented yet. please contribute :-)");
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2009-12-04 15:36:10 UTC (rev 5917)
+++ jbpm4/trunk/pom.xml 2009-12-04 16:12:00 UTC (rev 5918)
@@ -284,6 +284,11 @@
<version>${drools.version}</version>
</dependency>
<dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-compiler</artifactId>
+ <version>${drools.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.birt</groupId>
<artifactId>report-engine</artifactId>
<type>zip</type>
16 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5917 - in jbpm4/trunk/modules: distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar and 2 other directories.
by do-not-reply＠jboss.org
Author: jbarrez
Date: 2009-12-04 10:36:10 -0500 (Fri, 04 Dec 2009)
New Revision: 5917
Modified:
jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/usertask/taskform/vacationrequest.bpmn.xml
Log:
FIxing the example
Modified: jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java
===================================================================
--- jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-12-04 06:41:43 UTC (rev 5916)
+++ jbpm4/trunk/modules/bpmn/src/main/java/org/jbpm/bpmn/parser/BpmnParser.java 2009-12-04 15:36:10 UTC (rev 5917)
@@ -262,7 +262,7 @@
// 8.2.5 of the spec document
if (conditionElement != null) {
String type = conditionElement.getAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "type");
- if ("bpmn:tFormalExpression".equals(type)) {
+ if ("bpmn:tFormalExpression".equals(type) || "tFormalExpression".equals(type)) {
String expr = conditionElement.getTextContent();
String lang = XmlUtil.attribute(conditionElement, "language");
Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml 2009-12-04 06:41:43 UTC (rev 5916)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml 2009-12-04 15:36:10 UTC (rev 5917)
@@ -6,6 +6,7 @@
<import resource="jbpm.businesscalendar.cfg.xml" />
<import resource="jbpm.tx.jta.cfg.xml" />
<import resource="jbpm.jpdl.cfg.xml" />
+ <import resource="jbpm.bpmn.cfg.xml" />
<import resource="jbpm.identity.cfg.xml" />
<import resource="jbpm.jobexecutor.cfg.xml" />
<import resource="jbpm.console.cfg.xml" />
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java 2009-12-04 06:41:43 UTC (rev 5916)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/bpmn/usertask/taskform/TaskFormTest.java 2009-12-04 15:36:10 UTC (rev 5917)
@@ -48,7 +48,7 @@
// After process start, peter should be a candidate for the task
Task requestTasktask = taskService.createTaskQuery().candidate("peter").uniqueResult();
assertNotNull(requestTasktask);
- assertEquals("org/jbpm/bpmn/usertask/request_vacation.ftl", requestTasktask.getFormResourceName());
+ assertEquals("org/jbpm/examples/bpmn/usertask/taskform/request_vacation.ftl", requestTasktask.getFormResourceName());
// After this task is completed, a manager should be able to see the 'verify' task
TaskQuery verifyTaskQuery = taskService.createTaskQuery().candidate("alex");
@@ -56,7 +56,7 @@
taskService.completeTask(requestTasktask.getId());
Task verifyTask = verifyTaskQuery.uniqueResult();
- assertEquals("org/jbpm/bpmn/usertask/verify_request.ftl", verifyTask.getFormResourceName());
+ assertEquals("org/jbpm/examples/bpmn/usertask/taskform/verify_request.ftl", verifyTask.getFormResourceName());
assertNotNull(verifyTask);
// When completing the verification task, we also need to store the result of the decision
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/usertask/taskform/vacationrequest.bpmn.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/usertask/taskform/vacationrequest.bpmn.xml 2009-12-04 06:41:43 UTC (rev 5916)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/bpmn/usertask/taskform/vacationrequest.bpmn.xml 2009-12-04 15:36:10 UTC (rev 5917)
@@ -1,62 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions id="vacationRequest"
+<definitions id="vacationRequest"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 ../../../../../../../../../../bpmn/src/main/resources/BPMN20.xsd"
- xmlns:bpmn="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
+ xmlns="http://schema.omg.org/spec/BPMN/2.0" typeLanguage="http://www.w3.org/2001/XMLSchema"
expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://jbpm.org/example/bpmn2/vacation_request"
xmlns:jbpm="http://jbpm.org/bpmn2">
- <bpmn:process id="vacationRequestProcess" name="BPMN2 Example process using task forms">
+ <process id="vacationRequestProcess" name="BPMN2 Example process using task forms">
- <bpmn:startEvent id="start" />
+ <startEvent id="start" />
- <bpmn:sequenceFlow id="flow1" name="fromStartToRequestVacation"
+ <sequenceFlow id="flow1" name="fromStartToRequestVacation"
sourceRef="start" targetRef="requestVacation" />
- <bpmn:userTask id="requestVacation" name="Request Vacation"
+ <userTask id="requestVacation" name="Request Vacation"
implementation="other">
- <bpmn:potentialOwner resourceRef="user" />
- <bpmn:rendering id="requestForm">
+ <potentialOwner resourceRef="user" />
+ <rendering id="requestForm">
<jbpm:form>org/jbpm/examples/bpmn/usertask/taskform/request_vacation.ftl</jbpm:form>
- </bpmn:rendering>
- </bpmn:userTask>
+ </rendering>
+ </userTask>
- <bpmn:sequenceFlow id="flow2"
+ <sequenceFlow id="flow2"
name="fromRequestVacationToVerifyRequest" sourceRef="requestVacation"
targetRef="verifyRequest" />
- <bpmn:userTask id="verifyRequest" name="Verify Request"
+ <userTask id="verifyRequest" name="Verify Request"
implementation="other">
- <bpmn:potentialOwner resourceRef="manager" />
- <bpmn:rendering id="verifyForm">
+ <potentialOwner resourceRef="manager" />
+ <rendering id="verifyForm">
<jbpm:form>org/jbpm/examples/bpmn/usertask/taskform/verify_request.ftl</jbpm:form>
- </bpmn:rendering>
- </bpmn:userTask>
+ </rendering>
+ </userTask>
- <bpmn:sequenceFlow id="flow3" name="fromVerifyRequestToEnd"
+ <sequenceFlow id="flow3" name="fromVerifyRequestToEnd"
sourceRef="verifyRequest" targetRef="theEnd">
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${verificationResult == 'OK'}</bpmn:conditionExpression>
- </bpmn:sequenceFlow>
+ <conditionExpression xsi:type="tFormalExpression">${verificationResult == 'OK'}</conditionExpression>
+ </sequenceFlow>
- <bpmn:sequenceFlow id="flow4"
+ <sequenceFlow id="flow4"
name="fromVerifyRequestToSendRejectionMessage" sourceRef="verifyRequest"
targetRef="sendRejectionMessage">
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${verificationResult == 'Not OK'}</bpmn:conditionExpression>
- </bpmn:sequenceFlow>
+ <conditionExpression xsi:type="tFormalExpression">${verificationResult == 'Not OK'}</conditionExpression>
+ </sequenceFlow>
- <bpmn:scriptTask id="sendRejectionMessage" name="Send rejection Message"
+ <scriptTask id="sendRejectionMessage" name="Send rejection Message"
scriptLanguage="bsh">
- <bpmn:script>
+ <script>
<![CDATA[System.out.println("Vacation request refused!");]]>
- </bpmn:script>
- </bpmn:scriptTask>
+ </script>
+ </scriptTask>
- <bpmn:sequenceFlow id="flow5"
+ <sequenceFlow id="flow5"
name="fromSendRejectionMessageToEnd" sourceRef="sendRejectionMessage"
targetRef="theEnd" />
- <bpmn:endEvent id="theEnd" name="End" />
+ <endEvent id="theEnd" name="End" />
- </bpmn:process>
-</bpmn:definitions>
+ </process>
+</definitions>
16 years, 4 months
- 1
- 0
JBoss JBPM SVN: r5916 - jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-12-04 01:41:43 -0500 (Fri, 04 Dec 2009)
New Revision: 5916
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/SerializabilityTest.java
Log:
fix unintended call to jdk 1.5 method
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/SerializabilityTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/SerializabilityTest.java 2009-12-04 06:24:43 UTC (rev 5915)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/SerializabilityTest.java 2009-12-04 06:41:43 UTC (rev 5916)
@@ -92,7 +92,7 @@
File classDir = new File(ClassLoaderUtil.class.getProtectionDomain()
.getCodeSource()
.getLocation()
- .toURI());
+ .getPath());
File[] files = classDir.listFiles();
for (int i = 0; i < files.length; i++) {
16 years, 5 months
- 1
- 0
JBoss JBPM SVN: r5915 - jbpm3/branches/jbpm-3.2-soa/eclipse and 13 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-12-04 01:24:43 -0500 (Fri, 04 Dec 2009)
New Revision: 5915
Modified:
jbpm3/branches/jbpm-3.2-soa/eclipse/jbpm.code.style.xml
jbpm3/branches/jbpm-3.2-soa/eclipse/jbpm.code.templates.xml
jbpm3/branches/jbpm-3.2-soa/eclipse/readme.txt
jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en/master.xml
jbpm3/branches/jbpm-3.2-soa/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml
Log:
SOA-1586: bump version to 3.2.9, sanitize pom files
Modified: jbpm3/branches/jbpm-3.2-soa/eclipse/jbpm.code.style.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/eclipse/jbpm.code.style.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ jbpm3/branches/jbpm-3.2-soa/eclipse/jbpm.code.style.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<profiles version="11">
-<profile kind="CodeFormatterProfile" name="jbpm3.code.style" version="11">
+<profile kind="CodeFormatterProfile" name="jBPM 3" version="11">
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
@@ -24,7 +24,7 @@
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
@@ -39,7 +39,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
@@ -51,6 +51,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
@@ -59,7 +60,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
@@ -69,8 +70,8 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="164"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
@@ -93,7 +94,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
@@ -102,7 +103,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
@@ -112,17 +113,17 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
@@ -145,9 +146,9 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
@@ -167,7 +168,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
@@ -176,21 +177,21 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="168"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
@@ -201,6 +202,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
@@ -244,7 +246,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
Modified: jbpm3/branches/jbpm-3.2-soa/eclipse/jbpm.code.templates.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/eclipse/jbpm.code.templates.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ jbpm3/branches/jbpm-3.2-soa/eclipse/jbpm.code.templates.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,4 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?><templates><template autoinsert="false" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment"></template><template autoinsert="false" context="settercomment_context" deleted="false" description="Comment for setter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment"></template><template autoinsert="false" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment"></template><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/*
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><templates><template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
+ * @return the ${bare_field_name}
+ */</template><template autoinsert="true" context="settercomment_context" deleted="false" description="Comment for setter function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name="settercomment">/**
+ * @param ${param} the ${bare_field_name} to set
+ */</template><template autoinsert="true" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/**
+ * ${tags}
+ */</template><template autoinsert="true" context="filecomment_context" deleted="false" description="Comment for created JavaScript files" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name="filecomment">/**
+ *
+ */</template><template autoinsert="false" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name="typecomment">/**
+ * @author ${user}
+ */</template><template autoinsert="false" context="fieldcomment_context" deleted="false" description="Comment for vars" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name="fieldcomment"/><template autoinsert="true" context="methodcomment_context" deleted="false" description="Comment for non-overriding function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name="methodcomment">/**
+ * ${tags}
+ */</template><template autoinsert="false" context="overridecomment_context" deleted="false" description="Comment for overriding functions" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name="overridecomment"/><template autoinsert="true" context="delegatecomment_context" deleted="false" description="Comment for delegate functions" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/**
+ * ${tags}
+ * ${see_to_target}
+ */</template><template autoinsert="true" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
+${package_declaration}
+
+${typecomment}
+${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name="classbody">
+</template><template autoinsert="true" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name="catchblock">// ${todo} Auto-generated catch block
+${exception_var}.printStackTrace();</template><template autoinsert="true" context="methodbody_context" deleted="false" description="Code in created function stubs" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name="methodbody">// ${todo} Auto-generated function stub
+${body_statement}</template><template autoinsert="true" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}
+// ${todo} Auto-generated constructor stub</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template><template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
+ * @return the ${bare_field_name}
+ */</template><template autoinsert="true" context="settercomment_context" deleted="false" description="Comment for setter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment">/**
+ * @param ${param} the ${bare_field_name} to set
+ */</template><template autoinsert="true" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/**
+ * ${tags}
+ */</template><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/*
* JBoss, Home of Professional Open Source
* Copyright 2005, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -19,8 +48,13 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/</template><template autoinsert="false" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.typecomment" name="typecomment">/**
- * @author Tom Baeyens
- */</template><template autoinsert="false" context="fieldcomment_context" deleted="false" description="Comment for fields" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name="fieldcomment"></template><template autoinsert="false" context="methodcomment_context" deleted="false" description="Comment for non-overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name="methodcomment"></template><template autoinsert="false" context="overridecomment_context" deleted="false" description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment"></template><template autoinsert="false" context="delegatecomment_context" deleted="false" description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment"></template><template autoinsert="false" context="newtype_context" deleted="false" !
description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
+ * @author ${user}
+ */</template><template autoinsert="false" context="fieldcomment_context" deleted="false" description="Comment for fields" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name="fieldcomment"/><template autoinsert="true" context="methodcomment_context" deleted="false" description="Comment for non-overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name="methodcomment">/**
+ * ${tags}
+ */</template><template autoinsert="false" context="overridecomment_context" deleted="false" description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment"/><template autoinsert="true" context="delegatecomment_context" deleted="false" description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/**
+ * ${tags}
+ * ${see_to_target}
+ */</template><template autoinsert="true" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
${package_declaration}
${typecomment}
@@ -31,33 +65,4 @@
</template><template autoinsert="true" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">// ${todo} Auto-generated catch block
${exception_var}.printStackTrace();</template><template autoinsert="true" context="methodbody_context" deleted="false" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody">// ${todo} Auto-generated method stub
${body_statement}</template><template autoinsert="true" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}
-// ${todo} Auto-generated constructor stub</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template><template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
- * @return the ${bare_field_name}
- */</template><template autoinsert="true" context="settercomment_context" deleted="false" description="Comment for setter function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name="settercomment">/**
- * @param ${param} the ${bare_field_name} to set
- */</template><template autoinsert="true" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/**
- * ${tags}
- */</template><template autoinsert="true" context="filecomment_context" deleted="false" description="Comment for created JavaScript files" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name="filecomment">/**
- *
- */</template><template autoinsert="true" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name="typecomment">/**
- * @author ${user}
- *
- * ${tags}
- */</template><template autoinsert="true" context="fieldcomment_context" deleted="false" description="Comment for vars" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name="fieldcomment">/**
- *
- */</template><template autoinsert="true" context="methodcomment_context" deleted="false" description="Comment for non-overriding function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name="methodcomment">/**
- * ${tags}
- */</template><template autoinsert="true" context="overridecomment_context" deleted="false" description="Comment for overriding functions" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name="overridecomment">/* (non-Jsdoc)
- * ${see_to_overridden}
- */</template><template autoinsert="true" context="delegatecomment_context" deleted="false" description="Comment for delegate functions" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/**
- * ${tags}
- * ${see_to_target}
- */</template><template autoinsert="true" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
-${package_declaration}
-
-${typecomment}
-${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name="classbody">
-</template><template autoinsert="true" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name="catchblock">// ${todo} Auto-generated catch block
-${exception_var}.printStackTrace();</template><template autoinsert="true" context="methodbody_context" deleted="false" description="Code in created function stubs" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name="methodbody">// ${todo} Auto-generated function stub
-${body_statement}</template><template autoinsert="true" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}
-// ${todo} Auto-generated constructor stub</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template></templates>
\ No newline at end of file
+// ${todo} Auto-generated constructor stub</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template></templates>
\ No newline at end of file
Modified: jbpm3/branches/jbpm-3.2-soa/eclipse/readme.txt
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/eclipse/readme.txt 2009-12-03 23:44:44 UTC (rev 5914)
+++ jbpm3/branches/jbpm-3.2-soa/eclipse/readme.txt 2009-12-04 06:24:43 UTC (rev 5915)
@@ -9,13 +9,14 @@
enable-auto-props = yes
[auto-props]
-*.bat = svn:keywords=Id Revision;svn:eol-style=CRLF
-*.java = svn:keywords=Id Revision;svn:eol-style=LF
-*.sh = svn:keywords=Id Revision;svn:eol-style=LF;svn:executable
-*.txt = svn:keywords=Id Revision;svn:eol-style=LF
-*.wsdl = svn:keywords=Id Revision;svn:eol-style=LF
-*.xml = svn:keywords=Id Revision;svn:eol-style=LF
-*.xsd = svn:keywords=Id Revision;svn:eol-style=LF
+*.bat = svn:keywords=Id Revision;svn:eol-style=CRLF
+*.bpel = svn:keywords=Id Revision;svn:eol-style=native
+*.java = svn:keywords=Id Revision;svn:eol-style=native
+*.sh = svn:keywords=Id Revision;svn:eol-style=LF;svn:executable
+*.txt = svn:keywords=Id Revision;svn:eol-style=native
+*.wsdl = svn:keywords=Id Revision;svn:eol-style=native
+*.xml = svn:keywords=Id Revision;svn:eol-style=native
+*.xsd = svn:keywords=Id Revision;svn:eol-style=native
2. If you are using an IDE, make sure that it refers to the same config.
With Eclipse and Subclipse this is already the case if
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
<!-- ====================================================================== -->
<!-- $Id$ -->
@@ -23,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -34,8 +32,12 @@
<!-- Dependencies -->
<dependencies>
- <!-- jBPM Dependencies -->
+ <!-- Compile Dependencies -->
<dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+ <dependency>
<groupId>bsh</groupId>
<artifactId>bsh</artifactId>
</dependency>
@@ -54,6 +56,20 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <!-- Provided Dependencies -->
+ <dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
<scope>provided</scope>
@@ -68,22 +84,6 @@
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </dependency>
<!-- Test Dependencies -->
<dependency>
@@ -96,13 +96,6 @@
<artifactId>jaxen</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- Remove this static dependency -->
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- Plugins -->
@@ -133,12 +126,14 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<showDeprecation>false</showDeprecation>
</configuration>
</plugin>
+
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -150,6 +145,7 @@
</excludes>
</configuration>
</plugin>
+
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -167,6 +163,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -187,7 +184,7 @@
<!--
Name: soa
- Descr: Customizations for the SOA build
+ Desc: Customizations for the SOA build
-->
<profile>
<id>soa</id>
@@ -240,7 +237,7 @@
<!--
Name: db2
- Descr: DB2 Test Exclusions
+ Desc: DB2 Test Exclusions
-->
<profile>
<id>db2</id>
@@ -266,7 +263,7 @@
<!--
Name: mssql
- Descr: SQL Server Test Exclusions
+ Desc: SQL Server Test Exclusions
-->
<profile>
<id>mssql</id>
@@ -292,7 +289,7 @@
<!--
Name: oracle
- Descr: Oracle Test Exclusions
+ Desc: Oracle Test Exclusions
-->
<profile>
<id>oracle</id>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ jbpm3/branches/jbpm-3.2-soa/modules/db/pom.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, the OpenSource J2EE webOS -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- -->
- <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
- <!-- $Id$ -->
+<!-- $Id$ -->
<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">
@@ -23,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -70,10 +68,10 @@
</goals>
<configuration>
<tasks>
- <property name="project.output.dir" value="${project.build.outputDirectory}"/>
- <property name="previous.version.dir" value="${previous.version.directory}"/>
+ <property name="project.output.dir" value="${project.build.outputDirectory}" />
+ <property name="previous.version.dir" value="${previous.version.directory}" />
<ant antfile="scripts/antrun-jbpmschema.xml" target="update-schema"
- inheritRefs="true"/>
+ inheritRefs="true" />
</tasks>
</configuration>
</execution>
@@ -87,6 +85,7 @@
</properties>
<dependencies>
+ <!-- Database Drivers -->
<dependency>
<groupId>com.ibm</groupId>
<artifactId>db2jcc</artifactId>
@@ -164,6 +163,7 @@
<version>${project.version}</version>
</dependency>
+ <!-- Runtime Dependencies -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -192,11 +192,11 @@
</goals>
<configuration>
<tasks>
- <property name="project.output.dir" value="${project.build.outputDirectory}"/>
+ <property name="project.output.dir" value="${project.build.outputDirectory}" />
<ant antfile="scripts/antrun-jbpmschema.xml" target="create-schema"
- inheritRefs="true"/>
+ inheritRefs="true" />
<ant antfile="scripts/antrun-jbpmschema.xml" target="drop-schema"
- inheritRefs="true"/>
+ inheritRefs="true" />
</tasks>
</configuration>
</execution>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/pom.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, the OpenSource J2EE webOS -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- -->
- <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
- <!-- $Id$ -->
+<!-- $Id$ -->
+
<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>
@@ -22,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -37,6 +36,7 @@
<!-- Dependencies -->
<dependencies>
+ <!-- jBPM dependencies -->
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-db</artifactId>
@@ -91,22 +91,20 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-jpdl-designer-site</artifactId>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-userguide</artifactId>
<version>${project.version}</version>
<type>jdocbook</type>
</dependency>
-
- <!-- jBPM Projects -->
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console</artifactId>
<type>war</type>
</dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-jpdl-designer-site</artifactId>
- <type>zip</type>
- </dependency>
<!-- Sources -->
<dependency>
@@ -204,15 +202,16 @@
</goals>
<configuration>
<tasks>
- <property name="project.version" value="${project.version}"/>
- <property name="project.build.dir" value="${project.build.directory}"/>
- <property name="project.build.assembly.resources" value="${project.build.assemblyDirectory}/resources"/>
- <property name="resources.dir" value="${resources.directory}"/>
- <property name="resources.output.dir" value="${resources.outputDirectory}"/>
- <property name="container" value="${container}"/>
- <property name="jboss.home" value="${jboss.home}"/>
- <property name="database" value="${database}"/>
- <ant antfile="scripts/antrun-installer.xml" target="process-resources"/>
+ <property name="project.version" value="${project.version}" />
+ <property name="project.build.dir" value="${project.build.directory}" />
+ <property name="project.build.assembly.resources"
+ value="${project.build.assemblyDirectory}/resources" />
+ <property name="resources.dir" value="${resources.directory}" />
+ <property name="resources.output.dir" value="${resources.outputDirectory}" />
+ <property name="container" value="${container}" />
+ <property name="jboss.home" value="${jboss.home}" />
+ <property name="database" value="${database}" />
+ <ant antfile="scripts/antrun-installer.xml" target="process-resources" />
</tasks>
</configuration>
</execution>
@@ -266,11 +265,12 @@
<configuration>
<tasks>
<!-- replace jsf-console.war with the SOA platform build -->
- <property name="project.build.assembly.lib" value="${project.build.assemblyDirectory}/lib"/>
+ <property name="project.build.assembly.lib"
+ value="${project.build.assemblyDirectory}/lib" />
<echo>**** Replacing jsf-console with SOA-P build ****</echo>
<copy file="${project.build.assembly.lib}/jsf-console-soa.war"
tofile="${project.build.assembly.lib}/jsf-console.war"
- overwrite="yes"/>
+ overwrite="yes" />
</tasks>
</configuration>
</execution>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
<!-- ====================================================================== -->
<!-- $Id$ -->
@@ -23,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -170,7 +168,7 @@
</property>
<property>
<name>java.security.manager</name>
- <value/>
+ <value />
</property>
<property>
<name>java.security.policy</name>
@@ -186,7 +184,7 @@
<profiles>
<!--
Name: no-jboss-bind-address
- Descr: Skip tests if no bind address is given
+ Desc: Skip tests if no bind address is given
-->
<profile>
<id>no-jboss-bind-address</id>
@@ -232,7 +230,7 @@
<!--
Name: no-database
- Description: Default database test exclusions
+ Desc: Default database test exclusions
-->
<profile>
<id>no-database</id>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,20 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, the OpenSource J2EE webOS -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- -->
- <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
- <!-- $Id$ -->
+<!-- $Id$ -->
<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 - Examples</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-examples</artifactId>
@@ -24,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -43,6 +40,7 @@
<version>${project.version}</version>
</dependency>
+ <!-- Provided Dependencies -->
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
@@ -53,7 +51,7 @@
<artifactId>hibernate</artifactId>
<scope>provided</scope>
</dependency>
-
+
<!-- Test Dependencies -->
<dependency>
<groupId>org.drools</groupId>
@@ -116,5 +114,4 @@
<url>http://repository.jboss.org/maven2</url>
</repository>
</repositories>
-
</project>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
<!-- ====================================================================== -->
<!-- $Id$ -->
+
<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>
@@ -18,15 +17,15 @@
<artifactId>jbpm-identity</artifactId>
<packaging>jar</packaging>
- <!-- Parent -->
+ <!-- Parent -->
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <!-- Dependencies -->
+ <!-- Dependencies -->
<dependencies>
<!-- jBPM Dependencies -->
<dependency>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
<!-- ====================================================================== -->
<!-- $Id$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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 - Simulation</name>
@@ -24,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/pom.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,20 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, the OpenSource J2EE webOS -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- -->
- <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
- <!-- $Id$ -->
+<!-- $Id$ -->
<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 - Userguide</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-userguide</artifactId>
@@ -24,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
- <version>3.2.8</version>
+ <version>3.2.9</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en/master.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en/master.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ jbpm3/branches/jbpm-3.2-soa/modules/userguide/src/main/docbook/en/master.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -21,7 +21,7 @@
<!ENTITY security SYSTEM "modules/security.xml">
<!ENTITY tdd SYSTEM "modules/tdd.xml">
<!ENTITY pluggable SYSTEM "modules/pluggable.xml">
-<!ENTITY version "3.2.8">
+<!ENTITY version "3.2.9">
]>
<book lang="en">
<bookinfo>
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,25 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
<!-- ====================================================================== -->
<!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
<artifactId>jbpm</artifactId>
<packaging>pom</packaging>
- <version>3.2.8</version>
+ <version>3.2.9</version>
<!-- Parent -->
<parent>
@@ -35,11 +32,6 @@
<module>modules/enterprise</module>
<module>modules/examples</module>
<module>modules/simulation</module>
-
- <!-- Execute as part of -Pdistro
- <module>modules/db</module>
- <module>modules/userguide</module>
- -->
</modules>
<!-- Properties -->
@@ -341,7 +333,6 @@
<!-- Profiles -->
<profiles>
-
<!--
Name: distro
Desc: Build the distribution
@@ -409,11 +400,11 @@
</dependencyManagement>
</profile>
- <!-- DATABASE PROFILES ***************************************************************************** -->
+ <!-- DATABASE PROFILES -->
<!--
Name: no-database
- Descr: Setup the default database
+ Desc: Setup the default database
-->
<profile>
<id>no-database</id>
@@ -436,7 +427,7 @@
<!--
Name: db2
- Descr: DB2 Database Setup
+ Desc: DB2 Database Setup
-->
<profile>
<id>db2</id>
@@ -468,7 +459,7 @@
<!--
Name: hsqldb
- Descr: Hypersonic Database Setup
+ Desc: Hypersonic Database Setup
-->
<profile>
<id>hsqldb</id>
@@ -489,7 +480,7 @@
<!--
Name: mssql
- Descr: MSSQL Database Setup
+ Desc: MSSQL Database Setup
-->
<profile>
<id>mssql</id>
@@ -516,7 +507,7 @@
<!--
Name: mysql
- Descr: MySQL Database Setup
+ Desc: MySQL Database Setup
-->
<profile>
<id>mysql</id>
@@ -537,7 +528,7 @@
<!--
Name: oracle
- Descr: Oracle Database Setup
+ Desc: Oracle Database Setup
-->
<profile>
<id>oracle</id>
@@ -564,7 +555,7 @@
<!--
Name: postgresql
- Descr: PostgreSQL Database Setup
+ Desc: PostgreSQL Database Setup
-->
<profile>
<id>postgresql</id>
@@ -585,7 +576,7 @@
<!--
Name: sybase
- Descr: Sybase Database Setup
+ Desc: Sybase Database Setup
-->
<profile>
<id>sybase</id>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
+ <!-- ====================================================================== -->
+ <!-- jBPM: Workflow in Java -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- ====================================================================== -->
-<!-- $Id$ -->
-<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">
+ <!-- $Id$ -->
+
+<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 - Console</name>
<groupId>org.jbpm.jbpm3</groupId>
@@ -21,14 +21,22 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.2.7</version>
+ <version>3.2.9</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!-- Dependencies -->
<dependencies>
- <!-- jBPM Dependencies -->
+ <!-- Compile Dependencies -->
<dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-jbpm4jsf</artifactId>
<version>${project.version}</version>
@@ -39,23 +47,14 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>soa-webapp</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
<!-- Provided Dependencies -->
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
<scope>provided</scope>
@@ -65,68 +64,32 @@
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
- <!-- Plugins -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- <finalName>jsf-console</finalName>
- </build>
-
<profiles>
<profile>
<id>soa</id>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>soa-webapp</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+
<build>
- <plugins>
+ <plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>war</goal>
- </goals>
- <configuration>
- <classifier>soa</classifier>
- </configuration>
- </execution>
- </executions>
<configuration>
- <overlays>
- <overlay>
- <id>soa-webapp-overlay</id>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>soa-webapp</artifactId>
- <includes>
- <include>JBossLogo.jpg</include>
- <include>login.jsp</include>
- <include>WEB-INF/web.xml</include>
- <include>WEB-INF/jboss-web.xml</include>
- </includes>
- </overlay>
- <overlay>
- <!-- empty groupId/artifactId detected as the current build -->
- </overlay>
- </overlays>
+ <classifier>soa</classifier>
+ <primaryArtifact>false</primaryArtifact>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
-
</profiles>
</project>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/pom.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
<!-- ====================================================================== -->
<!-- $Id: pom.xml 2644 2008-10-28 13:15:01Z heiko.braun(a)jboss.com $ -->
@@ -14,7 +12,6 @@
<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 - 4JSF</name>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-jbpm4jsf</artifactId>
@@ -24,20 +21,14 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.2.7</version>
+ <version>3.2.9</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!-- Dependencies -->
<dependencies>
- <!-- jBPM Dependencies -->
+ <!-- Compile Dependencies -->
<dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-identity</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.gravel</groupId>
<artifactId>gravel</artifactId>
</dependency>
@@ -45,32 +36,49 @@
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
</dependency>
+
+ <!-- Provided Dependencies -->
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-identity</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>runtime</scope>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- Runtime Dependencies -->
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<!-- Plugins -->
<build>
<plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
<executions>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/pom.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, the OpenSource J2EE webOS -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- -->
- <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ====================================================================== -->
- <!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ -->
-<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">
+<!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ -->
+
+<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>
<artifactId>jsf-console-parent</artifactId>
<packaging>pom</packaging>
- <version>3.2.7</version>
+ <version>3.2.9</version>
<!-- Parent -->
<parent>
@@ -27,7 +27,6 @@
<!-- Modules -->
<modules>
- <module>soa</module>
<module>console</module>
<module>jbpm4jsf</module>
</modules>
@@ -49,6 +48,7 @@
<!-- DependencyManagement -->
<dependencyManagement>
<dependencies>
+ <!-- jBPM Dependencies -->
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
@@ -59,6 +59,8 @@
<artifactId>jbpm-identity</artifactId>
<version>${jbpm.version}</version>
</dependency>
+
+ <!-- Thirdparty Dependencies -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
@@ -107,4 +109,27 @@
</dependencies>
</dependencyManagement>
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Profiles -->
+ <profiles>
+ <profile>
+ <id>soa</id>
+
+ <modules>
+ <module>soa</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml 2009-12-03 23:44:44 UTC (rev 5914)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/soa/pom.xml 2009-12-04 06:24:43 UTC (rev 5915)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
<!-- ====================================================================== -->
<!-- $Id: pom.xml 3298 2008-12-09 21:33:53Z thomas.diesler(a)jboss.com $ -->
-<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 - SOA Overlay</name>
<groupId>org.jbpm.jbpm3</groupId>
@@ -21,13 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.2.7</version>
+ <version>3.2.9</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
- <!-- Dependencies -->
- <dependencies>
-
- </dependencies>
-
</project>
16 years, 5 months
- 1
- 0