Return-Path: 
 <connectors-commits-return-2615-apmail-incubator-connectors-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 627CD92F2
	for <apmail-incubator-connectors-commits-archive@minotaur.apache.org>;
 Thu,  5 Apr 2012 17:33:15 +0000 (UTC)
Received: (qmail 60960 invoked by uid 500); 5 Apr 2012 17:33:15 -0000
Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org
Received: (qmail 60929 invoked by uid 500); 5 Apr 2012 17:33:15 -0000
Mailing-List: contact connectors-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:connectors-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:connectors-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:connectors-commits@incubator.apache.org>
List-Id: <connectors-commits.incubator.apache.org>
Reply-To: connectors-dev@incubator.apache.org
Delivered-To: mailing list connectors-commits@incubator.apache.org
Received: (qmail 60922 invoked by uid 99); 5 Apr 2012 17:33:15 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Apr 2012 17:33:15 +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; Thu, 05 Apr 2012 17:33:12 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 03A3323889E3;
	Thu,  5 Apr 2012 17:32:51 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1309965 - in
 /incubator/lcf/branches/release-0.5-incubating-branch: ./ CHANGES.txt
 build.xml framework/build.xml
Date: Thu, 05 Apr 2012 17:32:50 -0000
To: connectors-commits@incubator.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120405173251.03A3323889E3@eris.apache.org>

Author: kwright
Date: Thu Apr  5 17:32:50 2012
New Revision: 1309965

URL: http://svn.apache.org/viewvc?rev=1309965&view=rev
Log:
Pull up fix for CONNECTORS-452 from trunk.

Modified:
    incubator/lcf/branches/release-0.5-incubating-branch/   (props changed)
    incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt
    incubator/lcf/branches/release-0.5-incubating-branch/build.xml
    incubator/lcf/branches/release-0.5-incubating-branch/framework/build.xml

Propchange: incubator/lcf/branches/release-0.5-incubating-branch/
------------------------------------------------------------------------------
  Merged /incubator/lcf/trunk:r1309962

Modified: incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt?rev=1309965&r1=1309964&r2=1309965&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt (original)
+++ incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt Thu Apr  5 17:32:50 2012
@@ -3,6 +3,11 @@ $Id$
 
 ======================= Release 0.5 =========================
 
+CONNECTORS-452: Get a version of postgresql jdbc driver compatible
+with JDK 1.5, and make sure it is actually in the classpath for single-
+process example.
+(Karl Wright)
+
 CONNECTORS-451: mvn-bootstrap scripts were broken.
 (Karl Wright)
 

Modified: incubator/lcf/branches/release-0.5-incubating-branch/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.5-incubating-branch/build.xml?rev=1309965&r1=1309964&r2=1309965&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.5-incubating-branch/build.xml (original)
+++ incubator/lcf/branches/release-0.5-incubating-branch/build.xml Thu Apr  5 17:32:50 2012
@@ -2764,12 +2764,7 @@ Use Apache Forrest version forrest-0.9-d
     
     <target name="download-postgresql">
         <mkdir dir="lib"/>
-        <property name="postgresql-version" value="9.1-901-1.jdbc4"/>
-        <property name="postgresql-package" value="postgresql"/>
-        <antcall target="download-via-maven"><param name="project-path" value="${postgresql-package}"/><param name="artifact-version" value="${postgresql-version}"/><param name="target" value="lib"/>
-            <param name="artifact-name" value="postgresql"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
+        <get src="http://jdbc.postgresql.org/download/postgresql-9.1-901.jdbc3.jar" dest="lib/postgresql.jar"/>
     </target>
 
     <target name="download-axis">

Modified: incubator/lcf/branches/release-0.5-incubating-branch/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.5-incubating-branch/framework/build.xml?rev=1309965&r1=1309964&r2=1309965&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.5-incubating-branch/framework/build.xml (original)
+++ incubator/lcf/branches/release-0.5-incubating-branch/framework/build.xml Thu Apr  5 17:32:50 2012
@@ -859,7 +859,7 @@
         <property name="manifest-cp-38" value="${manifest-cp-37} lib/mcf-ui-core.jar"/>
         <property name="manifest-cp-39" value="${manifest-cp-38} lib/log4j.jar"/>
         <property name="manifest-cp-40" value="${manifest-cp-39} lib/postgresql.jar"/>
-        <property name="manifest-cp-42" value="${manifest-cp-39} lib/serializer.jar"/>
+        <property name="manifest-cp-42" value="${manifest-cp-40} lib/serializer.jar"/>
         <property name="manifest-cp-43" value="${manifest-cp-42} lib/servlet-api.jar"/>
         <property name="manifest-cp-44" value="${manifest-cp-43} lib/juli.jar"/>
         <property name="manifest-cp-45" value="${manifest-cp-44} lib/xalan.jar"/>