Return-Path: 
 <commits-return-4954-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org>
Delivered-To: apmail-openjpa-commits-archive@www.apache.org
Received: (qmail 63685 invoked from network); 30 Jul 2009 16:51:07 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 30 Jul 2009 16:51:07 -0000
Received: (qmail 28546 invoked by uid 500); 30 Jul 2009 16:51:08 -0000
Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org
Received: (qmail 28522 invoked by uid 500); 30 Jul 2009 16:51:08 -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 28513 invoked by uid 99); 30 Jul 2009 16:51:08 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jul 2009 16:51:08 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 30 Jul 2009 16:51:05 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E9CA623888E7; Thu, 30 Jul 2009 16:50:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r799361 -
 /openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
Date: Thu, 30 Jul 2009 16:50:43 -0000
To: commits@openjpa.apache.org
From: mikedd@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090730165043.E9CA623888E7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mikedd
Date: Thu Jul 30 16:50:43 2009
New Revision: 799361

URL: http://svn.apache.org/viewvc?rev=799361&view=rev
Log:
OPENJPA-1210:
Add properties for derby timeouts to pom.xml.
	modified:   openjpa-persistence-jdbc/pom.xml

Modified:
    openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml

Modified: openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml?rev=799361&r1=799360&r2=799361&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-persistence-jdbc/pom.xml Thu Jul 30 16:50:43 2009
@@ -39,6 +39,8 @@
         <dbcp.minIdle>2</dbcp.minIdle>
         <dbcp.maxWait>10000</dbcp.maxWait>
         <dbcp.args>MaxActive=${dbcp.maxActive},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait}</dbcp.args>
+        <derby.locks.waitTimeout>60</derby.locks.waitTimeout>        
+        <derby.locks.deadlockTimeout>5</derby.locks.deadlockTimeout>
     </properties>
     <profiles>
 
@@ -823,11 +825,11 @@
                         </property>
                         <property>
                             <name>derby.locks.deadlockTimeout</name>
-                            <value>5</value>
+                            <value>${derby.locks.deadlockTimeout}</value>
                         </property>
                         <property>
                             <name>derby.locks.waitTimeout</name>
-                            <value>6</value>
+                            <value>${derby.locks.waitTimeout}</value>
                         </property>
                         <property>
                             <name>openjpa.ConnectionProperties</name>