Big honkin' merge from head. Sheesh!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-08-27 01:01:30 +00:00
parent 465ae145be
commit b0d02fa6be
241 changed files with 12379 additions and 1061 deletions

View File

@@ -71,6 +71,7 @@ public class Application
private static String spaceTemplatesFolderName;
private static String contentTemplatesFolderName;
private static String emailTemplatesFolderName;
private static String rssTemplatesFolderName;
private static String savedSearchesFolderName;
private static String scriptsFolderName;
private static String guestHomeFolderName;
@@ -376,6 +377,22 @@ public class Application
return getEmailTemplatesFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return Returns the RSS templates folder name
*/
public static String getRSSTemplatesFolderName(ServletContext context)
{
return getRSSTemplatesFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return Returns the RSS templates folder name
*/
public static String getRSSTemplatesFolderName(FacesContext context)
{
return getRSSTemplatesFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return Return the Saved Searches folder name
*/
@@ -750,6 +767,24 @@ public class Application
return emailTemplatesFolderName;
}
/**
* Returns the RSS Templates folder name
*
* @param context The spring context
* @return The RSS folder name
*/
private static String getRSSTemplatesFolderName(WebApplicationContext context)
{
if (rssTemplatesFolderName == null)
{
ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
Properties configuration = bootstrap.getConfiguration();
rssTemplatesFolderName = configuration.getProperty("spaces.templates.rss.childname");
}
return rssTemplatesFolderName;
}
/**
* Returns the Saved Searches folder name
*