Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 32784 invoked from network); 9 Sep 2005 12:56:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Sep 2005 12:56:43 -0000 Received: (qmail 57366 invoked by uid 500); 9 Sep 2005 12:56:41 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 57309 invoked by uid 500); 9 Sep 2005 12:56:41 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 57295 invoked by uid 99); 9 Sep 2005 12:56:41 -0000 X-ASF-Spam-Status: No, hits=-9.6 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 09 Sep 2005 05:56:41 -0700 Received: (qmail 32707 invoked by uid 65534); 9 Sep 2005 12:56:41 -0000 Message-ID: <20050909125641.32706.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r279762 - in /cocoon/branches/BRANCH_2_1_X: legal/msv-20030225.jar.license.txt lib/optional/msv-20030225.jar src/blocks/validation/java/org/apache/cocoon/components/validation/Validator.java Date: Fri, 09 Sep 2005 12:56:40 -0000 To: cvs@cocoon.apache.org From: pier@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: pier Date: Fri Sep 9 05:56:29 2005 New Revision: 279762 URL: http://svn.apache.org/viewcvs?rev=279762&view=rev Log: Adding SCHEMATRON (ISO and non) grammar identifiers for Gianugo. Importing Sun's MSV (it has an Apache license) Added: cocoon/branches/BRANCH_2_1_X/legal/msv-20030225.jar.license.txt cocoon/branches/BRANCH_2_1_X/lib/optional/msv-20030225.jar (with props) Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/Validator.java Added: cocoon/branches/BRANCH_2_1_X/legal/msv-20030225.jar.license.txt URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/msv-20030225.jar.license.txt?rev=279762&view=auto ============================================================================== --- cocoon/branches/BRANCH_2_1_X/legal/msv-20030225.jar.license.txt (added) +++ cocoon/branches/BRANCH_2_1_X/legal/msv-20030225.jar.license.txt Fri Sep 9 05:56:29 2005 @@ -0,0 +1,41 @@ +Copyright (c) 2001-2003 Sun Microsystems, Inc. All Rights +Reserved. + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the +following conditions are met: + +- Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + +- Redistribution in binary form must reproduct the above + copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + +Neither the name of Sun Microsystems, Inc. or the names of +contributors may be used to endorse or promote products +derived from this software without specific prior written +permission. + +This software is provided "AS IS," without a warranty of any +kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS +AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR +NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN AND ITS +LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR LIABILITIES +SUFFERED BY LICENSEE AS A RESULT OF OR RELATING TO USE, +MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS +DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE +LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, +INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE +DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF +LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE +SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + +You acknowledge that Software is not designed,licensed or +intended for use in the design, construction, operation or +maintenance of any nuclear facility. + Added: cocoon/branches/BRANCH_2_1_X/lib/optional/msv-20030225.jar URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/msv-20030225.jar?rev=279762&view=auto ============================================================================== Binary file - no diff available. Propchange: cocoon/branches/BRANCH_2_1_X/lib/optional/msv-20030225.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/Validator.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/Validator.java?rev=279762&r1=279761&r2=279762&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/Validator.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/validation/java/org/apache/cocoon/components/validation/Validator.java Fri Sep 9 05:56:29 2005 @@ -50,5 +50,13 @@ public static final String GRAMMAR_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema"; /**

The XML DTD grammar identifer.

*/ public static final String GRAMMAR_XML_DTD = "http://www.w3.org/XML/1998/namespace"; + + /**

The list of all known grammars excluding {@link #GRAMMAR_AUTOMATIC}.

*/ + public static final String GRAMMARS[] = new String[] { GRAMMAR_RELAX_NG, + GRAMMAR_RELAX_CORE, + GRAMMAR_RELAX_NS, + GRAMMAR_TREX, + GRAMMAR_XML_SCHEMA, + GRAMMAR_XML_DTD }; }