svn commit: r1092794 - in /incubator/lcf/branches/CONNECTORS-32: ./ connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java

[kw...@apache.org]

Author: kwright
Date: Fri Apr 15 19:40:46 2011
New Revision: 1092794

URL: http://svn.apache.org/viewvc?rev=1092794&view=rev
Log:
Commit stuff so far so I can work on it elsewhere

Modified:
    incubator/lcf/branches/CONNECTORS-32/   (props changed)
    incubator/lcf/branches/CONNECTORS-32/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java

Propchange: incubator/lcf/branches/CONNECTORS-32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 15 19:40:46 2011
@@ -1,2 +1,3 @@
 /incubator/lcf/branches/CONNECTORS-151-branch:1063444-1071206
 /incubator/lcf/branches/CONNECTORS-160-branch:1071241-1071534
+/incubator/lcf/trunk:1092566,1092568,1092631

Modified: incubator/lcf/branches/CONNECTORS-32/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-32/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java?rev=1092794&r1=1092793&r2=1092794&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-32/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java (original)
+++ incubator/lcf/branches/CONNECTORS-32/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java Fri Apr 15 19:40:46 2011
@@ -45,6 +45,9 @@ public class ActiveDirectoryAuthority ex
   private String userName = null;
   private String password = null;
 
+  /** Cache manager. */
+  private ICacheManager cacheManager = null;
+  
   /** The initialized LDAP context (which functions as a session) */
   private LdapContext ctx = null;
   /** The time of last access to this ctx object */
@@ -67,18 +70,23 @@ public class ActiveDirectoryAuthority ex
   {
   }
 
-  /** Return the path for the UI interface JSP elements.
-  * These JSP's must be provided to allow the connector to be configured, and to
-  * permit it to present document filtering specification information in the UI.
-  * This method should return the name of the folder, under the <webapp>/connectors/
-  * area, where the appropriate JSP's can be found.  The name should NOT have a slash in it.
-  *@return the folder part
+  /** Set thread context.
   */
-  public String getJSPFolder()
+  public void setThreadContext(IThreadContext tc)
+    throws ManifoldCFException
   {
-    return "activedirectory";
+    super.setThreadContext(tc);
+    cacheManager = CacheManagerFactory.make(tc);
   }
-
+  
+  /** Clear thread context.
+  */
+  public void clearThreadContext()
+  {
+    super.clearThreadContext();
+    cacheManager = null;
+  }
+  
   /** Connect.  The configuration parameters are included.
   *@param configParams are the configuration parameters for this connection.
   */
@@ -152,6 +160,7 @@ public class ActiveDirectoryAuthority ex
   public AuthorizationResponse getAuthorizationResponse(String userName)
     throws ManifoldCFException
   {
+    // MHL
     return getAuthorizationResponseUncached(userName);
   }
   
@@ -429,7 +438,7 @@ public class ActiveDirectoryAuthority ex
   }
 
   // Protected methods
-  
+
   protected void getSession()
     throws ManifoldCFException
   {