cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r292214 - in /cocoon/branches/BRANCH_2_1_X/src/blocks/validation: WEB-INF/ WEB-INF/xconf/ WEB-INF/xconf/validation.xconf conf/validation.xconf conf/validation.xroles java/org/apache/cocoon/components/validation/validation.roles
Date Wed, 28 Sep 2005 15:38:42 GMT
Author: vgritsenko
Date: Wed Sep 28 08:38:33 2005
New Revision: 292214

URL: http://svn.apache.org/viewcvs?rev=292214&view=rev
Log:
sync validation block

Added:
    cocoon/branches/BRANCH_2_1_X/src/blocks/validation/WEB-INF/
    cocoon/branches/BRANCH_2_1_X/src/blocks/validation/WEB-INF/xconf/
    cocoon/branches/BRANCH_2_1_X/src/blocks/validation/WEB-INF/xconf/validation.xconf   (with
props)
    cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/validation.roles
  (with props)
Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/validation/conf/validation.xconf
    cocoon/branches/BRANCH_2_1_X/src/blocks/validation/conf/validation.xroles

Added: cocoon/branches/BRANCH_2_1_X/src/blocks/validation/WEB-INF/xconf/validation.xconf
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/validation/WEB-INF/xconf/validation.xconf?rev=292214&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/validation/WEB-INF/xconf/validation.xconf (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/validation/WEB-INF/xconf/validation.xconf Wed
Sep 28 08:38:33 2005
@@ -0,0 +1,40 @@
+<?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.
+-->
+
+<!--+
+    | $Id$
+    +-->
+<components>
+  <!-- Include roles -->
+  <include src="resource://org/apache/cocoon/components/validation/validation.roles"/>
+
+  <!--+
+      | The shared Validator instance in Cocoon.
+      |
+      | This defaults to an instance of a "CachedValidator". To disable schema
+      | caching add the following attribute to the <validator ... /> element:
+      |
+      |   class="org.apache.cocoon.components.validation.impl.DefaultValidator"
+      +-->
+  <validator logger="core.validation">
+    <schema-parser name="jing" class="org.apache.cocoon.components.validation.jing.JingSchemaParser"/>
+    <schema-parser name="jaxp" class="org.apache.cocoon.components.validation.jaxp.JaxpSchemaParser">
+      <factory-class>org.apache.xerces.jaxp.validation.XMLSchemaFactory</factory-class>
+    </schema-parser>
+  </validator>
+  
+</components>

Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/validation/WEB-INF/xconf/validation.xconf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/validation/WEB-INF/xconf/validation.xconf
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/validation/conf/validation.xconf
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/validation/conf/validation.xconf?rev=292214&r1=292213&r2=292214&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/validation/conf/validation.xconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/validation/conf/validation.xconf Wed Sep 28 08:38:33
2005
@@ -15,9 +15,10 @@
   limitations under the License.
 -->
 
-<xconf xpath="/cocoon" unless="validator">
+<xconf xpath="/cocoon" unless="@version != '2.1' or validator">
 
-  <!--+ The shared Validator instance in Cocoon.
+  <!--+
+      | The shared Validator instance in Cocoon.
       |
       | This defaults to an instance of a "CachedValidator". To disable schema
       | caching add the following attribute to the <validator ... /> element:

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/validation/conf/validation.xroles
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/validation/conf/validation.xroles?rev=292214&r1=292213&r2=292214&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/validation/conf/validation.xroles (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/validation/conf/validation.xroles Wed Sep 28 08:38:33
2005
@@ -15,7 +15,8 @@
   limitations under the License.
 -->
 
-<xroles xpath="/role-list" unless="role[@name='org.apache.cocoon.components.validation.Validator']">
+<xroles xpath="/role-list"
+        unless="/role-list[@cocoon-version != '2.1']|role[@name='org.apache.cocoon.components.validation.Validator']">
 
   <role name="org.apache.cocoon.components.validation.Validator" shorthand="validator"
         default-class="org.apache.cocoon.components.validation.impl.CachingValidator"/>

Added: cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/validation.roles
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/validation.roles?rev=292214&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/validation.roles
(added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/validation.roles
Wed Sep 28 08:38:33 2005
@@ -0,0 +1,27 @@
+<?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.
+-->
+
+<!--+
+    | $Id$
+    +-->
+<role-list>
+
+  <role name="org.apache.cocoon.components.validation.Validator"
+        shorthand="validator"
+        default-class="org.apache.cocoon.components.validation.impl.CachingValidator"/>
+
+</role-list>

Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/validation.roles
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/validation.roles
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message