Author: kwright
Date: Tue Aug 21 20:32:34 2012
New Revision: 1375771
URL: http://svn.apache.org/viewvc?rev=1375771&view=rev
Log:
Fix for CONNECTORS-512.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
manifoldcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties
manifoldcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
manifoldcf/trunk/site/src/documentation/resources/images/en_US/jdbc-configure-database-type.PNG
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1375771&r1=1375770&r2=1375771&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Aug 21 20:32:34 2012
@@ -3,6 +3,10 @@ $Id$
======================= 0.7-dev =====================
+CONNECTORS-512: Revise documentation to include new access-
+method pulldown and corresponding screen shot.
+(Karl Wright)
+
CONNECTORS-510: MySQL now periodically runs ANALYZE on tables
to be sure the plan(s) are reasonable.
(Karl Wright)
Modified:
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1375771&r1=1375770&r2=1375771&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
(original)
+++
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
Tue Aug 21 20:32:34 2012
@@ -749,8 +749,8 @@ public class JDBCConnector extends org.a
" <tr>\n"+
" <td class=\"description\"><nobr>" +
Messages.getBodyString(locale,"JDBCConnector.AccessMethod") + "</nobr></td><td
class=\"value\">\n"+
" <select multiple=\"false\" name=\"accessmethod\" size=\"2\">\n"+
-" <option value=\"name\"
"+(accessMethod.equals("name")?"selected=\"selected\"":"")+">by
name</option>\n"+
-" <option value=\"label\"
"+(accessMethod.equals("label")?"selected=\"selected\"":"")+">by
label</option>\n"+
+" <option value=\"name\"
"+(accessMethod.equals("name")?"selected=\"selected\"":"")+">"+Messages.getBodyString(locale,"JDBCConnector.ByName")+"</option>\n"+
+" <option value=\"label\"
"+(accessMethod.equals("label")?"selected=\"selected\"":"")+">"+Messages.getBodyString(locale,"JDBCConnector.ByLabel")+"</option>\n"+
" </select>\n"+
" </td>\n"+
" </tr>\n"+
Modified:
manifoldcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties?rev=1375771&r1=1375770&r2=1375771&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties
(original)
+++
manifoldcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_en_US.properties
Tue Aug 21 20:32:34 2012
@@ -15,6 +15,8 @@
JDBCConnector.DatabaseType=Database Type
JDBCConnector.AccessMethod=Access Method
+JDBCConnector.ByName=by name
+JDBCConnector.ByLabel=by label
JDBCConnector.Server=Server
JDBCConnector.Credentials=Credentials
JDBCConnector.DatabaseType2=Database type:
Modified:
manifoldcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties?rev=1375771&r1=1375770&r2=1375771&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties
(original)
+++
manifoldcf/trunk/connectors/jdbc/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/jdbc/common_ja_JP.properties
Tue Aug 21 20:32:34 2012
@@ -15,6 +15,8 @@
JDBCConnector.DatabaseType=ãã¼ã¿ãã¼ã¹ã¿ã¤ã
JDBCConnector.AccessMethod=ã¢ã¯ã»ã¹æ¹å¼
+JDBCConnector.ByName=by name
+JDBCConnector.ByLabel=by label
JDBCConnector.Server=ãµã¼ã
JDBCConnector.Credentials=証ææ¸
JDBCConnector.DatabaseType2=ãã¼ã¿ãã¼ã¹ã¿ã¤ãï¼
Modified:
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml?rev=1375771&r1=1375770&r2=1375771&view=diff
==============================================================================
---
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
(original)
+++
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
Tue Aug 21 20:32:34 2012
@@ -1351,9 +1351,10 @@
<li>SQL Server (via the JTDS JDBC driver)</li>
<li>Oracle (via the Oracle JDBC driver)</li>
<li>Sybase (via the JTDS JDBC driver)</li>
+ <li>MySQL (via the MySQL JDBC driver)</li>
</ul>
<br/>
- <p>This connection type <b>cannot</b> be configured to work
with other databases without software changes. Depending on your particular
installation,
+ <p>This connection type <b>cannot</b> be configured to work
with other databases than the ones listed above without software changes.
Depending on your particular installation,
some of the above options may not be available.</p>
<p>The generic database connection type currently has no
per-document notion of security. It is possible to set document security for
all documents specified by a
given job. Since this form of security requires you to
know what the actual access tokens are, you must have detailed knowledge of the
authority connection you
@@ -1364,6 +1365,11 @@
<figure src="images/en_US/jdbc-configure-database-type.PNG"
alt="Generic Database Connection, Database Type tab" width="80%"/>
<br/><br/>
<p>Select the kind of database you want to connect to, from
the pulldown.</p>
+ <p>Also, select the JDBC access method you want from the
access method pulldown. The access method is provided because the JDBC
specification has been
+ recently clarified, and not all JDBC drivers work the same
way as far as resultset column name discovery is concerned. The "by name"
option currently works
+ with all JDBC drivers in the list except for the MySQL
driver. The "by label" works for the current MySQL driver, and may work for
some of the others as well. If
+ the queries you supply for your generic database jobs do
not work correctly, and you see an error message about not being able to find
required columns in the
+ result, you can change your selection on this pulldown and
it may correct the problem.</p>
<p>The "Server" tab looks like this:</p>
<br/><br/>
<figure src="images/en_US/jdbc-configure-server.PNG"
alt="Generic Database Connection, Server tab" width="80%"/>
Modified:
manifoldcf/trunk/site/src/documentation/resources/images/en_US/jdbc-configure-database-type.PNG
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/resources/images/en_US/jdbc-configure-database-type.PNG?rev=1375771&r1=1375770&r2=1375771&view=diff
==============================================================================
Binary files - no diff available.
