manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1229228 - in /incubator/lcf/trunk/connectors/jdbc/connector/src/main: java/org/apache/manifoldcf/crawler/connectors/jdbc/ native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/
Date Mon, 09 Jan 2012 16:02:49 GMT 
Author: kwright
Date: Mon Jan  9 16:02:48 2012
New Revision: 1229228

URL: http://svn.apache.org/viewvc?rev=1229228&view=rev
Log:
Patch for CONNECTORS-362.  Further patches will be required.

Modified:
    incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
    incubator/lcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties
    incubator/lcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties

Modified: incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1229228&r1=1229227&r2=1229228&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
(original)
+++ incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
Mon Jan  9 16:02:48 2012
@@ -666,21 +666,21 @@ public class JDBCConnector extends org.a
 "{\n"+
 "  if (editconnection.databasehost.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Please fill in a database server name\");\n"+
+"    alert(" + Messages.getString(locale,"JDBCConnector.PleaseFillInADatabaseServerName")
+ ");\n"+
 "    SelectTab(\"" + Messages.getBodyJavascriptString(locale,"JDBCConnector.Server") + "\");\n"+
 "    editconnection.databasehost.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.databasename.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Please fill in the name of the database\");\n"+
+"    alert(" + Messages.getString(locale,"JDBCConnector.PleaseFillInTheNameOfTheDatabase")
+ ");\n"+
 "    SelectTab(\"" + Messages.getBodyJavascriptString(locale,"JDBCConnector.Server") + "\");\n"+
 "    editconnection.databasename.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.username.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Please supply the database username for this connection\");\n"+
+"    alert(" + Messages.getString(locale,"JDBCConnector.PleaseSupplyTheDatabaseUsernameForThisConnection")
+ ");\n"+
 "    SelectTab(\"" + Messages.getBodyJavascriptString(locale,"JDBCConnector.Credentials")
+ "\");\n"+
 "    editconnection.username.focus();\n"+
 "    return false;\n"+
@@ -912,7 +912,7 @@ public class JDBCConnector extends org.a
 "{\n"+
 "  if (editjob.spectoken.value == \"\")\n"+
 "  {\n"+
-"    alert(\"" + Messages.getBodyJavascriptString(locale,"JDBCConnector.TypeInAnAccessToken")
+ "\");\n"+
+"    alert(" + Messages.getBodyJavascriptString(locale,"JDBCConnector.TypeInAnAccessToken")
+ ");\n"+
 "    editjob.spectoken.focus();\n"+
 "    return;\n"+
 "  }\n"+
@@ -923,13 +923,13 @@ public class JDBCConnector extends org.a
 "{\n"+
 "  if (editjob.idquery.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Enter a seeding query\");\n"+
+"    alert(" + Messages.getString(locale,"JDBCConnector.EnterASeedingQuery") + ");\n"+
 "    editjob.idquery.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editjob.idquery.value.indexOf(\"$(IDCOLUMN)\") == -1)\n"+
 "  {\n"+
-"    alert(\"Must return $(IDCOLUMN) in the result.\\nExample: SELECT idfield AS $(IDCOLUMN)
FROM ...\");\n"+
+"    alert(" + Messages.getString(locale,"JDBCConnector.MustReturnIDCOLUMNInTheResult") +
");\n"+
 "    editjob.idquery.focus();\n"+
 "    return false;\n"+
 "  }\n"+
@@ -937,50 +937,50 @@ public class JDBCConnector extends org.a
 "  {\n"+
 "    if (editjob.versionquery.value.indexOf(\"$(IDCOLUMN)\") == -1)\n"+
 "    {\n"+
-"      alert(\"Must return $(IDCOLUMN) in the result.\\nExample: SELECT idfield AS $(IDCOLUMN),
...\");\n"+
+"      alert(" + Messages.getString(locale,"JDBCConnector.MustReturnIDCOLUMNInTheResult")
+ ");\n"+
 "      editjob.versionquery.focus();\n"+
 "      return false;\n"+
 "    }\n"+
 "    if (editjob.versionquery.value.indexOf(\"$(VERSIONCOLUMN)\") == -1)\n"+
 "    {\n"+
-"      alert(\"Must return $(VERSIONCOLUMN) in the result, containing the document version.\\nExample:
SELECT versionfield AS $(VERSIONCOLUMN), ...\");\n"+
+"      alert(" + Messages.getString(locale,"JDBCConnector.MustReturnVERSIONCOLUMNInTheResult")
+ ");\n"+
 "      editjob.versionquery.focus();\n"+
 "      return false;\n"+
 "    }\n"+
 "    if (editjob.versionquery.value.indexOf(\"$(IDLIST)\") == -1)\n"+
 "    {\n"+
-"      alert(\"Must use $(IDLIST) in WHERE clause.\\nExample: SELECT ... WHERE idfield IN
$(IDLIST) ...\");\n"+
+"      alert(" + Messages.getString(locale,"JDBCConnector.MustUseIDLISTInWHEREClause") +
");\n"+
 "      editjob.versionquery.focus();\n"+
 "      return false;\n"+
 "    }\n"+
 "  }\n"+
 "  if (editjob.dataquery.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Enter a data query\");\n"+
+"    alert(" + Messages.getString(locale,"JDBCConnector.EnterADataQuery") + ");\n"+
 "    editjob.dataquery.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editjob.dataquery.value.indexOf(\"$(IDCOLUMN)\") == -1)\n"+
 "  {\n"+
-"    alert(\"Must return $(IDCOLUMN) in the result.\\nExample: SELECT idfield AS $(IDCOLUMN),
...\");\n"+
+"    alert(" + Messages.getString(locale,"JDBCConnector.MustReturnIDCOLUMNInTheResult2")
+ ");\n"+
 "    editjob.dataquery.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editjob.dataquery.value.indexOf(\"$(URLCOLUMN)\") == -1)\n"+
 "  {\n"+
-"    alert(\"Must return $(URLCOLUMN) in the result, containing the url to use to reach the
document.\\nExample: SELECT urlfield AS $(URLCOLUMN), ...\");\n"+
+"    alert(" + Messages.getString(locale,"JDBCConnector.MustReturnURLCOLUMNInTheResult")
+ ");\n"+
 "    editjob.dataquery.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editjob.dataquery.value.indexOf(\"$(DATACOLUMN)\") == -1)\n"+
 "  {\n"+
-"    alert(\"Must return $(DATACOLUMN) in the result, containing the document data.\\nExample:
SELECT datafield AS $(DATACOLUMN), ...\");\n"+
+"    alert(" + Messages.getString(locale,"JDBCConnector.MustReturnDATACOLUMNInTheResult")
+ ");\n"+
 "    editjob.dataquery.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editjob.dataquery.value.indexOf(\"$(IDLIST)\") == -1)\n"+
 "  {\n"+
-"    alert(\"Must use $(IDLIST) in WHERE clause.\\nExample: SELECT ... WHERE idfield IN $(IDLIST)
...\");\n"+
+"    alert(" + Messages.getString(locale,"JDBCConnector.MustUseIDLISTInWHEREClause") + ");\n"+
 "    editjob.dataquery.focus();\n"+
 "    return false;\n"+
 "  }\n"+
@@ -1091,7 +1091,7 @@ public class JDBCConnector extends org.a
 "      <input type=\"hidden\" name=\""+accessOpName+"\" value=\"\"/>\n"+
 "      <input type=\"hidden\" name=\""+"spectoken"+accessDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(token)+"\"/>\n"+
 "      <a name=\""+"token_"+Integer.toString(k)+"\">\n"+
-"        <input type=\"button\" value=\"Delete\" onClick='Javascript:SpecOp(\""+accessOpName+"\",\"Delete\",\"token_"+Integer.toString(k)+"\")'
alt=\"Delete token #\""+Integer.toString(k)+"\"/>\n"+
+"        <input type=\"button\" value=\"Delete\" onClick='Javascript:SpecOp(\""+accessOpName+"\",\"Delete\",\"token_"+Integer.toString(k)+"\")'
alt=\"" + Messages.getString(locale,"JDBCConnector.DeleteToken") + "\""+Integer.toString(k)+"\"/>\n"+
 "      </a>&nbsp;\n"+
 "    </td>\n"+
 "    <td class=\"value\">\n"+
@@ -1117,7 +1117,7 @@ public class JDBCConnector extends org.a
 "      <input type=\"hidden\" name=\"tokencount\" value=\""+Integer.toString(k)+"\"/>\n"+
 "      <input type=\"hidden\" name=\"accessop\" value=\"\"/>\n"+
 "      <a name=\""+"token_"+Integer.toString(k)+"\">\n"+
-"        <input type=\"button\" value=\"Add\" onClick='Javascript:SpecAddToken(\"token_"+Integer.toString(k+1)+"\")'
alt=\"Add access token\"/>\n"+
+"        <input type=\"button\" value=\"Add\" onClick='Javascript:SpecAddToken(\"token_"+Integer.toString(k+1)+"\")'
alt=\"" + Messages.getString(locale,"JDBCConnector.AddAccessToken") + "\"/>\n"+
 "      </a>&nbsp;\n"+
 "    </td>\n"+
 "    <td class=\"value\">\n"+
@@ -1299,15 +1299,15 @@ public class JDBCConnector extends org.a
     out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Seeding query:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString(locale,"JDBCConnector.SeedingQuery")
+ "</nobr></td>\n"+
 "    <td class=\"value\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(idQuery)+"</td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Version check query:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString(locale,"JDBCConnector.VersionCheckQuery")
+ "</nobr></td>\n"+
 "    <td class=\"value\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(versionQuery)+"</td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Data query:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString(locale,"JDBCConnector.DataQuery")
+ "</nobr></td>\n"+
 "    <td class=\"value\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(dataQuery)+"</td>\n"+
 "  </tr>\n"+
 "\n"+
@@ -1324,7 +1324,7 @@ public class JDBCConnector extends org.a
         if (seenAny == false)
         {
           out.print(
-"  <tr><td class=\"description\"><nobr>Access tokens:</nobr></td>\n"+
+"  <tr><td class=\"description\"><nobr>" + Messages.getString(locale,"JDBCConnector.AccessTokens")
+ "</nobr></td>\n"+
 "    <td class=\"value\">\n"
           );
           seenAny = true;

Modified: incubator/lcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties?rev=1229228&r1=1229227&r2=1229228&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties
(original)
+++ incubator/lcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties
Mon Jan  9 16:02:48 2012
@@ -22,7 +22,7 @@ JDBCConnector.DatabaseServiceNameOrInsta
 JDBCConnector.UserName=User name:
 JDBCConnector.Password=Password:
 JDBCConnector.Parameters=Parameters:
-JDBCConnector.TypeInAnAccessToken=Type in an access token
+JDBCConnector.TypeInAnAccessToken=\"Type in an access token\"
 JDBCConnector.Queries=Queries
 JDBCConnector.Security=Security
 JDBCConnector.SeedingQuery=Seeding query:
@@ -34,3 +34,21 @@ JDBCConnector.returnIdsUrlsAndDataForASe
 JDBCConnector.returnIdsThatNeedToBeChecked=(return ids that need to be checked)
 JDBCConnector.NoAccessTokensPresent=No access tokens present
 JDBCConnector.NoAccessTokensSpecified=No access tokens specified
+JDBCConnector.PleaseFillInADatabaseServerName=\"Please fill in a database server name\"
+JDBCConnector.PleaseFillInTheNameOfTheDatabase=\"Please fill in the name of the database\"
+JDBCConnector.PleaseSupplyTheDatabaseUsernameForThisConnection=\"Please supply the database
username for this connection\"
+JDBCConnector.EnterASeedingQuery=\"Enter a seeding query\"
+JDBCConnector.MustReturnIDCOLUMNInTheResult=\"Must return $(IDCOLUMN) in the result.\\nExample:
SELECT idfield AS $(IDCOLUMN) FROM ...\"
+JDBCConnector.MustReturnVERSIONCOLUMNInTheResult=\"Must return $(VERSIONCOLUMN) in the result,
containing the document version.\\nExample: SELECT versionfield AS $(VERSIONCOLUMN), ...\"
+JDBCConnector.MustUseIDLISTInWHEREClause=\"Must use $(IDLIST) in WHERE clause.\\nExample:
SELECT ... WHERE idfield IN $(IDLIST) ...\"
+JDBCConnector.EnterADataQuery=\"Enter a data query\"
+JDBCConnector.MustReturnIDCOLUMNInTheResult2=\"Must return $(IDCOLUMN) in the result.\\nExample:
SELECT idfield AS $(IDCOLUMN), ...\"
+JDBCConnector.MustReturnURLCOLUMNInTheResult=\"Must return $(URLCOLUMN) in the result, containing
the url to use to reach the document.\\nExample: SELECT urlfield AS $(URLCOLUMN), ...\"
+JDBCConnector.MustReturnDATACOLUMNInTheResult=\"Must return $(DATACOLUMN) in the result,
containing the document data.\\nExample: SELECT datafield AS $(DATACOLUMN), ...\"
+JDBCConnector.DeleteToken=Delete token #
+JDBCConnector.AddAccessToken=Add access token
+JDBCConnector.SeedingQuery=Seeding query:
+JDBCConnector.VersionCheckQuery=Version check query:
+JDBCConnector.DataQuery=Data query:
+JDBCConnector.AccessTokens=Access tokens:
+

Modified: incubator/lcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties?rev=1229228&r1=1229227&r2=1229228&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties
(original)
+++ incubator/lcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties
Mon Jan  9 16:02:48 2012
@@ -34,4 +34,21 @@ JDBCConnector.returnIdsUrlsAndDataForASe
 JDBCConnector.returnIdsThatNeedToBeChecked=(チェックするIDを取得)
 JDBCConnector.NoAccessTokensPresent=アクセストークンが存在しません
 JDBCConnector.NoAccessTokensSpecified=アクセストークンが未定義です
+JDBCConnector.PleaseFillInADatabaseServerName=\"データベースサーバ名を入力してください\"
+JDBCConnector.PleaseFillInTheNameOfTheDatabase=\"データベース名を入力しうてください\"
+JDBCConnector.PleaseSupplyTheDatabaseUsernameForThisConnection=\"コネクション用のデータベースユーザ名を入力してください\"
+JDBCConnector.EnterASeedingQuery=\"シードクエリーを入力してください\"
+JDBCConnector.MustReturnIDCOLUMNInTheResult=\"結果に$(IDCOLUMN)を返す必要があります。\\n例：SELECT
idfield AS $(IDCOLUMN) FROM ...\"
+JDBCConnector.MustReturnVERSIONCOLUMNInTheResult=\"結果にコンテンツのバージョン情報を含む$(VERSIONCOLUMN)を返す必要があります。\\n例：SELECT
versionfield AS $(VERSIONCOLUMN), ...\"
+JDBCConnector.MustUseIDLISTInWHEREClause=\"WHERE句に$(IDLIST)を使ってください。\\n例：SELECT
... WHERE idfield IN $(IDLIST) ...\"
+JDBCConnector.EnterADataQuery=\"Enter a data query\"
+JDBCConnector.MustReturnIDCOLUMNInTheResult2=\"結果に$(IDCOLUMN)を返す必要があります。\\n例：SELECT
idfield AS $(IDCOLUMN), ...\"
+JDBCConnector.MustReturnURLCOLUMNInTheResult=\"結果にコンテンツを取得するURIを含む$(URLCOLUMN)を返す必要があります。\\n例：SELECT
urlfield AS $(URLCOLUMN), ...\"
+JDBCConnector.MustReturnDATACOLUMNInTheResult=\"結果にコンテンツ内容を含む$(DATACOLUMN)を返す必要があります。\\n例：SELECT
datafield AS $(DATACOLUMN), ...\"
+JDBCConnector.DeleteToken=トークンを削除： #
+JDBCConnector.AddAccessToken=アクセストークンを追加
+JDBCConnector.SeedingQuery=シードクエリー：
+JDBCConnector.VersionCheckQuery=バージョンチェッククエリー：
+JDBCConnector.DataQuery=データクエリー：
+JDBCConnector.AccessTokens=アクセストークン：
Mime
View raw message