Copied: manifoldcf/branches/CONNECTORS-754-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewADConfiguration.html (from r1535987, manifoldcf/branches/CONNECTORS-754-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html) URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewADConfiguration.html?p2=manifoldcf/branches/CONNECTORS-754-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewADConfiguration.html&p1=manifoldcf/branches/CONNECTORS-754-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html&r1=1535987&r2=1536145&rev=1536145&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-754-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html (original) +++ manifoldcf/branches/CONNECTORS-754-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewADConfiguration.html Sun Oct 27 14:29:08 2013 @@ -59,90 +59,4 @@ <td class="value"><nobr>$Encoder.bodyEscape($CACHELRUSIZE)</nobr></td> </tr> - <tr><td class="separator" colspan="2"><hr/></td></tr> - - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ServerSharePointVersion'))</nobr></td> - <td class="value"> - #if($SERVERVERSION == '2.0') - SharePoint Services 2.0 (2003) - #elseif($SERVERVERSION == '3.0') - SharePoint Services 3.0 (2007) - #elseif($SERVERVERSION == '4.0') - SharePoint Services 4.0 (2010) - #else - Unknown - #end - </td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ServerProtocol'))</nobr></td> - <td class="value"> - $SERVERPROTOCOL - </td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ServerName'))</nobr></td> - <td class="value"> - $Encoder.bodyEscape($SERVERNAME) - </td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ServerPort'))</nobr></td> - <td class="value"> - $SERVERPORT - </td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.SitePath'))</nobr></td> - <td class="value"> - $Encoder.bodyEscape($SERVERLOCATION) - </td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.UserName'))</nobr></td> - <td class="value"> - $Encoder.bodyEscape($USERNAME) - </td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.Password'))</nobr></td> - <td class="value"> - ******** - </td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.SSLCertificateList'))</nobr></td> - <td class="value"> - <table class="displaytable"> - #if($CERTIFICATELIST.size() == 0) - <tr><td class="message" colspan="1">$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.NoCertificatesPresent'))</td></tr> - #else - #foreach($certificate in $CERTIFICATELIST) - <tr> - <td class="value"> - $Encoder.bodyEscape($certificate.get('DESCRIPTION')) - </td> - </tr> - #end - #end - </table> - </td> - </tr> - - <tr><td class="separator" colspan="2"><hr/></td></tr> - - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.AuthorizationModelColon'))</nobr></td> - <td class="value"> -#if($AUTHORIZATIONMODEL == 'Classic') - <nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.Classic'))</nobr> -#elseif($AUTHORIZATIONMODEL == 'ClaimSpace') - <nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ClaimSpace'))</nobr> -#else - Unknown -#end - </td> - </tr> - </table>
Modified: manifoldcf/branches/CONNECTORS-754-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html?rev=1536145&r1=1536144&r2=1536145&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-754-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html (original) +++ manifoldcf/branches/CONNECTORS-754-2/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html Sun Oct 27 14:29:08 2013 @@ -17,51 +17,6 @@ <table class="displaytable"> <tr> - <td class="description">$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.DomainControllers'))</td> - <td class="boxcell"> - <table class="formtable"> - <tr class="formheaderrow"> - <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.DomainControllerName'))</td> - <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.DomainSuffix'))</td> - <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.AdministrativeUserName'))</td> - <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.AdministrativePassword'))</td> - <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.Authentication'))</td> - <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.LoginNameADAttribute'))</td> - </tr> -#set($dccounter = 0) -#foreach($domaincontroller in $DOMAINCONTROLLERS) - #if(($dccounter % 2) == 0) - <tr class="evenformrow"> - #else - <tr class="oddformrow"> - #end - <td class="formcolumncell"><nobr>$Encoder.bodyEscape($domaincontroller.get('DOMAINCONTROLLER'))</nobr></td> - <td class="formcolumncell"><nobr>$Encoder.bodyEscape($domaincontroller.get('SUFFIX'))</nobr></td> - <td class="formcolumncell"><nobr>$Encoder.bodyEscape($domaincontroller.get('USERNAME'))</nobr></td> - <td class="formcolumncell"><nobr>******</nobr></td> - <td class="formcolumncell"><nobr>$Encoder.bodyEscape($domaincontroller.get('AUTHENTICATION'))</nobr></td> - <td class="formcolumncell"><nobr>$Encoder.bodyEscape($domaincontroller.get('USERACLsUSERNAME'))</nobr></td> - </tr> - #set($dccounter = $dccounter + 1) -#end - </table> - </td> - </tr> - - <tr><td class="separator" colspan="2"><hr/></td></tr> - - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.CacheLifetime'))</nobr></td> - <td class="value"><nobr>$Encoder.bodyEscape($CACHELIFETIME)</nobr> $Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.minutes'))</td> - </tr> - <tr> - <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.CacheLRUSize'))</nobr></td> - <td class="value"><nobr>$Encoder.bodyEscape($CACHELRUSIZE)</nobr></td> - </tr> - - <tr><td class="separator" colspan="2"><hr/></td></tr> - - <tr> <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ServerSharePointVersion'))</nobr></td> <td class="value"> #if($SERVERVERSION == '2.0') @@ -145,4 +100,15 @@ </td> </tr> + <tr><td class="separator" colspan="2"><hr/></td></tr> + + <tr> + <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.CacheLifetime'))</nobr></td> + <td class="value"><nobr>$Encoder.bodyEscape($CACHELIFETIME)</nobr> $Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.minutes'))</td> + </tr> + <tr> + <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.CacheLRUSize'))</nobr></td> + <td class="value"><nobr>$Encoder.bodyEscape($CACHELRUSIZE)</nobr></td> + </tr> + </table> Modified: manifoldcf/branches/CONNECTORS-754-2/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authorities/BaseAuthorityConnector.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754-2/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authorities/BaseAuthorityConnector.java?rev=1536145&r1=1536144&r2=1536145&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-754-2/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authorities/BaseAuthorityConnector.java (original) +++ manifoldcf/branches/CONNECTORS-754-2/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authorities/BaseAuthorityConnector.java Sun Oct 27 14:29:08 2013 @@ -34,6 +34,7 @@ public abstract class BaseAuthorityConne { public static final String _rcsid = "@(#)$Id: BaseAuthorityConnector.java 988245 2010-08-23 18:39:35Z kwright $"; + // For repositories that have the ability to deny access based on a user's access tokens protected static final AuthorizationResponse RESPONSE_UNREACHABLE = new AuthorizationResponse(new String[]{GLOBAL_DENY_TOKEN}, AuthorizationResponse.RESPONSE_UNREACHABLE); protected static final AuthorizationResponse RESPONSE_USERNOTFOUND = new AuthorizationResponse(new String[]{GLOBAL_DENY_TOKEN}, @@ -41,6 +42,14 @@ public abstract class BaseAuthorityConne protected static final AuthorizationResponse RESPONSE_USERUNAUTHORIZED = new AuthorizationResponse(new String[]{GLOBAL_DENY_TOKEN}, AuthorizationResponse.RESPONSE_USERUNAUTHORIZED); + // For repositories that DO NOT have the ability to deny access based on a user's access tokens + protected static final AuthorizationResponse RESPONSE_UNREACHABLE_ADDITIVE = new AuthorizationResponse(new String[0], + AuthorizationResponse.RESPONSE_UNREACHABLE); + protected static final AuthorizationResponse RESPONSE_USERNOTFOUND_ADDITIVE = new AuthorizationResponse(new String[0], + AuthorizationResponse.RESPONSE_USERNOTFOUND); + protected static final AuthorizationResponse RESPONSE_USERUNAUTHORIZED_ADDITIVE = new AuthorizationResponse(new String[0], + AuthorizationResponse.RESPONSE_USERUNAUTHORIZED); + /** Obtain the access tokens for a given user name. *@param userName is the user name or identifier. *@return the response tokens (according to the current authority).
