Connector/J commit: r4946 - in branches/branch_5_0/connector-j: . src/com/mysql/jdbc src/com/mysql/jdbc/log src/lib

[mmatthews]

Added:
   branches/branch_5_0/connector-j/src/com/mysql/jdbc/log/CommonsLogger.java
   branches/branch_5_0/connector-j/src/lib/Commons-Logging-LICENSE.txt
   branches/branch_5_0/connector-j/src/lib/commons-logging.jar
Modified:
   branches/branch_5_0/connector-j/.classpath
   branches/branch_5_0/connector-j/CHANGES
   branches/branch_5_0/connector-j/src/com/mysql/jdbc/ConnectionProperties.java
   branches/branch_5_0/connector-j/src/com/mysql/jdbc/log/LogFactory.java
Log:
(merges from 3.1 branch to fix bug 13469)

Modified: branches/branch_5_0/connector-j/.classpath
===================================================================
(Binary files differ)

Modified: branches/branch_5_0/connector-j/CHANGES
===================================================================
--- branches/branch_5_0/connector-j/CHANGES	2006-02-17 18:40:54 UTC (rev 4945)
+++ branches/branch_5_0/connector-j/CHANGES	2006-02-17 18:44:36 UTC (rev 4946)
@@ -1,6 +1,11 @@
 # Changelog
 # $Id$
 
+xx-xx-06 - Version 5.0.1-beta
+
+    - Fixed BUG#17401 - Can't use XAConnection for local transactions when
+      no global transaction is in progress.
+      
 12-23-05 - Version 5.0.0-beta
 
     - XADataSource implemented (ported from 3.2 branch which won't be 
@@ -87,6 +92,15 @@
       cancelled due to timeout expiration and have it throw the exception
       instead.
       
+    - Removed dead code in com.mysql.jdbc.Connection. 
+    
+    - Made construction of com.mysql.jdbc.Field (result set metadata)
+      instances more efficient for non-string types by not doing
+      character set initialization, or detection of type changes due to
+      temporary tables.
+      
+    - Removed redundant code in com.mysql.jdbc.MysqlIO.
+      
 xx-xx-06 - Version 3.1.13
 
     - Fixed BUG#15464 - INOUT parameter does not store IN value.
@@ -126,6 +140,22 @@
       
     - Fixed BUG#17099 - Statement.getGeneratedKeys() throws NullPointerException 
       when no query has been processed.
+      
+    - Fixed BUG#13469 - Driver tries to call methods that don't exist on older and
+      newer versions of Log4j. The fix is not trying to auto-detect presense of log4j, 
+      too many different incompatible versions out there in the wild to do this reliably.
+      
+      If you relied on autodetection before, you will need to add 
+      "logger=com.mysql.jdbc.log.Log4JLogger" to your JDBC URL to enable Log4J usage,
+      or alternatively use the new "CommonsLogger" class to take care of this.
+      
+    - Added support for Apache Commons logging, use "com.mysql.jdbc.log.CommonsLogger"
+      as the value for the "logger" configuration property.
+      
+    - LogFactory now prepends "com.mysql.jdbc.log" to log class name if it can't be
+      found as-specified. This allows you to use "short names" for the built-in log
+      factories, for example "logger=CommonsLogger" instead of 
+      "logger=com.mysql.jdbc.log.CommonsLogger".
     
 11-30-05 - Version 3.1.12
 

Modified: branches/branch_5_0/connector-j/src/com/mysql/jdbc/ConnectionProperties.java
===================================================================
---
branches/branch_5_0/connector-j/src/com/mysql/jdbc/ConnectionProperties.java	2006-02-17
18:40:54 UTC (rev 4945)
+++
branches/branch_5_0/connector-j/src/com/mysql/jdbc/ConnectionProperties.java	2006-02-17
18:44:36 UTC (rev 4946)
@@ -1093,6 +1093,15 @@
 			"Require SSL connection if useSSL=true? (defaults to 'false').",
 			"3.1.0", SECURITY_CATEGORY, 3);
 
+	private StringConnectionProperty resourceId = new StringConnectionProperty(
+			"resourceId",
+			null, "A globally unique name that identifies the resource that this datasource or
connection is " +
+			"connected to, used for XAResource.isSameRM() when the driver can't determine this
value based on " +
+			"hostnames used in the URL",
+			"5.0.1",
+			HA_CATEGORY,
+			Integer.MIN_VALUE);
+			
 	private BooleanConnectionProperty retainStatementAfterResultSetClose = new
BooleanConnectionProperty(
 			"retainStatementAfterResultSetClose",
 			false,
@@ -2457,15 +2466,18 @@
 	}
 
 	protected void postInitialization() throws SQLException {
-		/*
-		 * Configure logger If the value has been set by the user, then use
-		 * that, otherwise, autodetect it We prefer, Log4j, if it's available,
-		 * Then JDK1.4 logging, Then fallback to our STDERR logging.
-		 */
+		//
+		// Configure logger If the value has been set by the user, then use
+		// that, otherwise, autodetect it : JDK1.4 logging, 
+		// Then fallback to our STDERR logging.
+		//
 
+		//
 		// Yes, this looks goofy (String == instead of .equals),
 		// but it's how we tell whether we're using defaults
 		// or not, and it survives JNDI/Properties initialization, etc.
+		//
+		
 		if (getLogger() == STANDARD_LOGGER_NAME) {
 			String environmentLoggerName = null;
 
@@ -2478,20 +2490,14 @@
 
 			if (environmentLoggerName != null) {
 				setLogger(environmentLoggerName);
-			} else {
+			} else {	
 				try {
-					// Is Log4J available?
-					Class.forName("org.apache.log4j.Level");
-					setLogger("com.mysql.jdbc.log.Log4JLogger");
-				} catch (Throwable t) {
-					try {
-						// Are we running on JDK-1.4?
-						Class.forName("java.util.logging.Level");
-						setLogger(Jdk14Logger.class.getName());
-					} catch (Throwable t2) {
-						// guess not
-						setLogger(STANDARD_LOGGER_NAME);
-					}
+					// Are we running on JDK-1.4?
+					Class.forName("java.util.logging.Level");
+					setLogger(Jdk14Logger.class.getName());
+				} catch (Throwable t2) {
+					// guess not
+					setLogger(STANDARD_LOGGER_NAME);
 				}
 			}
 		}
@@ -3573,4 +3579,12 @@
 	protected void setDumpMetadataOnColumnNotFound(boolean flag) {
 		this.dumpMetadataOnColumnNotFound.setValue(flag);
 	}
+
+	protected String getResourceId() {
+		return this.resourceId.getValueAsString();
+	}
+
+	protected void setResourceId(String resourceId) {
+		this.resourceId.setValue(resourceId);
+	}
 }

Added: branches/branch_5_0/connector-j/src/com/mysql/jdbc/log/CommonsLogger.java
===================================================================
--- branches/branch_5_0/connector-j/src/com/mysql/jdbc/log/CommonsLogger.java	2006-02-17
18:40:54 UTC (rev 4945)
+++ branches/branch_5_0/connector-j/src/com/mysql/jdbc/log/CommonsLogger.java	2006-02-17
18:44:36 UTC (rev 4946)
@@ -0,0 +1,108 @@
+/*
+ Copyright (C) 2006 MySQL AB
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of version 2 of the GNU General Public License as 
+ published by the Free Software Foundation.
+
+ There are special exceptions to the terms and conditions of the GPL 
+ as it is applied to this software. View the full text of the 
+ exception in file EXCEPTIONS-CONNECTOR-J in the directory of this 
+ software distribution.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ */
+
+package com.mysql.jdbc.log;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class CommonsLogger implements com.mysql.jdbc.log.Log {
+	private Log logger;
+	
+	public CommonsLogger(String instanceName) {
+		logger = LogFactory.getLog(instanceName);
+	}
+
+	public boolean isDebugEnabled() {
+		return this.logger.isInfoEnabled();
+	}
+
+	public boolean isErrorEnabled() {
+		return this.logger.isErrorEnabled();
+	}
+
+	public boolean isFatalEnabled() {
+		return this.logger.isFatalEnabled();
+	}
+
+	public boolean isInfoEnabled() {
+		return this.logger.isInfoEnabled();
+	}
+
+	public boolean isTraceEnabled() {
+		return this.logger.isTraceEnabled();
+	}
+
+	public boolean isWarnEnabled() {
+		return this.logger.isWarnEnabled();
+	}
+
+	public void logDebug(Object msg) {
+		this.logger.debug(LogUtils.expandProfilerEventIfNecessary(msg));
+	}
+
+	public void logDebug(Object msg, Throwable thrown) {
+		this.logger.debug(LogUtils.expandProfilerEventIfNecessary(msg), thrown);
+	}
+
+	public void logError(Object msg) {
+		this.logger.error(LogUtils.expandProfilerEventIfNecessary(msg));
+	}
+
+	public void logError(Object msg, Throwable thrown) {
+		this.logger.fatal(LogUtils.expandProfilerEventIfNecessary(msg), thrown);
+	}
+
+	public void logFatal(Object msg) {
+		this.logger.fatal(LogUtils.expandProfilerEventIfNecessary(msg));
+	}
+
+	public void logFatal(Object msg, Throwable thrown) {
+		this.logger.fatal(LogUtils.expandProfilerEventIfNecessary(msg), thrown);
+	}
+
+	public void logInfo(Object msg) {
+		this.logger.info(LogUtils.expandProfilerEventIfNecessary(msg));
+	}
+
+	public void logInfo(Object msg, Throwable thrown) {
+		this.logger.info(LogUtils.expandProfilerEventIfNecessary(msg), thrown);
+	}
+
+	public void logTrace(Object msg) {
+		this.logger.trace(LogUtils.expandProfilerEventIfNecessary(msg));
+	}
+
+	public void logTrace(Object msg, Throwable thrown) {
+		this.logger.trace(LogUtils.expandProfilerEventIfNecessary(msg), thrown);
+	}
+
+	public void logWarn(Object msg) {
+		this.logger.warn(LogUtils.expandProfilerEventIfNecessary(msg));
+	}
+
+	public void logWarn(Object msg, Throwable thrown) {
+		this.logger.warn(LogUtils.expandProfilerEventIfNecessary(msg), thrown);
+	}
+
+}

Modified: branches/branch_5_0/connector-j/src/com/mysql/jdbc/log/LogFactory.java
===================================================================
--- branches/branch_5_0/connector-j/src/com/mysql/jdbc/log/LogFactory.java	2006-02-17
18:40:54 UTC (rev 4945)
+++ branches/branch_5_0/connector-j/src/com/mysql/jdbc/log/LogFactory.java	2006-02-17
18:44:36 UTC (rev 4946)
@@ -65,7 +65,14 @@
 		}
 
 		try {
-			Class loggerClass = Class.forName(className);
+			Class loggerClass = null;
+			
+			try {
+				loggerClass = Class.forName(className);
+			} catch (ClassNotFoundException nfe) {
+				loggerClass = Class.forName(Log.class.getPackage().getName() + "." + className);
+			}
+		
 			Constructor constructor = loggerClass
 					.getConstructor(new Class[] { String.class });
 

Added: branches/branch_5_0/connector-j/src/lib/Commons-Logging-LICENSE.txt
===================================================================
--- branches/branch_5_0/connector-j/src/lib/Commons-Logging-LICENSE.txt	2006-02-17
18:40:54 UTC (rev 4945)
+++ branches/branch_5_0/connector-j/src/lib/Commons-Logging-LICENSE.txt	2006-02-17
18:44:36 UTC (rev 4946)
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Added: branches/branch_5_0/connector-j/src/lib/commons-logging.jar
===================================================================
(Binary files differ)


Property changes on: branches/branch_5_0/connector-j/src/lib/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream