Merged DEV/SWIFT to HEAD

27908: ALF-8706: RSOLR 023: Locale is persisted for all nodes
          - Part of ALF-7991: RSOLR 023: Locale support for query: Repository
          - Added alf_node.locale_id mandatory column
          - sys:localizable is now spoofed and mandatory on sys:base
          - sys:locale property is always available
          - The locale set is the I18NUtil.getLocale() (thread then server)
          - TODO: Upgrade scripts, so drop database to take this change
   27909: ALF-8706: RSOLR 023: Locale is persisted for all nodes
          - Part of ALF-7991: RSOLR 023: Locale support for query: Repository
          - Extended locale test to ensure that sys:locale can be set using properties during create
   27910: ALF-8707: RSOLR 023: Upgrade to give nodes their default locales
          - Part of ALF-7991:RSOLR 023: Locale support for query: Repository
          - Upgrade scripts for PostgreSQL and MySQL: patch.db-V4.0-Node-Locale
   27912: WCM QS ML Support for creating missing intermediate directories when adding an "orphan" translation, plus tests
   27913: Fixed failing JbpmEngineUnitTest.
   27914: Build fix. Fixes failing test DiscussionServiceTest.testDeleteTopLevelPost
   27916: WCM QS ML forms config for overrideable name, and passing the initially orphaned flag through to the behaviour
   27917: Enable the WCM QS ML Manage Translations action in the folder details page, as well as the document details page as before
   27919: Quick build fix. Introduction of new property sys:locale on all nodes means that FormService is seeing some off-by-one errors.
   27921: WCM QS ML - Support copying parts of the section collections to the new folder when translating a section, plus tests
   27925: ALF-8707: RSOLR 023: Upgrade to give nodes their default locales
          - Part of ALF-7991: RSOLR 023: Locale support for query: Repository
          - Upgrade scripts for DB2, Oracle and SQLServer
   27927: Update FileFolderService list/paging (RINF 09) & CQ permission checking (RINF 11)
          - also added additional unit tests and update FileFolderPerformanceTester utility (for read / list testing)
   27930: Corrected bean reference: "ServiceRegistry"
   27931: Partially implemented EnvironmentImpl.getPublishingEvents(). This currently only supports searching on publishing event ids.
   27933: Implemented PublishService.getPublishingEvent(String) method.
   27934: WCM QS ML Pull over the locale resolver from Ian, and delegate much of the work to the main class
   27941: ALF-7874 - Mime Type entries for detection and display for some Apple and Adobe formats
   27947: ALF-2707 - Largely fix custom site properties that have multiple values, and custom site properties without a full definition, plus tests.
   27964: ALF-7339:RSOLR 009: Index track and build from SOLR
          - complete
          ALF-7475: RSOLR 010: Index integrity check
          - check ACL info
   27966: RINF 09: FileFolderService list - if skipCount > number of items then return empty list
          - related to ALF-7884 when using CMIS getChildren (via OpenCMIS - eg. http://localhost:8080/alfresco/cmisatom/...)
   27968: ALF-7884 - getChildren() returns an error if skipCount > number of children
   27970: WCM QS Fix issue in the webapp for sites where no port has been given yet
   27972: WPUB: F150: Foundation API: Request that a node be removed from the live environment
          - Initial support for "unpublish"
   27975: ALF-8790:RSOLR 033: Automated build produces SOLR artifacts
          - add configuration per core based on properties files
   27976: ALF-8790: RSOLR 033: Automated build produces SOLR artifacts
          - restructure, added properties files for config, track archived store
   27977: ALF-8790: RSOLR 033: Automated build produces SOLR artifacts
          - Solr zip included in continuous build
   27978: Fixed missing policy event when sys:locale is changed.
   27979: Fixed tests and checks after sys:locale became a mandatory property.
   27982: ALF-8547: WPUB: F163: Foundation API: Create/update/remove a delivery channel
          - Code and tests for channel update and delete
   28007: Implemented starting publishing workflow on schedulePublishingEvent method. Added tests for PublishingEventHelper.
   28008: Updated web-publishing-context.xml to include WorkflowService and workflowEngineId for PublishingEventHelper.
   28009: Added more PublishingEventHelper tests.
   28012: Support for ALF-8792: RSOLR 036: SOLR APIs to support index integrity checking
   28013: Fix failing Web Publishing tests.
   28015: Adding a DoNotCopy CopyBehaviourCallback for the fm:commentsRollup aspect. Part of ALF-8498.
   28016: Bring over the WCM QS ML RootNavInterceptor from Ian, and productise it
   28019: CMIS browser: close invalid connections
   28025: Update the WCM QS ML behaviour, webscript and test to handle more things having locales by default
   28026: ML-WQS:
          - Wired up the RootNavInterceptor to detect locale based on path
          - Wired up the replacement locale resolver to respect the locale determined by the RootNavInterceptor
          - Adjusted "Manage Translations" page to render the data table correctly
          - Adjusted site search box to restrict search to selected site localisation
          - Adjusted top nav component to select menu items only from appropriate site localisation
   28029: Added more tests for PublishingEventHelper and PublishingQueueImpl. Also added WebPublishingTestSuite.
   28034: Support for ALF-8792: RSOLR 036: SOLR APIs to support index integrity checking
          - ACL and ACLTX support
   28036: WCM QS ML UI tweaks for marking something as the initial translation
   28038: ALF-8548: WPUB: F165: Foundation API: Cancel a scheduled publishing event
           - Code and initial test cases
   28043: Added missing JCR mapping for property type d:locale
           - This property type is not new, btw.
   28312: RepoBM: minor cleanup
          - remove hardcoded JMeter install dir
          - add configurable user.dir (for default import of test data) - check that default zip exists
          - update readme
          - default threadfolder should be null (in case of absolute folder paths)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/publishing/ChannelServiceImpl.java

@@ -27,6 +27,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
 import org.alfresco.model.ContentModel;
@@ -48,8 +49,9 @@ import org.alfresco.util.ParameterCheck;
 
 /**
  * @author Nick Smith
+ * @author Brian
  * @since 4.0
- *
+ * 
  */
 public class ChannelServiceImpl implements ChannelService
 {
@@ -62,15 +64,17 @@ public class ChannelServiceImpl implements ChannelService
     private EnvironmentHelper environmentHelper;
 
     /**
-     * @param siteService the siteService to set
+     * @param siteService
+     *            the siteService to set
      */
     public void setSiteService(SiteService siteService)
     {
         this.siteService = siteService;
     }
-    
+
     /**
-     * @param nodeService the nodeService to set
+     * @param nodeService
+     *            the nodeService to set
      */
     public void setNodeService(NodeService nodeService)
     {
@@ -78,7 +82,8 @@ public class ChannelServiceImpl implements ChannelService
     }
 
     /**
-     * @param dictionaryService the dictionaryService to set
+     * @param dictionaryService
+     *            the dictionaryService to set
      */
     public void setDictionaryService(DictionaryService dictionaryService)
     {
@@ -86,38 +91,39 @@ public class ChannelServiceImpl implements ChannelService
     }
 
     /**
-     * @param environmentHelper the environmentHelper to set
+     * @param environmentHelper
+     *            the environmentHelper to set
      */
     public void setEnvironmentHelper(EnvironmentHelper environmentHelper)
     {
         this.environmentHelper = environmentHelper;
     }
-    
+
     /**
-    * {@inheritDoc}
-    */
+     * {@inheritDoc}
+     */
     public void register(ChannelType channelType)
     {
         ParameterCheck.mandatory("channelType", channelType);
         String id = channelType.getId();
-        if(channelTypes.containsKey(id))
+        if (channelTypes.containsKey(id))
         {
-            throw new IllegalArgumentException("Channel type "+id+" is already registered!");
+            throw new IllegalArgumentException("Channel type " + id + " is already registered!");
         }
         channelTypes.put(id, channelType);
     }
 
     /**
-    * {@inheritDoc}
-    */
+     * {@inheritDoc}
+     */
     public List<ChannelType> getChannelTypes()
     {
         return new ArrayList<ChannelType>(channelTypes.values());
     }
 
     /**
-    * {@inheritDoc}
-    */
+     * {@inheritDoc}
+     */
     public Channel createChannel(String siteId, String channelTypeId, String name, Map<QName, Serializable> properties)
     {
         NodeRef channelContainer = getChannelContainer(siteId);
@@ -143,7 +149,8 @@ public class ChannelServiceImpl implements ChannelService
 
             // Now create the corresponding channel nodes in each of the
             // configured environments
-            //FIXME: BJR: 20110506: Should we provide a means for supplying separate properties for each environment?
+            // FIXME: BJR: 20110506: Should we provide a means for supplying
+            // separate properties for each environment?
             Map<String, NodeRef> environments = environmentHelper.getEnvironments(siteId);
             for (NodeRef environment : environments.values())
             {
@@ -155,17 +162,27 @@ public class ChannelServiceImpl implements ChannelService
     }
 
     /**
-    * {@inheritDoc}
-    */
+     * {@inheritDoc}
+     */
     public void deleteChannel(String siteId, String channelName)
     {
-        // TODO Auto-generated method stub
-        
+        Map<String, NodeRef> environments = environmentHelper.getEnvironments(siteId);
+        Set<NodeRef> containers = new HashSet<NodeRef>();
+        containers.add(getChannelContainer(siteId));
+        containers.addAll(environments.values());
+        for (NodeRef channelContainer : containers)
+        {
+            NodeRef channel = nodeService.getChildByName(channelContainer, ContentModel.ASSOC_CONTAINS, channelName);
+            if (channel != null)
+            {
+                nodeService.deleteNode(channel);
+            }
+        }
     }
 
     /**
-    * {@inheritDoc}
-    */
+     * {@inheritDoc}
+     */
     public List<Channel> getChannels(String siteId)
     {
         ParameterCheck.mandatory("siteId", siteId);
@@ -215,25 +232,75 @@ public class ChannelServiceImpl implements ChannelService
         Serializable channelTypeId = props.get(PublishingModel.PROP_CHANNEL_TYPE_ID);
         ChannelType channelType = channelTypes.get(channelTypeId);
         String name = (String) props.get(ContentModel.PROP_NAME);
-        return new ChannelImpl(channelType, nodeRef, name, this);
+        return new ChannelImpl(channelType, nodeRef, name, this, nodeService);
     }
 
     /**
-    * {@inheritDoc}
-    */
+     * {@inheritDoc}
+     */
     public ChannelType getChannelType(String id)
     {
         return channelTypes.get(id);
     }
-    
+
     public NodeFinder getChannelDependancyNodeFinder()
     {
         return new ChannelDependancyNodeFinder(this);
     }
-    
+
     public NodeFilter getChannelDependancyNodeFilter()
     {
         return new ChannelDependancyNodeFilter(this);
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.alfresco.service.cmr.publishing.channels.ChannelService#renameChannel
+     * (java.lang.String, java.lang.String, java.lang.String)
+     */
+    @Override
+    public void renameChannel(String siteId, String oldName, String newName)
+    {
+        Map<String, NodeRef> environments = environmentHelper.getEnvironments(siteId);
+        Set<NodeRef> containers = new HashSet<NodeRef>();
+        containers.add(getChannelContainer(siteId));
+        containers.addAll(environments.values());
+        for (NodeRef channelContainer : containers)
+        {
+            NodeRef channel = nodeService.getChildByName(channelContainer, ContentModel.ASSOC_CONTAINS, oldName);
+            if (channel != null)
+            {
+                nodeService.setProperty(channel, ContentModel.PROP_NAME, newName);
+                nodeService.moveNode(channel, channelContainer, ContentModel.ASSOC_CONTAINS, QName.createQName(
+                        NamespaceService.APP_MODEL_1_0_URI, newName));
+            }
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.alfresco.service.cmr.publishing.channels.ChannelService#updateChannel
+     * (java.lang.String, java.lang.String, java.util.Map)
+     */
+    @Override
+    public void updateChannel(String siteId, String channelName, Map<QName, Serializable> properties)
+    {
+        Map<String, NodeRef> environments = environmentHelper.getEnvironments(siteId);
+        Set<NodeRef> containers = new HashSet<NodeRef>();
+        containers.add(getChannelContainer(siteId));
+        containers.addAll(environments.values());
+        for (NodeRef channelContainer : containers)
+        {
+            NodeRef channel = nodeService.getChildByName(channelContainer, ContentModel.ASSOC_CONTAINS, channelName);
+            if (channel != null)
+            {
+                nodeService.setProperties(channel, properties);
+            }
+        }
+    }
+
 }