Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow
In directory
james.mmbase.org:/tmp/cvs-serv15291/workflow/src/java/com/finalist/cmsc/workflow
Modified Files:
LinkWorkflow.java PageWorkflow.java WorkflowManager.java
ContentWorkflow.java
Log Message:
CMSC-1029 Move some sources from net.sf.mmapps.mmcommons to cmsc cvs
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1029
Index: LinkWorkflow.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/LinkWorkflow.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- LinkWorkflow.java 7 Jul 2008 20:52:35 -0000 1.10
+++ LinkWorkflow.java 25 Jul 2008 15:54:54 -0000 1.11
@@ -9,20 +9,21 @@
*/
package com.finalist.cmsc.workflow;
-import java.util.*;
-
-import net.sf.mmapps.commons.bridge.RelationUtil;
+import java.util.Iterator;
+import java.util.List;
import org.mmbase.bridge.*;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
+import com.finalist.cmsc.mmbase.RelationUtil;
import com.finalist.cmsc.repository.ContentElementUtil;
import com.finalist.cmsc.repository.RepositoryUtil;
-import com.finalist.cmsc.security.*;
+import com.finalist.cmsc.security.Role;
+import com.finalist.cmsc.security.UserRole;
import com.finalist.cmsc.services.publish.Publish;
-import com.finalist.cmsc.services.workflow.WorkflowException;
import com.finalist.cmsc.services.workflow.Workflow;
+import com.finalist.cmsc.services.workflow.WorkflowException;
public class LinkWorkflow extends RepositoryWorkflow {
@@ -57,6 +58,7 @@
}
+ @Override
public void finishWriting(Node content, String remark) {
throw new UnsupportedOperationException("Linked workflows are always
finished after linking");
}
@@ -66,6 +68,7 @@
* Status change to 'APPROVED'. The workflow appears on all chiefeditor
* workflow screens
*/
+ @Override
public void accept(Node node, String remark) {
Node wfItem;
Node channel;
@@ -88,6 +91,7 @@
}
+ @Override
public void reject(Node node, String remark) {
Node wfItem;
if (RepositoryUtil.isContentChannel(node)) {
@@ -108,11 +112,13 @@
/**
* Put content elements in publishqueue
*/
+ @Override
public void publish(Node node) throws WorkflowException {
publish(node, null);
}
+ @Override
public void publish(Node node, List<Integer> publishNumbers) throws
WorkflowException {
Node channel;
if (RepositoryUtil.isContentChannel(node)) {
@@ -125,6 +131,7 @@
}
+ @Override
protected void publishInternal(Node wf, Node node) {
NodeList nodes = getAllWorkflowNodes(wf);
if (nodes.size() == 1) {
@@ -144,6 +151,7 @@
}
+ @Override
public void complete(Node contentNode) {
complete(contentNode, TYPE_LINK);
}
Index: PageWorkflow.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/PageWorkflow.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- PageWorkflow.java 16 May 2008 11:45:45 -0000 1.8
+++ PageWorkflow.java 25 Jul 2008 15:54:54 -0000 1.9
@@ -12,8 +12,6 @@
import java.util.Iterator;
import java.util.List;
-import net.sf.mmapps.commons.bridge.RelationUtil;
-
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.RelationStep;
@@ -21,8 +19,10 @@
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
+import com.finalist.cmsc.mmbase.RelationUtil;
import com.finalist.cmsc.navigation.*;
-import com.finalist.cmsc.security.*;
+import com.finalist.cmsc.security.Role;
+import com.finalist.cmsc.security.UserRole;
import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.services.workflow.Workflow;
import com.finalist.cmsc.services.workflow.WorkflowException;
@@ -49,6 +49,7 @@
}
+ @Override
public Node createFor(Node page, String remark) {
synchronized (page) {
if (hasWorkflow(page)) {
@@ -136,6 +137,7 @@
}
+ @Override
public void complete(Node contentNode) {
complete(contentNode, TYPE_PAGE);
}
Index: WorkflowManager.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/WorkflowManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- WorkflowManager.java 7 Jul 2008 20:52:35 -0000 1.13
+++ WorkflowManager.java 25 Jul 2008 15:54:54 -0000 1.14
@@ -1,18 +1,14 @@
package com.finalist.cmsc.workflow;
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-
import java.util.*;
-import net.sf.mmapps.commons.bridge.RelationUtil;
import org.apache.commons.lang.StringUtils;
-
import org.mmbase.bridge.*;
import org.mmbase.storage.search.*;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
+import com.finalist.cmsc.mmbase.RelationUtil;
import com.finalist.cmsc.security.*;
import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.services.workflow.Workflow;
Index: ContentWorkflow.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/ContentWorkflow.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ContentWorkflow.java 16 May 2008 11:45:45 -0000 1.7
+++ ContentWorkflow.java 25 Jul 2008 15:54:54 -0000 1.8
@@ -11,16 +11,15 @@
import java.util.List;
-import net.sf.mmapps.commons.bridge.RelationUtil;
-
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
+import com.finalist.cmsc.mmbase.RelationUtil;
import com.finalist.cmsc.repository.ContentElementUtil;
import com.finalist.cmsc.repository.RepositoryUtil;
-import com.finalist.cmsc.security.*;
+import com.finalist.cmsc.security.UserRole;
import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.services.workflow.WorkflowException;
@@ -37,6 +36,7 @@
}
+ @Override
public Node createFor(Node content, String remark) {
synchronized (content) {
if (hasWorkflow(content)) {
@@ -52,6 +52,7 @@
}
+ @Override
public void finishWriting(Node node, String remark) {
Node wfItem;
Node content;
@@ -72,6 +73,7 @@
* Status change to 'APPROVED'. The workflow appears on all chiefeditor
* workflow screens
*/
+ @Override
public void accept(Node node, String remark) {
Node wfItem;
Node content;
@@ -92,6 +94,7 @@
* Status change to 'DRAFT'. The workflow appears on the writer workflow
* screens
*/
+ @Override
public void reject(Node node, String remark) {
if (ContentElementUtil.isContentElement(node)) {
if (hasWorkflow(node, TYPE_CONTENT)) {
@@ -118,11 +121,13 @@
*
* @param content
*/
+ @Override
public void publish(Node node) throws WorkflowException {
publish(node, null);
}
+ @Override
public void publish(Node node, List<Integer> publishNumbers) throws
WorkflowException {
Node content;
if (ContentElementUtil.isContentElement(node)) {
@@ -135,6 +140,7 @@
}
+ @Override
public void complete(Node contentNode) {
complete(contentNode, TYPE_CONTENT);
}
@@ -145,6 +151,7 @@
}
+ @Override
public boolean isWorkflowElement(Node node, boolean isWorkflowItem) {
if (isWorkflowItem) {
return TYPE_CONTENT.equals(node.getStringValue(TYPE_FIELD));
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
