lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From k...@apache.org
Subject svn commit: r785029 - in /lucene/solr/trunk: CHANGES.txt build.xml common-build.xml contrib/clustering/build.xml
Date Mon, 15 Jun 2009 23:48:11 GMT
Author: koji
Date: Mon Jun 15 23:48:11 2009
New Revision: 785029

URL: http://svn.apache.org/viewvc?rev=785029&view=rev
Log:
SOLR-1219: added proxy.setup target

Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/build.xml
    lucene/solr/trunk/common-build.xml
    lucene/solr/trunk/contrib/clustering/build.xml

Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=785029&r1=785028&r2=785029&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Mon Jun 15 23:48:11 2009
@@ -514,6 +514,8 @@
  2. SOLR-854: Added run-example target (Mark Miller vie ehatcher)
 
  3. SOLR-1054:Fix dist-src target for DataImportHandler (Ryuuichi Kumai via shalin)
+
+ 4. SOLR-1219: Added proxy.setup target (koji)
  
 
 Documentation

Modified: lucene/solr/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/build.xml?rev=785029&r1=785028&r2=785029&view=diff
==============================================================================
--- lucene/solr/trunk/build.xml (original)
+++ lucene/solr/trunk/build.xml Mon Jun 15 23:48:11 2009
@@ -875,7 +875,7 @@
   <!-- ========================================================================= -->
 
   <available file="luke/luke-0.9.1.jar" property="luke.jar.exists" />
-  <target name="luke-download" unless="luke.jar.exists">
+  <target name="luke-download" unless="luke.jar.exists" depends="proxy.setup">
     <mkdir dir="luke"/>
     <get src="http://www.getopt.org/luke/luke-0.9.1/luke-0.9.1.jar" 
         dest="luke/luke-0.9.1.jar"/>

Modified: lucene/solr/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/common-build.xml?rev=785029&r1=785028&r2=785029&view=diff
==============================================================================
--- lucene/solr/trunk/common-build.xml (original)
+++ lucene/solr/trunk/common-build.xml Mon Jun 15 23:48:11 2009
@@ -319,6 +319,19 @@
     </sequential>
   </macrodef>
 
+  <!-- setup proxy for download tasks -->
+  <condition property="proxy.specified">
+    <or>
+      <isset property="proxy.host"/>
+      <isset property="proxy.port"/>
+      <isset property="proxy.user"/>
+    </or>
+  </condition>
+
+  <target name="proxy.setup" if="proxy.specified">
+    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.user}"
proxypassword="${proxy.password}"/>
+  </target>
+
 
   <target name="clean-contrib"
 	          description="Cleans all contrib modules and their tests">

Modified: lucene/solr/trunk/contrib/clustering/build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/clustering/build.xml?rev=785029&r1=785028&r2=785029&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/clustering/build.xml (original)
+++ lucene/solr/trunk/contrib/clustering/build.xml Mon Jun 15 23:48:11 2009
@@ -58,7 +58,7 @@
     <mkdir dir="lib/downloads" />
   </target>
 
-  <target name="check-files">
+  <target name="check-files" depends="proxy.setup">
       <available file="lib/downloads/colt-1.2.0.jar" property="colt.exists"/>
       <available file="lib/downloads/pcj-1.2.jar" property="pcj.exists"/>
       <available file="lib/downloads/nni-1.0.0.jar" property="nni.exists"/>



Mime
View raw message