svn commit: r1705388 - in /manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main: java/org/apache/manifoldcf/authorities/authorities/ldap/ resources/org/apache/manifoldcf/authorities/authorities/ldap/

[kw...@apache.org]

Author: kwright
Date: Fri Sep 25 23:52:56 2015
New Revision: 1705388

URL: http://svn.apache.org/viewvc?rev=1705388&view=rev
Log:
Get UI limping

Modified:
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_ForcedTokens.html
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html

Modified: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java?rev=1705388&r1=1705387&r2=1705388&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java (original)
+++ manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java Fri Sep 25 23:52:56 2015
@@ -484,6 +484,7 @@ public class LDAPAuthority extends org.a
   public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, Locale locale, ConfigParams parameters, String tabName)
     throws ManifoldCFException, IOException {
     final Map<String,Object> paramMap = new HashMap<String,Object>();
+    paramMap.put("TabName",tabName);
     fillInLDAPTab(paramMap, out, parameters);
     fillInForcedTokensTab(paramMap, out, parameters);
     Messages.outputResourceWithVelocity(out, locale, "editConfiguration_LDAP.html", paramMap);    

Modified: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_ForcedTokens.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_ForcedTokens.html?rev=1705388&r1=1705387&r2=1705388&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_ForcedTokens.html (original)
+++ manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_ForcedTokens.html Fri Sep 25 23:52:56 2015
@@ -19,7 +19,7 @@
 
 <table class="displaytable">
   <tr><td class="separator" colspan="2"><hr/></td></tr>
-  <tr><td class="value" colspan="2">$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.ForcedTokensDisclaimer'))</td></tr>
+  <tr><td class="value" colspan="2">$Encoder.bodyEscape($ResourceBundle.getString('LDAP.ForcedTokensDisclaimer'))</td></tr>
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   #set($counter = 0)
   #foreach($forcedtoken in $FORCEDTOKENS)
@@ -28,7 +28,7 @@
       <input type="hidden" name="accessop_$counter" value=""/>
       <input type="hidden" name="spectoken_$counter" value="$Encoder.attributeEscape($forcedtoken)"/>
       <a name="token_$counter">
-        <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getMessage('LDAP.Delete'))" onClick='Javascript:SpecOp("accessop_$counter","Delete","token_$counter")' alt="$Encoder.attributeEscape($ResourceBundle.getMessage('LDAP.DeleteToken')$counter)"/>
+        <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('LDAP.Delete'))" onClick='Javascript:SpecOp("accessop_$counter","Delete","token_$counter")' alt="$Encoder.attributeEscape($ResourceBundle.getString('LDAP.DeleteToken'))$counter"/>
       </a>
     </td>
     <td class="value">
@@ -39,7 +39,7 @@
   #end
   #if ($counter == 0)
   <tr>
-    <td class="message" colspan="2">$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.NoTokensPresent'))</td>
+    <td class="message" colspan="2">$Encoder.bodyEscape($ResourceBundle.getString('LDAP.NoTokensPresent'))</td>
   </tr>
   #end
   <tr><td class="lightseparator" colspan="2"><hr/></td></tr>
@@ -49,7 +49,7 @@
   #set($counterplusone = $counter + 1)
       <input type="hidden" name="accessop" value=""/>
       <a name="token_$counter">
-        <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getMessage('LDAP.Add'))" onClick='Javascript:SpecAddToken("token_$counterplusone")' alt="$Encoder.attributeEscape($ResourceBundle.getMessage('LDAP.AddToken'))"/>
+        <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('LDAP.Add'))" onClick='Javascript:SpecAddToken("token_$counterplusone")' alt="$Encoder.attributeEscape($ResourceBundle.getString('LDAP.AddToken'))"/>
       </a>
     </td>
     <td class="value">
@@ -60,9 +60,9 @@
 #else
   #set($counter = 0)
   #foreach($forcedtoken in $FORCEDTOKENS)
-<input type="hidden" name="spectoken_$counter" value="$Encoder.attributeEscape($forcedtoken)"/>);
+<input type="hidden" name="spectoken_$counter" value="$Encoder.attributeEscape($forcedtoken)"/>
     #set($counter = $counter + 1)
   #end
-<input type="hidden" name="tokencount" value="$counter"/>);
+<input type="hidden" name="tokencount" value="$counter"/>
 #end
 

Modified: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html?rev=1705388&r1=1705387&r2=1705388&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html (original)
+++ manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html Fri Sep 25 23:52:56 2015
@@ -102,7 +102,7 @@
         <tr>
           <td class="description">
             <input type="button" onclick='Javascript:SSLDeleteCertificate($Encoder.attributeJavascriptEscape($cert.Key))'
-                   alt="$Encoder.attributeEscape($ResourceBundle.getString('LDAP.DeleteCert')$cert.Key)"
+                   alt="$Encoder.attributeEscape($ResourceBundle.getString('LDAP.DeleteCert'))$Encoder.attributeEscape($cert.Key)"
                    value="$Encoder.attributeEscape($ResourceBundle.getString('LDAP.Delete'))"/>
           </td>
           <td class="value">

Modified: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html?rev=1705388&r1=1705387&r2=1705388&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html (original)
+++ manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html Fri Sep 25 23:52:56 2015
@@ -18,66 +18,66 @@
 <table class="displaytable">
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.LDAPServerNameColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.LDAPServerNameColon'))</nobr></td>
     <td class="value">$Encoder.bodyEscape($FSERVERNAME)</td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.LDAPServerPortColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.LDAPServerPortColon'))</nobr></td>
     <td class="value">$Encoder.bodyEscape($FSERVERPORT)</td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.LDAPServerBaseColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.LDAPServerBaseColon'))</nobr></td>
     <td class="value">$Encoder.bodyEscape($FSERVERBASE)</td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.LDAPBindUserColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.LDAPBindUserColon'))</nobr></td>
     <td class="value">$Encoder.bodyEscape($FBINDUSER)</td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.LDAPBindPasswordColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.LDAPBindPasswordColon'))</nobr></td>
     <td class="value">*******</td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.UserSearchBaseColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.UserSearchBaseColon'))</nobr></td>
     <td class="value">$Encoder.bodyEscape($FUSERBASE)</td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.UserSearchFilterColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.UserSearchFilterColon'))</nobr></td>
     <td class="value">$Encoder.bodyEscape($FUSERSEARCH)</td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.AddUserAuthColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.AddUserAuthColon'))</nobr></td>
     <td class="value">
 #if($FADDUSERRECORD == '1')
-    $Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.Yes'))
+    $Encoder.bodyEscape($ResourceBundle.getString('LDAP.Yes'))
 #else
-    $Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.No'))
+    $Encoder.bodyEscape($ResourceBundle.getString('LDAP.No'))
 #end
     </td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.UserNameAttrColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.UserNameAttrColon'))</nobr></td>
     <td class="value">$Encoder.bodyEscape($FUSERNAMEATTR)</td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.GroupSearchBaseColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.GroupSearchBaseColon'))</nobr></td>
     <td class="value">$Encoder.bodyEscape($FGROUPBASE)</td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.GroupSearchFilterColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.GroupSearchFilterColon'))</nobr></td>
     <td class="value">$Encoder.bodyEscape($FGROUPSEARCH)</td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.GroupNameAttributeColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.GroupNameAttributeColon'))</nobr></td>
     <td class="value">$Encoder.bodyEscape($FGROUPNAMEATTR)</td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.GroupMemberDnColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.GroupMemberDnColon'))</nobr></td>
     <td class="value">
 #if($FGROUPMEMBERDN == '1')
-    $Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.Yes'))
+    $Encoder.bodyEscape($ResourceBundle.getString('LDAP.Yes'))
 #else
-    $Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.No'))
+    $Encoder.bodyEscape($ResourceBundle.getString('LDAP.No'))
 #end
     </td>
   </tr>
@@ -118,16 +118,16 @@
 #foreach($forcedtoken in $FORCEDTOKENS)
   #if(!$seenany)
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.ForcedTokensColon'))</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.ForcedTokensColon'))</nobr></td>
     <td class="value">
   #end
-  #set(#seenany = true)
+  #set($seenany = true)
         $Encoder.bodyEscape($forcedtoken)<br/>
 #end
 #if($seenany)
     </td>
   </tr>
 #else
-  <tr><td class="message" colspan="4"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.NoTokensSpecified'))</nobr></td></tr>
+  <tr><td class="message" colspan="4"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.NoTokensSpecified'))</nobr></td></tr>
 #end
 </table>