Return-Path: Delivered-To: apmail-forrest-svn-archive@www.apache.org Received: (qmail 88006 invoked from network); 24 Dec 2005 03:03:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Dec 2005 03:03:09 -0000 Received: (qmail 4633 invoked by uid 500); 24 Dec 2005 03:03:09 -0000 Delivered-To: apmail-forrest-svn-archive@forrest.apache.org Received: (qmail 4540 invoked by uid 500); 24 Dec 2005 03:03:08 -0000 Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Forrest Developers List" List-Id: Delivered-To: mailing list svn@forrest.apache.org Received: (qmail 4474 invoked by uid 99); 24 Dec 2005 03:03:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Dec 2005 19:03:07 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 23 Dec 2005 19:03:06 -0800 Received: (qmail 87935 invoked by uid 65534); 24 Dec 2005 03:02:46 -0000 Message-ID: <20051224030246.87934.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r358914 - in /forrest/trunk/main: fresh-site/ template-sites/basic/ template-sites/benchmark/ template-sites/business/ template-sites/v2/ template-sites/v3/ webapp/ Date: Sat, 24 Dec 2005 03:02:44 -0000 To: svn@forrest.apache.org From: crossley@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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= +# proxy.user= +# proxy.password= 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= +# proxy.user= +# proxy.password= 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= +# proxy.user= +# proxy.password= 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= +# proxy.user= +# proxy.password= 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= +# proxy.user= +# proxy.password= 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= +# proxy.user= +# proxy.password= 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= -# proxy.user= -# proxy.password= - # 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