inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78438: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77695: ACE-2149 - EOL AVM / WCM. Ripped WCM out of Explorer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:18:05 +00:00
parent 1ea3931e33
commit 124f05593e
221 changed files with 21 additions and 28579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
source/java/org/alfresco/web/app/Application.java
View File

@@ -28,7 +28,6 @@ import java.util.ResourceBundle;
import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -641,70 +640,6 @@ public class Application
return getGuestHomeFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return the Websites folder name
*/
public static String getWebsitesFolderName(ServletContext context)
{
return getWebsitesFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return the Websites folder name
*/
public static String getWebsitesFolderName(FacesContext context)
{
return getWebsitesFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return the WCM Content Forms folder name
*/
public static String getWebContentFormsFolderName(ServletContext context)
{
return getWebContentFormsFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return the WCM Content Forms folder name
*/
public static String getWebContentFormsFolderName(FacesContext context)
{
return getWebContentFormsFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return the Content Forms folder name
*/
public static String getContentFormsFolderName(ServletContext context)
{
return getContentFormsFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return the Content Forms folder name
*/
public static String getContentFormsFolderName(FacesContext context)
{
return getContentFormsFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
}
/**
<<<<<<< .working
* @return the Projects folder name
*/
public static String getProjectsFolderName(ServletContext context)
{
return getProjectsFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return the Projects folder name
*/
public static String getProjectsFolderName(FacesContext context)
{
return getProjectsFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
}
/**
* Set the language locale for the current user context
@@ -1259,78 +1194,6 @@ public class Application
return guestHomeFolderName;
}
/**
* Returns the Websites folder name
*
* @param context The Spring context
* @return The Websites folder name
*/
private static String getWebsitesFolderName(WebApplicationContext context)
{
if (websitesFolderName == null)
{
ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
Properties configuration = bootstrap.getConfiguration();
websitesFolderName = configuration.getProperty("spaces.wcm.childname");
}
return websitesFolderName;
}
/**
* Returns the Projects folder name
*
* @param context The Spring context
* @return The Projects folder name
*/
private static String getProjectsFolderName(WebApplicationContext context)
{
if (projectsFolderName == null)
{
ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
Properties configuration = bootstrap.getConfiguration();
projectsFolderName = configuration.getProperty("spaces.projects.childname");
}
return projectsFolderName;
}
/**
* Returns the WCM Content Forms folder name
*
* @param context The Spring context
* @return The WCM Content Forms folder name
*/
private static String getWebContentFormsFolderName(WebApplicationContext context)
{
if (webContentFormsFolderName == null)
{
ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
Properties configuration = bootstrap.getConfiguration();
webContentFormsFolderName = configuration.getProperty("spaces.wcm_content_forms.childname");
}
return webContentFormsFolderName;
}
/**
* Returns the Content Forms folder name
*
* @param context The Spring context
* @return The WCM Content Forms folder name
*/
private static String getContentFormsFolderName(WebApplicationContext context)
{
if (contentFormsFolderName == null)
{
ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
Properties configuration = bootstrap.getConfiguration();
contentFormsFolderName = configuration.getProperty("spaces.content_forms.childname");
}
return contentFormsFolderName;
}
/**
* Retrieves the configured error page for the application
*

98
source/java/org/alfresco/web/app/servlet/command/EditWebContentCommand.java
View File

@@ -1,98 +0,0 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* 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/>.
*/
package org.alfresco.web.app.servlet.command;
import java.util.Map;
import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.web.app.servlet.BaseServlet;
import org.alfresco.web.app.servlet.FacesHelper;
import org.alfresco.web.bean.NavigationBean;
import org.springframework.extensions.surf.util.ParameterCheck;
/**
* Command to execute the Edit Web Content (xforms) wizard via url.
* <p>
* Arguments: webproject = the GUID of the webproject to create the content in
* sandbox = the sandbox to create the content in
* path = path to the form instance data for edit
*
* @author Kevin Roast
*/
public class EditWebContentCommand extends BaseUIActionCommand
{
public static final String PROP_WEBPROJECTID = "webproject";
public static final String PROP_SANDBOX = "sandbox";
public static final String PROP_PATH = "path";
private static final String[] PROPERTIES = new String[] {
PROP_SERVLETCONTEXT, PROP_REQUEST, PROP_RESPONSE, PROP_WEBPROJECTID, PROP_SANDBOX, PROP_PATH};
/**
* @see org.alfresco.web.app.servlet.command.Command#execute(org.alfresco.service.ServiceRegistry, java.util.Map)
*/
public Object execute(ServiceRegistry serviceRegistry, Map<String, Object> properties)
{
ServletContext sc = (ServletContext)properties.get(PROP_SERVLETCONTEXT);
ServletRequest req = (ServletRequest)properties.get(PROP_REQUEST);
ServletResponse res = (ServletResponse)properties.get(PROP_RESPONSE);
FacesContext fc = FacesHelper.getFacesContext(req, res, sc);
// AVMBrowseBean avmBrowseBean = (AVMBrowseBean)FacesHelper.getManagedBean(fc, AVMBrowseBean.BEAN_NAME); // WCM
NavigationBean navigator = (NavigationBean)FacesHelper.getManagedBean(fc, NavigationBean.BEAN_NAME);
// setup context from url args in properties map
String webProjectId = (String)properties.get(PROP_WEBPROJECTID);
ParameterCheck.mandatoryString(PROP_WEBPROJECTID, webProjectId);
String sandbox = (String)properties.get(PROP_SANDBOX);
ParameterCheck.mandatoryString(PROP_SANDBOX, sandbox);
String path = (String)properties.get(PROP_PATH);
ParameterCheck.mandatoryString(PROP_PATH, path);
navigator.setCurrentNodeId(webProjectId);
// // WCM
// avmBrowseBean.setSandbox(sandbox);
// // navigation handler is called directly in this method
// avmBrowseBean.setupEditAction(path);
String viewId = fc.getViewRoot().getViewId();
try
{
sc.getRequestDispatcher(BaseServlet.FACES_SERVLET + viewId).forward(req, res);
}
catch (Exception e)
{
throw new AlfrescoRuntimeException("Unable to forward to viewId: " + viewId, e);
}
return null;
}
/**
* @see org.alfresco.web.app.servlet.command.Command#getPropertyNames()
*/
public String[] getPropertyNames()
{
return PROPERTIES;
}
}

12
source/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java
View File

@@ -47,12 +47,9 @@ import org.alfresco.web.ui.common.Utils;
*/
public class UIActionCommandProcessor implements ExtCommandProcessor
{
/**
*
*/
private static final String MANAGE_TASK = "managetask";
private static final String MANAGE_TASK = "managetask";
public static final String PARAM_CONTAINER = "container";
public static final String PARAM_CONTAINER = "container";
private ServletContext sc = null;
private String command = null;
@@ -61,9 +58,6 @@ public static final String PARAM_CONTAINER = "container";
static
{
// add our commands to the command registry
// // WCM
// CommandFactory.getInstance().registerCommand("createwebcontent", CreateWebContentCommand.class);
CommandFactory.getInstance().registerCommand("editwebcontent", EditWebContentCommand.class);
CommandFactory.getInstance().registerCommand(MANAGE_TASK, ManageTaskDialogCommand.class);
CommandFactory.getInstance().registerCommand("editcontentprops", EditContentPropertiesCommand.class);
CommandFactory.getInstance().registerCommand("userprofile", UserProfileDialogCommand.class);
@@ -81,7 +75,7 @@ public static final String PARAM_CONTAINER = "container";
{
this.args = new HashMap<String, String>(args);
}
if(MANAGE_TASK.equals(command))
if (MANAGE_TASK.equals(command))
{
String taskId = args.get(ManageTaskDialogCommand.PROP_TASKID);
return WorkflowUtil.isTaskEditable(taskId, sc);