incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1325656 - 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...
Date Fri, 13 Apr 2012 08:42:59 GMT
Author: kwright
Date: Fri Apr 13 08:42:58 2012
New Revision: 1325656

URL: http://svn.apache.org/viewvc?rev=1325656&view=rev
Log:
Debug the new UI code.

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.js
    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=1325656&r1=1325655&r2=1325656&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 08:42:58 2012
@@ -128,7 +128,7 @@ public class ActiveDirectoryAuthority ex
       int i = 0;
       while (i < configParams.getChildCount())
       {
-        ConfigurationNode cn = configParams.getChild(i++);
+        ConfigNode cn = configParams.getChild(i++);
         if (cn.getType().equals(ActiveDirectoryConfig.NODE_DOMAINCONTROLLER))
         {
           // Domain controller name is the actual key...
@@ -495,7 +495,7 @@ public class ActiveDirectoryAuthority ex
       int i = 0;
       while (i < parameters.getChildCount())
       {
-        ConfigurationNode cn = parameters.getChild(i++);
+        ConfigNode cn = parameters.getChild(i++);
         if (cn.getType().equals(ActiveDirectoryConfig.NODE_DOMAINCONTROLLER))
         {
           // Grab the info
@@ -571,7 +571,7 @@ public class ActiveDirectoryAuthority ex
       int i = 0;
       while (i < parameters.getChildCount())
       {
-        ConfigurationNode cn = parameters.getChild(i);
+        ConfigNode cn = parameters.getChild(i);
         if (cn.getType().equals(ActiveDirectoryConfig.NODE_DOMAINCONTROLLER))
           parameters.removeChild(i);
         else
@@ -580,14 +580,6 @@ public class ActiveDirectoryAuthority ex
       // Scan form fields and apply operations
       int count = Integer.parseInt(x);
       i = 0;
-      
-      String suffix;
-      String domainControllerName;
-      String userName;
-      String password;
-      String authentication;
-      String userACLsUsername;
-      ConfigurationNode cn;
       String op;
       
       Set<String> seenDomains = new HashSet<String>();
@@ -650,7 +642,7 @@ public class ActiveDirectoryAuthority ex
   {
     if (!seenDomains.contains(domainControllerName))
     {
-      ConfigurationNode cn = new ConfigurationNode(ActiveDirectoryConfig.NODE_DOMAINCONTROLLER);
+      ConfigNode cn = new ConfigNode(ActiveDirectoryConfig.NODE_DOMAINCONTROLLER);
       cn.setAttribute(ActiveDirectoryConfig.ATTR_SUFFIX,suffix);
       cn.setAttribute(ActiveDirectoryConfig.ATTR_DOMAINCONTROLLER,domainControllerName);
       cn.setAttribute(ActiveDirectoryConfig.ATTR_USERNAME,userName);

Modified: incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration.js
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration.js?rev=1325656&r1=1325655&r2=1325656&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration.js
(original)
+++ incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration.js
Fri Apr 13 08:42:58 2012
@@ -89,13 +89,13 @@ function insertDC(i)
     editconnection.dcrecord_domaincontrollername.focus();
     return;
   }
-  if (editconnection.username.value == "")
+  if (editconnection.dcrecord_username.value == "")
   {
     alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativeUserNameCannotBeNull'))");
     editconnection.dcrecord_username.focus();
     return;
   }
-  if (editconnection.authentication.value == "")
+  if (editconnection.dcrecord_authentication.value == "")
   {
     alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AuthenticationCannotBeNull'))");
     editconnection.dcrecord_authentication.focus();
@@ -113,13 +113,13 @@ function addDC()
     editconnection.dcrecord_domaincontrollername.focus();
     return;
   }
-  if (editconnection.username.value == "")
+  if (editconnection.dcrecord_username.value == "")
   {
     alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativeUserNameCannotBeNull'))");
     editconnection.dcrecord_username.focus();
     return;
   }
-  if (editconnection.authentication.value == "")
+  if (editconnection.dcrecord_authentication.value == "")
   {
     alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AuthenticationCannotBeNull'))");
     editconnection.dcrecord_authentication.focus();

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=1325656&r1=1325655&r2=1325656&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 08:42:58 2012
@@ -77,12 +77,15 @@ public class NavigationDerbyUI extends B
     link.click();
     window = testerInstance.findWindow(null);
     form = window.findForm(testerInstance.createStringDescription("editconnection"));
-    textarea = form.findTextarea(testerInstance.createStringDescription("domaincontrollername"));
+    textarea = form.findTextarea(testerInstance.createStringDescription("dcrecord_domaincontrollername"));
     textarea.setValue(testerInstance.createStringDescription("localhost"));
-    textarea = form.findTextarea(testerInstance.createStringDescription("username"));
+    textarea = form.findTextarea(testerInstance.createStringDescription("dcrecord_username"));
     textarea.setValue(testerInstance.createStringDescription("foo"));
-    textarea = form.findTextarea(testerInstance.createStringDescription("authentication"));
+    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);
 
     // Go back to the Name tab
     link = window.findLink(testerInstance.createStringDescription("Name tab"));



Mime
View raw message