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
*