Return-Path: 
 <svn-return-7785-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 39528 invoked from network); 23 Aug 2008 05:07:40 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 23 Aug 2008 05:07:40 -0000
Received: (qmail 60824 invoked by uid 500); 23 Aug 2008 05:07:38 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 60785 invoked by uid 500); 23 Aug 2008 05:07:38 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 60776 invoked by uid 99); 23 Aug 2008 05:07:38 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2008 22:07:38 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Aug 2008 05:06:49 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 65A88238898A; Fri, 22 Aug 2008 22:07:19 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r688261 - in
 /forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF:
 cocoon.xconf properties/core.properties properties/dev/ properties/prod/
Date: Sat, 23 Aug 2008 05:07:18 -0000
To: svn@forrest.apache.org
From: crossley@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080823050719.65A88238898A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: crossley
Date: Fri Aug 22 22:07:18 2008
New Revision: 688261

URL: http://svn.apache.org/viewvc?rev=688261&view=rev
Log:
Cocoon "Running modes" are not supported in Cocoon-2.1
So removing WEB-INF/properties/prod|dev which were added by FOR-917.
We only used one experimental property "org.apache.xml.resolver.verbosity" whichhas been moved to WEB-INF/properties/core.properties file.
Issue: FOR-1091, FOR-955

Removed:
    forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/properties/dev/
    forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/properties/prod/
Modified:
    forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf
    forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/properties/core.properties

Modified: forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf?rev=688261&r1=688260&r2=688261&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf (original)
+++ forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf Fri Aug 22 22:07:18 2008
@@ -313,9 +313,6 @@
       +-->
   <entity-resolver logger="core.resolver">
     <parameter name="catalog" value="resources/schema/catalog.xcat"/>
-<!-- See FOR-917 testing new Cocoon "running modes"
-    <parameter name="verbosity" value="1"/>
--->
     <parameter name="verbosity" value="${org.apache.xml.resolver.verbosity}"/>
   </entity-resolver>
 

Modified: forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/properties/core.properties
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/properties/core.properties?rev=688261&r1=688260&r2=688261&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/properties/core.properties (original)
+++ forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/properties/core.properties Fri Aug 22 22:07:18 2008
@@ -13,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file contains the default settings for Cocoon.
-# You should NOT change this file directly. Create your own properties
-# file and put it in the sub directories for the mode you are running
-# Cocoon in.
-
 # This parameter points to the main configuration file for Cocoon.
 org.apache.cocoon.configuration=/WEB-INF/cocoon.xconf
 
@@ -31,3 +26,5 @@
 #       ERROR:        prints all level of log messages except DEBUG, INFO and WARN ones.
 #       FATAL_ERROR:  prints only log messages of this level
 org.apache.cocoon.logging.bootstrap.loglevel=WARN
+
+org.apache.xml.resolver.verbosity=0