Update of
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish
In directory
james.mmbase.org:/tmp/cvs-serv25296/publish-remote/src/java/com/finalist/cmsc/publish
Modified Files:
PagePublisher.java
Log Message:
CMSC-635 - big updates on subsite-module, also enhanced PagePublisher.java
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish
See also: http://www.mmbase.org/jira/browse/CMSC-635
Index: PagePublisher.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish/PagePublisher.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PagePublisher.java 7 Jan 2008 22:37:32 -0000 1.6
+++ PagePublisher.java 18 Feb 2008 10:55:44 -0000 1.7
@@ -36,6 +36,12 @@
@Override
public void publish(Node node) {
Map<Node, Date> nodes = new LinkedHashMap<Node, Date>();
+ addPageNodes(node, nodes);
+
+ publishNodes(nodes);
+ }
+
+ protected void addPageNodes(Node node, Map<Node, Date> nodes) {
Date publishDate = node.getDateValue(PagesUtil.PUBLISHDATE_FIELD);
Long date = new Long(System.currentTimeMillis());
@@ -73,11 +79,9 @@
nodes.putAll(pageNodes);
addReferredPageParameters(node, nodes, publishDate);
-
- publishNodes(nodes);
}
- private void publishContentChannel(Map<Node, Date> nodes, Node valueNode,
Long date) {
+ protected void publishContentChannel(Map<Node, Date> nodes, Node
valueNode, Long date) {
if (!isPublished(valueNode)) {
addChannels(nodes, valueNode);
@@ -106,14 +110,14 @@
removeNodes(removeNodes);
}
- private NodeList getContentElements(Node contentChannel, Long date) {
+ protected NodeList getContentElements(Node contentChannel, Long date) {
NodeQuery query =
RepositoryUtil.createLinkedContentQuery(contentChannel, null, null, null,
false, null, -1, -1, -1, -1, -1);
ContentElementUtil.addNotExpiredConstraint(contentChannel, query,
date);
NodeList contentNodes = query.getNodeManager().getList(query);
return contentNodes;
}
- private void addChannels(Map<Node, Date> nodes, Node contentChannel) {
+ protected void addChannels(Map<Node, Date> nodes, Node contentChannel) {
List<Node> path = RepositoryUtil.getPathToRoot(contentChannel);
for (Iterator<Node> iter = path.iterator(); iter.hasNext();) {
Node pathElement = iter.next();
@@ -123,7 +127,7 @@
}
}
- private void addContentBlock(Map<Node, Date> nodes, Node content) {
+ protected void addContentBlock(Map<Node, Date> nodes, Node content) {
Date contentPublishDate =
content.getDateValue(ContentElementUtil.PUBLISHDATE_FIELD);
List<Node> contentBlockNodes = findContentBlockNodes(content);
for (Node contentNode : contentBlockNodes) {
@@ -131,7 +135,7 @@
}
}
- private void addReferredPageParameters(Node node, Map<Node, Date> nodes,
Date publishDate) {
+ protected void addReferredPageParameters(Node node, Map<Node, Date> nodes,
Date publishDate) {
NodeManager parameterManager =
cloud.getNodeManager(PortletUtil.NODEPARAMETER);
NodeManager portletManager = cloud.getNodeManager(PortletUtil.PORTLET);
NodeManager pageManager = cloud.getNodeManager(PagesUtil.PAGE);
@@ -166,7 +170,7 @@
}
- private void findPageNodes(Node node, Map<Node, Date> nodes, Date
publishDate) {
+ protected void findPageNodes(Node node, Map<Node, Date> nodes, Date
publishDate) {
if (nodes.containsKey(node) ||
TypeUtil.isSystemType(node.getNodeManager().getName())) {
return;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
