vgritsenko 2004/05/16 05:17:28
Modified: src/blocks/slide/conf slide-servlet.xweb
Added: src/blocks/slide/conf slide-mapping.xweb
Log:
Separate servlet definition and mapping
Revision Changes Path
1.11 +2 -6 cocoon-2.1/src/blocks/slide/conf/slide-servlet.xweb
Index: slide-servlet.xweb
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/conf/slide-servlet.xweb,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- slide-servlet.xweb 3 May 2004 16:46:36 -0000 1.10
+++ slide-servlet.xweb 16 May 2004 12:17:28 -0000 1.11
@@ -15,8 +15,8 @@
limitations under the License.
-->
<xweb xpath="/web-app"
- unless="comment()[contains(., 'Definition and configuration of Slide')]"
- insert-after="servlet[servlet-name = 'Cocoon']">
+ unless="comment()[contains(., 'Definition and configuration of
Slide')]"
+ insert-after="servlet[last()]">
<!-- Definition and configuration of Slide's WebDAV servlet. -->
<servlet>
@@ -175,9 +175,5 @@
<role-link>user</role-link>
</security-role-ref!-->
</servlet>
- <servlet-mapping>
- <servlet-name>webdav</servlet-name>
- <url-pattern>/webdav/*</url-pattern>
- </servlet-mapping>
</xweb>
1.1 cocoon-2.1/src/blocks/slide/conf/slide-mapping.xweb
Index: slide-mapping.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"
unless="comment()[contains(., 'Mapping of Slide')]"
insert-after="servlet-mapping[last()]">
<!-- Mapping of Slide's WebDAV servlet. -->
<servlet-mapping>
<servlet-name>webdav</servlet-name>
<url-pattern>/webdav/*</url-pattern>
</servlet-mapping>
</xweb>
