svn commit: rev 20146 - xml/xerces-p/trunk

[ja...@apache.org]

Author: jasons
Date: Thu May 20 09:07:37 2004
New Revision: 20146

Modified:
   xml/xerces-p/trunk/Xerces.i
Log:
included DOM Level 3 input source support ; removed XMLScanner cruft

Modified: xml/xerces-p/trunk/Xerces.i
==============================================================================
--- xml/xerces-p/trunk/Xerces.i	(original)
+++ xml/xerces-p/trunk/Xerces.i	Thu May 20 09:07:37 2004
@@ -44,6 +44,8 @@
 #include "xercesc/framework/MemBufFormatTarget.hpp"
 #include "xercesc/framework/LocalFileFormatTarget.hpp"
 #include "xercesc/framework/StdOutFormatTarget.hpp"
+#include "xercesc/framework/Wrapper4InputSource.hpp"
+#include "xercesc/framework/Wrapper4DOMInputSource.hpp"
 
 #include "PerlCallbackHandler.hpp"
 #include "PerlErrorCallbackHandler.hpp"
@@ -177,6 +179,9 @@
 #endif
 
 %import "xercesc/util/XercesDefs.hpp"
+// %import "xercesc/internal/XSerializable.hpp"
+
+#define DECL_XSERIALIZABLE(XMLUri)
 
 /*
  * The generic exception handler
@@ -708,60 +713,6 @@
 // Unicode string constants for XML Formatter
 %include "xercesc/util/XMLUni.hpp"
 
-//
-// XMLScanner support
-//
-
-// ignore the constructors for now
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::XMLScanner;
-
-// ignore all versions of the following for now
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::emitError;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getURIText;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::scanDocument;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::scanFirst;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::setExternalNoNamespaceSchemaLocation;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::setExternalSchemaLocation;
-
-// ignore these specific ones for now
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getDocHandler() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getDocHandler();
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getDocTypeHandler() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getDocTypeHandler();
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getDoNamespaces() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getValidationScheme() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getDoSchema() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getValidationSchemaFullChecking() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getEntityHandler() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getEntityHandler();
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getErrorReporter() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getErrorReporter();
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getErrorHandler() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getErrorHandler();
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getExitOnFirstFatal() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getValidationConstraintFatal() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getIDRefList();
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getIDRefList() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getInException() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getLastExtLocation    (XMLCh* const, const unsigned int,
-					   XMLCh* const, const unsigned int,
-					   unsigned int&, unsigned int&);
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getLocator() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getStandalone() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getValidator() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getValidator();
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getErrorCount();
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getEntityDecl(const XMLCh* const) const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getEntityEnumerator() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getEntityDeclPool();
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getEntityDeclPool() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getURIStringPool() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getURIStringPool();
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getHasNoDTD() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getExternalSchemaLocation() const;
-%ignore XERCES_CPP_NAMESPACE::XMLScanner::getExternalNoNamespaceSchemaLocation() const;
-
-%include "xercesc/internal/XMLScanner.hpp"
 
 /* 
  * PARSERS (PRETTY IMPORTANT) 
@@ -820,9 +771,9 @@
 %ignore TextDecl;
 
 // These are char* versions of XMLCh* methods, and should be ignored
-%ignore XERCES_CPP_NAMESPACE::SAX2XMLReader::parse(const char *const );
-%ignore XERCES_CPP_NAMESPACE::AbstractDOMParser::setExternalSchemaLocation(const char* const);
-%ignore XERCES_CPP_NAMESPACE::AbstractDOMParser::setExternalNoNamespaceSchemaLocation(const char* const);
+// %ignore XERCES_CPP_NAMESPACE::SAX2XMLReader::parse(const char *const );
+// %ignore XERCES_CPP_NAMESPACE::AbstractDOMParser::setExternalSchemaLocation(const char* const);
+// %ignore XERCES_CPP_NAMESPACE::AbstractDOMParser::setExternalNoNamespaceSchemaLocation(const char* const);
 %ignore parse(const char* const, const bool);
 %ignore parseFirst(const char *const,XMLPScanToken&,const bool);
 
@@ -954,11 +905,18 @@
 
 // Introduced in DOM Level 3
 // Experimental - subject to change
+
+
+// needed for DOMBuilder
+%include "xercesc/dom/DOMInputSource.hpp"
+%include "xercesc/framework/Wrapper4InputSource.hpp"
+%include "xercesc/framework/Wrapper4DOMInputSource.hpp"
+
 %include "xercesc/dom/DOMBuilder.hpp"
+
 %include "xercesc/dom/DOMImplementationLS.hpp"
 %include "xercesc/dom/DOMImplementationRegistry.hpp"
 %include "xercesc/dom/DOMImplementationSource.hpp"
-%include "xercesc/dom/DOMInputSource.hpp"
 %include "xercesc/dom/DOMLocator.hpp"
 %include "xercesc/dom/DOMWriter.hpp"
 %include "xercesc/dom/DOMWriterFilter.hpp"

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org