mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.4-BUG-FIX to HEAD
30744: ALF-9524: WCM: Defining a complex type with 'abstract' attribute to true does not allow other complex types to define elements with the same name
- Fix by Pavel
30804: ALF-9524: Fix to NPE by Pavel
30812: ALF-718: Rules Fire Emails before Transaction Commit/Rollback
Added tests and moved email sending into a post commit callback.
30820: Fix for ALF-10516 - 'My Sites' dashlet should indicate it is loading rather than say 'No sites'
30824: Fixed ALF-10470: DeclaritiveRegistry is looping continuously and re-initializing
- Only replicate removals for the cache. The reset always does a remove first.
<cache
name="org.alfresco.cache.webScriptsRegistryCache"
...
replicateUpdates = false,
...
</cache>
30827: ALF-10513 60k Site Performance: Unable to delete user + request not acknowledged for 2 minutes
Now about 3 to 4 seconds
30828: Andy H recommended change to lucene indexer values
30831: ALF-718: Fix for InvitationServiceImplTest
Fixes behaviour broken by original fix for ALF-718: the send-after-commit does NOT work for the invitation service, so it was necessary
to change the code to only send-after-commit in the context of a rule.
30843: Fixed ALF-7698 "Defects in tags picker in SHARE." according to feedback provided in ALF-9953 "Decide order where new items shall appear in the object finder."
30844: ALF-9544 - Inbound email restricts file name to 86 characters or less.
used QName.createQNameWithValidLocalName() as suggested.
added new EmailServiceImplTest
30849: Fixed ALF-8776 "Rule details dialog handling of apostrophes"
30862: Merged DEV/TEMPORARY to V3.4-BUG-FIX (with improvements)
30856: ALF-10288: Regression of ALF-1997: non domain users cannot bypass SSO in Share using /share/page?pt=login
In SSOAuthenticationFilter.doFilter() method added check (PAGE_SERVLET_PATH.equals(req.getServletPath()) && LOGIN_PATH_INFORMATION.equals(req.getPathInfo()).
30864: SMTP Server, To and From address format.
- Out standards for from and to address were stuck in the 1980s!
30867: ALF-10517 - 'My Content' slow
- performance improvements by reworking Lucene queries used to retrieve recently modified and recently created content for a user
- converted queries to fts-alfresco
- improvements from 3.5sec per page render down to 1.1 secs
30874: MERGE DEV to V3.4-BUG-FIX
30851 : ALF-9558 - Unchecked Return Value
30882: - ScriptGroup.isRootGroup() now stops if it finds a single parent rather than doing a size on all parent groups.
Not sure the logic (not changed by me) is correct as it includes parents that are site groups.
- SiteServiceImpl now only gets the specified number of sites. Sometimes it would have return more if AuthorityDAOImpl
switched approach used to get containing authorities.
- Overloaded getContainingAuthorities to take a size parameter, deprecated other and switched calling code
Done for isRootGroup activity.
30910: - Fix build error
- Found a better way to use filter in AuthorityDAOImpl.getContainingAuthoritiesInZone
so that we don't need to reset the filter, by using the +ve hits from first approach
if we switch to second approach.
30925: - ALF-10501 60k Site Performance: Searching for a group to add to a site with a value that matches a few sites takes 2 minutes
ALF-10502 60k Site Performance: Admin Console | Groups: search with a value that matches a few sites takes 70 seconds
ALF-10504 60k Site Performance: Admin Console | Groups | Browse Groups page appears corrupt as it never finishes loading
- All the above were slow as a result of ScriptGroup.isRootGroup()
- ScriptGroup.isRootGroup() and ScriptGroup.isAdminGroup() removed - Checked with KevinR that these are not needed any more.
- Removed code added on 30 Sep 11 to support isRootGroup (the size parameter to AuthorityDAO.getContainingAuthorities)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
@@ -19,6 +19,7 @@
|
||||
package org.alfresco.repo.rule;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
@@ -27,6 +28,8 @@ import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.mail.MessagingException;
|
||||
import javax.mail.internet.MimeMessage;
|
||||
import javax.transaction.UserTransaction;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
@@ -57,6 +60,8 @@ import org.alfresco.repo.dictionary.IndexTokenisationMode;
|
||||
import org.alfresco.repo.dictionary.M2Aspect;
|
||||
import org.alfresco.repo.dictionary.M2Model;
|
||||
import org.alfresco.repo.dictionary.M2Property;
|
||||
import org.alfresco.repo.management.subsystems.ApplicationContextFactory;
|
||||
import org.alfresco.repo.node.integrity.IntegrityException;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
||||
@@ -898,11 +903,11 @@ public class RuleServiceCoverageTest extends TestCase
|
||||
* Test:
|
||||
* rule type: inbound
|
||||
* condition: no-condition
|
||||
* action: mail
|
||||
*
|
||||
* Note: this test will be removed from the standard list since it is not currently automated
|
||||
* action: mail
|
||||
* @throws MessagingException
|
||||
* @throws IOException
|
||||
*/
|
||||
public void xtestMailAction()
|
||||
public void testMailAction() throws MessagingException, IOException
|
||||
{
|
||||
this.nodeService.addAspect(this.nodeRef, ContentModel.ASPECT_LOCKABLE, null);
|
||||
|
||||
@@ -919,6 +924,11 @@ public class RuleServiceCoverageTest extends TestCase
|
||||
null);
|
||||
|
||||
this.ruleService.saveRule(this.nodeRef, rule);
|
||||
|
||||
MailActionExecuter mailService = (MailActionExecuter) ((ApplicationContextFactory) this.applicationContext
|
||||
.getBean("OutboundSMTP")).getApplicationContext().getBean("mail");
|
||||
mailService.setTestMode(true);
|
||||
mailService.clearLastTestMessage();
|
||||
|
||||
this.nodeService.createNode(
|
||||
this.nodeRef,
|
||||
@@ -928,8 +938,63 @@ public class RuleServiceCoverageTest extends TestCase
|
||||
getContentProperties()).getChildRef();
|
||||
|
||||
// An email should appear in the recipients email
|
||||
|
||||
// System.out.println(NodeStoreInspector.dumpNodeStore(this.nodeService, this.testStoreRef));
|
||||
MimeMessage lastMessage = mailService.retrieveLastTestMessage();
|
||||
assertNotNull("Message should have been sent", lastMessage);
|
||||
System.out.println("Sent email with subject: " + lastMessage.getSubject());
|
||||
System.out.println("Sent email with content: " + lastMessage.getContent());
|
||||
}
|
||||
|
||||
public void testMailNotSentIfRollback()
|
||||
{
|
||||
this.nodeService.addAspect(this.nodeRef, ContentModel.ASPECT_LOCKABLE, null);
|
||||
|
||||
Map<String, Serializable> params = new HashMap<String, Serializable>(1);
|
||||
params.put(MailActionExecuter.PARAM_TO, "alfresco.test@gmail.com");
|
||||
params.put(MailActionExecuter.PARAM_SUBJECT, "testMailNotSentIfRollback()");
|
||||
params.put(MailActionExecuter.PARAM_TEXT, "This email should NOT have been sent.");
|
||||
|
||||
Rule rule = createRule(
|
||||
RuleType.INBOUND,
|
||||
MailActionExecuter.NAME,
|
||||
params,
|
||||
NoConditionEvaluator.NAME,
|
||||
null);
|
||||
|
||||
this.ruleService.saveRule(this.nodeRef, rule);
|
||||
|
||||
String illegalName = "MyName.txt "; // space at end
|
||||
|
||||
MailActionExecuter mailService = (MailActionExecuter) ((ApplicationContextFactory) this.applicationContext
|
||||
.getBean("OutboundSMTP")).getApplicationContext().getBean("mail");
|
||||
mailService.setTestMode(true);
|
||||
mailService.clearLastTestMessage();
|
||||
|
||||
try
|
||||
{
|
||||
this.nodeService.createNode(
|
||||
this.nodeRef,
|
||||
ContentModel.ASSOC_CHILDREN,
|
||||
QName.createQName(TEST_NAMESPACE, "children"),
|
||||
ContentModel.TYPE_CONTENT,
|
||||
makeNameProperty(illegalName)).getChildRef();
|
||||
fail("createNode() should have failed.");
|
||||
}
|
||||
catch(IntegrityException e)
|
||||
{
|
||||
// Expected exception.
|
||||
// An email should NOT appear in the recipients email
|
||||
}
|
||||
|
||||
MimeMessage lastMessage = mailService.retrieveLastTestMessage();
|
||||
assertNull("Message should NOT have been sent", lastMessage);
|
||||
}
|
||||
|
||||
private Map<QName, Serializable> makeNameProperty(String name)
|
||||
{
|
||||
Map<QName, Serializable> properties = new HashMap<QName, Serializable>(1);
|
||||
properties.put(ContentModel.PROP_NAME, name);
|
||||
return properties;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user