From commits-return-8726-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org  Fri Apr 29 14:58:17 2011
Return-Path: <commits-return-8726-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org>
X-Original-To: apmail-openjpa-commits-archive@www.apache.org
Delivered-To: apmail-openjpa-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 37E2727A3
	for <apmail-openjpa-commits-archive@www.apache.org>; Fri, 29 Apr 2011 14:58:17 +0000 (UTC)
Received: (qmail 80967 invoked by uid 500); 29 Apr 2011 14:58:17 -0000
Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org
Received: (qmail 80941 invoked by uid 500); 29 Apr 2011 14:58:17 -0000
Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@openjpa.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@openjpa.apache.org>
List-Post: <mailto:commits@openjpa.apache.org>
List-Id: <commits.openjpa.apache.org>
Reply-To: dev@openjpa.apache.org
Delivered-To: mailing list commits@openjpa.apache.org
Received: (qmail 80934 invoked by uid 99); 29 Apr 2011 14:58:17 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Apr 2011 14:58:17 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Apr 2011 14:58:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9F65D23889F7; Fri, 29 Apr 2011 14:57:55 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1097829 - in /openjpa/sandboxes/perf-2.1.x:
 openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
 openjpa-project/src/doc/manual/ref_guide_dbsetup.xml
Date: Fri, 29 Apr 2011 14:57:55 -0000
To: commits@openjpa.apache.org
From: curtisr7@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110429145755.9F65D23889F7@eris.apache.org>

Author: curtisr7
Date: Fri Apr 29 14:57:55 2011
New Revision: 1097829

URL: http://svn.apache.org/viewvc?rev=1097829&view=rev
Log:
OPENJPA-1990: Porting to sandbox.

Modified:
    openjpa/sandboxes/perf-2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
    openjpa/sandboxes/perf-2.1.x/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml

Modified: openjpa/sandboxes/perf-2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/perf-2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=1097829&r1=1097828&r2=1097829&view=diff
==============================================================================
--- openjpa/sandboxes/perf-2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original)
+++ openjpa/sandboxes/perf-2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Fri Apr 29 14:57:55 2011
@@ -92,6 +92,7 @@ public class DB2Dictionary
     protected int min = 0;
     
     private int defaultBatchLimit = 100;
+    public boolean appendExtendedExceptionText = true;
     
     public DB2Dictionary() {
         platform = "DB2";
@@ -585,10 +586,10 @@ public class DB2Dictionary
         return "";
     }
 
-    public OpenJPAException newStoreException(String msg, SQLException[] causes,
-        Object failed) {
-        if (causes != null && causes.length > 0)
+    public OpenJPAException newStoreException(String msg, SQLException[] causes, Object failed) {
+        if (appendExtendedExceptionText == true && causes != null && causes.length > 0) {
             msg = appendExtendedExceptionMsg(msg, causes[0]);
+        }
         return super.newStoreException(msg, causes, failed);
     }
 

Modified: openjpa/sandboxes/perf-2.1.x/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/perf-2.1.x/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml?rev=1097829&r1=1097828&r2=1097829&view=diff
==============================================================================
--- openjpa/sandboxes/perf-2.1.x/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml (original)
+++ openjpa/sandboxes/perf-2.1.x/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml Fri Apr 29 14:57:55 2011
@@ -3900,6 +3900,39 @@ the operation will fail.
             </itemizedlist>
         </section>
         
+        <section id="ref_guide_dbsetup_dbsupport_db2">
+            <title>
+                DB2 Properties
+            </title>
+            <indexterm zone="ref_guide_dbsetup_dbsupport_db2">
+                <primary>
+                    DB2
+                </primary>
+                <seealso>
+                    DBDictionary
+                </seealso>
+            </indexterm>
+            <para>
+The <literal>db2</literal> dictionary understands the following additional
+properties:
+            </para>
+            <itemizedlist>
+                <listitem id="DB2Dictionary.AppendExtendedExceptionText">
+                    <para>
+                    <indexterm>
+                        <primary>
+                            DB2
+                        </primary>
+                        <secondary>
+                            AppendExtendedExceptionText
+                        </secondary>
+                    </indexterm>
+<literal>AppendExtendedExceptionText</literal>: If false, OpenJPA will not call back to the database to 
+get extended exception text.
+                    </para>
+                </listitem>
+            </itemizedlist>
+        </section>        
         <section id="ref_guide_dbsetup_dbsupport_delim_id">
         	<title>
         		Delimited Identifiers Support