REPO-1296 EOL spring-social (#12)

war/src/main/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository WAR Community
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository WAR Community
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.web.bean.workflow;
 
 import java.io.Serializable;
@@ -44,7 +44,6 @@ import javax.transaction.UserTransaction;
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.policy.BehaviourFilter;
-import org.alfresco.repo.publishing.PublishingEventHelper;
 import org.alfresco.repo.workflow.WorkflowModel;
 import org.alfresco.repo.workflow.activiti.ActivitiConstants;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
@@ -93,8 +92,7 @@ public class StartWorkflowWizard extends BaseWizardBean
    
    protected List<String> excludedWorkflows;
    protected List<String> invitationWorkflows;
-   protected List<String> publishingWorkflows;
-   
+
    transient private WorkflowService workflowService;
    transient private InvitationService invitationService;
    transient private BehaviourFilter policyBehaviourFilter;
@@ -601,7 +599,6 @@ public class StartWorkflowWizard extends BaseWizardBean
       this.workflows = new HashMap<String, WorkflowDefinition>(4);
       
       List<String> configuredInvitationWorkflows = this.getInvitationServiceWorkflowNames();
-      List<String> publishingWorkflows = this.getPublishingWorkflowNames();
       List<String> excludedWorkflows = this.getExcludedWorkflows();
       
       List<WorkflowDefinition> workflowDefs =  this.getWorkflowService().getDefinitions();
@@ -610,7 +607,6 @@ public class StartWorkflowWizard extends BaseWizardBean
          String name = workflowDef.name;
          
          if (configuredInvitationWorkflows.contains(name) == false &&
-        	 publishingWorkflows.contains(name) == false &&
         	 excludedWorkflows.contains(name) == false)
          {
             // add the workflow if it is not a WCM specific workflow
@@ -807,23 +803,6 @@ public class StartWorkflowWizard extends BaseWizardBean
       }
       return invitationWorkflows;
    }
-   
-   /**
-    * Get the names of the publishing workflows
-    * 
-    * @return The names of the publishing workflows
-    */
-   protected List<String> getPublishingWorkflowNames()   
-   {
-      if (publishingWorkflows == null)
-      {
-         publishingWorkflows = new ArrayList<String>(2);
-         
-         publishingWorkflows.add(ActivitiConstants.ENGINE_ID + "$" + PublishingEventHelper.WORKFLOW_DEFINITION_NAME);
-      }
-      
-      return publishingWorkflows;
-   }
 
    public void setInvitationService(InvitationService invitationService) 
    {

zip/src/main/resources/licenses/notice.txt

@@ -98,7 +98,6 @@ Solr    http://lucene.apache.org/solr/
 Solr4   http://lucene.apache.org/solr/
 Spring Framework    http://projects.spring.io/spring-framework/
 Spring Security http://projects.spring.io/spring-security/
-Spring Social   http://projects.spring.io/spring-social/
 SpringModules   http://springmodules.java.net/
 StAX    http://stax.codehaus.org/
 STAX2   http://woodstox.codehaus.org/