[prev in list] [next in list] [prev in thread] [next in thread] 

List:       forrest-dev
Subject:    svn commit: r358914 - in /forrest/trunk/main: fresh-site/
From:       crossley () apache ! org
Date:       2005-12-24 3:02:44
Message-ID: 20051224030246.87934.qmail () minotaur ! apache ! org
[Download RAW message or body]

Author: crossley
Date: Fri Dec 23 19:02:33 2005
New Revision: 358914

URL: http://svn.apache.org/viewcvs?rev=358914&view=rev
Log:
The webapp/default-forrest.properties is only for default values.
Move the example proxy configuration to the example seed sites.

Modified:
    forrest/trunk/main/fresh-site/forrest.properties
    forrest/trunk/main/template-sites/basic/forrest.properties
    forrest/trunk/main/template-sites/benchmark/forrest.properties
    forrest/trunk/main/template-sites/business/forrest.properties
    forrest/trunk/main/template-sites/v2/forrest.properties
    forrest/trunk/main/template-sites/v3/forrest.properties
    forrest/trunk/main/webapp/default-forrest.properties

Modified: forrest/trunk/main/fresh-site/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/forrest.properties?rev=358914&r1=358913&r2=358914&view=diff
 ==============================================================================
--- forrest/trunk/main/fresh-site/forrest.properties (original)
+++ forrest/trunk/main/fresh-site/forrest.properties Fri Dec 23 19:02:33 2005
@@ -139,5 +139,8 @@
 #org.apache.forrest.plugin.input.viewHelper.xhtml.ls,org.apache.forrest.plugin.output.themer,org.apache.forrest.plugin.internal.structurer
  
 # Proxy configuration
-# proxy.host=
-# proxy.port=
+# - 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.user=<login, if authenticated proxy>
+# proxy.password=<password, if authenticated proxy>

Modified: forrest/trunk/main/template-sites/basic/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/basic/forrest.properties?rev=358914&r1=358913&r2=358914&view=diff
 ==============================================================================
--- forrest/trunk/main/template-sites/basic/forrest.properties (original)
+++ forrest/trunk/main/template-sites/basic/forrest.properties Fri Dec 23 19:02:33 \
2005 @@ -138,5 +138,8 @@
 #org.apache.forrest.plugin.input.viewHelper.xhtml.ls,org.apache.forrest.plugin.output.themer,org.apache.forrest.plugin.internal.structurer
  
 # Proxy configuration
-# proxy.host=
-# proxy.port=
+# - 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.user=<login, if authenticated proxy>
+# proxy.password=<password, if authenticated proxy>

Modified: forrest/trunk/main/template-sites/benchmark/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/benchmark/forrest.properties?rev=358914&r1=358913&r2=358914&view=diff
 ==============================================================================
--- forrest/trunk/main/template-sites/benchmark/forrest.properties (original)
+++ forrest/trunk/main/template-sites/benchmark/forrest.properties Fri Dec 23 \
19:02:33 2005 @@ -130,5 +130,8 @@
 #org.apache.forrest.plugin.input.viewHelper.xhtml.ls,org.apache.forrest.plugin.output.themer,org.apache.forrest.plugin.internal.structurer
  
 # Proxy configuration
-# proxy.host=
-# proxy.port=
+# - 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.user=<login, if authenticated proxy>
+# proxy.password=<password, if authenticated proxy>

Modified: forrest/trunk/main/template-sites/business/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/business/forrest.properties?rev=358914&r1=358913&r2=358914&view=diff
 ==============================================================================
--- forrest/trunk/main/template-sites/business/forrest.properties (original)
+++ forrest/trunk/main/template-sites/business/forrest.properties Fri Dec 23 19:02:33 \
2005 @@ -130,5 +130,8 @@
 #org.apache.forrest.plugin.input.viewHelper.xhtml.ls,org.apache.forrest.plugin.output.themer,org.apache.forrest.plugin.internal.structurer
  
 # Proxy configuration
-# proxy.host=
-# proxy.port=
+# - 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.user=<login, if authenticated proxy>
+# proxy.password=<password, if authenticated proxy>

Modified: forrest/trunk/main/template-sites/v2/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v2/forrest.properties?rev=358914&r1=358913&r2=358914&view=diff
 ==============================================================================
--- forrest/trunk/main/template-sites/v2/forrest.properties (original)
+++ forrest/trunk/main/template-sites/v2/forrest.properties Fri Dec 23 19:02:33 2005
@@ -176,5 +176,8 @@
 project.required.plugins=org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.output.themer,org.apache.forrest.plugin.internal.structurer
  
 # Proxy configuration
-# proxy.host=
-# proxy.port=
+# - 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.user=<login, if authenticated proxy>
+# proxy.password=<password, if authenticated proxy>

Modified: forrest/trunk/main/template-sites/v3/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v3/forrest.properties?rev=358914&r1=358913&r2=358914&view=diff
 ==============================================================================
--- forrest/trunk/main/template-sites/v3/forrest.properties (original)
+++ forrest/trunk/main/template-sites/v3/forrest.properties Fri Dec 23 19:02:33 2005
@@ -176,5 +176,8 @@
 project.required.plugins=org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.output.themer,org.apache.forrest.plugin.internal.structurer
  
 # Proxy configuration
-# proxy.host=
-# proxy.port=
+# - 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.user=<login, if authenticated proxy>
+# proxy.password=<password, if authenticated proxy>

Modified: forrest/trunk/main/webapp/default-forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/default-forrest.properties?rev=358914&r1=358913&r2=358914&view=diff
 ==============================================================================
--- forrest/trunk/main/webapp/default-forrest.properties (original)
+++ forrest/trunk/main/webapp/default-forrest.properties Fri Dec 23 19:02:33 2005
@@ -1,4 +1,4 @@
-# Copyright 2002-2004 The Apache Software Foundation or its licensors,
+# Copyright 2002-2005 The Apache Software Foundation or its licensors,
 # as applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -156,13 +156,6 @@
 # Run "forrest available-plugins" for a list of plug-ins currently available
 project.required.plugins=org.apache.forrest.plugin.output.pdf
 
-# Proxy configuration
-# - proxy.user and proxy.password are only needed if the proxy is an authenticated \
                one...
-proxy.host=80
-# proxy.port=<ProxyPort if not the default : 80>
-# proxy.user=<login if authenticated proxy>
-# proxy.password=<pwd if authenticated proxy>
-
 # Views v1 Configuration
 project.view.internal.plugin=org.apache.forrest.plugin.internal.view
 project.theme.plugin=org.apache.forrest.plugin.internal.view
@@ -170,4 +163,4 @@
 #   *advanced configuration*  v2 - you can specify which plugins you want
 #   use internal.
 project.themer=${forrest.home}/build/plugins/org.apache.forrest.plugin.output.themer
-project.stucturer=${forrest.home}/build/plugins/org.apache.forrest.plugin.internal.structurer
 \ No newline at end of file
+project.stucturer=${forrest.home}/build/plugins/org.apache.forrest.plugin.internal.structurer



[prev in list] [next in list] [prev in thread] [next in thread]