[MMBASE CVS] contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow Workflow.java DummyWorkflowService.java WorkflowService.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow
In directory 
james.mmbase.org:/tmp/cvs-serv4324/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow

Modified Files:
        Workflow.java DummyWorkflowService.java WorkflowService.java 
Log Message:
CMSC-1016 Only publish contentelements with pages when they are accepted


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1016


Index: Workflow.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow/Workflow.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Workflow.java       26 Nov 2007 11:43:46 -0000      1.5
+++ Workflow.java       14 Jul 2008 11:59:32 -0000      1.6
@@ -135,4 +135,9 @@
    public static boolean isAllowedToPublish(Node node) {
       return cService.isAllowedToPublish(node);
    }
+
+
+   public static boolean isAccepted(Node node) {
+      return cService.isAccepted(node);
+   }
 }


Index: DummyWorkflowService.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow/DummyWorkflowService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- DummyWorkflowService.java   26 Nov 2007 11:43:46 -0000      1.6
+++ DummyWorkflowService.java   14 Jul 2008 11:59:32 -0000      1.7
@@ -12,10 +12,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Node;
 
 import com.finalist.cmsc.security.UserRole;
 
@@ -148,6 +148,12 @@
 
 
    @Override
+   public boolean isAccepted(Node node) {
+      return true;
+   }
+
+
+   @Override
    protected Log getLogger() {
       return LogFactory.getLog(DummyWorkflowService.class);
    }


Index: WorkflowService.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/workflow/WorkflowService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- WorkflowService.java        26 Nov 2007 11:43:46 -0000      1.4
+++ WorkflowService.java        14 Jul 2008 11:59:32 -0000      1.5
@@ -11,13 +11,13 @@
 
 import java.util.List;
 
+import org.apache.commons.logging.Log;
 import org.mmbase.bridge.Cloud;
 import org.mmbase.bridge.Node;
-import org.apache.commons.logging.Log;
 
 import com.finalist.cmsc.security.UserRole;
-import com.finalist.cmsc.services.Service;
 import com.finalist.cmsc.services.Properties;
+import com.finalist.cmsc.services.Service;
 
 public abstract class WorkflowService extends Service {
    protected boolean acceptedStepEnabled;
@@ -86,6 +86,9 @@
    public abstract boolean isAllowedToPublish(Node node);
 
 
+   public abstract boolean isAccepted(Node node);
+
+
    @Override
    protected void init(Properties properties) throws Exception {
 
@@ -109,7 +112,7 @@
       this.acceptedStepEnabled = acceptedStepEnabled;
    }
 
-
    protected abstract Log getLogger();
 
+
 }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs