From 4c350ca0a00421d37b7ff4a3c7b5974cc19bcb31 Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Mon, 14 Nov 2011 16:41:46 +0000
Subject: [PATCH] FIXED : ALF-11400: Publishing - Incorrect behaviour of
 publishing permissions Changed to a new publishedNode association

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/model/publishingModel.xml             | 11 +++++++++++
 .../org/alfresco/repo/publishing/ChannelImpl.java     |  3 +--
 .../org/alfresco/repo/publishing/PublishingModel.java |  3 ++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/config/alfresco/model/publishingModel.xml b/config/alfresco/model/publishingModel.xml
index e934aa1d8b..73eeb0bc1e 100644
--- a/config/alfresco/model/publishingModel.xml
+++ b/config/alfresco/model/publishingModel.xml
@@ -45,6 +45,17 @@
                         <many>true</many>
                     </target>
                 </child-association>
+                <child-association name="pub:publishedNodes">
+                    <source>
+                        <mandatory>false</mandatory>
+                        <many>false</many>
+                    </source>
+                    <target>
+                        <class>cm:cmobject</class>
+                        <mandatory>false</mandatory>
+                        <many>true</many>
+                    </target>
+                </child-association>                
             </associations>
         </type>
 
diff --git a/source/java/org/alfresco/repo/publishing/ChannelImpl.java b/source/java/org/alfresco/repo/publishing/ChannelImpl.java
index 6ab25a7274..4eb7310059 100644
--- a/source/java/org/alfresco/repo/publishing/ChannelImpl.java
+++ b/source/java/org/alfresco/repo/publishing/ChannelImpl.java
@@ -19,7 +19,6 @@
 
 package org.alfresco.repo.publishing;
 
-import static org.alfresco.model.ContentModel.ASSOC_CONTAINS;
 import static org.alfresco.repo.publishing.PublishingModel.ASPECT_PUBLISHED;
 import static org.alfresco.repo.publishing.PublishingModel.ASSOC_LAST_PUBLISHING_EVENT;
 import static org.alfresco.repo.publishing.PublishingModel.NAMESPACE;
@@ -272,7 +271,7 @@ public class ChannelImpl implements Channel
             name = GUID.generate();
         }
         QName assocName = QName.createQName(NAMESPACE, name);
-        ChildAssociationRef publishedAssoc = nodeService.createNode(root, ASSOC_CONTAINS, assocName, type, actualProps);
+        ChildAssociationRef publishedAssoc = nodeService.createNode(root, PublishingModel.ASSOC_PUBLISHED_NODES, assocName, type, actualProps);
         NodeRef publishedNode = publishedAssoc.getChildRef();
        return publishedNode;
     }
diff --git a/source/java/org/alfresco/repo/publishing/PublishingModel.java b/source/java/org/alfresco/repo/publishing/PublishingModel.java
index 482c7685e1..54b150d22c 100644
--- a/source/java/org/alfresco/repo/publishing/PublishingModel.java
+++ b/source/java/org/alfresco/repo/publishing/PublishingModel.java
@@ -90,7 +90,8 @@ public interface PublishingModel
     public static final QName ASSOC_PUBLISHING_EVENT = QName.createQName(NAMESPACE, "publishingEventAssoc");
     public static final QName ASSOC_SOURCE = QName.createQName(NAMESPACE, "source");
     public static final QName ASSOC_LAST_PUBLISHING_EVENT= QName.createQName(NAMESPACE, "lastPublishingEvent");
-
+    public static final QName ASSOC_PUBLISHED_NODES = QName.createQName(NAMESPACE, "publishedNodes");
+    
     // Workflow Properties
     public static final QName PROP_WF_PUBLISHING_EVENT= QName.createQName(WF_NAMESPACE, "publishingEvent");
     public static final QName PROP_WF_SCHEDULED_PUBLISH_DATE= QName.createQName(WF_NAMESPACE, "scheduledPublishDate");