You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2004/06/03 14:31:30 UTC
cvs commit: cocoon-2.1/src/webapp/WEB-INF web.xml
vgritsenko 2004/06/03 05:31:30
Modified: . build.properties
src/webapp/WEB-INF web.xml
Added: src/confpatch enable-instrumentation.xweb
Log:
Add config.enable-instrumentation build property
Revision Changes Path
1.40 +1 -0 cocoon-2.1/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.properties,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- build.properties 29 Apr 2004 21:32:49 -0000 1.39
+++ build.properties 3 Jun 2004 12:31:30 -0000 1.40
@@ -41,6 +41,7 @@
#include.driver.odbc=true
#config.allow-reloads=true
#config.enable-uploads=true
+#config.enable-instrumentation=true
# ---- Validation --------------------------------------------------------------
1.1 cocoon-2.1/src/confpatch/enable-instrumentation.xweb
Index: enable-instrumentation.xweb
===================================================================
<?xml version="1.0"?>
<!--
Copyright 1999-2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<xweb xpath="/web-app/servlet/init-param[param-name='enable-instrumentation']/param-value"
if-prop="config.enable-instrumentation"
remove="/web-app/servlet/init-param[param-name='enable-instrumentation']/param-value/text()"
>true</xweb>
1.15 +3 -5 cocoon-2.1/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- web.xml 27 May 2004 13:00:55 -0000 1.14
+++ web.xml 3 Jun 2004 12:31:30 -0000 1.15
@@ -308,22 +308,20 @@
<!--
If true, Avalon Excalibur instrumentation will be enabled on all
Instrumentable components with Cocoon and your Cocoon application.
-
+ -->
<init-param>
<param-name>enable-instrumentation</param-name>
- <param-value>true</param-value>
+ <param-value>false</param-value>
</init-param>
- -->
<!--
This defines the location of the instrument manager configuration, only
used if the init-param enable-instrumentation is enabled.
-
+ -->
<init-param>
<param-name>instrumentation-config</param-name>
<param-value>/WEB-INF/instrumentation.xconf</param-value>
</init-param>
- -->
<!--
Set encoding used by the container. If not set the ISO-8859-1 encoding