[GME-commit] GMESRC/GME/Include/xercesc/validators/DTD DTDAttDef.hpp, 1.1.1.1, 1.2 DTDAttDefList.hpp, 1.1.1.1, 1.2 DTDElementDecl.hpp, 1.1.1.1, 1.2 DTDEntityDecl.hpp, 1.1.1.1, 1.2 DTDGrammar.hpp, 1.1.1.1, 1.2 DTDScanner.hpp, 1.1.1.1, 1.2 DTDValidator.hpp, 1.1.1.1, 1.2 DocTypeHandler.hpp, 1.1.1.1, 1.2 XMLDTDDescriptionImpl.hpp, 1.1.1.1, 1.2
Log messages of CVS commits
gme-commit at list.isis.vanderbilt.edu
Tue Feb 19 14:16:33 CST 2008
- Previous message: [GME-commit] GMESRC/GME/Include/xercesc/util/Transcoders/Win32 Win32TransService.cpp, NONE, 1.1 Win32TransService2.cpp, NONE, 1.1 Win32TransService.hpp, 1.1.1.1, 1.2
- Next message: [GME-commit] GMESRC/GME/Include/xercesc/validators/common AllContentModel.hpp, 1.1.1.1, 1.2 CMAny.hpp, 1.1.1.1, 1.2 CMBinaryOp.hpp, 1.1.1.1, 1.2 CMLeaf.hpp, 1.1.1.1, 1.2 CMNode.hpp, 1.1.1.1, 1.2 CMStateSet.hpp, 1.1.1.1, 1.2 CMUnaryOp.hpp, 1.1.1.1, 1.2 ContentLeafNameTypeVector.hpp, 1.1.1.1, 1.2 ContentSpecNode.hpp, 1.1.1.1, 1.2 DFAContentModel.hpp, 1.1.1.1, 1.2 Grammar.hpp, 1.1.1.1, 1.2 GrammarResolver.hpp, 1.1.1.1, 1.2 MixedContentModel.hpp, 1.1.1.1, 1.2 SimpleContentModel.hpp, 1.1.1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /project/gme-repository/GMESRC/GME/Include/xercesc/validators/DTD
In directory escher:/tmp/cvs-serv26529/validators/DTD
Modified Files:
DTDAttDef.hpp DTDAttDefList.hpp DTDElementDecl.hpp
DTDEntityDecl.hpp DTDGrammar.hpp DTDScanner.hpp
DTDValidator.hpp DocTypeHandler.hpp XMLDTDDescriptionImpl.hpp
Log Message:
Xerces2.7 includes checkin.
CVS User: Zoltan Molnar, ISIS (zolmol)
Index: XMLDTDDescriptionImpl.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/DTD/XMLDTDDescriptionImpl.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XMLDTDDescriptionImpl.hpp 14 Apr 2004 10:08:29 -0000 1.1.1.1
--- XMLDTDDescriptionImpl.hpp 19 Feb 2008 20:16:31 -0000 1.2
***************
*** 1,71 ****
/*
! * 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:29 volgy
- * Importing Xerces library 2.4
- *
- * Revision 1.2 2003/10/14 15:20:42 peiyongz
- * Implementation of Serialization/Deserialization
- *
- * Revision 1.1 2003/06/20 18:39:33 peiyongz
- * Stateless Grammar Pool :: Part I
- *
* $Id$
- *
*/
--- 1,20 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
! *
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
! *
! * http://www.apache.org/licenses/LICENSE-2.0
! *
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
/*
* $Id$
*/
***************
*** 85,89 ****
//@{
XMLDTDDescriptionImpl(
! const XMLCh* const rootName
, MemoryManager* const memMgr
);
--- 34,38 ----
//@{
XMLDTDDescriptionImpl(
! const XMLCh* const systemId
, MemoryManager* const memMgr
);
***************
*** 108,121 ****
//@{
/**
! * getRootName
*
*/
! virtual const XMLCh* getRootName() const ;
/**
! * setRootName
*
*/
! virtual void setRootName(const XMLCh* const rootName);
//@}
--- 57,72 ----
//@{
/**
! * Getter
*
*/
! virtual const XMLCh* getRootName() const;
! virtual const XMLCh* getSystemId() const;
/**
! * Setter
*
*/
! virtual void setRootName(const XMLCh* const);
! virtual void setSystemId(const XMLCh* const);
//@}
***************
*** 138,141 ****
--- 89,95 ----
// -----------------------------------------------------------------------
//
+ // fSystemId:
+ // SYSTEM ID of the grammar
+ //
// fRootName:
// root name of the grammar
***************
*** 143,147 ****
--- 97,103 ----
// -----------------------------------------------------------------------
+ const XMLCh* fSystemId;
const XMLCh* fRootName;
+
};
Index: DTDElementDecl.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/DTD/DTDElementDecl.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DTDElementDecl.hpp 14 Apr 2004 10:08:28 -0000 1.1.1.1
--- DTDElementDecl.hpp 19 Feb 2008 20:16:31 -0000 1.2
***************
*** 1,123 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 1999-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) 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:28 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.7 2003/10/10 16:24:51 peiyongz
! * Implementation of Serialization/Deserialization
! *
! * Revision 1.6 2003/10/08 21:33:18 peiyongz
! * Synchronize ContentSpec/ContentModel/FormattedModel
! *
! * Revision 1.5 2003/05/16 21:43:19 knoaman
! * Memory manager implementation: Modify constructors to pass in the memory manager.
! *
! * Revision 1.4 2003/05/15 18:54:50 knoaman
! * Partial implementation of the configurable memory manager.
! *
! * Revision 1.3 2003/01/29 19:46:40 gareth
! * added DOMTypeInfo API
! *
! * Revision 1.2 2002/11/04 14:50:40 tng
! * C++ Namespace Support.
! *
! * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
! * sane_include
! *
! * Revision 1.12 2001/09/05 20:49:10 knoaman
! * Fix for complexTypes with mixed content model.
! *
! * Revision 1.11 2001/08/21 16:06:11 tng
! * Schema: Unique Particle Attribution Constraint Checking.
! *
! * Revision 1.10 2001/05/11 13:27:08 tng
! * Copyright update.
! *
! * Revision 1.9 2001/04/19 18:17:20 tng
! * Schema: SchemaValidator update, and use QName in Content Model
! *
! * Revision 1.8 2001/03/21 21:56:19 tng
! * Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
! *
! * Revision 1.7 2001/03/21 19:29:43 tng
! * Schema: Content Model Updates, by Pei Yong Zhang.
! *
! * Revision 1.6 2001/02/26 19:29:21 tng
! * Schema: add virtual method getURI(), getContentSpec and setContenSpec in XMLElementDecl, and DTDElementDecl.
! *
! * Revision 1.5 2001/02/26 19:22:02 tng
! * Schema: add parameter prefix in findElem and findAttr.
! *
! * Revision 1.4 2000/02/24 20:16:49 abagchi
! * Swat for removing Log from API docs
! *
! * Revision 1.3 2000/02/09 21:42:37 abagchi
! * Copyright swat
! *
! * Revision 1.2 1999/11/23 01:51:04 rahulj
! * Cannot use class qualifier in class defn. CC under HPUX is happy.
! *
! * Revision 1.1.1.1 1999/11/09 01:03:32 twl
! * Initial checkin
! *
! * Revision 1.3 1999/11/08 20:45:40 rahul
! * Swat for adding in Product name and CVS comment log variable.
! *
*/
--- 1,20 ----
/*
! * Copyright 1999-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$
*/
***************
*** 227,232 ****
--- 124,135 ----
ModelTypes getModelType() const;
+ /**
+ * @deprecated
+ **/
const XMLCh* getDOMTypeInfoName() const;
+ /**
+ * @deprecated
+ **/
const XMLCh* getDOMTypeInfoUri() const;
***************
*** 242,245 ****
--- 145,150 ----
DECL_XSERIALIZABLE(DTDElementDecl)
+ virtual XMLElementDecl::objectType getObjectType() const;
+
private :
// -----------------------------------------------------------------------
***************
*** 251,254 ****
--- 156,164 ----
XMLCh* formatContentModel () const ;
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDElementDecl(const DTDElementDecl &);
+ DTDElementDecl& operator = (const DTDElementDecl&);
// -----------------------------------------------------------------------
***************
*** 285,292 ****
// this field (to avoid doing the formatted over and over.)
// -----------------------------------------------------------------------
RefHashTableOf<DTDAttDef>* fAttDefs;
DTDAttDefList* fAttList;
ContentSpecNode* fContentSpec;
- ModelTypes fModelType;
XMLContentModel* fContentModel;
XMLCh* fFormattedModel;
--- 195,203 ----
// this field (to avoid doing the formatted over and over.)
// -----------------------------------------------------------------------
+ ModelTypes fModelType;
+
RefHashTableOf<DTDAttDef>* fAttDefs;
DTDAttDefList* fAttList;
ContentSpecNode* fContentSpec;
XMLContentModel* fContentModel;
XMLCh* fFormattedModel;
Index: DTDAttDefList.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/DTD/DTDAttDefList.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DTDAttDefList.hpp 14 Apr 2004 10:08:28 -0000 1.1.1.1
--- DTDAttDefList.hpp 19 Feb 2008 20:16:31 -0000 1.2
***************
*** 1,93 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 1999-2000 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:28 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:24:51 peiyongz
! * Implementation of Serialization/Deserialization
! *
! * Revision 1.3 2002/12/06 13:27:22 tng
! * [Bug 9083] Make some classes be exportable.
! *
! * Revision 1.2 2002/11/04 14:50:40 tng
! * C++ Namespace Support.
! *
! * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
! * sane_include
! *
! * Revision 1.3 2000/02/24 20:16:48 abagchi
! * Swat for removing Log from API docs
! *
! * Revision 1.2 2000/02/09 21:42:37 abagchi
! * Copyright swat
! *
! * Revision 1.1.1.1 1999/11/09 01:03:28 twl
! * Initial checkin
! *
! * Revision 1.2 1999/11/08 20:45:39 rahul
! * Swat for adding in Product name and CVS comment log variable.
! *
*/
--- 1,20 ----
/*
! * Copyright 1999-2000,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$
*/
***************
*** 198,201 ****
--- 125,133 ----
void addAttDef(DTDAttDef *toAdd);
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDAttDefList(const DTDAttDefList &);
+ DTDAttDefList& operator = (const DTDAttDefList&);
// -----------------------------------------------------------------------
Index: DTDEntityDecl.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/DTD/DTDEntityDecl.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DTDEntityDecl.hpp 14 Apr 2004 10:08:28 -0000 1.1.1.1
--- DTDEntityDecl.hpp 19 Feb 2008 20:16:31 -0000 1.2
***************
*** 1,94 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 1999-2000 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:28 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.5 2003/10/10 16:24:51 peiyongz
! * Implementation of Serialization/Deserialization
! *
! * Revision 1.4 2003/05/16 21:43:19 knoaman
! * Memory manager implementation: Modify constructors to pass in the memory manager.
! *
! * Revision 1.3 2003/03/07 18:17:12 tng
! * Return a reference instead of void for operator=
! *
! * Revision 1.2 2002/11/04 14:50:40 tng
! * C++ Namespace Support.
! *
! * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
! * sane_include
! *
! * Revision 1.4 2000/02/24 20:16:49 abagchi
! * Swat for removing Log from API docs
! *
! * Revision 1.3 2000/02/09 21:42:37 abagchi
! * Copyright swat
! *
! * Revision 1.2 2000/01/20 01:57:07 rahulj
! * Reported by marc at ist.de
! * Removed extra 'const' qualifiers.
! *
! * Revision 1.1.1.1 1999/11/09 01:03:34 twl
! * Initial checkin
! *
! * Revision 1.2 1999/11/08 20:45:40 rahul
! * Swat for adding in Product name and CVS comment log variable.
! *
*/
--- 1,20 ----
/*
! * Copyright 1999-2000,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: DTDGrammar.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/DTD/DTDGrammar.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DTDGrammar.hpp 14 Apr 2004 10:08:28 -0000 1.1.1.1
--- DTDGrammar.hpp 19 Feb 2008 20:16:31 -0000 1.2
***************
*** 1,111 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 1999-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) 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:28 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.11 2003/10/14 15:20:42 peiyongz
! * Implementation of Serialization/Deserialization
! *
! * Revision 1.10 2003/09/22 19:49:02 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.9 2003/08/14 03:00:46 knoaman
! * Code refactoring to improve performance of validation.
! *
! * Revision 1.8 2003/07/31 17:09:59 peiyongz
! * Grammar embed grammar description
! *
! * Revision 1.7 2003/05/16 21:43:19 knoaman
! * Memory manager implementation: Modify constructors to pass in the memory manager.
! *
! * Revision 1.6 2003/05/15 18:54:50 knoaman
! * Partial implementation of the configurable memory manager.
! *
! * Revision 1.5 2002/11/04 14:50:40 tng
! * C++ Namespace Support.
! *
! * Revision 1.4 2002/08/22 15:05:39 tng
! * Remove unused parameter variables in inline functions.
! *
! * Revision 1.3 2002/07/11 18:19:28 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:43 peiyongz
! * sane_include
! *
! * Revision 1.5 2001/09/14 14:50:22 tng
! * Schema: Fix some wildcard bugs, and some retrieving qualified/unqualified element decl problems.
! *
! * Revision 1.4 2001/05/28 20:56:17 tng
! * Schema: Move getTargetNamespace as virtual function in base class Grammar
! *
! * Revision 1.3 2001/05/11 13:27:09 tng
! * Copyright update.
! *
! * Revision 1.2 2001/04/19 18:17:21 tng
! * Schema: SchemaValidator update, and use QName in Content Model
! *
! * Revision 1.1 2001/03/21 21:56:20 tng
! * Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
! *
*/
--- 1,20 ----
/*
! * Copyright 1999-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$
*/
***************
*** 240,244 ****
// deprecated. returns the ID of the root element; not
// useable in multithreaded environments!
! unsigned int getRootElemId();
const DTDEntityDecl* getEntityDecl(const XMLCh* const entName) const;
DTDEntityDecl* getEntityDecl(const XMLCh* const entName);
--- 149,153 ----
// deprecated. returns the ID of the root element; not
// useable in multithreaded environments!
! unsigned int getRootElemId() const;
const DTDEntityDecl* getEntityDecl(const XMLCh* const entName) const;
DTDEntityDecl* getEntityDecl(const XMLCh* const entName);
***************
*** 281,284 ****
--- 190,198 ----
void resetEntityDeclPool();
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDGrammar(const DTDGrammar &);
+ DTDGrammar& operator = (const DTDGrammar&);
// -----------------------------------------------------------------------
***************
*** 322,328 ****
NameIdPool<DTDEntityDecl>* fEntityDeclPool;
NameIdPool<XMLNotationDecl>* fNotationDeclPool;
unsigned int fRootElemId;
bool fValidated;
! XMLDTDDescription* fGramDesc;
};
--- 236,245 ----
NameIdPool<DTDEntityDecl>* fEntityDeclPool;
NameIdPool<XMLNotationDecl>* fNotationDeclPool;
+ XMLDTDDescription* fGramDesc;
+
unsigned int fRootElemId;
bool fValidated;
!
! friend class XMLInitializer;
};
***************
*** 331,335 ****
// DTDGrammar: Getter methods
// ---------------------------------------------------------------------------
! inline unsigned int DTDGrammar::getRootElemId()
{
return fRootElemId;
--- 248,252 ----
// DTDGrammar: Getter methods
// ---------------------------------------------------------------------------
! inline unsigned int DTDGrammar::getRootElemId() const
{
return fRootElemId;
***************
*** 342,346 ****
DTDGrammar::getElemEnumerator() const
{
! return NameIdPoolEnumerator<DTDElementDecl>(fElemDeclPool);
}
--- 259,263 ----
DTDGrammar::getElemEnumerator() const
{
! return NameIdPoolEnumerator<DTDElementDecl>(fElemDeclPool, fMemoryManager);
}
***************
*** 348,352 ****
DTDGrammar::getEntityEnumerator() const
{
! return NameIdPoolEnumerator<DTDEntityDecl>(fEntityDeclPool);
}
--- 265,269 ----
DTDGrammar::getEntityEnumerator() const
{
! return NameIdPoolEnumerator<DTDEntityDecl>(fEntityDeclPool, fMemoryManager);
}
***************
*** 354,358 ****
DTDGrammar::getNotationEnumerator() const
{
! return NameIdPoolEnumerator<XMLNotationDecl>(fNotationDeclPool);
}
--- 271,275 ----
DTDGrammar::getNotationEnumerator() const
{
! return NameIdPoolEnumerator<XMLNotationDecl>(fNotationDeclPool, fMemoryManager);
}
Index: DocTypeHandler.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/DTD/DocTypeHandler.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DocTypeHandler.hpp 14 Apr 2004 10:08:27 -0000 1.1.1.1
--- DocTypeHandler.hpp 19 Feb 2008 20:16:31 -0000 1.2
***************
*** 1,95 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 1999-2000 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:27 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.4 2003/03/07 18:17:12 tng
! * Return a reference instead of void for operator=
! *
! * Revision 1.3 2002/11/04 14:50:40 tng
! * C++ Namespace Support.
! *
! * Revision 1.2 2002/08/14 15:20:38 knoaman
! * [Bug 3111] Problem with LexicalHandler::startDTD() and LexicalHandler::endDTD().
! *
! * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
! * sane_include
! *
! * Revision 1.5 2001/06/19 16:43:46 tng
! * Correct description of DocTypeHandler
! *
! * Revision 1.4 2000/03/02 19:55:39 roddey
! * This checkin includes many changes done while waiting for the
! * 1.1.0 code to be finished. I can't list them all here, but a list is
! * available elsewhere.
! *
! * Revision 1.3 2000/02/24 20:16:49 abagchi
! * Swat for removing Log from API docs
! *
! * Revision 1.2 2000/02/09 21:42:39 abagchi
! * Copyright swat
! *
! * Revision 1.1.1.1 1999/11/09 01:03:21 twl
! * Initial checkin
! *
! * Revision 1.2 1999/11/08 20:45:43 rahul
! * Swat for adding in Product name and CVS comment log variable.
! *
*/
--- 1,20 ----
/*
! * Copyright 1999-2000,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: DTDValidator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/DTD/DTDValidator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DTDValidator.hpp 14 Apr 2004 10:08:29 -0000 1.1.1.1
--- DTDValidator.hpp 19 Feb 2008 20:16:31 -0000 1.2
***************
*** 1,130 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 1999-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) 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:29 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.6 2002/11/07 21:58:56 tng
! * Pass elemDecl to XMLValidator::validateAttrValue so that we can include element name in error message.
! *
! * Revision 1.5 2002/11/04 14:50:40 tng
! * C++ Namespace Support.
! *
! * Revision 1.4 2002/09/04 18:17:49 tng
! * Do not set IDREF to used during prevalidation.
! *
! * Revision 1.3 2002/08/22 15:05:40 tng
! * Remove unused parameter variables in inline functions.
! *
! * Revision 1.2 2002/07/11 18:55:44 knoaman
! * Add a flag to the preContentValidation method to indicate whether to validate
! * default/fixed attributes or not.
! *
! * Revision 1.1.1.1 2002/02/01 22:22:45 peiyongz
! * sane_include
! *
! * Revision 1.13 2001/11/13 13:25:28 tng
! * Deprecate function XMLValidator::checkRootElement.
! *
! * Revision 1.12 2001/06/05 16:51:20 knoaman
! * Add 'const' to getGrammar - submitted by Peter A. Volchek.
! *
! * Revision 1.11 2001/05/11 13:27:11 tng
! * Copyright update.
! *
! * Revision 1.10 2001/05/03 20:34:37 tng
! * Schema: SchemaValidator update
! *
! * Revision 1.9 2001/04/19 18:17:23 tng
! * Schema: SchemaValidator update, and use QName in Content Model
! *
! * Revision 1.8 2001/03/21 21:56:21 tng
! * Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
! *
! * Revision 1.7 2001/02/26 19:22:08 tng
! * Schema: add parameter prefix in findElem and findAttr.
! *
! * Revision 1.6 2000/08/09 22:08:48 jpolast
! * added const XMLCh* getURIText() as per XMLValidator.
! * allows parsers to use const URIs instead of appending
! * to a XMLBuffer.
! *
! * Revision 1.5 2000/04/06 19:00:07 roddey
! * Added a getter for the doc type handler.
! *
! * Revision 1.4 2000/02/24 20:16:49 abagchi
! * Swat for removing Log from API docs
! *
! * Revision 1.3 2000/02/09 21:42:38 abagchi
! * Copyright swat
! *
! * Revision 1.2 2000/01/12 23:52:48 roddey
! * These are trivial changes required to get the C++ and Java versions
! * of error messages more into sync. Mostly it was where the Java version
! * was passing out one or more parameter than the C++ version was. In
! * some cases the change just required an extra parameter to get the
! * needed info to the place where the error was issued.
! *
! * Revision 1.1.1.1 1999/11/09 01:03:36 twl
! * Initial checkin
! *
! * Revision 1.5 1999/11/08 20:45:41 rahul
! * Swat for adding in Product name and CVS comment log variable.
! *
*/
--- 1,20 ----
/*
! * Copyright 1999-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$
*/
***************
*** 209,212 ****
--- 99,113 ----
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDValidator(const DTDValidator &);
+ DTDValidator& operator = (const DTDValidator&);
+
+ // -----------------------------------------------------------------------
+ // Helper
+ // -----------------------------------------------------------------------
+ void checkTokenList(const XMLAttDef& attDef
+ , bool toValidateNotation);
// -----------------------------------------------------------------------
Index: DTDScanner.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/DTD/DTDScanner.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DTDScanner.hpp 14 Apr 2004 10:08:28 -0000 1.1.1.1
--- DTDScanner.hpp 19 Feb 2008 20:16:31 -0000 1.2
***************
*** 1,102 ****
/*
! * 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:28 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.9 2003/07/10 19:50:12 peiyongz
! * Stateless Grammar: create grammar components with grammarPool's memory Manager
! *
! * Revision 1.8 2003/05/16 21:43:19 knoaman
! * Memory manager implementation: Modify constructors to pass in the memory manager.
! *
! * Revision 1.7 2003/05/15 18:54:51 knoaman
! * Partial implementation of the configurable memory manager.
! *
! * Revision 1.6 2003/02/05 22:07:09 tng
! * [Bug 3111] Problem with LexicalHandler::startDTD() and LexicalHandler::endDTD().
! *
! * Revision 1.5 2002/12/04 02:47:25 knoaman
! * scanner re-organization.
! *
! * Revision 1.4 2002/11/04 14:50:40 tng
! * C++ Namespace Support.
! *
! * Revision 1.3 2002/07/11 18:39:48 knoaman
! * Access entities through the DTDGrammar instead of the scanner.
! *
! * Revision 1.2 2002/05/30 16:17:19 tng
! * Add feature to optionally ignore external DTD.
! *
! * Revision 1.1.1.1 2002/02/01 22:22:44 peiyongz
! * sane_include
! *
! * Revision 1.4 2001/06/21 14:25:56 knoaman
! * Fix for bug 1946
! *
! * Revision 1.3 2001/05/11 13:27:10 tng
! * Copyright update.
! *
! * Revision 1.2 2001/04/19 18:17:22 tng
! * Schema: SchemaValidator update, and use QName in Content Model
! *
! * Revision 1.1 2001/03/21 21:56:20 tng
! * Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
! *
*/
--- 1,20 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
! *
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
! *
! * http://www.apache.org/licenses/LICENSE-2.0
! *
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
/*
! * $Id$
*/
***************
*** 194,205 ****
private:
// -----------------------------------------------------------------------
// Private DTD scanning methods. These are all in XMLValidator2.cpp
// -----------------------------------------------------------------------
bool checkForPERef
(
! const bool spaceRequired
! , const bool inLiteral
, const bool inMarkup
- , const bool throwEndOfExt = false
);
bool expandPERef
--- 112,127 ----
private:
// -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDScanner(const DTDScanner &);
+ DTDScanner& operator = (const DTDScanner&);
+
+ // -----------------------------------------------------------------------
// Private DTD scanning methods. These are all in XMLValidator2.cpp
// -----------------------------------------------------------------------
bool checkForPERef
(
! const bool inLiteral
, const bool inMarkup
);
bool expandPERef
***************
*** 231,235 ****
void scanEntityDecl();
bool scanEntityDef();
! bool scanEntityLiteral(XMLBuffer& toFill, const bool isPE);
bool scanEntityDef(DTDEntityDecl& decl, const bool isPEDecl);
EntityExpRes scanEntityRef(XMLCh& firstCh, XMLCh& secondCh, bool& escaped);
--- 153,157 ----
void scanEntityDecl();
bool scanEntityDef();
! bool scanEntityLiteral(XMLBuffer& toFill);
bool scanEntityDef(DTDEntityDecl& decl, const bool isPEDecl);
EntityExpRes scanEntityRef(XMLCh& firstCh, XMLCh& secondCh, bool& escaped);
Index: DTDAttDef.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/DTD/DTDAttDef.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DTDAttDef.hpp 14 Apr 2004 10:08:28 -0000 1.1.1.1
--- DTDAttDef.hpp 19 Feb 2008 20:16:31 -0000 1.2
***************
*** 1,93 ****
/*
! * The Apache Software License, Version 1.1
! *
! * Copyright (c) 1999-2000 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:28 volgy
! * Importing Xerces library 2.4
! *
! * Revision 1.6 2003/10/10 16:24:51 peiyongz
! * Implementation of Serialization/Deserialization
! *
! * Revision 1.5 2003/05/16 21:43:19 knoaman
! * Memory manager implementation: Modify constructors to pass in the memory manager.
! *
! * Revision 1.4 2003/05/15 18:54:50 knoaman
! * Partial implementation of the configurable memory manager.
! *
! * Revision 1.3 2003/01/29 19:46:40 gareth
! * added DOMTypeInfo API
! *
! * Revision 1.2 2002/11/04 14:50:40 tng
! * C++ Namespace Support.
! *
! * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
! * sane_include
! *
! * Revision 1.3 2000/02/24 20:16:48 abagchi
! * Swat for removing Log from API docs
! *
! * Revision 1.2 2000/02/09 21:42:37 abagchi
! * Copyright swat
! *
! * Revision 1.1.1.1 1999/11/09 01:03:26 twl
! * Initial checkin
! *
! * Revision 1.2 1999/11/08 20:45:39 rahul
! * Swat for adding in Product name and CVS comment log variable.
! *
*/
--- 1,20 ----
/*
! * Copyright 1999-2000,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$
*/
***************
*** 147,152 ****
--- 74,85 ----
unsigned int getElemId() const;
+ /**
+ * @deprecated
+ **/
virtual const XMLCh* getDOMTypeInfoName() const;
+ /**
+ * @deprecated
+ **/
virtual const XMLCh* getDOMTypeInfoUri() const;
***************
*** 165,168 ****
--- 98,107 ----
private :
// -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDAttDef(const DTDAttDef &);
+ DTDAttDef& operator = (const DTDAttDef&);
+
+ // -----------------------------------------------------------------------
// Private data members
//
***************
*** 201,205 ****
inline const XMLCh* DTDAttDef::getDOMTypeInfoName() const
{
! return getAttTypeString(getType());
}
--- 140,144 ----
inline const XMLCh* DTDAttDef::getDOMTypeInfoName() const
{
! return getAttTypeString(getType(), getMemoryManager());
}
- Previous message: [GME-commit] GMESRC/GME/Include/xercesc/util/Transcoders/Win32 Win32TransService.cpp, NONE, 1.1 Win32TransService2.cpp, NONE, 1.1 Win32TransService.hpp, 1.1.1.1, 1.2
- Next message: [GME-commit] GMESRC/GME/Include/xercesc/validators/common AllContentModel.hpp, 1.1.1.1, 1.2 CMAny.hpp, 1.1.1.1, 1.2 CMBinaryOp.hpp, 1.1.1.1, 1.2 CMLeaf.hpp, 1.1.1.1, 1.2 CMNode.hpp, 1.1.1.1, 1.2 CMStateSet.hpp, 1.1.1.1, 1.2 CMUnaryOp.hpp, 1.1.1.1, 1.2 ContentLeafNameTypeVector.hpp, 1.1.1.1, 1.2 ContentSpecNode.hpp, 1.1.1.1, 1.2 DFAContentModel.hpp, 1.1.1.1, 1.2 Grammar.hpp, 1.1.1.1, 1.2 GrammarResolver.hpp, 1.1.1.1, 1.2 MixedContentModel.hpp, 1.1.1.1, 1.2 SimpleContentModel.hpp, 1.1.1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list