You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/06/18 18:45:25 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/workflow Workflow.java
andreas 2003/06/18 09:45:25
Modified: src/java/org/apache/lenya/cms/cocoon/transformation
WorkflowMenuTransformer.java
src/java/org/apache/lenya/workflow/impl History.java
WorkflowBuilder.java
src/java/org/apache/lenya/workflow Workflow.java
Log:
moved NAMESPACE and DEFAULT_PREFIX from WorkflowBuilder to Workflow
Revision Changes Path
1.10 +2 -1 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java
Index: WorkflowMenuTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WorkflowMenuTransformer.java 6 Jun 2003 13:30:47 -0000 1.9
+++ WorkflowMenuTransformer.java 18 Jun 2003 16:45:24 -0000 1.10
@@ -58,6 +58,7 @@
import org.apache.lenya.cms.publication.PublicationFactory;
import org.apache.lenya.workflow.Event;
import org.apache.lenya.workflow.Situation;
+import org.apache.lenya.workflow.Workflow;
import org.apache.lenya.workflow.WorkflowInstance;
import org.apache.lenya.cms.workflow.WorkflowFactory;
import org.xml.sax.Attributes;
@@ -85,7 +86,7 @@
boolean passed = true;
if (hasWorkflow() && localName.equals(ITEM_ELEMENT)) {
- String event = attr.getValue(EVENT_ATTRIBUTE);
+ String event = attr.getValue(Workflow.NAMESPACE, EVENT_ATTRIBUTE);
// filter item if command not allowed
if (event != null) {
1.5 +7 -6 cocoon-lenya/src/java/org/apache/lenya/workflow/impl/History.java
Index: History.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/workflow/impl/History.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- History.java 11 Jun 2003 13:10:38 -0000 1.4
+++ History.java 18 Jun 2003 16:45:24 -0000 1.5
@@ -52,6 +52,7 @@
import org.apache.lenya.workflow.Event;
import org.apache.lenya.workflow.Situation;
import org.apache.lenya.workflow.State;
+import org.apache.lenya.workflow.Workflow;
import org.apache.lenya.workflow.WorkflowException;
import org.apache.lenya.workflow.WorkflowInstance;
import org.apache.lenya.workflow.WorkflowListener;
@@ -92,8 +93,8 @@
NamespaceHelper helper =
new NamespaceHelper(
- WorkflowBuilder.NAMESPACE,
- WorkflowBuilder.DEFAULT_PREFIX,
+ Workflow.NAMESPACE,
+ Workflow.DEFAULT_PREFIX,
HISTORY_ELEMENT);
Element historyElement = helper.getDocument().getDocumentElement();
@@ -141,8 +142,8 @@
Document document = DocumentHelper.readDocument(getHistoryFile());
helper =
new NamespaceHelper(
- WorkflowBuilder.NAMESPACE,
- WorkflowBuilder.DEFAULT_PREFIX,
+ Workflow.NAMESPACE,
+ Workflow.DEFAULT_PREFIX,
document);
} catch (Exception e) {
throw new WorkflowException(e);
@@ -204,8 +205,8 @@
NamespaceHelper helper =
new NamespaceHelper(
- WorkflowBuilder.NAMESPACE,
- WorkflowBuilder.DEFAULT_PREFIX,
+ Workflow.NAMESPACE,
+ Workflow.DEFAULT_PREFIX,
xmlDocument);
CMSSituation cmsSituation = (CMSSituation) situation;
1.5 +10 -12 cocoon-lenya/src/java/org/apache/lenya/workflow/impl/WorkflowBuilder.java
Index: WorkflowBuilder.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/workflow/impl/WorkflowBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WorkflowBuilder.java 6 Jun 2003 13:35:18 -0000 1.4
+++ WorkflowBuilder.java 18 Jun 2003 16:45:24 -0000 1.5
@@ -15,6 +15,7 @@
import org.apache.lenya.workflow.Action;
import org.apache.lenya.workflow.Condition;
import org.apache.lenya.workflow.Event;
+import org.apache.lenya.workflow.Workflow;
import org.apache.lenya.workflow.WorkflowException;
import org.apache.lenya.xml.DocumentHelper;
import org.apache.lenya.xml.NamespaceHelper;
@@ -32,9 +33,6 @@
protected WorkflowBuilder() {
}
- public static final String NAMESPACE = "http://apache.org/cocoon/lenya/workflow/1.0";
- public static final String DEFAULT_PREFIX = "wf";
-
public static WorkflowImpl buildWorkflow(File file) throws WorkflowException {
WorkflowImpl workflow;
@@ -56,7 +54,7 @@
WorkflowException {
NamespaceHelper helper =
- new NamespaceHelper(NAMESPACE, DEFAULT_PREFIX, document);
+ new NamespaceHelper(Workflow.NAMESPACE, Workflow.DEFAULT_PREFIX, document);
Element root = document.getDocumentElement();
StateImpl initialState = null;
@@ -67,7 +65,7 @@
// load states
NodeList stateElements =
- root.getElementsByTagNameNS(NAMESPACE, STATE_ELEMENT);
+ root.getElementsByTagNameNS(Workflow.NAMESPACE, STATE_ELEMENT);
for (int i = 0; i < stateElements.getLength(); i++) {
Element element = (Element) stateElements.item(i);
StateImpl state = buildState(element);
@@ -83,7 +81,7 @@
// load variables
NodeList variableElements =
- root.getElementsByTagNameNS(NAMESPACE, VARIABLE_ELEMENT);
+ root.getElementsByTagNameNS(Workflow.NAMESPACE, VARIABLE_ELEMENT);
for (int i = 0; i < variableElements.getLength(); i++) {
Element element = (Element) variableElements.item(i);
BooleanVariableImpl variable = buildVariable(element);
@@ -93,7 +91,7 @@
// load events
NodeList eventElements =
- root.getElementsByTagNameNS(NAMESPACE, EVENT_ELEMENT);
+ root.getElementsByTagNameNS(Workflow.NAMESPACE, EVENT_ELEMENT);
for (int i = 0; i < eventElements.getLength(); i++) {
EventImpl event = buildEvent((Element) eventElements.item(i));
String id = event.getName();
@@ -102,7 +100,7 @@
// load transitions
NodeList transitionElements =
- root.getElementsByTagNameNS(NAMESPACE, TRANSITION_ELEMENT);
+ root.getElementsByTagNameNS(Workflow.NAMESPACE, TRANSITION_ELEMENT);
for (int i = 0; i < transitionElements.getLength(); i++) {
TransitionImpl transition =
buildTransition(
@@ -172,7 +170,7 @@
// set event
Element eventElement =
(Element) element.getElementsByTagNameNS(
- NAMESPACE,
+ Workflow.NAMESPACE,
EVENT_ELEMENT).item(
0);
String id = eventElement.getAttribute(ID_ATTRIBUTE);
@@ -185,7 +183,7 @@
// load conditions
NodeList conditionElements =
- element.getElementsByTagNameNS(NAMESPACE, CONDITION_ELEMENT);
+ element.getElementsByTagNameNS(Workflow.NAMESPACE, CONDITION_ELEMENT);
for (int i = 0; i < conditionElements.getLength(); i++) {
Condition condition =
buildCondition((Element) conditionElements.item(i));
@@ -194,7 +192,7 @@
// load assignments
NodeList assignmentElements =
- element.getElementsByTagNameNS(NAMESPACE, ASSIGNMENT_ELEMENT);
+ element.getElementsByTagNameNS(Workflow.NAMESPACE, ASSIGNMENT_ELEMENT);
for (int i = 0; i < assignmentElements.getLength(); i++) {
BooleanVariableAssignmentImpl action = buildAssignment(variables, (Element) assignmentElements.item(i));
transition.addAction(action);
@@ -202,7 +200,7 @@
// load actions
NodeList actionElements =
- element.getElementsByTagNameNS(NAMESPACE, ACTION_ELEMENT);
+ element.getElementsByTagNameNS(Workflow.NAMESPACE, ACTION_ELEMENT);
for (int i = 0; i < actionElements.getLength(); i++) {
Action action = buildAction((Element) actionElements.item(i));
transition.addAction(action);
1.2 +3 -0 cocoon-lenya/src/java/org/apache/lenya/workflow/Workflow.java
Index: Workflow.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/workflow/Workflow.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Workflow.java 30 May 2003 19:32:43 -0000 1.1
+++ Workflow.java 18 Jun 2003 16:45:25 -0000 1.2
@@ -12,6 +12,9 @@
*/
public interface Workflow {
+ String NAMESPACE = "http://apache.org/cocoon/lenya/workflow/1.0";
+ String DEFAULT_PREFIX = "wf";
+
/**
* Returns the initial state of this workflow.
* @return The initial state
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org