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 05:27:56 UTC

svn commit: r1325598 - in /incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main: native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/ resources/org/apache/manifoldcf/authorities/authorities/activedi...

Author: kwright
Date: Fri Apr 13 03:27:56 2012
New Revision: 1325598

URL: http://svn.apache.org/viewvc?rev=1325598&view=rev
Log:
Finish coding authority changes

Modified:
    incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties
    incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties
    incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/activedirectory/editConfiguration.js

Modified: incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties?rev=1325598&r1=1325597&r2=1325598&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties (original)
+++ incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties Fri Apr 13 03:27:56 2012
@@ -16,16 +16,21 @@
 ActiveDirectoryAuthority.DomainController=Domain Controller
 ActiveDirectoryAuthority.Cache=Cache
 ActiveDirectoryAuthority.DomainControllers=Domain Controllers:
-ActiveDirectoryAuthority.DomainControllerName=Domain controller name:
+ActiveDirectoryAuthority.DomainControllerName=Domain controller name
 ActiveDirectoryAuthority.DomainSuffix=Domain suffix
-ActiveDirectoryAuthority.AdministrativeUserName=Administrative user name:
-ActiveDirectoryAuthority.AdministrativePassword=Administrative password:
-ActiveDirectoryAuthority.Authentication=Authentication:
-ActiveDirectoryAuthority.LoginNameADAttribute=Login name AD attribute:
+ActiveDirectoryAuthority.AdministrativeUserName=Administrative user name
+ActiveDirectoryAuthority.AdministrativePassword=Administrative password
+ActiveDirectoryAuthority.Authentication=Authentication
+ActiveDirectoryAuthority.LoginNameADAttribute=Login name AD attribute
 ActiveDirectoryAuthority.CacheLifetime=Cache lifetime:
 ActiveDirectoryAuthority.CacheLRUSize=Cache LRU size:
-ActiveDirectoryAuthority.Parameters=Parameters:
 ActiveDirectoryAuthority.minutes=minutes
+ActiveDirectoryAuthority.AddToEnd=Add to End
+ActiveDirectoryAuthority.AddRuleToEnd=Add rule to end of list
+ActiveDirectoryAuthority.Delete=Delete
+ActiveDirectoryAuthority.DeleteRuleNumber=Delete rule #
+ActiveDirectoryAuthority.InsertBefore=Insert Before
+ActiveDirectoryAuthority.InsertBeforeRuleNumber=Insert before rule #
 ActiveDirectoryAuthority.EnterADomainControllerServerName=Enter a domain controller server name
 ActiveDirectoryAuthority.Domain Controller2=Domain Controller
 ActiveDirectoryAuthority.AdministrativeUserNameCannotBeNull=Administrative user name cannot be null

Modified: incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties?rev=1325598&r1=1325597&r2=1325598&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties (original)
+++ incubator/lcf/branches/CONNECTORS-460/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties Fri Apr 13 03:27:56 2012
@@ -16,16 +16,21 @@
 ActiveDirectoryAuthority.DomainController=ドメインコントローラ
 ActiveDirectoryAuthority.Cache=キャッシュ
 ActiveDirectoryAuthority.DomainControllers=Domain Controllers:
-ActiveDirectoryAuthority.DomainControllerName=ドメインコントローラ名：
+ActiveDirectoryAuthority.DomainControllerName=ドメインコントローラ名
 ActiveDirectoryAuthority.DomainSuffix=Domain suffix
-ActiveDirectoryAuthority.AdministrativeUserName=管理者：
-ActiveDirectoryAuthority.AdministrativePassword=管理者パスワード：
-ActiveDirectoryAuthority.Authentication=認証：
-ActiveDirectoryAuthority.LoginNameADAttribute=ログイン名AD属性：
+ActiveDirectoryAuthority.AdministrativeUserName=管理者
+ActiveDirectoryAuthority.AdministrativePassword=管理者パスワード
+ActiveDirectoryAuthority.Authentication=認証
+ActiveDirectoryAuthority.LoginNameADAttribute=ログイン名AD属性
 ActiveDirectoryAuthority.CacheLifetime=キャッシュライフタイム：
 ActiveDirectoryAuthority.CacheLRUSize=キャッシュLRUサイズ：
-ActiveDirectoryAuthority.Parameters=引数：
 ActiveDirectoryAuthority.minutes=分
+ActiveDirectoryAuthority.AddToEnd=Add to End
+ActiveDirectoryAuthority.AddRuleToEnd=Add rule to end of list
+ActiveDirectoryAuthority.Delete=Delete
+ActiveDirectoryAuthority.DeleteRuleNumber=Delete rule #
+ActiveDirectoryAuthority.InsertBefore=Insert Before
+ActiveDirectoryAuthority.InsertBeforeRuleNumber=Insert before rule #
 ActiveDirectoryAuthority.EnterADomainControllerServerName=ドメインコントローラ名を入力してください
 ActiveDirectoryAuthority.Domain Controller2=ドメインコントローラ
 ActiveDirectoryAuthority.AdministrativeUserNameCannotBeNull=管理者名を入力してください

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=1325598&r1=1325597&r2=1325598&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 03:27:56 2012
@@ -19,32 +19,31 @@
 <!--
 function checkConfig()
 {
+  var i = 0;
+  var count = editconnection.dcrecord_count.value;
+  while (i < count)
+  {
+    var username = eval("editconnection.dcrecord_username_"+i+".value");
+    if (username == "")
+    {
+      alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativeUserNameCannotBeNull'))");
+      eval("editconnection.dcrecord_username_"+i+".focus()");
+      return false;
+    }
+    var authentication = eval("editconnection.dcrecord_authentication_"+i+".value");
+    if (authentication == "")
+    {
+      alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AuthenticationCannotBeNull'))");
+      eval("editconnection.dcrecord_authentication_"+i+".focus()");
+      return false;
+    }
+    i += 1;
+  }
   return true;
 }
 
 function checkConfigForSave()
 {
-  if (editconnection.domaincontrollername.value == "")
-  {
-    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.EnterADomainControllerServerName'))");
-    SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainController'))");
-    editconnection.domaincontrollername.focus();
-    return false;
-  }
-  if (editconnection.username.value == "")
-  {
-    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativeUserNameCannotBeNull'))");
-    SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainController'))");
-    editconnection.username.focus();
-    return false;
-  }
-  if (editconnection.authentication.value == "")
-  {
-    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AuthenticationCannotBeNull'))");
-    SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainController'))");
-    editconnection.authentication.focus();
-    return false;
-  }
   if (editconnection.cachelifetime.value == "")
   {
     alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.CacheLifetimeCannotBeNull'))");
@@ -76,6 +75,60 @@ function checkConfigForSave()
   return true;
 }
 
+function deleteDC(i)
+{
+  eval("editconnection.dcrecord_op_"+i+".value=\"Delete\"");
+  postFormSetAnchor("dcrecord");
+}
+
+function insertDC(i)
+{
+  if (editconnection.dcrecord_domaincontrollername.value == "")
+  {
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.EnterADomainControllerServerName'))");
+    editconnection.dcrecord_domaincontrollername.focus();
+    return;
+  }
+  if (editconnection.username.value == "")
+  {
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativeUserNameCannotBeNull'))");
+    editconnection.dcrecord_username.focus();
+    return;
+  }
+  if (editconnection.authentication.value == "")
+  {
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AuthenticationCannotBeNull'))");
+    editconnection.dcrecord_authentication.focus();
+    return;
+  }
+  eval("editconnection.dcrecord_op_"+i+".value=\"Insert\"");
+  postFormSetAnchor("dcrecord_"+i);
+}
+
+function addDC()
+{
+  if (editconnection.dcrecord_domaincontrollername.value == "")
+  {
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.EnterADomainControllerServerName'))");
+    editconnection.dcrecord_domaincontrollername.focus();
+    return;
+  }
+  if (editconnection.username.value == "")
+  {
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativeUserNameCannotBeNull'))");
+    editconnection.dcrecord_username.focus();
+    return;
+  }
+  if (editconnection.authentication.value == "")
+  {
+    alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AuthenticationCannotBeNull'))");
+    editconnection.dcrecord_authentication.focus();
+    return;
+  }
+  editconnection.dcrecord_op.value="Add";
+  postFormSetAnchor("dcrecord");
+}
+
 //-->
 </script>