[Yanel-commits] rev 45749 -
public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/workflow
michi at wyona.com
michi at wyona.com
Mon Nov 30 14:06:17 CET 2009
Author: michi
Date: 2009-11-30 14:06:17 +0100 (Mon, 30 Nov 2009)
New Revision: 45749
Modified:
public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/workflow/RevisionEqualsCondition.java
public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/workflow/RevisionNotEqualsCondition.java
public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/workflow/RoleCondition.java
Log:
getMessage added
Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/workflow/RevisionEqualsCondition.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/workflow/RevisionEqualsCondition.java 2009-11-30 13:05:53 UTC (rev 45748)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/workflow/RevisionEqualsCondition.java 2009-11-30 13:06:17 UTC (rev 45749)
@@ -20,9 +20,14 @@
import org.wyona.yanel.core.workflow.Workflow;
import org.wyona.yanel.core.workflow.WorkflowException;
+import org.apache.log4j.Logger;
+
public class RevisionEqualsCondition implements Condition {
+ private static Logger log = Logger.getLogger(RevisionEqualsCondition.class);
+
protected String variable;
+ private String message;
public void setExpression(String expression) {
this.variable = expression;
@@ -31,8 +36,18 @@
public boolean isComplied(WorkflowableV1 workflowable, Workflow workflow, String revision)
throws WorkflowException {
String liveRevision = workflowable.getWorkflowVariable(variable);
- boolean result = revision.equals(liveRevision);
- return result;
+ boolean complied = revision.equals(liveRevision);
+ if (!complied) {
+ message = "The revision '" + revision + "' is not the live revision.";
+ log.warn(message);
+ }
+ return complied;
}
-}
\ No newline at end of file
+ /**
+ * @see org.wyona.yanel.core.workflow.Condition#getMessage()
+ */
+ public String getMessage() {
+ return message;
+ }
+}
Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/workflow/RevisionNotEqualsCondition.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/workflow/RevisionNotEqualsCondition.java 2009-11-30 13:05:53 UTC (rev 45748)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/workflow/RevisionNotEqualsCondition.java 2009-11-30 13:06:17 UTC (rev 45749)
@@ -26,6 +26,8 @@
private static Logger log = Logger.getLogger(RevisionNotEqualsCondition.class);
+ private String message;
+
protected String variable;
public void setExpression(String expression) {
@@ -38,7 +40,17 @@
public boolean isComplied(WorkflowableV1 workflowable, Workflow workflow, String revision) throws WorkflowException {
String liveRevision = workflowable.getWorkflowVariable(variable);
boolean complied = !revision.equals(liveRevision);
- if (!complied) log.warn("The revision '" + revision + "' is the live revision.");
+ if (!complied) {
+ message = "The revision '" + revision + "' is the live revision.";
+ log.warn(message);
+ }
return complied;
}
+
+ /**
+ * @see org.wyona.yanel.core.workflow.Condition#getMessage()
+ */
+ public String getMessage() {
+ return message;
+ }
}
Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/workflow/RoleCondition.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/workflow/RoleCondition.java 2009-11-30 13:05:53 UTC (rev 45748)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/workflow/RoleCondition.java 2009-11-30 13:06:17 UTC (rev 45749)
@@ -15,7 +15,7 @@
*/
package org.wyona.yanel.impl.workflow;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.wyona.security.core.api.Identity;
import org.wyona.security.core.api.Role;
import org.wyona.security.core.api.Usecase;
@@ -26,11 +26,12 @@
import org.wyona.yanel.core.workflow.WorkflowException;
/**
- * @deprecated Use UsecaseCondition instead
+ * @deprecated Use UsecaseCondition instead (whereas UsecaseCondition does not exist yet!)
*/
public class RoleCondition implements Condition {
- private static Category log = Category.getInstance(RoleCondition.class);
+ private static Logger log = Logger.getLogger(RoleCondition.class);
+ private String message;
protected Role role;
@@ -60,7 +61,10 @@
log.debug(" result : " + authorized);
}
- if (!authorized) log.warn("User '" + identity.getUsername() + "' is not allowed to execute usecase (workflow transition) '" + role.getName() + "'");
+ if (!authorized) {
+ message = "User '" + identity.getUsername() + "' is not allowed to execute usecase (workflow transition) '" + role.getName() + "'";
+ log.warn(message);
+ }
return authorized;
} catch (Exception e) {
@@ -69,4 +73,10 @@
}
}
+ /**
+ * @see org.wyona.yanel.core.workflow.Condition#getMessage()
+ */
+ public String getMessage() {
+ return message;
+ }
}
More information about the Yanel-commits
mailing list