Mailing-List: contact connectors-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
Reply-To: connectors-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1087610 - in
 /incubator/lcf/branches/release-0.2-incubating-branch: ./ lib/
Date: Fri, 01 Apr 2011 07:27:09 -0000
To: connectors-commits@incubator.apache.org
From: kwright@apache.org
Message-Id: <20110401072709.2760423889B2@eris.apache.org>

Author: kwright
Date: Fri Apr  1 07:27:08 2011
New Revision: 1087610

URL: http://svn.apache.org/viewvc?rev=1087610&view=rev
Log:
Merge in Derby changes from trunk to fix CONNECTORS-172.

Modified:
    incubator/lcf/branches/release-0.2-incubating-branch/   (props changed)
    incubator/lcf/branches/release-0.2-incubating-branch/CHANGES.txt
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derby.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_cs.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_de_DE.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_es.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_fr.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_hu.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_it.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_ja_JP.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_ko_KR.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_pl.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_pt_BR.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_ru.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_zh_CN.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_zh_TW.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyclient.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbynet.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyrun.jar
    incubator/lcf/branches/release-0.2-incubating-branch/lib/derbytools.jar

Propchange: incubator/lcf/branches/release-0.2-incubating-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr  1 07:27:08 2011
@@ -1,2 +1,3 @@
 /incubator/lcf/branches/CONNECTORS-151-branch:1063444-1071206
 /incubator/lcf/branches/CONNECTORS-160-branch:1071241-1071534
+/incubator/lcf/trunk:1087607

Modified: incubator/lcf/branches/release-0.2-incubating-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/CHANGES.txt?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.2-incubating-branch/CHANGES.txt (original)
+++ incubator/lcf/branches/release-0.2-incubating-branch/CHANGES.txt Fri Apr  1 07:27:08 2011
@@ -6,6 +6,10 @@ Release Date:  See http://incubator.apac
 
 Web site updated to reflect proposed release.
 
+CONNECTORS-172: At the advice of the Derby team, build Derby in
+"insane" mode to allow it to recover from internal errors.
+(Koji Sekiguchi, Karl Wright)
+
 CONNECTORS-170: Add support to the Derby driver for periodic analysis and
 reindexing, since after 10.7.1.1 it seems this is now supported.
 (Karl Wright)

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derby.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derby.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_cs.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_cs.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_de_DE.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_de_DE.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_es.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_es.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_fr.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_fr.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_hu.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_hu.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_it.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_it.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_ja_JP.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_ja_JP.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_ko_KR.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_ko_KR.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_pl.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_pl.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_pt_BR.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_pt_BR.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_ru.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_ru.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_zh_CN.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_zh_CN.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_zh_TW.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyLocale_zh_TW.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyclient.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyclient.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbynet.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbynet.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyrun.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbyrun.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/lcf/branches/release-0.2-incubating-branch/lib/derbytools.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.2-incubating-branch/lib/derbytools.jar?rev=1087610&r1=1087609&r2=1087610&view=diff
==============================================================================
Binary files - no diff available.