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 
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
This commit is contained in:
Derek Hulley
2009-10-13 20:33:02 +00:00
parent 2dd348a281
commit 51e37ecf1a
4 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/action-services-context.xml
View File

@@ -381,6 +381,9 @@
<property name="fromAddress">
<value>${mail.from.default}</value>
</property>
<property name="repoRemoteUrl">
<value>${repo.remote.url}</value>
</property>
</bean>
<bean id="set-property-value" class="org.alfresco.repo.action.executer.SetPropertyValueActionExecuter" parent="action-executer">

2
config/alfresco/activities/activities-feed-context.xml
View File

@@ -54,7 +54,7 @@
<bean id="baseFeedGenerator" class="org.alfresco.repo.activities.feed.AbstractFeedGenerator" abstract="true" init-method="init">
<property name="postDAO" ref="postDAO"/>
<property name="authenticationService" ref="AuthenticationService"/>
<property name="repoEndPoint" value="${repo.remote.endpoint.url}"/>
<property name="repoEndPoint" value="${repo.remote.url}${repo.remote.endpoint}"/>
<property name="userNamesAreCaseSensitive" value="${user.name.caseSensitive}"/>
<property name="maxItemsPerCycle" value="100"/>
<property name="activityPostServiceImpl" ref="activityPostService"/>

3
config/alfresco/repository.properties
View File

@@ -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

44
source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
View File

@@ -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;
}
}
}