svn commit: r1532303 - in /manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main: java/org/apache/manifoldcf/authorities/authorities/sharepoint/ native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/ resources/org/...

Tue, 15 Oct 2013 05:10:54 -0700 

Author: kwright
Date: Tue Oct 15 12:09:54 2013
New Revision: 1532303

URL: http://svn.apache.org/r1532303
Log:
Add authorization type radio button

Added:
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_AuthoritizationModel.html
   (with props)
Modified:
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties
    
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html

Modified: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java?rev=1532303&r1=1532302&r2=1532303&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
 Tue Oct 15 12:09:54 2013
@@ -104,6 +104,8 @@ public class SharePointAuthority extends
 
   private SPSProxyHelper proxy = null;
 
+  private boolean isClaimSpace = false;
+  
   private long sharepointSessionTimeout;
   
   // SSL support
@@ -563,6 +565,7 @@ public class SharePointAuthority extends
   {
     
tabsArray.add(Messages.getString(locale,"SharePointAuthority.DomainController"));
     tabsArray.add(Messages.getString(locale,"SharePointAuthority.Server"));
+    
tabsArray.add(Messages.getString(locale,"SharePointAuthority.AuthorizationModel"));
     tabsArray.add(Messages.getString(locale,"SharePointAuthority.Cache"));
     
Messages.outputResourceWithVelocity(out,locale,"editConfiguration.js",null);
   }
@@ -585,11 +588,24 @@ public class SharePointAuthority extends
     fillInDomainControllerTab(velocityContext,out,parameters);
     fillInCacheTab(velocityContext,out,parameters);
     fillInServerTab(velocityContext,out,parameters);
+    fillInAuthorizationModelTab(velocityContext,out,parameters);
     
Messages.outputResourceWithVelocity(out,locale,"editConfiguration_DomainController.html",velocityContext);
     
Messages.outputResourceWithVelocity(out,locale,"editConfiguration_Cache.html",velocityContext);
     
Messages.outputResourceWithVelocity(out,locale,"editConfiguration_Server.html",velocityContext);
+    
Messages.outputResourceWithVelocity(out,locale,"editConfiguration_AuthorizationModel.html",velocityContext);
   }
-  
+
+  protected static void fillInAuthorizationModelTab(Map<String,Object> 
velocityContext, IHTTPOutput out, ConfigParams parameters)
+    throws ManifoldCFException
+  {
+    String authorizationModel = 
parameters.getParameter(SharePointConfig.PARAM_AUTHORIZATIONMODEL);
+    if (authorizationModel == null)
+      authorizationModel = "Classic";
+    
+    // Fill in context
+    velocityContext.put("AUTHORIZATIONMODEL", authorizationModel);
+  }
+
   protected static void fillInServerTab(Map<String,Object> velocityContext, 
IHTTPOutput out, ConfigParams parameters)
     throws ManifoldCFException
   {
@@ -885,6 +901,12 @@ public class SharePointAuthority extends
         
parameters.setParameter(SharePointConfig.PARAM_SERVERKEYSTORE,mgr.getString());
       }
     }
+    
+    // Authorization model
+    String authorizationModel = 
variableContext.getParameter("authorizationModel");
+    if (authorizationModel != null)
+      
parameters.setParameter(SharePointConfig.PARAM_AUTHORIZATIONMODEL,authorizationModel);
+
     return null;
   }
   
@@ -922,6 +944,7 @@ public class SharePointAuthority extends
     fillInDomainControllerTab(velocityContext,out,parameters);
     fillInCacheTab(velocityContext,out,parameters);
     fillInServerTab(velocityContext,out,parameters);
+    fillInAuthorizationModelTab(velocityContext,out,parameters);
     
Messages.outputResourceWithVelocity(out,locale,"viewConfiguration.html",velocityContext);
   }
 
@@ -957,6 +980,9 @@ public class SharePointAuthority extends
         serverVersion = "2.0";
       // Authority needs to do nothing with SharePoint version right now.
       
+      String authorizationModel = params.getParameter( 
SharePointConfig.PARAM_AUTHORIZATIONMODEL );
+      isClaimSpace = authorizationModel.equals("ClaimSpace");
+
       serverProtocol = params.getParameter( 
SharePointConfig.PARAM_SERVERPROTOCOL );
       if (serverProtocol == null)
         serverProtocol = "http";

Modified: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java?rev=1532303&r1=1532302&r2=1532303&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java
 Tue Oct 15 12:09:54 2013
@@ -49,6 +49,9 @@ public class SharePointConfig
   /** SharePoint server certificate store */
   public static final String PARAM_SERVERKEYSTORE = "keystore";
 
+  /** SharePoint authorization model */
+  public static final String PARAM_AUTHORIZATIONMODEL = "authorizationModel";
+  
   // Nodes
   
   /** Domain controller node */

Modified: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties?rev=1532303&r1=1532302&r2=1532303&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties
 Tue Oct 15 12:09:54 2013
@@ -68,6 +68,10 @@ SharePointAuthority.PleaseSupplyASharePo
 SharePointAuthority.TheConnectionRequiresAValidSharePointUserName=The 
connection requires a valid SharePoint user name of the form <domain>\\<user>
 SharePointAuthority.Certificate=Certificate:
 
+SharePointAuthority.AuthorizationModel=Authorization model
+SharePointAuthority.AuthorizationModelColon=Authorization model:
+SharePointAuthority.Classic=Classic
+SharePointAuthority.ClaimSpace=Claim Space
 
 
 

Modified: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties?rev=1532303&r1=1532302&r2=1532303&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties
 Tue Oct 15 12:09:54 2013
@@ -67,3 +67,8 @@ SharePointAuthority.PleaseSpecifyAnyServ
 
SharePointAuthority.PleaseSupplyASharePointPortNumber=SharePointポート番号をå
…¥åŠ›ã—てください。デフォルト値を利用するå 
´åˆã¯ç©ºç™½ã«ã—てください
 
SharePointAuthority.TheConnectionRequiresAValidSharePointUserName=コネクションのSharePointユーザ名は<ドメイン>\\<ユーザ>\形式で指定してくã
 ã•ã„
 SharePointAuthority.Certificate=証明証：
+
+SharePointAuthority.AuthorizationModel=Authorization model
+SharePointAuthority.AuthorizationModelColon=Authorization model:
+SharePointAuthority.Classic=Classic
+SharePointAuthority.ClaimSpace=Claim Space

Added: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_AuthoritizationModel.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_AuthoritizationModel.html?rev=1532303&view=auto
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_AuthoritizationModel.html
 (added)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_AuthoritizationModel.html
 Tue Oct 15 12:09:54 2013
@@ -0,0 +1,43 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+#if($TabName == 
$ResourceBundle.getString('SharePointAuthority.AuthorizationModel'))
+
+<table class="displaytable">
+  <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')
+      <input type="radio" name="authorizationModel" value="Classic" 
checked="true"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.Classic'))</nobr></input>
+  #else
+      <input type="radio" name="authorizationModel" 
value="Classic"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.Classic'))</nobr></input>
+  #end
+  #if($AUTHORIZATIONMODEL == 'ClaimSpace')
+      <input type="radio" name="authorizationModel" value="ClaimSpace" 
checked="true"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ClaimSpace'))</nobr></input>
+  #else
+      <input type="radio" name="authorizationModel" 
value="ClaimSpace"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ClaimSpace'))</nobr></input>
+  #end
+    </td>
+  </tr>
+</table>
+
+#else
+
+<input type="hidden" name="authorityType" value="$AUTHORITYTYPE"/>
+
+#end

Propchange: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_AuthoritizationModel.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_AuthoritizationModel.html
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html?rev=1532303&r1=1532302&r2=1532303&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
 (original)
+++ 
manifoldcf/branches/CONNECTORS-754/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
 Tue Oct 15 12:09:54 2013
@@ -130,4 +130,19 @@
     </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>

Reply via email to