Merged V3.0 to HEAD

12123: Merged V2.2 to V3.0
      11466: Fixed sql-query DELETE syntax
      11614: Flush after putChild, fix for ETWOTWO-777
      11641: Merged V2.1 to V2.2
         11632: Improvements for AVM index FULL and AUTO rebuild. 
      11646: Upgrade scripts tweaks:
      11650: Added unit test to confirm fix of ETWOTWO-740
      11674: Added missing EHCache definitions for QName, Namespace and Locale caches
      11825: Fixed Eclipse classpath addition of path for Oracle JDBC driver
   12125: ETHREEOH-899: Image transformations do not follow Options
   12127: Merged V2.2 to V3.0
      11675: Node DAO optimizations
      11680: Full Fix for ETWOTWO-777 + more protection for nested write transactions beneath read transactions.
      11729: AVM creates and deletes no longer update the directory mod time - ETWOTWO-801
      11738: Fix for ETWOTWO - fixed check for TX propagation mode
      11748: Fixed ETWOTWO-578: RepositoryWebService fetchMore() does not fetch last node
      11749: Incorporate feedback from ACT-5440: MySQL-specific tweaks to the upgrade scripts
      11750: Moved t_qnames_dyn section to after t_qnames
      11752: Fixed ETWOTWO-734: ImporterComponent uses Lucene queries
      11785: Build Fix:Remove auto created person TX commit fro DB
      11853: Fix for ETWOTWO-687 - missed a case when generating lists of actions for modified files list
      11940: Stress test main method for ETWOTWO-744
      11950: Fixed ETWOTWO-909 and ETWOTWO-911
      11987: Dirty checking for attribute related  DAOs
      12008: Fixed test for transaction-requiring AttributeService
   12128: Merged V2.2 to V3.0
      11530: Merged V2.1 to V2.2
         11499: Defensive clear of the security context to avoid any ticket sharing for a given user - ETWOTWO-326

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java

@@ -265,9 +265,9 @@ public class AuthenticationTest extends TestCase
         
         // new TX
         
-        userTransaction.commit();
-        userTransaction = transactionService.getUserTransaction();
-        userTransaction.begin();
+        //userTransaction.commit();
+        //userTransaction = transactionService.getUserTransaction();
+        //userTransaction.begin();
         
         pubAuthenticationService.validate(ticket);
         userName = pubAuthenticationService.getCurrentUserName();
@@ -319,6 +319,20 @@ public class AuthenticationTest extends TestCase
         }
     }
 
+    public void testNewTicketOnLogin()
+    {
+        authenticationComponent.setSystemUserAsCurrentUser();
+        pubAuthenticationService.createAuthentication("Andy", "auth1".toCharArray());
+        authenticationComponent.clearCurrentSecurityContext();
+
+        // authenticate with this user details
+        pubAuthenticationService.authenticate("Andy", "auth1".toCharArray());
+        String ticket1 = pubAuthenticationService.getCurrentTicket();
+        pubAuthenticationService.authenticate("Andy", "auth1".toCharArray());
+        assertFalse(ticket1.equals(pubAuthenticationService.getCurrentTicket()));
+        
+    }
+    
     public void testGuest()
     {
         authenticationService.authenticate("GUEST", "".toCharArray());

source/java/org/alfresco/repo/security/authentication/ntlm/NTLMAuthenticationComponentImpl.java

@@ -749,6 +749,7 @@ public class NTLMAuthenticationComponentImpl extends AbstractAuthenticationCompo
             
             // Map the passthru username to an Alfresco person
             
+            clearCurrentSecurityContext();
             setCurrentUser( username);
             
             // Debug
@@ -912,6 +913,7 @@ public class NTLMAuthenticationComponentImpl extends AbstractAuthenticationCompo
             	
                 // Map the passthru username to an Alfresco person
                 
+                clearCurrentSecurityContext();
                 setCurrentUser( username);
                     
             }