diff --git a/src/xercesc/com/IXMLDOMNodeImpl.h b/src/xercesc/com/IXMLDOMNodeImpl.h
index bae29c29cce0144413f95685583725a5c33452ab..da02c52f7e98e305f8abc74446b8bb4dbd473813 100644
--- a/src/xercesc/com/IXMLDOMNodeImpl.h
+++ b/src/xercesc/com/IXMLDOMNodeImpl.h
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/02/12 13:49:43 amassari
+ * Updated version to 2.5
+ *
* Revision 1.3 2003/11/21 12:05:48 amassari
* Updated version to 2.4
*
@@ -111,7 +114,7 @@ XERCES_CPP_NAMESPACE_USE
template <class T, const IID* piid, class tihclass = CComTypeInfoHolder>
class ATL_NO_VTABLE IXMLDOMNodeImpl:
- public IDispatchImpl<T,piid,&LIBID_Xerces, 2, 40,tihclass>,
+ public IDispatchImpl<T,piid,&LIBID_Xerces, 2, 50,tihclass>,
public IIBMXMLDOMNodeIdentity,
public ISupportErrorInfo
{
diff --git a/src/xercesc/com/XMLDOMDocument.h b/src/xercesc/com/XMLDOMDocument.h
index 6025e2c5ba9554eeb2a661b129b6d28253154238..f619134c611a7ed3b7cbcc4d918ffa4131d82619 100644
--- a/src/xercesc/com/XMLDOMDocument.h
+++ b/src/xercesc/com/XMLDOMDocument.h
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/02/12 13:49:43 amassari
+ * Updated version to 2.5
+ *
* Revision 1.6 2003/12/02 14:33:13 amassari
* Don't use the word "exception" as a variable name, as VC 7.1 complains about it
*
@@ -122,7 +125,7 @@ class ATL_NO_VTABLE CXMLDOMDocument :
public IObjectWithSiteImpl<CXMLDOMDocument>,
public CProxyXMLDOMDocumentEvents< CXMLDOMDocument >,
public IConnectionPointContainerImpl<CXMLDOMDocument>,
- public IProvideClassInfo2Impl<&CLSID_DOMDocument, &DIID_XMLDOMDocumentEvents, &LIBID_Xerces, 2, 40>,
+ public IProvideClassInfo2Impl<&CLSID_DOMDocument, &DIID_XMLDOMDocumentEvents, &LIBID_Xerces, 2, 50>,
public CWindowImpl<CXMLDOMDocument, CWindow, CWinTraits<0,0> >,
ErrorHandler
{
diff --git a/src/xercesc/com/XMLDOMImplementation.h b/src/xercesc/com/XMLDOMImplementation.h
index 789a53046145a3c344580cead366f2f574e575e1..33aec460b928d52ee8afc87645a2ee2fe604e368 100644
--- a/src/xercesc/com/XMLDOMImplementation.h
+++ b/src/xercesc/com/XMLDOMImplementation.h
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/02/12 13:49:43 amassari
+ * Updated version to 2.5
+ *
* Revision 1.5 2003/11/21 12:05:48 amassari
* Updated version to 2.4
*
@@ -91,7 +94,7 @@ XERCES_CPP_NAMESPACE_USE
class ATL_NO_VTABLE CXMLDOMImplementation :
public CComObjectRootEx<CComSingleThreadModel>,
- public IDispatchImpl<IXMLDOMImplementation, &IID_IXMLDOMImplementation, &LIBID_Xerces, 2, 40>
+ public IDispatchImpl<IXMLDOMImplementation, &IID_IXMLDOMImplementation, &LIBID_Xerces, 2, 50>
{
public:
CXMLDOMImplementation()
diff --git a/src/xercesc/com/XMLDOMNamedNodeMap.h b/src/xercesc/com/XMLDOMNamedNodeMap.h
index 0881bbf175e8786e0f4eca3742ef080dc31cfe44..ef439379ada799dec985655e2a45ed97f014bbe4 100644
--- a/src/xercesc/com/XMLDOMNamedNodeMap.h
+++ b/src/xercesc/com/XMLDOMNamedNodeMap.h
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/02/12 13:49:43 amassari
+ * Updated version to 2.5
+ *
* Revision 1.5 2003/11/21 12:05:48 amassari
* Updated version to 2.4
*
@@ -101,7 +104,7 @@ XERCES_CPP_NAMESPACE_USE
class ATL_NO_VTABLE CXMLDOMNamedNodeMap :
public CComObjectRootEx<CComSingleThreadModel>,
- public IDispatchImpl<IXMLDOMNamedNodeMap, &IID_IXMLDOMNamedNodeMap, &LIBID_Xerces, 2, 40>,
+ public IDispatchImpl<IXMLDOMNamedNodeMap, &IID_IXMLDOMNamedNodeMap, &LIBID_Xerces, 2, 50>,
public NodeContainerImpl<DOM_NamedNodeMap>,
public ISupportErrorInfo
{
diff --git a/src/xercesc/com/XMLDOMNodeList.h b/src/xercesc/com/XMLDOMNodeList.h
index 4b2d7c73ce381255da4e1db6522b3f05fcc2541b..45d542635115b528c2f333e9b519ed5d992a85ef 100644
--- a/src/xercesc/com/XMLDOMNodeList.h
+++ b/src/xercesc/com/XMLDOMNodeList.h
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/02/12 13:49:43 amassari
+ * Updated version to 2.5
+ *
* Revision 1.5 2003/11/21 12:05:48 amassari
* Updated version to 2.4
*
@@ -101,7 +104,7 @@ XERCES_CPP_NAMESPACE_USE
class ATL_NO_VTABLE CXMLDOMNodeList :
public CComObjectRootEx<CComSingleThreadModel>,
- public IDispatchImpl<IXMLDOMNodeList, &IID_IXMLDOMNodeList, &LIBID_Xerces, 2, 40>,
+ public IDispatchImpl<IXMLDOMNodeList, &IID_IXMLDOMNodeList, &LIBID_Xerces, 2, 50>,
public NodeContainerImpl<DOM_NodeList>,
public ISupportErrorInfo
{
diff --git a/src/xercesc/com/XMLDOMParseError.h b/src/xercesc/com/XMLDOMParseError.h
index ca04de059045843d70689308f606ccc9bebe35b6..714922d27b907cf13c3788444f0a33965e3720e8 100644
--- a/src/xercesc/com/XMLDOMParseError.h
+++ b/src/xercesc/com/XMLDOMParseError.h
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2004/02/12 13:49:43 amassari
+ * Updated version to 2.5
+ *
* Revision 1.4 2003/11/21 12:05:48 amassari
* Updated version to 2.4
*
@@ -87,7 +90,7 @@ XERCES_CPP_NAMESPACE_USE
class ATL_NO_VTABLE CXMLDOMParseError :
public CComObjectRootEx<CComSingleThreadModel>,
- public IDispatchImpl<IXMLDOMParseError, &IID_IXMLDOMParseError, &LIBID_Xerces, 2, 40>
+ public IDispatchImpl<IXMLDOMParseError, &IID_IXMLDOMParseError, &LIBID_Xerces, 2, 50>
{
public:
CXMLDOMParseError()
diff --git a/src/xercesc/com/XMLHttpRequest.h b/src/xercesc/com/XMLHttpRequest.h
index ac6bb8469397be76318737d1f73d1eed154eba9e..0be7d994f3ffe78fe0e5e33d24689b9b5bba0ab0 100644
--- a/src/xercesc/com/XMLHttpRequest.h
+++ b/src/xercesc/com/XMLHttpRequest.h
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2004/02/12 13:49:43 amassari
+ * Updated version to 2.5
+ *
* Revision 1.4 2003/11/21 12:05:48 amassari
* Updated version to 2.4
*
@@ -91,7 +94,7 @@ class ATL_NO_VTABLE CXMLHttpRequest :
public CComObjectRootEx<CComSingleThreadModel>,
public CComCoClass<CXMLHttpRequest, &CLSID_XMLHTTPRequest>,
public IObjectSafetyImpl<CXMLHttpRequest, INTERFACESAFE_FOR_UNTRUSTED_CALLER>,
- public IDispatchImpl<IXMLHttpRequest, &IID_IXMLHttpRequest, &LIBID_Xerces, 2, 40>,
+ public IDispatchImpl<IXMLHttpRequest, &IID_IXMLHttpRequest, &LIBID_Xerces, 2, 50>,
public IObjectWithSiteImpl<CXMLHttpRequest>,
public ISupportErrorInfo,
public CWindowImpl<CXMLHttpRequest, CWindow, CWinTraits<0,0> >
diff --git a/src/xercesc/com/xml4com.idl b/src/xercesc/com/xml4com.idl
index 5ee225a8ea8fcb0c47d8e5132309adb3b81d8886..9e20d5e0aecebc84a424bc0a4fff280428af0a87 100644
--- a/src/xercesc/com/xml4com.idl
+++ b/src/xercesc/com/xml4com.idl
@@ -69,8 +69,8 @@ import "oaidl.idl";
// Format for version is major.minor
// no support for additional parts (like 1.5.2)
// Use 1.60 for subsequent release
- version(2.40),
- helpstring("Xerces XML Parser 2.4.0")
+ version(2.50),
+ helpstring("Xerces XML Parser 2.5.0")
]
library Xerces
{
diff --git a/src/xercesc/com/xml4com.rc b/src/xercesc/com/xml4com.rc
index d02b3249e28824278d3205acd2f320ce449508aa..0db1d4a2f7726a6ebd32f4e889464791a72b4e4a 100644
--- a/src/xercesc/com/xml4com.rc
+++ b/src/xercesc/com/xml4com.rc
@@ -1,60 +1,3 @@
-/*
- * 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/>.
- */
-
-
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
@@ -111,8 +54,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,0,0
- PRODUCTVERSION 1,4,0,0
+ FILEVERSION 2,5,0,0
+ PRODUCTVERSION 2,5,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -130,7 +73,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Apache Software Foundation\0"
VALUE "FileDescription", "Xerces XML Parser for COM\0"
- VALUE "FileVersion", "2, 4, 0\0"
+ VALUE "FileVersion", "2, 5, 0, 0\0"
VALUE "InternalName", "Xerces XML Parser for COM \0"
VALUE "LegalCopyright", "Copyright © Apache Software Foundation 2000 subject to licensing terms\0"
VALUE "LegalTrademarks", "\0"
@@ -138,7 +81,7 @@ BEGIN
VALUE "OriginalFilename", "xerces-com.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Xerces XML Parser for COM\0"
- VALUE "ProductVersion", "2, 4, 0\0"
+ VALUE "ProductVersion", "2, 5, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/src/xercesc/com/xmldocument.rgs b/src/xercesc/com/xmldocument.rgs
index a6d24ba0b93481a3c883e26a1300998e9998cee8..f0355479e917ec21a7f1389963d552a3790680d2 100644
--- a/src/xercesc/com/xmldocument.rgs
+++ b/src/xercesc/com/xmldocument.rgs
@@ -1,19 +1,19 @@
HKCR
{
- Xerces.DOMDocument.2.4.0 = s 'Apache Xerces Parser for COM'
+ Xerces.DOMDocument.2.5.0 = s 'Apache Xerces Parser for COM'
{
CLSID = s '{C4775B61-ECD6-11d4-94B4-00A0CC57CBCB}'
}
Xerces.DOMDocument = s 'Apache Xerces Parser For COM'
{
CLSID = s '{C4775B61-ECD6-11d4-94B4-00A0CC57CBCB}'
- CurVer = s 'Xerces.DOMDocument.2.4.0'
+ CurVer = s 'Xerces.DOMDocument.2.5.0'
}
NoRemove CLSID
{
ForceRemove = '{C4775B61-ECD6-11d4-94B4-00A0CC57CBCB}' = s 'Apache Xerces Parser for COM'
{
- ProgID = s 'Xerces.DOMDocument.2.4.0'
+ ProgID = s 'Xerces.DOMDocument.2.5.0'
VersionIndependentProgID = s 'Xerces.DOMDocument'
ForceRemove 'Programmable'
InprocServer32 = s '%XMLMODULE%'
diff --git a/src/xercesc/com/xmlhttprequest.rgs b/src/xercesc/com/xmlhttprequest.rgs
index 01b24c70b825360cd1bfbb7b06c1acaa57850186..1ab7ceede65fd96893de8a36c9f3df72aa93f122 100644
--- a/src/xercesc/com/xmlhttprequest.rgs
+++ b/src/xercesc/com/xmlhttprequest.rgs
@@ -1,19 +1,19 @@
HKCR
{
- IBMXML.XMLHttpRequest.2.4.0 = s 'Apache Xerces XML Http Request'
+ IBMXML.XMLHttpRequest.2.5.0 = s 'Apache Xerces XML Http Request'
{
CLSID = s '{3A725053-15FB-4065-9171-BC02BCF3876C}'
}
IBMXML.XMLHttpRequest = s 'Apache Xerces XML Http Request'
{
CLSID = s '{3A725053-15FB-4065-9171-BC02BCF3876C}'
- CurVer = s 'Xerces.XMLHttpRequest.2.4.0'
+ CurVer = s 'Xerces.XMLHttpRequest.2.5.0'
}
NoRemove CLSID
{
ForceRemove {3A725053-15FB-4065-9171-BC02BCF3876C} = s 'Apache Xerces XML Http Request'
{
- ProgID = s 'Xerces.XMLHttpRequest.2.4.0'
+ ProgID = s 'Xerces.XMLHttpRequest.2.5.0'
VersionIndependentProgID = s 'Xerces.XMLHttpRequest'
ForceRemove 'Programmable'
InprocServer32 = s '%XMLMODULE%'