incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1337350 - in /incubator/lcf/trunk: CHANGES.txt build.xml common-build.xml tests/test-build.xml
Date Fri, 11 May 2012 20:01:17 GMT
Author: kwright
Date: Fri May 11 20:01:17 2012
New Revision: 1337350

URL: http://svn.apache.org/viewvc?rev=1337350&view=rev
Log:
Fix for CONNECTORS-471.

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/common-build.xml
    incubator/lcf/trunk/tests/test-build.xml

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1337350&r1=1337349&r2=1337350&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Fri May 11 20:01:17 2012
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 0.6-dev =====================
 
+CONNECTORS-471: Replace broken HSQLDB 2.2.8 with a trunk build.
+(Karl Wright)
+
 CONNECTORS-96: Remove jdbcpool driver, and replace with a simple
 set of pooling classes.  This gives us better control and makes failures
 on long crawls less likely.

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1337350&r1=1337349&r2=1337350&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Fri May 11 20:01:17 2012
@@ -2736,13 +2736,26 @@ Use Apache Forrest version forrest-0.9-d
     
     <target name="download-hsqldb">
         <mkdir dir="lib"/>
-        <antcall target="download-via-maven">
+        <mkdir dir="build/download"/>
+        <delete dir="build/download/hsqldb"/>
+        <antcall target="checkout-source-via-svn">
+            <param name="root-dir" value="build/download"/>
+            <param name="svn-url" value="https://hsqldb.svn.sourceforge.net/svnroot/hsqldb/base/trunk"/>
+            <param name="dir-name" value="hsqldb"/>
+        </antcall>
+        <!-- Build it -->
+        <antcall target="build-via-ant">
+            <param name="root-dir" value="build/download/hsqldb/build"/>
+            <param name="target" value="hsqldb"/>
+        </antcall>
+        <copy todir="lib" file="build/download/hsqldb/lib/hsqldb.jar"/>
+        <!-- antcall target="download-via-mvn">
             <param name="project-path" value="org/hsqldb"/>
-            <param name="artifact-version" value="2.2.8"/>
+            <param name="artifact-version" value="2.2.9-snapshot"/>
             <param name="target" value="lib"/>
             <param name="artifact-name" value="hsqldb"/>
             <param name="artifact-type" value="jar"/>
-        </antcall>
+        </antcall -->
     </target>
     
     <target name="download-postgresql">

Modified: incubator/lcf/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/common-build.xml?rev=1337350&r1=1337349&r2=1337350&view=diff
==============================================================================
--- incubator/lcf/trunk/common-build.xml (original)
+++ incubator/lcf/trunk/common-build.xml Fri May 11 20:01:17 2012
@@ -54,4 +54,15 @@
         </exec>
     </target>
     
+    <target name="build-via-ant">
+        <exec osfamily="windows" dir="${root-dir}" executable="cmd" failifexecutionfails="true"
failonerror="true">
+            <arg value="/c"/>
+            <arg value="ant.bat"/>
+            <arg value="${target}" />
+        </exec>
+        <exec osfamily="unix" dir="${root-dir}" executable="ant" failifexecutionfails="true"
failonerror="true">
+            <arg value="${target}" />
+        </exec>
+    </target>
+    
 </project>

Modified: incubator/lcf/trunk/tests/test-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/test-build.xml?rev=1337350&r1=1337349&r2=1337350&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/test-build.xml (original)
+++ incubator/lcf/trunk/tests/test-build.xml Fri May 11 20:01:17 2012
@@ -241,7 +241,7 @@
     
     <target name="run-load-HSQLDB" depends="compile-tests">
         <mkdir dir="test-HSQLDB-output"/>
-        <junit fork="true" maxmemory="1700m" dir="test-HSQLDB-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
+        <junit fork="true" maxmemory="384m" dir="test-HSQLDB-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <jvmarg value="-DcrawlerWarPath=../../../framework/build/war-proprietary/mcf-crawler-ui.war"/>
             <jvmarg value="-DauthorityserviceWarPath=../../../framework/build/war-proprietary/mcf-authority-service.war"/>
             <jvmarg value="-DapiWarPath=../../../framework/build/war-proprietary/mcf-api-service.war"/>
@@ -260,7 +260,7 @@
     
     <target name="run-load-HSQLDBext" depends="compile-tests">
         <mkdir dir="test-HSQLDBext-output"/>
-        <junit fork="true" maxmemory="1700m" dir="test-HSQLDBext-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
+        <junit fork="true" maxmemory="384m" dir="test-HSQLDBext-output" outputtoformatters="true"
showoutput="true" haltonfailure="true">
             <jvmarg value="-DcrawlerWarPath=../../../framework/build/war-proprietary/mcf-crawler-ui.war"/>
             <jvmarg value="-DauthorityserviceWarPath=../../../framework/build/war-proprietary/mcf-authority-service.war"/>
             <jvmarg value="-DapiWarPath=../../../framework/build/war-proprietary/mcf-api-service.war"/>



Mime
View raw message