svn commit: r407503 - in /lenya/trunk/src: impl/java/org/apache/lenya/workflow/ impl/java/org/apache/lenya/workflow/impl/ java/org/apache/lenya/cms/workflow/ java/org/apache/lenya/workflow/impl/

[an...@apache.org]

Author: andreas
Date: Thu May 18 01:39:43 2006
New Revision: 407503

URL: http://svn.apache.org/viewvc?rev=407503&view=rev
Log:
Moved workflow implementation from API to impl

Added:
    lenya/trunk/src/impl/java/org/apache/lenya/workflow/
    lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/
      - copied from r407247, lenya/trunk/src/java/org/apache/lenya/workflow/impl/
Removed:
    lenya/trunk/src/java/org/apache/lenya/cms/workflow/LenyaVersion.java
    lenya/trunk/src/java/org/apache/lenya/workflow/impl/
Modified:
    lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java
    lenya/trunk/src/java/org/apache/lenya/cms/workflow/RoleCondition.java

Modified: lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java?rev=407503&r1=407502&r2=407503&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java Thu May 18 01:39:43 2006
@@ -213,6 +213,9 @@
                 variables.put(nameValue[0], nameValue[1]);
             }
         }
+        
+        
+        
         Version version = new LenyaVersion(event, state);
         for (Iterator i = variables.keySet().iterator(); i.hasNext();) {
             String name = (String) i.next();

Modified: lenya/trunk/src/java/org/apache/lenya/cms/workflow/RoleCondition.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/workflow/RoleCondition.java?rev=407503&r1=407502&r2=407503&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/workflow/RoleCondition.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/workflow/RoleCondition.java Thu May 18 01:39:43 2006
@@ -29,15 +29,15 @@
 import org.apache.lenya.ac.Policy;
 import org.apache.lenya.ac.PolicyManager;
 import org.apache.lenya.ac.Role;
+import org.apache.lenya.workflow.Condition;
 import org.apache.lenya.workflow.Workflow;
 import org.apache.lenya.workflow.WorkflowException;
 import org.apache.lenya.workflow.Workflowable;
-import org.apache.lenya.workflow.impl.AbstractCondition;
 
 /**
  * Role condition
  */
-public class RoleCondition extends AbstractCondition {
+public class RoleCondition implements Condition {
 
     private Set roleIds = new HashSet();
 
@@ -47,7 +47,7 @@
      * @see org.apache.lenya.workflow.Condition#setExpression(java.lang.String)
      */
     public void setExpression(String expression) throws WorkflowException {
-        super.setExpression(expression);
+        this.expression = expression;
 
         String[] roles = expression.split(SEPARATOR);
         for (int i = 0; i < roles.length; i++) {
@@ -103,6 +103,23 @@
             }
         }
 
+    }
+
+    private String expression;
+
+    /**
+     * Returns the expression of this condition.
+     * @return A string.
+     */
+    public String getExpression() {
+        return this.expression;
+    }
+
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString() {
+        return getExpression();
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org