Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

were both beyond me, and are just the raw conflict merge data.  If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/filesys/server/auth/ClientInfo.java

@@ -71,6 +71,10 @@ public class ClientInfo
     
     private Authentication m_authToken;
     
+    // Authentication ticket, used for web access without having to re-authenticate
+    
+    private String m_authTicket;
+    
     // Home folder node
     
     private NodeRef m_homeNode;
@@ -286,6 +290,26 @@ public class ClientInfo
     {
         return m_authToken;
     }
+
+    /**
+     * Check if the client has an authentication ticket
+     * 
+     * @return boolean
+     */
+    public final boolean hasAuthenticationTicket()
+    {
+    	return m_authTicket != null ? true : false;
+    }
+    
+    /**
+     * Return the authentication ticket
+     * 
+     * @return String
+     */
+    public final String getAuthenticationTicket()
+    {
+    	return m_authTicket;
+    }
     
     /**
      * Check if the client has a home folder node
@@ -409,6 +433,16 @@ public class ClientInfo
     {
         m_authToken = token;
     }
+
+    /**
+     * Set the authentication ticket
+     * 
+     * @param ticket String
+     */
+    public final void setAuthenticationTicket(String ticket)
+    {
+    	m_authTicket = ticket;
+    }
     
     /**
      * Set the home folder node
@@ -448,6 +482,12 @@ public class ClientInfo
             str.append(",token=");
             str.append(getAuthenticationToken());
         }
+
+        if ( hasAuthenticationTicket())
+        {
+        	str.append(",ticket=");
+        	str.append(getAuthenticationTicket());
+        }
         
         if (isGuest())
             str.append(",Guest");