diff --git a/src/validators/datatype/ENTITYDatatypeValidator.cpp b/src/validators/datatype/ENTITYDatatypeValidator.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..01985fc7b20c59f066819bad5f274366932e2f02
--- /dev/null
+++ b/src/validators/datatype/ENTITYDatatypeValidator.cpp
@@ -0,0 +1,142 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xerces" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache\@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation, and was
+ * originally based on software copyright (c) 1999, International
+ * Business Machines, Inc., http://www.ibm.com . For more information
+ * on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+/*
+ * $Id$
+ * $Log$
+ * Revision 1.1 2001/07/06 20:19:52 peiyongz
+ * ENTITYDTV
+ *
+ */
+
+// ---------------------------------------------------------------------------
+// Includes
+// ---------------------------------------------------------------------------
+#include <validators/datatype/ENTITYDatatypeValidator.hpp>
+#include <validators/datatype/InvalidDatatypeFacetException.hpp>
+#include <validators/datatype/InvalidDatatypeValueException.hpp>
+#include <framework/XMLEntityDecl.hpp>
+
+// ---------------------------------------------------------------------------
+// Constructors and Destructor
+// ---------------------------------------------------------------------------
+ENTITYDatatypeValidator::ENTITYDatatypeValidator(
+ DatatypeValidator* const baseValidator
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
+ , const int finalSet)
+:StringDatatypeValidator(baseValidator, facets, enums, finalSet)
+,fEntityHandler(0)
+{
+ //
+ // the StringDatatypeValidator has the same set of
+ // constrainning facets as the ENTITYDatatypeValidator
+ // and the StringDatatypeValidator(...) would do
+ // all the jobs there.
+
+ //
+ // if enumeration is provided, make sure that they
+ // are all valid NCName(s).
+ //
+ if (enums)
+ {
+ int enumLength = enums->size();
+ for ( int i = 0; i < enumLength; i++)
+ {
+ if ( XMLString::isValidNCName(enums->elementAt(i)) == false)
+ ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_minLen);
+ //("Value '"+content+"' is not a valid NCName");
+ }
+ }
+
+ DatatypeValidator::setType(DatatypeValidator::ENTITY);
+
+}
+
+void ENTITYDatatypeValidator::validate(const XMLCh* const content)
+{
+ // use StringDatatypeValidator (which in turn, invoke
+ // the baseValidator) to validate content against
+ // facets if any.
+ //
+ StringDatatypeValidator::validate(content);
+
+ //
+ // check must: "NCName"
+ //
+ if ( XMLString::isValidNCName(content) == false)
+ ThrowXML(InvalidDatatypeValueException, XMLExcepts::FACET_Len_minLen);
+ //("Value '"+content+"' is not a valid NCName");
+
+ //
+ // parse the entity iff an EntityHandler is provided
+ //
+ if (fEntityHandler)
+ {
+ DTDEntityDecl* decl = fEntityHandler->getEntityDecl(content);
+
+ if (!decl ||
+ (decl->isUnparsed()) )
+ ThrowXML(InvalidDatatypeValueException, XMLExcepts::CM_UnaryOpHadBinType);
+ //"ENTITY '"+ content +"' is not valid" )
+ }
+
+ return;
+}
+
+ /**
+ * End of file ENTITYDatatypeValidator.cpp
+ */
diff --git a/src/validators/datatype/ENTITYDatatypeValidator.hpp b/src/validators/datatype/ENTITYDatatypeValidator.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..a6f45ad83f0ce390021ee4aa17a3cbc631227ad7
--- /dev/null
+++ b/src/validators/datatype/ENTITYDatatypeValidator.hpp
@@ -0,0 +1,221 @@
+/*
+ * 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) 1999, International
+ * Business Machines, Inc., http://www.ibm.com . For more information
+ * on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+/*
+ * $Id$
+ * $Log$
+ * Revision 1.1 2001/07/06 20:19:52 peiyongz
+ * ENTITYDTV
+ *
+ */
+
+#if !defined(ENTITY_DATATYPEVALIDATOR_HPP)
+#define ENTITY_DATATYPEVALIDATOR_HPP
+
+#include <validators/datatype/StringDatatypeValidator.hpp>
+#include <internal/XMLScanner.hpp>
+
+class VALIDATORS_EXPORT ENTITYDatatypeValidator : public StringDatatypeValidator
+{
+public:
+
+ // -----------------------------------------------------------------------
+ // Public ctor/dtor
+ // -----------------------------------------------------------------------
+ /** @name Constructor. */
+ //@{
+
+ ENTITYDatatypeValidator();
+
+ ENTITYDatatypeValidator(DatatypeValidator* const baseValidator
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
+ , const int finalSet);
+
+ virtual ~ENTITYDatatypeValidator();
+
+ //@}
+
+ // -----------------------------------------------------------------------
+ // Validation methods
+ // -----------------------------------------------------------------------
+ /** @name Validation Function */
+ //@{
+
+ /**
+ * validate that a string matches the boolean datatype
+ * @param content A string containing the content to be validated
+ *
+ * @exception throws InvalidDatatypeException if the content is
+ * is not valid.
+ */
+
+ void validate(const XMLCh* const content);
+
+ //@}
+
+ // -----------------------------------------------------------------------
+ // Compare methods
+ // -----------------------------------------------------------------------
+ /** @name Compare Function */
+ //@{
+
+ /**
+ * Compare two boolean data types
+ *
+ * @param content1
+ * @param content2
+ * @return
+ */
+ int compare(const XMLCh* const, const XMLCh* const);
+
+ //@}
+
+ /**
+ * Returns an instance of the base datatype validator class
+ * Used by the DatatypeValidatorFactory.
+ */
+ DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
+ , const int finalSet);
+
+
+ // -----------------------------------------------------------------------
+ // Getter methods
+ // -----------------------------------------------------------------------
+ /** @name Getter Functions */
+ //@{
+
+ XMLScanner* getEntityHandler() const;
+
+ //@}
+
+// -----------------------------------------------------------------------
+// Setter methods
+// -----------------------------------------------------------------------
+ /** @name Setter Functions */
+ //@{
+
+ void setEntityHandler(XMLScanner*);
+
+ //@}
+
+private:
+
+ // -----------------------------------------------------------------------
+ // Private data members
+ //
+ // fEntityHandler
+ // we do NOT own it.
+ //
+ // -----------------------------------------------------------------------
+
+ XMLScanner* fEntityHandler;
+};
+
+// ---------------------------------------------------------------------------
+// Constructors and Destructor
+// ---------------------------------------------------------------------------
+inline ENTITYDatatypeValidator::ENTITYDatatypeValidator()
+:StringDatatypeValidator()
+,fEntityHandler(0)
+{
+ DatatypeValidator::setType(DatatypeValidator::ENTITY);
+}
+
+inline ENTITYDatatypeValidator::~ENTITYDatatypeValidator()
+{
+}
+
+// -----------------------------------------------------------------------
+// Compare methods
+// -----------------------------------------------------------------------
+inline int ENTITYDatatypeValidator::compare(const XMLCh* const lValue
+ , const XMLCh* const rValue)
+{
+ return ( XMLString::compareString(lValue, rValue)==0 ? 0 : -1);
+}
+
+inline DatatypeValidator* ENTITYDatatypeValidator::newInstance(
+ DatatypeValidator* const baseValidator
+ , RefHashTableOf<KVStringPair>* const facets
+ , RefVectorOf<XMLCh>* const enums
+ , const int finalSet)
+{
+ return (DatatypeValidator*) new ENTITYDatatypeValidator(baseValidator, facets, enums, finalSet);
+}
+
+// -----------------------------------------------------------------------
+// Getter methods
+// -----------------------------------------------------------------------
+inline XMLScanner* ENTITYDatatypeValidator::getEntityHandler() const
+{
+ return fEntityHandler;
+}
+
+// -----------------------------------------------------------------------
+// Setter methods
+// -----------------------------------------------------------------------
+inline void ENTITYDatatypeValidator::setEntityHandler(XMLScanner* newHandler)
+{
+ fEntityHandler = newHandler;
+}
+
+/**
+ * End of file ENTITYDatatypeValidator.hpp
+ */
+#endif