incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1325459 - 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...
Date Thu, 12 Apr 2012 19:33:18 GMT
Author: kwright
Date: Thu Apr 12 19:33:17 2012
New Revision: 1325459

URL: http://svn.apache.org/viewvc?rev=1325459&view=rev
Log:
Get connection view working properly with new data structure.

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/viewConfiguration.html

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=1325459&r1=1325458&r2=1325459&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
Thu Apr 12 19:33:17 2012
@@ -15,7 +15,9 @@
 
 ActiveDirectoryAuthority.DomainController=Domain Controller
 ActiveDirectoryAuthority.Cache=Cache
+ActiveDirectoryAuthority.DomainControllers=Domain Controllers:
 ActiveDirectoryAuthority.DomainControllerName=Domain controller name:
+ActiveDirectoryAuthority.DomainSuffix=Domain suffix
 ActiveDirectoryAuthority.AdministrativeUserName=Administrative user name:
 ActiveDirectoryAuthority.AdministrativePassword=Administrative password:
 ActiveDirectoryAuthority.Authentication=Authentication:

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=1325459&r1=1325458&r2=1325459&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
Thu Apr 12 19:33:17 2012
@@ -15,7 +15,9 @@
 
 ActiveDirectoryAuthority.DomainController=ドメインコントローラ
 ActiveDirectoryAuthority.Cache=キャッシュ
+ActiveDirectoryAuthority.DomainControllers=Domain Controllers:
 ActiveDirectoryAuthority.DomainControllerName=ドメインコントローラ名:
+ActiveDirectoryAuthority.DomainSuffix=Domain suffix
 ActiveDirectoryAuthority.AdministrativeUserName=管理者:
 ActiveDirectoryAuthority.AdministrativePassword=管理者パスワード:
 ActiveDirectoryAuthority.Authentication=認証:

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=1325459&r1=1325458&r2=1325459&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
Thu Apr 12 19:33:17 2012
@@ -16,26 +16,36 @@
 -->
 
 <table class="displaytable">
-  <tr><td class="separator" colspan="2"><hr/></td></tr>
-  <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainControllerName'))</nobr></td>
-    <td class="value"><nobr>$Encoder.bodyEscape($DOMAINCONTROLLER)</nobr></td>
-  </tr>
-  <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativeUserName'))</nobr></td>
-    <td class="value"><nobr>$Encoder.bodyEscape($USERNAME)</nobr></td>
-  </tr>
-  <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.AdministrativePassword'))</nobr></td>
-    <td class="value">********</td>
-  </tr>
-  <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.Authentication'))</nobr></td>
-    <td class="value"><nobr>$Encoder.bodyEscape($AUTHENTICATION)</nobr></td>
-  </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.LoginNameADAttribute'))</nobr></td>
-    <td class="value"><nobr>$Encoder.bodyEscape($USERACLsUSERNAME)</nobr></td>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ActiveDirectoryAuthority.DomainControllers'))</nobr></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>
+        </tr>
+#set($dccounter = 0)
+#foreach($domaincontroller in $DOMAINCONTROLLERS)
+  #if(($dccounter % 2) == 0)
+        <tr class="evenformrow">
+  #else
+        <tr class="oddformrow">
+  #end
+          <td class="formcolumncell"><nobr>$Encoder.bodyEscape($domaincontroller.get('DOMAINCONTROLLER'))</nobr></td>
+          <td class="formcolumncell"><nobr>$Encoder.bodyEscape($domaincontroller.get('SUFFIX'))</nobr></td>
+          <td class="formcolumncell"><nobr>$Encoder.bodyEscape($domaincontroller.get('USERNAME'))</nobr></td>
+          <td class="formcolumncell"><nobr>******</nobr></td>
+          <td class="formcolumncell"><nobr>$Encoder.bodyEscape($domaincontroller.get('AUTHENTICATION'))</nobr></td>
+          <td class="formcolumncell"><nobr>$Encoder.bodyEscape($domaincontroller.get('USERACLsUSERNAME'))</nobr></td>
+        </tr>
+  #set($dccounter = $dccounter + 1)
+#end
+      </table>
+    </td>
   </tr>
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>



Mime
View raw message