You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2007/05/02 19:13:01 UTC

svn commit: r534552 - in /incubator/uima/uimacpp/trunk: docs/ examples/ examples/src/ src/framework/uima/ src/test/ src/test/src/

Author: eae
Date: Wed May  2 10:12:59 2007
New Revision: 534552

URL: http://svn.apache.org/viewvc?view=rev&rev=534552
Log:
UIMA-391

Added:
    incubator/uima/uimacpp/trunk/src/test/fvtTestfile.debug
Modified:
    incubator/uima/uimacpp/trunk/docs/overview_and_setup.html
    incubator/uima/uimacpp/trunk/examples/runall.cmd
    incubator/uima/uimacpp/trunk/examples/src/DaveDetector.vcproj
    incubator/uima/uimacpp/trunk/examples/src/ExampleApplication.vcproj
    incubator/uima/uimacpp/trunk/examples/src/SimpleTextSegmenter.vcproj
    incubator/uima/uimacpp/trunk/examples/src/SofaDataAnnotator.vcproj
    incubator/uima/uimacpp/trunk/examples/src/SofaExampleAnnotator.vcproj
    incubator/uima/uimacpp/trunk/examples/src/SofaExampleApplication.vcproj
    incubator/uima/uimacpp/trunk/examples/src/SofaStreamHandlerFile.vcproj
    incubator/uima/uimacpp/trunk/examples/src/XCasWriterCasConsumer.vcproj
    incubator/uima/uimacpp/trunk/src/framework/uima/dllfile.hpp
    incubator/uima/uimacpp/trunk/src/test/fvt.bat
    incubator/uima/uimacpp/trunk/src/test/src/MeetingAnnotator.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/SimpleTextSegmenter.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/TextSegmentConsumer.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/plugin_annotator_dump.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/plugin_tokenizer.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/test_cas.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/test_engine.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/test_iterators.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/test_language.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/test_primitivetypes.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/test_sofa.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/test_typepriority.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/test_xcasdeserialization.vcproj
    incubator/uima/uimacpp/trunk/src/test/src/test_xmideserialization.vcproj

Modified: incubator/uima/uimacpp/trunk/docs/overview_and_setup.html
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/docs/overview_and_setup.html?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/docs/overview_and_setup.html (original)
+++ incubator/uima/uimacpp/trunk/docs/overview_and_setup.html Wed May  2 10:12:59 2007
@@ -181,19 +181,19 @@
 To test the interoperability with UIMA Java SDK, make sure UIMA_HOME is set to the location of the UIMA SDK, and that its bin directory is in the PATH. Run DaveDetector as follows:
 <h4>2.3.1 On Linux</h4>
 <ul>
-    <code>runTAE.sh descriptors/DaveDetector.xml data</code>
+    <code>runAE.sh descriptors/DaveDetector.xml data</code>
 </ul>  
 <h4>2.3.2 On Windows</h4>
 <ul>
-    <code>runTAE descriptors\DaveDetector.xml data</code>
+    <code>runAE descriptors\DaveDetector.xml data</code>
 </ul>  
-The runTAE driver will process all files in the data directory and DaveDetector should find Daves in some of them.
+The runAE driver will process all files in the data directory and DaveDetector should find Daves in some of them.
 
 <h2>3.0 Developing a C++ Component</h2>
 
 <h3>3.1 Developing UIMA C++ Components without Java</h3>
 <p>
-It is advantageous to debug C++ components as stand-alone C++ applications.
+It is advantageous to develop C++ components as stand-alone C++ applications.
 The program <CODE>runAECpp</CODE> found under the $UIMACPP_HOME/bin directory is a
 C++ utility that imports one or more XML format CAS files into CAS objects and for each calls the 
 <CODE>process</CODE> method of the specified UIMA C++ component, optionally
@@ -206,7 +206,7 @@
 in the CPE flow to export the contents of the CAS object to a file in an XML format. 
 </p>
 <p>
-To debug using XML CAS serialization, use one of the above serializers to dump
+To develop using XML CAS serialization, use one of the above serializers to dump
 the CAS at the point the C++ component would be called, 
 or even create the XML content with an editor.  Use runAECpp to process XML format CAS input as follows:
 </p>
@@ -234,12 +234,32 @@
 <a href="../examples/readme.html">C++ Examples</a>
 </p>
 
-<h3>3.2 Message Logging from a C++ Component</h3>
+<h3>3.2 Debugging UIMA C++ Components</h3>
+<p>Another advantage in developing UIMA C++ components as stand-alone applications is the use of native debuggers.
+The component driver, runAECpp, simplifies running the C++ component under a native debugger.
+</p>
+<h4>3.2.1 Debugging on Windows</h4>
+<p>The UIMA C++ framework has special provisions for debugging on Windows.
+UIMA C++ components built debug should link to a debug version of the framework, uimaD.dll.
+The debug framework automatically appends "D" to the name of C++ components before trying to load them.
+This applies to annotators and URI scheme handlers. All UIMA C++ example code follow this convention.
+</p>
+<p>Note also that the runAECppD version of the component driver should be used with debug components.
+</p>
+
+<h3>3.3 Running C++ Components under Java</h3>
+<p>Native components running under Java may operate differently than when run from a native application.
+This is because the JVM uses different default process limits than those used for a native application.
+For example, the maximum stack size for a thread running under a JVM may be 100KB versus
+1MB for a native command line application. Use "java -X" to get more information on non-standard JVM options.
+</p>
+
+<h3>3.4 Message Logging from a C++ Component</h3>
 <p>For formal integration with UIMA applications, a logfile interface is available.
 When a C++ annotator is called from Java, logging messages are integrated into the Java log.
 If the C++ annotator is called from a native C++ application, such as runAECpp,
 a local logfile may be created. The name of the logfile is taken from the 
-the environmental parameter, UIMACPP_LOG_FILE, and it is opened "append".
+the environmental parameter, UIMACPP_LOGFILE, and it is opened "append".
 The default is to disable logging.
 </p>
 <p>Three levels of message logging can be used: Message, Warning and Error.
@@ -247,5 +267,6 @@
 When called from a C++ application an API is available to set the log level; the default level is Error.
 When called from runAECpp the value of these levels are 0, 1, and 2, respectively.
 </p>
+
 </body>
 </html>

Modified: incubator/uima/uimacpp/trunk/examples/runall.cmd
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/examples/runall.cmd?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/examples/runall.cmd (original)
+++ incubator/uima/uimacpp/trunk/examples/runall.cmd Wed May  2 10:12:59 2007
@@ -1,25 +1,34 @@
-runAECpp descriptors/DaveDetector.xml data/example.txt
+@setlocal
+@set runae=runAECpp
+@set exampapp=ExampleApplication
+@set sofaexampapp=SofaExampleApplication
+@if "%~1" == "debug" (
+  @set runae=runAECppD
+  @set exampapp=ExampleApplicationD
+  @set sofaexampapp=SofaExampleApplicationD
+)
+%runae% descriptors/DaveDetector.xml data/example.txt
 @if errorlevel 1 goto error
-runAECpp descriptors/DaveDetector.xml -x data/tcas.xcas
+%runae% descriptors/DaveDetector.xml -x data/tcas.xcas
 @if errorlevel 1 goto error
-runAECpp descriptors/DaveDetector.xml -x data/sofa.xcas -s EnglishDocument
+%runae% descriptors/DaveDetector.xml -x data/sofa.xcas -s EnglishDocument
 @if errorlevel 1 goto error
-runAECpp -x descriptors/SofaExampleAnnotator.xml data/sofa.xcas
+%runae% -x descriptors/SofaExampleAnnotator.xml data/sofa.xcas
 @if errorlevel 1 goto error
 set UIMACPP_STREAMHANDLERS=file:SofaStreamHandlerFile
-runAECpp -x descriptors/SofaDataAnnotator.xml data/sofa.xcas
+%runae% -x descriptors/SofaDataAnnotator.xml data/sofa.xcas
 @if errorlevel 1 goto error
-runAECpp -x descriptors/SofaDataAnnotator.xml data/filetcas.xcas
+%runae% -x descriptors/SofaDataAnnotator.xml data/filetcas.xcas
 @if errorlevel 1 goto error
-runAECpp -x descriptors/SimpleTextSegmenter.xml data/docforsegmenter.xcas
+%runae% -x descriptors/SimpleTextSegmenter.xml data/docforsegmenter.xcas
 @if errorlevel 1 goto error
-runAECpp -x descriptors/XCasWriterCasConsumer.xml data/tcas.xcas
+%runae% -x descriptors/XCasWriterCasConsumer.xml data/tcas.xcas
 @if errorlevel 1 goto error
-runAECpp -x descriptors/XCasWriterCasConsumer.xml data/sofa.xcas
+%runae% -x descriptors/XCasWriterCasConsumer.xml data/sofa.xcas
 @if errorlevel 1 goto error
-src\ExampleApplication descriptors/DaveDetector.xml data
+%exampapp% descriptors/DaveDetector.xml data
 @if errorlevel 1 goto error
-src\SofaExampleApplication descriptors/SofaExampleAnnotator.xml
+%sofaexampapp% descriptors/SofaExampleAnnotator.xml
 @if errorlevel 1 goto error
 echo .................
 echo All examples ran!

Modified: incubator/uima/uimacpp/trunk/examples/src/DaveDetector.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/examples/src/DaveDetector.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/examples/src/DaveDetector.vcproj (original)
+++ incubator/uima/uimacpp/trunk/examples/src/DaveDetector.vcproj Wed May  2 10:12:59 2007
@@ -36,7 +36,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libapr$(APR_VER).lib xerces-c_2.lib icuuc.lib uimaD.lib"
-				OutputFile="$(OutDir)/DaveDetector.dll"
+				OutputFile="$(OutDir)/DaveDetectorD.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/examples/src/ExampleApplication.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/examples/src/ExampleApplication.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/examples/src/ExampleApplication.vcproj (original)
+++ incubator/uima/uimacpp/trunk/examples/src/ExampleApplication.vcproj Wed May  2 10:12:59 2007
@@ -37,7 +37,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib libapr$(APR_VER).lib"
-				OutputFile="$(OutDir)\ExampleApplication.exe"
+				OutputFile="$(OutDir)\ExampleApplicationD.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/examples/src/SimpleTextSegmenter.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/examples/src/SimpleTextSegmenter.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/examples/src/SimpleTextSegmenter.vcproj (original)
+++ incubator/uima/uimacpp/trunk/examples/src/SimpleTextSegmenter.vcproj Wed May  2 10:12:59 2007
@@ -36,7 +36,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libapr$(APR_VER).lib xerces-c_2.lib icuuc.lib uimaD.lib"
-				OutputFile="$(OutDir)/SimpleTextSegmenter.dll"
+				OutputFile="$(OutDir)/SimpleTextSegmenterD.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/examples/src/SofaDataAnnotator.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/examples/src/SofaDataAnnotator.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/examples/src/SofaDataAnnotator.vcproj (original)
+++ incubator/uima/uimacpp/trunk/examples/src/SofaDataAnnotator.vcproj Wed May  2 10:12:59 2007
@@ -36,7 +36,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libapr$(APR_VER).lib xerces-c_2.lib icuuc.lib uimaD.lib"
-				OutputFile="$(OutDir)/SofaDataAnnotator.dll"
+				OutputFile="$(OutDir)/SofaDataAnnotatorD.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/examples/src/SofaExampleAnnotator.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/examples/src/SofaExampleAnnotator.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/examples/src/SofaExampleAnnotator.vcproj (original)
+++ incubator/uima/uimacpp/trunk/examples/src/SofaExampleAnnotator.vcproj Wed May  2 10:12:59 2007
@@ -36,7 +36,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libapr$(APR_VER).lib xerces-c_2.lib icuuc.lib uimaD.lib"
-				OutputFile="$(OutDir)/SofaExampleAnnotator.dll"
+				OutputFile="$(OutDir)/SofaExampleAnnotatorD.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/examples/src/SofaExampleApplication.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/examples/src/SofaExampleApplication.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/examples/src/SofaExampleApplication.vcproj (original)
+++ incubator/uima/uimacpp/trunk/examples/src/SofaExampleApplication.vcproj Wed May  2 10:12:59 2007
@@ -37,7 +37,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib libapr$(APR_VER).lib"
-				OutputFile="$(OutDir)\SofaExampleApplication.exe"
+				OutputFile="$(OutDir)\SofaExampleApplicationD.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/examples/src/SofaStreamHandlerFile.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/examples/src/SofaStreamHandlerFile.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/examples/src/SofaStreamHandlerFile.vcproj (original)
+++ incubator/uima/uimacpp/trunk/examples/src/SofaStreamHandlerFile.vcproj Wed May  2 10:12:59 2007
@@ -36,7 +36,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libapr$(APR_VER).lib xerces-c_2.lib icuuc.lib uimaD.lib"
-				OutputFile="$(OutDir)/SofaStreamHandlerFile.dll"
+				OutputFile="$(OutDir)/SofaStreamHandlerFileD.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/examples/src/XCasWriterCasConsumer.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/examples/src/XCasWriterCasConsumer.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/examples/src/XCasWriterCasConsumer.vcproj (original)
+++ incubator/uima/uimacpp/trunk/examples/src/XCasWriterCasConsumer.vcproj Wed May  2 10:12:59 2007
@@ -36,7 +36,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libapr$(APR_VER).lib xerces-c_2.lib icuuc.lib uimaD.lib"
-				OutputFile="$(OutDir)/XCasWriterCasConsumer.dll"
+				OutputFile="$(OutDir)/XCasWriterCasConsumerD.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/framework/uima/dllfile.hpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/framework/uima/dllfile.hpp?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/framework/uima/dllfile.hpp (original)
+++ incubator/uima/uimacpp/trunk/src/framework/uima/dllfile.hpp Wed May  2 10:12:59 2007
@@ -191,6 +191,15 @@
         // and that is expected back in ResourceManager::requestAnnotatorFile
         dsoBuffer = (char*) apr_palloc ( dsoPool, DSOBUFLEN );
 
+#ifdef _DEBUG
+#ifdef _WINDOWS
+        // Add "D" to library name
+        char libName[128];
+        strcpy(libName, iv_clFilename.getName());
+        strcat(libName, "D");
+        iv_clFilename.setNewName(libName);
+#endif
+#endif
         // Add the appropriate extension if missing
         if (! iv_clFilename.isAbsolute() && *iv_clFilename.getExtension() == '\0' )
           iv_clFilename.setNewExtension(DSO_EXTN);

Modified: incubator/uima/uimacpp/trunk/src/test/fvt.bat
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/fvt.bat?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/fvt.bat (original)
+++ incubator/uima/uimacpp/trunk/src/test/fvt.bat Wed May  2 10:12:59 2007
@@ -25,7 +25,17 @@
 	set UIMACPPTEST_JNI=@echo "UIMA_HOME is not set. The JNI test was not run."
 )
 
-nmake -f fvtTestfile %1
+if "%~1" == "debug" (
+  nmake -f fvtTestfile.debug
+)
+if "%~2" == "debug" (
+  nmake -f fvtTestfile.debug
+)
+if not "%~2" == "debug" (
+  if not "%~1" == "debug" (
+    nmake -f fvtTestfile
+  )
+)
 
 goto end
 

Added: incubator/uima/uimacpp/trunk/src/test/fvtTestfile.debug
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/fvtTestfile.debug?view=auto&rev=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/fvtTestfile.debug (added)
+++ incubator/uima/uimacpp/trunk/src/test/fvtTestfile.debug Wed May  2 10:12:59 2007
@@ -0,0 +1,43 @@
+
+all:	cas sofa engine typepriority language iterators casserializer primitivetypes xcasdeserialization xmideserialization jni
+
+cas:
+	$(DEBUG_FVT)test_casD
+
+sofa:
+	$(DEBUG_FVT)test_sofaD
+	$(RM) temp.xcas
+
+engine:	
+	$(DEBUG_FVT)test_engineD
+
+typepriority:
+	$(DEBUG_FVT)test_typepriorityD
+	$(RM) ANDump.xml
+
+language:
+	$(DEBUG_FVT)test_languageD
+
+iterators:	
+	$(DEBUG_FVT)test_iteratorsD
+
+casserializer:
+	$(DEBUG_FVT)test_casserializerD
+
+primitivetypes:
+	$(DEBUG_FVT)test_primitivetypesD
+	$(RM) temp.xcas
+	$(RM) testprimitivetypes.xmi
+
+xcasdeserialization:
+	$(DEBUG_FVT)test_xcasdeserializationD
+	$(RM) temp.xcas
+
+xmideserialization:
+	$(DEBUG_FVT)test_xmideserializationD
+	$(RM) temp.xmi
+	$(RM) oots.xmi
+	$(RM) oots2.xmi
+
+jni:
+	$(UIMACPPTEST_JNI)

Modified: incubator/uima/uimacpp/trunk/src/test/src/MeetingAnnotator.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/MeetingAnnotator.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/MeetingAnnotator.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/MeetingAnnotator.vcproj Wed May  2 10:12:59 2007
@@ -34,7 +34,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
-				OutputFile="$(OutDir)\$(ProjectName).dll"
+				OutputFile="$(OutDir)\$(ProjectName)D.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/SimpleTextSegmenter.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/SimpleTextSegmenter.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/SimpleTextSegmenter.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/SimpleTextSegmenter.vcproj Wed May  2 10:12:59 2007
@@ -34,7 +34,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
-				OutputFile="$(OutDir)\lib$(ProjectName).dll"
+				OutputFile="$(OutDir)\lib$(ProjectName)D.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.vcproj Wed May  2 10:12:59 2007
@@ -34,7 +34,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
-				OutputFile="$(OutDir)\$(ProjectName).dll"
+				OutputFile="$(OutDir)\$(ProjectName)D.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/TextSegmentConsumer.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/TextSegmentConsumer.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/TextSegmentConsumer.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/TextSegmentConsumer.vcproj Wed May  2 10:12:59 2007
@@ -34,7 +34,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
-				OutputFile="$(OutDir)\lib$(ProjectName).dll"
+				OutputFile="$(OutDir)\lib$(ProjectName)D.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/plugin_annotator_dump.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/plugin_annotator_dump.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/plugin_annotator_dump.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/plugin_annotator_dump.vcproj Wed May  2 10:12:59 2007
@@ -33,7 +33,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="icuuc.lib libapr$(APR_VER).lib uimaD.lib"
-				OutputFile="$(OutDir)\libdump.dll"
+				OutputFile="$(OutDir)\libdumpD.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/plugin_tokenizer.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/plugin_tokenizer.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/plugin_tokenizer.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/plugin_tokenizer.vcproj Wed May  2 10:12:59 2007
@@ -33,7 +33,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="icuuc.lib uimaD.lib libapr$(APR_VER).lib"
-				OutputFile="$(OutDir)\libtoknz.dll"
+				OutputFile="$(OutDir)\libtoknzD.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/test_cas.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_cas.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_cas.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_cas.vcproj Wed May  2 10:12:59 2007
@@ -33,7 +33,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
-				OutputFile="$(OutDir)/test_cas.exe"
+				OutputFile="$(OutDir)/test_casD.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.vcproj Wed May  2 10:12:59 2007
@@ -33,7 +33,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
-				OutputFile="$(OutDir)/test_casserializer.exe"
+				OutputFile="$(OutDir)/test_casserializerD.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/test_engine.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_engine.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_engine.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_engine.vcproj Wed May  2 10:12:59 2007
@@ -34,7 +34,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
-				OutputFile="$(OutDir)/test_engine.exe"
+				OutputFile="$(OutDir)/test_engineD.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/test_iterators.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_iterators.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_iterators.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_iterators.vcproj Wed May  2 10:12:59 2007
@@ -33,7 +33,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
-				OutputFile="$(OutDir)\test_iterators.exe"
+				OutputFile="$(OutDir)\test_iteratorsD.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/test_language.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_language.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_language.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_language.vcproj Wed May  2 10:12:59 2007
@@ -33,7 +33,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr$(APR_VER).lib uimaD.lib"
-				OutputFile="$(OutDir)/test_language.exe"
+				OutputFile="$(OutDir)/test_languageD.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/test_primitivetypes.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_primitivetypes.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_primitivetypes.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_primitivetypes.vcproj Wed May  2 10:12:59 2007
@@ -33,7 +33,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
-				OutputFile="$(OutDir)/test_primitivetypes.exe"
+				OutputFile="$(OutDir)/test_primitivetypesD.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/test_sofa.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_sofa.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_sofa.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_sofa.vcproj Wed May  2 10:12:59 2007
@@ -33,7 +33,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
-				OutputFile="$(OutDir)/test_sofa.exe"
+				OutputFile="$(OutDir)/test_sofaD.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/test_typepriority.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_typepriority.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_typepriority.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_typepriority.vcproj Wed May  2 10:12:59 2007
@@ -33,7 +33,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
-				OutputFile="$(OutDir)/test_typepriority.exe"
+				OutputFile="$(OutDir)/test_typepriorityD.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/test_xcasdeserialization.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_xcasdeserialization.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_xcasdeserialization.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_xcasdeserialization.vcproj Wed May  2 10:12:59 2007
@@ -33,7 +33,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
-				OutputFile="$(OutDir)/test_xcasdeserialization.exe"
+				OutputFile="$(OutDir)/test_xcasdeserializationD.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"

Modified: incubator/uima/uimacpp/trunk/src/test/src/test_xmideserialization.vcproj
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_xmideserialization.vcproj?view=diff&rev=534552&r1=534551&r2=534552
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_xmideserialization.vcproj (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_xmideserialization.vcproj Wed May  2 10:12:59 2007
@@ -33,7 +33,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
-				OutputFile="$(OutDir)/test_xmideserialization.exe"
+				OutputFile="$(OutDir)/test_xmideserializationD.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Debug&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
 				GenerateDebugInformation="TRUE"