forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r154831 - in forrest/trunk: main/forrest.build.xml main/fresh-site/forrest.properties main/targets/plugins.xml main/targets/skins.xml main/webapp/default-forrest.properties plugins/build.xml
Date Tue, 22 Feb 2005 11:14:54 GMT
Author: rgardler
Date: Tue Feb 22 03:14:48 2005
New Revision: 154831

URL: http://svn.apache.org/viewcvs?view=rev&rev=154831
Log:
allow configuration of a proxy for skin and plugin downloads (thanks to Cyriaque Dupoirieux)

Modified:
    forrest/trunk/main/forrest.build.xml
    forrest/trunk/main/fresh-site/forrest.properties
    forrest/trunk/main/targets/plugins.xml
    forrest/trunk/main/targets/skins.xml
    forrest/trunk/main/webapp/default-forrest.properties
    forrest/trunk/plugins/build.xml

Modified: forrest/trunk/main/forrest.build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/forrest.build.xml?view=diff&r1=154830&r2=154831
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Tue Feb 22 03:14:48 2005
@@ -473,5 +473,20 @@
     </java>
   </target>
 
+<!-- ***************************************************************** -->
+<!-- ***************************************************************** -->
+<!-- **                                                             ** -->
+<!-- **                                                             ** -->
+<!-- **                       PROXY SETTINGS                        ** -->
+<!-- **                                                             ** -->
+<!-- **                                                             ** -->
+<!-- ***************************************************************** -->
+<!-- ***************************************************************** -->
+  <target name="init-proxy" if="proxy.host">
+     <property name="proxy.port" value="80"/>
+     <echo>Using proxy : ${proxy.host}:${proxy.port}</echo>
+     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+  </target>
+
 
 </project>

Modified: forrest/trunk/main/fresh-site/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/forrest.properties?view=diff&r1=154830&r2=154831
==============================================================================
--- forrest/trunk/main/fresh-site/forrest.properties (original)
+++ forrest/trunk/main/fresh-site/forrest.properties Tue Feb 22 03:14:48 2005
@@ -89,22 +89,33 @@
 
 # The URL to start crawling from
 #project.start-uri=linkmap.html
+
 # Set logging level for messages printed to the console
 # (DEBUG, INFO, WARN, ERROR, FATAL_ERROR)
 #project.debuglevel=ERROR
+
 # Max memory to allocate to Java
 #forrest.maxmemory=64m
+
 # Any other arguments to pass to the JVM. For example, to run on an X-less
 # server, set to -Djava.awt.headless=true
 #forrest.jvmargs=
+
 # The bugtracking URL - the issue number will be appended
 #project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
 #project.bugtracking-url=http://issues.apache.org/jira/browse/
+
 # The issues list as rss
 #project.issues-rss-url=
+
 #I18n Property only works for the "forrest run" target.
 #project.i18n=true
+
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
 project.required.plugins=org.apache.forrest.plugin.pdf-output
+
+# Proxy configuration
+# proxy.host=
+# proxy.port=

Modified: forrest/trunk/main/targets/plugins.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/plugins.xml?view=diff&r1=154830&r2=154831
==============================================================================
--- forrest/trunk/main/targets/plugins.xml (original)
+++ forrest/trunk/main/targets/plugins.xml Tue Feb 22 03:14:48 2005
@@ -78,7 +78,10 @@
 There may be more information about the reason for this in ouput
 above. The usual cause is that Forrest has been unable to download
 the plugin descriptor file that indicates where this plugin is to be
-downloaded from. Please check the value of the 
+downloaded from. If you are behind a firewall then set the proxy.host 
+and proxy.port values in the forrest.properties file.
+
+You may also like to check the value of the 
 forrest.plugins.descriptors property in the forrest.properties file
 and ensure that the locations indicated by that value are accessible
 (note there should be no spaces in this property).
@@ -163,7 +166,7 @@
       <fileset dir="${project.temp-dir}" includes="plugins-*.xml"/>
     </delete>
   
-    <var name="plugin-counter" value="1"/>
+    <var name="plugin-counter" value="1" depends="init-proxy"/>
     <for list="${forrest.plugins.descriptors}" param="url">
       <sequential>
         <echo>fetching descriptor: @{url}</echo>
@@ -191,8 +194,7 @@
             
             Unable to load plugin list number ${plugin-counter}. 
             Any plugins identified in this plugin list cannot be installed 
-            automatially, you will need to install these manually, see 
-            further errors below.</echo>
+            automatially, see further errors below.</echo>
           </else>
         </if>
         <math result="plugin-counter" operand1="${plugin-counter}" operation="+" operand2="1"
datatype="int"/>

Modified: forrest/trunk/main/targets/skins.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/skins.xml?view=diff&r1=154830&r2=154831
==============================================================================
--- forrest/trunk/main/targets/skins.xml (original)
+++ forrest/trunk/main/targets/skins.xml Tue Feb 22 03:14:48 2005
@@ -85,7 +85,7 @@
      </delete>
   </target>  
 
-  <target name="fetch-skins-descriptors" if="skin.unavailable">
+  <target name="fetch-skins-descriptors" if="skin.unavailable" depends="init-proxy">
     <delete>
       <fileset dir="${forrest.skins-dir}" includes="skins-*.xml"/>
     </delete>

Modified: forrest/trunk/main/webapp/default-forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/default-forrest.properties?view=diff&r1=154830&r2=154831
==============================================================================
--- forrest/trunk/main/webapp/default-forrest.properties (original)
+++ forrest/trunk/main/webapp/default-forrest.properties Tue Feb 22 03:14:48 2005
@@ -124,22 +124,31 @@
 
 # The URL to start crawling from
 project.start-uri=linkmap.html
+
 # Set logging level for messages printed to the console
 # (DEBUG, INFO, WARN, ERROR, FATAL_ERROR)
 project.debuglevel=ERROR
+
 # Max memory to allocate to Java
 forrest.maxmemory=64m
+
 # Any other arguments to pass to the JVM. For example, to run on an X-less
 # server, set to -Djava.awt.headless=true
 forrest.jvmargs=
+
 # The bugtracking URL - the issue number will be appended
 project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
+
 #project.bugtracking-url=http://issues.apache.org/jira/browse/
 # The issues list as rss
 #project.issues-rss-url=
 project.i18n=false
+
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
 project.required.plugins=org.apache.forrest.plugin.OpenOffice.org,simplified-docbook,wiki,org.apache.forrest.plugin.pdf-output
 
+# Proxy configuration
+# proxy.host=
+# proxy.port=

Modified: forrest/trunk/plugins/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/build.xml?view=diff&r1=154830&r2=154831
==============================================================================
--- forrest/trunk/plugins/build.xml (original)
+++ forrest/trunk/plugins/build.xml Tue Feb 22 03:14:48 2005
@@ -111,7 +111,7 @@
   <!-- FIXME: Forrest should really use the plugins in-place if they are available as
source -->
   <target name="local-deploy"
           description="Deploy a plugin locally"
-          depends="init, jar, clean">
+          depends="init, clean, jar">
           
     <echo>Locally deploying ${plugin-name}</echo>
     



Mime
View raw message