Author: cdupoirieux
Date: Wed Jan 11 01:16:01 2006
New Revision: 367979
URL: http://svn.apache.org/viewcvs?rev=367979&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/branches/forrest_07_branch/main/forrest.build.xml
forrest/branches/forrest_07_branch/main/fresh-site/forrest.properties
forrest/branches/forrest_07_branch/main/webapp/default-forrest.properties
forrest/branches/forrest_07_branch/site-author/content/xdocs/docs_0_70/faq.xml
forrest/branches/forrest_07_branch/site-author/status.xml
Modified: forrest/branches/forrest_07_branch/main/forrest.build.xml
URL:
http://svn.apache.org/viewcvs/forrest/branches/forrest_07_branch/main/forrest.build.xml?rev=367979&r1=367978&r2=367979&view=diff
==============================================================================
--- forrest/branches/forrest_07_branch/main/forrest.build.xml (original)
+++ forrest/branches/forrest_07_branch/main/forrest.build.xml Wed Jan 11
01:16:01 2006
@@ -525,10 +525,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/branches/forrest_07_branch/main/fresh-site/forrest.properties
URL:
http://svn.apache.org/viewcvs/forrest/branches/forrest_07_branch/main/fresh-site/forrest.properties?rev=367979&r1=367978&r2=367979&view=diff
==============================================================================
--- forrest/branches/forrest_07_branch/main/fresh-site/forrest.properties
(original)
+++ forrest/branches/forrest_07_branch/main/fresh-site/forrest.properties Wed
Jan 11 01:16:01 2006
@@ -125,5 +125,8 @@
project.required.plugins=org.apache.forrest.plugin.output.pdf
# Proxy configuration
-# proxy.host=
-# proxy.port=
+# - proxy.user and proxy.password are only needed if the proxy is an
authenticated one...
+# proxy.host=<yourProxy>
+# proxy.port=<ProxyPort>
+# proxy.user=<login if authenticated proxy>
+# proxy.password=<pwd if authenticated proxy>
Modified:
forrest/branches/forrest_07_branch/main/webapp/default-forrest.properties
URL:
http://svn.apache.org/viewcvs/forrest/branches/forrest_07_branch/main/webapp/default-forrest.properties?rev=367979&r1=367978&r2=367979&view=diff
==============================================================================
--- forrest/branches/forrest_07_branch/main/webapp/default-forrest.properties
(original)
+++ forrest/branches/forrest_07_branch/main/webapp/default-forrest.properties
Wed Jan 11 01:16:01 2006
@@ -150,5 +150,7 @@
project.required.plugins=org.apache.forrest.plugin.output.pdf
# Proxy configuration
-# proxy.host=
-# proxy.port=
+# proxy.host=<yourProxy>
+# proxy.port=<ProxyPort>
+# proxy.user=<login - if needed>
+# proxy.password=<pwd - if proxy.user>
\ No newline at end of file
Modified:
forrest/branches/forrest_07_branch/site-author/content/xdocs/docs_0_70/faq.xml
URL:
http://svn.apache.org/viewcvs/forrest/branches/forrest_07_branch/site-author/content/xdocs/docs_0_70/faq.xml?rev=367979&r1=367978&r2=367979&view=diff
==============================================================================
---
forrest/branches/forrest_07_branch/site-author/content/xdocs/docs_0_70/faq.xml
(original)
+++
forrest/branches/forrest_07_branch/site-author/content/xdocs/docs_0_70/faq.xml
Wed Jan 11 01:16:01 2006
@@ -416,8 +416,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/branches/forrest_07_branch/site-author/status.xml
URL:
http://svn.apache.org/viewcvs/forrest/branches/forrest_07_branch/site-author/status.xml?rev=367979&r1=367978&r2=367979&view=diff
==============================================================================
--- forrest/branches/forrest_07_branch/site-author/status.xml (original)
+++ forrest/branches/forrest_07_branch/site-author/status.xml Wed Jan 11
01:16:01 2006
@@ -324,7 +324,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">
