forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdupoiri...@apache.org
Subject svn commit: r367986 - in /forrest/trunk: main/forrest.build.xml main/fresh-site/forrest.properties site-author/content/xdocs/docs_0_70/faq.xml site-author/content/xdocs/docs_0_80/faq.xml site-author/status.xml
Date Wed, 11 Jan 2006 09:41:32 GMT
Author: cdupoirieux
Date: Wed Jan 11 01:41:22 2006
New Revision: 367986

URL: http://svn.apache.org/viewcvs?rev=367986&view=rev
Log:
Add the ability to set a proxy user and password in case the proxy is an authenticated one.
Update the faq.xml

Modified:
    forrest/trunk/main/forrest.build.xml
    forrest/trunk/main/fresh-site/forrest.properties
    forrest/trunk/site-author/content/xdocs/docs_0_70/faq.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml
    forrest/trunk/site-author/status.xml

Modified: forrest/trunk/main/forrest.build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/forrest.build.xml?rev=367986&r1=367985&r2=367986&view=diff
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Wed Jan 11 01:41:22 2006
@@ -504,10 +504,17 @@
 <!-- ***************************************************************** -->
 <!-- ***************************************************************** -->
   <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}"/>
+    <echo>Using proxy : ${proxy.host}:${proxy.port}</echo>
+    <if>
+      <isset property="proxy.user"/>
+      <then>
+        <echo>Proxy connection : xxxxxx/xxxxxx (confidential)</echo>
+        <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.user}"
proxypassword="${proxy.password}"/>
+      </then>
+      <else>
+        <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+      </else>
+    </if>
   </target>
-
 
 </project>

Modified: forrest/trunk/main/fresh-site/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/forrest.properties?rev=367986&r1=367985&r2=367986&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/forrest.properties (original)
+++ forrest/trunk/main/fresh-site/forrest.properties Wed Jan 11 01:41:22 2006
@@ -154,6 +154,6 @@
 # Proxy configuration
 # - proxy.user and proxy.password are only needed if the proxy is an authenticated one...
 # proxy.host=myproxy.myhost.com
-# proxy.port=<ProxyPort, if not the default : 80>
+# proxy.port=<ProxyPort>
 # proxy.user=<login, if authenticated proxy>
 # proxy.password=<password, if authenticated proxy>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_70/faq.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/docs_0_70/faq.xml?rev=367986&r1=367985&r2=367986&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_70/faq.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_70/faq.xml Wed Jan 11 01:41:22 2006
@@ -426,8 +426,8 @@
         do?</question>
       <answer>
         <p>You can configure the proxy in the <code>forrest.properties</code>
file. Set the
-            <code>proxy.host</code> and <code>proxy.port</code> accordingly
(the port will default
-          to port 80).</p>
+            <code>proxy.host</code> and <code>proxy.port</code> accordingly.</p>
+        <p>You can also cross an authenticated proxy by setting the <code>proxy.user</code>
and <code>proxy.password</code> accordingly.</p>
       </answer>
     </faq>
     <faq id="CVS_revison_tags">

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml?rev=367986&r1=367985&r2=367986&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml Wed Jan 11 01:41:22 2006
@@ -538,8 +538,8 @@
         do?</question>
       <answer>
         <p>You can configure the proxy in the <code>forrest.properties</code>
file. Set the
-            <code>proxy.host</code> and <code>proxy.port</code> accordingly
(the port will default
-          to port 80).</p>
+            <code>proxy.host</code> and <code>proxy.port</code> accordingly.</p>
+        <p>You can also cross an authenticated proxy by setting the <code>proxy.user</code>
and <code>proxy.password</code> accordingly.</p>
       </answer>
     </faq>
     <faq id="CVS_revison_tags">

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/status.xml?rev=367986&r1=367985&r2=367986&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Wed Jan 11 01:41:22 2006
@@ -454,7 +454,7 @@
        This requires that your source must now be foo.lang.xml instead of foo_lang.xml
       </action>
       <action dev="RDG" type="add" context="code" fixes-bug="FOR-445" due-to="Cyriaque
Dupoirieux">
-        Added proxy.host and proxy.port to allow plugin downloads from behind a
+        Added proxy.host, proxy.port, proxy.user and proxy.password to allow plugin downloads
from behind a
         proxy.
       </action>
       <action dev="DC" type="fix" context="code" fixes-bug="FOR-246,FOR-431" due-to="Florian
G. Haas">



Mime
View raw message