mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Morning merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -72,6 +72,7 @@ public class Application
|
||||
private static String emailTemplatesFolderName;
|
||||
private static String savedSearchesFolderName;
|
||||
private static String scriptsFolderName;
|
||||
private static String guestHomeFolderName;
|
||||
|
||||
/**
|
||||
* Private constructor to prevent instantiation of this class
|
||||
@@ -380,7 +381,6 @@ public class Application
|
||||
return getSavedSearchesFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return Return the JavaScript scripts folder name
|
||||
*/
|
||||
@@ -397,6 +397,22 @@ public class Application
|
||||
return getScriptsFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Return the Guest Home folder name
|
||||
*/
|
||||
public static String getGuestHomeFolderName(ServletContext context)
|
||||
{
|
||||
return getGuestHomeFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Return the Guest Home folder name
|
||||
*/
|
||||
public static String getGuestHomeFolderName(FacesContext context)
|
||||
{
|
||||
return getGuestHomeFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the language locale for the current user context
|
||||
*
|
||||
@@ -764,6 +780,24 @@ public class Application
|
||||
return scriptsFolderName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the Guest Home folder name name
|
||||
*
|
||||
* @param context The spring context
|
||||
* @return The Guest Home folder name
|
||||
*/
|
||||
private static String getGuestHomeFolderName(WebApplicationContext context)
|
||||
{
|
||||
if (guestHomeFolderName == null)
|
||||
{
|
||||
ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
|
||||
Properties configuration = bootstrap.getConfiguration();
|
||||
guestHomeFolderName = configuration.getProperty("spaces.guest_home.childname");
|
||||
}
|
||||
|
||||
return guestHomeFolderName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the configured error page for the application
|
||||
*
|
||||
|
Reference in New Issue
Block a user