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