You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by ki...@apache.org on 2015/07/09 00:01:09 UTC
svn commit: r1689968 [14/14] - in /manifoldcf/branches/CONNECTORS-1196: ./
connectors/elasticsearch/
connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/
connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf...
Modified: manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties Wed Jul 8 22:01:08 2015
@@ -528,7 +528,6 @@ showjobstatus.Active=Active
showjobstatus.Processed=Processed
showjobstatus.RefreshStatus=Refresh status
showjobstatus.Refresh=Refresh
-showjobstatus.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
showjobstatus.StatusOfJobs=Status of Jobs
showjobstatus.Notyetrun=Not yet run
@@ -575,7 +574,6 @@ documentstatus.ExecuteThisQuery=Execute
documentstatus.Continue=Continue
documentstatus.PleaseSelectAtLeastOneJob=Please select at least one job
documentstatus.PleaseSelectaConnection=Please select a connection
-documentstatus.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
documentstatus.Previous=Previous
documentstatus.Next=Next
documentstatus.Rows=Rows:
@@ -620,7 +618,6 @@ queuestatus.ExecuteThisQuery=Execute thi
queuestatus.Continue=Continue
queuestatus.PleaseSelectAtLeastOneJob=Please select at least one job
queuestatus.PleaseSelectaConnection=Please select a connection
-queuestatus.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
queuestatus.DocumentsThatHaveNeverBeenProcessed=Documents that have never been processed
queuestatus.DocumentsProcessedAtLeastOnce=Documents processed at least once
queuestatus.DocumentsOutOfScope=Documents that are out of scope
@@ -696,7 +693,6 @@ simplereport.Next=Next
simplereport.Rows=Rows:
simplereport.RowsPerPage=Rows per page:
simplereport.PleaseSelectAConnection=Please select a connection
-simplereport.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
simplereport.EnterALegalNumberForRowsPerPage=Enter a legal number for rows per page
simplereport.EntityMatchMustBeAValidRegularExpression=Entity match must be a valid regular expression
simplereport.ResultCodeMatchMustBeAValidRegularExpression=Result code match must be a valid regular expression
@@ -738,7 +734,6 @@ maxactivityreport.Next=Next
maxactivityreport.Rows=Rows:
maxactivityreport.RowsPerPage=Rows per page:
maxactivityreport.PleaseSelectAConnection=Please select a connection
-maxactivityreport.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
maxactivityreport.EnterALegalNumberForRowsPerPage=Enter a legal number for rows per page
maxactivityreport.EnterALegalIntervalSizeInMinutes=Enter a legal interval size, in minutes
maxactivityreport.IdentifierClassDescriptionCannotBeEmpty=Identifier class description cannot be empty
@@ -783,7 +778,6 @@ maxbandwidthreport.NextPage=Next page
maxbandwidthreport.Next=Next
maxbandwidthreport.RowsPerPage=Rows per page:
maxbandwidthreport.PleaseSelectAConnection=Please select a connection
-maxbandwidthreport.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
maxbandwidthreport.HighestBandwidth2=Highest Bandwith
maxbandwidthreport.Rows=Rows:
maxbandwidthreport.Next=Next
@@ -829,7 +823,6 @@ resultreport.Next=Next
resultreport.Rows=Rows:
resultreport.RowsPerPage=Rows per page:
resultreport.PleaseSelectAConnection=Please select a connection
-resultreport.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
resultreport.IdentifierClass=Identifier Class
resultreport.ResultClass=Result Class
resultreport.EventCount=Event Count
@@ -847,6 +840,11 @@ resultreport.ResultCodeMatchMustBeAValid
error.ApacheManifoldCFError=Apache ManifoldCF: Error
error.Error=Error!
error.Return=Return
+error.Unauthorized=Apache ManifoldCF: Unauthorized activity
+error.UnauthorizedAccess=You do not have permissions to perform this activity
+error.ApacheManifoldCFMaintenanceUnderway=Apache ManifoldCF: Maintenance underway
+error.MaintenanceUnderway=Maintenance underway
+error.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF: View Job
viewjob.ViewAJob=View a Job
Modified: manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties Wed Jul 8 22:01:08 2015
@@ -528,7 +528,6 @@ showjobstatus.Active=ã¢ã¯ã�
showjobstatus.Processed=æ¸ã¿
showjobstatus.RefreshStatus=ç¶æ
ä¸è¦§ãæ´æ°
showjobstatus.Refresh=æ´æ°
-showjobstatus.PleaseTryAgainLater=ä¿å®å¦çä¸ã§ããå°ã
ãå¾
ã¡ãã ããã
showjobstatus.StatusOfJobs=ã¸ã§ãã®ç¶æ
showjobstatus.Notyetrun=æªå®è¡
@@ -575,7 +574,6 @@ documentstatus.ExecuteThisQuery=ã¯ã
documentstatus.Continue=次ã¸
documentstatus.PleaseSelectAtLeastOneJob=ã¸ã§ããä¸ã¤ä»¥ä¸é¸æãã¦ãã ãã
documentstatus.PleaseSelectaConnection=ã³ãã¯ã·ã§ã³ãé¸æãã¦ãã ãã
-documentstatus.PleaseTryAgainLater=ä¿å®å¦çä¸ã§ããå°ã
ãå¾
ã¡ãã ããã
documentstatus.Previous=åã¸
documentstatus.Next=次ã¸
documentstatus.Rows=è¡ï¼
@@ -620,7 +618,6 @@ queuestatus.ExecuteThisQuery=ã¯ã�
queuestatus.Continue=次ã¸
queuestatus.PleaseSelectAtLeastOneJob=ã¸ã§ããä¸ã¤ä»¥ä¸é¸æãã¦ãã ãã
queuestatus.PleaseSelectaConnection=ã³ãã¯ã·ã§ã³ãé¸æãã¦ãã ãã
-queuestatus.PleaseTryAgainLater=ä¿å®å¦çä¸ã§ããå°ã
ãå¾
ã¡ãã ããã
queuestatus.DocumentsThatHaveNeverBeenProcessed=å¦çãä¸åº¦ãããã¦ããªãã³ã³ãã³ã
queuestatus.DocumentsProcessedAtLeastOnce=ï¼å以ä¸å¦çãããã³ã³ãã³ã
queuestatus.DocumentsOutOfScope=ç¯å²å¤ã§ããææ¸
@@ -696,7 +693,6 @@ simplereport.Next=次ã¸
simplereport.Rows=Rows:
simplereport.RowsPerPage=è¡ï¼ãã¼ã¸ï¼
simplereport.PleaseSelectAConnection=ã³ãã¯ã·ã§ã³ãé¸æãã¦ãã ãã
-simplereport.PleaseTryAgainLater=ä¿å®å¦çä¸ã§ããå°ã
ãå¾
ã¡ãã ããã
simplereport.EnterALegalNumberForRowsPerPage=æ£ãããã¼ã¸æ¯ã®è¡æ°ãå
¥åãã¦ãã ãã
simplereport.EntityMatchMustBeAValidRegularExpression=ã¨ã³ãã£ãã£ãã¿ã¼ã³ã¯æ£è¦è¡¨ç¾å¼ã«ä¸è´ããå¿
è¦ãããã¾ã
simplereport.ResultCodeMatchMustBeAValidRegularExpression=çµæã³ã¼ãã¯æ£è¦è¡¨ç¾å¼ã«ä¸è´ããå¿
è¦ãããã¾ã
@@ -738,7 +734,6 @@ maxactivityreport.Next=次ã¸
maxactivityreport.Rows=Rows:
maxactivityreport.RowsPerPage=è¡ï¼ãã¼ã¸ï¼
maxactivityreport.PleaseSelectAConnection=ã³ãã¯ã·ã§ã³ãé¸æãã¦ãã ãã
-maxactivityreport.PleaseTryAgainLater=ä¿å®å¦çä¸ã§ããå°ã
ãå¾
ã¡ãã ããã
maxactivityreport.EnterALegalNumberForRowsPerPage=æ£ãããã¼ã¸æ¯ã®è¡æ°ãå
¥åãã¦ãã ãã
maxactivityreport.EnterALegalIntervalSizeInMinutes=æ£ããééå¤ãå
¥åãã¦ãã ããï¼åï¼
maxactivityreport.IdentifierClassDescriptionCannotBeEmpty=IDã¯ã©ã¹ãã¿ã¼ã³ãå
¥åãã¦ãã ãã
@@ -784,7 +779,6 @@ maxbandwidthreport.NextPage=次ã®
maxbandwidthreport.Next=次ã¸
maxbandwidthreport.RowsPerPage=è¡ï¼ãã¼ã¸ï¼
maxbandwidthreport.PleaseSelectAConnection=ã³ãã¯ã·ã§ã³ãé¸æãã¦ãã ãã
-maxbandwidthreport.PleaseTryAgainLater=ä¿å®å¦çä¸ã§ããå°ã
ãå¾
ã¡ãã ããã
maxbandwidthreport.HighestBandwidth2=æ大ãã³ãå¹
maxbandwidthreport.Rows=è¡ï¼
maxbandwidthreport.Next=次ã¸
@@ -830,7 +824,6 @@ resultreport.Next=次ã¸
resultreport.Rows=è¡ï¼
resultreport.RowsPerPage=è¡ï¼ãã¼ã¸ï¼
resultreport.PleaseSelectAConnection=ã³ãã¯ã·ã§ã³ãé¸æãã¦ãã ãã
-resultreport.PleaseTryAgainLater=ä¿å®å¦çä¸ã§ããå°ã
ãå¾
ã¡ãã ããã
resultreport.IdentifierClass=IDã¯ã©ã¹
resultreport.ResultClass=çµæã¯ã©ã¹
resultreport.EventCount=ã¤ãã³ãæ°
@@ -848,6 +841,11 @@ resultreport.ResultCodeMatchMustBeAValid
error.ApacheManifoldCFError=Apache ManifoldCFï¼ã¨ã©ã¼
error.Error=ã¨ã©ã¼
error.Return=æ»ã
+error.Unauthorized=Apache ManifoldCF: Unauthorized activity
+error.UnauthorizedAccess=You do not have permissions to perform this activity
+error.ApacheManifoldCFMaintenanceUnderway=Apache ManifoldCF: Maintenance underway
+error.MaintenanceUnderway=Maintenance underway
+error.PleaseTryAgainLater=ä¿å®å¦çä¸ã§ããå°ã
ãå¾
ã¡ãã ããã
viewjob.ApacheManifoldCFViewJob=Apache ManifoldCFï¼ã¸ã§ãæ
å ±
viewjob.ViewAJob=ã¸ã§ãæ
å ±
Modified: manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties Wed Jul 8 22:01:08 2015
@@ -528,7 +528,6 @@ showjobstatus.Active=ææ
showjobstatus.Processed=å·²å¤ç
showjobstatus.RefreshStatus=å·æ°ç¶æå表
showjobstatus.Refresh=å·æ°
-showjobstatus.PleaseTryAgainLater=ç»´æ¤ä¸ã请ç¨çã
showjobstatus.StatusOfJobs=ä½ä¸ç¶æ
showjobstatus.Notyetrun=è¿æªæ§è¡
@@ -575,7 +574,6 @@ documentstatus.ExecuteThisQuery=æ§è
documentstatus.Continue=ä¸ä¸ä¸ª
documentstatus.PleaseSelectAtLeastOneJob=请éæ©è³å°ä¸ä¸ªä½ä¸
documentstatus.PleaseSelectaConnection=请éæ©ä¸ä¸ªè¿æ¥
-documentstatus.PleaseTryAgainLater=ç»´æ¤ä¸ã请ç¨çã
documentstatus.Previous=ä¸ä¸ä¸ª
documentstatus.Next=ä¸ä¸ä¸ª
documentstatus.Rows=è¡:
@@ -620,7 +618,6 @@ queuestatus.ExecuteThisQuery=æ§è¡�
queuestatus.Continue=ä¸ä¸ä¸ª
queuestatus.PleaseSelectAtLeastOneJob=请éæ©è³å°ä¸ä¸ªä½ä¸
queuestatus.PleaseSelectaConnection=请éæ©ä¸ä¸ªè¿æ¥
-queuestatus.PleaseTryAgainLater=ç»´æ¤ä¸ã请ç¨çã
queuestatus.DocumentsThatHaveNeverBeenProcessed=ä»æªå¤çè¿çææ¡£
queuestatus.DocumentsProcessedAtLeastOnce=è³å°å¤çè¿ä¸æ¬¡çææ¡£
queuestatus.DocumentsOutOfScope=èå´ä¹å¤çææ¡£
@@ -696,7 +693,6 @@ simplereport.Next=ä¸ä¸ä¸ª
simplereport.Rows=Rows:
simplereport.RowsPerPage=è¡ï¼é¡µ:
simplereport.PleaseSelectAConnection=请éæ©è¿æ¥
-simplereport.PleaseTryAgainLater=ç»´æ¤ä¸ã请ç¨çã
simplereport.EnterALegalNumberForRowsPerPage=请æ£ç¡®è¾å
¥æ¯é¡µçè¡æ°
simplereport.EntityMatchMustBeAValidRegularExpression=å®ä½å¹é
é为æææ£å表达å¼
simplereport.ResultCodeMatchMustBeAValidRegularExpression=ç»æ代ç é为æææ£å表达å¼
@@ -738,7 +734,6 @@ maxactivityreport.Next=ä¸ä¸ä¸�
maxactivityreport.Rows=Rows:
maxactivityreport.RowsPerPage=è¡ï¼é¡µ:
maxactivityreport.PleaseSelectAConnection=请éæ©è¿æ¥
-maxactivityreport.PleaseTryAgainLater=ç»´æ¤ä¸ã请ç¨çã
maxactivityreport.EnterALegalNumberForRowsPerPage=请æ£ç¡®è¾å
¥æ¯é¡µçè¡æ°
maxactivityreport.EnterALegalIntervalSizeInMinutes=请æ£ç¡®è¾å
¥é´é(å)
maxactivityreport.IdentifierClassDescriptionCannotBeEmpty=请è¾å
¥æ è¯ç¬¦ç±»è¯´æ
@@ -784,7 +779,6 @@ maxbandwidthreport.NextPage=ä¸ä¸
maxbandwidthreport.Next=ä¸ä¸ä¸ª
maxbandwidthreport.RowsPerPage=è¡ï¼é¡µ:
maxbandwidthreport.PleaseSelectAConnection=请éæ©è¿æ¥
-maxbandwidthreport.PleaseTryAgainLater=ç»´æ¤ä¸ã请ç¨çã
maxbandwidthreport.HighestBandwidth2=æ大带宽
maxbandwidthreport.Rows=è¡:
maxbandwidthreport.Next=ä¸ä¸é¡µ
@@ -830,7 +824,6 @@ resultreport.Next=ä¸ä¸ä¸ª
resultreport.Rows=è¡:
resultreport.RowsPerPage=è¡ï¼é¡µ:
resultreport.PleaseSelectAConnection=请éæ©è¿æ¥
-resultreport.PleaseTryAgainLater=ç»´æ¤ä¸ã请ç¨çã
resultreport.IdentifierClass=æ è¯ç¬¦ç±»
resultreport.ResultClass=ç»æç±»
resultreport.EventCount=äºä»¶æ°
@@ -848,6 +841,11 @@ resultreport.ResultCodeMatchMustBeAValid
error.ApacheManifoldCFError=Apache ManifoldCF: é误
error.Error=é误
error.Return=è¿å
+error.Unauthorized=Apache ManifoldCF: Unauthorized activity
+error.UnauthorizedAccess=You do not have permissions to perform this activity
+error.ApacheManifoldCFMaintenanceUnderway=Apache ManifoldCF: Maintenance underway
+error.MaintenanceUnderway=Maintenance underway
+error.PleaseTryAgainLater=ç»´æ¤ä¸ã请ç¨çã
viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF: ä½ä¸ä¿¡æ¯
viewjob.ViewAJob=ä½ä¸ä¿¡æ¯
Modified: manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml (original)
+++ manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml Wed Jul 8 22:01:08 2015
@@ -1037,12 +1037,18 @@ start[.bat|.sh]
<table>
<caption>property.xml properties</caption>
<tr><th>Property</th><th>Required?</th><th>Function</th></tr>
- <tr><td>org.apache.manifoldcf.login.name</td><td>No</td><td>Crawler UI login user ID (defaults to "admin")</td></tr>
- <tr><td>org.apache.manifoldcf.login.password</td><td>No</td><td>Crawler UI login user password (defaults to "admin")</td></tr>
- <tr><td>org.apache.manifoldcf.login.password.obfuscated</td><td>No</td><td>Obfuscated crawler UI login user password (defaults to "admin")</td></tr>
- <tr><td>org.apache.manifoldcf.login.apiname</td><td>No</td><td>API login user ID (defaults to "")</td></tr>
- <tr><td>org.apache.manifoldcf.login.apipassword</td><td>No</td><td>API login user password (defaults to "")</td></tr>
- <tr><td>org.apache.manifoldcf.login.apipassword.obfuscated</td><td>No</td><td>Obfuscated API login user password (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.authimplementationclass</td><td>No</td><td>Auth implementation class (defaults to "org.apache.manifoldcf.core.auth.DefaultAuthenticator", set to "org.apache.manifoldcf.core.auth.LdapAuthenticator" for LDAP)</td></tr>
+ <tr><td>org.apache.manifoldcf.login.name</td><td>No</td><td>Default auth implementation crawler UI login user ID (defaults to "admin")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.password</td><td>No</td><td>Default auth implementation crawler UI login user password (defaults to "admin")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.password.obfuscated</td><td>No</td><td>Default auth implementation obfuscated crawler UI login user password (defaults to "admin")</td></tr>
+ <tr><td>org.apache.manifoldcf.apilogin.name</td><td>No</td><td>Default auth implementation API login user ID (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.apilogin.password</td><td>No</td><td>Default auth implementation API login user password (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.apilogin.password.obfuscated</td><td>No</td><td>Default auth implementation obfuscated API login user password (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.providerurl</td><td>No</td><td>LDAP auth implementation provider URL (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.securityauthenticationtype</td><td>No</td><td>LDAP auth implementation auth type (defaults to "simple")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.securityprincipal</td><td>No</td><td>LDAP auth implementation security principal (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.contextsearchquery</td><td>No</td><td>LDAP auth implementation search query (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.searchattribute</td><td>No</td><td>LDAP auth implementation search attribute (defaults to "uid")</td></tr>
<tr><td>org.apache.manifoldcf.crawleruiwarpath</td><td>Yes, for Jetty</td><td>Location of Crawler UI war</td></tr>
<tr><td>org.apache.manifoldcf.authorityservicewarpath</td><td>Yes, for Jetty</td><td>Location of Authority Service war</td></tr>
<tr><td>org.apache.manifoldcf.apiservicewarpath</td><td>Yes, for Jetty</td><td>Location of API Service war</td></tr>
Modified: manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml (original)
+++ manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml Wed Jul 8 22:01:08 2015
@@ -1037,12 +1037,18 @@ start[.bat|.sh]
<table>
<caption>property.xml properties</caption>
<tr><th>Property</th><th>Required?</th><th>Function</th></tr>
- <tr><td>org.apache.manifoldcf.login.name</td><td>No</td><td>Crawler UI login user ID (defaults to "admin")</td></tr>
- <tr><td>org.apache.manifoldcf.login.password</td><td>No</td><td>Crawler UI login user password (defaults to "admin")</td></tr>
- <tr><td>org.apache.manifoldcf.login.password.obfuscated</td><td>No</td><td>Obfuscated crawler UI login user password (defaults to "admin")</td></tr>
- <tr><td>org.apache.manifoldcf.login.apiname</td><td>No</td><td>API login user ID (defaults to "")</td></tr>
- <tr><td>org.apache.manifoldcf.login.apipassword</td><td>No</td><td>API login user password (defaults to "")</td></tr>
- <tr><td>org.apache.manifoldcf.login.apipassword.obfuscated</td><td>No</td><td>Obfuscated API login user password (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.authimplementationclass</td><td>No</td><td>Auth implementation class (defaults to "org.apache.manifoldcf.core.auth.DefaultAuthenticator", set to "org.apache.manifoldcf.core.auth.LdapAuthenticator" for LDAP)</td></tr>
+ <tr><td>org.apache.manifoldcf.login.name</td><td>No</td><td>Default auth implementation crawler UI login user ID (defaults to "admin")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.password</td><td>No</td><td>Default auth implementation crawler UI login user password (defaults to "admin")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.password.obfuscated</td><td>No</td><td>Default auth implementation obfuscated crawler UI login user password (defaults to "admin")</td></tr>
+ <tr><td>org.apache.manifoldcf.apilogin.name</td><td>No</td><td>Default auth implementation API login user ID (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.apilogin.password</td><td>No</td><td>Default auth implementation API login user password (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.apilogin.password.obfuscated</td><td>No</td><td>Default auth implementation obfuscated API login user password (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.providerurl</td><td>No</td><td>LDAP auth implementation provider URL (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.securityauthenticationtype</td><td>No</td><td>LDAP auth implementation auth type (defaults to "simple")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.securityprincipal</td><td>No</td><td>LDAP auth implementation security principal (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.contextsearchquery</td><td>No</td><td>LDAP auth implementation search query (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.searchattribute</td><td>No</td><td>LDAP auth implementation search attribute (defaults to "uid")</td></tr>
<tr><td>org.apache.manifoldcf.crawleruiwarpath</td><td>Yes, for Jetty</td><td>Location of Crawler UI war</td></tr>
<tr><td>org.apache.manifoldcf.authorityservicewarpath</td><td>Yes, for Jetty</td><td>Location of Authority Service war</td></tr>
<tr><td>org.apache.manifoldcf.apiservicewarpath</td><td>Yes, for Jetty</td><td>Location of API Service war</td></tr>
Modified: manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/zh_CN/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/zh_CN/how-to-build-and-deploy.xml?rev=1689968&r1=1689967&r2=1689968&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/zh_CN/how-to-build-and-deploy.xml (original)
+++ manifoldcf/branches/CONNECTORS-1196/site/src/documentation/content/xdocs/zh_CN/how-to-build-and-deploy.xml Wed Jul 8 22:01:08 2015
@@ -1037,12 +1037,18 @@ start[.bat|.sh]
<table>
<caption>property.xml properties</caption>
<tr><th>Property</th><th>Required?</th><th>Function</th></tr>
- <tr><td>org.apache.manifoldcf.login.name</td><td>No</td><td>Crawler UI login user ID (defaults to "admin")</td></tr>
- <tr><td>org.apache.manifoldcf.login.password</td><td>No</td><td>Crawler UI login user password (defaults to "admin")</td></tr>
- <tr><td>org.apache.manifoldcf.login.password.obfuscated</td><td>No</td><td>Obfuscated crawler UI login user password (defaults to "admin")</td></tr>
- <tr><td>org.apache.manifoldcf.login.apiname</td><td>No</td><td>API login user ID (defaults to "")</td></tr>
- <tr><td>org.apache.manifoldcf.login.apipassword</td><td>No</td><td>API login user password (defaults to "")</td></tr>
- <tr><td>org.apache.manifoldcf.login.apipassword.obfuscated</td><td>No</td><td>Obfuscated API login user password (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.authimplementationclass</td><td>No</td><td>Auth implementation class (defaults to "org.apache.manifoldcf.core.auth.DefaultAuthenticator", set to "org.apache.manifoldcf.core.auth.LdapAuthenticator" for LDAP)</td></tr>
+ <tr><td>org.apache.manifoldcf.login.name</td><td>No</td><td>Default auth implementation crawler UI login user ID (defaults to "admin")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.password</td><td>No</td><td>Default auth implementation crawler UI login user password (defaults to "admin")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.password.obfuscated</td><td>No</td><td>Default auth implementation obfuscated crawler UI login user password (defaults to "admin")</td></tr>
+ <tr><td>org.apache.manifoldcf.apilogin.name</td><td>No</td><td>Default auth implementation API login user ID (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.apilogin.password</td><td>No</td><td>Default auth implementation API login user password (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.apilogin.password.obfuscated</td><td>No</td><td>Default auth implementation obfuscated API login user password (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.providerurl</td><td>No</td><td>LDAP auth implementation provider URL (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.securityauthenticationtype</td><td>No</td><td>LDAP auth implementation auth type (defaults to "simple")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.securityprincipal</td><td>No</td><td>LDAP auth implementation security principal (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.contextsearchquery</td><td>No</td><td>LDAP auth implementation search query (defaults to "")</td></tr>
+ <tr><td>org.apache.manifoldcf.login.ldap.searchattribute</td><td>No</td><td>LDAP auth implementation search attribute (defaults to "uid")</td></tr>
<tr><td>org.apache.manifoldcf.crawleruiwarpath</td><td>Yes, for Jetty</td><td>Location of Crawler UI war</td></tr>
<tr><td>org.apache.manifoldcf.authorityservicewarpath</td><td>Yes, for Jetty</td><td>Location of Authority Service war</td></tr>
<tr><td>org.apache.manifoldcf.apiservicewarpath</td><td>Yes, for Jetty</td><td>Location of API Service war</td></tr>