You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/04/13 11:07:58 UTC
svn commit: r1325668 - in /incubator/lcf/branches/CONNECTORS-460:
connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/
connectors/activedirectory/connector/src/main/resources/org/apache/manif...
Author: kwright
Date: Fri Apr 13 09:07:58 2012
New Revision: 1325668
URL: http://svn.apache.org/viewvc?rev=1325668&view=rev
Log:
Finish debugging the UI
Modified:
incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration_DomainController.html
incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/viewConfiguration.html
incubator/lcf/branches/CONNECTORS-460/tests/activedirectory/src/test/java/org/apache/manifoldcf/activedirectory_tests/NavigationDerbyUI.java
Modified: incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java?rev=1325668&r1=1325667&r2=1325668&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java (original)
+++ incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java Fri Apr 13 09:07:58 2012
@@ -598,7 +598,7 @@ public class ActiveDirectoryAuthority ex
variableContext.getParameter("dcrecord_authentication"),
variableContext.getParameter("dcrecord_userACLsUsername"));
}
- else if (op == null || !op.equals("Delete"))
+ if (op == null || !op.equals("Delete"))
{
// Add this record back in
addDomainController(seenDomains,parameters,
Modified: incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration_DomainController.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration_DomainController.html?rev=1325668&r1=1325667&r2=1325668&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration_DomainController.html (original)
+++ incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration_DomainController.html Fri Apr 13 09:07:58 2012
@@ -20,17 +20,17 @@
<table class="displaytable">
<tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
- <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainControllers'))</nobr></td>
+ <td class="description">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainControllers'))</td>
<td class="boxcell">
<table class="formtable">
<tr class="formheaderrow">
<td class="formcolumnheader"></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainControllerName'))</nobr></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainSuffix'))</nobr></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativeUserName'))</nobr></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativePassword'))</nobr></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.Authentication'))</nobr></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.LoginNameADAttribute'))</nobr></td>
+ <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainControllerName'))</td>
+ <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainSuffix'))</td>
+ <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativeUserName'))</td>
+ <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativePassword'))</td>
+ <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.Authentication'))</td>
+ <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.LoginNameADAttribute'))</td>
</tr>
#set($dccounter = 0)
#foreach($domaincontroller in $DOMAINCONTROLLERS)
@@ -41,10 +41,12 @@
#end
<td class="formcolumncell">
<a name="dcrecord_$dccounter">
- <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('ActiveDirectoryAuthority.Delete'))"
- alt="$Encoder.attributeEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DeleteRuleNumber'))$dccounter" onclick="javascript:deleteDC($dccounter);"/>
- <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('ActiveDirectoryAuthority.InsertBefore'))"
- alt="$Encoder.attributeEscape($ResourceBundle.getString('ActiveDirectoryAuthority.InsertBeforeRuleNumber'))$dccounter" onclick="javascript:insertDC($dccounter);"/>
+ <nobr>
+ <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('ActiveDirectoryAuthority.Delete'))"
+ alt="$Encoder.attributeEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DeleteRuleNumber'))$dccounter" onclick="javascript:deleteDC($dccounter);"/>
+ <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('ActiveDirectoryAuthority.InsertBefore'))"
+ alt="$Encoder.attributeEscape($ResourceBundle.getString('ActiveDirectoryAuthority.InsertBeforeRuleNumber'))$dccounter" onclick="javascript:insertDC($dccounter);"/>
+ </nobr>
</a>
<input type="hidden" name="dcrecord_op_$dccounter" value="Continue"/>
<input type="hidden" name="dcrecord_domaincontrollername_$dccounter" value="$Encoder.attributeEscape($domaincontroller.get('DOMAINCONTROLLER'))"/>
@@ -91,7 +93,7 @@
<td class="formcolumncell"><nobr><input name="dcrecord_suffix" type="text" size="10" value=""/></nobr></td>
<td class="formcolumncell"><nobr><input name="dcrecord_username" type="text" size="10" value=""/></nobr></td>
<td class="formcolumncell"><nobr><input name="dcrecord_password" type="password" size="6" value=""/></nobr></td>
- <td class="formcolumncell"><nobr><input name="dcrecord_authentication" type="text" size="10" value=""/></nobr></td>
+ <td class="formcolumncell"><nobr><input name="dcrecord_authentication" type="text" size="10" value="DIGEST-MD5 GSSAPI"/></nobr></td>
<td class="formcolumncell">
<nobr>
<select name="dcrecord_userACLsUsername">
Modified: incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/viewConfiguration.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/viewConfiguration.html?rev=1325668&r1=1325667&r2=1325668&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/viewConfiguration.html (original)
+++ incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/viewConfiguration.html Fri Apr 13 09:07:58 2012
@@ -17,16 +17,16 @@
<table class="displaytable">
<tr>
- <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainControllers'))</nobr></td>
+ <td class="description">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainControllers'))</td>
<td class="boxcell">
<table class="formtable">
<tr class="formheaderrow">
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainControllerName'))</nobr></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainSuffix'))</nobr></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativeUserName'))</nobr></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativePassword'))</nobr></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.Authentication'))</nobr></td>
- <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.LoginNameADAttribute'))</nobr></td>
+ <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainControllerName'))</td>
+ <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainSuffix'))</td>
+ <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativeUserName'))</td>
+ <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativePassword'))</td>
+ <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.Authentication'))</td>
+ <td class="formcolumnheader">$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.LoginNameADAttribute'))</td>
</tr>
#set($dccounter = 0)
#foreach($domaincontroller in $DOMAINCONTROLLERS)
Modified: incubator/lcf/branches/CONNECTORS-460/tests/activedirectory/src/test/java/org/apache/manifoldcf/activedirectory_tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-460/tests/activedirectory/src/test/java/org/apache/manifoldcf/activedirectory_tests/NavigationDerbyUI.java?rev=1325668&r1=1325667&r2=1325668&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-460/tests/activedirectory/src/test/java/org/apache/manifoldcf/activedirectory_tests/NavigationDerbyUI.java (original)
+++ incubator/lcf/branches/CONNECTORS-460/tests/activedirectory/src/test/java/org/apache/manifoldcf/activedirectory_tests/NavigationDerbyUI.java Fri Apr 13 09:07:58 2012
@@ -81,8 +81,6 @@ public class NavigationDerbyUI extends B
textarea.setValue(testerInstance.createStringDescription("localhost"));
textarea = form.findTextarea(testerInstance.createStringDescription("dcrecord_username"));
textarea.setValue(testerInstance.createStringDescription("foo"));
- textarea = form.findTextarea(testerInstance.createStringDescription("dcrecord_authentication"));
- textarea.setValue(testerInstance.createStringDescription("bar"));
button = window.findButton(testerInstance.createStringDescription("Add rule to end of list"));
button.click();
window = testerInstance.findWindow(null);