Author: borisk
Date: Wed Jun 25 05:38:28 2008
New Revision: 671531
URL: http://svn.apache.org/viewvc?rev=671531&view=rev
Log:
Move XMLGrammarPoolImpl from internal/ to framework/ so that it can be
instantiated directly by the use
Added:
xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.cpp
- copied, changed from r671495,
xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.cpp
xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.hpp
- copied, changed from r671495,
xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp
Removed:
xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.cpp
xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp
Modified:
xerces/c/trunk/projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
xerces/c/trunk/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
xerces/c/trunk/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
xerces/c/trunk/projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
xerces/c/trunk/projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
xerces/c/trunk/projects/Win32/VC9/xerces-all/XercesLib/XercesLib.vcproj
xerces/c/trunk/src/Makefile.am
xerces/c/trunk/src/xercesc/framework/psvi/XSModel.cpp
xerces/c/trunk/src/xercesc/validators/common/GrammarResolver.cpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp
Modified: xerces/c/trunk/projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr?rev=671531&r1=671530&r2=671531&view=diff
==============================================================================
--- xerces/c/trunk/projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
(original)
+++ xerces/c/trunk/projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr Wed
Jun 25 05:38:28 2008
@@ -496,7 +496,7 @@
<FILE
FILENAME="..\..\..\..\..\src\xercesc\internal\VecAttributesImpl.cpp"
FORMNAME="" UNITNAME="VecAttributesImpl" CONTAINERID="CCompiler" DESIGNCLASS=""
LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\internal\VecAttrListImpl.cpp"
FORMNAME="" UNITNAME="VecAttrListImpl" CONTAINERID="CCompiler" DESIGNCLASS=""
LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\internal\WFXMLScanner.cpp"
FORMNAME="" UNITNAME="WFXMLScanner" CONTAINERID="CCompiler" DESIGNCLASS=""
LOCALCOMMAND=""/>
- <FILE
FILENAME="..\..\..\..\..\src\xercesc\internal\XMLGrammarPoolImpl.cpp"
FORMNAME="" UNITNAME="XMLGrammarPoolImpl" CONTAINERID="CCompiler"
DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE
FILENAME="..\..\..\..\..\src\xercesc\framework\XMLGrammarPoolImpl.cpp"
FORMNAME="" UNITNAME="XMLGrammarPoolImpl" CONTAINERID="CCompiler"
DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\internal\XMLReader.cpp"
FORMNAME="" UNITNAME="XMLReader" CONTAINERID="CCompiler" DESIGNCLASS=""
LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\internal\XMLScanner.cpp"
FORMNAME="" UNITNAME="XMLScanner" CONTAINERID="CCompiler" DESIGNCLASS=""
LOCALCOMMAND=""/>
<FILE
FILENAME="..\..\..\..\..\src\xercesc\internal\XMLScannerResolver.cpp"
FORMNAME="" UNITNAME="XMLScannerResolver" CONTAINERID="CCompiler"
DESIGNCLASS="" LOCALCOMMAND=""/>
Modified: xerces/c/trunk/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp?rev=671531&r1=671530&r2=671531&view=diff
==============================================================================
--- xerces/c/trunk/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
(original)
+++ xerces/c/trunk/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp Wed
Jun 25 05:38:28 2008
@@ -1620,6 +1620,14 @@
# End Source File
# Begin Source File
+SOURCE=..\..\..\..\..\src\xercesc\framework\XMLGrammarPoolImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\framework\XMLGrammarPoolImpl.hpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\..\src\xercesc\framework\XMLNotationDecl.cpp
# End Source File
# Begin Source File
@@ -1784,14 +1792,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\internal\XMLGrammarPoolImpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\src\xercesc\internal\XMLGrammarPoolImpl.hpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\..\src\xercesc\internal\XMLInternalErrorHandler.hpp
# End Source File
# Begin Source File
Modified: xerces/c/trunk/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak?rev=671531&r1=671530&r2=671531&view=diff
==============================================================================
--- xerces/c/trunk/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
(original)
+++ xerces/c/trunk/projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak Wed
Jun 25 05:38:28 2008
@@ -3636,7 +3636,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\src\xercesc\internal\XMLGrammarPoolImpl.cpp
+SOURCE=..\..\..\..\..\src\xercesc\framework\XMLGrammarPoolImpl.cpp
"$(INTDIR)\XMLGrammarPoolImpl.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
Modified:
xerces/c/trunk/projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj?rev=671531&r1=671530&r2=671531&view=diff
==============================================================================
--- xerces/c/trunk/projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
(original)
+++ xerces/c/trunk/projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
Wed Jun 25 05:38:28 2008
@@ -1739,10 +1739,10 @@
RelativePath="..\..\..\..\..\src\xercesc\internal\WFXMLScanner.hpp">
</File>
<File
-
RelativePath="..\..\..\..\..\src\xercesc\internal\XMLGrammarPoolImpl.cpp">
+
RelativePath="..\..\..\..\..\src\xercesc\framework\XMLGrammarPoolImpl.cpp">
</File>
<File
-
RelativePath="..\..\..\..\..\src\xercesc\internal\XMLGrammarPoolImpl.hpp">
+
RelativePath="..\..\..\..\..\src\xercesc\framework\XMLGrammarPoolImpl.hpp">
</File>
<File
RelativePath="..\..\..\..\..\src\xercesc\internal\XMLInternalErrorHandler.hpp">
Modified:
xerces/c/trunk/projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj?rev=671531&r1=671530&r2=671531&view=diff
==============================================================================
--- xerces/c/trunk/projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
(original)
+++ xerces/c/trunk/projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj Wed
Jun 25 05:38:28 2008
@@ -3120,11 +3120,11 @@
>
</File>
<File
-
RelativePath="..\..\..\..\..\src\xercesc\internal\XMLGrammarPoolImpl.cpp"
+
RelativePath="..\..\..\..\..\src\xercesc\framework\XMLGrammarPoolImpl.cpp"
>
</File>
<File
-
RelativePath="..\..\..\..\..\src\xercesc\internal\XMLGrammarPoolImpl.hpp"
+
RelativePath="..\..\..\..\..\src\xercesc\framework\XMLGrammarPoolImpl.hpp"
>
</File>
<File
Modified:
xerces/c/trunk/projects/Win32/VC9/xerces-all/XercesLib/XercesLib.vcproj
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/projects/Win32/VC9/xerces-all/XercesLib/XercesLib.vcproj?rev=671531&r1=671530&r2=671531&view=diff
==============================================================================
--- xerces/c/trunk/projects/Win32/VC9/xerces-all/XercesLib/XercesLib.vcproj
(original)
+++ xerces/c/trunk/projects/Win32/VC9/xerces-all/XercesLib/XercesLib.vcproj Wed
Jun 25 05:38:28 2008
@@ -3235,11 +3235,11 @@
>
</File>
<File
-
RelativePath="..\..\..\..\..\src\xercesc\internal\XMLGrammarPoolImpl.cpp"
+
RelativePath="..\..\..\..\..\src\xercesc\framework\XMLGrammarPoolImpl.cpp"
>
</File>
<File
-
RelativePath="..\..\..\..\..\src\xercesc\internal\XMLGrammarPoolImpl.hpp"
+
RelativePath="..\..\..\..\..\src\xercesc\framework\XMLGrammarPoolImpl.hpp"
>
</File>
<File
Modified: xerces/c/trunk/src/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/Makefile.am?rev=671531&r1=671530&r2=671531&view=diff
==============================================================================
--- xerces/c/trunk/src/Makefile.am (original)
+++ xerces/c/trunk/src/Makefile.am Wed Jun 25 05:38:28 2008
@@ -403,6 +403,7 @@
xercesc/framework/XMLFormatter.hpp \
xercesc/framework/XMLGrammarDescription.hpp \
xercesc/framework/XMLGrammarPool.hpp \
+ xercesc/framework/XMLGrammarPoolImpl.hpp \
xercesc/framework/XMLNotationDecl.hpp \
xercesc/framework/XMLPScanToken.hpp \
xercesc/framework/XMLRecognizer.hpp \
@@ -457,6 +458,7 @@
xercesc/framework/XMLEntityDecl.cpp \
xercesc/framework/XMLFormatter.cpp \
xercesc/framework/XMLGrammarDescription.cpp \
+ xercesc/framework/XMLGrammarPoolImpl.cpp \
xercesc/framework/XMLNotationDecl.cpp \
xercesc/framework/XMLRecognizer.cpp \
xercesc/framework/XMLRefInfo.cpp \
@@ -480,7 +482,6 @@
xercesc/internal/VecAttributesImpl.hpp \
xercesc/internal/VecAttrListImpl.hpp \
xercesc/internal/WFXMLScanner.hpp \
- xercesc/internal/XMLGrammarPoolImpl.hpp \
xercesc/internal/XMLInternalErrorHandler.hpp \
xercesc/internal/XMLReader.hpp \
xercesc/internal/XMLScanner.hpp \
@@ -507,7 +508,6 @@
xercesc/internal/VecAttributesImpl.cpp \
xercesc/internal/VecAttrListImpl.cpp \
xercesc/internal/WFXMLScanner.cpp \
- xercesc/internal/XMLGrammarPoolImpl.cpp \
xercesc/internal/XMLReader.cpp \
xercesc/internal/XMLScanner.cpp \
xercesc/internal/XMLScannerResolver.cpp \
Copied: xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.cpp (from
r671495, xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.cpp)
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.cpp?p2=xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.cpp&p1=xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.cpp&r1=671495&r2=671531&rev=671531&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.cpp Wed Jun 25
05:38:28 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -23,7 +23,7 @@
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
-#include <xercesc/internal/XMLGrammarPoolImpl.hpp>
+#include <xercesc/framework/XMLGrammarPoolImpl.hpp>
#include <xercesc/internal/XSerializeEngine.hpp>
#include <xercesc/internal/XTemplateSerializer.hpp>
#include <xercesc/validators/DTD/DTDGrammar.hpp>
@@ -41,7 +41,7 @@
delete fXSModel;
fXSModel = 0;
fXSModel = new (getMemoryManager()) XSModel(this, getMemoryManager());
- fXSModelIsValid = true;
+ fXSModelIsValid = true;
}
// ---------------------------------------------------------------------------
@@ -71,7 +71,7 @@
}
// -----------------------------------------------------------------------
-// Implementation of Grammar Pool Interface
+// Implementation of Grammar Pool Interface
// -----------------------------------------------------------------------
bool XMLGrammarPoolImpl::cacheGrammar(Grammar* const gramToCache
)
{
@@ -80,13 +80,13 @@
const XMLCh* grammarKey =
gramToCache->getGrammarDescription()->getGrammarKey();
- if (fGrammarRegistry->containsKey(grammarKey))
+ if (fGrammarRegistry->containsKey(grammarKey))
{
return false;
}
fGrammarRegistry->put((void*) grammarKey, gramToCache);
-
+
if (fXSModelIsValid && gramToCache->getGrammarType() ==
Grammar::SchemaGrammarType)
{
fXSModelIsValid = false;
@@ -108,8 +108,8 @@
Grammar* XMLGrammarPoolImpl::orphanGrammar(const XMLCh* const nameSpaceKey)
{
if (!fLocked)
- {
- Grammar* grammar = fGrammarRegistry->orphanKey(nameSpaceKey);
+ {
+ Grammar* grammar = fGrammarRegistry->orphanKey(nameSpaceKey);
if (fXSModelIsValid && grammar && grammar->getGrammarType() ==
Grammar::SchemaGrammarType)
{
fXSModelIsValid = false;
@@ -155,7 +155,7 @@
}
if (!fXSModelIsValid)
{
- createXSModel();
+ createXSModel();
}
}
}
@@ -173,8 +173,8 @@
fSynchronizedStringPool = 0;
}
fXSModelIsValid = false;
- if (fXSModel)
- {
+ if (fXSModel)
+ {
delete fXSModel;
fXSModel = 0;
}
@@ -182,26 +182,26 @@
}
// -----------------------------------------------------------------------
-// Implementation of Factory Interface
+// Implementation of Factory Interface
// -----------------------------------------------------------------------
DTDGrammar* XMLGrammarPoolImpl::createDTDGrammar()
-{
+{
return new (getMemoryManager()) DTDGrammar(getMemoryManager());
-}
+}
SchemaGrammar* XMLGrammarPoolImpl::createSchemaGrammar()
{
- return new (getMemoryManager()) SchemaGrammar(getMemoryManager());
+ return new (getMemoryManager()) SchemaGrammar(getMemoryManager());
}
XMLDTDDescription* XMLGrammarPoolImpl::createDTDDescription(const XMLCh*
const systemId)
-{
- return new (getMemoryManager()) XMLDTDDescriptionImpl(systemId,
getMemoryManager());
+{
+ return new (getMemoryManager()) XMLDTDDescriptionImpl(systemId,
getMemoryManager());
}
-
+
XMLSchemaDescription* XMLGrammarPoolImpl::createSchemaDescription(const XMLCh*
const targetNamespace)
{
- return new (getMemoryManager())
XMLSchemaDescriptionImpl(targetNamespace, getMemoryManager());
+ return new (getMemoryManager())
XMLSchemaDescriptionImpl(targetNamespace, getMemoryManager());
}
XSModel *XMLGrammarPoolImpl::getXSModel(bool& XSModelWasChanged)
@@ -209,13 +209,13 @@
XSModelWasChanged = false;
if (fLocked || fXSModelIsValid)
return fXSModel;
-
- createXSModel();
+
+ createXSModel();
XSModelWasChanged = true;
return fXSModel;
}
-XMLStringPool *XMLGrammarPoolImpl::getURIStringPool()
+XMLStringPool *XMLGrammarPoolImpl::getURIStringPool()
{
if(fLocked)
return fSynchronizedStringPool;
@@ -238,11 +238,11 @@
void XMLGrammarPoolImpl::serializeGrammars(BinOutputStream* const binOut)
{
RefHashTableOfEnumerator<Grammar> grammarEnum(fGrammarRegistry, false,
getMemoryManager());
- if (!(grammarEnum.hasMoreElements()))
- {
+ if (!(grammarEnum.hasMoreElements()))
+ {
ThrowXMLwithMemMgr(XSerializationException,
XMLExcepts::XSer_GrammarPool_Empty, getMemoryManager());
}
-
+
XSerializeEngine serEng(binOut, this);
//version information
@@ -255,7 +255,7 @@
fStringPool->serialize(serEng);
/***
- * Serialize RefHashTableOf<Grammar>* fGrammarRegistry;
+ * Serialize RefHashTableOf<Grammar>* fGrammarRegistry;
***/
XTemplateSerializer::storeObject(fGrammarRegistry, serEng);
}
@@ -286,7 +286,7 @@
}
RefHashTableOfEnumerator<Grammar> grammarEnum(fGrammarRegistry, false,
memMgr);
- if (grammarEnum.hasMoreElements())
+ if (grammarEnum.hasMoreElements())
{
ThrowXMLwithMemMgr(XSerializationException,
XMLExcepts::XSer_GrammarPool_NotEmpty, memMgr);
}
@@ -295,7 +295,7 @@
// thrown during deserialization.
JanitorMemFunCall<XMLGrammarPoolImpl> cleanup(this,
&XMLGrammarPoolImpl::cleanUp);
- try
+ try
{
XSerializeEngine serEng(binIn, this);
@@ -312,7 +312,7 @@
XMLCh LoaderLevelChar[5];
XMLString::binToText(StorerLevel,
StorerLevelChar, 4, 10, memMgr);
XMLString::binToText(XERCES_GRAMMAR_SERIALIZATION_LEVEL,
LoaderLevelChar, 4, 10, memMgr);
-
+
ThrowXMLwithMemMgr2(XSerializationException
, XMLExcepts::XSer_Storer_NewerThan_Loader
, StorerLevelChar
@@ -327,7 +327,7 @@
fStringPool->serialize(serEng);
/***
- * Deserialize RefHashTableOf<Grammar>* fGrammarRegistry;
+ * Deserialize RefHashTableOf<Grammar>* fGrammarRegistry;
***/
XTemplateSerializer::loadObject(&fGrammarRegistry, 29, true, serEng);
@@ -345,9 +345,9 @@
// Everything is OK, so we can release the cleanup object.
cleanup.release();
- if (fLocked)
+ if (fLocked)
{
- createXSModel();
+ createXSModel();
}
}
Copied: xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.hpp (from
r671495, xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp)
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.hpp?p2=xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.hpp&p1=xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp&r1=671495&r2=671531&rev=671531&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLGrammarPoolImpl.hpp Wed Jun 25
05:38:28 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -36,7 +36,7 @@
// -----------------------------------------------------------------------
//@{
- XMLGrammarPoolImpl(MemoryManager* const memMgr);
+ XMLGrammarPoolImpl(MemoryManager* const memMgr =
XMLPlatformUtils::fgMemoryManager);
~XMLGrammarPoolImpl();
//@}
@@ -45,7 +45,7 @@
/** @name Implementation of Grammar Pool Interface */
// -----------------------------------------------------------------------
//@{
-
+
/**
* cacheGrammar
*
@@ -60,7 +60,7 @@
*
*/
virtual bool cacheGrammar(Grammar* const
gramToCache);
-
+
/**
* retrieveGrammar
@@ -70,8 +70,8 @@
*
*/
virtual Grammar* retrieveGrammar(XMLGrammarDescription* const
gramDesc);
-
-
+
+
/**
* orphanGrammar
*
@@ -80,7 +80,7 @@
* @param nameSpaceKey: Key used to search for grammar in the grammar pool
*
*/
- virtual Grammar* orphanGrammar(const XMLCh* const nameSpaceKey);
+ virtual Grammar* orphanGrammar(const XMLCh* const nameSpaceKey);
/**
@@ -97,15 +97,15 @@
* @return true if the grammar pool was cleared. false if it did not.
*/
virtual bool clear();
-
+
/**
* lockPool
*
- * When this method is called by the application, the
+ * When this method is called by the application, the
* grammar pool should stop adding new grammars to the cache.
*/
virtual void lockPool();
-
+
/**
* unlockPool
*
@@ -134,28 +134,28 @@
*
*/
virtual SchemaGrammar* createSchemaGrammar();
-
+
/**
* createDTDDescription
*
- */
+ */
virtual XMLDTDDescription* createDTDDescription(const XMLCh* const
systemId);
/**
* createSchemaDescription
*
- */
+ */
virtual XMLSchemaDescription* createSchemaDescription(const XMLCh* const
targetNamespace);
//@}
-
+
// -----------------------------------------------------------------------
/** @name schema component model support */
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
//@{
/***
* Return an XSModel derived from the components of all SchemaGrammars
* in the grammar pool. If the pool is locked, this should
- * be a thread-safe operation.
+ * be a thread-safe operation.
*
* NOTE: The function should NEVER return NULL. If there are no grammars
in
* the pool it should return an XSModel containing the Schema for
Schema.
@@ -163,27 +163,27 @@
* Calling getXSModel() on an unlocked grammar pool may result in the
* creation of a new XSModel with the old XSModel being deleted.
* The bool parameter will indicate if the XSModel was changed.
- *
+ *
* In this implementation, when the pool is not locked a new XSModel will
be
* computed each this time the pool is called if the pool has changed
(and the
* previous one will be destroyed at that time). When the lockPool()
* method is called, an XSModel will be generated and returned whenever
this method is called
* while the pool is in the locked state. This will be destroyed if the
unlockPool()
* operation is called. The XSModel will not be serialized,
- * but will be recreated if a deserialized pool is in the
+ * but will be recreated if a deserialized pool is in the
* locked state.
- *
+ *
*/
virtual XSModel *getXSModel(bool& XSModelWasChanged);
// @}
// -----------------------------------------------------------------------
/** @name Getter */
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
//@{
/**
- * Return an XMLStringPool for use by validation routines.
+ * Return an XMLStringPool for use by validation routines.
* Implementations should not create a string pool on each call to this
* method, but should maintain one string pool for all grammars
* for which this pool is responsible.
@@ -200,12 +200,12 @@
*
* Multiple serializations
*
- * For multiple serializations, if the same file name is given, then
the
- * last result will be in the file (overwriting mode), if different
file
+ * For multiple serializations, if the same file name is given, then
the
+ * last result will be in the file (overwriting mode), if different
file
* names are given, then there are multiple data stores for each
serialization.
*
* Multiple deserializations
- *
+ *
* Not supported
*
* Versioning
@@ -215,27 +215,27 @@
*
* Clean up
*
- * In the event of an exception thrown due to a corrupted data store
during
- * deserialization, this implementation may not be able to clean up
all resources
- * allocated, and therefore it is the client application's
responsibility to
+ * In the event of an exception thrown due to a corrupted data store
during
+ * deserialization, this implementation may not be able to clean up
all resources
+ * allocated, and therefore it is the client application's
responsibility to
* clean up those unreleased resources.
*
* Coupling of Grammars and StringPool
*
- * This implementation assumes that StringPool shall always be
+ * This implementation assumes that StringPool shall always be
* serialized/deserialized together with the grammars. In the case
that such a
- * coupling is not desired, client application can modify this
behaviour by
+ * coupling is not desired, client application can modify this
behaviour by
* either derivate from this imlementation and overwrite the
serializeGrammars()
* and/or deserializeGrammars() to decouple grammars and string pool,
or
* Once deserializeGrammars() is done, insert another StringPool
through
* setStringPool().
*
- * Client application shall be aware of the unpredicatable/undefined
consequence
+ * Client application shall be aware of the unpredicatable/undefined
consequence
* of this decoupling.
*/
- virtual void serializeGrammars(BinOutputStream* const);
- virtual void deserializeGrammars(BinInputStream* const);
+ virtual void serializeGrammars(BinOutputStream* const);
+ virtual void deserializeGrammars(BinInputStream* const);
private:
@@ -254,7 +254,7 @@
// -----------------------------------------------------------------------
//
- // fGrammarRegistry:
+ // fGrammarRegistry:
//
// container
// fStringPool
@@ -266,7 +266,7 @@
// whether the pool has been locked
//
// -----------------------------------------------------------------------
- RefHashTableOf<Grammar>* fGrammarRegistry;
+ RefHashTableOf<Grammar>* fGrammarRegistry;
XMLStringPool* fStringPool;
XMLSynchronizedStringPool* fSynchronizedStringPool;
XSModel* fXSModel;
Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSModel.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSModel.cpp?rev=671531&r1=671530&r2=671531&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSModel.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSModel.cpp Wed Jun 25 05:38:28
2008
@@ -21,7 +21,6 @@
#include <xercesc/framework/psvi/XSModel.hpp>
#include <xercesc/framework/psvi/XSNamespaceItem.hpp>
-#include <xercesc/internal/XMLGrammarPoolImpl.hpp>
#include <xercesc/validators/schema/SchemaGrammar.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
#include <xercesc/validators/schema/XercesAttGroupInfo.hpp>
Modified: xerces/c/trunk/src/xercesc/validators/common/GrammarResolver.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/common/GrammarResolver.cpp?rev=671531&r1=671530&r2=671531&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/common/GrammarResolver.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/common/GrammarResolver.cpp Wed Jun 25
05:38:28 2008
@@ -24,7 +24,7 @@
#include <xercesc/validators/schema/SchemaGrammar.hpp>
#include <xercesc/validators/schema/XMLSchemaDescriptionImpl.hpp>
#include <xercesc/validators/DTD/XMLDTDDescriptionImpl.hpp>
-#include <xercesc/internal/XMLGrammarPoolImpl.hpp>
+#include <xercesc/framework/XMLGrammarPoolImpl.hpp>
#include <xercesc/framework/psvi/XSAnnotation.hpp>
XERCES_CPP_NAMESPACE_BEGIN
Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp?rev=671531&r1=671530&r2=671531&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp Wed Jun 25
05:38:28 2008
@@ -37,7 +37,6 @@
#include <xercesc/validators/schema/XercesGroupInfo.hpp>
#include <xercesc/validators/schema/XSDLocator.hpp>
#include <xercesc/util/OutOfMemoryException.hpp>
-#include <xercesc/internal/XMLGrammarPoolImpl.hpp>
XERCES_CPP_NAMESPACE_BEGIN
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
