svn commit: r598368 - in /lenya/trunk/src/confpatch: logger-class.xweb remove-xindice-servlet.xweb

Author: andreas
Date: Mon Nov 26 10:11:40 2007
New Revision: 598368

URL: http://svn.apache.org/viewvc?rev=598368&view=rev
Log:
Removing Xindice servlet declaration from web.xml, specify Cocoon servlet name in logger-class.xweb to avoid suspending by XConfToolTask

Added:
    lenya/trunk/src/confpatch/remove-xindice-servlet.xweb
Modified:
    lenya/trunk/src/confpatch/logger-class.xweb

Modified: lenya/trunk/src/confpatch/logger-class.xweb
URL: http://svn.apache.org/viewvc/lenya/trunk/src/confpatch/logger-class.xweb?rev=598368&r1=598367&r2=598368&view=diff
==============================================================================
--- lenya/trunk/src/confpatch/logger-class.xweb (original)
+++ lenya/trunk/src/confpatch/logger-class.xweb Mon Nov 26 10:11:40 2007
@@ -15,9 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xweb unless="/web-app/servlet/init-param[param-name = 'logger-class'][contains(param-value,'org.apache.avalon.excalibur.logger.Log4JLoggerManager')]" 
-      xpath="/web-app/servlet"
-      insert-after="init-param[position()=last()]">
+<xweb xpath="/web-app/servlet[servlet-name = 'Cocoon']"
+      unless="init-param[param-name = 'logger-class' and
+                         normalize-space(param-value) = 'org.apache.avalon.excalibur.logger.Log4JLoggerManager']"
+      insert-after="init-param[position() = last()]">
     <init-param>
       <param-name>logger-class</param-name>
       <param-value>org.apache.avalon.excalibur.logger.Log4JLoggerManager</param-value>

Added: lenya/trunk/src/confpatch/remove-xindice-servlet.xweb
URL: http://svn.apache.org/viewvc/lenya/trunk/src/confpatch/remove-xindice-servlet.xweb?rev=598368&view=auto
==============================================================================
--- lenya/trunk/src/confpatch/remove-xindice-servlet.xweb (added)
+++ lenya/trunk/src/confpatch/remove-xindice-servlet.xweb Mon Nov 26 10:11:40 2007
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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" remove="/web-app/servlet[servlet-name = 'Xindice']"/>