From 51e37ecf1aadb84185b25e33b9155cddd753a5ce Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 13 Oct 2009 20:33:02 +0000 Subject: [PATCH] Merged V3.2 to HEAD 15908: Merged V3.1 to V3.2 (record only) 15907: Merged V3.2 to V3.1 15683: Fixed potential concurrency issues in HeartBeat and LicenseComponent 15972: Merged V3.1 to V3.2 15429: **Record only** I18N message IDs for JSF dashlets 15947: ETHREEOH-2565: The content size shown in the preview popup is incorrect 15952: Part of fix for ETHREEOH-2493 - missing html encoding on webscript 404 html status page. 15953: Fix for ETHREEOH-2364 - LDAP sync missing last name displayed as null. 15956: Fix for ETHREEOH-2714 - html encoding in Create New User summary page. 15957: Merged DEV-TEMPORARY to V3.1 15865: Fix for ETHREEOH-2673 15958: Merged DEV-TEMPORARY to V3.1 15885: ETHREEOH-2615: Localization Issue - Japanese UI 15959: Merged DEV-TEMPORARY to V3.1 15882: ETHREEOH-2644: Sending Email using Template throws exception 15962: Fix for ETHREEOH-2390 15963: Fix ETHREEOH-1962: Hibernate flush ordering incorrect for alf_qname 15965: Merged DEV/BELARUS/V3.1 15949: ETHREEOH-2689: When upgrading from 2.1.7e to 3.1.0e/3.1.1e user roles are mapped incorrectly 15966: Merged V2.2 to V3.1 15948: (RECORD ONLY) Backport of the fix provided for ETHREEOH-1719. 15969: Prep for ETHREEOH-2295 fixes and associated merges. 15970: Merged DEV-TEMPORARY to V3.1 14360: ETHREEOH-1571, ETHREEOH-1656, ETHREEOH-1404, ETHREEOH-953, ALFCOM-2650, ETHREEOH-1572, ETHREEOH-1574 15331: ETHREEOH-2295 - LayeredFile: Layer file/folder is present when original file/folder is removed 15824: ETHREEOH-2295 - higlight stale object ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/DEV/BELARUS/V3.1:r15865,15882,15885,15949 Merged /alfresco/BRANCHES/DEV/3.1SP2:r14360,15331,15824 Merged /alfresco/BRANCHES/V2.2:r15948 Merged /alfresco/BRANCHES/V3.1:r15907,15947-15962,15964-15970 Merged /alfresco/BRANCHES/V3.2:r15908,15972 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/action-services-context.xml | 3 ++ .../activities/activities-feed-context.xml | 2 +- config/alfresco/repository.properties | 3 +- .../action/executer/MailActionExecuter.java | 44 +++++++++++++++++++ 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml index 304ee124cf..b03d46e8d3 100644 --- a/config/alfresco/action-services-context.xml +++ b/config/alfresco/action-services-context.xml @@ -381,6 +381,9 @@ ${mail.from.default} + + ${repo.remote.url} + diff --git a/config/alfresco/activities/activities-feed-context.xml b/config/alfresco/activities/activities-feed-context.xml index f637a52e3b..59084cc311 100644 --- a/config/alfresco/activities/activities-feed-context.xml +++ b/config/alfresco/activities/activities-feed-context.xml @@ -54,7 +54,7 @@ - + diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties index ae3e2c2a00..ffafeab5b7 100644 --- a/config/alfresco/repository.properties +++ b/config/alfresco/repository.properties @@ -312,7 +312,8 @@ linkvalidation.disableOnFail=false system.usages.enabled=true # Repository endpoint - used by Activity Service -repo.remote.endpoint.url=http://localhost:8080/alfresco/service +repo.remote.url=http://localhost:8080/alfresco +repo.remote.endpoint=/service # Create home folders as people are created (true) or create them lazily (false) home.folder.creation.eager=true diff --git a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java index 9625ef0102..ad77d0b13b 100644 --- a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java +++ b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java @@ -86,6 +86,8 @@ public class MailActionExecuter extends ActionExecuterAbstractBase */ private static final String FROM_ADDRESS = "alfresco@alfresco.org"; + private static final String REPO_REMOTE_URL = "http://localhost:8080/alfresco"; + /** * The java mail sender */ @@ -131,6 +133,11 @@ public class MailActionExecuter extends ActionExecuterAbstractBase */ private String fromAddress = null; + /** + * Default alfresco installation url + */ + private String repoRemoteUrl = null; + /** * @param javaMailSender the java mail sender */ @@ -203,6 +210,15 @@ public class MailActionExecuter extends ActionExecuterAbstractBase this.fromAddress = fromAddress; } + /** + * + * @param repoRemoteUrl The default alfresco installation url + */ + public void setRepoRemoteUrl(String repoRemoteUrl) + { + this.repoRemoteUrl = repoRemoteUrl; + } + /** * Initialise bean */ @@ -212,6 +228,11 @@ public class MailActionExecuter extends ActionExecuterAbstractBase { fromAddress = FROM_ADDRESS; } + + if (repoRemoteUrl == null || repoRemoteUrl.length() == 0) + { + repoRemoteUrl = REPO_REMOTE_URL; + } } /** @@ -421,6 +442,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase model.put("hasAspect", new HasAspectMethod()); model.put("message", new I18NMessageMethod()); model.put("dateCompare", new DateCompareMethod()); + model.put("url", new URLHelper(repoRemoteUrl)); return model; } @@ -439,4 +461,26 @@ public class MailActionExecuter extends ActionExecuterAbstractBase paramList.add(new ParameterDefinitionImpl(PARAM_TEMPLATE, DataTypeDefinition.NODE_REF, false, getParamDisplayLabel(PARAM_TEMPLATE))); } + public static class URLHelper + { + String contextPath; + String serverPath; + + public URLHelper(String repoRemoteUrl) + { + String[] parts = repoRemoteUrl.split("/"); + this.contextPath = "/" + parts[parts.length - 1]; + this.serverPath = parts[0] + "//" + parts[2]; + } + + public String getContext() + { + return this.contextPath; + } + + public String getServerPath() + { + return this.serverPath; + } + } }