[MMBASE CVS] contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/services/publish PublishServiceMMBaseImpl.java

[avleeuwen]

Update of 
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/services/publish
In directory 
james.mmbase.org:/tmp/cvs-serv18718/publish-remote/src/java/com/finalist/cmsc/services/publish

Modified Files:
      Tag: b1_4
        PublishServiceMMBaseImpl.java 
Log Message:
CMSC-617: Subsite/PersonalPages publisher fixes


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/services/publish
See also: http://www.mmbase.org/jira/browse/CMSC-617


Index: PublishServiceMMBaseImpl.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/services/publish/PublishServiceMMBaseImpl.java,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -b -r1.10.2.3 -r1.10.2.4
--- PublishServiceMMBaseImpl.java       26 Feb 2008 17:04:06 -0000      1.10.2.3
+++ PublishServiceMMBaseImpl.java       28 Feb 2008 10:36:14 -0000      1.10.2.4
@@ -9,7 +9,9 @@
  */
 package com.finalist.cmsc.services.publish;
 
-import org.mmbase.bridge.*;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NodeList;
 import org.mmbase.remotepublishing.PublishListener;
 import org.mmbase.remotepublishing.PublishManager;
 import org.mmbase.remotepublishing.builders.PublishingQueueBuilder;
@@ -18,7 +20,11 @@
 import com.finalist.cmsc.mmbase.TypeUtil;
 import com.finalist.cmsc.navigation.NavigationItemManager;
 import com.finalist.cmsc.navigation.NavigationManager;
-import com.finalist.cmsc.publish.*;
+import com.finalist.cmsc.publish.ChannelPublisher;
+import com.finalist.cmsc.publish.ContentPublisher;
+import com.finalist.cmsc.publish.NodePublisher;
+import com.finalist.cmsc.publish.PagePublisher;
+import com.finalist.cmsc.publish.Publisher;
 import com.finalist.cmsc.repository.ContentElementUtil;
 import com.finalist.cmsc.services.search.Search;
 import com.finalist.cmsc.services.workflow.Workflow;
@@ -79,6 +85,10 @@
       if (publisher.isPublishable(node)) {
          return publisher;
       }
+      publisher = getOptionalPublisher(node.getCloud(), 
node.getNodeManager().getName());
+      if (publisher != null && publisher.isPublishable(node)) {
+         return publisher;
+      }
       publisher = getPagePublisher(node.getCloud());
       if (publisher.isPublishable(node)) {
          return publisher;
@@ -87,10 +97,6 @@
       if (publisher.isPublishable(node)) {
          return publisher;
       }
-      publisher = getOptionalPublisher(node.getCloud(), 
node.getNodeManager().getName());
-      if (publisher != null && publisher.isPublishable(node)) {
-         return publisher;
-      }
       publisher = getNodePublisher(node.getCloud());
       if (publisher.isPublishable(node)) {
         return publisher;
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs