[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

Log messages of CVS commits gme-commit at list.isis.vanderbilt.edu
Tue Feb 19 14:16:34 CST 2008


Update of /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity
In directory escher:/tmp/cvs-serv26529/validators/schema/identity

Modified Files:
	FieldActivator.hpp FieldValueMap.hpp IC_Field.hpp IC_Key.hpp 
	IC_KeyRef.hpp IC_Selector.hpp IC_Unique.hpp 
	IdentityConstraint.hpp ValueStore.hpp ValueStoreCache.hpp 
	XPathException.hpp XPathMatcher.hpp XPathMatcherStack.hpp 
	XPathSymbols.hpp XercesXPath.hpp 
Log Message:
Xerces2.7 includes checkin.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: IC_KeyRef.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/IC_KeyRef.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** IC_KeyRef.hpp	14 Apr 2004 10:08:32 -0000	1.1.1.1
--- IC_KeyRef.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: IC_Selector.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/IC_Selector.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** IC_Selector.hpp	14 Apr 2004 10:08:32 -0000	1.1.1.1
--- IC_Selector.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.
   */
  

Index: IC_Key.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/IC_Key.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** IC_Key.hpp	14 Apr 2004 10:08:32 -0000	1.1.1.1
--- IC_Key.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: IC_Field.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/IC_Field.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** IC_Field.hpp	14 Apr 2004 10:08:32 -0000	1.1.1.1
--- IC_Field.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.
   */
  
***************
*** 76,79 ****
--- 36,40 ----
  // ---------------------------------------------------------------------------
  class ValueStore;
+ class FieldActivator;
  
  
***************
*** 94,112 ****
      bool operator!= (const IC_Field& other) const;
  
! 	// -----------------------------------------------------------------------
      //  Getter methods
      // -----------------------------------------------------------------------
-     bool getMayMatch() const { return fMayMatch; }
      XercesXPath* getXPath() const { return fXPath; }
      IdentityConstraint* getIdentityConstraint() const { return fIdentityConstraint; }
  
! 	// -----------------------------------------------------------------------
      //  Setter methods
      // -----------------------------------------------------------------------
!     void setMayMatch(const bool other) { fMayMatch = other; }
  
! 	// -----------------------------------------------------------------------
      //  Factory methods
      // -----------------------------------------------------------------------
      XPathMatcher* createMatcher(ValueStore* const valueStore,
                                  MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
--- 55,90 ----
      bool operator!= (const IC_Field& other) const;
  
!     // -----------------------------------------------------------------------
      //  Getter methods
      // -----------------------------------------------------------------------
      XercesXPath* getXPath() const { return fXPath; }
      IdentityConstraint* getIdentityConstraint() const { return fIdentityConstraint; }
  
!     /**
!       * @deprecated
!       */
!     bool getMayMatch() const { return false; }
! 
!     // -----------------------------------------------------------------------
      //  Setter methods
      // -----------------------------------------------------------------------
!     /**
!       * @deprecated
!       */
!     void setMayMatch(const bool) {}
  
!     // -----------------------------------------------------------------------
      //  Factory methods
      // -----------------------------------------------------------------------
+     XPathMatcher* createMatcher
+     (
+         FieldActivator* const fieldActivator
+         , ValueStore* const valueStore
+         , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
+     );
+ 
+     /**
+       * @deprecated
+       */
      XPathMatcher* createMatcher(ValueStore* const valueStore,
                                  MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
***************
*** 129,133 ****
      //  Data members
      // -----------------------------------------------------------------------
-     bool                fMayMatch;
      XercesXPath*        fXPath;
      IdentityConstraint* fIdentityConstraint;
--- 107,110 ----
***************
*** 162,165 ****
--- 139,143 ----
                   IC_Field* const aField,
                   ValueStore* const valueStore,
+                  FieldActivator* const fieldActivator,
                   MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
  
***************
*** 178,183 ****
      //  Data members
      // -----------------------------------------------------------------------
!     ValueStore* fValueStore;
!     IC_Field*   fField;
  };
  
--- 156,162 ----
      //  Data members
      // -----------------------------------------------------------------------
!     ValueStore*     fValueStore;
!     IC_Field*       fField;
!     FieldActivator* fFieldActivator;
  };
  

Index: XPathException.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/XPathException.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathException.hpp	14 Apr 2004 10:08:33 -0000	1.1.1.1
--- XPathException.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: FieldValueMap.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/FieldValueMap.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FieldValueMap.hpp	14 Apr 2004 10:08:32 -0000	1.1.1.1
--- FieldValueMap.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.
   */
  
***************
*** 115,118 ****
--- 75,83 ----
  
  private:
+     // -----------------------------------------------------------------------
+     //  Private helper methods
+     // -----------------------------------------------------------------------
+     void cleanUp();
+ 
      // -----------------------------------------------------------------------
      //  Unimplemented operators

Index: XercesXPath.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/XercesXPath.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XercesXPath.hpp	14 Apr 2004 10:08:33 -0000	1.1.1.1
--- XercesXPath.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.
   */
  

Index: XPathSymbols.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/XPathSymbols.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathSymbols.hpp	14 Apr 2004 10:08:33 -0000	1.1.1.1
--- XPathSymbols.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.
   */
  
***************
*** 98,101 ****
--- 58,66 ----
      static const XMLCh fgSYMBOL_SELF[];
  
+ private:
+     // -----------------------------------------------------------------------
+     //  Unimplemented constructors and operators
+     // -----------------------------------------------------------------------
+     XPathSymbols();
  };
  

Index: XPathMatcher.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/XPathMatcher.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathMatcher.hpp	14 Apr 2004 10:08:33 -0000	1.1.1.1
--- XPathMatcher.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.
   */
  
***************
*** 146,149 ****
--- 106,114 ----
  
  private:
+     // -----------------------------------------------------------------------
+     //  Unimplemented constructors and operators
+     // -----------------------------------------------------------------------
+     XPathMatcher(const XPathMatcher&);
+     XPathMatcher& operator=(const XPathMatcher&);
  
      // -----------------------------------------------------------------------

Index: FieldActivator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/FieldActivator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FieldActivator.hpp	14 Apr 2004 10:08:32 -0000	1.1.1.1
--- FieldActivator.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.
   */
  
***************
*** 70,74 ****
  //  Includes
  // ---------------------------------------------------------------------------
! #include <xercesc/util/PlatformUtils.hpp>
  
  XERCES_CPP_NAMESPACE_BEGIN
--- 30,34 ----
  //  Includes
  // ---------------------------------------------------------------------------
! #include <xercesc/util/ValueHashTableOf.hpp>
  
  XERCES_CPP_NAMESPACE_BEGIN
***************
*** 102,109 ****
--- 62,75 ----
  
      // -----------------------------------------------------------------------
+     //  Getter methods
+     // -----------------------------------------------------------------------
+     bool getMayMatch(IC_Field* const field);
+ 
+     // -----------------------------------------------------------------------
      //  Setter methods
      // -----------------------------------------------------------------------
      void setValueStoreCache(ValueStoreCache* const other);
      void setMatcherStack(XPathMatcherStack* const matcherStack);
+     void setMayMatch(IC_Field* const field, bool value);
  
  	// -----------------------------------------------------------------------
***************
*** 132,142 ****
      //  Data
      // -----------------------------------------------------------------------
!     ValueStoreCache*   fValueStoreCache;
!     XPathMatcherStack* fMatcherStack;
!     MemoryManager*     fMemoryManager;
  };
  
  
  // ---------------------------------------------------------------------------
  //  FieldActivator: Setter methods
  // ---------------------------------------------------------------------------
--- 98,117 ----
      //  Data
      // -----------------------------------------------------------------------
!     ValueStoreCache*        fValueStoreCache;
!     XPathMatcherStack*      fMatcherStack;
!     ValueHashTableOf<bool>* fMayMatch;
!     MemoryManager*          fMemoryManager;
  };
  
  
  // ---------------------------------------------------------------------------
+ //  FieldActivator: Getter methods
+ // ---------------------------------------------------------------------------
+ inline bool FieldActivator::getMayMatch(IC_Field* const field) {
+ 
+     return fMayMatch->get(field);
+ }
+ 
+ // ---------------------------------------------------------------------------
  //  FieldActivator: Setter methods
  // ---------------------------------------------------------------------------
***************
*** 150,153 ****
--- 125,133 ----
  
      fMatcherStack = matcherStack;
+ }
+ 
+ inline void FieldActivator::setMayMatch(IC_Field* const field, bool value) {
+ 
+     fMayMatch->put(field, value);
  }
  

Index: XPathMatcherStack.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/XPathMatcherStack.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathMatcherStack.hpp	14 Apr 2004 10:08:33 -0000	1.1.1.1
--- XPathMatcherStack.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.
   */
  
***************
*** 103,106 ****
--- 63,71 ----
  
  private:
+     // -----------------------------------------------------------------------
+     //  Private helper methods
+     // -----------------------------------------------------------------------
+     void cleanUp();
+ 
      // -----------------------------------------------------------------------
      //  Unimplemented contstructors and operators

Index: ValueStoreCache.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/ValueStoreCache.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ValueStoreCache.hpp	14 Apr 2004 10:08:33 -0000	1.1.1.1
--- ValueStoreCache.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.
   */
  

Index: ValueStore.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/ValueStore.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ValueStore.hpp	14 Apr 2004 10:08:32 -0000	1.1.1.1
--- ValueStore.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.
   */
  
***************
*** 79,82 ****
--- 39,43 ----
  //  Forward Declaration
  // ---------------------------------------------------------------------------
+ class FieldActivator;
  class IdentityConstraint;
  class XMLScanner;
***************
*** 95,104 ****
  	~ValueStore();
  
! 	// -----------------------------------------------------------------------
      //  Getter methods
      // -----------------------------------------------------------------------
      IdentityConstraint* getIdentityConstraint() const;
  
! 	// -----------------------------------------------------------------------
      //  Helper methods
      // -----------------------------------------------------------------------
--- 56,65 ----
  	~ValueStore();
  
!     // -----------------------------------------------------------------------
      //  Getter methods
      // -----------------------------------------------------------------------
      IdentityConstraint* getIdentityConstraint() const;
  
!     // -----------------------------------------------------------------------
      //  Helper methods
      // -----------------------------------------------------------------------
***************
*** 106,119 ****
      void startValueScope();
      void endValueScope();
!     void addValue(IC_Field* const field, DatatypeValidator* const dv,
                    const XMLCh* const value);
      bool contains(const FieldValueMap* const other);
  
! 	// -----------------------------------------------------------------------
      //  Document handling methods
      // -----------------------------------------------------------------------
      void endDcocumentFragment(ValueStoreCache* const valueStoreCache);
  
! 	// -----------------------------------------------------------------------
      //  Error reporting methods
      // -----------------------------------------------------------------------
--- 67,89 ----
      void startValueScope();
      void endValueScope();
!     void addValue(FieldActivator* const fieldActivator,
!                   IC_Field* const field,
!                   DatatypeValidator* const dv,
                    const XMLCh* const value);
      bool contains(const FieldValueMap* const other);
  
!     /**
!       * @deprecated
!       */
!     void addValue(IC_Field* const field, DatatypeValidator* const dv,
!                   const XMLCh* const value);
! 
! 
!     // -----------------------------------------------------------------------
      //  Document handling methods
      // -----------------------------------------------------------------------
      void endDcocumentFragment(ValueStoreCache* const valueStoreCache);
  
!     // -----------------------------------------------------------------------
      //  Error reporting methods
      // -----------------------------------------------------------------------

Index: IdentityConstraint.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/IdentityConstraint.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** IdentityConstraint.hpp	14 Apr 2004 10:08:32 -0000	1.1.1.1
--- IdentityConstraint.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.
   */
  

Index: IC_Unique.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/validators/schema/identity/IC_Unique.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** IC_Unique.hpp	14 Apr 2004 10:08:32 -0000	1.1.1.1
--- IC_Unique.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.
   */
  



More information about the GME-commit mailing list