Merged V3.2 to HEAD

17475: ETHREEOH-3295: Fix to AuthorityMigrationPatch
      - Forces transaction retry if worker thread reaches child authority before a parent authority
      - Tested on Kev's 3.1.1 repository with ~20,000 bulk loaded users and ~2,000 Share sites
      - Now completes in 5 minutes as opposed to 45
   17461: ETHREEOH-3268: Added MutableAuthenticationService.isAuthenticationCreationAllowed () to allow conditional display of external user invitation UI
   17450: ETHREEOH-2762: Correction to previous fix. Do not generate new name when working copy copied back on check in.
   17440: ETHREEOH-3295: Fixed logging in FixNameCrcValuesPatch
   17439: ETHREEOH-2762: Improved behaviour when a working copy is copied
      - Working copy aspect already removed the working copy aspect on copy
      - Now derives a new name from the node checked out from and a UUID, preserving the extension
   17438: ETHREEOH-2690: Fix sequencing of jgroups system property setting
      - declared dependency between internalEHCacheManager and jgroupsPropertySetter
   17436: ETHREEOH-3295: Further performance improvements to AuthorityMigrationPatch
      - authority created at same time as all its parent associations to save lots of reindexing, as per LDAP sync
      - multi-threaded BatchProcessor (as used by LDAP sync, FixNameCrcValuesPatch) used to process work in 2 threads in batches of 20, report progress every 100 entries and handle transaction retries
      - BatchProcessor now promoted to its own package
   17394: Fix for license issue in local enterprise builds.
      - Replace Community with Enterprise in version.properties during enterprise war building
   17365: ETHREEOH-3229: Visited and fixed all SearchService result set leaks
   17362: ETHREEOH-3254: Eliminate needless ping to LDAP server in LDAPAuthenticationComponentImpl.implementationAllowsGuestLogin()
   17348: ETHREEOH-3003: Fix NPE in Hyperic when LicenseDescriptor has null fields
   17316: Merged V3.1 to V3.2
      17315: ETHREEOH-3092: PersonService won't let you create duplicate persons anymore.
      17314: ETHREEOH-3158: Fix RepoServerMgmt to work with external authentication methods
         - AuthenticationService.getCurrentTicket / getNewTicket now call pre authentication check before issuing a new ticket, thus still allowing ticket enforcement when external authentication is in use.
      17312: ETHREEOH-3219: Enable resolution of JMX server password file path on JBoss 5
      17299: Merged V3.2 to V3.1 (Record only)
         17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
         17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
   17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
      - thanks Kev!
   17292: ETHREEOH-1842: Ticket association with HttpSession IDs tracked so that we don't invalidate a ticket in use by multiple sessions prematurely
      - AuthenticationService validate, getCurrentTicket, etc. methods now take optional sessionId arguments
   17269: Fix failing unit test
      - reinstate original behaviour of AbstractChainingAuthenticationService.getAuthenticationEnabled()
   17268: Fix InvitationService
      - Runs as system to do privileged AuthenticationService actions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2010-01-18 17:41:59 +00:00
parent b96d174e1f
commit 1c1a35e500
55 changed files with 1153 additions and 711 deletions

View File

@@ -64,7 +64,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
*/
public Action createAction(String ticket, String name)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.createAction(name);
}
@@ -74,7 +74,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
public Action createAction(String ticket, String name,
Map<String, Serializable> params)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.createAction(name, params);
}
@@ -83,7 +83,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
*/
public ActionCondition createActionCondition(String ticket, String name)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.createActionCondition(name);
}
@@ -93,7 +93,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
public ActionCondition createActionCondition(String ticket, String name,
Map<String, Serializable> params)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.createActionCondition(name, params);
}
@@ -102,7 +102,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
*/
public CompositeAction createCompositeAction(String ticket)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.createCompositeAction();
}
@@ -112,7 +112,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
public boolean evaluateAction(String ticket, Action action,
NodeRef actionedUponNodeRef)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.evaluateAction(action, actionedUponNodeRef);
}
@@ -122,7 +122,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
public boolean evaluateActionCondition(String ticket,
ActionCondition condition, NodeRef actionedUponNodeRef)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.evaluateActionCondition(condition, actionedUponNodeRef);
}
@@ -132,7 +132,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
public void executeAction(String ticket, Action action,
NodeRef actionedUponNodeRef)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
fActionService.executeAction(action, actionedUponNodeRef);
}
@@ -142,7 +142,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
public void executeAction(String ticket, Action action,
NodeRef actionedUponNodeRef, boolean checkConditions)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
fActionService.executeAction(action, actionedUponNodeRef, checkConditions);
}
@@ -153,7 +153,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
NodeRef actionedUponNodeRef, boolean checkConditions,
boolean executeAsynchronously)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
fActionService.executeAction(action, actionedUponNodeRef, checkConditions, executeAsynchronously);
}
@@ -162,7 +162,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
*/
public Action getAction(String ticket, NodeRef nodeRef, String actionId)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.getAction(nodeRef, actionId);
}
@@ -172,7 +172,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
public ActionConditionDefinition getActionConditionDefinition(
String ticket, String name)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.getActionConditionDefinition(name);
}
@@ -182,7 +182,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
public List<ActionConditionDefinition> getActionConditionDefinitions(
String ticket)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.getActionConditionDefinitions();
}
@@ -191,7 +191,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
*/
public ActionDefinition getActionDefinition(String ticket, String name)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.getActionDefinition(name);
}
@@ -200,7 +200,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
*/
public List<ActionDefinition> getActionDefinitions(String ticket)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.getActionDefinitions();
}
@@ -210,7 +210,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
public List<ActionDefinition> getActionDefinitions(String ticket,
NodeRef nodeRef)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.getActionDefinitions(nodeRef);
}
@@ -219,7 +219,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
*/
public List<Action> getActions(String ticket, NodeRef nodeRef)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
return fActionService.getActions(nodeRef);
}
@@ -228,7 +228,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
*/
public void removeAction(String ticket, NodeRef nodeRef, Action action)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
fActionService.removeAction(nodeRef, action);
}
@@ -237,7 +237,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
*/
public void removeAllActions(String ticket, NodeRef nodeRef)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
fActionService.removeAllActions(nodeRef);
}
@@ -246,7 +246,7 @@ public class ActionServiceTransportImpl implements ActionServiceTransport
*/
public void saveAction(String ticket, NodeRef nodeRef, Action action)
{
fAuthenticationService.validate(ticket);
fAuthenticationService.validate(ticket, null);
fActionService.saveAction(nodeRef, action);
}
}