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 V3.2 to HEAD

Browse Source 
15642: Merged V3.1 to V3.2
      15376: ETHREEOH-255: missing email template dependencies that were stopping a cold bootstrap from working


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15801 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-08-18 18:02:23 +00:00
parent cb4ce6b652
commit f73c72d424
10 changed files with 183 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,8 @@ public class Application
private static String spaceTemplatesFolderName;
private static String contentTemplatesFolderName;
private static String emailTemplatesFolderName;
private static String inviteEmailTemplatesFolderName;
private static String notifyEmailTemplatesFolderName;
private static String rssTemplatesFolderName;
private static String savedSearchesFolderName;
private static String scriptsFolderName;
@@ -432,6 +434,38 @@ public class Application
}
/**
* @return Returns the Invite Email Templates folder name
*/
public static String getInviteEmailTemplatesFolderName(ServletContext context)
{
return getInviteEmailTemplatesFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return Returns the Invite Email Templates folder name
*/
public static String getInviteEmailTemplatesFolderName(FacesContext context)
{
return getInviteEmailTemplatesFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return Returns the Notify Email Templates folder name
*/
public static String getNotifyEmailTemplatesFolderName(ServletContext context)
{
return getNotifyEmailTemplatesFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return Returns the Notify Email Templates folder name
*/
public static String getNotifyEmailTemplatesFolderName(FacesContext context)
{
return getNotifyEmailTemplatesFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
}
/**
* @return Returns the Email templates folder name
*/
public static String getEmailTemplatesFolderName(ServletContext context)
@@ -995,6 +1029,42 @@ public class Application
}
/**
* Returns the Invite Email Templates folder name
*
* @param context The spring context
* @return The invite email folder name
*/
private static String getInviteEmailTemplatesFolderName(WebApplicationContext context)
{
if (inviteEmailTemplatesFolderName == null)
{
ImporterBootstrap bootstrap = (ImporterBootstrap) context.getBean(BEAN_IMPORTER_BOOTSTRAP);
Properties configuration = bootstrap.getConfiguration();
inviteEmailTemplatesFolderName = configuration.getProperty("spaces.templates.email.invite1.childname");
}
return inviteEmailTemplatesFolderName;
}
/**
* Returns the Notify Email Templates folder name
*
* @param context The spring context
* @return The notify email folder name
*/
private static String getNotifyEmailTemplatesFolderName(WebApplicationContext context)
{
if (notifyEmailTemplatesFolderName == null)
{
ImporterBootstrap bootstrap = (ImporterBootstrap) context.getBean(BEAN_IMPORTER_BOOTSTRAP);
Properties configuration = bootstrap.getConfiguration();
notifyEmailTemplatesFolderName = configuration.getProperty("spaces.templates.email.notify.childname");
}
return notifyEmailTemplatesFolderName;
}
/**
* Returns the RSS Templates folder name
*
* @param context The spring context