Author: amassari
Date: Mon Oct 16 09:41:09 2006
New Revision: 464557
URL: http://svn.apache.org/viewvc?view=rev&rev=464557
Log:
Move PSVIUni.* from sample PSVIWriter into main library
Added:
xerces/c/trunk/src/xercesc/util/PSVIUni.cpp
- copied unchanged from r464389,
xerces/c/trunk/samples/src/PSVIWriter/PSVIUni.cpp
xerces/c/trunk/src/xercesc/util/PSVIUni.hpp
- copied, changed from r464389,
xerces/c/trunk/samples/src/PSVIWriter/PSVIUni.hpp
Removed:
xerces/c/trunk/samples/src/PSVIWriter/PSVIUni.cpp
xerces/c/trunk/samples/src/PSVIWriter/PSVIUni.hpp
Modified:
xerces/c/trunk/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/PSVIWriter/PSVIWriter.mak
xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
xerces/c/trunk/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.dsp
xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
xerces/c/trunk/Projects/Win32/VC6/xerces-all/xerces-all.dsw
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
xerces/c/trunk/Projects/Win32/VC8/xerces-all/PSVIWriter/PSVIWriter.vcproj
xerces/c/trunk/Projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
xerces/c/trunk/samples/Makefile.am
xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp
xerces/c/trunk/src/Makefile.am
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?view=diff&rev=464557&r1=464556&r2=464557
==============================================================================
--- xerces/c/trunk/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
(original)
+++ xerces/c/trunk/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr Mon
Oct 16 09:41:09 2006
@@ -53,6 +53,7 @@
..\..\..\..\..\Build\Win32\BCB6\obj\KVStringPair.obj
..\..\..\..\..\Build\Win32\BCB6\obj\Mutexes.obj
..\..\..\..\..\Build\Win32\BCB6\obj\PlatformUtils.obj
+ ..\..\..\..\..\Build\Win32\BCB6\obj\PSVIUni.obj
..\..\..\..\..\Build\Win32\BCB6\obj\QName.obj
..\..\..\..\..\Build\Win32\BCB6\obj\StringPool.obj
..\..\..\..\..\Build\Win32\BCB6\obj\SynchronizedStringPool.obj
@@ -416,6 +417,7 @@
<FILE FILENAME="..\..\..\..\..\src\xercesc\util\KVStringPair.cpp"
FORMNAME="" UNITNAME="KVStringPair" CONTAINERID="CCompiler" DESIGNCLASS=""
LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\util\Mutexes.cpp" FORMNAME=""
UNITNAME="Mutexes" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\util\PlatformUtils.cpp"
FORMNAME="" UNITNAME="PlatformUtils" CONTAINERID="CCompiler" DESIGNCLASS=""
LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\..\..\..\src\xercesc\util\PSVIUni.cpp" FORMNAME=""
UNITNAME="PSVIUni" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\util\QName.cpp" FORMNAME=""
UNITNAME="QName" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\util\StringPool.cpp"
FORMNAME="" UNITNAME="StringPool" CONTAINERID="CCompiler" DESIGNCLASS=""
LOCALCOMMAND=""/>
<FILE
FILENAME="..\..\..\..\..\src\xercesc\util\SynchronizedStringPool.cpp"
FORMNAME="" UNITNAME="SynchronizedStringPool" CONTAINERID="CCompiler"
DESIGNCLASS="" LOCALCOMMAND=""/>
Modified:
xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/PSVIWriter/PSVIWriter.mak
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/PSVIWriter/PSVIWriter.mak?view=diff&rev=464557&r1=464556&r2=464557
==============================================================================
--- xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/PSVIWriter/PSVIWriter.mak
(original)
+++ xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/PSVIWriter/PSVIWriter.mak
Mon Oct 16 09:41:09 2006
@@ -6,7 +6,6 @@
TARGETPATH=..\..\..\..\..\Build\Win32\BCC.551
PROJECT = $(TARGETPATH)\PSVIWriter.exe
OBJFILES = $(TARGETPATH)\obj\PSVIWriter.obj \
- $(TARGETPATH)\obj\PSVIUni.obj \
$(TARGETPATH)\obj\PSVIWriterHandlers.obj
RESFILES =
MAINSOURCE = PSVIWriter.cpp
Modified:
xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak?view=diff&rev=464557&r1=464556&r2=464557
==============================================================================
--- xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
(original)
+++ xerces/c/trunk/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
Mon Oct 16 09:41:09 2006
@@ -49,6 +49,7 @@
$(TARGETPATH)\obj\KVStringPair.obj \
$(TARGETPATH)\obj\Mutexes.obj \
$(TARGETPATH)\obj\PlatformUtils.obj \
+ $(TARGETPATH)\obj\PSVIUni.obj \
$(TARGETPATH)\obj\QName.obj \
$(TARGETPATH)\obj\StringPool.obj \
$(TARGETPATH)\obj\TransService.obj \
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.dsp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.dsp?view=diff&rev=464557&r1=464556&r2=464557
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.dsp
(original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/PSVIWriter/PSVIWriter.dsp Mon
Oct 16 09:41:09 2006
@@ -136,14 +136,6 @@
# Name "PSVIWriter - Win64 Release"
# Begin Source File
-SOURCE=..\..\..\..\..\samples\src\PSVIWriter\PSVIUni.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\samples\src\PSVIWriter\PSVIUni.hpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\..\samples\src\PSVIWriter\PSVIWriter.cpp
# End Source File
# Begin Source File
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?view=diff&rev=464557&r1=464556&r2=464557
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
(original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp Mon
Oct 16 09:41:09 2006
@@ -692,6 +692,14 @@
# End Source File
# Begin Source File
+SOURCE=..\..\..\..\..\src\xercesc\util\PSVIUni.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\util\PSVIUni.hpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\..\src\xercesc\util\QName.cpp
# End Source File
# Begin Source File
Modified: xerces/c/trunk/Projects/Win32/VC6/xerces-all/xerces-all.dsw
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC6/xerces-all/xerces-all.dsw?view=diff&rev=464557&r1=464556&r2=464557
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC6/xerces-all/xerces-all.dsw (original)
+++ xerces/c/trunk/Projects/Win32/VC6/xerces-all/xerces-all.dsw Mon Oct 16
09:41:09 2006
@@ -435,6 +435,21 @@
###############################################################################
+Project: "XercesP"=".\XercesP\XercesP.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name XercesLib
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "all"=".\all\all.dsp" - Package Owner=<4>
Package=<5>
Modified:
xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj?view=diff&rev=464557&r1=464556&r2=464557
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj
(original)
+++ xerces/c/trunk/Projects/Win32/VC7.1/xerces-all/PSVIWriter/PSVIWriter.vcproj
Mon Oct 16 09:41:09 2006
@@ -251,12 +251,6 @@
</References>
<Files>
<File
-
RelativePath="..\..\..\..\..\samples\src\PSVIWriter\PSVIUni.cpp">
- </File>
- <File
-
RelativePath="..\..\..\..\..\samples\src\PSVIWriter\PSVIUni.hpp">
- </File>
- <File
RelativePath="..\..\..\..\..\samples\src\PSVIWriter\PSVIWriter.cpp">
</File>
<File
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?view=diff&rev=464557&r1=464556&r2=464557
==============================================================================
--- 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
Mon Oct 16 09:41:09 2006
@@ -402,6 +402,12 @@
RelativePath="..\..\..\..\..\src\xercesc\util\PlatformUtils.hpp">
</File>
<File
+
RelativePath="..\..\..\..\..\src\xercesc\util\PSVIUni.cpp">
+ </File>
+ <File
+
RelativePath="..\..\..\..\..\src\xercesc\util\PSVIUni.hpp">
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\xercesc\util\QName.cpp">
</File>
<File
Modified:
xerces/c/trunk/Projects/Win32/VC8/xerces-all/PSVIWriter/PSVIWriter.vcproj
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/Projects/Win32/VC8/xerces-all/PSVIWriter/PSVIWriter.vcproj?view=diff&rev=464557&r1=464556&r2=464557
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC8/xerces-all/PSVIWriter/PSVIWriter.vcproj
(original)
+++ xerces/c/trunk/Projects/Win32/VC8/xerces-all/PSVIWriter/PSVIWriter.vcproj
Mon Oct 16 09:41:09 2006
@@ -367,14 +367,6 @@
</References>
<Files>
<File
-
RelativePath="..\..\..\..\..\samples\src\PSVIWriter\PSVIUni.cpp"
- >
- </File>
- <File
-
RelativePath="..\..\..\..\..\samples\src\PSVIWriter\PSVIUni.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\..\samples\src\PSVIWriter\PSVIWriter.cpp"
>
</File>
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?view=diff&rev=464557&r1=464556&r2=464557
==============================================================================
--- xerces/c/trunk/Projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj
(original)
+++ xerces/c/trunk/Projects/Win32/VC8/xerces-all/XercesLib/XercesLib.vcproj Mon
Oct 16 09:41:09 2006
@@ -555,6 +555,14 @@
>
</File>
<File
+
RelativePath="..\..\..\..\..\src\xercesc\util\PSVIUni.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\..\..\src\xercesc\util\PSVIUni.hpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\..\src\xercesc\util\QName.cpp"
>
</File>
Modified: xerces/c/trunk/samples/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/samples/Makefile.am?view=diff&rev=464557&r1=464556&r2=464557
==============================================================================
--- xerces/c/trunk/samples/Makefile.am (original)
+++ xerces/c/trunk/samples/Makefile.am Mon Oct 16 09:41:09 2006
@@ -49,8 +49,7 @@
src/PParse/PParseHandlers.cpp
sampleprogs += PSVIWriter
-PSVIWriter_SOURCES =
src/PSVIWriter/PSVIUni.cpp \
-
src/PSVIWriter/PSVIWriter.cpp \
+PSVIWriter_SOURCES = src/PSVIWriter/PSVIWriter.cpp \
src/PSVIWriter/PSVIWriterHandlers.cpp
sampleprogs += Redirect
Modified: xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp?view=diff&rev=464557&r1=464556&r2=464557
==============================================================================
--- xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp (original)
+++ xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp Mon Oct 16
09:41:09 2006
@@ -18,7 +18,7 @@
// Includes
// ---------------------------------------------------------------------------
#include "PSVIWriterHandlers.hpp"
-#include "PSVIUni.hpp"
+#include <xercesc/util/PSVIUni.hpp>
#include <xercesc/util/XMLUni.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/XMLString.hpp>
Modified: xerces/c/trunk/src/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/Makefile.am?view=diff&rev=464557&r1=464556&r2=464557
==============================================================================
--- xerces/c/trunk/src/Makefile.am (original)
+++ xerces/c/trunk/src/Makefile.am Mon Oct 16 09:41:09 2006
@@ -695,6 +695,7 @@
xercesc/util/PanicHandler.hpp \
xercesc/util/ParseException.hpp \
xercesc/util/PlatformUtils.hpp \
+ xercesc/util/PSVIUni.hpp \
xercesc/util/QName.hpp \
xercesc/util/RefArrayOf.hpp \
xercesc/util/RefArrayOf.c \
@@ -823,6 +824,7 @@
xercesc/util/Mutexes.cpp \
xercesc/util/PanicHandler.cpp \
xercesc/util/PlatformUtils.cpp \
+ xercesc/util/PSVIUni.cpp \
xercesc/util/QName.cpp \
xercesc/util/regx/ASCIIRangeFactory.cpp \
xercesc/util/regx/BlockRangeFactory.cpp \
Copied: xerces/c/trunk/src/xercesc/util/PSVIUni.hpp (from r464389,
xerces/c/trunk/samples/src/PSVIWriter/PSVIUni.hpp)
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/PSVIUni.hpp?view=diff&rev=464557&p1=xerces/c/trunk/samples/src/PSVIWriter/PSVIUni.hpp&r1=464389&p2=xerces/c/trunk/src/xercesc/util/PSVIUni.hpp&r2=464557
==============================================================================
--- xerces/c/trunk/samples/src/PSVIWriter/PSVIUni.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/PSVIUni.hpp Mon Oct 16 09:41:09 2006
@@ -20,9 +20,9 @@
#include <xercesc/util/XercesDefs.hpp>
-XERCES_CPP_NAMESPACE_USE
+XERCES_CPP_NAMESPACE_BEGIN
-class PSVIUni
+class XMLUTIL_EXPORT PSVIUni
{
public :
@@ -218,7 +218,7 @@
static const XMLCh fgTotalDigits[];
static const XMLCh fgWhiteSpace[];
- //Namespaces and prefixes
+ //Namespaces and prefixes
static const XMLCh fgNamespaceInfoset[];
static const XMLCh fgXsi[];
@@ -229,5 +229,7 @@
static const XMLCh fgNamespaceXmlSchema[];
};
+
+XERCES_CPP_NAMESPACE_END
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
