manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1229212 - in /incubator/lcf/trunk/connectors/activedirectory/connector/src/main: java/org/apache/manifoldcf/authorities/authorities/activedirectory/ native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/
Date Mon, 09 Jan 2012 15:36:21 GMT
Author: kwright
Date: Mon Jan  9 15:36:20 2012
New Revision: 1229212

URL: http://svn.apache.org/viewvc?rev=1229212&view=rev
Log:
Patch for CONNECTORS-356.  Some reorganization still possible for this commit before the ticket
is closed.

Modified:
    incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
    incubator/lcf/trunk/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties
    incubator/lcf/trunk/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties

Modified: incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java?rev=1229212&r1=1229211&r2=1229212&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
(original)
+++ incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
Mon Jan  9 15:36:20 2012
@@ -357,50 +357,50 @@ public class ActiveDirectoryAuthority ex
 "{\n"+
 "  if (editconnection.domaincontrollername.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Enter a domain controller server name\");\n"+
-"    SelectTab(\"Domain Controller\");\n"+
+"    alert(" + Messages.getString(locale,"ActiveDirectoryAuthority.EnterADomainControllerServerName")
+ ");\n"+
+"    SelectTab(" + Messages.getString(locale,"ActiveDirectoryAuthority.DomainController")
+ ");\n"+
 "    editconnection.domaincontrollername.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.username.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Administrative user name cannot be null\");\n"+
-"    SelectTab(\"Domain Controller\");\n"+
+"    alert(" + Messages.getString(locale,"ActiveDirectoryAuthority.AdministrativeUserNameCannotBeNull")
+ ");\n"+
+"    SelectTab(" + Messages.getString(locale,"ActiveDirectoryAuthority.DomainController")
+ ");\n"+
 "    editconnection.username.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.authentication.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Authentication cannot be null\");\n"+
-"    SelectTab(\"Domain Controller\");\n"+
+"    alert(" + Messages.getString(locale,"ActiveDirectoryAuthority.AuthenticationCannotBeNull")
+ ");\n"+
+"    SelectTab(" + Messages.getString(locale,"ActiveDirectoryAuthority.DomainController")
+ ");\n"+
 "    editconnection.authentication.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.cachelifetime.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Cache lifetime cannot be null\");\n"+
-"    SelectTab(\"Cache\");\n"+
+"    alert(" + Messages.getString(locale,"ActiveDirectoryAuthority.CacheLifetimeCannotBeNull")
+ ");\n"+
+"    SelectTab(" + Messages.getString(locale,"ActiveDirectoryAuthority.Cache") + ");\n"+
 "    editconnection.cachelifetime.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.cachelifetime.value != \"\" && !isInteger(editconnection.cachelifetime.value))\n"+
 "  {\n"+
-"    alert(\"Cache lifetime must be an integer\");\n"+
-"    SelectTab(\"Cache\");\n"+
+"    alert(" + Messages.getString(locale,"ActiveDirectoryAuthority.CacheLifetimeMustBeAnInteger")
+ ");\n"+
+"    SelectTab(" + Messages.getString(locale,"ActiveDirectoryAuthority.Cache") + ");\n"+
 "    editconnection.cachelifetime.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.cachelrusize.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Cache LRU size cannot be null\");\n"+
-"    SelectTab(\"Cache\");\n"+
+"    alert(" + Messages.getString(locale,"ActiveDirectoryAuthority.CacheLRUSizeCannotBeNull")
+ ");\n"+
+"    SelectTab(" + Messages.getString(locale,"ActiveDirectoryAuthority.Cache") + ");\n"+
 "    editconnection.cachelrusize.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.cachelrusize.value != \"\" && !isInteger(editconnection.cachelrusize.value))\n"+
 "  {\n"+
-"    alert(\"Cache LRU size must be an integer\");\n"+
-"    SelectTab(\"Cache\");\n"+
+"    alert(" + Messages.getString(locale,"ActiveDirectoryAuthority.CacheLRUSizeMustBeAnInteger")
+ ");\n"+
+"    SelectTab(" + Messages.getString(locale,"ActiveDirectoryAuthority.Cache") + ");\n"+
 "    editconnection.cachelrusize.focus();\n"+
 "    return false;\n"+
 "  }\n"+
@@ -587,14 +587,14 @@ public class ActiveDirectoryAuthority ex
       else if (param.length() >="cache lifetime".length() && param.substring(param.length()-"cache
lifetime".length()).equalsIgnoreCase("cache lifetime"))
       {
         out.print(
-"      <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(param)+"="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)+"
minutes</nobr><br/>\n"
+"      <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(param)+"="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)+"
" + Messages.getString(locale,"ActiveDirectoryAuthority.minutes") + "</nobr><br/>\n"
         );
       }      
       else if (param.length() >="keystore".length() && param.substring(param.length()-"keystore".length()).equalsIgnoreCase("keystore"))
       {
         IKeystoreManager kmanager = KeystoreManagerFactory.make("",value);
         out.print(
-"      <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(param)+"=<"+Integer.toString(kmanager.getContents().length)+"
certificate(s)></nobr><br/>\n"
+"      <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(param)+"=<"+Integer.toString(kmanager.getContents().length)+"
" + Messages.getString(locale,"ActiveDirectoryAuthority.certificate") + "></nobr><br/>\n"
         );
       }
       else

Modified: incubator/lcf/trunk/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties?rev=1229212&r1=1229211&r2=1229212&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties
(original)
+++ incubator/lcf/trunk/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_en_US.properties
Mon Jan  9 15:36:20 2012
@@ -24,4 +24,28 @@ ActiveDirectoryAuthority.CacheLifetime=C
 ActiveDirectoryAuthority.CacheLRUSize=Cache LRU size:
 ActiveDirectoryAuthority.Parameters=Parameters:
 ActiveDirectoryAuthority.minutes=minutes
+ActiveDirectoryAuthority.EnterADomainControllerServerName=\"Enter a domain controller server
name\"
+ActiveDirectoryAuthority.Domain Controller2=\"Domain Controller\"
+ActiveDirectoryAuthority.AdministrativeUserNameCannotBeNull=\"Administrative user name cannot
be null\"
+ActiveDirectoryAuthority.AuthenticationCannotBeNull=\"Authentication cannot be null\"
+ActiveDirectoryAuthority.CacheLifetimeCannotBeNull=\"Cache lifetime cannot be null\"
+ActiveDirectoryAuthority.CacheLifetimeMustBeAnInteger=\"Cache lifetime must be an integer\"
+ActiveDirectoryAuthority.CacheLRUSizeCannotBeNull=\"Cache LRU size cannot be null\"
+ActiveDirectoryAuthority.CacheLRUSizeMustBeAnInteger=\"Cache LRU size must be an integer\"
+ActiveDirectoryAuthority.certificate=certificate(s)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 

Modified: incubator/lcf/trunk/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties?rev=1229212&r1=1229211&r2=1229212&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties
(original)
+++ incubator/lcf/trunk/connectors/activedirectory/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/activedirectory/common_ja_JP.properties
Mon Jan  9 15:36:20 2012
@@ -24,4 +24,12 @@ ActiveDirectoryAuthority.CacheLifetime=�
 ActiveDirectoryAuthority.CacheLRUSize=キャッシュLRUサイズ:
 ActiveDirectoryAuthority.Parameters=引数:
 ActiveDirectoryAuthority.minutes=分
-
+ActiveDirectoryAuthority.EnterADomainControllerServerName=\"ドメインコントローラ名を入力してください\"
+ActiveDirectoryAuthority.Domain Controller2=\"ドメインコントローラ\"
+ActiveDirectoryAuthority.AdministrativeUserNameCannotBeNull=\"管理者名を入力してください\"
+ActiveDirectoryAuthority.AuthenticationCannotBeNull=\"認証情報を入力してください\"
+ActiveDirectoryAuthority.CacheLifetimeCannotBeNull=\"キャッシュライフタイムを入力してください\"
+ActiveDirectoryAuthority.CacheLifetimeMustBeAnInteger=\"キャッシュライフタイムには整数を入力してください\"
+ActiveDirectoryAuthority.CacheLRUSizeCannotBeNull=\"キャッシュLRUサイズを入力してください\"
+ActiveDirectoryAuthority.CacheLRUSizeMustBeAnInteger=\"キャッシュLRUサイズには整数を入力してください\"
+ActiveDirectoryAuthority.certificate=証明書



Mime
View raw message