[GME-commit] GMESRC/GME/Include/xercesc/validators/schema ComplexTypeInfo.hpp, 1.1.1.1, 1.2 GeneralAttributeCheck.hpp, 1.1.1.1, 1.2 NamespaceScope.hpp, 1.1.1.1, 1.2 PSVIDefs.hpp, 1.1.1.1, 1.2 SchemaAttDef.hpp, 1.1.1.1, 1.2 SchemaAttDefList.hpp, 1.1.1.1, 1.2 SchemaElementDecl.hpp, 1.1.1.1, 1.2 SchemaGrammar.hpp, 1.1.1.1, 1.2 SchemaInfo.hpp, 1.1.1.1, 1.2 SchemaSymbols.hpp, 1.1.1.1, 1.2 SchemaValidator.hpp, 1.1.1.1, 1.2 SubstitutionGroupComparator.hpp, 1.1.1.1, 1.2 TraverseSchema.hpp, 1.1.1.1, 1.2 XMLSchemaDescriptionImpl.hpp, 1.1.1.1, 1.2 XSDDOMParser.hpp, 1.1.1.1, 1.2 XSDErrorReporter.hpp, 1.1.1.1, 1.2 XSDLocator.hpp, 1.1.1.1, 1.2 XUtil.hpp, 1.1.1.1, 1.2 XercesAttGroupInfo.hpp, 1.1.1.1, 1.2 XercesElementWildcard.hpp, 1.1.1.1, 1.2 XercesGroupInfo.hpp, 1.1.1.1, 1.2
Log messages of CVS commits
gme-commit at list.isis.vanderbilt.edu
Tue Feb 19 14:16:34 CST 2008
- Previous message: [GME-commit] GMESRC/GME/Include/xercesc/validators/schema/identity FieldActivator.hpp, 1.1.1.1, 1.2 FieldValueMap.hpp, 1.1.1.1, 1.2 IC_Field.hpp, 1.1.1.1, 1.2 IC_Key.hpp, 1.1.1.1, 1.2 IC_KeyRef.hpp, 1.1.1.1, 1.2 IC_Selector.hpp, 1.1.1.1, 1.2 IC_Unique.hpp, 1.1.1.1, 1.2 IdentityConstraint.hpp, 1.1.1.1, 1.2 ValueStore.hpp, 1.1.1.1, 1.2 ValueStoreCache.hpp, 1.1.1.1, 1.2 XPathException.hpp, 1.1.1.1, 1.2 XPathMatcher.hpp, 1.1.1.1, 1.2 XPathMatcherStack.hpp, 1.1.1.1, 1.2 XPathSymbols.hpp, 1.1.1.1, 1.2 XercesXPath.hpp, 1.1.1.1, 1.2
- Next message: [GME-commit] GMESRC/GME/Include/xercesc/validators/datatype XMLCanRepGroup.hpp, NONE, 1.1 AbstractNumericFacetValidator.hpp, 1.1.1.1, 1.2 AbstractNumericValidator.hpp, 1.1.1.1, 1.2 AbstractStringValidator.hpp, 1.1.1.1, 1.2 AnySimpleTypeDatatypeValidator.hpp, 1.1.1.1, 1.2 AnyURIDatatypeValidator.hpp, 1.1.1.1, 1.2 Base64BinaryDatatypeValidator.hpp, 1.1.1.1, 1.2 BooleanDatatypeValidator.hpp, 1.1.1.1, 1.2 DatatypeValidator.hpp, 1.1.1.1, 1.2 DatatypeValidatorFactory.hpp, 1.1.1.1, 1.2 DateDatatypeValidator.hpp, 1.1.1.1, 1.2 DateTimeDatatypeValidator.hpp, 1.1.1.1, 1.2 DateTimeValidator.hpp, 1.1.1.1, 1.2 DayDatatypeValidator.hpp, 1.1.1.1, 1.2 DecimalDatatypeValidator.hpp, 1.1.1.1, 1.2 DoubleDatatypeValidator.hpp, 1.1.1.1, 1.2 DurationDatatypeValidator.hpp, 1.1.1.1, 1.2 ENTITYDatatypeValidator.hpp, 1.1.1.1, 1.2 FloatDatatypeValidator.hpp, 1.1.1.1, 1.2 HexBinaryDatatypeValidator.hpp, 1.1.1.1, 1.2 IDDatatypeValidator.hpp, 1.1.1.1, 1.2 IDREFDatatypeValidator.hpp, 1.1.1.1, 1.2 InvalidDatatypeFacetException.hpp, 1.1.1.1, 1.2 InvalidDataty peValueException.hpp, 1.1.1.1, 1.2 ListDatatypeValidator.hpp, 1.1.1.1, 1.2 MonthDatatypeValidator.hpp, 1.1.1.1, 1.2 MonthDayDatatypeValidator.hpp, 1.1.1.1, 1.2 NCNameDatatypeValidator.hpp, 1.1.1.1, 1.2 NOTATIONDatatypeValidator.hpp, 1.1.1.1, 1.2 NameDatatypeValidator.hpp, 1.1.1.1, 1.2 QNameDatatypeValidator.hpp, 1.1.1.1, 1.2 StringDatatypeValidator.hpp, 1.1.1.1, 1.2 TimeDatatypeValidator.hpp, 1.1.1.1, 1.2 UnionDatatypeValidator.hpp, 1.1.1.1, 1.2 YearDatatypeValidator.hpp, 1.1.1.1, 1.2 YearMonthDatatypeValidator.hpp, 1.1.1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema
In directory escher:/tmp/cvs-serv26529/validators/schema
Modified Files:
ComplexTypeInfo.hpp GeneralAttributeCheck.hpp
NamespaceScope.hpp PSVIDefs.hpp SchemaAttDef.hpp
SchemaAttDefList.hpp SchemaElementDecl.hpp SchemaGrammar.hpp
SchemaInfo.hpp SchemaSymbols.hpp SchemaValidator.hpp
SubstitutionGroupComparator.hpp TraverseSchema.hpp
XMLSchemaDescriptionImpl.hpp XSDDOMParser.hpp
XSDErrorReporter.hpp XSDLocator.hpp XUtil.hpp
XercesAttGroupInfo.hpp XercesElementWildcard.hpp
XercesGroupInfo.hpp
Log Message:
Xerces2.7 includes checkin.
CVS User: Zoltan Molnar, ISIS (zolmol)
Index: SubstitutionGroupComparator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/SubstitutionGroupComparator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SubstitutionGroupComparator.hpp 14 Apr 2004 10:08:31 -0000 1.1.1.1
--- SubstitutionGroupComparator.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,56 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 2001,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.
*/
***************
*** 126,137 ****
bool isAllowedByWildcard(SchemaGrammar* const pGrammar, QName* const element, unsigned int wuri, bool wother);
- protected:
-
private:
// -----------------------------------------------------------------------
! // Unimplemented Ctor
// -----------------------------------------------------------------------
SubstitutionGroupComparator();
!
// -----------------------------------------------------------------------
// Private data members
--- 86,97 ----
bool isAllowedByWildcard(SchemaGrammar* const pGrammar, QName* const element, unsigned int wuri, bool wother);
private:
// -----------------------------------------------------------------------
! // Unimplemented constructors and operators
// -----------------------------------------------------------------------
SubstitutionGroupComparator();
! SubstitutionGroupComparator(const SubstitutionGroupComparator&);
! SubstitutionGroupComparator& operator=(const SubstitutionGroupComparator&);
!
// -----------------------------------------------------------------------
// Private data members
***************
*** 141,145 ****
GrammarResolver *fGrammarResolver;
XMLStringPool *fStringPool;
-
};
--- 101,104 ----
Index: NamespaceScope.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/NamespaceScope.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** NamespaceScope.hpp 14 Apr 2004 10:08:29 -0000 1.1.1.1
--- NamespaceScope.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,56 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 2001,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.
*/
Index: XSDDOMParser.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/XSDDOMParser.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XSDDOMParser.hpp 14 Apr 2004 10:08:31 -0000 1.1.1.1
--- XSDDOMParser.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,56 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2002 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 2002,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.
*/
***************
*** 307,310 ****
--- 267,272 ----
);
+ virtual InputSource* resolveEntity(XMLResourceIdentifier* resourceIdentifier);
+
protected :
// -----------------------------------------------------------------------
***************
*** 315,318 ****
--- 277,286 ----
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XSDDOMParser(const XSDDOMParser&);
+ XSDDOMParser& operator=(const XSDDOMParser&);
+
// -----------------------------------------------------------------------
// Private Helper methods
Index: XercesElementWildcard.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/XercesElementWildcard.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XercesElementWildcard.hpp 14 Apr 2004 10:08:31 -0000 1.1.1.1
--- XercesElementWildcard.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,77 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
/*
! * $Log$
! * Revision 1.1.1.1 2004/04/14 10:08:31 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.2 2002/11/04 14:49:42 tng
! * C++ Namespace Support.
! *
! * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
! * sane_include
! *
! * Revision 1.2 2001/11/21 14:30:13 knoaman
! * Fix for UPA checking.
! *
! * Revision 1.1 2001/08/21 15:58:42 tng
! * Schema: New files XercesElementWildCard.
! *
!
! */
--- 1,21 ----
/*
! * Copyright 2001,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$
! */
Index: SchemaAttDef.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/SchemaAttDef.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SchemaAttDef.hpp 14 Apr 2004 10:08:29 -0000 1.1.1.1
--- SchemaAttDef.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,110 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
/*
! * $Log$
! * Revision 1.1.1.1 2004/04/14 10:08:29 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.9 2003/11/24 05:13:41 neilg
! * update method documentation
! *
! * Revision 1.8 2003/11/21 22:34:46 neilg
! * More schema component model implementation, thanks to David Cargill.
! * In particular, this cleans up and completes the XSModel, XSNamespaceItem,
! * XSAttributeDeclaration and XSAttributeGroup implementations.
! *
! * Revision 1.7 2003/10/10 16:25:40 peiyongz
! * Implementation of Serialization/Deserialization
! *
! * Revision 1.6 2003/05/18 14:02:07 knoaman
! * Memory manager implementation: pass per instance manager.
! *
! * Revision 1.5 2003/05/16 21:43:21 knoaman
! * Memory manager implementation: Modify constructors to pass in the memory manager.
! *
! * Revision 1.4 2003/02/06 13:51:55 gareth
! * fixed bug with multiple attributes being validated by the same union type.
! *
! * Revision 1.3 2003/01/29 19:47:16 gareth
! * added DOMTypeInfo and some PSVI methods
! *
! * Revision 1.2 2002/11/04 14:49:41 tng
! * C++ Namespace Support.
! *
! * Revision 1.1.1.1 2002/02/01 22:22:46 peiyongz
! * sane_include
! *
! * Revision 1.6 2001/08/10 12:34:25 knoaman
! * Fix compilation error.
! *
! * Revision 1.5 2001/08/09 15:23:16 knoaman
! * add support for <anyAttribute> declaration.
! *
! * Revision 1.4 2001/07/31 15:26:54 knoaman
! * Added support for <attributeGroup>.
! *
! * Revision 1.3 2001/05/11 17:17:41 tng
! * Schema: DatatypeValidator fixes. By Pei Yong Zhang.
! *
! * Revision 1.2 2001/05/11 13:27:34 tng
! * Copyright update.
! *
! * Revision 1.1 2001/02/27 18:48:22 tng
! * Schema: Add SchemaAttDef, SchemaElementDecl, SchemaAttDefList.
! *
*/
#if !defined(SCHEMAATTDEF_HPP)
--- 1,20 ----
/*
! * Copyright 2001,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$
*/
#if !defined(SCHEMAATTDEF_HPP)
***************
*** 265,268 ****
--- 175,185 ----
DatatypeValidator* getDatatypeValidator() const;
ValueVectorOf<unsigned int>* getNamespaceList() const;
+ const SchemaAttDef* getBaseAttDecl() const;
+ SchemaAttDef* getBaseAttDecl();
+ PSVIDefs::PSVIScope getPSVIScope() const;
+
+ /*
+ * @deprecated
+ */
ComplexTypeInfo* getEnclosingCT() const;
***************
*** 278,282 ****
--- 195,205 ----
);
void setDatatypeValidator(DatatypeValidator* newDatatypeValidator);
+ /*
+ * @deprecated
+ */
void setAnyDatatypeValidator(DatatypeValidator* newDatatypeValidator);
+ void setBaseAttDecl(SchemaAttDef* const attDef);
+ void setPSVIScope(const PSVIDefs::PSVIScope toSet);
+
/*
* @deprecated
***************
*** 301,304 ****
--- 224,233 ----
private :
// -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaAttDef(const SchemaAttDef&);
+ SchemaAttDef& operator=(const SchemaAttDef&);
+
+ // -----------------------------------------------------------------------
// Private data members
//
***************
*** 331,336 ****
--- 260,277 ----
// The type of validation that happened to this attr
//
+ // fBaseAttDecl
+ // The base attribute declaration that this attribute is based on
+ // NOTE: we do not have a notion of attribute use, so in the case
+ // of ref'd attributes and inherited attributes, we make a copy
+ // of the actual attribute declaration. The fBaseAttDecl stores that
+ // declaration, and will be helpful when we build the XSModel (i.e
+ // easy access the XSAnnotation object).
// -----------------------------------------------------------------------
unsigned int fElemId;
+
+ PSVIDefs::Validity fValidity;
+ PSVIDefs::Validation fValidation;
+ PSVIDefs::PSVIScope fPSVIScope;
+
QName* fAttName;
DatatypeValidator* fDatatypeValidator;
***************
*** 338,344 ****
const DatatypeValidator* fMemberTypeValidator;
ValueVectorOf<unsigned int>* fNamespaceList;
! PSVIDefs::Validity fValidity;
! PSVIDefs::Validation fValidation;
! ComplexTypeInfo* fEnclosingCT;
};
--- 279,283 ----
const DatatypeValidator* fMemberTypeValidator;
ValueVectorOf<unsigned int>* fNamespaceList;
! SchemaAttDef* fBaseAttDecl;
};
***************
*** 475,479 ****
inline ComplexTypeInfo* SchemaAttDef::getEnclosingCT() const
{
! return fEnclosingCT;
}
--- 414,433 ----
inline ComplexTypeInfo* SchemaAttDef::getEnclosingCT() const
{
! return 0;
! }
!
! inline SchemaAttDef* SchemaAttDef::getBaseAttDecl()
! {
! return fBaseAttDecl;
! }
!
! inline const SchemaAttDef* SchemaAttDef::getBaseAttDecl() const
! {
! return fBaseAttDecl;
! }
!
! inline PSVIDefs::PSVIScope SchemaAttDef::getPSVIScope() const
! {
! return fPSVIScope;
}
***************
*** 535,541 ****
}
! inline void SchemaAttDef::setEnclosingCT(ComplexTypeInfo* complexTypeInfo)
{
! fEnclosingCT = complexTypeInfo;
}
--- 489,504 ----
}
! inline void SchemaAttDef::setEnclosingCT(ComplexTypeInfo*)
{
! }
!
! inline void SchemaAttDef::setBaseAttDecl(SchemaAttDef* const attDef)
! {
! fBaseAttDecl = attDef;
! }
!
! inline void SchemaAttDef::setPSVIScope(const PSVIDefs::PSVIScope toSet)
! {
! fPSVIScope = toSet;
}
Index: XMLSchemaDescriptionImpl.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/XMLSchemaDescriptionImpl.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XMLSchemaDescriptionImpl.hpp 14 Apr 2004 10:08:31 -0000 1.1.1.1
--- XMLSchemaDescriptionImpl.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,62 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
/*
* $Log$
! * Revision 1.1.1.1 2004/04/14 10:08:31 volgy
! * Importing Xerces library 2.4
*
* Revision 1.3 2003/10/14 15:22:28 peiyongz
--- 1,25 ----
/*
! * 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.
*/
/*
* $Log$
! * Revision 1.2 2008/02/19 20:16:32 zolmol
! * Xerces2.7 includes checkin.
! *
! * Revision 1.4 2004/09/08 13:56:57 peiyongz
! * Apache License Version 2.0
*
* Revision 1.3 2003/10/14 15:22:28 peiyongz
Index: SchemaAttDefList.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/SchemaAttDefList.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SchemaAttDefList.hpp 14 Apr 2004 10:08:29 -0000 1.1.1.1
--- SchemaAttDefList.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,87 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
/*
! * $Log$
! * Revision 1.1.1.1 2004/04/14 10:08:29 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.6 2003/11/10 21:54:51 neilg
! * implementation for new stateless means of traversing attribute definition lists
! *
! * Revision 1.5 2003/10/20 11:46:28 gareth
! * Pass in memory manager to constructors and use for creation of enumerators.
! *
! * Revision 1.4 2003/10/10 16:25:40 peiyongz
! * Implementation of Serialization/Deserialization
! *
! * Revision 1.3 2002/12/06 13:27:14 tng
! * [Bug 9083] Make some classes be exportable.
! *
! * Revision 1.2 2002/11/04 14:49:41 tng
! * C++ Namespace Support.
! *
! * Revision 1.1.1.1 2002/02/01 22:22:46 peiyongz
! * sane_include
! *
! * Revision 1.2 2001/05/11 13:27:34 tng
! * Copyright update.
! *
! * Revision 1.1 2001/02/27 18:48:22 tng
! * Schema: Add SchemaAttDef, SchemaElementDecl, SchemaAttDefList.
! *
*/
--- 1,20 ----
/*
! * Copyright 2001,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$
*/
***************
*** 131,134 ****
--- 64,68 ----
*/
virtual bool hasMoreElements() const;
+
virtual bool isEmpty() const;
virtual XMLAttDef* findAttDef
***************
*** 153,156 ****
--- 87,102 ----
) const;
+ XMLAttDef* findAttDefLocalPart
+ (
+ const unsigned long uriID
+ , const XMLCh* const attLocalPart
+ );
+
+ const XMLAttDef* findAttDefLocalPart
+ (
+ const unsigned long uriID
+ , const XMLCh* const attLocalPart
+ ) const;
+
/**
* @deprecated This method is not thread-safe.
***************
*** 186,189 ****
--- 132,141 ----
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaAttDefList(const SchemaAttDefList&);
+ SchemaAttDefList& operator=(const SchemaAttDefList&);
+
void addAttDef(SchemaAttDef *toAdd);
***************
*** 226,229 ****
--- 178,193 ----
}
fArray[fCount++] = toAdd;
+ }
+
+ inline XMLAttDef* SchemaAttDefList::findAttDefLocalPart(const unsigned long uriID
+ , const XMLCh* const attLocalPart)
+ {
+ return fList->get((void*)attLocalPart, uriID);
+ }
+
+ inline const XMLAttDef* SchemaAttDefList::findAttDefLocalPart(const unsigned long uriID
+ , const XMLCh* const attLocalPart) const
+ {
+ return fList->get((void*)attLocalPart, uriID);
}
Index: XercesAttGroupInfo.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/XercesAttGroupInfo.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XercesAttGroupInfo.hpp 14 Apr 2004 10:08:31 -0000 1.1.1.1
--- XercesAttGroupInfo.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,56 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 2001-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.
*/
***************
*** 245,249 ****
if (toClone) {
! fAttributes->addElement(new (fMemoryManager) SchemaAttDef(toAdd));
}
else {
--- 205,214 ----
if (toClone) {
! SchemaAttDef* clonedAttDef = new (fMemoryManager) SchemaAttDef(toAdd);
!
! if (!clonedAttDef->getBaseAttDecl())
! clonedAttDef->setBaseAttDecl(toAdd);
!
! fAttributes->addElement(clonedAttDef);
}
else {
***************
*** 260,264 ****
if (toClone) {
! fAnyAttributes->addElement(new (fMemoryManager) SchemaAttDef(toAdd));
}
else {
--- 225,234 ----
if (toClone) {
! SchemaAttDef* clonedAttDef = new (fMemoryManager) SchemaAttDef(toAdd);
!
! if (!clonedAttDef->getBaseAttDecl())
! clonedAttDef->setBaseAttDecl(toAdd);
!
! fAnyAttributes->addElement(clonedAttDef);
}
else {
Index: GeneralAttributeCheck.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/GeneralAttributeCheck.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** GeneralAttributeCheck.hpp 14 Apr 2004 10:08:29 -0000 1.1.1.1
--- GeneralAttributeCheck.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,56 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 2001-2002,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.
*/
***************
*** 82,86 ****
class TraverseSchema;
class DOMElement;
!
class VALIDATORS_EXPORT GeneralAttributeCheck : public XMemory
--- 42,46 ----
class TraverseSchema;
class DOMElement;
! class DOMNode;
class VALIDATORS_EXPORT GeneralAttributeCheck : public XMemory
***************
*** 225,229 ****
// Getter methods
// -----------------------------------------------------------------------
! unsigned short getFacetId(const XMLCh* const facetName);
// -----------------------------------------------------------------------
--- 185,189 ----
// Getter methods
// -----------------------------------------------------------------------
! unsigned short getFacetId(const XMLCh* const facetName, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
// -----------------------------------------------------------------------
***************
*** 242,246 ****
const unsigned short elemContext,
TraverseSchema* const schema,
! const bool isTopLevel = false);
// -----------------------------------------------------------------------
--- 202,207 ----
const unsigned short elemContext,
TraverseSchema* const schema,
! const bool isTopLevel = false,
! ValueVectorOf<DOMNode*>* const nonXSAttList = 0);
// -----------------------------------------------------------------------
***************
*** 299,305 ****
// ---------------------------------------------------------------------------
inline unsigned short
! GeneralAttributeCheck::getFacetId(const XMLCh* const facetName) {
! return fFacetsMap->get(facetName);
}
--- 260,266 ----
// ---------------------------------------------------------------------------
inline unsigned short
! GeneralAttributeCheck::getFacetId(const XMLCh* const facetName, MemoryManager* const manager) {
! return fFacetsMap->get(facetName, manager);
}
Index: PSVIDefs.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/PSVIDefs.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PSVIDefs.hpp 14 Apr 2004 10:08:29 -0000 1.1.1.1
--- PSVIDefs.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,56 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2003 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 2003,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.
*/
***************
*** 80,84 ****
};
!
};
--- 40,49 ----
};
! enum PSVIScope
! {
! SCP_ABSENT // declared in group/attribute group
! , SCP_GLOBAL // global decalarion or ref
! , SCP_LOCAL // local declaration
! };
};
Index: XUtil.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/XUtil.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XUtil.hpp 14 Apr 2004 10:08:32 -0000 1.1.1.1
--- XUtil.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,84 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
/*
! * $Log$
! * Revision 1.1.1.1 2004/04/14 10:08:32 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.4 2002/11/04 14:49:42 tng
! * C++ Namespace Support.
! *
! * Revision 1.3 2002/05/21 19:31:45 tng
! * DOM Reorganization: modify to use the new DOM interface and remove obsolete code in XUtil.
! *
! * Revision 1.2 2002/02/06 22:21:49 knoaman
! * Use IDOM for schema processing.
! *
! * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
! * sane_include
! *
! * Revision 1.3 2001/11/02 14:13:45 knoaman
! * Add support for identity constraints.
! *
! * Revision 1.2 2001/05/11 13:27:39 tng
! * Copyright update.
! *
! * Revision 1.1 2001/03/30 16:06:00 tng
! * Schema: XUtil, added by Pei Yong Zhang
! *
*/
--- 1,20 ----
/*
! * Copyright 2001,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$
*/
***************
*** 120,124 ****
, unsigned int length);
! protected:
// -----------------------------------------------------------------------
// Constructors and Destructor
--- 56,60 ----
, unsigned int length);
! private:
// -----------------------------------------------------------------------
// Constructors and Destructor
***************
*** 128,132 ****
XUtil() {};
~XUtil() {};
-
};
--- 64,67 ----
Index: XSDErrorReporter.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/XSDErrorReporter.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XSDErrorReporter.hpp 14 Apr 2004 10:08:32 -0000 1.1.1.1
--- XSDErrorReporter.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,56 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2002 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 2002,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.
*/
***************
*** 109,113 ****
const XMLCh* const text2 = 0,
const XMLCh* const text3 = 0,
! const XMLCh* const text4 = 0);
private:
--- 69,75 ----
const XMLCh* const text2 = 0,
const XMLCh* const text3 = 0,
! const XMLCh* const text4 = 0,
! MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
! );
private:
Index: XSDLocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/XSDLocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XSDLocator.hpp 14 Apr 2004 10:08:32 -0000 1.1.1.1
--- XSDLocator.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,56 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2002 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 2002,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.
*/
Index: TraverseSchema.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/TraverseSchema.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TraverseSchema.hpp 14 Apr 2004 10:08:31 -0000 1.1.1.1
--- TraverseSchema.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,56 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 2001-2002,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.
*/
***************
*** 173,176 ****
--- 133,137 ----
void traverseSchemaHeader(const DOMElement* const schemaRoot);
XSAnnotation* traverseAnnotationDecl(const DOMElement* const childElem,
+ ValueVectorOf<DOMNode*>* const nonXSAttList,
const bool topLevel = false);
void traverseInclude(const DOMElement* const childElem);
***************
*** 426,431 ****
*/
ComplexTypeInfo* getElementComplexTypeInfo(const DOMElement* const elem,
! const XMLCh* const typeStr,
! bool& noErrorDetected,
const XMLCh* const otherSchemaURI);
--- 387,391 ----
*/
ComplexTypeInfo* getElementComplexTypeInfo(const DOMElement* const elem,
! const XMLCh* const typeStr,
const XMLCh* const otherSchemaURI);
***************
*** 451,455 ****
void processSubstitutionGroup(const DOMElement* const elem,
! SchemaElementDecl* elemDecl,
ComplexTypeInfo*& typeInfo,
DatatypeValidator*& validator,
--- 411,415 ----
void processSubstitutionGroup(const DOMElement* const elem,
! SchemaElementDecl* const elemDecl,
ComplexTypeInfo*& typeInfo,
DatatypeValidator*& validator,
***************
*** 482,489 ****
const XMLCh* const typeName,
const DOMElement* const childElem,
! ComplexTypeInfo* const typeInfo,
! const XMLCh* const baseRawName,
! const XMLCh* const baseLocalPart,
! const XMLCh* const baseURI,
const bool isMixed,
const bool isBaseAnyType = false);
--- 442,447 ----
const XMLCh* const typeName,
const DOMElement* const childElem,
! ComplexTypeInfo* const typeInfo,
! const XMLCh* const baseLocalPart,
const bool isMixed,
const bool isBaseAnyType = false);
***************
*** 524,531 ****
*/
void processAttributes(const DOMElement* const elem,
! const DOMElement* const attElem,
! const XMLCh* const baseRawName,
! const XMLCh* const baseLocalPart,
! const XMLCh* const baseURI,
ComplexTypeInfo* const typeInfo,
const bool isBaseAnyType = false);
--- 482,486 ----
*/
void processAttributes(const DOMElement* const elem,
! const DOMElement* const attElem,
ComplexTypeInfo* const typeInfo,
const bool isBaseAnyType = false);
***************
*** 727,733 ****
ValueVectorOf<SchemaInfo*>* const infoList);
! // Spaces are not allowed in URI, so %20 is used instead.
! // Convert %20 to spaces before resolving the URI
! void normalizeURI(const XMLCh* const systemURI, XMLBuffer& normalizedURI);
// -----------------------------------------------------------------------
--- 682,693 ----
ValueVectorOf<SchemaInfo*>* const infoList);
! void processAttValue(const XMLCh* const attVal, XMLBuffer& aBuf);
!
! // routine to generate synthetic annotations
! XSAnnotation* generateSyntheticAnnotation(const DOMElement* const elem
! , ValueVectorOf<DOMNode*>* nonXSAttList);
!
! // routine to validate annotations
! void validateAnnotations();
// -----------------------------------------------------------------------
***************
*** 793,796 ****
--- 753,757 ----
ValueVectorOf<const DOMElement*>* fDeclStack;
ValueVectorOf<unsigned int>** fGlobalDeclarations;
+ ValueVectorOf<DOMNode*>* fNonXSAttList;
RefHashTableOf<ValueVectorOf<DOMElement*> >* fIC_NodeListNS;
RefHashTableOf<ValueVectorOf<unsigned int> >* fIC_NamespaceDepthNS;
***************
*** 917,921 ****
XMLCh anonCountStr[16]; // a count of 15 digits should be enough
! XMLString::binToText(fAnonXSTypeCount++, anonCountStr, 15, 10);
fBuffer.set(prefix);
fBuffer.append(anonCountStr);
--- 878,882 ----
XMLCh anonCountStr[16]; // a count of 15 digits should be enough
! XMLString::binToText(fAnonXSTypeCount++, anonCountStr, 15, 10, fMemoryManager);
fBuffer.set(prefix);
fBuffer.append(anonCountStr);
***************
*** 950,979 ****
for (int i=0; i < redefineCounter; i++) {
newTypeName.append(SchemaSymbols::fgRedefIdentifier);
- }
- }
-
- inline void TraverseSchema::normalizeURI(const XMLCh* const systemURI,
- XMLBuffer& normalizedURI)
- {
- const XMLCh* pszSrc = systemURI;
-
- normalizedURI.reset();
-
- while (*pszSrc) {
-
- if ((*(pszSrc) == chPercent)
- && (*(pszSrc+1) == chDigit_2)
- && (*(pszSrc+2) == chDigit_0))
- {
- pszSrc += 3;
- normalizedURI.append(chSpace);
- }
- else if (*pszSrc == 0xFFFF) { //escaped character
- pszSrc++;
- }
- else {
- normalizedURI.append(*pszSrc);
- pszSrc++;
- }
}
}
--- 911,914 ----
Index: XercesGroupInfo.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/XercesGroupInfo.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XercesGroupInfo.hpp 14 Apr 2004 10:08:31 -0000 1.1.1.1
--- XercesGroupInfo.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,56 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 2001,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.
*/
Index: SchemaElementDecl.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/SchemaElementDecl.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SchemaElementDecl.hpp 14 Apr 2004 10:08:30 -0000 1.1.1.1
--- SchemaElementDecl.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,165 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
/*
! * $Log$
! * Revision 1.1.1.1 2004/04/14 10:08:30 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.17 2003/11/24 05:21:04 neilg
! * update method documentation
! *
! * Revision 1.16 2003/11/21 22:34:46 neilg
! * More schema component model implementation, thanks to David Cargill.
! * In particular, this cleans up and completes the XSModel, XSNamespaceItem,
! * XSAttributeDeclaration and XSAttributeGroup implementations.
! *
! * Revision 1.15 2003/11/06 15:30:08 neilg
! * first part of PSVI/schema component model implementation, thanks to David Cargill. This covers setting the PSVIHandler on parser objects, as well as implementing XSNotation, XSSimpleTypeDefinition, XSIDCDefinition, and most of XSWildcard, XSComplexTypeDefinition, XSElementDeclaration, XSAttributeDeclaration and XSAttributeUse.
! *
! * Revision 1.14 2003/10/14 15:22:28 peiyongz
! * Implementation of Serialization/Deserialization
! *
! * Revision 1.13 2003/10/05 02:08:05 neilg
! * Because it makes grammars un-sharable between parsers running on multiple threads, xsi:type should not be handled by modifying element declarations. Modifying implementation so it no longer relies on this kind of behaviour; marking methods as deprecated which imply that xsi:type will be handled in this way. Once their behaviour is handled elsewhere, these methods should eventually be removed
! *
! * Revision 1.12 2003/08/29 11:44:18 gareth
! * If a type was explicitly declared as anyType that now gets set in DOMTypeInfo. Added test cases.
! *
! * Revision 1.11 2003/05/18 14:02:08 knoaman
! * Memory manager implementation: pass per instance manager.
! *
! * Revision 1.10 2003/05/16 21:43:21 knoaman
! * Memory manager implementation: Modify constructors to pass in the memory manager.
! *
! * Revision 1.9 2003/05/15 18:57:27 knoaman
! * Partial implementation of the configurable memory manager.
! *
! * Revision 1.8 2003/01/29 19:47:16 gareth
! * added DOMTypeInfo and some PSVI methods
! *
! * Revision 1.7 2002/11/04 14:49:41 tng
! * C++ Namespace Support.
! *
! * Revision 1.6 2002/07/12 15:17:48 knoaman
! * For a given global element, store info about a substitution group element
! * as a SchemaElementDecl and not as a string.
! *
! * Revision 1.5 2002/04/01 15:47:06 knoaman
! * Move Element Consistency checking (ref to global declarations) to SchemaValidator.
! *
! * Revision 1.4 2002/03/21 16:31:43 knoaman
! * Remove data/methods from SchemaElementDecl that are not used.
! *
! * Revision 1.3 2002/03/04 15:09:50 knoaman
! * Fix for bug 6834.
! *
! * Revision 1.2 2002/02/06 22:30:50 knoaman
! * Added a new attribute to store the wild card information for elements of type 'anyType'.
! *
! * Revision 1.1.1.1 2002/02/01 22:22:46 peiyongz
! * sane_include
! *
! * Revision 1.16 2001/11/23 18:25:45 tng
! * Eliminate Warning from AIX xlC 3.6: 1540-399: (W) "IdentityConstraint" is undefined. The delete operator will not call a destructor.
! *
! * Revision 1.15 2001/11/02 14:13:45 knoaman
! * Add support for identity constraints.
! *
! * Revision 1.14 2001/10/11 12:07:39 tng
! * Schema: model type should be based on complextypeinfo if exists.
! *
! * Revision 1.13 2001/09/05 20:49:11 knoaman
! * Fix for complexTypes with mixed content model.
! *
! * Revision 1.12 2001/08/29 20:52:35 tng
! * Schema: xsi:type support
! *
! * Revision 1.11 2001/08/21 16:06:11 tng
! * Schema: Unique Particle Attribution Constraint Checking.
! *
! * Revision 1.10 2001/08/09 15:23:16 knoaman
! * add support for <anyAttribute> declaration.
! *
! * Revision 1.9 2001/07/24 18:33:46 knoaman
! * Added support for <group> + extra constraint checking for complexType
! *
! * Revision 1.8 2001/06/13 20:51:15 peiyongz
! * fIsMixed: to handle mixed Content Model
! *
! * Revision 1.7 2001/05/11 13:27:36 tng
! * Copyright update.
! *
! * Revision 1.6 2001/05/03 20:34:43 tng
! * Schema: SchemaValidator update
! *
! * Revision 1.5 2001/05/03 19:18:01 knoaman
! * TraverseSchema Part II.
! *
! * Revision 1.4 2001/04/19 17:43:17 knoaman
! * More schema implementation classes.
! *
! * Revision 1.3 2001/03/21 21:56:33 tng
! * Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
! *
! * Revision 1.2 2001/03/21 19:30:17 tng
! * Schema: Content Model Updates, by Pei Yong Zhang.
! *
! * Revision 1.1 2001/02/27 18:48:23 tng
! * Schema: Add SchemaAttDef, SchemaElementDecl, SchemaAttDefList.
! *
*/
--- 1,20 ----
/*
! * Copyright 2001,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$
*/
***************
*** 208,212 ****
};
-
// -----------------------------------------------------------------------
// Constructors and Destructor
--- 63,66 ----
***************
*** 267,270 ****
--- 121,125 ----
SchemaAttDef* getAttWildCard();
ModelTypes getModelType() const;
+ PSVIDefs::PSVIScope getPSVIScope() const;
DatatypeValidator* getDatatypeValidator() const;
int getEnclosingScope() const;
***************
*** 380,385 ****
--- 235,244 ----
// Setter methods
// -----------------------------------------------------------------------
+ /**
+ * @deprecated; not actually used
+ */
void setElemId(unsigned int elemId);
void setModelType(const SchemaElementDecl::ModelTypes toSet);
+ void setPSVIScope(const PSVIDefs::PSVIScope toSet);
void setDatatypeValidator(DatatypeValidator* newDatatypeValidator);
void setEnclosingScope(const int enclosingScope);
***************
*** 436,441 ****
--- 295,308 ----
DECL_XSERIALIZABLE(SchemaElementDecl)
+ virtual XMLElementDecl::objectType getObjectType() const;
+
private :
// -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaElementDecl(const SchemaElementDecl&);
+ SchemaElementDecl& operator=(const SchemaElementDecl&);
+
+ // -----------------------------------------------------------------------
// Private data members
//
***************
*** 508,517 ****
// -----------------------------------------------------------------------
ModelTypes fModelType;
! DatatypeValidator* fDatatypeValidator;
int fEnclosingScope;
int fFinalSet;
int fBlockSet;
! int fMiscFlags;
! unsigned int fElemId;
XMLCh* fDefaultValue;
ComplexTypeInfo* fComplexTypeInfo;
--- 375,386 ----
// -----------------------------------------------------------------------
ModelTypes fModelType;
! PSVIDefs::PSVIScope fPSVIScope;
! PSVIDefs::Validity fValidity;
! PSVIDefs::Validation fValidation;
!
int fEnclosingScope;
int fFinalSet;
int fBlockSet;
! int fMiscFlags;
XMLCh* fDefaultValue;
ComplexTypeInfo* fComplexTypeInfo;
***************
*** 522,527 ****
SchemaAttDef* fAttWildCard;
SchemaElementDecl* fSubstitutionGroupElem;
! PSVIDefs::Validity fValidity;
! PSVIDefs::Validation fValidation;
bool fSeenValidation;
bool fSeenNoValidation;
--- 391,396 ----
SchemaAttDef* fAttWildCard;
SchemaElementDecl* fSubstitutionGroupElem;
! DatatypeValidator* fDatatypeValidator;
!
bool fSeenValidation;
bool fSeenNoValidation;
***************
*** 551,555 ****
inline void
! SchemaElementDecl::setContentSpec(ContentSpecNode* toAdopt)
{
//Handled by complexType
--- 420,424 ----
inline void
! SchemaElementDecl::setContentSpec(ContentSpecNode*)
{
//Handled by complexType
***************
*** 565,569 ****
inline void
! SchemaElementDecl::setContentModel(XMLContentModel* const newModelToAdopt)
{
//Handled by complexType
--- 434,438 ----
inline void
! SchemaElementDecl::setContentModel(XMLContentModel* const)
{
//Handled by complexType
***************
*** 583,586 ****
--- 452,460 ----
}
+ inline PSVIDefs::PSVIScope SchemaElementDecl::getPSVIScope() const
+ {
+ return fPSVIScope;
+ }
+
inline DatatypeValidator* SchemaElementDecl::getDatatypeValidator() const
{
***************
*** 803,809 ****
// ---------------------------------------------------------------------------
inline void
! SchemaElementDecl::setElemId(unsigned int elemId)
{
! fElemId = elemId;
}
--- 677,684 ----
// ---------------------------------------------------------------------------
inline void
! SchemaElementDecl::setElemId(unsigned int)
{
! //there is not getElemId so this is not needed. mark deprecated.
! //fElemId = elemId;
}
***************
*** 812,815 ****
--- 687,696 ----
{
fModelType = toSet;
+ }
+
+ inline void
+ SchemaElementDecl::setPSVIScope(const PSVIDefs::PSVIScope toSet)
+ {
+ fPSVIScope = toSet;
}
Index: ComplexTypeInfo.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/ComplexTypeInfo.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ComplexTypeInfo.hpp 14 Apr 2004 10:08:29 -0000 1.1.1.1
--- ComplexTypeInfo.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,56 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 2001,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.
*/
***************
*** 162,165 ****
--- 122,128 ----
void addAttDef(SchemaAttDef* const toAdd);
void addElement(SchemaElementDecl* const toAdd);
+ /**
+ * @deprecated; not thread-safe (will not work with shared grammars)
+ */
void setContentModel(XMLContentModel* const newModelToAdopt);
void setLocator(XSDLocator* const aLocator);
***************
*** 193,196 ****
--- 156,171 ----
) ;
+ /**
+ * Return a singleton that represents 'anyType'
+ *
+ * @param emptyNSId the uri id of the empty namespace
+ */
+ static ComplexTypeInfo* getAnyType(unsigned int emptyNSId);
+
+ /**
+ * Notification that lazy data has been deleted
+ */
+ static void reinitAnyType();
+
/***
* Support for Serialization/De-serialization
***************
*** 210,214 ****
void faultInAttDefList() const;
XMLContentModel* createChildModel(ContentSpecNode* specNode, const bool isMixed);
! XMLContentModel* makeContentModel(const bool checkUPA = false, ContentSpecNode* const specNode = 0);
XMLContentModel* buildContentModel(ContentSpecNode* const specNode);
XMLCh* formatContentModel () const ;
--- 185,189 ----
void faultInAttDefList() const;
XMLContentModel* createChildModel(ContentSpecNode* specNode, const bool isMixed);
! XMLContentModel* makeContentModel(const bool checkUPA = false);
XMLContentModel* buildContentModel(ContentSpecNode* const specNode);
XMLCh* formatContentModel () const ;
***************
*** 229,234 ****
int fFinalSet;
int fScopeDefined;
- unsigned int fElementId;
int fContentType;
XMLCh* fTypeName;
XMLCh* fTypeLocalName;
--- 204,213 ----
int fFinalSet;
int fScopeDefined;
int fContentType;
+
+ unsigned int fElementId;
+ unsigned int fUniqueURI;
+ unsigned int fContentSpecOrgURISize;
+
XMLCh* fTypeName;
XMLCh* fTypeLocalName;
***************
*** 240,253 ****
SchemaAttDef* fAttWildCard;
SchemaAttDefList* fAttList;
! RefVectorOf<SchemaElementDecl>* fElements;
! RefVectorOf<ContentSpecNode>* fSpecNodesToDelete;
RefHash2KeysTableOf<SchemaAttDef>* fAttDefs;
XMLContentModel* fContentModel;
XMLCh* fFormattedModel;
unsigned int* fContentSpecOrgURI;
- unsigned int fUniqueURI;
- unsigned int fContentSpecOrgURISize;
XSDLocator* fLocator;
MemoryManager* fMemoryManager;
};
--- 219,231 ----
SchemaAttDef* fAttWildCard;
SchemaAttDefList* fAttList;
! RefVectorOf<SchemaElementDecl>* fElements;
RefHash2KeysTableOf<SchemaAttDef>* fAttDefs;
XMLContentModel* fContentModel;
XMLCh* fFormattedModel;
unsigned int* fContentSpecOrgURI;
XSDLocator* fLocator;
MemoryManager* fMemoryManager;
+
+ static ComplexTypeInfo* fAnyType;
};
***************
*** 351,358 ****
const int uriId) const {
- // If no list, then return a null
- if (!fAttDefs)
- return 0;
-
return fAttDefs->get(baseName, uriId);
}
--- 329,332 ----
***************
*** 361,368 ****
const int uriId)
{
- // If no list, then return a null
- if (!fAttDefs)
- return 0;
-
return fAttDefs->get(baseName, uriId);
}
--- 335,338 ----
***************
*** 390,394 ****
inline XMLContentModel* ComplexTypeInfo::getContentModel(const bool checkUPA)
{
! if (!fContentModel)
fContentModel = makeContentModel(checkUPA);
--- 360,364 ----
inline XMLContentModel* ComplexTypeInfo::getContentModel(const bool checkUPA)
{
! if (!fContentModel && fContentSpec)
fContentModel = makeContentModel(checkUPA);
***************
*** 407,421 ****
inline const XMLCh* ComplexTypeInfo::getTypeLocalName() const
{
- if(!fTypeLocalName) {
- int index = XMLString::indexOf(fTypeName, chComma);
- int length = XMLString::stringLen(fTypeName);
- XMLCh *tName = (XMLCh*) fMemoryManager->allocate
- (
- (length - index + 1) * sizeof(XMLCh)
- ); //new XMLCh[length - index + 1];
- XMLString::subString(tName, fTypeName, index + 1, length);
- ((ComplexTypeInfo *)this)->fTypeLocalName = tName;
- }
-
return fTypeLocalName;
}
--- 377,380 ----
***************
*** 423,436 ****
inline const XMLCh* ComplexTypeInfo::getTypeUri() const
{
- if(!fTypeUri) {
- int index = XMLString::indexOf(fTypeName, chComma);
- XMLCh *uri = (XMLCh*) fMemoryManager->allocate
- (
- (index + 1) * sizeof(XMLCh)
- ); //new XMLCh[index + 1];
- XMLString::subString(uri, fTypeName, 0, index);
- ((ComplexTypeInfo *)this)->fTypeUri = uri;
- }
-
return fTypeUri;
}
--- 382,385 ----
***************
*** 494,501 ****
fMemoryManager->deallocate(fTypeName);//delete [] fTypeName;
fMemoryManager->deallocate(fTypeLocalName);//delete [] fTypeLocalName;
! fMemoryManager->deallocate(fTypeUri);//delete [] fTypeUri;
! fTypeLocalName = fTypeUri = 0;
! fTypeName = XMLString::replicate(typeName, fMemoryManager);
}
--- 443,470 ----
fMemoryManager->deallocate(fTypeName);//delete [] fTypeName;
fMemoryManager->deallocate(fTypeLocalName);//delete [] fTypeLocalName;
! fMemoryManager->deallocate(fTypeUri);//delete [] fTypeUri;
! if (typeName)
! {
! fTypeName = XMLString::replicate(typeName, fMemoryManager);
!
! int index = XMLString::indexOf(fTypeName, chComma);
! int length = XMLString::stringLen(fTypeName);
! fTypeLocalName = (XMLCh*) fMemoryManager->allocate
! (
! (length - index + 1) * sizeof(XMLCh)
! ); //new XMLCh[length - index + 1];
! XMLString::subString(fTypeLocalName, fTypeName, index + 1, length, fMemoryManager);
!
! fTypeUri = (XMLCh*) fMemoryManager->allocate
! (
! (index + 1) * sizeof(XMLCh)
! ); //new XMLCh[index + 1];
! XMLString::subString(fTypeUri, fTypeName, 0, index, fMemoryManager);
! }
! else
! {
! fTypeName = fTypeLocalName = fTypeUri = 0;
! }
}
***************
*** 564,571 ****
inline bool ComplexTypeInfo::hasAttDefs() const
{
- // If the collection hasn't been faulted in, then no att defs
- if (!fAttDefs)
- return false;
-
return !fAttDefs->isEmpty();
}
--- 533,536 ----
***************
*** 573,581 ****
inline bool ComplexTypeInfo::contains(const XMLCh* const attName) {
! if (!fAttDefs) {
! return false;
! }
!
! RefHash2KeysTableOfEnumerator<SchemaAttDef> enumDefs(fAttDefs);
while (enumDefs.hasMoreElements()) {
--- 538,542 ----
inline bool ComplexTypeInfo::contains(const XMLCh* const attName) {
! RefHash2KeysTableOfEnumerator<SchemaAttDef> enumDefs(fAttDefs, false, fMemoryManager);
while (enumDefs.hasMoreElements()) {
Index: SchemaSymbols.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/SchemaSymbols.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SchemaSymbols.hpp 14 Apr 2004 10:08:30 -0000 1.1.1.1
--- SchemaSymbols.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,56 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 2001,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.
*/
***************
*** 273,276 ****
--- 233,241 ----
};
+ private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaSymbols();
};
Index: SchemaValidator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/SchemaValidator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SchemaValidator.hpp 14 Apr 2004 10:08:30 -0000 1.1.1.1
--- SchemaValidator.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,165 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
/*
! * $Log$
! * Revision 1.1.1.1 2004/04/14 10:08:30 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.23 2003/11/28 21:18:32 knoaman
! * Make use of canonical representation in PSVIElement
! *
! * Revision 1.22 2003/11/27 22:52:37 knoaman
! * PSVIElement implementation
! *
! * Revision 1.21 2003/11/27 06:10:31 neilg
! * PSVIAttribute implementation
! *
! * Revision 1.20 2003/11/24 05:13:20 neilg
! * expose validator that actually validated attribute. Clean up union handling
! *
! * Revision 1.19 2003/10/05 02:09:37 neilg
! * the validator now keeps track of the current complex and simple type (including if this is an xsi:type). This allows both the validator and the scanner to know what the current type is, without the need to modify the element declaration each time an xsi:type is seen
! *
! * Revision 1.18 2003/08/14 03:01:04 knoaman
! * Code refactoring to improve performance of validation.
! *
! * Revision 1.17 2003/05/18 14:02:08 knoaman
! * Memory manager implementation: pass per instance manager.
! *
! * Revision 1.16 2003/05/16 21:43:21 knoaman
! * Memory manager implementation: Modify constructors to pass in the memory manager.
! *
! * Revision 1.15 2003/05/16 03:15:51 knoaman
! * Partial implementation of the configurable memory manager.
! *
! * Revision 1.14 2003/05/15 18:57:27 knoaman
! * Partial implementation of the configurable memory manager.
! *
! * Revision 1.13 2003/01/20 19:04:48 knoaman
! * Fix for particle derivation checking.
! *
! * Revision 1.12 2003/01/13 20:16:51 knoaman
! * [Bug 16024] SchemaSymbols.hpp conflicts C++ Builder 6 dir.h
! *
! * Revision 1.11 2003/01/09 22:34:54 tng
! * [Bug 14955] error validating parser.
! *
! * Revision 1.10 2002/11/07 21:57:37 tng
! * Fix the following Schema Test Failures:
! * 1. Typo when comparing miscFlags with FIXED
! * 2. If xsi:type is specified, need to validate using that xsitype validator even if the type was any
! * 3. Need to check ID/IDREFs for element value
! * 4. Need to duplicate attribute id for wildcard scenario.
! *
! * Revision 1.9 2002/11/04 14:49:42 tng
! * C++ Namespace Support.
! *
! * Revision 1.8 2002/09/04 18:17:41 tng
! * Do not set IDREF to used during prevalidation.
! *
! * Revision 1.7 2002/07/11 18:55:45 knoaman
! * Add a flag to the preContentValidation method to indicate whether to validate
! * default/fixed attributes or not.
! *
! * Revision 1.6 2002/06/17 18:09:29 tng
! * DOM L3: support "datatype-normalization"
! *
! * Revision 1.5 2002/05/22 20:54:14 knoaman
! * Prepare for DOM L3 :
! * - Make use of the XMLEntityHandler/XMLErrorReporter interfaces, instead of using
! * EntityHandler/ErrorHandler directly.
! * - Add 'AbstractDOMParser' class to provide common functionality for XercesDOMParser
! * and DOMBuilder.
! *
! * Revision 1.4 2002/04/19 13:33:23 knoaman
! * Fix for bug 8236.
! *
! * Revision 1.3 2002/04/01 15:47:06 knoaman
! * Move Element Consistency checking (ref to global declarations) to SchemaValidator.
! *
! * Revision 1.2 2002/03/25 20:25:32 knoaman
! * Move particle derivation checking from TraverseSchema to SchemaValidator.
! *
! * Revision 1.1.1.1 2002/02/01 22:22:47 peiyongz
! * sane_include
! *
! * Revision 1.8 2001/11/13 13:25:08 tng
! * Deprecate function XMLValidator::checkRootElement.
! *
! * Revision 1.7 2001/06/05 16:51:21 knoaman
! * Add 'const' to getGrammar - submitted by Peter A. Volchek.
! *
! * Revision 1.6 2001/05/11 15:17:48 tng
! * Schema: Nillable fixes.
! *
! * Revision 1.5 2001/05/11 13:27:37 tng
! * Copyright update.
! *
! * Revision 1.4 2001/05/03 20:34:45 tng
! * Schema: SchemaValidator update
! *
! * Revision 1.3 2001/04/19 18:17:40 tng
! * Schema: SchemaValidator update, and use QName in Content Model
! *
! * Revision 1.2 2001/03/30 16:35:20 tng
! * Schema: Whitespace normalization.
! *
! * Revision 1.1 2001/03/21 21:56:33 tng
! * Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
! *
*/
--- 1,20 ----
/*
! * Copyright 2001-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$
*/
***************
*** 270,273 ****
--- 125,129 ----
void setExitOnFirstFatal(const bool newValue);
void setDatatypeBuffer(const XMLCh* const value);
+ void clearDatatypeBuffer();
// -----------------------------------------------------------------------
***************
*** 283,286 ****
--- 139,148 ----
private:
// -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaValidator(const SchemaValidator&);
+ SchemaValidator& operator=(const SchemaValidator&);
+
+ // -----------------------------------------------------------------------
// Element Consitency Checking methods
// -----------------------------------------------------------------------
***************
*** 373,376 ****
--- 235,239 ----
const int baseScope,
const ComplexTypeInfo* const baseInfo);
+ ContentSpecNode* getNonUnaryGroup(ContentSpecNode* const pNode);
// -----------------------------------------------------------------------
***************
*** 463,466 ****
--- 326,334 ----
{
fDatatypeBuffer.append(value);
+ }
+
+ inline void SchemaValidator::clearDatatypeBuffer()
+ {
+ fDatatypeBuffer.reset();
}
Index: SchemaInfo.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/SchemaInfo.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SchemaInfo.hpp 14 Apr 2004 10:08:30 -0000 1.1.1.1
--- SchemaInfo.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,56 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 2001,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.
*/
***************
*** 84,87 ****
--- 44,53 ----
XERCES_CPP_NAMESPACE_BEGIN
+ // ---------------------------------------------------------------------------
+ // Forward Declarations
+ // ---------------------------------------------------------------------------
+ class ValidationContext;
+
+
class VALIDATORS_EXPORT SchemaInfo : public XMemory
{
***************
*** 138,141 ****
--- 104,109 ----
ValueVectorOf<const DOMElement*>* getRecursingAnonTypes() const;
ValueVectorOf<const XMLCh*>* getRecursingTypeNames() const;
+ ValueVectorOf<DOMNode*>* getNonXSAttList() const;
+ ValidationContext* getValidationContext() const;
// -----------------------------------------------------------------------
***************
*** 171,174 ****
--- 139,148 ----
private:
// -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaInfo(const SchemaInfo&);
+ SchemaInfo& operator=(const SchemaInfo&);
+
+ // -----------------------------------------------------------------------
// Private helper methods
// -----------------------------------------------------------------------
***************
*** 197,200 ****
--- 171,176 ----
ValueVectorOf<const XMLCh*>* fRecursingTypeNames;
ValueVectorOf<DOMElement*>* fTopLevelComponents[C_Count];
+ ValueVectorOf<DOMNode*>* fNonXSAttList;
+ ValidationContext* fValidationContext;
MemoryManager* fMemoryManager;
};
***************
*** 271,274 ****
--- 247,255 ----
}
+ inline ValueVectorOf<DOMNode*>* SchemaInfo::getNonXSAttList() const
+ {
+ return fNonXSAttList;
+ }
+
// ---------------------------------------------------------------------------
// Setter methods
***************
*** 365,368 ****
--- 346,354 ----
return currInfo;
+ }
+
+ inline ValidationContext* SchemaInfo::getValidationContext() const {
+
+ return fValidationContext;
}
Index: SchemaGrammar.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/SchemaGrammar.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SchemaGrammar.hpp 14 Apr 2004 10:08:30 -0000 1.1.1.1
--- SchemaGrammar.hpp 19 Feb 2008 20:16:32 -0000 1.2
***************
*** 1,142 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 2001 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xerces" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache\@apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation, and was
! * originally based on software copyright (c) 2001, International
! * Business Machines, Inc., http://www.ibm.com . For more information
! * on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
/*
! * $Log$
! * Revision 1.1.1.1 2004/04/14 10:08:30 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.13 2003/11/14 22:35:09 neilg
! * changes in support of second phase of XSModel implementation; thanks to David Cargill
! *
! * Revision 1.12 2003/11/12 20:35:31 peiyongz
! * Stateless Grammar: ValidationContext
! *
! * Revision 1.11 2003/11/06 19:28:11 knoaman
! * PSVI support for annotations.
! *
! * Revision 1.10 2003/10/14 15:22:28 peiyongz
! * Implementation of Serialization/Deserialization
! *
! * Revision 1.9 2003/09/22 19:49:03 neilg
! * implement change to Grammar::putElem(XMLElementDecl, bool). If Grammars are used only to hold declared objects, there will be no need for the fElemNonDeclPool tables; make Grammar implementations lazily create them only if the application requires them (which good cpplications should not.)
! *
! * Revision 1.8 2003/07/31 17:12:10 peiyongz
! * Grammar embed grammar description
! *
! * Revision 1.7 2003/05/16 21:43:21 knoaman
! * Memory manager implementation: Modify constructors to pass in the memory manager.
! *
! * Revision 1.6 2003/05/15 18:57:27 knoaman
! * Partial implementation of the configurable memory manager.
! *
! * Revision 1.5 2002/11/04 14:49:41 tng
! * C++ Namespace Support.
! *
! * Revision 1.4 2002/08/22 15:42:10 tng
! * Remove unused parameter variables in inline functions.
! *
! * Revision 1.3 2002/07/11 18:21:20 knoaman
! * Grammar caching/preparsing - initial implementation.
! *
! * Revision 1.2 2002/07/05 17:08:10 tng
! * [Bug 10119] Grammar::getGrammarType need a const modifier
! *
! * Revision 1.1.1.1 2002/02/01 22:22:46 peiyongz
! * sane_include
! *
! * Revision 1.14 2001/11/19 18:26:31 knoaman
! * no message
! *
! * Revision 1.13 2001/10/09 12:18:26 tng
! * Leak fix: should use delete [] to delete fTargetNamespace.
! *
! * Revision 1.12 2001/10/04 15:11:51 knoaman
! * Add support for circular import.
! *
! * Revision 1.10 2001/09/14 14:50:22 tng
! * Schema: Fix some wildcard bugs, and some retrieving qualified/unqualified element decl problems.
! *
! * Revision 1.9 2001/08/21 16:06:11 tng
! * Schema: Unique Particle Attribution Constraint Checking.
! *
! * Revision 1.8 2001/07/31 15:27:10 knoaman
! * Added support for <attributeGroup>.
! *
! * Revision 1.7 2001/07/24 18:33:46 knoaman
! * Added support for <group> + extra constraint checking for complexType
! *
! * Revision 1.6 2001/06/25 12:51:57 knoaman
! * Add constraint checking on elements in complex types to prevent same
! * element names from having different definitions - use substitueGroups.
! *
! * Revision 1.5 2001/05/28 20:56:19 tng
! * Schema: Move getTargetNamespace as virtual function in base class Grammar
! *
! * Revision 1.4 2001/05/11 13:27:36 tng
! * Copyright update.
! *
! * Revision 1.3 2001/05/03 20:34:43 tng
! * Schema: SchemaValidator update
! *
! * Revision 1.2 2001/04/19 17:43:19 knoaman
! * More schema implementation classes.
! *
! * Revision 1.1 2001/03/21 21:56:33 tng
! * Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
! *
*/
--- 1,20 ----
/*
! * Copyright 2001,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$
*/
***************
*** 360,363 ****
--- 238,247 ----
const XSAnnotation* getAnnotation() const;
+ /**
+ * Get annotation hash table, to enumerate through them
+ */
+ RefHashTableOf<XSAnnotation>* getAnnotations();
+ const RefHashTableOf<XSAnnotation>* getAnnotations() const;
+
/***
* Support for Serialization/De-serialization
***************
*** 366,369 ****
--- 250,258 ----
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaGrammar(const SchemaGrammar&);
+ SchemaGrammar& operator=(const SchemaGrammar&);
// -----------------------------------------------------------------------
***************
*** 442,449 ****
ValidationContext* fValidationContext;
MemoryManager* fMemoryManager;
- bool fValidated;
- DatatypeValidatorFactory fDatatypeRegistry;
XMLSchemaDescription* fGramDesc;
RefHashTableOf<XSAnnotation>* fAnnotations;
};
--- 331,339 ----
ValidationContext* fValidationContext;
MemoryManager* fMemoryManager;
XMLSchemaDescription* fGramDesc;
RefHashTableOf<XSAnnotation>* fAnnotations;
+
+ bool fValidated;
+ DatatypeValidatorFactory fDatatypeRegistry;
};
***************
*** 455,459 ****
SchemaGrammar::getElemEnumerator() const
{
! return RefHash3KeysIdPoolEnumerator<SchemaElementDecl>(fElemDeclPool);
}
--- 345,349 ----
SchemaGrammar::getElemEnumerator() const
{
! return RefHash3KeysIdPoolEnumerator<SchemaElementDecl>(fElemDeclPool, false, fMemoryManager);
}
***************
*** 461,465 ****
SchemaGrammar::getNotationEnumerator() const
{
! return NameIdPoolEnumerator<XMLNotationDecl>(fNotationDeclPool);
}
--- 351,355 ----
SchemaGrammar::getNotationEnumerator() const
{
! return NameIdPoolEnumerator<XMLNotationDecl>(fNotationDeclPool, fMemoryManager);
}
***************
*** 538,541 ****
--- 428,440 ----
}
+ inline RefHashTableOf<XSAnnotation>* SchemaGrammar::getAnnotations()
+ {
+ return fAnnotations;
+ }
+
+ inline const RefHashTableOf<XSAnnotation>* SchemaGrammar::getAnnotations() const
+ {
+ return fAnnotations;
+ }
// -----------------------------------------------------------------------
// Setter methods
- Previous message: [GME-commit] GMESRC/GME/Include/xercesc/validators/schema/identity FieldActivator.hpp, 1.1.1.1, 1.2 FieldValueMap.hpp, 1.1.1.1, 1.2 IC_Field.hpp, 1.1.1.1, 1.2 IC_Key.hpp, 1.1.1.1, 1.2 IC_KeyRef.hpp, 1.1.1.1, 1.2 IC_Selector.hpp, 1.1.1.1, 1.2 IC_Unique.hpp, 1.1.1.1, 1.2 IdentityConstraint.hpp, 1.1.1.1, 1.2 ValueStore.hpp, 1.1.1.1, 1.2 ValueStoreCache.hpp, 1.1.1.1, 1.2 XPathException.hpp, 1.1.1.1, 1.2 XPathMatcher.hpp, 1.1.1.1, 1.2 XPathMatcherStack.hpp, 1.1.1.1, 1.2 XPathSymbols.hpp, 1.1.1.1, 1.2 XercesXPath.hpp, 1.1.1.1, 1.2
- Next message: [GME-commit] GMESRC/GME/Include/xercesc/validators/datatype XMLCanRepGroup.hpp, NONE, 1.1 AbstractNumericFacetValidator.hpp, 1.1.1.1, 1.2 AbstractNumericValidator.hpp, 1.1.1.1, 1.2 AbstractStringValidator.hpp, 1.1.1.1, 1.2 AnySimpleTypeDatatypeValidator.hpp, 1.1.1.1, 1.2 AnyURIDatatypeValidator.hpp, 1.1.1.1, 1.2 Base64BinaryDatatypeValidator.hpp, 1.1.1.1, 1.2 BooleanDatatypeValidator.hpp, 1.1.1.1, 1.2 DatatypeValidator.hpp, 1.1.1.1, 1.2 DatatypeValidatorFactory.hpp, 1.1.1.1, 1.2 DateDatatypeValidator.hpp, 1.1.1.1, 1.2 DateTimeDatatypeValidator.hpp, 1.1.1.1, 1.2 DateTimeValidator.hpp, 1.1.1.1, 1.2 DayDatatypeValidator.hpp, 1.1.1.1, 1.2 DecimalDatatypeValidator.hpp, 1.1.1.1, 1.2 DoubleDatatypeValidator.hpp, 1.1.1.1, 1.2 DurationDatatypeValidator.hpp, 1.1.1.1, 1.2 ENTITYDatatypeValidator.hpp, 1.1.1.1, 1.2 FloatDatatypeValidator.hpp, 1.1.1.1, 1.2 HexBinaryDatatypeValidator.hpp, 1.1.1.1, 1.2 IDDatatypeValidator.hpp, 1.1.1.1, 1.2 IDREFDatatypeValidator.hpp, 1.1.1.1, 1.2 InvalidDatatypeFacetException.hpp, 1.1.1.1, 1.2 InvalidDataty peValueException.hpp, 1.1.1.1, 1.2 ListDatatypeValidator.hpp, 1.1.1.1, 1.2 MonthDatatypeValidator.hpp, 1.1.1.1, 1.2 MonthDayDatatypeValidator.hpp, 1.1.1.1, 1.2 NCNameDatatypeValidator.hpp, 1.1.1.1, 1.2 NOTATIONDatatypeValidator.hpp, 1.1.1.1, 1.2 NameDatatypeValidator.hpp, 1.1.1.1, 1.2 QNameDatatypeValidator.hpp, 1.1.1.1, 1.2 StringDatatypeValidator.hpp, 1.1.1.1, 1.2 TimeDatatypeValidator.hpp, 1.1.1.1, 1.2 UnionDatatypeValidator.hpp, 1.1.1.1, 1.2 YearDatatypeValidator.hpp, 1.1.1.1, 1.2 YearMonthDatatypeValidator.hpp, 1.1.1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list