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/10/02 17:28:25 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/ac2/workflow WorkflowAuthorizer.java
andreas 2003/10/02 08:28:25
Modified: src/java/org/apache/lenya/cms/cocoon/transformation
WorkflowMenuTransformer.java
src/java/org/apache/lenya/cms/cocoon/acting
WorkflowInvokerAction.java
src/java/org/apache/lenya/cms/ac2/workflow
WorkflowAuthorizer.java
Log:
using workflow synchronization
Revision Changes Path
1.23 +6 -5 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- WorkflowMenuTransformer.java 8 Sep 2003 19:26:25 -0000 1.22
+++ WorkflowMenuTransformer.java 2 Oct 2003 15:28:25 -0000 1.23
@@ -70,6 +70,7 @@
import org.apache.lenya.workflow.Workflow;
import org.apache.lenya.workflow.WorkflowException;
import org.apache.lenya.workflow.WorkflowInstance;
+import org.apache.lenya.workflow.impl.SynchronizedWorkflowInstances;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -152,7 +153,7 @@
Situation situation = null;
try {
- setInstance(factory.buildInstance(document));
+ setInstance(factory.buildSynchronizedInstance(document));
situation = factory.buildSituation(objectModel);
} catch (Exception e) {
throw new ProcessingException(e);
@@ -175,14 +176,14 @@
}
private boolean hasWorkflow;
- private WorkflowInstance instance;
+ private SynchronizedWorkflowInstances instance;
/**
* Get the workflow instance.
*
* @return a <code>WorkflowInstance</code>
*/
- protected WorkflowInstance getInstance() {
+ protected SynchronizedWorkflowInstances getInstance() {
return instance;
}
@@ -225,7 +226,7 @@
* Sets the workflow instance for the current request.
* @param instance A workflow instance.
*/
- public void setInstance(WorkflowInstance instance) {
+ public void setInstance(SynchronizedWorkflowInstances instance) {
this.instance = instance;
}
}
1.2 +3 -2 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
Index: WorkflowInvokerAction.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkflowInvokerAction.java 19 Sep 2003 19:20:25 -0000 1.1
+++ WorkflowInvokerAction.java 2 Oct 2003 15:28:25 -0000 1.2
@@ -71,6 +71,7 @@
import org.apache.lenya.workflow.Event;
import org.apache.lenya.workflow.Situation;
import org.apache.lenya.workflow.WorkflowInstance;
+import org.apache.lenya.workflow.impl.SynchronizedWorkflowInstances;
/**
* Action to invoke a workflow transition independently from the request document URL.
@@ -128,7 +129,7 @@
getLogger().debug(" Invoking workflow event");
}
- WorkflowInstance instance = factory.buildInstance(document);
+ SynchronizedWorkflowInstances instance = factory.buildSynchronizedInstance(document);
Situation situation = factory.buildSituation(objectModel);
Event[] events = instance.getExecutableEvents(situation);
Event event = null;
1.19 +3 -2 cocoon-lenya/src/java/org/apache/lenya/cms/ac2/workflow/WorkflowAuthorizer.java
Index: WorkflowAuthorizer.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac2/workflow/WorkflowAuthorizer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- WorkflowAuthorizer.java 9 Sep 2003 11:33:10 -0000 1.18
+++ WorkflowAuthorizer.java 2 Oct 2003 15:28:25 -0000 1.19
@@ -72,6 +72,7 @@
import org.apache.lenya.workflow.Event;
import org.apache.lenya.workflow.Situation;
import org.apache.lenya.workflow.WorkflowInstance;
+import org.apache.lenya.workflow.impl.SynchronizedWorkflowInstances;
/**
* If the client requested invoking a workflow event, this authorizer checks if
@@ -120,7 +121,7 @@
WorkflowFactory factory = WorkflowFactory.newInstance();
if (factory.hasWorkflow(document)) {
- WorkflowInstance instance = factory.buildInstance(document);
+ SynchronizedWorkflowInstances instance = factory.buildSynchronizedInstance(document);
authorized = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org