UIMA-6175 adjust eol handling to work cross-platform
diff --git a/LICENSE b/LICENSE
index b1418b5..26b7eaf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,845 +1,845 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-   See the License for the specific language governing permissions and

-   limitations under the License.

-

-

-

-==================================================================================

-

-UIMACPP SUBCOMPONENTS not covered by the Apache 2.0 license above: 

-

-

-For the ICU component:

-

-ICU License - ICU 1.8.1 and later

-COPYRIGHT AND PERMISSION NOTICE

-

-Copyright (c) 1995-2012 International Business Machines Corporation and others

-

-All rights reserved.

-

-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-

-Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.

-

-All trademarks and registered trademarks mentioned herein are the property of their respective owners.

-

-Third-Party Software Licenses

-This section contains third-party software notices and/or additional terms for licensed third-party software components included within ICU libraries.

-1. Unicode Data Files and Software

-EXHIBIT 1

-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE

-Unicode Data Files include all data files under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/. Unicode Data Files do not include PDF online code charts under the directory http://www.unicode.org/Public/. Software includes any source code published in the Unicode Standard or under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/.

-

-NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.

-

-COPYRIGHT AND PERMISSION NOTICE

-

-Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.

-

-Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.

-

-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.

-

-Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.

-

-Unicode and the Unicode logo are trademarks of Unicode, Inc. in the United States and other countries. All third party trademarks referenced herein are the property of their respective owners.

-

-2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt)

- #    The Google Chrome software developed by Google is licensed under the BSD license. Other software included in this distribution is provided under other licenses, as set forth below.

- #	

- #	The BSD License

- #	http://opensource.org/licenses/bsd-license.php 

- #	Copyright (C) 2006-2008, Google Inc.

- #	

- #	All rights reserved.

- #	

- #	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

- #	

- #	Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

- #	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.

- #	Neither the name of  Google Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

- #	 

- #	

- #	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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.

- #	

- #	                                             

- #	The word list in cjdict.txt are generated by combining three word lists listed

- #	below with further processing for compound word breaking. The frequency is generated

- #	with an iterative training against Google web corpora. 

- #	

- #	* Libtabe (Chinese)

- #	  - https://sourceforge.net/project/?group_id=1519

- #	  - Its license terms and conditions are shown below.

- #	

- #	* IPADIC (Japanese)

- #	  - http://chasen.aist-nara.ac.jp/chasen/distribution.html

- #	  - Its license terms and conditions are shown below.

- #	

- #	---------COPYING.libtabe ---- BEGIN--------------------

- #	

- #	/*

- #	 * Copyrighy (c) 1999 TaBE Project.

- #	 * Copyright (c) 1999 Pai-Hsiang Hsiao.

- #	 * All rights reserved.

- #	 *

- #	 * Redistribution and use in source and binary forms, with or without

- #	 * modification, are permitted provided that the following conditions

- #	 * are met:

- #	 *

- #	 * . Redistributions of source code must retain the above copyright

- #	 *   notice, this list of conditions and the following disclaimer.

- #	 * . 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.

- #	 * . Neither the name of the TaBE Project nor the names of its

- #	 *   contributors may be used to endorse or promote products derived

- #	 *   from this software without specific prior written permission.

- #	 *

- #	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

- #	 * "AS IS" AND ANY EXPRESS 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

- #	 * REGENTS OR 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.

- #	 */

- #	

- #	/*

- #	 * Copyright (c) 1999 Computer Systems and Communication Lab,

- #	 *                    Institute of Information Science, Academia Sinica.

- #	 * All rights reserved.

- #	 *

- #	 * Redistribution and use in source and binary forms, with or without

- #	 * modification, are permitted provided that the following conditions

- #	 * are met:

- #	 *

- #	 * . Redistributions of source code must retain the above copyright

- #	 *   notice, this list of conditions and the following disclaimer.

- #	 * . 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.

- #	 * . Neither the name of the Computer Systems and Communication Lab

- #	 *   nor the names of its contributors may be used to endorse or

- #	 *   promote products derived from this software without specific

- #	 *   prior written permission.

- #	 *

- #	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

- #	 * "AS IS" AND ANY EXPRESS 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

- #	 * REGENTS OR 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.

- #	 */

- #	

- #	Copyright 1996 Chih-Hao Tsai @ Beckman Institute, University of Illinois

- #	c-tsai4@uiuc.edu  http://casper.beckman.uiuc.edu/~c-tsai4

- #	

- #	---------------COPYING.libtabe-----END------------------------------------

- #	

- #	

- #	---------------COPYING.ipadic-----BEGIN------------------------------------

- #	

- #	Copyright 2000, 2001, 2002, 2003 Nara Institute of Science

- #	and Technology.  All Rights Reserved.

- #	

- #	Use, reproduction, and distribution of this software is permitted.

- #	Any copy of this software, whether in its original form or modified,

- #	must include both the above copyright notice and the following

- #	paragraphs.

- #	

- #	Nara Institute of Science and Technology (NAIST),

- #	the copyright holders, disclaims all warranties with regard to this

- #	software, including all implied warranties of merchantability and

- #	fitness, in no event shall NAIST be liable for

- #	any special, indirect or consequential damages or any damages

- #	whatsoever resulting from loss of use, data or profits, whether in an

- #	action of contract, negligence or other tortuous action, arising out

- #	of or in connection with the use or performance of this software.

- #	

- #	A large portion of the dictionary entries

- #	originate from ICOT Free Software.  The following conditions for ICOT

- #	Free Software applies to the current dictionary as well.

- #	

- #	Each User may also freely distribute the Program, whether in its

- #	original form or modified, to any third party or parties, PROVIDED

- #	that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear

- #	on, or be attached to, the Program, which is distributed substantially

- #	in the same form as set out herein and that such intended

- #	distribution, if actually made, will neither violate or otherwise

- #	contravene any of the laws and regulations of the countries having

- #	jurisdiction over the User or the intended distribution itself.

- #	

- #	NO WARRANTY

- #	

- #	The program was produced on an experimental basis in the course of the

- #	research and development conducted during the project and is provided

- #	to users as so produced on an experimental basis.  Accordingly, the

- #	program is provided without any warranty whatsoever, whether express,

- #	implied, statutory or otherwise.  The term "warranty" used herein

- #	includes, but is not limited to, any warranty of the quality,

- #	performance, merchantability and fitness for a particular purpose of

- #	the program and the nonexistence of any infringement or violation of

- #	any right of any third party.

- #	

- #	Each user of the program will agree and understand, and be deemed to

- #	have agreed and understood, that there is no warranty whatsoever for

- #	the program and, accordingly, the entire risk arising from or

- #	otherwise connected with the program is assumed by the user.

- #	

- #	Therefore, neither ICOT, the copyright holder, or any other

- #	organization that participated in or was otherwise related to the

- #	development of the program and their respective officials, directors,

- #	officers and other employees shall be held liable for any and all

- #	damages, including, without limitation, general, special, incidental

- #	and consequential damages, arising out of or otherwise in connection

- #	with the use or inability to use the program or any product, material

- #	or result produced or otherwise obtained by using the program,

- #	regardless of whether they have been advised of, or otherwise had

- #	knowledge of, the possibility of such damages at any time during the

- #	project or thereafter.  Each user will be deemed to have agreed to the

- #	foregoing by his or her commencement of use of the program.  The term

- #	"use" as used herein includes, but is not limited to, the use,

- #	modification, copying and distribution of the program and the

- #	production of secondary products from the program.

- #	

- #	In the case where the program, whether in its original form or

- #	modified, was distributed or delivered to or received by a user from

- #	any person, organization or entity other than ICOT, unless it makes or

- #	grants independently of ICOT any specific warranty to the user in

- #	writing, such person, organization or entity, will also be exempted

- #	from and not be held liable to the user for any such damages as noted

- #	above as far as the program is concerned.

- #	

- #	---------------COPYING.ipadic-----END------------------------------------

-3. Time Zone Database

-ICU uses the public domain data and code derived from Time Zone Database for its time zone support. The ownership of the TZ database is explained in BCP 175: Procedure for Maintaining the Time Zone Database section 7.

-

-7.  Database Ownership

-

-   The TZ database itself is not an IETF Contribution or an IETF

-   document.  Rather it is a pre-existing and regularly updated work

-   that is in the public domain, and is intended to remain in the public

-   domain.  Therefore, BCPs 78 [RFC5378] and 79 [RFC3979] do not apply

-   to the TZ Database or contributions that individuals make to it.

-   Should any claims be made and substantiated against the TZ Database,

-   the organization that is providing the IANA Considerations defined in

-   this RFC, under the memorandum of understanding with the IETF,

-   currently ICANN, may act in accordance with all competent court

-   orders.  No ownership claims will be made by ICANN or the IETF Trust

-   on the database or the code.  Any person making a contribution to the

-   database or code waives all rights to future claims in that

-   contribution or in the TZ Database.

-

-

-

-APR 1.6.5

-APACHE PORTABLE RUNTIME SUBCOMPONENTS: 

-

-The Apache Portable Runtime includes a number of subcomponents with

-separate copyright notices and license terms. Your use of the source

-code for these subcomponents is subject to the terms and conditions

-of the following licenses. 

-

-From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,

-file_io/unix/mktemp.c, strings/apr_strings.c:

-

-/* 

- * Copyright (c) 1987, 1993, 1994

- *      The Regents of the University of California.  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. All advertising materials mentioning features or use of this software

- *    must display the following acknowledgement:

- *      This product includes software developed by the University of

- *      California, Berkeley and its contributors.

- * 4. Neither the name of the University nor the names of its contributors

- *    may be used to endorse or promote products derived from this software

- *    without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND

- * ANY EXPRESS 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 REGENTS OR 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.

-

-From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c:

-

-/* Copyright (c) 1996 by Internet Software Consortium.

- *

- * Permission to use, copy, modify, and distribute this software for any

- * purpose with or without fee is hereby granted, provided that the above

- * copyright notice and this permission notice appear in all copies.

- *

- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS

- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES

- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE

- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL

- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR

- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS

- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

- * SOFTWARE.

-

-From dso/aix/dso.c:

-

- *  Based on libdl (dlfcn.c/dlfcn.h) which is

- *  Copyright (c) 1992,1993,1995,1996,1997,1988

- *  Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany.

- *

- *  Not derived from licensed software.

- *

- *  Permission is granted to freely use, copy, modify, and redistribute

- *  this software, provided that the author is not construed to be liable

- *  for any results of using the software, alterations are clearly marked

- *  as such, and this notice is not modified.

-

-From strings/apr_strnatcmp.c, include/apr_strings.h:

-

-  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.

-  Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>

-

-  This software is provided 'as-is', without any express or implied

-  warranty.  In no event will the authors be held liable for any damages

-  arising from the use of this software.

-

-  Permission is granted to anyone to use this software for any purpose,

-  including commercial applications, and to alter it and redistribute it

-  freely, subject to the following restrictions:

-

-  1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software

-     in a product, an acknowledgment in the product documentation would be

-     appreciated but is not required.

-  2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.

-  3. This notice may not be removed or altered from any source distribution.

-

-From strings/apr_snprintf.c:

-

-  *

-  * cvt - IEEE floating point formatting routines.

-  *       Derived from UNIX V7, Copyright(C) Caldera International Inc.

-  *

-

-  Copyright(C) Caldera International Inc.  2001-2002.  All rights reserved.

-  

-  Redistribution and use in source and binary forms, with or without

-  modification, are permitted provided that the following conditions are

-  met:

-

-  Redistributions of source code and documentation must retain the above

-  copyright notice, this list of conditions and the following disclaimer.

-

-  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.

-

-  All advertising materials mentioning features or use of this software

-  must display the following acknowledgement:

-

-     This product includes software developed or owned by  Caldera

-     International, Inc.

-

-  Neither the name of Caldera International, Inc. nor the names of other

-  contributors may be used to endorse or promote products derived from

-  this software without specific prior written permission.

-

-  USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA

-  INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS 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 CALDERA INTERNATIONAL, INC. 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.

-

------------------------------------------------------------------------------------

-

-For APR-Util

-

-APACHE PORTABLE RUNTIME SUBCOMPONENTS: 

-

-The Apache Portable Runtime includes a number of subcomponents with

-separate copyright notices and license terms. Your use of the source

-code for the these subcomponents is subject to the terms and

-conditions of the following licenses. 

-

-For the include\apr_md5.h component: 

-/*

- * This is work is derived from material Copyright RSA Data Security, Inc.

- *

- * The RSA copyright statement and Licence for that original material is

- * included below. This is followed by the Apache copyright statement and

- * licence for the modifications made to that material.

- */

-

-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All

-   rights reserved.

-

-   License to copy and use this software is granted provided that it

-   is identified as the "RSA Data Security, Inc. MD5 Message-Digest

-   Algorithm" in all material mentioning or referencing this software

-   or this function.

-

-   License is also granted to make and use derivative works provided

-   that such works are identified as "derived from the RSA Data

-   Security, Inc. MD5 Message-Digest Algorithm" in all material

-   mentioning or referencing the derived work.

-

-   RSA Data Security, Inc. makes no representations concerning either

-   the merchantability of this software or the suitability of this

-   software for any particular purpose. It is provided "as is"

-   without express or implied warranty of any kind.

-

-   These notices must be retained in any copies of any part of this

-   documentation and/or software.

- */

-

-For the passwd\apr_md5.c component:

-

-/*

- * This is work is derived from material Copyright RSA Data Security, Inc.

- *

- * The RSA copyright statement and Licence for that original material is

- * included below. This is followed by the Apache copyright statement and

- * licence for the modifications made to that material.

- */

-

-/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm

- */

-

-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All

-   rights reserved.

-

-   License to copy and use this software is granted provided that it

-   is identified as the "RSA Data Security, Inc. MD5 Message-Digest

-   Algorithm" in all material mentioning or referencing this software

-   or this function.

-

-   License is also granted to make and use derivative works provided

-   that such works are identified as "derived from the RSA Data

-   Security, Inc. MD5 Message-Digest Algorithm" in all material

-   mentioning or referencing the derived work.

-

-   RSA Data Security, Inc. makes no representations concerning either

-   the merchantability of this software or the suitability of this

-   software for any particular purpose. It is provided "as is"

-   without express or implied warranty of any kind.

-

-   These notices must be retained in any copies of any part of this

-   documentation and/or software.

- */

-/*

- * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0

- * MD5 crypt() function, which is licenced as follows:

- * ----------------------------------------------------------------------------

- * "THE BEER-WARE LICENSE" (Revision 42):

- * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you

- * can do whatever you want with this stuff. If we meet some day, and you think

- * this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp

- * ----------------------------------------------------------------------------

- */

-

-For the crypto\apr_md4.c component:

-

- * This is derived from material copyright RSA Data Security, Inc.

- * Their notice is reproduced below in its entirety.

- *

- * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All

- * rights reserved.

- *

- * License to copy and use this software is granted provided that it

- * is identified as the "RSA Data Security, Inc. MD4 Message-Digest

- * Algorithm" in all material mentioning or referencing this software

- * or this function.

- *

- * License is also granted to make and use derivative works provided

- * that such works are identified as "derived from the RSA Data

- * Security, Inc. MD4 Message-Digest Algorithm" in all material

- * mentioning or referencing the derived work.

- *

- * RSA Data Security, Inc. makes no representations concerning either

- * the merchantability of this software or the suitability of this

- * software for any particular purpose. It is provided "as is"

- * without express or implied warranty of any kind.

- *

- * These notices must be retained in any copies of any part of this

- * documentation and/or software.

- */

-

-For the crypto\crypt_blowfish.c(.h) component:

-

- * Written by Solar Designer <solar at openwall.com> in 1998-2011.

- * No copyright is claimed, and the software is hereby placed in the public

- * domain.  In case this attempt to disclaim copyright and place the software

- * in the public domain is deemed null and void, then the software is

- * Copyright (c) 1998-2011 Solar Designer and it is hereby released to the

- * general public under the following terms:

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted.

- *

- * There's ABSOLUTELY NO WARRANTY, express or implied.

-

- See crypto/crypt_blowfish.c for more information.

-

-For the include\apr_md4.h component:

-

- *

- * This is derived from material copyright RSA Data Security, Inc.

- * Their notice is reproduced below in its entirety.

- *

- * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All

- * rights reserved.

- *

- * License to copy and use this software is granted provided that it

- * is identified as the "RSA Data Security, Inc. MD4 Message-Digest

- * Algorithm" in all material mentioning or referencing this software

- * or this function.

- *

- * License is also granted to make and use derivative works provided

- * that such works are identified as "derived from the RSA Data

- * Security, Inc. MD4 Message-Digest Algorithm" in all material

- * mentioning or referencing the derived work.

- *

- * RSA Data Security, Inc. makes no representations concerning either

- * the merchantability of this software or the suitability of this

- * software for any particular purpose. It is provided "as is"

- * without express or implied warranty of any kind.

- *

- * These notices must be retained in any copies of any part of this

- * documentation and/or software.

- */

-

-For the test\testmd4.c component:

-

- *

- * This is derived from material copyright RSA Data Security, Inc.

- * Their notice is reproduced below in its entirety.

- *

- * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All

- * rights reserved.

- *

- * RSA Data Security, Inc. makes no representations concerning either

- * the merchantability of this software or the suitability of this

- * software for any particular purpose. It is provided "as is"

- * without express or implied warranty of any kind.

- *

- * These notices must be retained in any copies of any part of this

- * documentation and/or software.

- */

-

-For the xml\expat\conftools\install-sh component:

-

-#

-# install - install a program, script, or datafile

-# This comes from X11R5 (mit/util/scripts/install.sh).

-#

-# Copyright 1991 by the Massachusetts Institute of Technology

-#

-# Permission to use, copy, modify, distribute, and sell this software and its

-# documentation for any purpose is hereby granted without fee, provided that

-# the above copyright notice appear in all copies and that both that

-# copyright notice and this permission notice appear in supporting

-# documentation, and that the name of M.I.T. not be used in advertising or

-# publicity pertaining to distribution of the software without specific,

-# written prior permission.  M.I.T. makes no representations about the

-# suitability of this software for any purpose.  It is provided "as is"

-# without express or implied warranty.

-#

-

-For the expat xml parser component:

-

-Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd

-                               and Clark Cooper

-

-Permission is hereby granted, free of charge, to any person obtaining

-a copy of this software and associated documentation files (the

-"Software"), to deal in the Software without restriction, including

-without limitation the rights to use, copy, modify, merge, publish,

-distribute, sublicense, and/or sell copies of the Software, and to

-permit persons to whom the Software is furnished to do so, subject to

-the following conditions:

-	

-The above copyright notice and this permission notice shall be included

-in all copies or substantial portions of the Software.

-	

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-====================================================================

-

-For the ldap/apr_ldap_url.c component:

-

-/* Portions Copyright 1998-2002 The OpenLDAP Foundation

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted only as authorized by the OpenLDAP

- * Public License.  A copy of this license is available at

- * http://www.OpenLDAP.org/license.html or in file LICENSE in the

- * top-level directory of the distribution.

- *

- * OpenLDAP is a registered trademark of the OpenLDAP Foundation.

- *

- * Individual files and/or contributed packages may be copyright by

- * other parties and subject to additional restrictions.

- *

- * This work is derived from the University of Michigan LDAP v3.3

- * distribution.  Information concerning this software is available

- * at: http://www.umich.edu/~dirsvcs/ldap/

- *

- * This work also contains materials derived from public sources.

- *

- * Additional information about OpenLDAP can be obtained at:

- *     http://www.openldap.org/

- */

-

-/*

- * Portions Copyright (c) 1992-1996 Regents of the University of Michigan.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms are permitted

- * provided that this notice is preserved and that due credit is given

- * to the University of Michigan at Ann Arbor. The name of the University

- * may not be used to endorse or promote products derived from this

- * software without specific prior written permission. This software

- * is provided ``as is'' without express or implied warranty.

- */

-

+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+
+==================================================================================
+
+UIMACPP SUBCOMPONENTS not covered by the Apache 2.0 license above: 
+
+
+For the ICU component:
+
+ICU License - ICU 1.8.1 and later
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1995-2012 International Business Machines Corporation and others
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
+
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.
+
+Third-Party Software Licenses
+This section contains third-party software notices and/or additional terms for licensed third-party software components included within ICU libraries.
+1. Unicode Data Files and Software
+EXHIBIT 1
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+Unicode Data Files include all data files under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/. Unicode Data Files do not include PDF online code charts under the directory http://www.unicode.org/Public/. Software includes any source code published in the Unicode Standard or under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
+
+Unicode and the Unicode logo are trademarks of Unicode, Inc. in the United States and other countries. All third party trademarks referenced herein are the property of their respective owners.
+
+2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt)
+ #    The Google Chrome software developed by Google is licensed under the BSD license. Other software included in this distribution is provided under other licenses, as set forth below.
+ #	
+ #	The BSD License
+ #	http://opensource.org/licenses/bsd-license.php 
+ #	Copyright (C) 2006-2008, Google Inc.
+ #	
+ #	All rights reserved.
+ #	
+ #	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ #	
+ #	Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ #	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.
+ #	Neither the name of  Google Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+ #	 
+ #	
+ #	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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.
+ #	
+ #	                                             
+ #	The word list in cjdict.txt are generated by combining three word lists listed
+ #	below with further processing for compound word breaking. The frequency is generated
+ #	with an iterative training against Google web corpora. 
+ #	
+ #	* Libtabe (Chinese)
+ #	  - https://sourceforge.net/project/?group_id=1519
+ #	  - Its license terms and conditions are shown below.
+ #	
+ #	* IPADIC (Japanese)
+ #	  - http://chasen.aist-nara.ac.jp/chasen/distribution.html
+ #	  - Its license terms and conditions are shown below.
+ #	
+ #	---------COPYING.libtabe ---- BEGIN--------------------
+ #	
+ #	/*
+ #	 * Copyrighy (c) 1999 TaBE Project.
+ #	 * Copyright (c) 1999 Pai-Hsiang Hsiao.
+ #	 * All rights reserved.
+ #	 *
+ #	 * Redistribution and use in source and binary forms, with or without
+ #	 * modification, are permitted provided that the following conditions
+ #	 * are met:
+ #	 *
+ #	 * . Redistributions of source code must retain the above copyright
+ #	 *   notice, this list of conditions and the following disclaimer.
+ #	 * . 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.
+ #	 * . Neither the name of the TaBE Project nor the names of its
+ #	 *   contributors may be used to endorse or promote products derived
+ #	 *   from this software without specific prior written permission.
+ #	 *
+ #	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ #	 * "AS IS" AND ANY EXPRESS 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
+ #	 * REGENTS OR 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.
+ #	 */
+ #	
+ #	/*
+ #	 * Copyright (c) 1999 Computer Systems and Communication Lab,
+ #	 *                    Institute of Information Science, Academia Sinica.
+ #	 * All rights reserved.
+ #	 *
+ #	 * Redistribution and use in source and binary forms, with or without
+ #	 * modification, are permitted provided that the following conditions
+ #	 * are met:
+ #	 *
+ #	 * . Redistributions of source code must retain the above copyright
+ #	 *   notice, this list of conditions and the following disclaimer.
+ #	 * . 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.
+ #	 * . Neither the name of the Computer Systems and Communication Lab
+ #	 *   nor the names of its contributors may be used to endorse or
+ #	 *   promote products derived from this software without specific
+ #	 *   prior written permission.
+ #	 *
+ #	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ #	 * "AS IS" AND ANY EXPRESS 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
+ #	 * REGENTS OR 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.
+ #	 */
+ #	
+ #	Copyright 1996 Chih-Hao Tsai @ Beckman Institute, University of Illinois
+ #	c-tsai4@uiuc.edu  http://casper.beckman.uiuc.edu/~c-tsai4
+ #	
+ #	---------------COPYING.libtabe-----END------------------------------------
+ #	
+ #	
+ #	---------------COPYING.ipadic-----BEGIN------------------------------------
+ #	
+ #	Copyright 2000, 2001, 2002, 2003 Nara Institute of Science
+ #	and Technology.  All Rights Reserved.
+ #	
+ #	Use, reproduction, and distribution of this software is permitted.
+ #	Any copy of this software, whether in its original form or modified,
+ #	must include both the above copyright notice and the following
+ #	paragraphs.
+ #	
+ #	Nara Institute of Science and Technology (NAIST),
+ #	the copyright holders, disclaims all warranties with regard to this
+ #	software, including all implied warranties of merchantability and
+ #	fitness, in no event shall NAIST be liable for
+ #	any special, indirect or consequential damages or any damages
+ #	whatsoever resulting from loss of use, data or profits, whether in an
+ #	action of contract, negligence or other tortuous action, arising out
+ #	of or in connection with the use or performance of this software.
+ #	
+ #	A large portion of the dictionary entries
+ #	originate from ICOT Free Software.  The following conditions for ICOT
+ #	Free Software applies to the current dictionary as well.
+ #	
+ #	Each User may also freely distribute the Program, whether in its
+ #	original form or modified, to any third party or parties, PROVIDED
+ #	that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
+ #	on, or be attached to, the Program, which is distributed substantially
+ #	in the same form as set out herein and that such intended
+ #	distribution, if actually made, will neither violate or otherwise
+ #	contravene any of the laws and regulations of the countries having
+ #	jurisdiction over the User or the intended distribution itself.
+ #	
+ #	NO WARRANTY
+ #	
+ #	The program was produced on an experimental basis in the course of the
+ #	research and development conducted during the project and is provided
+ #	to users as so produced on an experimental basis.  Accordingly, the
+ #	program is provided without any warranty whatsoever, whether express,
+ #	implied, statutory or otherwise.  The term "warranty" used herein
+ #	includes, but is not limited to, any warranty of the quality,
+ #	performance, merchantability and fitness for a particular purpose of
+ #	the program and the nonexistence of any infringement or violation of
+ #	any right of any third party.
+ #	
+ #	Each user of the program will agree and understand, and be deemed to
+ #	have agreed and understood, that there is no warranty whatsoever for
+ #	the program and, accordingly, the entire risk arising from or
+ #	otherwise connected with the program is assumed by the user.
+ #	
+ #	Therefore, neither ICOT, the copyright holder, or any other
+ #	organization that participated in or was otherwise related to the
+ #	development of the program and their respective officials, directors,
+ #	officers and other employees shall be held liable for any and all
+ #	damages, including, without limitation, general, special, incidental
+ #	and consequential damages, arising out of or otherwise in connection
+ #	with the use or inability to use the program or any product, material
+ #	or result produced or otherwise obtained by using the program,
+ #	regardless of whether they have been advised of, or otherwise had
+ #	knowledge of, the possibility of such damages at any time during the
+ #	project or thereafter.  Each user will be deemed to have agreed to the
+ #	foregoing by his or her commencement of use of the program.  The term
+ #	"use" as used herein includes, but is not limited to, the use,
+ #	modification, copying and distribution of the program and the
+ #	production of secondary products from the program.
+ #	
+ #	In the case where the program, whether in its original form or
+ #	modified, was distributed or delivered to or received by a user from
+ #	any person, organization or entity other than ICOT, unless it makes or
+ #	grants independently of ICOT any specific warranty to the user in
+ #	writing, such person, organization or entity, will also be exempted
+ #	from and not be held liable to the user for any such damages as noted
+ #	above as far as the program is concerned.
+ #	
+ #	---------------COPYING.ipadic-----END------------------------------------
+3. Time Zone Database
+ICU uses the public domain data and code derived from Time Zone Database for its time zone support. The ownership of the TZ database is explained in BCP 175: Procedure for Maintaining the Time Zone Database section 7.
+
+7.  Database Ownership
+
+   The TZ database itself is not an IETF Contribution or an IETF
+   document.  Rather it is a pre-existing and regularly updated work
+   that is in the public domain, and is intended to remain in the public
+   domain.  Therefore, BCPs 78 [RFC5378] and 79 [RFC3979] do not apply
+   to the TZ Database or contributions that individuals make to it.
+   Should any claims be made and substantiated against the TZ Database,
+   the organization that is providing the IANA Considerations defined in
+   this RFC, under the memorandum of understanding with the IETF,
+   currently ICANN, may act in accordance with all competent court
+   orders.  No ownership claims will be made by ICANN or the IETF Trust
+   on the database or the code.  Any person making a contribution to the
+   database or code waives all rights to future claims in that
+   contribution or in the TZ Database.
+
+
+
+APR 1.6.5
+APACHE PORTABLE RUNTIME SUBCOMPONENTS: 
+
+The Apache Portable Runtime includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for these subcomponents is subject to the terms and conditions
+of the following licenses. 
+
+From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
+file_io/unix/mktemp.c, strings/apr_strings.c:
+
+/* 
+ * Copyright (c) 1987, 1993, 1994
+ *      The Regents of the University of California.  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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS 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 REGENTS OR 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.
+
+From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c:
+
+/* Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+
+From dso/aix/dso.c:
+
+ *  Based on libdl (dlfcn.c/dlfcn.h) which is
+ *  Copyright (c) 1992,1993,1995,1996,1997,1988
+ *  Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany.
+ *
+ *  Not derived from licensed software.
+ *
+ *  Permission is granted to freely use, copy, modify, and redistribute
+ *  this software, provided that the author is not construed to be liable
+ *  for any results of using the software, alterations are clearly marked
+ *  as such, and this notice is not modified.
+
+From strings/apr_strnatcmp.c, include/apr_strings.h:
+
+  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
+  Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+From strings/apr_snprintf.c:
+
+  *
+  * cvt - IEEE floating point formatting routines.
+  *       Derived from UNIX V7, Copyright(C) Caldera International Inc.
+  *
+
+  Copyright(C) Caldera International Inc.  2001-2002.  All rights reserved.
+  
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  Redistributions of source code and documentation must retain the above
+  copyright notice, this list of conditions and the following disclaimer.
+
+  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.
+
+  All advertising materials mentioning features or use of this software
+  must display the following acknowledgement:
+
+     This product includes software developed or owned by  Caldera
+     International, Inc.
+
+  Neither the name of Caldera International, Inc. nor the names of other
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+  USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
+  INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS 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 CALDERA INTERNATIONAL, INC. 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.
+
+-----------------------------------------------------------------------------------
+
+For APR-Util
+
+APACHE PORTABLE RUNTIME SUBCOMPONENTS: 
+
+The Apache Portable Runtime includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses. 
+
+For the include\apr_md5.h component: 
+/*
+ * This is work is derived from material Copyright RSA Data Security, Inc.
+ *
+ * The RSA copyright statement and Licence for that original material is
+ * included below. This is followed by the Apache copyright statement and
+ * licence for the modifications made to that material.
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+   rights reserved.
+
+   License to copy and use this software is granted provided that it
+   is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+   Algorithm" in all material mentioning or referencing this software
+   or this function.
+
+   License is also granted to make and use derivative works provided
+   that such works are identified as "derived from the RSA Data
+   Security, Inc. MD5 Message-Digest Algorithm" in all material
+   mentioning or referencing the derived work.
+
+   RSA Data Security, Inc. makes no representations concerning either
+   the merchantability of this software or the suitability of this
+   software for any particular purpose. It is provided "as is"
+   without express or implied warranty of any kind.
+
+   These notices must be retained in any copies of any part of this
+   documentation and/or software.
+ */
+
+For the passwd\apr_md5.c component:
+
+/*
+ * This is work is derived from material Copyright RSA Data Security, Inc.
+ *
+ * The RSA copyright statement and Licence for that original material is
+ * included below. This is followed by the Apache copyright statement and
+ * licence for the modifications made to that material.
+ */
+
+/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+   rights reserved.
+
+   License to copy and use this software is granted provided that it
+   is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+   Algorithm" in all material mentioning or referencing this software
+   or this function.
+
+   License is also granted to make and use derivative works provided
+   that such works are identified as "derived from the RSA Data
+   Security, Inc. MD5 Message-Digest Algorithm" in all material
+   mentioning or referencing the derived work.
+
+   RSA Data Security, Inc. makes no representations concerning either
+   the merchantability of this software or the suitability of this
+   software for any particular purpose. It is provided "as is"
+   without express or implied warranty of any kind.
+
+   These notices must be retained in any copies of any part of this
+   documentation and/or software.
+ */
+/*
+ * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0
+ * MD5 crypt() function, which is licenced as follows:
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
+ * can do whatever you want with this stuff. If we meet some day, and you think
+ * this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
+ * ----------------------------------------------------------------------------
+ */
+
+For the crypto\apr_md4.c component:
+
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+ * rights reserved.
+ *
+ * License to copy and use this software is granted provided that it
+ * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
+ * Algorithm" in all material mentioning or referencing this software
+ * or this function.
+ *
+ * License is also granted to make and use derivative works provided
+ * that such works are identified as "derived from the RSA Data
+ * Security, Inc. MD4 Message-Digest Algorithm" in all material
+ * mentioning or referencing the derived work.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+For the crypto\crypt_blowfish.c(.h) component:
+
+ * Written by Solar Designer <solar at openwall.com> in 1998-2011.
+ * No copyright is claimed, and the software is hereby placed in the public
+ * domain.  In case this attempt to disclaim copyright and place the software
+ * in the public domain is deemed null and void, then the software is
+ * Copyright (c) 1998-2011 Solar Designer and it is hereby released to the
+ * general public under the following terms:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+
+ See crypto/crypt_blowfish.c for more information.
+
+For the include\apr_md4.h component:
+
+ *
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+ * rights reserved.
+ *
+ * License to copy and use this software is granted provided that it
+ * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
+ * Algorithm" in all material mentioning or referencing this software
+ * or this function.
+ *
+ * License is also granted to make and use derivative works provided
+ * that such works are identified as "derived from the RSA Data
+ * Security, Inc. MD4 Message-Digest Algorithm" in all material
+ * mentioning or referencing the derived work.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+For the test\testmd4.c component:
+
+ *
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
+ * rights reserved.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+For the xml\expat\conftools\install-sh component:
+
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
+
+For the expat xml parser component:
+
+Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+                               and Clark Cooper
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+	
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+	
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====================================================================
+
+For the ldap/apr_ldap_url.c component:
+
+/* Portions Copyright 1998-2002 The OpenLDAP Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.  A copy of this license is available at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
+ *
+ * OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+ *
+ * Individual files and/or contributed packages may be copyright by
+ * other parties and subject to additional restrictions.
+ *
+ * This work is derived from the University of Michigan LDAP v3.3
+ * distribution.  Information concerning this software is available
+ * at: http://www.umich.edu/~dirsvcs/ldap/
+ *
+ * This work also contains materials derived from public sources.
+ *
+ * Additional information about OpenLDAP can be obtained at:
+ *     http://www.openldap.org/
+ */
+
+/*
+ * Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+
diff --git a/NOTICE b/NOTICE
index ee078c7..f0383da 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,12 +1,12 @@
-Apache UIMA C++

-Copyright 2007, 2009, 2012 The Apache Software Foundation

-

-This product includes software developed at

-The Apache Software Foundation (http://www.apache.org/).

-

-Portions of UIMACPP were originally developed by

-International Business Machines Corporation and are

-licensed to the Apache Software Foundation under the

-"Software Grant License Agreement", informally known as the 

-"IBM UIMA License Agreement".

-Copyright (c) 2003, 2007 IBM Corporation.

+Apache UIMA C++
+Copyright 2007, 2009, 2012 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of UIMACPP were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant License Agreement", informally known as the 
+"IBM UIMA License Agreement".
+Copyright (c) 2003, 2007 IBM Corporation.
diff --git a/NOTICE.4bin b/NOTICE.4bin
index 20d0ac0..b7e25e0 100644
--- a/NOTICE.4bin
+++ b/NOTICE.4bin
@@ -1,63 +1,63 @@
-Apache UIMA C++

-Copyright 2006 The Apache Software Foundation

-

-This product includes software developed at

-The Apache Software Foundation (http://www.apache.org/).

-

-Portions of UIMACPP were originally developed by

-International Business Machines Corporation and are

-licensed to the Apache Software Foundation under the

-"Software Grant License Agreement", informally known as the

-"IBM UIMA License Agreement".

-Copyright (c) 2003, 2007 IBM Corporation.

-

----------------------

-This product includes the software, International Components for

-Unicode, ICU (http://www.icu-project.org). Copyright (c) 1995-2006

-International Business Machines Corporation and others.

-

----------------------

-This product includes the software, Apache Portable Runtime 1.6.5

-Copyright (c) 2000-2018 The Apache Software Foundation.

-

-This product includes software developed at

-The Apache Software Foundation (http://www.apache.org/).

-

-Portions of this software were developed at the National Center

-for Supercomputing Applications (NCSA) at the University of

-Illinois at Urbana-Champaign.

-

-This software contains code derived from the RSA Data Security

-Inc. MD5 Message-Digest Algorithm.

-

-This software contains code derived from UNIX V7, Copyright(C)

-Caldera International Inc.

-

----------------------

-This product includes the software, Apache Xerces 

-Portions of this software were originally based on the following:

-     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. 

-

----------------------

-This product includes the software Apache ActiveMQ CPP 3.9.3

-=========================================================================

-==  ZLib Compression / Decompression Library Notice                    ==

-=========================================================================

-This product includes software developed by the Jean-loup Gailly and Mark Adler

-http://www.zlib.net/

-

----------------------

-This product includes the software Apache Portable Runtime Utility Library 1.6.1

-Copyright (c) 2000-2016 The Apache Software Foundation.

-

-This product includes software developed at

-The Apache Software Foundation (http://www.apache.org/).

-

-Portions of this software were developed at the National Center

-for Supercomputing Applications (NCSA) at the University of

-Illinois at Urbana-Champaign.

-

-This software contains code derived from the RSA Data Security

-Inc. MD5 Message-Digest Algorithm, including various

-modifications by Spyglass Inc., Carnegie Mellon University, and

-Bell Communications Research, Inc (Bellcore).

+Apache UIMA C++
+Copyright 2006 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of UIMACPP were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant License Agreement", informally known as the
+"IBM UIMA License Agreement".
+Copyright (c) 2003, 2007 IBM Corporation.
+
+---------------------
+This product includes the software, International Components for
+Unicode, ICU (http://www.icu-project.org). Copyright (c) 1995-2006
+International Business Machines Corporation and others.
+
+---------------------
+This product includes the software, Apache Portable Runtime 1.6.5
+Copyright (c) 2000-2018 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at the National Center
+for Supercomputing Applications (NCSA) at the University of
+Illinois at Urbana-Champaign.
+
+This software contains code derived from the RSA Data Security
+Inc. MD5 Message-Digest Algorithm.
+
+This software contains code derived from UNIX V7, Copyright(C)
+Caldera International Inc.
+
+---------------------
+This product includes the software, Apache Xerces 
+Portions of this software were originally based on the following:
+     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. 
+
+---------------------
+This product includes the software Apache ActiveMQ CPP 3.9.3
+=========================================================================
+==  ZLib Compression / Decompression Library Notice                    ==
+=========================================================================
+This product includes software developed by the Jean-loup Gailly and Mark Adler
+http://www.zlib.net/
+
+---------------------
+This product includes the software Apache Portable Runtime Utility Library 1.6.1
+Copyright (c) 2000-2016 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at the National Center
+for Supercomputing Applications (NCSA) at the University of
+Illinois at Urbana-Champaign.
+
+This software contains code derived from the RSA Data Security
+Inc. MD5 Message-Digest Algorithm, including various
+modifications by Spyglass Inc., Carnegie Mellon University, and
+Bell Communications Research, Inc (Bellcore).
diff --git a/buildSrcTree.cmd b/buildSrcTree.cmd
index f0eb82e..1d8703a 100644
--- a/buildSrcTree.cmd
+++ b/buildSrcTree.cmd
@@ -1,179 +1,179 @@
-@ECHO OFF

-SETLOCAL

-

-REM   Licensed to the Apache Software Foundation (ASF) under one

-REM   or more contributor license agreements.  See the NOTICE file

-REM   distributed with this work for additional information

-REM   regarding copyright ownership.  The ASF licenses this file

-REM   to you under the Apache License, Version 2.0 (the

-REM   "License"); you may not use this file except in compliance

-REM   with the License.  You may obtain a copy of the License at

-REM

-REM    http://www.apache.org/licenses/LICENSE-2.0

-REM

-REM   Unless required by applicable law or agreed to in writing,

-REM   software distributed under the License is distributed on an

-REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-REM   KIND, either express or implied.  See the License for the

-REM   specific language governing permissions and limitations

-REM   under the License.

-

-REM For now, update version in line below

-set srcName=uimacpp-3.0.0

-

-REM check args

-if "%~1" == "" (

-	echo ERROR: target directory for source tree not specified

-	echo ------

-	echo Usage: buildSrcTree targetDirectory [clean]

-	echo        Builds %srcName% source tree for distribution

-	echo assumes: current directory is the root of svn extract

-	echo expects: target directory to be non-existant

-	echo ------

-	goto error

-)

-

-set TARGET_DIR=%1\%srcName%

-

-if "%2" == "clean" (

-  rmdir %TARGET_DIR% /s /q

-)

-

-if exist %TARGET_DIR% (

-	echo ERROR: directory %TARGET_DIR% already exists

-	echo use "clean" option

-	goto error

-)

-echo Target source tree directory is %TARGET_DIR%

-

-set UIMACPP_SOURCE=%CD%

-if not exist %UIMACPP_SOURCE%\src (

-	echo ERROR: current directory is not root of UIMACPP source tree

-	goto error

-)

-

-mkdir %TARGET_DIR%

-mkdir %TARGET_DIR%\data

-mkdir %TARGET_DIR%\docs

-mkdir %TARGET_DIR%\src

-mkdir %TARGET_DIR%\src\cas

-mkdir %TARGET_DIR%\src\cas\uima

-mkdir %TARGET_DIR%\src\framework

-mkdir %TARGET_DIR%\src\framework\uima

-mkdir %TARGET_DIR%\src\jni

-mkdir %TARGET_DIR%\src\jni\uima

-mkdir %TARGET_DIR%\src\utils

-mkdir %TARGET_DIR%\src\test

-mkdir %TARGET_DIR%\src\test\data

-mkdir %TARGET_DIR%\src\test\data\descriptors

-mkdir %TARGET_DIR%\src\test\data\ExampleCas

-mkdir %TARGET_DIR%\src\test\data\segmenterinput

-mkdir %TARGET_DIR%\src\test\src

-mkdir %TARGET_DIR%\src\test\src\uima

-

-mkdir %TARGET_DIR%\examples

-mkdir %TARGET_DIR%\examples\data

-mkdir %TARGET_DIR%\examples\descriptors

-mkdir %TARGET_DIR%\examples\src

-mkdir %TARGET_DIR%\examples\run_configuration

-mkdir %TARGET_DIR%\examples\tutorial

-mkdir %TARGET_DIR%\examples\tutorial\src

-mkdir %TARGET_DIR%\examples\tutorial\descriptors

-mkdir %TARGET_DIR%\scriptators

-mkdir %TARGET_DIR%\scriptators\perl

-mkdir %TARGET_DIR%\scriptators\python

-mkdir %TARGET_DIR%\scriptators\tcl

-

-echo.

-echo copying from %UIMACPP_SOURCE%

-xcopy /Q %UIMACPP_SOURCE%\buildsdk.cmd %TARGET_DIR%

-xcopy /Q %UIMACPP_SOURCE%\NOTICE %TARGET_DIR%

-xcopy /Q %UIMACPP_SOURCE%\LICENSE %TARGET_DIR%

-xcopy /Q %UIMACPP_SOURCE%\RELEASE_NOTES.* %TARGET_DIR%

-xcopy /Q %UIMACPP_SOURCE%\README.4src %TARGET_DIR%

-ren %TARGET_DIR%\README.4src README

-xcopy /Q %UIMACPP_SOURCE%\README.4bin %TARGET_DIR%

-xcopy /Q %UIMACPP_SOURCE%\NOTICE.4bin %TARGET_DIR%

-

-echo copying from %UIMACPP_SOURCE%\data

-xcopy /Q  %UIMACPP_SOURCE%\data\*.xsd %TARGET_DIR%\data

-

-echo copying from %UIMACPP_SOURCE%\docs

-xcopy /Q %UIMACPP_SOURCE%\docs\uimacppdocs.mak %TARGET_DIR%\docs

-xcopy /Q %UIMACPP_SOURCE%\docs\builddocs.cmd %TARGET_DIR%\docs

-xcopy /Q %UIMACPP_SOURCE%\docs\uimacpp.dox %TARGET_DIR%\docs

-xcopy /Q %UIMACPP_SOURCE%\docs\doxyheader.html %TARGET_DIR%\docs

-xcopy /Q %UIMACPP_SOURCE%\docs\overview_and_setup.html %TARGET_DIR%\docs

-

-echo copying from %UIMACPP_SOURCE%\src

-xcopy /Q %UIMACPP_SOURCE%\src\*.cmd %TARGET_DIR%\src

-xcopy /Q %UIMACPP_SOURCE%\src\*.sln %TARGET_DIR%\src

-xcopy /Q %UIMACPP_SOURCE%\src\*.bat %TARGET_DIR%\src

-xcopy /Q %UIMACPP_SOURCE%\src\*.vcproj %TARGET_DIR%\src

-

-echo copying from %UIMACPP_SOURCE%\src\cas

-xcopy /Q %UIMACPP_SOURCE%\src\cas\*.cpp %TARGET_DIR%\src\cas

-xcopy /Q %UIMACPP_SOURCE%\src\cas\uima\*.hpp %TARGET_DIR%\src\cas\uima

-xcopy /Q %UIMACPP_SOURCE%\src\cas\uima\*.inl %TARGET_DIR%\src\cas\uima

-

-echo copying from %UIMACPP_SOURCE%\src\framework

-xcopy /Q %UIMACPP_SOURCE%\src\framework\*.cpp %TARGET_DIR%\src\framework

-xcopy /Q %UIMACPP_SOURCE%\src\framework\uima\*.hpp %TARGET_DIR%\src\framework\uima

-xcopy /Q %UIMACPP_SOURCE%\src\framework\uima\*.h %TARGET_DIR%\src\framework\uima

-

-echo copying from %UIMACPP_SOURCE%\src\jni

-xcopy /Q %UIMACPP_SOURCE%\src\jni\*.cpp %TARGET_DIR%\src\jni

-xcopy /Q %UIMACPP_SOURCE%\src\jni\uima\*.hpp %TARGET_DIR%\src\jni\uima

-xcopy /Q %UIMACPP_SOURCE%\src\jni\uima\*.h %TARGET_DIR%\src\jni\uima

-

-echo copying from %UIMACPP_SOURCE%\src\test

-xcopy /Q %UIMACPP_SOURCE%\src\test\*.sln %TARGET_DIR%\src\test

-xcopy /Q %UIMACPP_SOURCE%\src\test\*.bat %TARGET_DIR%\src\test

-xcopy /Q %UIMACPP_SOURCE%\src\test\fvtTestfile %TARGET_DIR%\src\test

-xcopy /Q %UIMACPP_SOURCE%\src\test\fvtTestfile.debug %TARGET_DIR%\src\test

-xcopy /Q %UIMACPP_SOURCE%\src\test\data\*.* %TARGET_DIR%\src\test\data

-xcopy /Q %UIMACPP_SOURCE%\src\test\data\segmenterinput\*.* %TARGET_DIR%\src\test\data\segmenterinput

-xcopy /Q %UIMACPP_SOURCE%\src\test\data\ExampleCas\*.* %TARGET_DIR%\src\test\data\ExampleCas

-xcopy /Q %UIMACPP_SOURCE%\src\test\data\descriptors\*.* %TARGET_DIR%\src\test\data\descriptors

-xcopy /Q %UIMACPP_SOURCE%\src\test\src\*.cpp %TARGET_DIR%\src\test\src

-xcopy /Q %UIMACPP_SOURCE%\src\test\src\*.vcproj %TARGET_DIR%\src\test\src

-xcopy /Q %UIMACPP_SOURCE%\src\test\src\uima\*.hpp %TARGET_DIR%\src\test\src\uima

-

-echo copying from %UIMACPP_SOURCE%\src\utils

-xcopy /Q %UIMACPP_SOURCE%\src\utils\*.cpp %TARGET_DIR%\src\utils

-xcopy /Q %UIMACPP_SOURCE%\src\utils\*.hpp %TARGET_DIR%\src\utils

-

-echo copying from %UIMACPP_SOURCE%\examples

-xcopy /Q %UIMACPP_SOURCE%\examples\run_configuration %TARGET_DIR%\examples\run_configuration

-xcopy /Q %UIMACPP_SOURCE%\examples\.project %TARGET_DIR%\examples

-xcopy /Q %UIMACPP_SOURCE%\examples\.cdtproject %TARGET_DIR%\examples

-xcopy /Q %UIMACPP_SOURCE%\examples\*.cmd %TARGET_DIR%\examples

-xcopy /Q %UIMACPP_SOURCE%\examples\*.html %TARGET_DIR%\examples

-xcopy /Q %UIMACPP_SOURCE%\examples\data\*.* %TARGET_DIR%\examples\data

-xcopy /Q %UIMACPP_SOURCE%\examples\descriptors\*.xml %TARGET_DIR%\examples\descriptors

-xcopy /Q %UIMACPP_SOURCE%\examples\src\*.cpp %TARGET_DIR%\examples\src

-xcopy /Q %UIMACPP_SOURCE%\examples\src\*.sln %TARGET_DIR%\examples\src

-xcopy /Q %UIMACPP_SOURCE%\examples\src\*.vcproj %TARGET_DIR%\examples\src

-xcopy /Q %UIMACPP_SOURCE%\examples\tutorial\*.* %TARGET_DIR%\examples\tutorial

-xcopy /Q %UIMACPP_SOURCE%\examples\tutorial\descriptors\*.xml %TARGET_DIR%\examples\tutorial\descriptors

-xcopy /Q %UIMACPP_SOURCE%\examples\tutorial\src\*.vcproj %TARGET_DIR%\examples\tutorial\src

-

-echo copying from %UIMACPP_SOURCE%\scriptators

-xcopy /Q %UIMACPP_SOURCE%\scriptators\*.* %TARGET_DIR%\scriptators

-xcopy /Q %UIMACPP_SOURCE%\scriptators\perl\*.* %TARGET_DIR%\scriptators\perl

-del %TARGET_DIR%\scriptators\perl\Makefile

-xcopy /Q %UIMACPP_SOURCE%\scriptators\python\*.* %TARGET_DIR%\scriptators\python

-del %TARGET_DIR%\scriptators\python\Makefile

-xcopy /Q %UIMACPP_SOURCE%\scriptators\tcl\*.* %TARGET_DIR%\scriptators\tcl

-del %TARGET_DIR%\scriptators\tcl\Makefile

-

-echo cleaning the target tree

-for /R %TARGET_DIR% %%d in (.) do del %%d\*~ 2> NUL

-

-echo DONE ... Source image created in %TARGET_DIR%

-goto end

-

-:error

-	echo FAILED: UIMA C++ source tree was not built.

-

-:end

+@ECHO OFF
+SETLOCAL
+
+REM   Licensed to the Apache Software Foundation (ASF) under one
+REM   or more contributor license agreements.  See the NOTICE file
+REM   distributed with this work for additional information
+REM   regarding copyright ownership.  The ASF licenses this file
+REM   to you under the Apache License, Version 2.0 (the
+REM   "License"); you may not use this file except in compliance
+REM   with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM   Unless required by applicable law or agreed to in writing,
+REM   software distributed under the License is distributed on an
+REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM   KIND, either express or implied.  See the License for the
+REM   specific language governing permissions and limitations
+REM   under the License.
+
+REM For now, update version in line below
+set srcName=uimacpp-3.0.0
+
+REM check args
+if "%~1" == "" (
+	echo ERROR: target directory for source tree not specified
+	echo ------
+	echo Usage: buildSrcTree targetDirectory [clean]
+	echo        Builds %srcName% source tree for distribution
+	echo assumes: current directory is the root of svn extract
+	echo expects: target directory to be non-existant
+	echo ------
+	goto error
+)
+
+set TARGET_DIR=%1\%srcName%
+
+if "%2" == "clean" (
+  rmdir %TARGET_DIR% /s /q
+)
+
+if exist %TARGET_DIR% (
+	echo ERROR: directory %TARGET_DIR% already exists
+	echo use "clean" option
+	goto error
+)
+echo Target source tree directory is %TARGET_DIR%
+
+set UIMACPP_SOURCE=%CD%
+if not exist %UIMACPP_SOURCE%\src (
+	echo ERROR: current directory is not root of UIMACPP source tree
+	goto error
+)
+
+mkdir %TARGET_DIR%
+mkdir %TARGET_DIR%\data
+mkdir %TARGET_DIR%\docs
+mkdir %TARGET_DIR%\src
+mkdir %TARGET_DIR%\src\cas
+mkdir %TARGET_DIR%\src\cas\uima
+mkdir %TARGET_DIR%\src\framework
+mkdir %TARGET_DIR%\src\framework\uima
+mkdir %TARGET_DIR%\src\jni
+mkdir %TARGET_DIR%\src\jni\uima
+mkdir %TARGET_DIR%\src\utils
+mkdir %TARGET_DIR%\src\test
+mkdir %TARGET_DIR%\src\test\data
+mkdir %TARGET_DIR%\src\test\data\descriptors
+mkdir %TARGET_DIR%\src\test\data\ExampleCas
+mkdir %TARGET_DIR%\src\test\data\segmenterinput
+mkdir %TARGET_DIR%\src\test\src
+mkdir %TARGET_DIR%\src\test\src\uima
+
+mkdir %TARGET_DIR%\examples
+mkdir %TARGET_DIR%\examples\data
+mkdir %TARGET_DIR%\examples\descriptors
+mkdir %TARGET_DIR%\examples\src
+mkdir %TARGET_DIR%\examples\run_configuration
+mkdir %TARGET_DIR%\examples\tutorial
+mkdir %TARGET_DIR%\examples\tutorial\src
+mkdir %TARGET_DIR%\examples\tutorial\descriptors
+mkdir %TARGET_DIR%\scriptators
+mkdir %TARGET_DIR%\scriptators\perl
+mkdir %TARGET_DIR%\scriptators\python
+mkdir %TARGET_DIR%\scriptators\tcl
+
+echo.
+echo copying from %UIMACPP_SOURCE%
+xcopy /Q %UIMACPP_SOURCE%\buildsdk.cmd %TARGET_DIR%
+xcopy /Q %UIMACPP_SOURCE%\NOTICE %TARGET_DIR%
+xcopy /Q %UIMACPP_SOURCE%\LICENSE %TARGET_DIR%
+xcopy /Q %UIMACPP_SOURCE%\RELEASE_NOTES.* %TARGET_DIR%
+xcopy /Q %UIMACPP_SOURCE%\README.4src %TARGET_DIR%
+ren %TARGET_DIR%\README.4src README
+xcopy /Q %UIMACPP_SOURCE%\README.4bin %TARGET_DIR%
+xcopy /Q %UIMACPP_SOURCE%\NOTICE.4bin %TARGET_DIR%
+
+echo copying from %UIMACPP_SOURCE%\data
+xcopy /Q  %UIMACPP_SOURCE%\data\*.xsd %TARGET_DIR%\data
+
+echo copying from %UIMACPP_SOURCE%\docs
+xcopy /Q %UIMACPP_SOURCE%\docs\uimacppdocs.mak %TARGET_DIR%\docs
+xcopy /Q %UIMACPP_SOURCE%\docs\builddocs.cmd %TARGET_DIR%\docs
+xcopy /Q %UIMACPP_SOURCE%\docs\uimacpp.dox %TARGET_DIR%\docs
+xcopy /Q %UIMACPP_SOURCE%\docs\doxyheader.html %TARGET_DIR%\docs
+xcopy /Q %UIMACPP_SOURCE%\docs\overview_and_setup.html %TARGET_DIR%\docs
+
+echo copying from %UIMACPP_SOURCE%\src
+xcopy /Q %UIMACPP_SOURCE%\src\*.cmd %TARGET_DIR%\src
+xcopy /Q %UIMACPP_SOURCE%\src\*.sln %TARGET_DIR%\src
+xcopy /Q %UIMACPP_SOURCE%\src\*.bat %TARGET_DIR%\src
+xcopy /Q %UIMACPP_SOURCE%\src\*.vcproj %TARGET_DIR%\src
+
+echo copying from %UIMACPP_SOURCE%\src\cas
+xcopy /Q %UIMACPP_SOURCE%\src\cas\*.cpp %TARGET_DIR%\src\cas
+xcopy /Q %UIMACPP_SOURCE%\src\cas\uima\*.hpp %TARGET_DIR%\src\cas\uima
+xcopy /Q %UIMACPP_SOURCE%\src\cas\uima\*.inl %TARGET_DIR%\src\cas\uima
+
+echo copying from %UIMACPP_SOURCE%\src\framework
+xcopy /Q %UIMACPP_SOURCE%\src\framework\*.cpp %TARGET_DIR%\src\framework
+xcopy /Q %UIMACPP_SOURCE%\src\framework\uima\*.hpp %TARGET_DIR%\src\framework\uima
+xcopy /Q %UIMACPP_SOURCE%\src\framework\uima\*.h %TARGET_DIR%\src\framework\uima
+
+echo copying from %UIMACPP_SOURCE%\src\jni
+xcopy /Q %UIMACPP_SOURCE%\src\jni\*.cpp %TARGET_DIR%\src\jni
+xcopy /Q %UIMACPP_SOURCE%\src\jni\uima\*.hpp %TARGET_DIR%\src\jni\uima
+xcopy /Q %UIMACPP_SOURCE%\src\jni\uima\*.h %TARGET_DIR%\src\jni\uima
+
+echo copying from %UIMACPP_SOURCE%\src\test
+xcopy /Q %UIMACPP_SOURCE%\src\test\*.sln %TARGET_DIR%\src\test
+xcopy /Q %UIMACPP_SOURCE%\src\test\*.bat %TARGET_DIR%\src\test
+xcopy /Q %UIMACPP_SOURCE%\src\test\fvtTestfile %TARGET_DIR%\src\test
+xcopy /Q %UIMACPP_SOURCE%\src\test\fvtTestfile.debug %TARGET_DIR%\src\test
+xcopy /Q %UIMACPP_SOURCE%\src\test\data\*.* %TARGET_DIR%\src\test\data
+xcopy /Q %UIMACPP_SOURCE%\src\test\data\segmenterinput\*.* %TARGET_DIR%\src\test\data\segmenterinput
+xcopy /Q %UIMACPP_SOURCE%\src\test\data\ExampleCas\*.* %TARGET_DIR%\src\test\data\ExampleCas
+xcopy /Q %UIMACPP_SOURCE%\src\test\data\descriptors\*.* %TARGET_DIR%\src\test\data\descriptors
+xcopy /Q %UIMACPP_SOURCE%\src\test\src\*.cpp %TARGET_DIR%\src\test\src
+xcopy /Q %UIMACPP_SOURCE%\src\test\src\*.vcproj %TARGET_DIR%\src\test\src
+xcopy /Q %UIMACPP_SOURCE%\src\test\src\uima\*.hpp %TARGET_DIR%\src\test\src\uima
+
+echo copying from %UIMACPP_SOURCE%\src\utils
+xcopy /Q %UIMACPP_SOURCE%\src\utils\*.cpp %TARGET_DIR%\src\utils
+xcopy /Q %UIMACPP_SOURCE%\src\utils\*.hpp %TARGET_DIR%\src\utils
+
+echo copying from %UIMACPP_SOURCE%\examples
+xcopy /Q %UIMACPP_SOURCE%\examples\run_configuration %TARGET_DIR%\examples\run_configuration
+xcopy /Q %UIMACPP_SOURCE%\examples\.project %TARGET_DIR%\examples
+xcopy /Q %UIMACPP_SOURCE%\examples\.cdtproject %TARGET_DIR%\examples
+xcopy /Q %UIMACPP_SOURCE%\examples\*.cmd %TARGET_DIR%\examples
+xcopy /Q %UIMACPP_SOURCE%\examples\*.html %TARGET_DIR%\examples
+xcopy /Q %UIMACPP_SOURCE%\examples\data\*.* %TARGET_DIR%\examples\data
+xcopy /Q %UIMACPP_SOURCE%\examples\descriptors\*.xml %TARGET_DIR%\examples\descriptors
+xcopy /Q %UIMACPP_SOURCE%\examples\src\*.cpp %TARGET_DIR%\examples\src
+xcopy /Q %UIMACPP_SOURCE%\examples\src\*.sln %TARGET_DIR%\examples\src
+xcopy /Q %UIMACPP_SOURCE%\examples\src\*.vcproj %TARGET_DIR%\examples\src
+xcopy /Q %UIMACPP_SOURCE%\examples\tutorial\*.* %TARGET_DIR%\examples\tutorial
+xcopy /Q %UIMACPP_SOURCE%\examples\tutorial\descriptors\*.xml %TARGET_DIR%\examples\tutorial\descriptors
+xcopy /Q %UIMACPP_SOURCE%\examples\tutorial\src\*.vcproj %TARGET_DIR%\examples\tutorial\src
+
+echo copying from %UIMACPP_SOURCE%\scriptators
+xcopy /Q %UIMACPP_SOURCE%\scriptators\*.* %TARGET_DIR%\scriptators
+xcopy /Q %UIMACPP_SOURCE%\scriptators\perl\*.* %TARGET_DIR%\scriptators\perl
+del %TARGET_DIR%\scriptators\perl\Makefile
+xcopy /Q %UIMACPP_SOURCE%\scriptators\python\*.* %TARGET_DIR%\scriptators\python
+del %TARGET_DIR%\scriptators\python\Makefile
+xcopy /Q %UIMACPP_SOURCE%\scriptators\tcl\*.* %TARGET_DIR%\scriptators\tcl
+del %TARGET_DIR%\scriptators\tcl\Makefile
+
+echo cleaning the target tree
+for /R %TARGET_DIR% %%d in (.) do del %%d\*~ 2> NUL
+
+echo DONE ... Source image created in %TARGET_DIR%
+goto end
+
+:error
+	echo FAILED: UIMA C++ source tree was not built.
+
+:end
diff --git a/buildsdk.cmd b/buildsdk.cmd
index d6b011e..d7cb2d2 100644
--- a/buildsdk.cmd
+++ b/buildsdk.cmd
@@ -1,294 +1,294 @@
-@ECHO OFF

-SETLOCAL

-

-REM   Licensed to the Apache Software Foundation (ASF) under one

-REM   or more contributor license agreements.  See the NOTICE file

-REM   distributed with this work for additional information

-REM   regarding copyright ownership.  The ASF licenses this file

-REM   to you under the Apache License, Version 2.0 (the

-REM   "License"); you may not use this file except in compliance

-REM   with the License.  You may obtain a copy of the License at

-REM

-REM    http://www.apache.org/licenses/LICENSE-2.0

-REM

-REM   Unless required by applicable law or agreed to in writing,

-REM   software distributed under the License is distributed on an

-REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-REM   KIND, either express or implied.  See the License for the

-REM   specific language governing permissions and limitations

-REM   under the License.

-

-REM check args

-if "%~1" == "" (

-	echo ERROR: SDK target directory not specified

-	echo ------

-	echo   Usage: buildsdk targetDirectory [clean]

-	echo     Builds SDK for distribution.

-	echo     buildsdk must be run from the root of the uimacpp source tree.

-	echo     The uimacpp solution must be built and installed by running

-	echo       winmake in the src directory of the uimacpp source tree. 

-	echo     The doxygen documentation must be built by running the buildocs.cmd

-	echo       in the docs directory of the uimacpp source tree.

-	echo     Requires the following environment variables:

-	echo       APR_HOME - root of the APR install. Required.

-	echo       ICU_HOME - root of the ICU install. Required.

-	echo       XERCES_HOME - root of the XERCES install. Required.

-	echo       MSVCRT_HOME - directory with required msvc*.dll files

-	echo       ACTIVEMQ_HOME - root of the XERCES install. Optional.

-	echo     Optional environment variable:

-	echo       UIMA_INSTALL - 'install' location of uimacpp build.

-	echo                      Defaults to ./install

-	goto error

-)

-

-set TARGET_DIR=%~1%

-

-if not exist %TARGET_DIR% mkdir %TARGET_DIR%

-if not exist %TARGET_DIR% (

-	echo ERROR: Could not create %TARGET_DIR%

-	goto error

-)

-set UIMA_DIR=%TARGET_DIR%\uimacpp

-

-

-if "%APR_HOME%" == "" goto Missing

-if "%ICU_HOME%" == "" goto Missing

-if "%XERCES_HOME%" == "" goto Missing

-

-echo.

-echo SDK directory tree will be built in %UIMA_DIR%

-echo.

-REM check environment values and set default values

-set UIMA_SOURCE=%cd%

-if "%UIMA_INSTALLDIR%"=="" set UIMA_INSTALLDIR=%UIMA_SOURCE%\install

-if "%UIMA_DOCDIR%" == "" set UIMA_DOCDIR=%UIMA_SOURCE%\docs

-if "%UIMA_EXAMPLESDIR%" == "" set UIMA_EXAMPLESDIR=%UIMA_SOURCE%\examples

-if "%UIMA_SCRIPTATORSDIR%" == "" set UIMA_SCRIPTATORSDIR=%UIMA_SOURCE%\scriptators

-REM if "%UIMA_LICENSEDIR%" == "" set UIMA_LICENSEDIR=%UIMA_SOURCE%\licenses

-if "%UIMA_TESTSRCDIR%" == "" set UIMA_TESTSRCDIR=%UIMA_SOURCE%\src\test\src

-

-REM if not exist "%UIMA_INSTALLDIR%"\bin\runAECpp.exe goto uimaInstallPathInvalid

-if not exist "%UIMA_INSTALLDIR%"\include\uima\api.hpp (

-	echo ERROR: UIMA_INSTALLDIR "%UIMA_INSTALLDIR%" is invalid.

-	echo Build and install UIMA C++ first. 

-	echo 	devenv src\uimacpp.sln

-	goto error

-)

-

-if not exist "%UIMA_DOCDIR%"\html\index.html (

-	echo ERROR: UIMACPP doxygen docs not found in %UIMA_DOCDIR%

-	echo run the builddocs script in the %UIMA_DOCDIR% directory. 

-	goto error

-)

-

-if not exist "%APR_HOME%"\include (

-	echo ERROR: APR_HOME "%APR_HOME%" is invalid.

-	goto error

-)

-

-if not exist "%ICU_HOME%"\include (

-	echo ERROR: ICU_HOME "%ICU_HOME%" is invalid.

-	goto error

-)

-

-if not exist "%XERCES_HOME%"\include (

-	echo ERROR: XERCES_HOME "%XERCES_HOME%" is invalid.

-	goto error

-)

-

-if not "%MSVCRT_HOME%" == "" goto check

-

-set MSVCRT_HOME=C:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT

-echo MSVCRT_HOME undefined: trying: "%MSVCRT_HOME%"

-

-:check

-if not exist "%MSVCRT_HOME%"\msvc*.dll (

-        echo ERROR: MSVCRT_HOME "%MSVCRT_HOME%" is invalid.

-        goto error

-)

-

-if not exist "%UIMA_SCRIPTATORSDIR%"\uima.i (

-	echo ERROR: UIMA_SCRIPTATORSDIR "%UIMA_SCRIPTATORSDIR%" is invalid.

-	goto error

-)

-

-if "%2" == "clean" (

-  echo removing %UIMA_DIR%

-  rmdir %UIMA_DIR% /s /q

-)

-

-if exist %UIMA_DIR% (

-	echo ERROR: directory %UIMA_DIR% already exists. Please use "clean" option

-	goto error

-)

-

-REM Create the top-level directories

-mkdir %UIMA_DIR%

-mkdir %UIMA_DIR%\bin

-mkdir %UIMA_DIR%\lib

-mkdir %UIMA_DIR%\data

-mkdir %UIMA_DIR%\docs

-mkdir %UIMA_DIR%\include

-mkdir %UIMA_DIR%\examples

-mkdir %UIMA_DIR%\scriptators

-REM mkdir %UIMA_DIR%\licenses

-

-echo.

-echo copying from %UIMA_INSTALLDIR%...

-xcopy /Q /Y %UIMA_INSTALLDIR%\bin\uima.dll %UIMA_DIR%\bin

-xcopy /Q /Y %UIMA_INSTALLDIR%\bin\uimaD.dll %UIMA_DIR%\bin

-xcopy /Q /Y %UIMA_INSTALLDIR%\bin\runAECpp.exe %UIMA_DIR%\bin

-xcopy /Q /Y %UIMA_INSTALLDIR%\bin\runAECppD.exe %UIMA_DIR%\bin

-xcopy /Q /Y %UIMA_INSTALLDIR%\bin\deployCppService.exe %UIMA_DIR%\bin

-xcopy /Q /Y %UIMA_INSTALLDIR%\bin\deployCppServiceD.exe %UIMA_DIR%\bin

-xcopy /Q /Y %UIMA_INSTALLDIR%\data\resourceSpecifierSchema.xsd %UIMA_DIR%\data

-xcopy /Q /Y %UIMA_INSTALLDIR%\lib\uima.lib %UIMA_DIR%\lib

-xcopy /Q /Y %UIMA_INSTALLDIR%\lib\uimaD.lib %UIMA_DIR%\lib

-mkdir %UIMA_DIR%\include\uima

-xcopy /Q /Y %UIMA_INSTALLDIR%\include\uima\* %UIMA_DIR%\include\uima

-

-echo.

-echo copying from %UIMA_DOCDIR%...

-xcopy /Q /Y %UIMA_DOCDIR%\overview_and_setup.html %UIMA_DIR%\docs

-xcopy /Q /Y %UIMA_DOCDIR%\uimadoxytags.tag %UIMA_DIR%\docs

-mkdir %UIMA_DIR%\docs\html

-xcopy /Q /Y %UIMA_DOCDIR%\html\* %UIMA_DIR%\docs\html

-

-echo.

-echo copying from %UIMA_EXAMPLESDIR%...

-xcopy /Q /Y %UIMA_EXAMPLESDIR%\*.html %UIMA_DIR%\examples

-xcopy /Q /Y %UIMA_EXAMPLESDIR%\*.cmd %UIMA_DIR%\examples

-mkdir %UIMA_DIR%\examples\data

-xcopy /Q /Y %UIMA_EXAMPLESDIR%\data\* %UIMA_DIR%\examples\data

-mkdir %UIMA_DIR%\examples\descriptors

-xcopy /Q /Y %UIMA_EXAMPLESDIR%\descriptors\*.xml %UIMA_DIR%\examples\descriptors\*.xml

-mkdir %UIMA_DIR%\examples\src

-xcopy /Q /Y %UIMA_EXAMPLESDIR%\src\*.cpp %UIMA_DIR%\examples\src

-xcopy /Q /Y %UIMA_EXAMPLESDIR%\src\*.vcproj %UIMA_DIR%\examples\src

-xcopy /Q /Y %UIMA_EXAMPLESDIR%\src\*.sln %UIMA_DIR%\examples\src

-REM copy the following file separately, as it is part of the fvt suite

-xcopy /Q /Y %UIMA_TESTSRCDIR%\SofaStreamHandlerFile.cpp %UIMA_DIR%\examples\src

-xcopy /Q /Y %UIMA_TESTSRCDIR%\SimpleTextSegmenter.cpp %UIMA_DIR%\examples\src

-

-mkdir %UIMA_DIR%\examples\tutorial

-mkdir %UIMA_DIR%\examples\tutorial\descriptors

-mkdir %UIMA_DIR%\examples\tutorial\src

-xcopy /Q /Y %UIMA_EXAMPLESDIR%\tutorial\*.* %UIMA_DIR%\examples\tutorial

-xcopy /Q /Y %UIMA_EXAMPLESDIR%\tutorial\descriptors\*.xml %UIMA_DIR%\examples\tutorial\descriptors

-xcopy /Q /Y %UIMA_EXAMPLESDIR%\tutorial\src\*.vcproj %UIMA_DIR%\examples\tutorial\src

-REM copy the following files from the fvt suite

-xcopy /Q /Y %UIMA_TESTSRCDIR%\MeetingAnnotator.cpp %UIMA_DIR%\examples\tutorial\src

-

-echo.

-echo copying from %APR_HOME%...

-mkdir %UIMA_DIR%\include\apr

-xcopy /Q /Y %APR_HOME%\include\apr*.h %UIMA_DIR%\include\apr

-xcopy /Q /Y %APR_HOME%\Release\libapr-*.dll %UIMA_DIR%\bin

-xcopy /Q /Y %APR_HOME%\Release\libapr-*.lib %UIMA_DIR%\lib

-

-

-echo.

-echo copying from %ICU_HOME%...

-mkdir %UIMA_DIR%\include\unicode

-xcopy /S /Q /Y %ICU_HOME%\include\unicode %UIMA_DIR%\include\unicode

-xcopy /Q /Y %ICU_HOME%\bin\icu*.dll %UIMA_DIR%\bin

-xcopy /Q /Y %ICU_HOME%\lib\icu*.lib %UIMA_DIR%\lib

-

-echo.

-echo copying from %XERCES_HOME%...

-mkdir %UIMA_DIR%\include\xercesc

-xcopy /S /Q /Y %XERCES_HOME%\include\xercesc %UIMA_DIR%\include\xercesc

-xcopy /Q /Y %XERCES_HOME%\bin\xerces-c_*.dll %UIMA_DIR%\bin

-xcopy /Q /Y %XERCES_HOME%\lib\xerces-c_*.lib %UIMA_DIR%\lib

-del %UIMA_DIR%\bin\xerces-c*d.dll 2> NUL

-del %UIMA_DIR%\lib\xerces-c*d.lib 2> NUL

-del %UIMA_DIR%\lib\xerces-c_static* 2> NUL

-

-echo.

-echo copying MSVC redistribution libs

-xcopy /q /y "%MSVCRT_HOME%"\msvc*.dll %UIMA_DIR%\bin

-

-echo.

-echo copying the scriptators...

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\uima.i %UIMA_DIR%\scriptators

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\ThreadAnnotator.h %UIMA_DIR%\scriptators

-

-echo.

-echo copying the Perl scriptator...

-mkdir %UIMA_DIR%\scriptators\perl

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\Perl.html %UIMA_DIR%\scriptators\perl

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\Perl.html %UIMA_DIR%\docs

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\*.cpp %UIMA_DIR%\scriptators\perl

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\*.pl  %UIMA_DIR%\scriptators\perl

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\*.xml %UIMA_DIR%\scriptators\perl

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\*.vcproj %UIMA_DIR%\scriptators\perl

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\*.cmd %UIMA_DIR%\scriptators\perl

-

-echo.

-echo copying Python scriptator...

-mkdir %UIMA_DIR%\scriptators\python

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\Python.html %UIMA_DIR%\scriptators\python

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\Python.html %UIMA_DIR%\docs

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\*.cpp %UIMA_DIR%\scriptators\python

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\*.py  %UIMA_DIR%\scriptators\python

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\*.xml %UIMA_DIR%\scriptators\python

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\*.vcproj %UIMA_DIR%\scriptators\python

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\*.cmd %UIMA_DIR%\scriptators\python

-

-echo.

-echo copying Tcl scriptator...

-mkdir %UIMA_DIR%\scriptators\tcl

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\Tcl.html %UIMA_DIR%\scriptators\tcl

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\Tcl.html %UIMA_DIR%\docs

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\*.cpp %UIMA_DIR%\scriptators\tcl

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\*.tcl %UIMA_DIR%\scriptators\tcl

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\*.xml %UIMA_DIR%\scriptators\tcl

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\*.vcproj %UIMA_DIR%\scriptators\tcl

-xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\*.cmd %UIMA_DIR%\scriptators\tcl

-

-echo.

-echo copying licenses...

-

-REM copy Apache licences

-xcopy /Q /Y %UIMA_SOURCE%\NOTICE.4bin %UIMA_DIR%

-ren %UIMA_DIR%\NOTICE.4bin NOTICE

-xcopy /Q /Y %UIMA_SOURCE%\LICENSE %UIMA_DIR%

-xcopy /Q /Y %UIMA_SOURCE%\RELEASE_NOTES.* %UIMA_DIR%

-xcopy /Q /Y %UIMA_SOURCE%\README.4bin %UIMA_DIR%

-ren %UIMA_DIR%\README.4bin README

-

-REM mkdir %UIMA_DIR%\licenses\apr

-REM xcopy /Q /Y %APR_HOME%\LICENSE* %UIMA_DIR%\licenses\apr

-REM if not exist %UIMA_DIR%\licenses\icu mkdir %UIMA_DIR%\licenses\icu

-REM xcopy /Q /Y %ICU_HOME%\LICENSE* %UIMA_DIR%\licenses\icu

-REM if not exist %UIMA_DIR%\licenses\xerces mkdir %UIMA_DIR%\licenses\xerces

-REM xcopy /Q /Y %XERCES_HOME%\LICENSE* %UIMA_DIR%\licenses\xerces

-

-if not "%ACTIVEMQ_HOME%" == "" (

-  echo.

-  echo copying libaprutil and libapriconv ...

-  xcopy /Q /Y %APR_HOME%\..\apr-util\Release\libaprutil*.dll %UIMA_DIR%\bin

-  xcopy /Q /Y %APR_HOME%\..\apr-util\Release\libaprutil*.lib %UIMA_DIR%\lib

-  xcopy /Q /Y %APR_HOME%\..\apr-iconv\Release\libapriconv*.dll %UIMA_DIR%\bin

-  xcopy /Q /Y %APR_HOME%\..\apr-iconv\Release\libapriconv*.lib %UIMA_DIR%\lib

-  echo.

-  echo copying from %ACTIVEMQ_HOME%...

-  xcopy /Q /Y %ACTIVEMQ_HOME%\vs2008-build\win32\ReleaseDLL\activemq-cpp.dll %UIMA_DIR%\bin

-)

-

-echo cleaning the target tree

-for /R %UIMA_DIR% %%d in (.) do del %%d\*~ 2> NUL

-

-echo DONE SDK image in %UIMA_DIR%

-echo Please check that all copies were successful

-goto end

-

-:Missing

-echo APR_HOME and ICU_HOME and XERCES_HOME must all be specified

-echo and must contain the directories produced by their "install" builds

-goto end

-

-:error

-echo FAILED: UIMA C++ SDK was not built.

-

-:end

+@ECHO OFF
+SETLOCAL
+
+REM   Licensed to the Apache Software Foundation (ASF) under one
+REM   or more contributor license agreements.  See the NOTICE file
+REM   distributed with this work for additional information
+REM   regarding copyright ownership.  The ASF licenses this file
+REM   to you under the Apache License, Version 2.0 (the
+REM   "License"); you may not use this file except in compliance
+REM   with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM   Unless required by applicable law or agreed to in writing,
+REM   software distributed under the License is distributed on an
+REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM   KIND, either express or implied.  See the License for the
+REM   specific language governing permissions and limitations
+REM   under the License.
+
+REM check args
+if "%~1" == "" (
+	echo ERROR: SDK target directory not specified
+	echo ------
+	echo   Usage: buildsdk targetDirectory [clean]
+	echo     Builds SDK for distribution.
+	echo     buildsdk must be run from the root of the uimacpp source tree.
+	echo     The uimacpp solution must be built and installed by running
+	echo       winmake in the src directory of the uimacpp source tree. 
+	echo     The doxygen documentation must be built by running the buildocs.cmd
+	echo       in the docs directory of the uimacpp source tree.
+	echo     Requires the following environment variables:
+	echo       APR_HOME - root of the APR install. Required.
+	echo       ICU_HOME - root of the ICU install. Required.
+	echo       XERCES_HOME - root of the XERCES install. Required.
+	echo       MSVCRT_HOME - directory with required msvc*.dll files
+	echo       ACTIVEMQ_HOME - root of the XERCES install. Optional.
+	echo     Optional environment variable:
+	echo       UIMA_INSTALL - 'install' location of uimacpp build.
+	echo                      Defaults to ./install
+	goto error
+)
+
+set TARGET_DIR=%~1%
+
+if not exist %TARGET_DIR% mkdir %TARGET_DIR%
+if not exist %TARGET_DIR% (
+	echo ERROR: Could not create %TARGET_DIR%
+	goto error
+)
+set UIMA_DIR=%TARGET_DIR%\uimacpp
+
+
+if "%APR_HOME%" == "" goto Missing
+if "%ICU_HOME%" == "" goto Missing
+if "%XERCES_HOME%" == "" goto Missing
+
+echo.
+echo SDK directory tree will be built in %UIMA_DIR%
+echo.
+REM check environment values and set default values
+set UIMA_SOURCE=%cd%
+if "%UIMA_INSTALLDIR%"=="" set UIMA_INSTALLDIR=%UIMA_SOURCE%\install
+if "%UIMA_DOCDIR%" == "" set UIMA_DOCDIR=%UIMA_SOURCE%\docs
+if "%UIMA_EXAMPLESDIR%" == "" set UIMA_EXAMPLESDIR=%UIMA_SOURCE%\examples
+if "%UIMA_SCRIPTATORSDIR%" == "" set UIMA_SCRIPTATORSDIR=%UIMA_SOURCE%\scriptators
+REM if "%UIMA_LICENSEDIR%" == "" set UIMA_LICENSEDIR=%UIMA_SOURCE%\licenses
+if "%UIMA_TESTSRCDIR%" == "" set UIMA_TESTSRCDIR=%UIMA_SOURCE%\src\test\src
+
+REM if not exist "%UIMA_INSTALLDIR%"\bin\runAECpp.exe goto uimaInstallPathInvalid
+if not exist "%UIMA_INSTALLDIR%"\include\uima\api.hpp (
+	echo ERROR: UIMA_INSTALLDIR "%UIMA_INSTALLDIR%" is invalid.
+	echo Build and install UIMA C++ first. 
+	echo 	devenv src\uimacpp.sln
+	goto error
+)
+
+if not exist "%UIMA_DOCDIR%"\html\index.html (
+	echo ERROR: UIMACPP doxygen docs not found in %UIMA_DOCDIR%
+	echo run the builddocs script in the %UIMA_DOCDIR% directory. 
+	goto error
+)
+
+if not exist "%APR_HOME%"\include (
+	echo ERROR: APR_HOME "%APR_HOME%" is invalid.
+	goto error
+)
+
+if not exist "%ICU_HOME%"\include (
+	echo ERROR: ICU_HOME "%ICU_HOME%" is invalid.
+	goto error
+)
+
+if not exist "%XERCES_HOME%"\include (
+	echo ERROR: XERCES_HOME "%XERCES_HOME%" is invalid.
+	goto error
+)
+
+if not "%MSVCRT_HOME%" == "" goto check
+
+set MSVCRT_HOME=C:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT
+echo MSVCRT_HOME undefined: trying: "%MSVCRT_HOME%"
+
+:check
+if not exist "%MSVCRT_HOME%"\msvc*.dll (
+        echo ERROR: MSVCRT_HOME "%MSVCRT_HOME%" is invalid.
+        goto error
+)
+
+if not exist "%UIMA_SCRIPTATORSDIR%"\uima.i (
+	echo ERROR: UIMA_SCRIPTATORSDIR "%UIMA_SCRIPTATORSDIR%" is invalid.
+	goto error
+)
+
+if "%2" == "clean" (
+  echo removing %UIMA_DIR%
+  rmdir %UIMA_DIR% /s /q
+)
+
+if exist %UIMA_DIR% (
+	echo ERROR: directory %UIMA_DIR% already exists. Please use "clean" option
+	goto error
+)
+
+REM Create the top-level directories
+mkdir %UIMA_DIR%
+mkdir %UIMA_DIR%\bin
+mkdir %UIMA_DIR%\lib
+mkdir %UIMA_DIR%\data
+mkdir %UIMA_DIR%\docs
+mkdir %UIMA_DIR%\include
+mkdir %UIMA_DIR%\examples
+mkdir %UIMA_DIR%\scriptators
+REM mkdir %UIMA_DIR%\licenses
+
+echo.
+echo copying from %UIMA_INSTALLDIR%...
+xcopy /Q /Y %UIMA_INSTALLDIR%\bin\uima.dll %UIMA_DIR%\bin
+xcopy /Q /Y %UIMA_INSTALLDIR%\bin\uimaD.dll %UIMA_DIR%\bin
+xcopy /Q /Y %UIMA_INSTALLDIR%\bin\runAECpp.exe %UIMA_DIR%\bin
+xcopy /Q /Y %UIMA_INSTALLDIR%\bin\runAECppD.exe %UIMA_DIR%\bin
+xcopy /Q /Y %UIMA_INSTALLDIR%\bin\deployCppService.exe %UIMA_DIR%\bin
+xcopy /Q /Y %UIMA_INSTALLDIR%\bin\deployCppServiceD.exe %UIMA_DIR%\bin
+xcopy /Q /Y %UIMA_INSTALLDIR%\data\resourceSpecifierSchema.xsd %UIMA_DIR%\data
+xcopy /Q /Y %UIMA_INSTALLDIR%\lib\uima.lib %UIMA_DIR%\lib
+xcopy /Q /Y %UIMA_INSTALLDIR%\lib\uimaD.lib %UIMA_DIR%\lib
+mkdir %UIMA_DIR%\include\uima
+xcopy /Q /Y %UIMA_INSTALLDIR%\include\uima\* %UIMA_DIR%\include\uima
+
+echo.
+echo copying from %UIMA_DOCDIR%...
+xcopy /Q /Y %UIMA_DOCDIR%\overview_and_setup.html %UIMA_DIR%\docs
+xcopy /Q /Y %UIMA_DOCDIR%\uimadoxytags.tag %UIMA_DIR%\docs
+mkdir %UIMA_DIR%\docs\html
+xcopy /Q /Y %UIMA_DOCDIR%\html\* %UIMA_DIR%\docs\html
+
+echo.
+echo copying from %UIMA_EXAMPLESDIR%...
+xcopy /Q /Y %UIMA_EXAMPLESDIR%\*.html %UIMA_DIR%\examples
+xcopy /Q /Y %UIMA_EXAMPLESDIR%\*.cmd %UIMA_DIR%\examples
+mkdir %UIMA_DIR%\examples\data
+xcopy /Q /Y %UIMA_EXAMPLESDIR%\data\* %UIMA_DIR%\examples\data
+mkdir %UIMA_DIR%\examples\descriptors
+xcopy /Q /Y %UIMA_EXAMPLESDIR%\descriptors\*.xml %UIMA_DIR%\examples\descriptors\*.xml
+mkdir %UIMA_DIR%\examples\src
+xcopy /Q /Y %UIMA_EXAMPLESDIR%\src\*.cpp %UIMA_DIR%\examples\src
+xcopy /Q /Y %UIMA_EXAMPLESDIR%\src\*.vcproj %UIMA_DIR%\examples\src
+xcopy /Q /Y %UIMA_EXAMPLESDIR%\src\*.sln %UIMA_DIR%\examples\src
+REM copy the following file separately, as it is part of the fvt suite
+xcopy /Q /Y %UIMA_TESTSRCDIR%\SofaStreamHandlerFile.cpp %UIMA_DIR%\examples\src
+xcopy /Q /Y %UIMA_TESTSRCDIR%\SimpleTextSegmenter.cpp %UIMA_DIR%\examples\src
+
+mkdir %UIMA_DIR%\examples\tutorial
+mkdir %UIMA_DIR%\examples\tutorial\descriptors
+mkdir %UIMA_DIR%\examples\tutorial\src
+xcopy /Q /Y %UIMA_EXAMPLESDIR%\tutorial\*.* %UIMA_DIR%\examples\tutorial
+xcopy /Q /Y %UIMA_EXAMPLESDIR%\tutorial\descriptors\*.xml %UIMA_DIR%\examples\tutorial\descriptors
+xcopy /Q /Y %UIMA_EXAMPLESDIR%\tutorial\src\*.vcproj %UIMA_DIR%\examples\tutorial\src
+REM copy the following files from the fvt suite
+xcopy /Q /Y %UIMA_TESTSRCDIR%\MeetingAnnotator.cpp %UIMA_DIR%\examples\tutorial\src
+
+echo.
+echo copying from %APR_HOME%...
+mkdir %UIMA_DIR%\include\apr
+xcopy /Q /Y %APR_HOME%\include\apr*.h %UIMA_DIR%\include\apr
+xcopy /Q /Y %APR_HOME%\Release\libapr-*.dll %UIMA_DIR%\bin
+xcopy /Q /Y %APR_HOME%\Release\libapr-*.lib %UIMA_DIR%\lib
+
+
+echo.
+echo copying from %ICU_HOME%...
+mkdir %UIMA_DIR%\include\unicode
+xcopy /S /Q /Y %ICU_HOME%\include\unicode %UIMA_DIR%\include\unicode
+xcopy /Q /Y %ICU_HOME%\bin\icu*.dll %UIMA_DIR%\bin
+xcopy /Q /Y %ICU_HOME%\lib\icu*.lib %UIMA_DIR%\lib
+
+echo.
+echo copying from %XERCES_HOME%...
+mkdir %UIMA_DIR%\include\xercesc
+xcopy /S /Q /Y %XERCES_HOME%\include\xercesc %UIMA_DIR%\include\xercesc
+xcopy /Q /Y %XERCES_HOME%\bin\xerces-c_*.dll %UIMA_DIR%\bin
+xcopy /Q /Y %XERCES_HOME%\lib\xerces-c_*.lib %UIMA_DIR%\lib
+del %UIMA_DIR%\bin\xerces-c*d.dll 2> NUL
+del %UIMA_DIR%\lib\xerces-c*d.lib 2> NUL
+del %UIMA_DIR%\lib\xerces-c_static* 2> NUL
+
+echo.
+echo copying MSVC redistribution libs
+xcopy /q /y "%MSVCRT_HOME%"\msvc*.dll %UIMA_DIR%\bin
+
+echo.
+echo copying the scriptators...
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\uima.i %UIMA_DIR%\scriptators
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\ThreadAnnotator.h %UIMA_DIR%\scriptators
+
+echo.
+echo copying the Perl scriptator...
+mkdir %UIMA_DIR%\scriptators\perl
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\Perl.html %UIMA_DIR%\scriptators\perl
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\Perl.html %UIMA_DIR%\docs
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\*.cpp %UIMA_DIR%\scriptators\perl
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\*.pl  %UIMA_DIR%\scriptators\perl
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\*.xml %UIMA_DIR%\scriptators\perl
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\*.vcproj %UIMA_DIR%\scriptators\perl
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\perl\*.cmd %UIMA_DIR%\scriptators\perl
+
+echo.
+echo copying Python scriptator...
+mkdir %UIMA_DIR%\scriptators\python
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\Python.html %UIMA_DIR%\scriptators\python
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\Python.html %UIMA_DIR%\docs
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\*.cpp %UIMA_DIR%\scriptators\python
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\*.py  %UIMA_DIR%\scriptators\python
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\*.xml %UIMA_DIR%\scriptators\python
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\*.vcproj %UIMA_DIR%\scriptators\python
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\python\*.cmd %UIMA_DIR%\scriptators\python
+
+echo.
+echo copying Tcl scriptator...
+mkdir %UIMA_DIR%\scriptators\tcl
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\Tcl.html %UIMA_DIR%\scriptators\tcl
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\Tcl.html %UIMA_DIR%\docs
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\*.cpp %UIMA_DIR%\scriptators\tcl
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\*.tcl %UIMA_DIR%\scriptators\tcl
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\*.xml %UIMA_DIR%\scriptators\tcl
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\*.vcproj %UIMA_DIR%\scriptators\tcl
+xcopy /Q /Y %UIMA_SCRIPTATORSDIR%\tcl\*.cmd %UIMA_DIR%\scriptators\tcl
+
+echo.
+echo copying licenses...
+
+REM copy Apache licences
+xcopy /Q /Y %UIMA_SOURCE%\NOTICE.4bin %UIMA_DIR%
+ren %UIMA_DIR%\NOTICE.4bin NOTICE
+xcopy /Q /Y %UIMA_SOURCE%\LICENSE %UIMA_DIR%
+xcopy /Q /Y %UIMA_SOURCE%\RELEASE_NOTES.* %UIMA_DIR%
+xcopy /Q /Y %UIMA_SOURCE%\README.4bin %UIMA_DIR%
+ren %UIMA_DIR%\README.4bin README
+
+REM mkdir %UIMA_DIR%\licenses\apr
+REM xcopy /Q /Y %APR_HOME%\LICENSE* %UIMA_DIR%\licenses\apr
+REM if not exist %UIMA_DIR%\licenses\icu mkdir %UIMA_DIR%\licenses\icu
+REM xcopy /Q /Y %ICU_HOME%\LICENSE* %UIMA_DIR%\licenses\icu
+REM if not exist %UIMA_DIR%\licenses\xerces mkdir %UIMA_DIR%\licenses\xerces
+REM xcopy /Q /Y %XERCES_HOME%\LICENSE* %UIMA_DIR%\licenses\xerces
+
+if not "%ACTIVEMQ_HOME%" == "" (
+  echo.
+  echo copying libaprutil and libapriconv ...
+  xcopy /Q /Y %APR_HOME%\..\apr-util\Release\libaprutil*.dll %UIMA_DIR%\bin
+  xcopy /Q /Y %APR_HOME%\..\apr-util\Release\libaprutil*.lib %UIMA_DIR%\lib
+  xcopy /Q /Y %APR_HOME%\..\apr-iconv\Release\libapriconv*.dll %UIMA_DIR%\bin
+  xcopy /Q /Y %APR_HOME%\..\apr-iconv\Release\libapriconv*.lib %UIMA_DIR%\lib
+  echo.
+  echo copying from %ACTIVEMQ_HOME%...
+  xcopy /Q /Y %ACTIVEMQ_HOME%\vs2008-build\win32\ReleaseDLL\activemq-cpp.dll %UIMA_DIR%\bin
+)
+
+echo cleaning the target tree
+for /R %UIMA_DIR% %%d in (.) do del %%d\*~ 2> NUL
+
+echo DONE SDK image in %UIMA_DIR%
+echo Please check that all copies were successful
+goto end
+
+:Missing
+echo APR_HOME and ICU_HOME and XERCES_HOME must all be specified
+echo and must contain the directories produced by their "install" builds
+goto end
+
+:error
+echo FAILED: UIMA C++ SDK was not built.
+
+:end
diff --git a/data/resourceSpecifierSchema.xsd b/data/resourceSpecifierSchema.xsd
index eb0e57b..f22d7a8 100644
--- a/data/resourceSpecifierSchema.xsd
+++ b/data/resourceSpecifierSchema.xsd
@@ -1,620 +1,620 @@
-<?xml version="1.0" encoding="UTF-8"?>

-	<!--

-	 ***************************************************************

-	 * Licensed to the Apache Software Foundation (ASF) under one

-	 * or more contributor license agreements.  See the NOTICE file

-	 * distributed with this work for additional information

-	 * regarding copyright ownership.  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.  See the License for the

-	 * specific language governing permissions and limitations

-	 * under the License.

-	 ***************************************************************

-   -->

-<schema xmlns="http://www.w3.org/2001/XMLSchema"

-  targetNamespace="http://uima.apache.org/resourceSpecifier"

-  xmlns:rs="http://uima.apache.org/resourceSpecifier" 

-  elementFormDefault="qualified">

- 

-  <annotation>

-    <documentation xml:lang="en">

-      Schema for UIMA Resource Specifiers.  This includes Analysis Engine Descriptors,

-      Collection Processing Component Descriptors, and Service Specifiers (client descriptors).

-      CPE Descriptors are currently not covered by this schema.

-    </documentation>

-  </annotation>

-

-	<!-- Top Level Element Definitions -->

-

-	<element name="resourceSpecifier" abstract="true" />

-

-	<element name="taeDescription" substitutionGroup="rs:resourceSpecifier" type="rs:AnalysisEngineDescriptionType" />

-

-	<element name="analysisEngineDescription" substitutionGroup="rs:resourceSpecifier" type="rs:AnalysisEngineDescriptionType" />

-

-  <element name="resourceMetaData" type="rs:ResourceMetaDataType"/>

-  

-	<complexType name="AnalysisEngineDescriptionType">

-		<sequence>

-			<element name="frameworkImplementation" type="string" />

-			<element name="primitive" type="boolean" />

-			<choice>

-				<element name="annotatorImplementationName" type="rs:EnvVarType" />

-				<element name="delegateAnalysisEngineSpecifiers">

-					<complexType>

-						<sequence>

-							<element name="delegateAnalysisEngine" type="rs:DelegateAnalysisEngineType" minOccurs="0" maxOccurs="unbounded"/>

-						</sequence>

-					</complexType>

-				</element>

-			</choice>

-			<element name="flowController" type="rs:FlowControllerDeclarationType" minOccurs="0"/>

-			<element name="analysisEngineMetaData" type="rs:ProcessingResourceMetaDataType" />

-			<element name="externalResourceDependencies" type="rs:ExternalResourceDependenciesType" minOccurs="0" />

-			<element name="resourceManagerConfiguration" type="rs:ResourceManagerConfigurationType" minOccurs="0" />

-			<element name="sofaMappings" type="rs:SofaMappingsType" minOccurs="0" />

-		</sequence>

-	</complexType>

-

-

-	<element name="fileResourceSpecifier" substitutionGroup="rs:resourceSpecifier">

-		<complexType>

-			<sequence>

-				<element name="fileUrl" type="rs:EnvVarType" />

-				<element name="localCache" type="rs:EnvVarType" minOccurs="0" />

-			</sequence>

-		</complexType>

-	</element>

-

-	<element name="fileLanguageResourceSpecifier" substitutionGroup="rs:resourceSpecifier">

-		<complexType>

-			<sequence>

-				<element name="fileUrlPrefix" type="rs:EnvVarType" />

-				<element name="fileUrlSuffix" type="rs:EnvVarType" />

-			</sequence>

-		</complexType>

-	</element>

-

-	<element name="configurableDataResourceSpecifier" substitutionGroup="rs:resourceSpecifier">

-		<complexType>

-			<sequence>

-				<element name="url" type="rs:EnvVarType" />

-				<element name="resourceMetaData" type="rs:ResourceMetaDataType" />

-			</sequence>

-		</complexType>

-	</element>

-

-	<element name="typeSystemDescription" type="rs:TypeSystemDescriptionType" />

-

-	<element name="typePriorities" type="rs:TypePriorityType" />

-

-	<element name="fsIndexes" type="rs:FsIndexCollectionType" />

-	<element name="fsIndexCollection" type="rs:FsIndexCollectionType" />

-	<element name="resourceManagerConfiguration" type="rs:ResourceManagerConfigurationType" />

-

-	<!-- Type Definitions -->

-

-	<complexType name="ResourceMetaDataType">

-		<sequence>

-			<element name="name" type="rs:EnvVarType" />

-			<element name="description" type="string" minOccurs="0" />

-			<element name="version" type="string" minOccurs="0" />

-			<element name="vendor" type="string" minOccurs="0" />

-			<element name="configurationParameters" type="rs:ConfigurationParametersType" minOccurs="0" />

-			<element name="configurationParameterSettings" type="rs:ConfigurationParameterSettingsType" minOccurs="0" />

-		</sequence>

-	</complexType>

-

-	<complexType name="ProcessingResourceMetaDataType">

-		<complexContent>

-			<extension base="rs:ResourceMetaDataType">

-				<sequence>

-					<element name="flowConstraints" type="rs:FlowConstraintsType" minOccurs="0" />

-					<element name="typeSystemDescription" type="rs:TypeSystemDescriptionType" minOccurs="0" />

-					<element name="typePriorities" type="rs:TypePriorityType" minOccurs="0" />

-					<choice>

-						<element name="fsIndexes" type="rs:FsIndexCollectionType" minOccurs="0" />

-						<element name="fsIndexCollection" type="rs:FsIndexCollectionType" minOccurs="0" />

-					</choice>

-					<element name="capabilities" type="rs:CapabilitiesType" minOccurs="0"/>

-					<element name="operationalProperties" type="rs:OperationalPropertiesType" minOccurs="0"/>

-				</sequence>

-			</extension>

-		</complexContent>

-	</complexType>

-

-	<complexType name="DelegateAnalysisEngineType">

-		<choice>

-			<element ref="rs:resourceSpecifier" />

- 			<element name="import" type="rs:ImportType" />

-		</choice>

-		<attribute name="key" type="Name" />

-	</complexType>

-

-	<complexType name="FlowControllerDeclarationType">

-		<choice>

-			<element ref="rs:resourceSpecifier" />

- 			<element name="import" type="rs:ImportType" />

-		</choice>

-		<attribute name="key" type="Name" />

-	</complexType>

-	

-	<complexType name="EnvVarType" mixed="true">

-		<sequence>

-			<element name="envVarRef" type="string" minOccurs="0" maxOccurs="unbounded" />

-		</sequence>

-	</complexType>

-

-	<complexType name="FlowConstraintsType">

-		<sequence>

-			<choice minOccurs="0" maxOccurs="1">

-				<element name="fixedFlow" minOccurs="0" maxOccurs="1">

-					<complexType>

-						<sequence>

-							<element name="node" type="Name" minOccurs="0" maxOccurs="unbounded" />

-						</sequence>

-					</complexType>

-				</element>

-				<element name="capabilityLanguageFlow" minOccurs="0" maxOccurs="1">

-					<complexType>

-						<sequence>

-							<element name="node" type="Name" minOccurs="0" maxOccurs="unbounded" />

-						</sequence>

-					</complexType>

-				</element>

-			</choice>

-		</sequence>

-	</complexType>

-

-	<complexType name="ConfigurationParametersType">

-		<sequence>

-			<element name="configurationParameter" type="rs:ConfigurationParameterType" minOccurs="0" maxOccurs="unbounded" />

-			<element name="commonParameters" type="rs:CommonParametersType" minOccurs="0" maxOccurs="1" />

-			<element name="configurationGroup" type="rs:ConfigurationGroupType" minOccurs="0" maxOccurs="unbounded" />

-		</sequence>

-		<attribute name="defaultGroup" type="Name" />

-		<attribute name="searchStrategy" type="Name" />

-	</complexType>

-

-	<complexType name="CommonParametersType">

-		<sequence>

-			<element name="configurationParameter" type="rs:ConfigurationParameterType" minOccurs="0" maxOccurs="unbounded" />

-		</sequence>

-	</complexType>

-

-	<complexType name="ConfigurationGroupType">

-		<sequence>

-			<element name="configurationParameter" type="rs:ConfigurationParameterType" minOccurs="0" maxOccurs="unbounded" />

-		</sequence>

-		<attribute name="names" type="string" />

-	</complexType>

-

-	<complexType name="ConfigurationParameterType">

-		<sequence>

-			<element name="name" type="Name" />

-			<element name="description" type="string" minOccurs="0" />

-			<element name="type" type="rs:CfgParamDataType" />

-			<element name="multiValued" type="boolean" minOccurs="0" />

-			<element name="mandatory" type="boolean" minOccurs="0" />

-			<element name="overrides" minOccurs="0">

-				<complexType>

-					<choice>

-						<sequence>

-							<element name="parameter" type="string" minOccurs="0" maxOccurs="unbounded" />

-	  					</sequence>

-						<!-- Use of tag "param" is deprectated but permitted for backwards compatibility -->

-						<sequence>

-							<element name="param" type="string" minOccurs="0" maxOccurs="unbounded" />

-	  					</sequence>

-					</choice>

-				</complexType>

-			</element>

-		</sequence>

-	</complexType>

-

-	<simpleType name="CfgParamDataType">

-		<restriction base="string">

-			<enumeration value="String" />

-			<enumeration value="Integer" />

-			<enumeration value="Float" />

-			<enumeration value="Boolean" />

-		</restriction>

-	</simpleType>

-

-	<complexType name="ConfigurationParameterSettingsType">

-		<sequence>

-			<element name="nameValuePair" type="rs:NameValuePairType" minOccurs="0" maxOccurs="unbounded" />

-			<element name="settingsForGroup" type="rs:SettingsForGroupType" minOccurs="0" maxOccurs="unbounded" />

-		</sequence>

-	</complexType>

-

-	<complexType name="SettingsForGroupType">

-		<sequence>

-			<element name="nameValuePair" type="rs:NameValuePairType" minOccurs="0" maxOccurs="unbounded" />

-		</sequence>

-		<attribute name="name" type="string" />

-	</complexType>

-

-	<complexType name="NameValuePairType">

-		<sequence>

-			<element name="name" type="Name" />

-			<element name="value">

-				<complexType>

-					<group ref="rs:ValueElement" />

-				</complexType>

-			</element>

-		</sequence>

-	</complexType>

-

-	<group name="ValueElement">

-		<choice>

-			<group ref="rs:BasicValueElement" />

-			<element name="array">

-				<complexType>

-					<sequence>

-						<group ref="rs:BasicValueElement" minOccurs="0" maxOccurs="unbounded" />

-					</sequence>

-				</complexType>

-			</element>

-		</choice>

-	</group>

-

-	<group name="BasicValueElement">

-		<choice>

-			<element name="string" type="rs:EnvVarType" />

-			<element name="integer" type="int" />

-			<element name="float" type="float" />

-			<element name="boolean" type="boolean" />

-		</choice>

-	</group>

-

-	<complexType name="TypeSystemDescriptionType">

-		<all>

-			<element name="name" type="string" minOccurs="0" />

-			<element name="description" type="string" minOccurs="0" />

-			<element name="version" type="string" minOccurs="0" />

-			<element name="vendor" type="string" minOccurs="0" />

-			<element name="imports" type="rs:ImportSequenceType" minOccurs="0" />

-			<element name="types" minOccurs="0">

-				<complexType>

-					<sequence>

-						<element name="typeDescription" type="rs:TypeDescriptionType" minOccurs="0" maxOccurs="unbounded" />

-					</sequence>

-				</complexType>

-			</element>

-		</all>

-	</complexType>

-

-	<complexType name="ImportSequenceType">

-		<sequence>

-			<element name="import" type="rs:ImportType" minOccurs="0" maxOccurs="unbounded" />

-		</sequence>

-	</complexType>

-

-	<complexType name="ImportType">

-		<attribute name="location" type="string" />

-		<attribute name="name" type="Name" />

-	</complexType>

-

-	<complexType name="TypeDescriptionType">

-		<sequence>

-			<element name="name" type="Name" />

-			<element name="description" type="string" minOccurs="0"/>

-			<element name="supertypeName" type="Name" />

-			<choice>

-				<element name="allowedValues" minOccurs="0">

-					<complexType>

-						<sequence>

-							<element name="value" maxOccurs="unbounded">

-								<complexType>

-									<sequence>

-										<element name="string" type="string" />

-										<element name="description" type="string" minOccurs="0"/>

-									</sequence>

-								</complexType>

-							</element>

-						</sequence>

-					</complexType>

-				</element>

-				<element name="features" minOccurs="0">

-					<complexType>

-						<sequence>

-							<element name="featureDescription" minOccurs="0" maxOccurs="unbounded">

-								<complexType>

-									<sequence>

-										<element name="name" type="Name" />

-										<element name="description" type="string" minOccurs="0"/>

-										<element name="rangeTypeName" type="Name" />

-										<element name="elementType" type="string" minOccurs="0" />

-										<element name="multipleReferencesAllowed" type="boolean" minOccurs="0" />

-									</sequence>

-								</complexType>

-							</element>

-						</sequence>

-					</complexType>

-				</element>

-			</choice>

-		</sequence>

-	</complexType>

-

-	<complexType name="TypePriorityType">

-		<sequence>

-			<element name="name" type="string" minOccurs="0" />

-			<element name="description" type="string" minOccurs="0" />

-			<element name="version" type="string" minOccurs="0" />

-			<element name="vendor" type="string" minOccurs="0" />

-			<element name="imports" type="rs:ImportSequenceType" minOccurs="0" />

-			<choice>

-				<element name="priorityLists">

-					<complexType>

-						<sequence>

-							<element name="priorityList" type="rs:PriorityListType" minOccurs="0" maxOccurs="unbounded" />

-						</sequence>

-					</complexType>

-				</element>

-				<element name="priorityList" type="rs:PriorityListType" minOccurs="0" maxOccurs="unbounded" />

-			</choice>

-		</sequence>

-	</complexType>

-

-	<complexType name="PriorityListType">

-		<sequence>

-			<element name="type" type="Name" minOccurs="0" maxOccurs="unbounded" />

-		</sequence>

-	</complexType>

-

-	<complexType name="FsIndexCollectionType">

-		<sequence>

-			<element name="name" type="string" minOccurs="0" />

-			<element name="description" type="string" minOccurs="0" />

-			<element name="version" type="string" minOccurs="0" />

-			<element name="vendor" type="string" minOccurs="0" />

-			<element name="imports" type="rs:ImportSequenceType" minOccurs="0" />

-			<choice>

-				<element name="fsIndexes">

-					<complexType>

-						<sequence>

-							<element name="fsIndexDescription" type="rs:FsIndexType" minOccurs="0" maxOccurs="unbounded" />

-						</sequence>

-					</complexType>

-				</element>

-				<element name="fsIndexDescription" type="rs:FsIndexType" minOccurs="0" maxOccurs="unbounded" />

-			</choice>

-		</sequence>

-	</complexType>

-

-	<complexType name="FsIndexType">

-		<sequence>

-			<element name="label" type="Name" />

-			<element name="typeName" type="Name" />

-			<element name="kind" minOccurs="0" maxOccurs="1">

-				<simpleType>

-					<restriction base="string">

-						<enumeration value="sorted" />

-						<enumeration value="bag" />

-						<enumeration value="set" />

-					</restriction>

-				</simpleType>

-			</element>

-			<element name="keys" minOccurs="0" maxOccurs="1">

-				<complexType>

-					<sequence>

-						<element name="fsIndexKey" type="rs:FSIndexKeyType" minOccurs="0" maxOccurs="unbounded" />

-					</sequence>

-				</complexType>

-			</element>

-		</sequence>

-	</complexType>

-

-

-	<complexType name="FSIndexKeyType">

-		<choice>

-			<element name="typePriority" />

-			<sequence>

-				<element name="featureName" type="Name" />

-				<element name="comparator" minOccurs="0">

-					<simpleType>

-						<restriction base="string">

-							<enumeration value="standard" />

-							<enumeration value="reverse" />

-						</restriction>

-					</simpleType>

-				</element>

-			</sequence>

-		</choice>

-	</complexType>

-

-	<complexType name="CapabilitiesType">

-		<sequence>

-			<element name="capability" minOccurs="0" maxOccurs="unbounded">

-				<complexType>

-					<sequence>

-						<element name="description" type="string" minOccurs="0"/>

-						<element name="inputs" type="rs:TypeOrFeatureNameListType" minOccurs="0" />

-						<element name="outputs" type="rs:TypeOrFeatureNameListType" minOccurs="0" />

-						<element name="inputSofas" type="rs:SofaListType" minOccurs="0" />

-						<element name="outputSofas" type="rs:SofaListType" minOccurs="0" />

-						<element name="languagesSupported" type="rs:LanguageListType" minOccurs="0" />

-						<element name="mimeTypesSupported" type="rs:MimeTypeListType" minOccurs="0" />

-					</sequence>

-				</complexType>

-			</element>

-		</sequence>

-	</complexType>

-

-	<complexType name="TypeOrFeatureNameListType">

-		<sequence>

-			<group ref="rs:TypeOrFeature" minOccurs="0" maxOccurs="unbounded" />

-		</sequence>

-	</complexType>

-

-	<group name="TypeOrFeature">

-		<choice>

-			<element name="type" type="rs:TypeNameType" />

-			<element name="feature" type="Name" />

-		</choice>

-	</group>

-

-	<complexType name="TypeNameType">

-		<simpleContent>

-			<extension base="Name">

-				<attribute name="allAnnotatorFeatures" type="boolean" />

-			</extension>

-		</simpleContent>

-	</complexType>

-

-	<complexType name="LanguageListType">

-		<sequence>

-			<element name="language" type="string" minOccurs="0" maxOccurs="unbounded" />

-		</sequence>

-	</complexType>

-

-	<complexType name="MimeTypeListType">

-		<sequence>

-			<element name="mimeType" type="string" minOccurs="0" maxOccurs="unbounded" />

-		</sequence>

-	</complexType>

-

-

-	<complexType name="SofaListType">

-		<sequence>

-			<element name="sofaName" type="string" minOccurs="0" maxOccurs="unbounded" />

-		</sequence>

-	</complexType>

-

-	<complexType name="OperationalPropertiesType">

-		<sequence>

-			<element name="modifiesCas" minOccurs="0" type="boolean"/>

-			<element name="multipleDeploymentAllowed" minOccurs="0" type="boolean"/>

-			<element name="outputsNewCASes" minOccurs="0" type="boolean"/>

-		</sequence>

-	</complexType>

-	

-	<complexType name="ExternalResourceDependenciesType">

-		<sequence>

-			<element name="externalResourceDependency" minOccurs="0" maxOccurs="unbounded">

-				<complexType>

-					<sequence>

-						<element name="key" type="string" />

-						<element name="description" type="string" />

-						<element name="interfaceName" type="string" minOccurs="0" />

-						<element name="optional" type="boolean" minOccurs="0" />

-					</sequence>

-				</complexType>

-			</element>

-		</sequence>

-	</complexType>

-

-	<complexType name="ResourceManagerConfigurationType">

-		<all>

-			<element name="name" type="string" minOccurs="0" />

-			<element name="description" type="string" minOccurs="0" />

-			<element name="vendor" type="string" minOccurs="0" />

-			<element name="version" type="string" minOccurs="0" />

-			<element name="imports" type="rs:ImportSequenceType" minOccurs="0" />

-			<element name="import" type="rs:ImportType" minOccurs="0"/> <!-- Old Style -->

-			<element name="externalResources" type="rs:ExternalResourcesType" minOccurs="0" />

-			<element name="externalResourceBindings" type="rs:ExternalResourceBindingsType" minOccurs="0" />

-		</all>

-	</complexType>

-

-	<complexType name="ExternalResourcesType">

-		<sequence>

-			<element name="externalResource" minOccurs="0" maxOccurs="unbounded">

-				<complexType>

-					<sequence>

-						<element name="name" type="string" />

-						<element name="description" type="string" />

-						<element ref="rs:resourceSpecifier" />

-						<element name="implementationName" type="string" minOccurs="0" />

-					</sequence>

-				</complexType>

-			</element>

-		</sequence>

-	</complexType>

-

-	<complexType name="ExternalResourceBindingsType">

-		<sequence>

-			<element name="externalResourceBinding" minOccurs="0" maxOccurs="unbounded">

-				<complexType>

-					<sequence>

-						<element name="key" type="string" />

-						<element name="resourceName" type="string" />

-					</sequence>

-				</complexType>

-			</element>

-		</sequence>

-	</complexType>

-

-	<complexType name="SofaMappingsType">

-		<sequence>

-			<element name="sofaMapping" minOccurs="0" maxOccurs="unbounded">

-				<complexType>

-					<sequence>

-						<element name="componentKey" type="string" />

-						<element name="componentSofaName" type="string" minOccurs="0" />

-						<element name="aggregateSofaName" type="string" />

-					</sequence>

-				</complexType>

-			</element>

-		</sequence>

-	</complexType>

-        

-

-<!-- Top Level Element Definitions for Collection Processing Component Specifiers -->

-

-  <element name="collectionReaderDescription" type="rs:CollectionProcessingComponentDescriptionType"/>

-  <element name="casInitializerDescription" type="rs:CollectionProcessingComponentDescriptionType"/>

-  <element name="casConsumerDescription" type="rs:CollectionProcessingComponentDescriptionType"/>

-  

-  <complexType name="CollectionProcessingComponentDescriptionType">

-    <sequence>

-      <element name="frameworkImplementation" type="string" />

-      <element name="implementationName" type="rs:EnvVarType"/>

-      <element name="processingResourceMetaData" type="rs:ProcessingResourceMetaDataType"/>

-      <element name="externalResourceDependencies" type="rs:ExternalResourceDependenciesType" minOccurs="0"/>

-      <element name="resourceManagerConfiguration" type="rs:ResourceManagerConfigurationType" minOccurs="0"/>

-    </sequence>  

-  </complexType>

-

-<!-- Top Level Element Definitions for FlowController Specifier 

-	(currently same as a Collection Processing Component Specifier -->

-  <element name="flowControllerDescription" type="rs:CollectionProcessingComponentDescriptionType"/>

-  

-  <!-- Top Level Element Definitions for Service Specifiers -->

-

-  <element name="uriSpecifier" substitutionGroup="rs:resourceSpecifier">

-    <complexType>

-      <sequence>

-        <element name="resourceType" minOccurs="0">

-         <simpleType>

-            <restriction base="string">

-               <enumeration value="AnalysisEngine"/>

-               <enumeration value="CasConsumer"/>

-            </restriction>

-         </simpleType>

-        </element> 

-        <element name="uri" type="string"/>

-        <element name="protocol">

-          <simpleType>

-            <restriction base="string">

-              <enumeration value="SOAP"/>

-              <enumeration value="SOAPwithAttachments"/>

-              <enumeration value="Vinci"/>

-            </restriction>

-          </simpleType>

-        </element>

-        <element name="timeout" type="integer" minOccurs="0"/>

-      </sequence>

-    </complexType>

-  </element>

-  

+<?xml version="1.0" encoding="UTF-8"?>
+	<!--
+	 ***************************************************************
+	 * Licensed to the Apache Software Foundation (ASF) under one
+	 * or more contributor license agreements.  See the NOTICE file
+	 * distributed with this work for additional information
+	 * regarding copyright ownership.  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.  See the License for the
+	 * specific language governing permissions and limitations
+	 * under the License.
+	 ***************************************************************
+   -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+  targetNamespace="http://uima.apache.org/resourceSpecifier"
+  xmlns:rs="http://uima.apache.org/resourceSpecifier" 
+  elementFormDefault="qualified">
+ 
+  <annotation>
+    <documentation xml:lang="en">
+      Schema for UIMA Resource Specifiers.  This includes Analysis Engine Descriptors,
+      Collection Processing Component Descriptors, and Service Specifiers (client descriptors).
+      CPE Descriptors are currently not covered by this schema.
+    </documentation>
+  </annotation>
+
+	<!-- Top Level Element Definitions -->
+
+	<element name="resourceSpecifier" abstract="true" />
+
+	<element name="taeDescription" substitutionGroup="rs:resourceSpecifier" type="rs:AnalysisEngineDescriptionType" />
+
+	<element name="analysisEngineDescription" substitutionGroup="rs:resourceSpecifier" type="rs:AnalysisEngineDescriptionType" />
+
+  <element name="resourceMetaData" type="rs:ResourceMetaDataType"/>
+  
+	<complexType name="AnalysisEngineDescriptionType">
+		<sequence>
+			<element name="frameworkImplementation" type="string" />
+			<element name="primitive" type="boolean" />
+			<choice>
+				<element name="annotatorImplementationName" type="rs:EnvVarType" />
+				<element name="delegateAnalysisEngineSpecifiers">
+					<complexType>
+						<sequence>
+							<element name="delegateAnalysisEngine" type="rs:DelegateAnalysisEngineType" minOccurs="0" maxOccurs="unbounded"/>
+						</sequence>
+					</complexType>
+				</element>
+			</choice>
+			<element name="flowController" type="rs:FlowControllerDeclarationType" minOccurs="0"/>
+			<element name="analysisEngineMetaData" type="rs:ProcessingResourceMetaDataType" />
+			<element name="externalResourceDependencies" type="rs:ExternalResourceDependenciesType" minOccurs="0" />
+			<element name="resourceManagerConfiguration" type="rs:ResourceManagerConfigurationType" minOccurs="0" />
+			<element name="sofaMappings" type="rs:SofaMappingsType" minOccurs="0" />
+		</sequence>
+	</complexType>
+
+
+	<element name="fileResourceSpecifier" substitutionGroup="rs:resourceSpecifier">
+		<complexType>
+			<sequence>
+				<element name="fileUrl" type="rs:EnvVarType" />
+				<element name="localCache" type="rs:EnvVarType" minOccurs="0" />
+			</sequence>
+		</complexType>
+	</element>
+
+	<element name="fileLanguageResourceSpecifier" substitutionGroup="rs:resourceSpecifier">
+		<complexType>
+			<sequence>
+				<element name="fileUrlPrefix" type="rs:EnvVarType" />
+				<element name="fileUrlSuffix" type="rs:EnvVarType" />
+			</sequence>
+		</complexType>
+	</element>
+
+	<element name="configurableDataResourceSpecifier" substitutionGroup="rs:resourceSpecifier">
+		<complexType>
+			<sequence>
+				<element name="url" type="rs:EnvVarType" />
+				<element name="resourceMetaData" type="rs:ResourceMetaDataType" />
+			</sequence>
+		</complexType>
+	</element>
+
+	<element name="typeSystemDescription" type="rs:TypeSystemDescriptionType" />
+
+	<element name="typePriorities" type="rs:TypePriorityType" />
+
+	<element name="fsIndexes" type="rs:FsIndexCollectionType" />
+	<element name="fsIndexCollection" type="rs:FsIndexCollectionType" />
+	<element name="resourceManagerConfiguration" type="rs:ResourceManagerConfigurationType" />
+
+	<!-- Type Definitions -->
+
+	<complexType name="ResourceMetaDataType">
+		<sequence>
+			<element name="name" type="rs:EnvVarType" />
+			<element name="description" type="string" minOccurs="0" />
+			<element name="version" type="string" minOccurs="0" />
+			<element name="vendor" type="string" minOccurs="0" />
+			<element name="configurationParameters" type="rs:ConfigurationParametersType" minOccurs="0" />
+			<element name="configurationParameterSettings" type="rs:ConfigurationParameterSettingsType" minOccurs="0" />
+		</sequence>
+	</complexType>
+
+	<complexType name="ProcessingResourceMetaDataType">
+		<complexContent>
+			<extension base="rs:ResourceMetaDataType">
+				<sequence>
+					<element name="flowConstraints" type="rs:FlowConstraintsType" minOccurs="0" />
+					<element name="typeSystemDescription" type="rs:TypeSystemDescriptionType" minOccurs="0" />
+					<element name="typePriorities" type="rs:TypePriorityType" minOccurs="0" />
+					<choice>
+						<element name="fsIndexes" type="rs:FsIndexCollectionType" minOccurs="0" />
+						<element name="fsIndexCollection" type="rs:FsIndexCollectionType" minOccurs="0" />
+					</choice>
+					<element name="capabilities" type="rs:CapabilitiesType" minOccurs="0"/>
+					<element name="operationalProperties" type="rs:OperationalPropertiesType" minOccurs="0"/>
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+
+	<complexType name="DelegateAnalysisEngineType">
+		<choice>
+			<element ref="rs:resourceSpecifier" />
+ 			<element name="import" type="rs:ImportType" />
+		</choice>
+		<attribute name="key" type="Name" />
+	</complexType>
+
+	<complexType name="FlowControllerDeclarationType">
+		<choice>
+			<element ref="rs:resourceSpecifier" />
+ 			<element name="import" type="rs:ImportType" />
+		</choice>
+		<attribute name="key" type="Name" />
+	</complexType>
+	
+	<complexType name="EnvVarType" mixed="true">
+		<sequence>
+			<element name="envVarRef" type="string" minOccurs="0" maxOccurs="unbounded" />
+		</sequence>
+	</complexType>
+
+	<complexType name="FlowConstraintsType">
+		<sequence>
+			<choice minOccurs="0" maxOccurs="1">
+				<element name="fixedFlow" minOccurs="0" maxOccurs="1">
+					<complexType>
+						<sequence>
+							<element name="node" type="Name" minOccurs="0" maxOccurs="unbounded" />
+						</sequence>
+					</complexType>
+				</element>
+				<element name="capabilityLanguageFlow" minOccurs="0" maxOccurs="1">
+					<complexType>
+						<sequence>
+							<element name="node" type="Name" minOccurs="0" maxOccurs="unbounded" />
+						</sequence>
+					</complexType>
+				</element>
+			</choice>
+		</sequence>
+	</complexType>
+
+	<complexType name="ConfigurationParametersType">
+		<sequence>
+			<element name="configurationParameter" type="rs:ConfigurationParameterType" minOccurs="0" maxOccurs="unbounded" />
+			<element name="commonParameters" type="rs:CommonParametersType" minOccurs="0" maxOccurs="1" />
+			<element name="configurationGroup" type="rs:ConfigurationGroupType" minOccurs="0" maxOccurs="unbounded" />
+		</sequence>
+		<attribute name="defaultGroup" type="Name" />
+		<attribute name="searchStrategy" type="Name" />
+	</complexType>
+
+	<complexType name="CommonParametersType">
+		<sequence>
+			<element name="configurationParameter" type="rs:ConfigurationParameterType" minOccurs="0" maxOccurs="unbounded" />
+		</sequence>
+	</complexType>
+
+	<complexType name="ConfigurationGroupType">
+		<sequence>
+			<element name="configurationParameter" type="rs:ConfigurationParameterType" minOccurs="0" maxOccurs="unbounded" />
+		</sequence>
+		<attribute name="names" type="string" />
+	</complexType>
+
+	<complexType name="ConfigurationParameterType">
+		<sequence>
+			<element name="name" type="Name" />
+			<element name="description" type="string" minOccurs="0" />
+			<element name="type" type="rs:CfgParamDataType" />
+			<element name="multiValued" type="boolean" minOccurs="0" />
+			<element name="mandatory" type="boolean" minOccurs="0" />
+			<element name="overrides" minOccurs="0">
+				<complexType>
+					<choice>
+						<sequence>
+							<element name="parameter" type="string" minOccurs="0" maxOccurs="unbounded" />
+	  					</sequence>
+						<!-- Use of tag "param" is deprectated but permitted for backwards compatibility -->
+						<sequence>
+							<element name="param" type="string" minOccurs="0" maxOccurs="unbounded" />
+	  					</sequence>
+					</choice>
+				</complexType>
+			</element>
+		</sequence>
+	</complexType>
+
+	<simpleType name="CfgParamDataType">
+		<restriction base="string">
+			<enumeration value="String" />
+			<enumeration value="Integer" />
+			<enumeration value="Float" />
+			<enumeration value="Boolean" />
+		</restriction>
+	</simpleType>
+
+	<complexType name="ConfigurationParameterSettingsType">
+		<sequence>
+			<element name="nameValuePair" type="rs:NameValuePairType" minOccurs="0" maxOccurs="unbounded" />
+			<element name="settingsForGroup" type="rs:SettingsForGroupType" minOccurs="0" maxOccurs="unbounded" />
+		</sequence>
+	</complexType>
+
+	<complexType name="SettingsForGroupType">
+		<sequence>
+			<element name="nameValuePair" type="rs:NameValuePairType" minOccurs="0" maxOccurs="unbounded" />
+		</sequence>
+		<attribute name="name" type="string" />
+	</complexType>
+
+	<complexType name="NameValuePairType">
+		<sequence>
+			<element name="name" type="Name" />
+			<element name="value">
+				<complexType>
+					<group ref="rs:ValueElement" />
+				</complexType>
+			</element>
+		</sequence>
+	</complexType>
+
+	<group name="ValueElement">
+		<choice>
+			<group ref="rs:BasicValueElement" />
+			<element name="array">
+				<complexType>
+					<sequence>
+						<group ref="rs:BasicValueElement" minOccurs="0" maxOccurs="unbounded" />
+					</sequence>
+				</complexType>
+			</element>
+		</choice>
+	</group>
+
+	<group name="BasicValueElement">
+		<choice>
+			<element name="string" type="rs:EnvVarType" />
+			<element name="integer" type="int" />
+			<element name="float" type="float" />
+			<element name="boolean" type="boolean" />
+		</choice>
+	</group>
+
+	<complexType name="TypeSystemDescriptionType">
+		<all>
+			<element name="name" type="string" minOccurs="0" />
+			<element name="description" type="string" minOccurs="0" />
+			<element name="version" type="string" minOccurs="0" />
+			<element name="vendor" type="string" minOccurs="0" />
+			<element name="imports" type="rs:ImportSequenceType" minOccurs="0" />
+			<element name="types" minOccurs="0">
+				<complexType>
+					<sequence>
+						<element name="typeDescription" type="rs:TypeDescriptionType" minOccurs="0" maxOccurs="unbounded" />
+					</sequence>
+				</complexType>
+			</element>
+		</all>
+	</complexType>
+
+	<complexType name="ImportSequenceType">
+		<sequence>
+			<element name="import" type="rs:ImportType" minOccurs="0" maxOccurs="unbounded" />
+		</sequence>
+	</complexType>
+
+	<complexType name="ImportType">
+		<attribute name="location" type="string" />
+		<attribute name="name" type="Name" />
+	</complexType>
+
+	<complexType name="TypeDescriptionType">
+		<sequence>
+			<element name="name" type="Name" />
+			<element name="description" type="string" minOccurs="0"/>
+			<element name="supertypeName" type="Name" />
+			<choice>
+				<element name="allowedValues" minOccurs="0">
+					<complexType>
+						<sequence>
+							<element name="value" maxOccurs="unbounded">
+								<complexType>
+									<sequence>
+										<element name="string" type="string" />
+										<element name="description" type="string" minOccurs="0"/>
+									</sequence>
+								</complexType>
+							</element>
+						</sequence>
+					</complexType>
+				</element>
+				<element name="features" minOccurs="0">
+					<complexType>
+						<sequence>
+							<element name="featureDescription" minOccurs="0" maxOccurs="unbounded">
+								<complexType>
+									<sequence>
+										<element name="name" type="Name" />
+										<element name="description" type="string" minOccurs="0"/>
+										<element name="rangeTypeName" type="Name" />
+										<element name="elementType" type="string" minOccurs="0" />
+										<element name="multipleReferencesAllowed" type="boolean" minOccurs="0" />
+									</sequence>
+								</complexType>
+							</element>
+						</sequence>
+					</complexType>
+				</element>
+			</choice>
+		</sequence>
+	</complexType>
+
+	<complexType name="TypePriorityType">
+		<sequence>
+			<element name="name" type="string" minOccurs="0" />
+			<element name="description" type="string" minOccurs="0" />
+			<element name="version" type="string" minOccurs="0" />
+			<element name="vendor" type="string" minOccurs="0" />
+			<element name="imports" type="rs:ImportSequenceType" minOccurs="0" />
+			<choice>
+				<element name="priorityLists">
+					<complexType>
+						<sequence>
+							<element name="priorityList" type="rs:PriorityListType" minOccurs="0" maxOccurs="unbounded" />
+						</sequence>
+					</complexType>
+				</element>
+				<element name="priorityList" type="rs:PriorityListType" minOccurs="0" maxOccurs="unbounded" />
+			</choice>
+		</sequence>
+	</complexType>
+
+	<complexType name="PriorityListType">
+		<sequence>
+			<element name="type" type="Name" minOccurs="0" maxOccurs="unbounded" />
+		</sequence>
+	</complexType>
+
+	<complexType name="FsIndexCollectionType">
+		<sequence>
+			<element name="name" type="string" minOccurs="0" />
+			<element name="description" type="string" minOccurs="0" />
+			<element name="version" type="string" minOccurs="0" />
+			<element name="vendor" type="string" minOccurs="0" />
+			<element name="imports" type="rs:ImportSequenceType" minOccurs="0" />
+			<choice>
+				<element name="fsIndexes">
+					<complexType>
+						<sequence>
+							<element name="fsIndexDescription" type="rs:FsIndexType" minOccurs="0" maxOccurs="unbounded" />
+						</sequence>
+					</complexType>
+				</element>
+				<element name="fsIndexDescription" type="rs:FsIndexType" minOccurs="0" maxOccurs="unbounded" />
+			</choice>
+		</sequence>
+	</complexType>
+
+	<complexType name="FsIndexType">
+		<sequence>
+			<element name="label" type="Name" />
+			<element name="typeName" type="Name" />
+			<element name="kind" minOccurs="0" maxOccurs="1">
+				<simpleType>
+					<restriction base="string">
+						<enumeration value="sorted" />
+						<enumeration value="bag" />
+						<enumeration value="set" />
+					</restriction>
+				</simpleType>
+			</element>
+			<element name="keys" minOccurs="0" maxOccurs="1">
+				<complexType>
+					<sequence>
+						<element name="fsIndexKey" type="rs:FSIndexKeyType" minOccurs="0" maxOccurs="unbounded" />
+					</sequence>
+				</complexType>
+			</element>
+		</sequence>
+	</complexType>
+
+
+	<complexType name="FSIndexKeyType">
+		<choice>
+			<element name="typePriority" />
+			<sequence>
+				<element name="featureName" type="Name" />
+				<element name="comparator" minOccurs="0">
+					<simpleType>
+						<restriction base="string">
+							<enumeration value="standard" />
+							<enumeration value="reverse" />
+						</restriction>
+					</simpleType>
+				</element>
+			</sequence>
+		</choice>
+	</complexType>
+
+	<complexType name="CapabilitiesType">
+		<sequence>
+			<element name="capability" minOccurs="0" maxOccurs="unbounded">
+				<complexType>
+					<sequence>
+						<element name="description" type="string" minOccurs="0"/>
+						<element name="inputs" type="rs:TypeOrFeatureNameListType" minOccurs="0" />
+						<element name="outputs" type="rs:TypeOrFeatureNameListType" minOccurs="0" />
+						<element name="inputSofas" type="rs:SofaListType" minOccurs="0" />
+						<element name="outputSofas" type="rs:SofaListType" minOccurs="0" />
+						<element name="languagesSupported" type="rs:LanguageListType" minOccurs="0" />
+						<element name="mimeTypesSupported" type="rs:MimeTypeListType" minOccurs="0" />
+					</sequence>
+				</complexType>
+			</element>
+		</sequence>
+	</complexType>
+
+	<complexType name="TypeOrFeatureNameListType">
+		<sequence>
+			<group ref="rs:TypeOrFeature" minOccurs="0" maxOccurs="unbounded" />
+		</sequence>
+	</complexType>
+
+	<group name="TypeOrFeature">
+		<choice>
+			<element name="type" type="rs:TypeNameType" />
+			<element name="feature" type="Name" />
+		</choice>
+	</group>
+
+	<complexType name="TypeNameType">
+		<simpleContent>
+			<extension base="Name">
+				<attribute name="allAnnotatorFeatures" type="boolean" />
+			</extension>
+		</simpleContent>
+	</complexType>
+
+	<complexType name="LanguageListType">
+		<sequence>
+			<element name="language" type="string" minOccurs="0" maxOccurs="unbounded" />
+		</sequence>
+	</complexType>
+
+	<complexType name="MimeTypeListType">
+		<sequence>
+			<element name="mimeType" type="string" minOccurs="0" maxOccurs="unbounded" />
+		</sequence>
+	</complexType>
+
+
+	<complexType name="SofaListType">
+		<sequence>
+			<element name="sofaName" type="string" minOccurs="0" maxOccurs="unbounded" />
+		</sequence>
+	</complexType>
+
+	<complexType name="OperationalPropertiesType">
+		<sequence>
+			<element name="modifiesCas" minOccurs="0" type="boolean"/>
+			<element name="multipleDeploymentAllowed" minOccurs="0" type="boolean"/>
+			<element name="outputsNewCASes" minOccurs="0" type="boolean"/>
+		</sequence>
+	</complexType>
+	
+	<complexType name="ExternalResourceDependenciesType">
+		<sequence>
+			<element name="externalResourceDependency" minOccurs="0" maxOccurs="unbounded">
+				<complexType>
+					<sequence>
+						<element name="key" type="string" />
+						<element name="description" type="string" />
+						<element name="interfaceName" type="string" minOccurs="0" />
+						<element name="optional" type="boolean" minOccurs="0" />
+					</sequence>
+				</complexType>
+			</element>
+		</sequence>
+	</complexType>
+
+	<complexType name="ResourceManagerConfigurationType">
+		<all>
+			<element name="name" type="string" minOccurs="0" />
+			<element name="description" type="string" minOccurs="0" />
+			<element name="vendor" type="string" minOccurs="0" />
+			<element name="version" type="string" minOccurs="0" />
+			<element name="imports" type="rs:ImportSequenceType" minOccurs="0" />
+			<element name="import" type="rs:ImportType" minOccurs="0"/> <!-- Old Style -->
+			<element name="externalResources" type="rs:ExternalResourcesType" minOccurs="0" />
+			<element name="externalResourceBindings" type="rs:ExternalResourceBindingsType" minOccurs="0" />
+		</all>
+	</complexType>
+
+	<complexType name="ExternalResourcesType">
+		<sequence>
+			<element name="externalResource" minOccurs="0" maxOccurs="unbounded">
+				<complexType>
+					<sequence>
+						<element name="name" type="string" />
+						<element name="description" type="string" />
+						<element ref="rs:resourceSpecifier" />
+						<element name="implementationName" type="string" minOccurs="0" />
+					</sequence>
+				</complexType>
+			</element>
+		</sequence>
+	</complexType>
+
+	<complexType name="ExternalResourceBindingsType">
+		<sequence>
+			<element name="externalResourceBinding" minOccurs="0" maxOccurs="unbounded">
+				<complexType>
+					<sequence>
+						<element name="key" type="string" />
+						<element name="resourceName" type="string" />
+					</sequence>
+				</complexType>
+			</element>
+		</sequence>
+	</complexType>
+
+	<complexType name="SofaMappingsType">
+		<sequence>
+			<element name="sofaMapping" minOccurs="0" maxOccurs="unbounded">
+				<complexType>
+					<sequence>
+						<element name="componentKey" type="string" />
+						<element name="componentSofaName" type="string" minOccurs="0" />
+						<element name="aggregateSofaName" type="string" />
+					</sequence>
+				</complexType>
+			</element>
+		</sequence>
+	</complexType>
+        
+
+<!-- Top Level Element Definitions for Collection Processing Component Specifiers -->
+
+  <element name="collectionReaderDescription" type="rs:CollectionProcessingComponentDescriptionType"/>
+  <element name="casInitializerDescription" type="rs:CollectionProcessingComponentDescriptionType"/>
+  <element name="casConsumerDescription" type="rs:CollectionProcessingComponentDescriptionType"/>
+  
+  <complexType name="CollectionProcessingComponentDescriptionType">
+    <sequence>
+      <element name="frameworkImplementation" type="string" />
+      <element name="implementationName" type="rs:EnvVarType"/>
+      <element name="processingResourceMetaData" type="rs:ProcessingResourceMetaDataType"/>
+      <element name="externalResourceDependencies" type="rs:ExternalResourceDependenciesType" minOccurs="0"/>
+      <element name="resourceManagerConfiguration" type="rs:ResourceManagerConfigurationType" minOccurs="0"/>
+    </sequence>  
+  </complexType>
+
+<!-- Top Level Element Definitions for FlowController Specifier 
+	(currently same as a Collection Processing Component Specifier -->
+  <element name="flowControllerDescription" type="rs:CollectionProcessingComponentDescriptionType"/>
+  
+  <!-- Top Level Element Definitions for Service Specifiers -->
+
+  <element name="uriSpecifier" substitutionGroup="rs:resourceSpecifier">
+    <complexType>
+      <sequence>
+        <element name="resourceType" minOccurs="0">
+         <simpleType>
+            <restriction base="string">
+               <enumeration value="AnalysisEngine"/>
+               <enumeration value="CasConsumer"/>
+            </restriction>
+         </simpleType>
+        </element> 
+        <element name="uri" type="string"/>
+        <element name="protocol">
+          <simpleType>
+            <restriction base="string">
+              <enumeration value="SOAP"/>
+              <enumeration value="SOAPwithAttachments"/>
+              <enumeration value="Vinci"/>
+            </restriction>
+          </simpleType>
+        </element>
+        <element name="timeout" type="integer" minOccurs="0"/>
+      </sequence>
+    </complexType>
+  </element>
+  
 </schema>
\ No newline at end of file
diff --git a/docs/builddocs.cmd b/docs/builddocs.cmd
index 1b9853f..32162bf 100644
--- a/docs/builddocs.cmd
+++ b/docs/builddocs.cmd
@@ -1,47 +1,47 @@
-@ECHO OFF

-

-REM   Licensed to the Apache Software Foundation (ASF) under one

-REM   or more contributor license agreements.  See the NOTICE file

-REM   distributed with this work for additional information

-REM   regarding copyright ownership.  The ASF licenses this file

-REM   to you under the Apache License, Version 2.0 (the

-REM   "License"); you may not use this file except in compliance

-REM   with the License.  You may obtain a copy of the License at

-REM

-REM    http://www.apache.org/licenses/LICENSE-2.0

-REM

-REM   Unless required by applicable law or agreed to in writing,

-REM   software distributed under the License is distributed on an

-REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-REM   KIND, either express or implied.  See the License for the

-REM   specific language governing permissions and limitations

-REM   under the License.

-

-@REM  Builds the UIMACPP doxygen docs.

-@REM	Requires Doxygen 1.3.6 and Graphviz 1.8.10 installed and 

-@REM  PATH environment variable must include

-@REM	doxygen\bin;graphviz\bin;graphviz\bin\tools

-@REM  This script must be run from the uimacpp\docs subdirectory

-

-@if "%~1"=="" goto build

-@if "%~1"=="clean" goto clean

-@if "%~1"=="rebuild" goto rebuild

-

-:build

-	@echo building uimacpp docs in ..\docs

-	nmake -f uimacppdocs.mak build CP=copy DEL=DEL RD="RM /s /q" MDFILES=html\*.md5  MAPFILES=html\*.map DOTFILES=html\*.dot HTMLDIR=.\html\

-	goto TheEnd

-

-:rebuild

-	@echo rebuilding uimacpp docs in ..\docs

-	nmake -f uimacppdocs.mak rebuild CP=copy DEL=DEL RD="RM /s /q" MDFILES=html\*.md5  MAPFILES=html\*.map DOTFILES=html\*.dot HTMLDIR=.\html\

-	goto TheEnd

-

-:clean

-	@echo cleaning uimacpp docs in ..\docs

-	nmake -f uimacppdocs.mak clean RD="RM /s /q" HTMLDIR=.\html\

-	goto TheEnd

-

-:TheEnd

-	@echo done 

-

+@ECHO OFF
+
+REM   Licensed to the Apache Software Foundation (ASF) under one
+REM   or more contributor license agreements.  See the NOTICE file
+REM   distributed with this work for additional information
+REM   regarding copyright ownership.  The ASF licenses this file
+REM   to you under the Apache License, Version 2.0 (the
+REM   "License"); you may not use this file except in compliance
+REM   with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM   Unless required by applicable law or agreed to in writing,
+REM   software distributed under the License is distributed on an
+REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM   KIND, either express or implied.  See the License for the
+REM   specific language governing permissions and limitations
+REM   under the License.
+
+@REM  Builds the UIMACPP doxygen docs.
+@REM	Requires Doxygen 1.3.6 and Graphviz 1.8.10 installed and 
+@REM  PATH environment variable must include
+@REM	doxygen\bin;graphviz\bin;graphviz\bin\tools
+@REM  This script must be run from the uimacpp\docs subdirectory
+
+@if "%~1"=="" goto build
+@if "%~1"=="clean" goto clean
+@if "%~1"=="rebuild" goto rebuild
+
+:build
+	@echo building uimacpp docs in ..\docs
+	nmake -f uimacppdocs.mak build CP=copy DEL=DEL RD="RM /s /q" MDFILES=html\*.md5  MAPFILES=html\*.map DOTFILES=html\*.dot HTMLDIR=.\html\
+	goto TheEnd
+
+:rebuild
+	@echo rebuilding uimacpp docs in ..\docs
+	nmake -f uimacppdocs.mak rebuild CP=copy DEL=DEL RD="RM /s /q" MDFILES=html\*.md5  MAPFILES=html\*.map DOTFILES=html\*.dot HTMLDIR=.\html\
+	goto TheEnd
+
+:clean
+	@echo cleaning uimacpp docs in ..\docs
+	nmake -f uimacppdocs.mak clean RD="RM /s /q" HTMLDIR=.\html\
+	goto TheEnd
+
+:TheEnd
+	@echo done 
+
diff --git a/docs/uimacpp.dox b/docs/uimacpp.dox
index 22ecf16..bc75d79 100644
--- a/docs/uimacpp.dox
+++ b/docs/uimacpp.dox
@@ -1,1257 +1,1257 @@
-# Doxyfile 1.3.6

-

-# ---------------------------------------------------------------------------

-# Licensed to the Apache Software Foundation (ASF) under one or more

-# contributor license agreements.  See the NOTICE file distributed with

-# this work for additional information regarding copyright ownership.

-# 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.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ---------------------------------------------------------------------------

-

-# This file describes the settings to be used by the documentation system

-# doxygen (www.doxygen.org) for a project

-#

-# All text after a hash (#) is considered a comment and will be ignored

-# The format is:

-#       TAG = value [value,  \]

-# For lists items can also be appended using:

-#       TAG += value [value,  \]

-# Values that contain spaces should be placed between quotes (" ")

-

-#---------------------------------------------------------------------------

-# Project related configuration options

-#---------------------------------------------------------------------------

-

-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 

-# by quotes) that should identify the project.

-

-PROJECT_NAME           = "UIMACPP API"

-

-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 

-# This could be handy for archiving the generated documentation or 

-# if some version control system is used.

-

-PROJECT_NUMBER         = "v2.4.0"

-

-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 

-# base path where the generated documentation will be put. 

-# If a relative path is entered, it will be relative to the location 

-# where doxygen was started. If left blank the current directory will be used.

-

-OUTPUT_DIRECTORY       = ../docs

-

-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 

-# documentation generated by doxygen is written. Doxygen will use this 

-# information to generate all constant output in the proper language. 

-# The default language is English, other supported languages are: 

-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 

-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 

-# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese, 

-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.

-

-OUTPUT_LANGUAGE        = English

-

-# This tag can be used to specify the encoding used in the generated output. 

-# The encoding is not always determined by the language that is chosen, 

-# but also whether or not the output is meant for Windows or non-Windows users. 

-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 

-# forces the Windows encoding (this is the default for the Windows binary), 

-# whereas setting the tag to NO uses a Unix-style encoding (the default for 

-# all platforms other than Windows).

-

-USE_WINDOWS_ENCODING   = YES

-

-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 

-# include brief member descriptions after the members that are listed in 

-# the file and class documentation (similar to JavaDoc). 

-# Set to NO to disable this.

-

-BRIEF_MEMBER_DESC      = YES

-

-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 

-# the brief description of a member or function before the detailed description. 

-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 

-# brief descriptions will be completely suppressed.

-

-REPEAT_BRIEF           = YES

-

-# This tag implements a quasi-intelligent brief description abbreviator 

-# that is used to form the text in various listings. Each string 

-# in this list, if found as the leading text of the brief description, will be 

-# stripped from the text and the result after processing the whole list, is used 

-# as the annotated text. Otherwise, the brief description is used as-is. If left 

-# blank, the following values are used ("$name" is automatically replaced with the 

-# name of the entity): "The $name class" "The $name widget" "The $name file" 

-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"

-

-ABBREVIATE_BRIEF       = 

-

-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 

-# Doxygen will generate a detailed section even if there is only a brief 

-# description.

-

-ALWAYS_DETAILED_SEC    = NO

-

-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 

-# members of a class in the documentation of that class as if those members were 

-# ordinary class members. Constructors, destructors and assignment operators of 

-# the base classes will not be shown.

-

-INLINE_INHERITED_MEMB  = YES

-

-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 

-# path before files name in the file list and in the header files. If set 

-# to NO the shortest path that makes the file name unique will be used.

-

-FULL_PATH_NAMES        = NO

-

-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 

-# can be used to strip a user-defined part of the path. Stripping is 

-# only done if one of the specified strings matches the left-hand part of 

-# the path. It is allowed to use relative paths in the argument list. 

-# If left blank the directory from which doxygen is run is used as the 

-# path to strip.

-

-STRIP_FROM_PATH        = 

-

-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 

-# (but less readable) file names. This can be useful is your file systems 

-# doesn't support long names like on DOS, Mac, or CD-ROM.

-

-SHORT_NAMES            = NO

-

-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 

-# will interpret the first line (until the first dot) of a JavaDoc-style 

-# comment as the brief description. If set to NO, the JavaDoc 

-# comments will behave just like the Qt-style comments (thus requiring an 

-# explicit @brief command for a brief description.

-

-JAVADOC_AUTOBRIEF      = YES

-

-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 

-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 

-# comments) as a brief description. This used to be the default behaviour. 

-# The new default is to treat a multi-line C++ comment block as a detailed 

-# description. Set this tag to YES if you prefer the old behaviour instead.

-

-MULTILINE_CPP_IS_BRIEF = NO

-

-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 

-# will output the detailed description near the top, like JavaDoc.

-# If set to NO, the detailed description appears after the member 

-# documentation.

-

-DETAILS_AT_TOP         = YES

-

-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 

-# member inherits the documentation from any documented member that it 

-# re-implements.

-

-INHERIT_DOCS           = YES

-

-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 

-# tag is set to YES, then doxygen will reuse the documentation of the first 

-# member in the group (if any) for the other members of the group. By default 

-# all members of a group must be documented explicitly.

-

-DISTRIBUTE_GROUP_DOC   = NO

-

-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 

-# Doxygen uses this value to replace tabs by spaces in code fragments.

-

-TAB_SIZE               = 3

-

-# This tag can be used to specify a number of aliases that acts 

-# as commands in the documentation. An alias has the form "name=value". 

-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 

-# put the command \sideeffect (or @sideeffect) in the documentation, which 

-# will result in a user-defined paragraph with heading "Side Effects:". 

-# You can put \n's in the value part of an alias to insert newlines.

-

-ALIASES                = ibm_external_copyright= \

-                         end_ibm_external_copyright= \

-                         ibm_internal_copyright= \

-                         end_ibm_internal_copyright= \

-                         draft= \

-                         stable=

-

-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 

-# only. Doxygen will then generate output that is more tailored for C. 

-# For instance, some of the names that are used will be different. The list 

-# of all members will be omitted, etc.

-

-OPTIMIZE_OUTPUT_FOR_C  = NO

-

-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 

-# only. Doxygen will then generate output that is more tailored for Java. 

-# For instance, namespaces will be presented as packages, qualified scopes 

-# will look different, etc.

-

-OPTIMIZE_OUTPUT_JAVA   = NO

-

-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 

-# the same type (for instance a group of public functions) to be put as a 

-# subgroup of that type (e.g. under the Public Functions section). Set it to 

-# NO to prevent subgrouping. Alternatively, this can be done per class using 

-# the \nosubgrouping command.

-

-SUBGROUPING            = YES

-

-#---------------------------------------------------------------------------

-# Build related configuration options

-#---------------------------------------------------------------------------

-

-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 

-# documentation are documented, even if no documentation was available. 

-# Private class members and static file members will be hidden unless 

-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES

-

-EXTRACT_ALL            = YES

-

-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 

-# will be included in the documentation.

-

-EXTRACT_PRIVATE        = NO

-

-# If the EXTRACT_STATIC tag is set to YES all static members of a file 

-# will be included in the documentation.

-

-EXTRACT_STATIC         = YES

-

-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 

-# defined locally in source files will be included in the documentation. 

-# If set to NO only classes defined in header files are included.

-

-EXTRACT_LOCAL_CLASSES  = NO

-

-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 

-# undocumented members of documented classes, files or namespaces. 

-# If set to NO (the default) these members will be included in the 

-# various overviews, but no documentation section is generated. 

-# This option has no effect if EXTRACT_ALL is enabled.

-

-HIDE_UNDOC_MEMBERS     = NO

-

-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 

-# undocumented classes that are normally visible in the class hierarchy. 

-# If set to NO (the default) these classes will be included in the various 

-# overviews. This option has no effect if EXTRACT_ALL is enabled.

-

-HIDE_UNDOC_CLASSES     = NO

-

-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 

-# friend (class|struct|union) declarations. 

-# If set to NO (the default) these declarations will be included in the 

-# documentation.

-

-HIDE_FRIEND_COMPOUNDS  = YES

-

-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 

-# documentation blocks found inside the body of a function. 

-# If set to NO (the default) these blocks will be appended to the 

-# function's detailed documentation block.

-

-HIDE_IN_BODY_DOCS      = NO

-

-# The INTERNAL_DOCS tag determines if documentation 

-# that is typed after a \internal command is included. If the tag is set 

-# to NO (the default) then the documentation will be excluded. 

-# Set it to YES to include the internal documentation.

-

-INTERNAL_DOCS          = NO

-

-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 

-# file names in lower-case letters. If set to YES upper-case letters are also 

-# allowed. This is useful if you have classes or files whose names only differ 

-# in case and if your file system supports case sensitive file names. Windows 

-# users are advised to set this option to NO.

-

-CASE_SENSE_NAMES       = YES

-

-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 

-# will show members with their full class and namespace scopes in the 

-# documentation. If set to YES the scope will be hidden.

-

-HIDE_SCOPE_NAMES       = NO

-

-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 

-# will put a list of the files that are included by a file in the documentation 

-# of that file.

-

-SHOW_INCLUDE_FILES     = NO

-

-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 

-# is inserted in the documentation for inline members.

-

-INLINE_INFO            = YES

-

-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 

-# will sort the (detailed) documentation of file and class members 

-# alphabetically by member name. If set to NO the members will appear in 

-# declaration order.

-

-SORT_MEMBER_DOCS       = NO

-

-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 

-# brief documentation of file, namespace and class members alphabetically 

-# by member name. If set to NO (the default) the members will appear in 

-# declaration order.

-

-SORT_BRIEF_DOCS        = NO

-

-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 

-# sorted by fully-qualified names, including namespaces. If set to 

-# NO (the default), the class list will be sorted only by class name, 

-# not including the namespace part. 

-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.

-# Note: This option applies only to the class list, not to the 

-# alphabetical list.

-

-SORT_BY_SCOPE_NAME     = NO

-

-# The GENERATE_TODOLIST tag can be used to enable (YES) or 

-# disable (NO) the todo list. This list is created by putting \todo 

-# commands in the documentation.

-

-GENERATE_TODOLIST      = YES

-

-# The GENERATE_TESTLIST tag can be used to enable (YES) or 

-# disable (NO) the test list. This list is created by putting \test 

-# commands in the documentation.

-

-GENERATE_TESTLIST      = YES

-

-# The GENERATE_BUGLIST tag can be used to enable (YES) or 

-# disable (NO) the bug list. This list is created by putting \bug 

-# commands in the documentation.

-

-GENERATE_BUGLIST       = YES

-

-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 

-# disable (NO) the deprecated list. This list is created by putting 

-# \deprecated commands in the documentation.

-

-GENERATE_DEPRECATEDLIST= YES

-

-# The ENABLED_SECTIONS tag can be used to enable conditional 

-# documentation sections, marked by \if sectionname  \ \endif.

-

-ENABLED_SECTIONS       = 

-

-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 

-# the initial value of a variable or define consists of for it to appear in 

-# the documentation. If the initializer consists of more lines than specified 

-# here it will be hidden. Use a value of 0 to hide initializers completely. 

-# The appearance of the initializer of individual variables and defines in the 

-# documentation can be controlled using \showinitializer or \hideinitializer 

-# command in the documentation regardless of this setting.

-

-MAX_INITIALIZER_LINES  = 30

-

-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 

-# at the bottom of the documentation of classes and structs. If set to YES the 

-# list will mention the files that were used to generate the documentation.

-

-SHOW_USED_FILES        = YES

-

-#---------------------------------------------------------------------------

-# configuration options related to warning and progress messages

-#---------------------------------------------------------------------------

-

-# The QUIET tag can be used to turn on/off the messages that are generated 

-# by doxygen. Possible values are YES and NO. If left blank NO is used.

-

-QUIET                  = NO

-

-# The WARNINGS tag can be used to turn on/off the warning messages that are 

-# generated by doxygen. Possible values are YES and NO. If left blank 

-# NO is used.

-

-WARNINGS               = YES

-

-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 

-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 

-# automatically be disabled.

-

-WARN_IF_UNDOCUMENTED   = YES

-

-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 

-# potential errors in the documentation, such as not documenting some 

-# parameters in a documented function, or documenting parameters that 

-# don't exist or using markup commands wrongly.

-

-WARN_IF_DOC_ERROR      = YES

-

-# The WARN_FORMAT tag determines the format of the warning messages that 

-# doxygen can produce. The string should contain the $file, $line, and $text 

-# tags, which will be replaced by the file and line number from which the 

-# warning originated and the warning text.

-

-WARN_FORMAT            = 

-

-# The WARN_LOGFILE tag can be used to specify a file to which warning 

-# and error messages should be written. If left blank the output is written 

-# to stderr.

-

-WARN_LOGFILE           = doxygen.log

-

-#---------------------------------------------------------------------------

-# configuration options related to the input files

-#---------------------------------------------------------------------------

-

-# The INPUT tag can be used to specify the files and/or directories that contain 

-# documented source files. You may enter file names like "myfile.cpp" or 

-# directories like "/usr/src/myproject". Separate the files or directories 

-# with spaces.

-

-INPUT = \

- ../src/framework/uima/annotator_abase.hpp \

- ../src/framework/uima/annotator_context.hpp \

- ../src/cas/uima/arrayfs.hpp \

- ../src/framework/uima/assertmsg.h \

- ../src/framework/uima/capability.hpp \

- ../src/cas/uima/cas.hpp \

- ../src/framework/uima/casiterator.hpp \

- ../src/framework/uima/casdefinition.hpp \

- ../src/cas/uima/casexception.hpp \

- ../src/framework/uima/caswriter_abase.hpp \

- ../src/framework/uima/ccsid.hpp \

- ../src/framework/uima/comp_ids.h \

- ../src/framework/uima/config_param.hpp \

- ../src/framework/uima/configure.h \

- ../src/framework/uima/consoleui.hpp \

- ../src/framework/uima/cp2ucnvrt.hpp \

- ../src/framework/uima/dirwalk.hpp \

- ../src/framework/uima/dllfile.hpp \

- ../src/framework/uima/dottypesystemwriter.hpp \

- ../src/framework/uima/endian.h \

- ../src/framework/uima/engine.hpp \

- ../src/framework/uima/engine_state.hpp \

- ../src/framework/uima/envvar.hpp \

- ../src/framework/uima/envvars.h \

- ../src/framework/uima/err_ids.h \

- ../src/framework/uima/exceptions.hpp \

- ../src/cas/uima/featurestructure.hpp \

- ../src/framework/uima/filename.hpp \

- ../src/cas/uima/fsindex.hpp \

- ../src/cas/uima/fsindexrepository.hpp \

- ../src/cas/uima/fsiterator.hpp \

- ../src/framework/uima/ftools.hpp \

- ../src/framework/uima/importdescription.hpp \

- ../src/framework/uima/language.hpp \

- ../src/cas/uima/listfs.hpp \

- ../src/framework/uima/location.hpp \

- ../src/framework/uima/log.hpp \

- ../src/framework/uima/macros.h \

- ../src/framework/uima/pragmas.hpp \

- ../src/framework/uima/res_abase.hpp \

- ../src/framework/uima/res_annotator.hpp \

- ../src/framework/uima/resmgr.hpp \

- ../src/framework/uima/result_specification.hpp \

- ../src/cas/uima/sofaid.hpp \

- ../src/framework/uima/sofamapping.hpp \

- ../src/cas/uima/sofastream.hpp \

- ../src/cas/uima/sofastreamhandler.hpp \

- ../src/framework/uima/strconvert.hpp \

- ../src/framework/uima/taemetadata.hpp \

- ../src/framework/uima/taespecifier.hpp \

- ../src/framework/uima/taespecifierbuilder.hpp \

- ../src/framework/uima/text.h \

- ../src/framework/uima/timedatetools.hpp \

- ../src/framework/uima/token_properties.hpp \

- ../src/framework/uima/trace.hpp \

- ../src/cas/uima/type_or_feature.hpp \

- ../src/cas/uima/typenamespace.hpp \

- ../src/framework/uima/types.h \

- ../src/cas/uima/typesystem.hpp \

- ../src/framework/uima/typesystemdescription.hpp \

- ../src/framework/uima/u2cpcnvrt.hpp \

- ../src/framework/uima/unistrref.hpp \

- ../src/cas/uima/xcasdeserializer.hpp \

- ../src/cas/uima/xcasdeserializer_handler.hpp \

- ../src/cas/uima/xmlerror_handler.hpp \

- ../src/cas/uima/xmlwriter.hpp 

-

-

-

-# If the value of the INPUT tag contains directories, you can use the 

-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

-# and *.h) to filter out the source-files in the directories. If left 

-# blank the following patterns are tested: 

-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 

-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc

-

-FILE_PATTERNS          = *.hpp \

-                         *.h

-

-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 

-# should be searched for input files as well. Possible values are YES and NO. 

-# If left blank NO is used.

-

-RECURSIVE              = NO

-

-# The EXCLUDE tag can be used to specify files and/or directories that should 

-# excluded from the INPUT source files. This way you can easily exclude a 

-# subdirectory from a directory tree whose root is specified with the INPUT tag.

-

-EXCLUDE                = 

-

-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 

-# that are symbolic links (a Unix filesystem feature) are excluded from the input.

-

-EXCLUDE_SYMLINKS       = NO

-

-# If the value of the INPUT tag contains directories, you can use the 

-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 

-# certain files from those directories.

-

-EXCLUDE_PATTERNS       = stltools.* \

-                         strhashfuncts.* \

-                         strtools.* \

-                         fssystem.* \

-                         *_imp.hpp \

-                         stl*.hpp \

-                         annotator.hpp \

-                         annotator_aux.hpp \

-                         annotator_def.hpp \

-                         annotator_file.hpp \

-                         annotator_m*.hpp \

-                         annotator_timing.hpp \

-                         filter_*.hpp \

-                         doc_*.* \

-                         allocator*.* \

-                         chars.* \

-                         icu_*.* \

-                         lstrings.* \

-                         internal_*.* \

-                         lowlevel_*.* \

-                         msgstrtab.h \

-                         annotator_api.h \

-                         htmlparser_tools.hpp \

-                         parse_handlers.hpp \

-                         fsfilterbuilder.hpp \

-                         msg.h \

-                         project_level.h \

-                         xmltypesystemreader.hpp \

-                         xmltypesystemwriter.hpp \

-                         config_tools.hpp \

-                         strptrlenpair.hpp

-

-# The EXAMPLE_PATH tag can be used to specify one or more files or 

-# directories that contain example code fragments that are included (see 

-# the \include command).

-

-EXAMPLE_PATH           = 

-

-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 

-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

-# and *.h) to filter out the source-files in the directories. If left 

-# blank all files are included.

-

-EXAMPLE_PATTERNS       = 

-

-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 

-# searched for input files to be used with the \include or \dontinclude 

-# commands irrespective of the value of the RECURSIVE tag. 

-# Possible values are YES and NO. If left blank NO is used.

-

-EXAMPLE_RECURSIVE      = NO

-

-# The IMAGE_PATH tag can be used to specify one or more files or 

-# directories that contain image that are included in the documentation (see 

-# the \image command).

-

-IMAGE_PATH             = 

-

-# The INPUT_FILTER tag can be used to specify a program that doxygen should 

-# invoke to filter for each input file. Doxygen will invoke the filter program 

-# by executing (via popen()) the command <filter> <input-file>, where <filter> 

-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 

-# input file. Doxygen will then use the output that the filter program writes 

-# to standard output.

-

-INPUT_FILTER           = 

-

-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 

-# INPUT_FILTER) will be used to filter the input files when producing source 

-# files to browse (i.e. when SOURCE_BROWSER is set to YES).

-

-FILTER_SOURCE_FILES    = NO

-

-#---------------------------------------------------------------------------

-# configuration options related to source browsing

-#---------------------------------------------------------------------------

-

-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 

-# be generated. Documented entities will be cross-referenced with these sources. 

-# Note: To get rid of all source code in the generated output, make sure also 

-# VERBATIM_HEADERS is set to NO.

-

-SOURCE_BROWSER         = NO

-

-# Setting the INLINE_SOURCES tag to YES will include the body 

-# of functions and classes directly in the documentation.

-

-INLINE_SOURCES         = NO

-

-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 

-# doxygen to hide any special comment blocks from generated source code 

-# fragments. Normal C and C++ comments will always remain visible.

-

-STRIP_CODE_COMMENTS    = YES

-

-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 

-# then for each documented function all documented 

-# functions referencing it will be listed.

-

-REFERENCED_BY_RELATION = YES

-

-# If the REFERENCES_RELATION tag is set to YES (the default) 

-# then for each documented function all documented entities 

-# called/used by that function will be listed.

-

-REFERENCES_RELATION    = YES

-

-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 

-# will generate a verbatim copy of the header file for each class for 

-# which an include is specified. Set to NO to disable this.

-

-VERBATIM_HEADERS       = NO

-

-#---------------------------------------------------------------------------

-# configuration options related to the alphabetical class index

-#---------------------------------------------------------------------------

-

-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 

-# of all compounds will be generated. Enable this if the project 

-# contains a lot of classes, structs, unions or interfaces.

-

-ALPHABETICAL_INDEX     = YES

-

-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 

-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 

-# in which this list will be split (can be a number in the range [1..20])

-

-COLS_IN_ALPHA_INDEX    = 2

-

-# In case all classes in a project start with a common prefix, all 

-# classes will be put under the same header in the alphabetical index. 

-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 

-# should be ignored while generating the index headers.

-

-IGNORE_PREFIX          = UIMA_ \

-                         UIMA \

-                         Uima \

-                         uima_ \

-                         uima

-

-#---------------------------------------------------------------------------

-# configuration options related to the HTML output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 

-# generate HTML output.

-

-GENERATE_HTML          = YES

-

-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 

-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 

-# put in front of it. If left blank `html' will be used as the default path.

-

-HTML_OUTPUT            = 

-

-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 

-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 

-# doxygen will generate files with .html extension.

-

-HTML_FILE_EXTENSION    = .html

-

-# The HTML_HEADER tag can be used to specify a personal HTML header for 

-# each generated HTML page. If it is left blank doxygen will generate a 

-# standard header.

-HTML_HEADER			= doxyheader.html

-

-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 

-# each generated HTML page. If it is left blank doxygen will generate a 

-# standard footer.

-

-#HTML_FOOTER            = doxyfooter.html

-

-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 

-# style sheet that is used by each HTML page. It can be used to 

-# fine-tune the look of the HTML output. If the tag is left blank doxygen 

-# will generate a default style sheet. Note that doxygen will try to copy 

-# the style sheet file to the HTML output directory, so don't put your own 

-# stylesheet in the HTML output directory as well, or it will be erased!

-

-HTML_STYLESHEET        = 

-

-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 

-# files or namespaces will be aligned in HTML using tables. If set to 

-# NO a bullet list will be used.

-

-HTML_ALIGN_MEMBERS     = YES

-

-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 

-# will be generated that can be used as input for tools like the 

-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 

-# of the generated HTML documentation.

-

-GENERATE_HTMLHELP      = YES

-

-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 

-# be used to specify the file name of the resulting .chm file. You 

-# can add a path in front of the file if the result should not be 

-# written to the html output directory.

-

-CHM_FILE               = 

-

-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 

-# be used to specify the location (absolute path including file name) of 

-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 

-# the HTML help compiler on the generated index.hhp.

-

-HHC_LOCATION           = 

-

-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 

-# controls if a separate .chi index file is generated (YES) or that 

-# it should be included in the master .chm file (NO).

-

-GENERATE_CHI           = NO

-

-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 

-# controls whether a binary table of contents is generated (YES) or a 

-# normal table of contents (NO) in the .chm file.

-

-BINARY_TOC             = NO

-

-# The TOC_EXPAND flag can be set to YES to add extra items for group members 

-# to the contents of the HTML help documentation and to the tree view.

-

-TOC_EXPAND             = NO

-

-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 

-# top of each HTML page. The value NO (the default) enables the index and 

-# the value YES disables it.

-

-DISABLE_INDEX          = YES

-

-# This tag can be used to set the number of enum values (range [1..20]) 

-# that doxygen will group on one line in the generated HTML documentation.

-

-ENUM_VALUES_PER_LINE   = 4

-

-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be

-# generated containing a tree-like index structure (just like the one that 

-# is generated for HTML Help). For this to work a browser that supports 

-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 

-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 

-# probably better off using the HTML help feature.

-

-GENERATE_TREEVIEW      = NO

-

-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 

-# used to set the initial width (in pixels) of the frame in which the tree 

-# is shown.

-

-TREEVIEW_WIDTH         = 250

-

-#---------------------------------------------------------------------------

-# configuration options related to the LaTeX output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 

-# generate Latex output.

-

-GENERATE_LATEX         = NO

-

-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 

-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 

-# put in front of it. If left blank `latex' will be used as the default path.

-

-LATEX_OUTPUT           = 

-

-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 

-# invoked. If left blank `latex' will be used as the default command name.

-

-LATEX_CMD_NAME         = latex

-

-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 

-# generate index for LaTeX. If left blank `makeindex' will be used as the 

-# default command name.

-

-MAKEINDEX_CMD_NAME     = makeindex

-

-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 

-# LaTeX documents. This may be useful for small projects and may help to 

-# save some trees in general.

-

-COMPACT_LATEX          = NO

-

-# The PAPER_TYPE tag can be used to set the paper type that is used 

-# by the printer. Possible values are: a4, a4wide, letter, legal and 

-# executive. If left blank a4wide will be used.

-

-PAPER_TYPE             = a4wide

-

-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 

-# packages that should be included in the LaTeX output.

-

-EXTRA_PACKAGES         = 

-

-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 

-# the generated latex document. The header should contain everything until 

-# the first chapter. If it is left blank doxygen will generate a 

-# standard header. Notice: only use this tag if you know what you are doing!

-

-LATEX_HEADER           = 

-

-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 

-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 

-# contain links (just like the HTML output) instead of page references 

-# This makes the output suitable for online browsing using a pdf viewer.

-

-PDF_HYPERLINKS         = NO

-

-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 

-# plain latex in the generated Makefile. Set this option to YES to get a 

-# higher quality PDF documentation.

-

-USE_PDFLATEX           = NO

-

-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 

-# command to the generated LaTeX files. This will instruct LaTeX to keep 

-# running if errors occur, instead of asking the user for help. 

-# This option is also used when generating formulas in HTML.

-

-LATEX_BATCHMODE        = NO

-

-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 

-# include the index chapters (such as File Index, Compound Index, etc.) 

-# in the output.

-

-LATEX_HIDE_INDICES     = NO

-

-#---------------------------------------------------------------------------

-# configuration options related to the RTF output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 

-# The RTF output is optimized for Word 97 and may not look very pretty with 

-# other RTF readers or editors.

-

-GENERATE_RTF           = NO

-

-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 

-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 

-# put in front of it. If left blank `rtf' will be used as the default path.

-

-RTF_OUTPUT             = 

-

-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 

-# RTF documents. This may be useful for small projects and may help to 

-# save some trees in general.

-

-COMPACT_RTF            = NO

-

-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 

-# will contain hyperlink fields. The RTF file will 

-# contain links (just like the HTML output) instead of page references. 

-# This makes the output suitable for online browsing using WORD or other 

-# programs which support those fields. 

-# Note: wordpad (write) and others do not support links.

-

-RTF_HYPERLINKS         = NO

-

-# Load stylesheet definitions from file. Syntax is similar to doxygen's 

-# config file, i.e. a series of assignments. You only have to provide 

-# replacements, missing definitions are set to their default value.

-

-RTF_STYLESHEET_FILE    = 

-

-# Set optional variables used in the generation of an rtf document. 

-# Syntax is similar to doxygen's config file.

-

-RTF_EXTENSIONS_FILE    = 

-

-#---------------------------------------------------------------------------

-# configuration options related to the man page output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 

-# generate man pages

-

-GENERATE_MAN           = NO

-

-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 

-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 

-# put in front of it. If left blank `man' will be used as the default path.

-

-MAN_OUTPUT             = 

-

-# The MAN_EXTENSION tag determines the extension that is added to 

-# the generated man pages (default is the subroutine's section .3)

-

-MAN_EXTENSION          = 

-

-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 

-# then it will generate one additional man file for each entity 

-# documented in the real man page(s). These additional files 

-# only source the real man page, but without them the man command 

-# would be unable to find the correct page. The default is NO.

-

-MAN_LINKS              = NO

-

-#---------------------------------------------------------------------------

-# configuration options related to the XML output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_XML tag is set to YES Doxygen will 

-# generate an XML file that captures the structure of 

-# the code including all documentation.

-

-GENERATE_XML           = NO

-

-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 

-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 

-# put in front of it. If left blank `xml' will be used as the default path.

-

-XML_OUTPUT             = xml

-

-# The XML_SCHEMA tag can be used to specify an XML schema, 

-# which can be used by a validating XML parser to check the 

-# syntax of the XML files.

-

-XML_SCHEMA             = 

-

-# The XML_DTD tag can be used to specify an XML DTD, 

-# which can be used by a validating XML parser to check the 

-# syntax of the XML files.

-

-XML_DTD                = 

-

-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 

-# dump the program listings (including syntax highlighting 

-# and cross-referencing information) to the XML output. Note that 

-# enabling this will significantly increase the size of the XML output.

-

-XML_PROGRAMLISTING     = YES

-

-#---------------------------------------------------------------------------

-# configuration options for the AutoGen Definitions output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 

-# generate an AutoGen Definitions (see autogen.sf.net) file 

-# that captures the structure of the code including all 

-# documentation. Note that this feature is still experimental 

-# and incomplete at the moment.

-

-GENERATE_AUTOGEN_DEF   = NO

-

-#---------------------------------------------------------------------------

-# configuration options related to the Perl module output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 

-# generate a Perl module file that captures the structure of 

-# the code including all documentation. Note that this 

-# feature is still experimental and incomplete at the 

-# moment.

-

-GENERATE_PERLMOD       = NO

-

-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 

-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 

-# to generate PDF and DVI output from the Perl module output.

-

-PERLMOD_LATEX          = NO

-

-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 

-# nicely formatted so it can be parsed by a human reader.  This is useful 

-# if you want to understand what is going on.  On the other hand, if this 

-# tag is set to NO the size of the Perl module output will be much smaller 

-# and Perl will parse it just the same.

-

-PERLMOD_PRETTY         = YES

-

-# The names of the make variables in the generated doxyrules.make file 

-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 

-# This is useful so different doxyrules.make files included by the same 

-# Makefile don't overwrite each other's variables.

-

-PERLMOD_MAKEVAR_PREFIX = 

-

-#---------------------------------------------------------------------------

-# Configuration options related to the preprocessor   

-#---------------------------------------------------------------------------

-

-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 

-# evaluate all C-preprocessor directives found in the sources and include 

-# files.

-

-ENABLE_PREPROCESSING   = YES

-

-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 

-# names in the source code. If set to NO (the default) only conditional 

-# compilation will be performed. Macro expansion can be done in a controlled 

-# way by setting EXPAND_ONLY_PREDEF to YES.

-

-MACRO_EXPANSION        = YES

-

-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 

-# then the macro expansion is limited to the macros specified with the 

-# PREDEFINED and EXPAND_AS_PREDEFINED tags.

-

-EXPAND_ONLY_PREDEF     = YES

-

-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 

-# in the INCLUDE_PATH (see below) will be search if a #include is found.

-

-SEARCH_INCLUDES        = YES

-

-# The INCLUDE_PATH tag can be used to specify one or more directories that 

-# contain include files that are not input files but should be processed by 

-# the preprocessor.

-

-INCLUDE_PATH           = 

-

-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 

-# patterns (like *.h and *.hpp) to filter out the header-files in the 

-# directories. If left blank, the patterns specified with FILE_PATTERNS will 

-# be used.

-

-INCLUDE_FILE_PATTERNS  = 

-

-# The PREDEFINED tag can be used to specify one or more macro names that 

-# are defined before the preprocessor is started (similar to the -D option of 

-# gcc). The argument of the tag is a list of macros of the form: name 

-# or name=definition (no spaces). If the definition and the = are 

-# omitted =1 is assumed.

-

-PREDEFINED             = COS_LINK_CONV= \

-                         UIMA_LINK_IMPORTSPEC= \

-                         _M_IX86=1 \

-                         __OS_FS_DOS__=1 \

-                         __OS_WIN32__=1 \

-                         __cplusplus=1 \

-                         BasicFSListFS=BasicListFS \

-                         BasicFloatListFS=BasicListFS \

-                         BasicIntListFS=BasicListFS \

-                         BasicStringListFS=BasicListFS

-

-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 

-# this tag can be used to specify a list of macro names that should be expanded. 

-# The macro definition that is found in the sources will be used. 

-# Use the PREDEFINED tag if you want to use a different macro definition.

-

-EXPAND_AS_DEFINED      = UIMA_FS_LIST_TEMPLATE \

-                         UIMA_FLOAT_LIST_TEMPLATE \

-                         UIMA_INT_LIST_TEMPLATE \

-                         UIMA_STRING_LIST_TEMPLATE \

-                         UIMA_FS_ARRAY_TEMPLATE \

-                         UIMA_FLOAT_ARRAY_TEMPLATE \

-                         UIMA_INT_ARRAY_TEMPLATE \

-                         UIMA_STRING_ARRAY_TEMPLATE

-

-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 

-# doxygen's preprocessor will remove all function-like macros that are alone 

-# on a line, have an all uppercase name, and do not end with a semicolon. Such 

-# function macros are typically used for boiler-plate code, and will confuse the 

-# parser if not removed.

-

-SKIP_FUNCTION_MACROS   = YES

-

-#---------------------------------------------------------------------------

-# Configuration::additions related to external references   

-#---------------------------------------------------------------------------

-

-# The TAGFILES option can be used to specify one or more tagfiles. 

-# Optionally an initial location of the external documentation 

-# can be added for each tagfile. The format of a tag file without 

-# this location is as follows: 

-#   TAGFILES = file1 file2  \ 

-# Adding location for the tag files is done as follows: 

-#   TAGFILES = file1=loc1 "file2 = loc2"  \ 

-# where "loc1" and "loc2" can be relative or absolute paths or 

-# URLs. If a location is present for each tag, the installdox tool 

-# does not have to be run to correct the links.

-# Note that each tag file must have a unique name

-# (where the name does NOT include the path)

-# If a tag file is not located in the directory in which doxygen 

-# is run, you must also specify the path to the tagfile here.

-

-# TAGFILES               =

-

-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 

-# a tag file that is based on the input files it reads.

-

-GENERATE_TAGFILE       = ../docs/uimadoxytags.tag

-

-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 

-# in the class index. If set to NO only the inherited external classes 

-# will be listed.

-

-ALLEXTERNALS           = NO

-

-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 

-# in the modules index. If set to NO, only the current project's groups will 

-# be listed.

-

-EXTERNAL_GROUPS        = YES

-

-# The PERL_PATH should be the absolute path and name of the perl script 

-# interpreter (i.e. the result of `which perl').

-

-PERL_PATH              = 

-

-#---------------------------------------------------------------------------

-# Configuration options related to the dot tool   

-#---------------------------------------------------------------------------

-

-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 

-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 

-# super classes. Setting the tag to NO turns the diagrams off. Note that this 

-# option is superseded by the HAVE_DOT option below. This is only a fallback. It is 

-# recommended to install and use dot, since it yields more powerful graphs.

-

-CLASS_DIAGRAMS         = NO

-

-# If set to YES, the inheritance and collaboration graphs will hide 

-# inheritance and usage relations if the target is undocumented 

-# or is not a class.

-

-HIDE_UNDOC_RELATIONS   = YES

-

-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 

-# available from the path. This tool is part of Graphviz, a graph visualization 

-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 

-# have no effect if this option is set to NO (the default)

-

-HAVE_DOT               = NO

-

-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 

-# will generate a graph for each documented class showing the direct and 

-# indirect inheritance relations. Setting this tag to YES will force the 

-# the CLASS_DIAGRAMS tag to NO.

-

-CLASS_GRAPH            = NO

-

-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 

-# will generate a graph for each documented class showing the direct and 

-# indirect implementation dependencies (inheritance, containment, and 

-# class references variables) of the class with other documented classes.

-

-COLLABORATION_GRAPH    = NO

-

-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 

-# collaboration diagrams in a style similar to the OMG's Unified Modeling 

-# Language.

-

-UML_LOOK               = YES

-

-# If set to YES, the inheritance and collaboration graphs will show the 

-# relations between templates and their instances.

-

-TEMPLATE_RELATIONS     = YES

-

-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 

-# tags are set to YES then doxygen will generate a graph for each documented 

-# file showing the direct and indirect include dependencies of the file with 

-# other documented files.

-

-INCLUDE_GRAPH          = YES

-

-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 

-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 

-# documented header file showing the documented files that directly or 

-# indirectly include this file.

-

-INCLUDED_BY_GRAPH      = YES

-

-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 

-# generate a call dependency graph for every global function or class method. 

-# Note that enabling this option will significantly increase the time of a run. 

-# So in most cases it will be better to enable call graphs for selected 

-# functions only using the \callgraph command.

-

-CALL_GRAPH             = NO

-

-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 

-# will graphical hierarchy of all classes instead of a textual one.

-

-GRAPHICAL_HIERARCHY    = NO

-

-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 

-# generated by dot. Possible values are png, jpg, or gif

-# If left blank png will be used.

-

-DOT_IMAGE_FORMAT       = png

-

-# The tag DOT_PATH can be used to specify the path where the dot tool can be 

-# found. If left blank, it is assumed the dot tool can be found on the path.

-

-DOT_PATH               = 

-

-# The DOTFILE_DIRS tag can be used to specify one or more directories that 

-# contain dot files that are included in the documentation (see the 

-# \dotfile command).

-

-DOTFILE_DIRS           = 

-

-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 

-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 

-# this value, doxygen will try to truncate the graph, so that it fits within 

-# the specified constraint. Beware that most browsers cannot cope with very 

-# large images.

-

-MAX_DOT_GRAPH_WIDTH    = 1024

-

-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 

-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 

-# this value, doxygen will try to truncate the graph, so that it fits within 

-# the specified constraint. Beware that most browsers cannot cope with very 

-# large images.

-

-MAX_DOT_GRAPH_HEIGHT   = 1024

-

-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 

-# graphs generated by dot. A depth value of 3 means that only nodes reachable 

-# from the root by following a path via at most 3 edges will be shown. Nodes that 

-# lay further from the root node will be omitted. Note that setting this option to 

-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also 

-# note that a graph may be further truncated if the graph's image dimensions are 

-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 

-# If 0 is used for the depth value (the default), the graph is not depth-constrained.

-

-MAX_DOT_GRAPH_DEPTH    = 0

-

-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 

-# generate a legend page explaining the meaning of the various boxes and 

-# arrows in the dot generated graphs.

-

-GENERATE_LEGEND        = YES

-

-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 

-# remove the intermediate dot files that are used to generate 

-# the various graphs.

-

-DOT_CLEANUP            = YES

-

-#---------------------------------------------------------------------------

-# Configuration::additions related to the search engine   

-#---------------------------------------------------------------------------

-

-# The SEARCHENGINE tag specifies whether or not a search engine should be 

-# used. If set to NO the values of all tags below this one will be ignored.

-

-SEARCHENGINE           = NO

+# Doxyfile 1.3.6
+
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value,  \]
+# For lists items can also be appended using:
+#       TAG += value [value,  \]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = "UIMACPP API"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = "v2.4.0"
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ../docs
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
+# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
+# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese, 
+# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# This tag can be used to specify the encoding used in the generated output. 
+# The encoding is not always determined by the language that is chosen, 
+# but also whether or not the output is meant for Windows or non-Windows users. 
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
+# forces the Windows encoding (this is the default for the Windows binary), 
+# whereas setting the tag to NO uses a Unix-style encoding (the default for 
+# all platforms other than Windows).
+
+USE_WINDOWS_ENCODING   = YES
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is used 
+# as the annotated text. Otherwise, the brief description is used as-is. If left 
+# blank, the following values are used ("$name" is automatically replaced with the 
+# name of the entity): "The $name class" "The $name widget" "The $name file" 
+# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
+# members of a class in the documentation of that class as if those members were 
+# ordinary class members. Constructors, destructors and assignment operators of 
+# the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. It is allowed to use relative paths in the argument list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like the Qt-style comments (thus requiring an 
+# explicit @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 3
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = ibm_external_copyright= \
+                         end_ibm_external_copyright= \
+                         ibm_internal_copyright= \
+                         end_ibm_internal_copyright= \
+                         draft= \
+                         stable=
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
+# only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
+# only. Doxygen will then generate output that is more tailored for Java. 
+# For instance, namespaces will be presented as packages, qualified scopes 
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = YES
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname  \ \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text.
+
+WARN_FORMAT            = 
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = doxygen.log
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT = \
+ ../src/framework/uima/annotator_abase.hpp \
+ ../src/framework/uima/annotator_context.hpp \
+ ../src/cas/uima/arrayfs.hpp \
+ ../src/framework/uima/assertmsg.h \
+ ../src/framework/uima/capability.hpp \
+ ../src/cas/uima/cas.hpp \
+ ../src/framework/uima/casiterator.hpp \
+ ../src/framework/uima/casdefinition.hpp \
+ ../src/cas/uima/casexception.hpp \
+ ../src/framework/uima/caswriter_abase.hpp \
+ ../src/framework/uima/ccsid.hpp \
+ ../src/framework/uima/comp_ids.h \
+ ../src/framework/uima/config_param.hpp \
+ ../src/framework/uima/configure.h \
+ ../src/framework/uima/consoleui.hpp \
+ ../src/framework/uima/cp2ucnvrt.hpp \
+ ../src/framework/uima/dirwalk.hpp \
+ ../src/framework/uima/dllfile.hpp \
+ ../src/framework/uima/dottypesystemwriter.hpp \
+ ../src/framework/uima/endian.h \
+ ../src/framework/uima/engine.hpp \
+ ../src/framework/uima/engine_state.hpp \
+ ../src/framework/uima/envvar.hpp \
+ ../src/framework/uima/envvars.h \
+ ../src/framework/uima/err_ids.h \
+ ../src/framework/uima/exceptions.hpp \
+ ../src/cas/uima/featurestructure.hpp \
+ ../src/framework/uima/filename.hpp \
+ ../src/cas/uima/fsindex.hpp \
+ ../src/cas/uima/fsindexrepository.hpp \
+ ../src/cas/uima/fsiterator.hpp \
+ ../src/framework/uima/ftools.hpp \
+ ../src/framework/uima/importdescription.hpp \
+ ../src/framework/uima/language.hpp \
+ ../src/cas/uima/listfs.hpp \
+ ../src/framework/uima/location.hpp \
+ ../src/framework/uima/log.hpp \
+ ../src/framework/uima/macros.h \
+ ../src/framework/uima/pragmas.hpp \
+ ../src/framework/uima/res_abase.hpp \
+ ../src/framework/uima/res_annotator.hpp \
+ ../src/framework/uima/resmgr.hpp \
+ ../src/framework/uima/result_specification.hpp \
+ ../src/cas/uima/sofaid.hpp \
+ ../src/framework/uima/sofamapping.hpp \
+ ../src/cas/uima/sofastream.hpp \
+ ../src/cas/uima/sofastreamhandler.hpp \
+ ../src/framework/uima/strconvert.hpp \
+ ../src/framework/uima/taemetadata.hpp \
+ ../src/framework/uima/taespecifier.hpp \
+ ../src/framework/uima/taespecifierbuilder.hpp \
+ ../src/framework/uima/text.h \
+ ../src/framework/uima/timedatetools.hpp \
+ ../src/framework/uima/token_properties.hpp \
+ ../src/framework/uima/trace.hpp \
+ ../src/cas/uima/type_or_feature.hpp \
+ ../src/cas/uima/typenamespace.hpp \
+ ../src/framework/uima/types.h \
+ ../src/cas/uima/typesystem.hpp \
+ ../src/framework/uima/typesystemdescription.hpp \
+ ../src/framework/uima/u2cpcnvrt.hpp \
+ ../src/framework/uima/unistrref.hpp \
+ ../src/cas/uima/xcasdeserializer.hpp \
+ ../src/cas/uima/xcasdeserializer_handler.hpp \
+ ../src/cas/uima/xmlerror_handler.hpp \
+ ../src/cas/uima/xmlwriter.hpp 
+
+
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
+# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
+
+FILE_PATTERNS          = *.hpp \
+                         *.h
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
+# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories.
+
+EXCLUDE_PATTERNS       = stltools.* \
+                         strhashfuncts.* \
+                         strtools.* \
+                         fssystem.* \
+                         *_imp.hpp \
+                         stl*.hpp \
+                         annotator.hpp \
+                         annotator_aux.hpp \
+                         annotator_def.hpp \
+                         annotator_file.hpp \
+                         annotator_m*.hpp \
+                         annotator_timing.hpp \
+                         filter_*.hpp \
+                         doc_*.* \
+                         allocator*.* \
+                         chars.* \
+                         icu_*.* \
+                         lstrings.* \
+                         internal_*.* \
+                         lowlevel_*.* \
+                         msgstrtab.h \
+                         annotator_api.h \
+                         htmlparser_tools.hpp \
+                         parse_handlers.hpp \
+                         fsfilterbuilder.hpp \
+                         msg.h \
+                         project_level.h \
+                         xmltypesystemreader.hpp \
+                         xmltypesystemwriter.hpp \
+                         config_tools.hpp \
+                         strptrlenpair.hpp
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.
+
+INPUT_FILTER           = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default) 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 2
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = UIMA_ \
+                         UIMA \
+                         Uima \
+                         uima_ \
+                         uima
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = 
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+HTML_HEADER			= doxyheader.html
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+#HTML_FOOTER            = doxyfooter.html
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = YES
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = 
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = 
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = 
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = 
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+
+EXPAND_ONLY_PREDEF     = YES
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed.
+
+PREDEFINED             = COS_LINK_CONV= \
+                         UIMA_LINK_IMPORTSPEC= \
+                         _M_IX86=1 \
+                         __OS_FS_DOS__=1 \
+                         __OS_WIN32__=1 \
+                         __cplusplus=1 \
+                         BasicFSListFS=BasicListFS \
+                         BasicFloatListFS=BasicListFS \
+                         BasicIntListFS=BasicListFS \
+                         BasicStringListFS=BasicListFS
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = UIMA_FS_LIST_TEMPLATE \
+                         UIMA_FLOAT_LIST_TEMPLATE \
+                         UIMA_INT_LIST_TEMPLATE \
+                         UIMA_STRING_LIST_TEMPLATE \
+                         UIMA_FS_ARRAY_TEMPLATE \
+                         UIMA_FLOAT_ARRAY_TEMPLATE \
+                         UIMA_INT_ARRAY_TEMPLATE \
+                         UIMA_STRING_ARRAY_TEMPLATE
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse the 
+# parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2  \ 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2"  \ 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+# TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = ../docs/uimadoxytags.tag
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
+# super classes. Setting the tag to NO turns the diagrams off. Note that this 
+# option is superseded by the HAVE_DOT option below. This is only a fallback. It is 
+# recommended to install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS         = NO
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = NO
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = NO
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = YES
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# generate a call dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable call graphs for selected 
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = NO
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found on the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_WIDTH    = 1024
+
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_HEIGHT   = 1024
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes that 
+# lay further from the root node will be omitted. Note that setting this option to 
+# 1 or 2 may greatly reduce the computation time needed for large code bases. Also 
+# note that a graph may be further truncated if the graph's image dimensions are 
+# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 
+# If 0 is used for the depth value (the default), the graph is not depth-constrained.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
diff --git a/examples/data/docforsegmenter.xcas b/examples/data/docforsegmenter.xcas
index 87c74ab..0f31e5e 100644
--- a/examples/data/docforsegmenter.xcas
+++ b/examples/data/docforsegmenter.xcas
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-

-<CAS>

- <uima.cas.Sofa _indexed="0" _id="1" sofaNum="1" sofaID="_InitialView" mimeType="text" sofaString="This is the first sentence. This is the second sentence. This is the third sentence."/>

- <uima.tcas.DocumentAnnotation _indexed="1" _id="8" _ref_sofa="1" begin="0" end="84" language=""/>

-</CAS>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+<CAS>
+ <uima.cas.Sofa _indexed="0" _id="1" sofaNum="1" sofaID="_InitialView" mimeType="text" sofaString="This is the first sentence. This is the second sentence. This is the third sentence."/>
+ <uima.tcas.DocumentAnnotation _indexed="1" _id="8" _ref_sofa="1" begin="0" end="84" language=""/>
+</CAS>
diff --git a/examples/data/docforsegmenter.xmi b/examples/data/docforsegmenter.xmi
index b66f3b7..a790fe7 100644
--- a/examples/data/docforsegmenter.xmi
+++ b/examples/data/docforsegmenter.xmi
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-<xmi:XMI xmlns:examples="http:///org/apache/uima/examples.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI"  xmi:version="2.0">

-<cas:NULL xmi:id="0"/> <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView" mimeType="text" sofaString="This is the first sentence. This is the second sentence. This is the third sentence."/>

- <tcas:DocumentAnnotation xmi:id="8" sofa="1" begin="0" end="84"/>

-<cas:View sofa="1" members="8"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+<xmi:XMI xmlns:examples="http:///org/apache/uima/examples.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI"  xmi:version="2.0">
+<cas:NULL xmi:id="0"/> <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView" mimeType="text" sofaString="This is the first sentence. This is the second sentence. This is the third sentence."/>
+ <tcas:DocumentAnnotation xmi:id="8" sofa="1" begin="0" end="84"/>
+<cas:View sofa="1" members="8"/>
+</xmi:XMI>
diff --git a/examples/data/filetcas.xcas b/examples/data/filetcas.xcas
index 55066cd..59aef66 100644
--- a/examples/data/filetcas.xcas
+++ b/examples/data/filetcas.xcas
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-

-<CAS>

-<uima.cas.Sofa _indexed="0" _id="1" sofaNum="1" sofaID="EnglishDocument" mimeType="text"  sofaURI="file://data/example.txt" />

-</CAS>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+<CAS>
+<uima.cas.Sofa _indexed="0" _id="1" sofaNum="1" sofaID="EnglishDocument" mimeType="text"  sofaURI="file://data/example.txt" />
+</CAS>
diff --git a/examples/data/filetcas.xmi b/examples/data/filetcas.xmi
index fed24f2..1fcbd31 100644
--- a/examples/data/filetcas.xmi
+++ b/examples/data/filetcas.xmi
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-<xmi:XMI xmlns:examples="http:///org/apache/uima/examples.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI"  xmi:version="2.0">

-<cas:NULL xmi:id="0"/> <cas:Sofa xmi:id="1" sofaNum="2" sofaID="EnglishDocument" mimeType="text" sofaURI="file://data/example.txt"/>

-<cas:View sofa="1"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+<xmi:XMI xmlns:examples="http:///org/apache/uima/examples.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI"  xmi:version="2.0">
+<cas:NULL xmi:id="0"/> <cas:Sofa xmi:id="1" sofaNum="2" sofaID="EnglishDocument" mimeType="text" sofaURI="file://data/example.txt"/>
+<cas:View sofa="1"/>
+</xmi:XMI>
diff --git a/examples/data/sofa.xcas b/examples/data/sofa.xcas
index 19279fb..e470811 100644
--- a/examples/data/sofa.xcas
+++ b/examples/data/sofa.xcas
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-

-<CAS>

-<uima.cas.Sofa _indexed="0" _id="1" sofaNum="1" sofaID="EnglishDocument" mimeType="text"  sofaString="This is a text document for analysis" />

-<uima.tcas.DocumentAnnotation _indexed="1" _id="8" sofa="1" begin="0" end="36" language="**"/>

-</CAS>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+<CAS>
+<uima.cas.Sofa _indexed="0" _id="1" sofaNum="1" sofaID="EnglishDocument" mimeType="text"  sofaString="This is a text document for analysis" />
+<uima.tcas.DocumentAnnotation _indexed="1" _id="8" sofa="1" begin="0" end="36" language="**"/>
+</CAS>
diff --git a/examples/data/sofa.xmi b/examples/data/sofa.xmi
index 442a0c5..4f54c32 100644
--- a/examples/data/sofa.xmi
+++ b/examples/data/sofa.xmi
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-

-<xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI"  xmi:version="2.0">

-<cas:NULL xmi:id="0"/>

- <cas:Sofa xmi:id="1" sofaNum="1" sofaID="EnglishDocument" mimeType="text" sofaString="This is a text document for analysis"/>

- <tcas:DocumentAnnotation xmi:id="8" sofa="1" begin="0" end="36" language=""/>

-<cas:View sofa="1" members="8"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+<xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI"  xmi:version="2.0">
+<cas:NULL xmi:id="0"/>
+ <cas:Sofa xmi:id="1" sofaNum="1" sofaID="EnglishDocument" mimeType="text" sofaString="This is a text document for analysis"/>
+ <tcas:DocumentAnnotation xmi:id="8" sofa="1" begin="0" end="36" language=""/>
+<cas:View sofa="1" members="8"/>
+</xmi:XMI>
diff --git a/examples/data/tcas.xcas b/examples/data/tcas.xcas
index a83b946..467c97b 100644
--- a/examples/data/tcas.xcas
+++ b/examples/data/tcas.xcas
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-

-<CAS>

-<uima.tcas.Document _content="text"><![CDATA[This is a text document with Dave for analysis]]></uima.tcas.Document>

-<uima.tcas.DocumentAnnotation _indexed="1" _id="8" sofa="1" begin="0" end="46" language="**"/>

-</CAS>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+<CAS>
+<uima.tcas.Document _content="text"><![CDATA[This is a text document with Dave for analysis]]></uima.tcas.Document>
+<uima.tcas.DocumentAnnotation _indexed="1" _id="8" sofa="1" begin="0" end="46" language="**"/>
+</CAS>
diff --git a/examples/data/tcas.xmi b/examples/data/tcas.xmi
index 8c1acd6..ea03a2d 100644
--- a/examples/data/tcas.xmi
+++ b/examples/data/tcas.xmi
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-

-<xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI"  xmi:version="2.0">

-<cas:NULL xmi:id="0"/>

- <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView" mimeType="text" sofaString="This is a text document with Dave for analysis"/>

- <tcas:DocumentAnnotation xmi:id="8" sofa="1" begin="0" end="46" language=""/>

-<cas:View sofa="1" members="8"/>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+<xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI"  xmi:version="2.0">
+<cas:NULL xmi:id="0"/>
+ <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView" mimeType="text" sofaString="This is a text document with Dave for analysis"/>
+ <tcas:DocumentAnnotation xmi:id="8" sofa="1" begin="0" end="46" language=""/>
+<cas:View sofa="1" members="8"/>
+</xmi:XMI>
diff --git a/examples/descriptors/SimpleTextSegmenter.xml b/examples/descriptors/SimpleTextSegmenter.xml
index e7c2ae2..1987f61 100644
--- a/examples/descriptors/SimpleTextSegmenter.xml
+++ b/examples/descriptors/SimpleTextSegmenter.xml
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8" ?> 

-

-	<!--

-	 ***************************************************************

-	 * Licensed to the Apache Software Foundation (ASF) under one

-	 * or more contributor license agreements.  See the NOTICE file

-	 * distributed with this work for additional information

-	 * regarding copyright ownership.  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.  See the License for the

-	 * specific language governing permissions and limitations

-	 * under the License.

-	 ***************************************************************

-   -->

-

-<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">

-<frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-<primitive>true</primitive>

-<annotatorImplementationName>SimpleTextSegmenter</annotatorImplementationName>

- 

-<analysisEngineMetaData>

-	<name>Simple Text Segmenter</name>

-	<description>Splits a text document into pieces. The point at which the text is split is determined by SegmentDelimiter configuration parameter which defaults to new line ('\n')</description>

-	<version>1.0</version>

-	<vendor>IBM</vendor>

-	

-	<configurationParameters>

-		<configurationParameter>

-			<name>SegmentDelimiter</name>

-			<description>segment delimiter</description>

-			<type>String</type>

-			<multiValued>false</multiValued>

-			<mandatory>false</mandatory>

-		</configurationParameter>

-	</configurationParameters>

-	<configurationParameterSettings>

-		<nameValuePair>

-			<name>SegmentDelimiter</name>

-			<value>

-				<string>.</string>

-			</value>

-		</nameValuePair>

-	</configurationParameterSettings>

-

-	<typeSystemDescription/>

-

-	<fsIndexCollection>

-	 <fsIndexes>

-	   <fsIndexDescription>

-	      <label>TestIndex</label>

-	      <typeName>uima.cas.TOP</typeName>

-	      <kind>bag</kind>

-	      <keys/>

-	    </fsIndexDescription>

-          </fsIndexes>

-        </fsIndexCollection>

-		

-	<capabilities>

-		<capability>

-			<outputs/>

-		</capability>

-	</capabilities>

-	

-	<operationalProperties>

-		<modifiesCas>false</modifiesCas>

-		<multipleDeploymentAllowed>true</multipleDeploymentAllowed>

-		<outputsNewCASes>true</outputsNewCASes>

-	</operationalProperties>

-	

-</analysisEngineMetaData>

-</analysisEngineDescription>

+<?xml version="1.0" encoding="UTF-8" ?> 
+
+	<!--
+	 ***************************************************************
+	 * Licensed to the Apache Software Foundation (ASF) under one
+	 * or more contributor license agreements.  See the NOTICE file
+	 * distributed with this work for additional information
+	 * regarding copyright ownership.  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.  See the License for the
+	 * specific language governing permissions and limitations
+	 * under the License.
+	 ***************************************************************
+   -->
+
+<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
+<frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+<primitive>true</primitive>
+<annotatorImplementationName>SimpleTextSegmenter</annotatorImplementationName>
+ 
+<analysisEngineMetaData>
+	<name>Simple Text Segmenter</name>
+	<description>Splits a text document into pieces. The point at which the text is split is determined by SegmentDelimiter configuration parameter which defaults to new line ('\n')</description>
+	<version>1.0</version>
+	<vendor>IBM</vendor>
+	
+	<configurationParameters>
+		<configurationParameter>
+			<name>SegmentDelimiter</name>
+			<description>segment delimiter</description>
+			<type>String</type>
+			<multiValued>false</multiValued>
+			<mandatory>false</mandatory>
+		</configurationParameter>
+	</configurationParameters>
+	<configurationParameterSettings>
+		<nameValuePair>
+			<name>SegmentDelimiter</name>
+			<value>
+				<string>.</string>
+			</value>
+		</nameValuePair>
+	</configurationParameterSettings>
+
+	<typeSystemDescription/>
+
+	<fsIndexCollection>
+	 <fsIndexes>
+	   <fsIndexDescription>
+	      <label>TestIndex</label>
+	      <typeName>uima.cas.TOP</typeName>
+	      <kind>bag</kind>
+	      <keys/>
+	    </fsIndexDescription>
+          </fsIndexes>
+        </fsIndexCollection>
+		
+	<capabilities>
+		<capability>
+			<outputs/>
+		</capability>
+	</capabilities>
+	
+	<operationalProperties>
+		<modifiesCas>false</modifiesCas>
+		<multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+		<outputsNewCASes>true</outputsNewCASes>
+	</operationalProperties>
+	
+</analysisEngineMetaData>
+</analysisEngineDescription>
diff --git a/examples/descriptors/XCasWriterCasConsumer.xml b/examples/descriptors/XCasWriterCasConsumer.xml
index 7ecbab2..401128f 100644
--- a/examples/descriptors/XCasWriterCasConsumer.xml
+++ b/examples/descriptors/XCasWriterCasConsumer.xml
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-	<!--

-	 ***************************************************************

-	 * Licensed to the Apache Software Foundation (ASF) under one

-	 * or more contributor license agreements.  See the NOTICE file

-	 * distributed with this work for additional information

-	 * regarding copyright ownership.  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.  See the License for the

-	 * specific language governing permissions and limitations

-	 * under the License.

-	 ***************************************************************

-   -->

-

-<!-- A simple CAS consumer that writes an inline XML representation of the CAS to the filesystem.  -->

-

-<casConsumerDescription xmlns="http://uima.apache.org/resourceSpecifier" xmlns:xi="http://www.w3.org/2001/XInclude">

-	 

-        <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-        <implementationName>XCasWriterCasConsumer</implementationName>

-         

-	<processingResourceMetaData>

-

-		<name>XCAS Writer CAS Consumer</name>

-		<description>Writes the CAS to a stand-off XML format (XCAS)</description>

-		<version>1.0</version>

-		<vendor>IBM</vendor>

-

-		<configurationParameters>

-			<configurationParameter>

-				<name>OutputDirectory</name>

-				<description>The directory where xcas files are to be created.  The directory will be created if it does not exist.</description>

-				<type>String</type>

-				<multiValued>false</multiValued>

-				<mandatory>false</mandatory>

-			</configurationParameter>

-		</configurationParameters>

-

-

-          <!-- 

-		<configurationParameterSettings>

-			<nameValuePair>

-				<name>OutputDirectory</name>

-				<value>

-					<string>xcasOutputDirectory</string>

-				</value>

-			</nameValuePair>

-		</configurationParameterSettings>

-          -->

-

-

-	<typeSystemDescription>

-             <types>

-		<typeDescription>

-			<name>org.apache.uima.examples.SourceDocumentInformation</name>

-			<description>Stores detailed information about the original source document from which the current CAS was initialized. All information (like size) refers to the source document and not to the document in the CAS which may be converted and filtered by a CAS Initializer. For example this information will be written to the Semantic Search index so that the original document contents can be retrieved by queries.</description>

-			<supertypeName>uima.tcas.Annotation</supertypeName>

-			<features>

-				<featureDescription>

-					<name>uri</name>

-					<description>URI of document. (For example, file:///MyDirectory/myFile.txt for a simple file or http://uima.apache.org for content from a web source.)</description>

-					<rangeTypeName>uima.cas.String</rangeTypeName>

-				</featureDescription>

-				<featureDescription>

-					<name>offsetInSource</name>

-					<description>Byte offset of the start of document content within original source file or other input source. Only used if the CAS document was retrieved from an source where one physical source file contained several conceptual documents. Zero otherwise.</description>

-					<rangeTypeName>uima.cas.Integer</rangeTypeName>

-				</featureDescription>

-				<featureDescription>

-					<name>documentSize</name>

-					<description>Size of original document in bytes before processing by CAS Initializer. Either absolute file size of size within file or other source.</description>

-					<rangeTypeName>uima.cas.Integer</rangeTypeName>

-				</featureDescription>

-			</features>

-		</typeDescription>

-	    </types>

-	</typeSystemDescription>

-

-		<capabilities>

-			<capability>

-				<inputs>

-          			<type allAnnotatorFeatures="true">org.apache.uima.examples.SourceDocumentInformation</type>

-				</inputs>

-			</capability>

-		</capabilities>

-

-	</processingResourceMetaData>

-

-</casConsumerDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+
+	<!--
+	 ***************************************************************
+	 * Licensed to the Apache Software Foundation (ASF) under one
+	 * or more contributor license agreements.  See the NOTICE file
+	 * distributed with this work for additional information
+	 * regarding copyright ownership.  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.  See the License for the
+	 * specific language governing permissions and limitations
+	 * under the License.
+	 ***************************************************************
+   -->
+
+<!-- A simple CAS consumer that writes an inline XML representation of the CAS to the filesystem.  -->
+
+<casConsumerDescription xmlns="http://uima.apache.org/resourceSpecifier" xmlns:xi="http://www.w3.org/2001/XInclude">
+	 
+        <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+        <implementationName>XCasWriterCasConsumer</implementationName>
+         
+	<processingResourceMetaData>
+
+		<name>XCAS Writer CAS Consumer</name>
+		<description>Writes the CAS to a stand-off XML format (XCAS)</description>
+		<version>1.0</version>
+		<vendor>IBM</vendor>
+
+		<configurationParameters>
+			<configurationParameter>
+				<name>OutputDirectory</name>
+				<description>The directory where xcas files are to be created.  The directory will be created if it does not exist.</description>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>false</mandatory>
+			</configurationParameter>
+		</configurationParameters>
+
+
+          <!-- 
+		<configurationParameterSettings>
+			<nameValuePair>
+				<name>OutputDirectory</name>
+				<value>
+					<string>xcasOutputDirectory</string>
+				</value>
+			</nameValuePair>
+		</configurationParameterSettings>
+          -->
+
+
+	<typeSystemDescription>
+             <types>
+		<typeDescription>
+			<name>org.apache.uima.examples.SourceDocumentInformation</name>
+			<description>Stores detailed information about the original source document from which the current CAS was initialized. All information (like size) refers to the source document and not to the document in the CAS which may be converted and filtered by a CAS Initializer. For example this information will be written to the Semantic Search index so that the original document contents can be retrieved by queries.</description>
+			<supertypeName>uima.tcas.Annotation</supertypeName>
+			<features>
+				<featureDescription>
+					<name>uri</name>
+					<description>URI of document. (For example, file:///MyDirectory/myFile.txt for a simple file or http://uima.apache.org for content from a web source.)</description>
+					<rangeTypeName>uima.cas.String</rangeTypeName>
+				</featureDescription>
+				<featureDescription>
+					<name>offsetInSource</name>
+					<description>Byte offset of the start of document content within original source file or other input source. Only used if the CAS document was retrieved from an source where one physical source file contained several conceptual documents. Zero otherwise.</description>
+					<rangeTypeName>uima.cas.Integer</rangeTypeName>
+				</featureDescription>
+				<featureDescription>
+					<name>documentSize</name>
+					<description>Size of original document in bytes before processing by CAS Initializer. Either absolute file size of size within file or other source.</description>
+					<rangeTypeName>uima.cas.Integer</rangeTypeName>
+				</featureDescription>
+			</features>
+		</typeDescription>
+	    </types>
+	</typeSystemDescription>
+
+		<capabilities>
+			<capability>
+				<inputs>
+          			<type allAnnotatorFeatures="true">org.apache.uima.examples.SourceDocumentInformation</type>
+				</inputs>
+			</capability>
+		</capabilities>
+
+	</processingResourceMetaData>
+
+</casConsumerDescription>
diff --git a/examples/readme.html b/examples/readme.html
index 1c026ed..007e7c3 100644
--- a/examples/readme.html
+++ b/examples/readme.html
@@ -1,165 +1,165 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-

-<html>

-<head>

-	<title></title>

-</head>

-

-<body>  

-<h1>UIMA C++ Examples</h1>

-<p>

-This directory contains example code that illustrate how to use the UIMA C++ Framework. 

-</p>

-<h2>Building the Examples</h2>

-Set environment variables as described in the overview and build the examples as follows:

-<h3>On Linux</h3>

-  <ul>

-    <code>

-      cd $UIMACPP_HOME/examples<br>

-      make -C src -f all.mak

-    </code>

-  </ul>  

-This will create shared libraries and executables in the src directory which must be placed in the LD_LIBRARY_PATH and PATH as follows:

-  <ul>

-     <code>

-       export LD_LIBRARY_PATH=`pwd`/src:$LD_LIBRARY_PATH</br>

-       export PATH=`pwd`/src:$PATH

-     </code>

-  </ul> 

-  

-<h3>On Windows</h3>

-  <ul>

-    <code>

-      cd %UIMACPP_HOME%\examples<br>

-      devenv src\uimacpp-examples.sln /build release<br>

-    </code>

-  </ul>

-This will create DLLs and executables in the src directory which must be placed in the PATH as follows:

-  <ul>

-    <code>

-      export PATH=%CD%\src;$PATH

-    </code>

-  </ul>

-<h2>Running the Sample UIMA Components</h2>

-<p>These components can be run using either in the native C++ environment using the <code>runAECpp</code> program or run from Java using the <code>runAE</code> utility or integrated into a CPE. The UIMA C++ descriptors are located in the descriptors subdirectory.

-<h3>DaveDetector</h3>

-A UIMA annotator that finds Daves in text and annotates them. It has one configuration parameter, <code>DaveString</code>, that specifies the string to match. It illustrates how to use the CAS APIs to create annotations and add them to the index. 

-<p>

-To run this annotator in C++:

-</p>

-<ul>

-<code>

-runAECpp descriptors/DaveDetector.xml data/example.txt &lt;yourOutputDir&gt;<br>

-runAECpp -xmi descriptors/DaveDetector.xml data/tcas.xmi &lt;yourOutputDir&gt;<br>

-runAECpp -xmi descriptors/DaveDetector.xml data/sofa.xmi &lt;yourOutputDir&gt; -s EnglishDocument<br>

-</code>

-</ul>

-<h3>SofaExampleAnnotator</h3>

-A simple multi-Sofa example annotator that expects an English text Sofa as input and creates a German text Sofa as output. This annotator has no configuration parameters, and requires no initialization method. 

-To run this annotator in C++:

-<ul>

-<code>

-runAECpp -xmi descriptors/SofaExampleAnnotator.xml data/sofa.xmi &lt;yourOutputDir&gt;<br>

-</code>

-</ul>

-<h3>SofaStreamHandlerFile</h3>

-This component implements the Sofa stream handler interface defined in <code>sofastreamhandler.hpp</code> to provide stream access to data located using the <code>file:</code> URI scheme. It enables a UIMA component to access remote Sofa data referenced with a <code>file:</code> URI. 

-This example may be used as a model for building handlers for custom URI schemes. 

-The shared library <code>SofaStreamHandlerFile</code> must be registered with the framework as follows:

-<ul>

-On Windows

-<ul>

-<code>

-set UIMACPP_STREAMHANDLERS=file:SofaStreamHandlerFile %UIMACPP_STREAMHANDLERS%<br>

-</code>

-</ul>

-On Linux

-<ul>

-<code>

-export UIMACPP_STREAMHANDLERS="file:SofaStreamHandlerFile $UIMACPP_STREAMHANDLERS"<br>

-</code>

-</ul>

-<p>

-Handlers for several URI schemes may be registered separated by a blank.  There can be only one handler per URI scheme.

-</p>

-</ul>

-The <code>SofaDataAnnotator</code> described below illustrates reading Sofa data as a stream. 

-<h3>SofaDataAnnotator</h3>

-An annotator that accesses the data in Sofa "EnglishDocument" as a text stream.

-It tokenizes the data on whitespace and creates an annotation for each token. The annotator may be run with an input Sofa where the Sofa data is local or with a Sofa where the Sofa data is remote and specified as a URI.  To run this annotator in C++ to process a Sofa with local data: 

-<ul>

-<code>

-runAECpp -xmi descriptors/SofaDataAnnotator.xml data/sofa.xmi &lt;yourOutputDir&gt;<br>

-</code>

-</ul>

-To run and process Sofa where the Sofa data is specified as a <code>file:</code> URL, register the example <code>sofaStreamFileHandler</code> handler for the <code>file</code> URI scheme as described in the section above. and run:

-<ul>

-<code>

-runAECpp -xmi descriptors/SofaDataAnnotator.xml data/filetcas.xmi &lt;yourOutputDir&gt;<br>

-</code>

-</ul>

-<h3>SimpleTextSegmenter</h3>

-A simple example CAS Multiplier which is a type of analysis component that outputs new CASes. This example illustrates one use of the CAS Multiplier which is to break down a large CAS into smaller pieces which are put into new CASs. The <code>SimpleTextSegmenter</code> breaks down the input document into segments based on a delimiter and creates a Sofa for each segment in a new CAS. The delimiter to use can be specified by setting the value of the configuration parameter <code>DelimiterString</code> in the descriptor. 

-To run this annotator in C++:

-<ul>

-<code>

-runAECpp -xmi descriptors/SimpleTextSegmenter.xml data/docforsegmenter.xmi &lt;yourOutputDir&gt;<br>

-</code>

-</ul>

-The original input CAS as well as the new CASs containing the segments will be written out as separate files in your &lt;yourOutputDir&gt; in XMI format.

-<h3>XCasWriterCasConsumer</h3>

-A simple example CAS Consumer that generates an XCAS (XML representation of a CAS) and writes it to stdout by default. It can be configured to write the XCAS output to a file in a directory specified by modifying the descriptor and setting a value for the configuration parameter <code>OutputDirectory</code>. The <code>XCasWriterCasConsumer</code> can be inserted at any point in a aggregate or CPE flow to dump the contents of CAS and is useful for debugging.

-To run this annotator in C++:

-<ul>

-<code>

-runAECpp -xmi descriptors/XCasWriterCasConsumer.xml data/tcas.xmi &lt;yourOutputDir&gt;<br>

-runAECpp -xmi descriptors/XCasWriterCasConsumer.xml data/sofa.xmi &lt;yourOutputDir&gt;<br>

-</code>

-</ul>

-To see the results of the earlier examples:

-<ul>

-<code>

-runAECpp -xmi descriptors/XCasWriterCasConsumer.xml &lt;yourOutputDir&gt;/tcas.xmi<br>

-runAECpp -xmi descriptors/XCasWriterCasConsumer.xml &lt;yourOutputDir&gt;/sofa.xmi<br>

-runAECpp -xmi descriptors/XCasWriterCasConsumer.xml &lt;yourOutputDir&gt;/filetcas.xmi<br>

-</code>

-</ul>

-<h2>Running the Sample UIMA Applications</h2>

-These illustrate how to write stand-alone C++ applications that run UIMA C++ components.

-Build the examples and set up environment variables as described above.

-<h3>ExampleApplication</h3>

-This application reads all the .txt files in a directory, creates a CAS for

-each in turn and sends them through an AnalysisEngine.

-The results are printed on stdout as an XCAS. The application takes two arguments, the path to a UIMA C++ descriptor file, and a file or directory containing input data:

-<ul>

-<code>

-ExampleApplication descriptors/DaveDetector.xml data<br>

-</code>

-</ul>

-<h3>SofaExampleApplication</h3>

-A multiple Sofa example that creates a text Sofa called EnglishDocument and sets its Sofa data to some English text and calls the SofaExampleAnnotator which produces a Sofa with German text and writes the annotations to stdout. This application takes one argument, the path to the SofaExampleAnnotator descriptor file:

-<ul>

-<code>

-SofaExampleApplication descriptors/SofaExampleAnnotator.xml<br>

-</code>

-</ul>

-</body>

-</html>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+<html>
+<head>
+	<title></title>
+</head>
+
+<body>  
+<h1>UIMA C++ Examples</h1>
+<p>
+This directory contains example code that illustrate how to use the UIMA C++ Framework. 
+</p>
+<h2>Building the Examples</h2>
+Set environment variables as described in the overview and build the examples as follows:
+<h3>On Linux</h3>
+  <ul>
+    <code>
+      cd $UIMACPP_HOME/examples<br>
+      make -C src -f all.mak
+    </code>
+  </ul>  
+This will create shared libraries and executables in the src directory which must be placed in the LD_LIBRARY_PATH and PATH as follows:
+  <ul>
+     <code>
+       export LD_LIBRARY_PATH=`pwd`/src:$LD_LIBRARY_PATH</br>
+       export PATH=`pwd`/src:$PATH
+     </code>
+  </ul> 
+  
+<h3>On Windows</h3>
+  <ul>
+    <code>
+      cd %UIMACPP_HOME%\examples<br>
+      devenv src\uimacpp-examples.sln /build release<br>
+    </code>
+  </ul>
+This will create DLLs and executables in the src directory which must be placed in the PATH as follows:
+  <ul>
+    <code>
+      export PATH=%CD%\src;$PATH
+    </code>
+  </ul>
+<h2>Running the Sample UIMA Components</h2>
+<p>These components can be run using either in the native C++ environment using the <code>runAECpp</code> program or run from Java using the <code>runAE</code> utility or integrated into a CPE. The UIMA C++ descriptors are located in the descriptors subdirectory.
+<h3>DaveDetector</h3>
+A UIMA annotator that finds Daves in text and annotates them. It has one configuration parameter, <code>DaveString</code>, that specifies the string to match. It illustrates how to use the CAS APIs to create annotations and add them to the index. 
+<p>
+To run this annotator in C++:
+</p>
+<ul>
+<code>
+runAECpp descriptors/DaveDetector.xml data/example.txt &lt;yourOutputDir&gt;<br>
+runAECpp -xmi descriptors/DaveDetector.xml data/tcas.xmi &lt;yourOutputDir&gt;<br>
+runAECpp -xmi descriptors/DaveDetector.xml data/sofa.xmi &lt;yourOutputDir&gt; -s EnglishDocument<br>
+</code>
+</ul>
+<h3>SofaExampleAnnotator</h3>
+A simple multi-Sofa example annotator that expects an English text Sofa as input and creates a German text Sofa as output. This annotator has no configuration parameters, and requires no initialization method. 
+To run this annotator in C++:
+<ul>
+<code>
+runAECpp -xmi descriptors/SofaExampleAnnotator.xml data/sofa.xmi &lt;yourOutputDir&gt;<br>
+</code>
+</ul>
+<h3>SofaStreamHandlerFile</h3>
+This component implements the Sofa stream handler interface defined in <code>sofastreamhandler.hpp</code> to provide stream access to data located using the <code>file:</code> URI scheme. It enables a UIMA component to access remote Sofa data referenced with a <code>file:</code> URI. 
+This example may be used as a model for building handlers for custom URI schemes. 
+The shared library <code>SofaStreamHandlerFile</code> must be registered with the framework as follows:
+<ul>
+On Windows
+<ul>
+<code>
+set UIMACPP_STREAMHANDLERS=file:SofaStreamHandlerFile %UIMACPP_STREAMHANDLERS%<br>
+</code>
+</ul>
+On Linux
+<ul>
+<code>
+export UIMACPP_STREAMHANDLERS="file:SofaStreamHandlerFile $UIMACPP_STREAMHANDLERS"<br>
+</code>
+</ul>
+<p>
+Handlers for several URI schemes may be registered separated by a blank.  There can be only one handler per URI scheme.
+</p>
+</ul>
+The <code>SofaDataAnnotator</code> described below illustrates reading Sofa data as a stream. 
+<h3>SofaDataAnnotator</h3>
+An annotator that accesses the data in Sofa "EnglishDocument" as a text stream.
+It tokenizes the data on whitespace and creates an annotation for each token. The annotator may be run with an input Sofa where the Sofa data is local or with a Sofa where the Sofa data is remote and specified as a URI.  To run this annotator in C++ to process a Sofa with local data: 
+<ul>
+<code>
+runAECpp -xmi descriptors/SofaDataAnnotator.xml data/sofa.xmi &lt;yourOutputDir&gt;<br>
+</code>
+</ul>
+To run and process Sofa where the Sofa data is specified as a <code>file:</code> URL, register the example <code>sofaStreamFileHandler</code> handler for the <code>file</code> URI scheme as described in the section above. and run:
+<ul>
+<code>
+runAECpp -xmi descriptors/SofaDataAnnotator.xml data/filetcas.xmi &lt;yourOutputDir&gt;<br>
+</code>
+</ul>
+<h3>SimpleTextSegmenter</h3>
+A simple example CAS Multiplier which is a type of analysis component that outputs new CASes. This example illustrates one use of the CAS Multiplier which is to break down a large CAS into smaller pieces which are put into new CASs. The <code>SimpleTextSegmenter</code> breaks down the input document into segments based on a delimiter and creates a Sofa for each segment in a new CAS. The delimiter to use can be specified by setting the value of the configuration parameter <code>DelimiterString</code> in the descriptor. 
+To run this annotator in C++:
+<ul>
+<code>
+runAECpp -xmi descriptors/SimpleTextSegmenter.xml data/docforsegmenter.xmi &lt;yourOutputDir&gt;<br>
+</code>
+</ul>
+The original input CAS as well as the new CASs containing the segments will be written out as separate files in your &lt;yourOutputDir&gt; in XMI format.
+<h3>XCasWriterCasConsumer</h3>
+A simple example CAS Consumer that generates an XCAS (XML representation of a CAS) and writes it to stdout by default. It can be configured to write the XCAS output to a file in a directory specified by modifying the descriptor and setting a value for the configuration parameter <code>OutputDirectory</code>. The <code>XCasWriterCasConsumer</code> can be inserted at any point in a aggregate or CPE flow to dump the contents of CAS and is useful for debugging.
+To run this annotator in C++:
+<ul>
+<code>
+runAECpp -xmi descriptors/XCasWriterCasConsumer.xml data/tcas.xmi &lt;yourOutputDir&gt;<br>
+runAECpp -xmi descriptors/XCasWriterCasConsumer.xml data/sofa.xmi &lt;yourOutputDir&gt;<br>
+</code>
+</ul>
+To see the results of the earlier examples:
+<ul>
+<code>
+runAECpp -xmi descriptors/XCasWriterCasConsumer.xml &lt;yourOutputDir&gt;/tcas.xmi<br>
+runAECpp -xmi descriptors/XCasWriterCasConsumer.xml &lt;yourOutputDir&gt;/sofa.xmi<br>
+runAECpp -xmi descriptors/XCasWriterCasConsumer.xml &lt;yourOutputDir&gt;/filetcas.xmi<br>
+</code>
+</ul>
+<h2>Running the Sample UIMA Applications</h2>
+These illustrate how to write stand-alone C++ applications that run UIMA C++ components.
+Build the examples and set up environment variables as described above.
+<h3>ExampleApplication</h3>
+This application reads all the .txt files in a directory, creates a CAS for
+each in turn and sends them through an AnalysisEngine.
+The results are printed on stdout as an XCAS. The application takes two arguments, the path to a UIMA C++ descriptor file, and a file or directory containing input data:
+<ul>
+<code>
+ExampleApplication descriptors/DaveDetector.xml data<br>
+</code>
+</ul>
+<h3>SofaExampleApplication</h3>
+A multiple Sofa example that creates a text Sofa called EnglishDocument and sets its Sofa data to some English text and calls the SofaExampleAnnotator which produces a Sofa with German text and writes the annotations to stdout. This application takes one argument, the path to the SofaExampleAnnotator descriptor file:
+<ul>
+<code>
+SofaExampleApplication descriptors/SofaExampleAnnotator.xml<br>
+</code>
+</ul>
+</body>
+</html>
diff --git a/examples/runall.cmd b/examples/runall.cmd
index 4599702..7dbc95f 100644
--- a/examples/runall.cmd
+++ b/examples/runall.cmd
@@ -1,57 +1,57 @@
-@echo off

-

-REM   Licensed to the Apache Software Foundation (ASF) under one

-REM   or more contributor license agreements.  See the NOTICE file

-REM   distributed with this work for additional information

-REM   regarding copyright ownership.  The ASF licenses this file

-REM   to you under the Apache License, Version 2.0 (the

-REM   "License"); you may not use this file except in compliance

-REM   with the License.  You may obtain a copy of the License at

-REM

-REM    http://www.apache.org/licenses/LICENSE-2.0

-REM

-REM   Unless required by applicable law or agreed to in writing,

-REM   software distributed under the License is distributed on an

-REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-REM   KIND, either express or implied.  See the License for the

-REM   specific language governing permissions and limitations

-REM   under the License.

-

-@echo on

-

-@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 not errorlevel 0 goto error

-%runae% descriptors/DaveDetector.xml -xmi data/tcas.xmi

-@if not errorlevel 0 goto error

-%runae% descriptors/DaveDetector.xml -xmi data/sofa.xmi -s EnglishDocument

-@if not errorlevel 0 goto error

-%runae% -xmi descriptors/SofaExampleAnnotator.xml data/sofa.xmi

-@if not errorlevel 0 goto error

-set UIMACPP_STREAMHANDLERS=file:SofaStreamHandlerFile

-%runae% -xmi descriptors/SofaDataAnnotator.xml data/sofa.xmi

-@if not errorlevel 0 goto error

-%runae% -xmi descriptors/SofaDataAnnotator.xml data/filetcas.xmi

-@if not errorlevel 0 goto error

-%runae% -xmi descriptors/SimpleTextSegmenter.xml data/docforsegmenter.xmi

-@if not errorlevel 0 goto error

-%runae% -xmi descriptors/XCasWriterCasConsumer.xml data/tcas.xmi

-@if not errorlevel 0 goto error

-%runae% -xmi descriptors/XCasWriterCasConsumer.xml data/sofa.xmi

-@if not errorlevel 0 goto error

-%exampapp% descriptors/DaveDetector.xml data

-@if not errorlevel 0 goto error

-%sofaexampapp% descriptors/SofaExampleAnnotator.xml

-@if not errorlevel 0 goto error

-@echo .................

-@echo All examples ran!

-@echo .................

-:error

+@echo off
+
+REM   Licensed to the Apache Software Foundation (ASF) under one
+REM   or more contributor license agreements.  See the NOTICE file
+REM   distributed with this work for additional information
+REM   regarding copyright ownership.  The ASF licenses this file
+REM   to you under the Apache License, Version 2.0 (the
+REM   "License"); you may not use this file except in compliance
+REM   with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM   Unless required by applicable law or agreed to in writing,
+REM   software distributed under the License is distributed on an
+REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM   KIND, either express or implied.  See the License for the
+REM   specific language governing permissions and limitations
+REM   under the License.
+
+@echo on
+
+@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 not errorlevel 0 goto error
+%runae% descriptors/DaveDetector.xml -xmi data/tcas.xmi
+@if not errorlevel 0 goto error
+%runae% descriptors/DaveDetector.xml -xmi data/sofa.xmi -s EnglishDocument
+@if not errorlevel 0 goto error
+%runae% -xmi descriptors/SofaExampleAnnotator.xml data/sofa.xmi
+@if not errorlevel 0 goto error
+set UIMACPP_STREAMHANDLERS=file:SofaStreamHandlerFile
+%runae% -xmi descriptors/SofaDataAnnotator.xml data/sofa.xmi
+@if not errorlevel 0 goto error
+%runae% -xmi descriptors/SofaDataAnnotator.xml data/filetcas.xmi
+@if not errorlevel 0 goto error
+%runae% -xmi descriptors/SimpleTextSegmenter.xml data/docforsegmenter.xmi
+@if not errorlevel 0 goto error
+%runae% -xmi descriptors/XCasWriterCasConsumer.xml data/tcas.xmi
+@if not errorlevel 0 goto error
+%runae% -xmi descriptors/XCasWriterCasConsumer.xml data/sofa.xmi
+@if not errorlevel 0 goto error
+%exampapp% descriptors/DaveDetector.xml data
+@if not errorlevel 0 goto error
+%sofaexampapp% descriptors/SofaExampleAnnotator.xml
+@if not errorlevel 0 goto error
+@echo .................
+@echo All examples ran!
+@echo .................
+:error
diff --git a/examples/src/DaveDetector.mak b/examples/src/DaveDetector.mak
index ceb6ef5..e2779df 100644
--- a/examples/src/DaveDetector.mak
+++ b/examples/src/DaveDetector.mak
@@ -1,42 +1,42 @@
-#####################################

-# UNIX Makefile for a UIMACPP annotator

-#####################################

-

-# ---------------------------------------------------------------------------

-# Licensed to the Apache Software Foundation (ASF) under one or more

-# contributor license agreements.  See the NOTICE file distributed with

-# this work for additional information regarding copyright ownership.

-# 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.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ---------------------------------------------------------------------------

-

-# name of the annotator to be created

-TARGET_FILE=DaveDetector

-

-# list of user's object files to be linked when building the annotator

-OBJS=DaveDetector.o

-

-#Use this var to pass additional user-defined parameters to the compiler

-USER_CFLAGS=

-

-#Use this var to pass additional user-defined parameters to the linker

-USER_LINKFLAGS=

-

-# Set DEBUG=1 for a debug build (if not 1 a ship build will result)

-DEBUG=1

-

-# Set DLL_BUILD=1 to build an annotator (shared library)

-#    if not 1 an executable binary will be built

-DLL_BUILD=1

-

-# include file with generic compiler instructions

-include $(UIMACPP_HOME)/lib/base.mak

+#####################################
+# UNIX Makefile for a UIMACPP annotator
+#####################################
+
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+# name of the annotator to be created
+TARGET_FILE=DaveDetector
+
+# list of user's object files to be linked when building the annotator
+OBJS=DaveDetector.o
+
+#Use this var to pass additional user-defined parameters to the compiler
+USER_CFLAGS=
+
+#Use this var to pass additional user-defined parameters to the linker
+USER_LINKFLAGS=
+
+# Set DEBUG=1 for a debug build (if not 1 a ship build will result)
+DEBUG=1
+
+# Set DLL_BUILD=1 to build an annotator (shared library)
+#    if not 1 an executable binary will be built
+DLL_BUILD=1
+
+# include file with generic compiler instructions
+include $(UIMACPP_HOME)/lib/base.mak
diff --git a/examples/src/DaveDetector.vcproj b/examples/src/DaveDetector.vcproj
index ddcded1..8308a67 100644
--- a/examples/src/DaveDetector.vcproj
+++ b/examples/src/DaveDetector.vcproj
@@ -1,217 +1,217 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="DaveDetector"

-	ProjectGUID="{69C8A769-7CEC-4D2A-B189-FE19606577B7}"

-	RootNamespace="DaveDetector"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"

-				OutputFile="$(OutDir)/DaveDetectorD.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"

-				OutputFile="$(OutDir)/DaveDetector.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\DaveDetector.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="DaveDetector"
+	ProjectGUID="{69C8A769-7CEC-4D2A-B189-FE19606577B7}"
+	RootNamespace="DaveDetector"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"
+				OutputFile="$(OutDir)/DaveDetectorD.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"
+				OutputFile="$(OutDir)/DaveDetector.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\DaveDetector.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/examples/src/ExampleApplication.mak b/examples/src/ExampleApplication.mak
index 3b3c6f4..842fb87 100644
--- a/examples/src/ExampleApplication.mak
+++ b/examples/src/ExampleApplication.mak
@@ -1,42 +1,42 @@
-#####################################

-# UNIX Makefile for a UIMACPP application

-#####################################

-

-# ---------------------------------------------------------------------------

-# Licensed to the Apache Software Foundation (ASF) under one or more

-# contributor license agreements.  See the NOTICE file distributed with

-# this work for additional information regarding copyright ownership.

-# 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.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ---------------------------------------------------------------------------

-

-# name of the annotator to be created

-TARGET_FILE=ExampleApplication

-

-# list of user's object files to be linked when building the application

-OBJS=ExampleApplication.o

-

-#Use this var to pass additional user-defined parameters to the compiler

-USER_CFLAGS=

-

-#Use this var to pass additional user-defined parameters to the linker

-USER_LINKFLAGS=

-

-# Set DEBUG=1 for a debug build (if not 1 a ship build will result)

-DEBUG=1

-

-# Set DLL_BUILD=1 to build an annotator (shared library)

-#    if not 1 an executable binary will be built

-DLL_BUILD=0

-

-# include file with generic compiler instructions

-include $(UIMACPP_HOME)/lib/base.mak

+#####################################
+# UNIX Makefile for a UIMACPP application
+#####################################
+
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+# name of the annotator to be created
+TARGET_FILE=ExampleApplication
+
+# list of user's object files to be linked when building the application
+OBJS=ExampleApplication.o
+
+#Use this var to pass additional user-defined parameters to the compiler
+USER_CFLAGS=
+
+#Use this var to pass additional user-defined parameters to the linker
+USER_LINKFLAGS=
+
+# Set DEBUG=1 for a debug build (if not 1 a ship build will result)
+DEBUG=1
+
+# Set DLL_BUILD=1 to build an annotator (shared library)
+#    if not 1 an executable binary will be built
+DLL_BUILD=0
+
+# include file with generic compiler instructions
+include $(UIMACPP_HOME)/lib/base.mak
diff --git a/examples/src/ExampleApplication.vcproj b/examples/src/ExampleApplication.vcproj
index 6254a7f..714fc1c 100644
--- a/examples/src/ExampleApplication.vcproj
+++ b/examples/src/ExampleApplication.vcproj
@@ -1,215 +1,215 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="ExampleApplication"

-	ProjectGUID="{9F230EC0-DB18-46AC-BB02-DC1E6974A463}"

-	RootNamespace="ExampleApplication"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				IgnoreStandardIncludePath="false"

-				MinimalRebuild="true"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib libapr-1.lib"

-				OutputFile="$(OutDir)\ExampleApplicationD.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib libapr-1.lib"

-				OutputFile="$(OutDir)\ExampleApplication.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="ExampleApplication.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ExampleApplication"
+	ProjectGUID="{9F230EC0-DB18-46AC-BB02-DC1E6974A463}"
+	RootNamespace="ExampleApplication"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				IgnoreStandardIncludePath="false"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib libapr-1.lib"
+				OutputFile="$(OutDir)\ExampleApplicationD.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib libapr-1.lib"
+				OutputFile="$(OutDir)\ExampleApplication.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="ExampleApplication.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/examples/src/SimpleTextSegmenter.mak b/examples/src/SimpleTextSegmenter.mak
index affeab5..faedcfc 100644
--- a/examples/src/SimpleTextSegmenter.mak
+++ b/examples/src/SimpleTextSegmenter.mak
@@ -1,42 +1,42 @@
-#####################################

-# UNIX Makefile for a UIMACPP annotator

-#####################################

-

-# ---------------------------------------------------------------------------

-# Licensed to the Apache Software Foundation (ASF) under one or more

-# contributor license agreements.  See the NOTICE file distributed with

-# this work for additional information regarding copyright ownership.

-# 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.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ---------------------------------------------------------------------------

-

-# name of the annotator to be created

-TARGET_FILE=SimpleTextSegmenter

-

-# list of user's object files to be linked when building the annotator

-OBJS=SimpleTextSegmenter.o

-

-#Use this var to pass additional user-defined parameters to the compiler

-USER_CFLAGS=

-

-#Use this var to pass additional user-defined parameters to the linker

-USER_LINKFLAGS=

-

-# Set DEBUG=1 for a debug build (if not 1 a ship build will result)

-DEBUG=1

-

-# Set DLL_BUILD=1 to build an annotator (shared library)

-#    if not 1 an executable binary will be built

-DLL_BUILD=1

-

-# include file with generic compiler instructions

-include $(UIMACPP_HOME)/lib/base.mak

+#####################################
+# UNIX Makefile for a UIMACPP annotator
+#####################################
+
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+# name of the annotator to be created
+TARGET_FILE=SimpleTextSegmenter
+
+# list of user's object files to be linked when building the annotator
+OBJS=SimpleTextSegmenter.o
+
+#Use this var to pass additional user-defined parameters to the compiler
+USER_CFLAGS=
+
+#Use this var to pass additional user-defined parameters to the linker
+USER_LINKFLAGS=
+
+# Set DEBUG=1 for a debug build (if not 1 a ship build will result)
+DEBUG=1
+
+# Set DLL_BUILD=1 to build an annotator (shared library)
+#    if not 1 an executable binary will be built
+DLL_BUILD=1
+
+# include file with generic compiler instructions
+include $(UIMACPP_HOME)/lib/base.mak
diff --git a/examples/src/SimpleTextSegmenter.vcproj b/examples/src/SimpleTextSegmenter.vcproj
index 704de7e..59612c3 100644
--- a/examples/src/SimpleTextSegmenter.vcproj
+++ b/examples/src/SimpleTextSegmenter.vcproj
@@ -1,217 +1,217 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="SimpleTextSegmenter"

-	ProjectGUID="{A9981C3E-6DFD-4204-9C4D-3DF7FE5BBB8C}"

-	RootNamespace="SimpleTextSegmenter"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"

-				OutputFile="$(OutDir)/SimpleTextSegmenterD.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"

-				OutputFile="$(OutDir)/SimpleTextSegmenter.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\SimpleTextSegmenter.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="SimpleTextSegmenter"
+	ProjectGUID="{A9981C3E-6DFD-4204-9C4D-3DF7FE5BBB8C}"
+	RootNamespace="SimpleTextSegmenter"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"
+				OutputFile="$(OutDir)/SimpleTextSegmenterD.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"
+				OutputFile="$(OutDir)/SimpleTextSegmenter.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\SimpleTextSegmenter.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/examples/src/SofaDataAnnotator.mak b/examples/src/SofaDataAnnotator.mak
index 566fef3..9a44853 100644
--- a/examples/src/SofaDataAnnotator.mak
+++ b/examples/src/SofaDataAnnotator.mak
@@ -1,42 +1,42 @@
-#####################################

-# UNIX Makefile for a UIMACPP annotator

-#####################################

-

-# ---------------------------------------------------------------------------

-# Licensed to the Apache Software Foundation (ASF) under one or more

-# contributor license agreements.  See the NOTICE file distributed with

-# this work for additional information regarding copyright ownership.

-# 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.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ---------------------------------------------------------------------------

-

-# name of the annotator to be created

-TARGET_FILE=SofaDataAnnotator

-

-# list of user's object files to be linked when building the annotator

-OBJS=SofaDataAnnotator.o

-

-#Use this var to pass additional user-defined parameters to the compiler

-USER_CFLAGS=

-

-#Use this var to pass additional user-defined parameters to the linker

-USER_LINKFLAGS=

-

-# Set DEBUG=1 for a debug build (if not 1 a ship build will result)

-DEBUG=1

-

-# Set DLL_BUILD=1 to build an annotator (shared library)

-#    if not 1 an executable binary will be built

-DLL_BUILD=1

-

-# include file with generic compiler instructions

-include $(UIMACPP_HOME)/lib/base.mak

+#####################################
+# UNIX Makefile for a UIMACPP annotator
+#####################################
+
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+# name of the annotator to be created
+TARGET_FILE=SofaDataAnnotator
+
+# list of user's object files to be linked when building the annotator
+OBJS=SofaDataAnnotator.o
+
+#Use this var to pass additional user-defined parameters to the compiler
+USER_CFLAGS=
+
+#Use this var to pass additional user-defined parameters to the linker
+USER_LINKFLAGS=
+
+# Set DEBUG=1 for a debug build (if not 1 a ship build will result)
+DEBUG=1
+
+# Set DLL_BUILD=1 to build an annotator (shared library)
+#    if not 1 an executable binary will be built
+DLL_BUILD=1
+
+# include file with generic compiler instructions
+include $(UIMACPP_HOME)/lib/base.mak
diff --git a/examples/src/SofaDataAnnotator.vcproj b/examples/src/SofaDataAnnotator.vcproj
index 4c32126..378b088 100644
--- a/examples/src/SofaDataAnnotator.vcproj
+++ b/examples/src/SofaDataAnnotator.vcproj
@@ -1,217 +1,217 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="SofaDataAnnotator"

-	ProjectGUID="{9CA1DB8D-3BB2-408B-B688-026F6080AFFE}"

-	RootNamespace="DaveDetector"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"

-				OutputFile="$(OutDir)/SofaDataAnnotatorD.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"

-				OutputFile="$(OutDir)/SofaDataAnnotator.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\SofaDataAnnotator.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="SofaDataAnnotator"
+	ProjectGUID="{9CA1DB8D-3BB2-408B-B688-026F6080AFFE}"
+	RootNamespace="DaveDetector"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"
+				OutputFile="$(OutDir)/SofaDataAnnotatorD.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"
+				OutputFile="$(OutDir)/SofaDataAnnotator.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\SofaDataAnnotator.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/examples/src/SofaExampleAnnotator.mak b/examples/src/SofaExampleAnnotator.mak
index a110b0b..f2274e8 100644
--- a/examples/src/SofaExampleAnnotator.mak
+++ b/examples/src/SofaExampleAnnotator.mak
@@ -1,42 +1,42 @@
-#####################################

-# UNIX Makefile for a UIMACPP annotator

-#####################################

-

-# ---------------------------------------------------------------------------

-# Licensed to the Apache Software Foundation (ASF) under one or more

-# contributor license agreements.  See the NOTICE file distributed with

-# this work for additional information regarding copyright ownership.

-# 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.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ---------------------------------------------------------------------------

-

-# name of the annotator to be created

-TARGET_FILE=SofaExampleAnnotator

-

-# list of user's object files to be linked when building the annotator

-OBJS=SofaExampleAnnotator.o

-

-#Use this var to pass additional user-defined parameters to the compiler

-USER_CFLAGS=

-

-#Use this var to pass additional user-defined parameters to the linker

-USER_LINKFLAGS=

-

-# Set DEBUG=1 for a debug build (if not 1 a ship build will result)

-DEBUG=1

-

-# Set DLL_BUILD=1 to build an annotator (shared library)

-#    if not 1 an executable binary will be built

-DLL_BUILD=1

-

-# include file with generic compiler instructions

-include $(UIMACPP_HOME)/lib/base.mak

+#####################################
+# UNIX Makefile for a UIMACPP annotator
+#####################################
+
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+# name of the annotator to be created
+TARGET_FILE=SofaExampleAnnotator
+
+# list of user's object files to be linked when building the annotator
+OBJS=SofaExampleAnnotator.o
+
+#Use this var to pass additional user-defined parameters to the compiler
+USER_CFLAGS=
+
+#Use this var to pass additional user-defined parameters to the linker
+USER_LINKFLAGS=
+
+# Set DEBUG=1 for a debug build (if not 1 a ship build will result)
+DEBUG=1
+
+# Set DLL_BUILD=1 to build an annotator (shared library)
+#    if not 1 an executable binary will be built
+DLL_BUILD=1
+
+# include file with generic compiler instructions
+include $(UIMACPP_HOME)/lib/base.mak
diff --git a/examples/src/SofaExampleAnnotator.vcproj b/examples/src/SofaExampleAnnotator.vcproj
index 7fb8918..aa007ff 100644
--- a/examples/src/SofaExampleAnnotator.vcproj
+++ b/examples/src/SofaExampleAnnotator.vcproj
@@ -1,217 +1,217 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="SofaExampleAnnotator"

-	ProjectGUID="{8EA7B6FE-FC33-42C7-9B44-8E0E569D4D42}"

-	RootNamespace="DaveDetector"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(ProjectName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"

-				OutputFile="$(OutDir)/SofaExampleAnnotatorD.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(ProjectName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"

-				OutputFile="$(OutDir)/SofaExampleAnnotator.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\SofaExampleAnnotator.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="SofaExampleAnnotator"
+	ProjectGUID="{8EA7B6FE-FC33-42C7-9B44-8E0E569D4D42}"
+	RootNamespace="DaveDetector"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(ProjectName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"
+				OutputFile="$(OutDir)/SofaExampleAnnotatorD.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(ProjectName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"
+				OutputFile="$(OutDir)/SofaExampleAnnotator.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\SofaExampleAnnotator.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/examples/src/SofaExampleApplication.mak b/examples/src/SofaExampleApplication.mak
index 5cbf473..907cccf 100644
--- a/examples/src/SofaExampleApplication.mak
+++ b/examples/src/SofaExampleApplication.mak
@@ -1,42 +1,42 @@
-#####################################

-# UNIX Makefile for a UIMACPP application

-#####################################

-

-# ---------------------------------------------------------------------------

-# Licensed to the Apache Software Foundation (ASF) under one or more

-# contributor license agreements.  See the NOTICE file distributed with

-# this work for additional information regarding copyright ownership.

-# 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.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ---------------------------------------------------------------------------

-

-# name of the annotator to be created

-TARGET_FILE=SofaExampleApplication

-

-# list of user's object files to be linked when building the application

-OBJS=SofaExampleApplication.o

-

-#Use this var to pass additional user-defined parameters to the compiler

-USER_CFLAGS=

-

-#Use this var to pass additional user-defined parameters to the linker

-USER_LINKFLAGS=

-

-# Set DEBUG=1 for a debug build (if not 1 a ship build will result)

-DEBUG=1

-

-# Set DLL_BUILD=1 to build an annotator (shared library)

-#    if not 1 an executable binary will be built

-DLL_BUILD=0

-

-# include file with generic compiler instructions

-include $(UIMACPP_HOME)/lib/base.mak

+#####################################
+# UNIX Makefile for a UIMACPP application
+#####################################
+
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+# name of the annotator to be created
+TARGET_FILE=SofaExampleApplication
+
+# list of user's object files to be linked when building the application
+OBJS=SofaExampleApplication.o
+
+#Use this var to pass additional user-defined parameters to the compiler
+USER_CFLAGS=
+
+#Use this var to pass additional user-defined parameters to the linker
+USER_LINKFLAGS=
+
+# Set DEBUG=1 for a debug build (if not 1 a ship build will result)
+DEBUG=1
+
+# Set DLL_BUILD=1 to build an annotator (shared library)
+#    if not 1 an executable binary will be built
+DLL_BUILD=0
+
+# include file with generic compiler instructions
+include $(UIMACPP_HOME)/lib/base.mak
diff --git a/examples/src/SofaExampleApplication.vcproj b/examples/src/SofaExampleApplication.vcproj
index 2998123..ea660f2 100644
--- a/examples/src/SofaExampleApplication.vcproj
+++ b/examples/src/SofaExampleApplication.vcproj
@@ -1,215 +1,215 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="SofaExampleApplication"

-	ProjectGUID="{7D1DBE6C-B61C-43C3-8552-EE86ECB44D48}"

-	RootNamespace="SofaExampleApplication"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				IgnoreStandardIncludePath="false"

-				MinimalRebuild="true"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib libapr-1.lib"

-				OutputFile="$(OutDir)\SofaExampleApplicationD.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib libapr-1.lib"

-				OutputFile="$(OutDir)\SofaExampleApplication.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="SofaExampleApplication.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="SofaExampleApplication"
+	ProjectGUID="{7D1DBE6C-B61C-43C3-8552-EE86ECB44D48}"
+	RootNamespace="SofaExampleApplication"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				IgnoreStandardIncludePath="false"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib libapr-1.lib"
+				OutputFile="$(OutDir)\SofaExampleApplicationD.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib libapr-1.lib"
+				OutputFile="$(OutDir)\SofaExampleApplication.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="SofaExampleApplication.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/examples/src/SofaStreamHandlerFile.mak b/examples/src/SofaStreamHandlerFile.mak
index b3dbd79..c09bb5d 100644
--- a/examples/src/SofaStreamHandlerFile.mak
+++ b/examples/src/SofaStreamHandlerFile.mak
@@ -1,42 +1,42 @@
-#####################################

-# UNIX Makefile for a UIMACPP annotator

-#####################################

-

-# ---------------------------------------------------------------------------

-# Licensed to the Apache Software Foundation (ASF) under one or more

-# contributor license agreements.  See the NOTICE file distributed with

-# this work for additional information regarding copyright ownership.

-# 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.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ---------------------------------------------------------------------------

-

-# name of the annotator to be created

-TARGET_FILE=SofaStreamHandlerFile

-

-# list of user's object files to be linked when building the annotator

-OBJS=SofaStreamHandlerFile.o

-

-#Use this var to pass additional user-defined parameters to the compiler

-USER_CFLAGS=

-

-#Use this var to pass additional user-defined parameters to the linker

-USER_LINKFLAGS=

-

-# Set DEBUG=1 for a debug build (if not 1 a ship build will result)

-DEBUG=1

-

-# Set DLL_BUILD=1 to build an annotator (shared library)

-#    if not 1 an executable binary will be built

-DLL_BUILD=1

-

-# include file with generic compiler instructions

-include $(UIMACPP_HOME)/lib/base.mak

+#####################################
+# UNIX Makefile for a UIMACPP annotator
+#####################################
+
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+# name of the annotator to be created
+TARGET_FILE=SofaStreamHandlerFile
+
+# list of user's object files to be linked when building the annotator
+OBJS=SofaStreamHandlerFile.o
+
+#Use this var to pass additional user-defined parameters to the compiler
+USER_CFLAGS=
+
+#Use this var to pass additional user-defined parameters to the linker
+USER_LINKFLAGS=
+
+# Set DEBUG=1 for a debug build (if not 1 a ship build will result)
+DEBUG=1
+
+# Set DLL_BUILD=1 to build an annotator (shared library)
+#    if not 1 an executable binary will be built
+DLL_BUILD=1
+
+# include file with generic compiler instructions
+include $(UIMACPP_HOME)/lib/base.mak
diff --git a/examples/src/SofaStreamHandlerFile.vcproj b/examples/src/SofaStreamHandlerFile.vcproj
index 9ad14d0..648759f 100644
--- a/examples/src/SofaStreamHandlerFile.vcproj
+++ b/examples/src/SofaStreamHandlerFile.vcproj
@@ -1,217 +1,217 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="SofaStreamHandlerFile"

-	ProjectGUID="{FFEC50AB-7A77-4D51-BDB8-45B3EB3274C7}"

-	RootNamespace="DaveDetector"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"

-				OutputFile="$(OutDir)/SofaStreamHandlerFileD.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(IntDir)\$(TargetName)"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"

-				OutputFile="$(OutDir)/SofaStreamHandlerFile.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(IntDir)\$(TargetName)"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\SofaStreamHandlerFile.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="SofaStreamHandlerFile"
+	ProjectGUID="{FFEC50AB-7A77-4D51-BDB8-45B3EB3274C7}"
+	RootNamespace="DaveDetector"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"
+				OutputFile="$(OutDir)/SofaStreamHandlerFileD.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName)"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"
+				OutputFile="$(OutDir)/SofaStreamHandlerFile.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName)"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\SofaStreamHandlerFile.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/examples/src/XCasWriterCasConsumer.mak b/examples/src/XCasWriterCasConsumer.mak
index d6bd1d7..ff8f160 100644
--- a/examples/src/XCasWriterCasConsumer.mak
+++ b/examples/src/XCasWriterCasConsumer.mak
@@ -1,42 +1,42 @@
-#####################################

-# UNIX Makefile for a UIMACPP annotator

-#####################################

-

-# ---------------------------------------------------------------------------

-# Licensed to the Apache Software Foundation (ASF) under one or more

-# contributor license agreements.  See the NOTICE file distributed with

-# this work for additional information regarding copyright ownership.

-# 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.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ---------------------------------------------------------------------------

-

-# name of the annotator to be created

-TARGET_FILE=XCasWriterCasConsumer

-

-# list of user's object files to be linked when building the annotator

-OBJS=XCasWriterCasConsumer.o

-

-#Use this var to pass additional user-defined parameters to the compiler

-USER_CFLAGS=

-

-#Use this var to pass additional user-defined parameters to the linker

-USER_LINKFLAGS=

-

-# Set DEBUG=1 for a debug build (if not 1 a ship build will result)

-DEBUG=1

-

-# Set DLL_BUILD=1 to build an annotator (shared library)

-#    if not 1 an executable binary will be built

-DLL_BUILD=1

-

-# include file with generic compiler instructions

-include $(UIMACPP_HOME)/lib/base.mak

+#####################################
+# UNIX Makefile for a UIMACPP annotator
+#####################################
+
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+# name of the annotator to be created
+TARGET_FILE=XCasWriterCasConsumer
+
+# list of user's object files to be linked when building the annotator
+OBJS=XCasWriterCasConsumer.o
+
+#Use this var to pass additional user-defined parameters to the compiler
+USER_CFLAGS=
+
+#Use this var to pass additional user-defined parameters to the linker
+USER_LINKFLAGS=
+
+# Set DEBUG=1 for a debug build (if not 1 a ship build will result)
+DEBUG=1
+
+# Set DLL_BUILD=1 to build an annotator (shared library)
+#    if not 1 an executable binary will be built
+DLL_BUILD=1
+
+# include file with generic compiler instructions
+include $(UIMACPP_HOME)/lib/base.mak
diff --git a/examples/src/XCasWriterCasConsumer.vcproj b/examples/src/XCasWriterCasConsumer.vcproj
index 22466e9..53e5b81 100644
--- a/examples/src/XCasWriterCasConsumer.vcproj
+++ b/examples/src/XCasWriterCasConsumer.vcproj
@@ -1,217 +1,217 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="XCasWriterCasConsumer"

-	ProjectGUID="{8A5CE38D-90C6-4B31-9BCF-D1E1E6037546}"

-	RootNamespace="DaveDetector"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"

-				OutputFile="$(OutDir)/XCasWriterCasConsumerD.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"

-				OutputFile="$(OutDir)/XCasWriterCasConsumer.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\XCasWriterCasConsumer.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="XCasWriterCasConsumer"
+	ProjectGUID="{8A5CE38D-90C6-4B31-9BCF-D1E1E6037546}"
+	RootNamespace="DaveDetector"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"
+				OutputFile="$(OutDir)/XCasWriterCasConsumerD.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"
+				OutputFile="$(OutDir)/XCasWriterCasConsumer.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\XCasWriterCasConsumer.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/examples/src/all.mak b/examples/src/all.mak
index 882e674..8fd5179 100644
--- a/examples/src/all.mak
+++ b/examples/src/all.mak
@@ -1,30 +1,30 @@
-#####################################

-# Makefile that makes all the eamples

-#####################################

-

-# ---------------------------------------------------------------------------

-# Licensed to the Apache Software Foundation (ASF) under one or more

-# contributor license agreements.  See the NOTICE file distributed with

-# this work for additional information regarding copyright ownership.

-# 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.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ---------------------------------------------------------------------------

-

-EXAMPLES = DaveDetector SofaExampleAnnotator SofaStreamHandlerFile SofaDataAnnotator XCasWriterCasConsumer ExampleApplication SofaExampleApplication SimpleTextSegmenter

-

-all: $(EXAMPLES)

-

-clean:

-	rm -f *.o *.so *.dylib

-

-$(EXAMPLES):

-	$(MAKE) -f $@.mak

+#####################################
+# Makefile that makes all the eamples
+#####################################
+
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+EXAMPLES = DaveDetector SofaExampleAnnotator SofaStreamHandlerFile SofaDataAnnotator XCasWriterCasConsumer ExampleApplication SofaExampleApplication SimpleTextSegmenter
+
+all: $(EXAMPLES)
+
+clean:
+	rm -f *.o *.so *.dylib
+
+$(EXAMPLES):
+	$(MAKE) -f $@.mak
diff --git a/examples/src/uimacpp-examples.sln b/examples/src/uimacpp-examples.sln
index ce0b877..405ed14 100644
--- a/examples/src/uimacpp-examples.sln
+++ b/examples/src/uimacpp-examples.sln
@@ -1,61 +1,61 @@
-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DaveDetector", "DaveDetector.vcproj", "{69C8A769-7CEC-4D2A-B189-FE19606577B7}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExampleApplication", "ExampleApplication.vcproj", "{9F230EC0-DB18-46AC-BB02-DC1E6974A463}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SofaDataAnnotator", "SofaDataAnnotator.vcproj", "{9CA1DB8D-3BB2-408B-B688-026F6080AFFE}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SofaExampleAnnotator", "SofaExampleAnnotator.vcproj", "{8EA7B6FE-FC33-42C7-9B44-8E0E569D4D42}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SofaExampleApplication", "SofaExampleApplication.vcproj", "{7D1DBE6C-B61C-43C3-8552-EE86ECB44D48}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SofaStreamHandlerFile", "SofaStreamHandlerFile.vcproj", "{FFEC50AB-7A77-4D51-BDB8-45B3EB3274C7}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XCasWriterCasConsumer", "XCasWriterCasConsumer.vcproj", "{8A5CE38D-90C6-4B31-9BCF-D1E1E6037546}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleTextSegmenter", "SimpleTextSegmenter.vcproj", "{A9981C3E-6DFD-4204-9C4D-3DF7FE5BBB8C}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{69C8A769-7CEC-4D2A-B189-FE19606577B7}.Debug|Win32.ActiveCfg = Debug|Win32

-		{69C8A769-7CEC-4D2A-B189-FE19606577B7}.Debug|Win32.Build.0 = Debug|Win32

-		{69C8A769-7CEC-4D2A-B189-FE19606577B7}.Release|Win32.ActiveCfg = Release|Win32

-		{69C8A769-7CEC-4D2A-B189-FE19606577B7}.Release|Win32.Build.0 = Release|Win32

-		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Debug|Win32.ActiveCfg = Debug|Win32

-		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Debug|Win32.Build.0 = Debug|Win32

-		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Release|Win32.ActiveCfg = Release|Win32

-		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Release|Win32.Build.0 = Release|Win32

-		{9CA1DB8D-3BB2-408B-B688-026F6080AFFE}.Debug|Win32.ActiveCfg = Debug|Win32

-		{9CA1DB8D-3BB2-408B-B688-026F6080AFFE}.Debug|Win32.Build.0 = Debug|Win32

-		{9CA1DB8D-3BB2-408B-B688-026F6080AFFE}.Release|Win32.ActiveCfg = Release|Win32

-		{9CA1DB8D-3BB2-408B-B688-026F6080AFFE}.Release|Win32.Build.0 = Release|Win32

-		{8EA7B6FE-FC33-42C7-9B44-8E0E569D4D42}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8EA7B6FE-FC33-42C7-9B44-8E0E569D4D42}.Debug|Win32.Build.0 = Debug|Win32

-		{8EA7B6FE-FC33-42C7-9B44-8E0E569D4D42}.Release|Win32.ActiveCfg = Release|Win32

-		{8EA7B6FE-FC33-42C7-9B44-8E0E569D4D42}.Release|Win32.Build.0 = Release|Win32

-		{7D1DBE6C-B61C-43C3-8552-EE86ECB44D48}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7D1DBE6C-B61C-43C3-8552-EE86ECB44D48}.Debug|Win32.Build.0 = Debug|Win32

-		{7D1DBE6C-B61C-43C3-8552-EE86ECB44D48}.Release|Win32.ActiveCfg = Release|Win32

-		{7D1DBE6C-B61C-43C3-8552-EE86ECB44D48}.Release|Win32.Build.0 = Release|Win32

-		{FFEC50AB-7A77-4D51-BDB8-45B3EB3274C7}.Debug|Win32.ActiveCfg = Debug|Win32

-		{FFEC50AB-7A77-4D51-BDB8-45B3EB3274C7}.Debug|Win32.Build.0 = Debug|Win32

-		{FFEC50AB-7A77-4D51-BDB8-45B3EB3274C7}.Release|Win32.ActiveCfg = Release|Win32

-		{FFEC50AB-7A77-4D51-BDB8-45B3EB3274C7}.Release|Win32.Build.0 = Release|Win32

-		{8A5CE38D-90C6-4B31-9BCF-D1E1E6037546}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8A5CE38D-90C6-4B31-9BCF-D1E1E6037546}.Debug|Win32.Build.0 = Debug|Win32

-		{8A5CE38D-90C6-4B31-9BCF-D1E1E6037546}.Release|Win32.ActiveCfg = Release|Win32

-		{8A5CE38D-90C6-4B31-9BCF-D1E1E6037546}.Release|Win32.Build.0 = Release|Win32

-		{A9981C3E-6DFD-4204-9C4D-3DF7FE5BBB8C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A9981C3E-6DFD-4204-9C4D-3DF7FE5BBB8C}.Debug|Win32.Build.0 = Debug|Win32

-		{A9981C3E-6DFD-4204-9C4D-3DF7FE5BBB8C}.Release|Win32.ActiveCfg = Release|Win32

-		{A9981C3E-6DFD-4204-9C4D-3DF7FE5BBB8C}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DaveDetector", "DaveDetector.vcproj", "{69C8A769-7CEC-4D2A-B189-FE19606577B7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExampleApplication", "ExampleApplication.vcproj", "{9F230EC0-DB18-46AC-BB02-DC1E6974A463}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SofaDataAnnotator", "SofaDataAnnotator.vcproj", "{9CA1DB8D-3BB2-408B-B688-026F6080AFFE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SofaExampleAnnotator", "SofaExampleAnnotator.vcproj", "{8EA7B6FE-FC33-42C7-9B44-8E0E569D4D42}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SofaExampleApplication", "SofaExampleApplication.vcproj", "{7D1DBE6C-B61C-43C3-8552-EE86ECB44D48}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SofaStreamHandlerFile", "SofaStreamHandlerFile.vcproj", "{FFEC50AB-7A77-4D51-BDB8-45B3EB3274C7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XCasWriterCasConsumer", "XCasWriterCasConsumer.vcproj", "{8A5CE38D-90C6-4B31-9BCF-D1E1E6037546}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleTextSegmenter", "SimpleTextSegmenter.vcproj", "{A9981C3E-6DFD-4204-9C4D-3DF7FE5BBB8C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{69C8A769-7CEC-4D2A-B189-FE19606577B7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{69C8A769-7CEC-4D2A-B189-FE19606577B7}.Debug|Win32.Build.0 = Debug|Win32
+		{69C8A769-7CEC-4D2A-B189-FE19606577B7}.Release|Win32.ActiveCfg = Release|Win32
+		{69C8A769-7CEC-4D2A-B189-FE19606577B7}.Release|Win32.Build.0 = Release|Win32
+		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Debug|Win32.Build.0 = Debug|Win32
+		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Release|Win32.ActiveCfg = Release|Win32
+		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Release|Win32.Build.0 = Release|Win32
+		{9CA1DB8D-3BB2-408B-B688-026F6080AFFE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9CA1DB8D-3BB2-408B-B688-026F6080AFFE}.Debug|Win32.Build.0 = Debug|Win32
+		{9CA1DB8D-3BB2-408B-B688-026F6080AFFE}.Release|Win32.ActiveCfg = Release|Win32
+		{9CA1DB8D-3BB2-408B-B688-026F6080AFFE}.Release|Win32.Build.0 = Release|Win32
+		{8EA7B6FE-FC33-42C7-9B44-8E0E569D4D42}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8EA7B6FE-FC33-42C7-9B44-8E0E569D4D42}.Debug|Win32.Build.0 = Debug|Win32
+		{8EA7B6FE-FC33-42C7-9B44-8E0E569D4D42}.Release|Win32.ActiveCfg = Release|Win32
+		{8EA7B6FE-FC33-42C7-9B44-8E0E569D4D42}.Release|Win32.Build.0 = Release|Win32
+		{7D1DBE6C-B61C-43C3-8552-EE86ECB44D48}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7D1DBE6C-B61C-43C3-8552-EE86ECB44D48}.Debug|Win32.Build.0 = Debug|Win32
+		{7D1DBE6C-B61C-43C3-8552-EE86ECB44D48}.Release|Win32.ActiveCfg = Release|Win32
+		{7D1DBE6C-B61C-43C3-8552-EE86ECB44D48}.Release|Win32.Build.0 = Release|Win32
+		{FFEC50AB-7A77-4D51-BDB8-45B3EB3274C7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FFEC50AB-7A77-4D51-BDB8-45B3EB3274C7}.Debug|Win32.Build.0 = Debug|Win32
+		{FFEC50AB-7A77-4D51-BDB8-45B3EB3274C7}.Release|Win32.ActiveCfg = Release|Win32
+		{FFEC50AB-7A77-4D51-BDB8-45B3EB3274C7}.Release|Win32.Build.0 = Release|Win32
+		{8A5CE38D-90C6-4B31-9BCF-D1E1E6037546}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8A5CE38D-90C6-4B31-9BCF-D1E1E6037546}.Debug|Win32.Build.0 = Debug|Win32
+		{8A5CE38D-90C6-4B31-9BCF-D1E1E6037546}.Release|Win32.ActiveCfg = Release|Win32
+		{8A5CE38D-90C6-4B31-9BCF-D1E1E6037546}.Release|Win32.Build.0 = Release|Win32
+		{A9981C3E-6DFD-4204-9C4D-3DF7FE5BBB8C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A9981C3E-6DFD-4204-9C4D-3DF7FE5BBB8C}.Debug|Win32.Build.0 = Debug|Win32
+		{A9981C3E-6DFD-4204-9C4D-3DF7FE5BBB8C}.Release|Win32.ActiveCfg = Release|Win32
+		{A9981C3E-6DFD-4204-9C4D-3DF7FE5BBB8C}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/tutorial/README b/examples/tutorial/README
index a144b87..8104d62 100644
--- a/examples/tutorial/README
+++ b/examples/tutorial/README
@@ -1,12 +1,12 @@
-This directory contains a C++ version of one of the Java annotations in the

-UIMA tutorial. It can be built from the UIMACPP_HOME/examples/tutorial directory with:

-

-    make -C src -f MeetingAnnotator.mak

-or

-    devenv src\MeetingAnnotator.vcproj /build release

-

-It can be deployed as a stand-alone C++ service and tested by starting a broker and running the following:

-

-   runRemoteAsyncAE[.sh]  tcp://localhost:61616 MeetingAnnotator -d descriptors/Deploy_MeetingAnnotator.xml

-

-The deployment descriptor adds "src" (the relative location of the annotator) to the library search path.

+This directory contains a C++ version of one of the Java annotations in the
+UIMA tutorial. It can be built from the UIMACPP_HOME/examples/tutorial directory with:
+
+    make -C src -f MeetingAnnotator.mak
+or
+    devenv src\MeetingAnnotator.vcproj /build release
+
+It can be deployed as a stand-alone C++ service and tested by starting a broker and running the following:
+
+   runRemoteAsyncAE[.sh]  tcp://localhost:61616 MeetingAnnotator -d descriptors/Deploy_MeetingAnnotator.xml
+
+The deployment descriptor adds "src" (the relative location of the annotator) to the library search path.
diff --git a/examples/tutorial/descriptors/Deploy_MeetingAnnotator.xml b/examples/tutorial/descriptors/Deploy_MeetingAnnotator.xml
index d0070d3..4738ba7 100644
--- a/examples/tutorial/descriptors/Deploy_MeetingAnnotator.xml
+++ b/examples/tutorial/descriptors/Deploy_MeetingAnnotator.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-   

-<analysisEngineDeploymentDescription 

-  xmlns="http://uima.apache.org/resourceSpecifier">

-  

-  <name>C++ Meeting Annotator</name>

-  <description>Deploys the C++ version of the Meeting Annotator</description>

-  

-  <deployment protocol="jms" provider="activemq">

-    <service>

-      <custom name="run_top_level_CPP_service_as_separate_process"/>

-      <inputQueue endpoint="MeetingAnnotator" brokerURL="${defaultBrokerURL}"/>

-      <topDescriptor>

-       <import location="MeetingAnnotatorCPP.xml"/>

-      </topDescriptor>

-      <environmentVariables>

-       <!-- Add the location of the MeetingAnnotator to the library search path. -->

-       <!-- For ease of testing do so for all platforms and use relative paths.  -->

-       <environmentVariable name="Path">src</environmentVariable>

-       <environmentVariable name="LD_LIBRARY_PATH">src</environmentVariable>

-       <environmentVariable name="DYLD_LIBRARY_PATH">src</environmentVariable>

-       <environmentVariable name="UIMACPP_DATAPATH">mydata</environmentVariable>

-	</environmentVariables>

-    </service>

-  </deployment>

-

-</analysisEngineDeploymentDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+   
+<analysisEngineDeploymentDescription 
+  xmlns="http://uima.apache.org/resourceSpecifier">
+  
+  <name>C++ Meeting Annotator</name>
+  <description>Deploys the C++ version of the Meeting Annotator</description>
+  
+  <deployment protocol="jms" provider="activemq">
+    <service>
+      <custom name="run_top_level_CPP_service_as_separate_process"/>
+      <inputQueue endpoint="MeetingAnnotator" brokerURL="${defaultBrokerURL}"/>
+      <topDescriptor>
+       <import location="MeetingAnnotatorCPP.xml"/>
+      </topDescriptor>
+      <environmentVariables>
+       <!-- Add the location of the MeetingAnnotator to the library search path. -->
+       <!-- For ease of testing do so for all platforms and use relative paths.  -->
+       <environmentVariable name="Path">src</environmentVariable>
+       <environmentVariable name="LD_LIBRARY_PATH">src</environmentVariable>
+       <environmentVariable name="DYLD_LIBRARY_PATH">src</environmentVariable>
+       <environmentVariable name="UIMACPP_DATAPATH">mydata</environmentVariable>
+	</environmentVariables>
+    </service>
+  </deployment>
+
+</analysisEngineDeploymentDescription>
diff --git a/examples/tutorial/descriptors/Deploy_MeetingDetectorTAE_RemoteMeeting.xml b/examples/tutorial/descriptors/Deploy_MeetingDetectorTAE_RemoteMeeting.xml
index 36c3610..4b4f5b3 100644
--- a/examples/tutorial/descriptors/Deploy_MeetingDetectorTAE_RemoteMeeting.xml
+++ b/examples/tutorial/descriptors/Deploy_MeetingDetectorTAE_RemoteMeeting.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<analysisEngineDeploymentDescription xmlns="http://uima.apache.org/resourceSpecifier">

-  

-  <name>Meeting Detector TAE</name>

-  <description>Deploys Meeting Detector Aggregate AE that uses remotely deployed RoomNumberAnnotator.</description>

-  

-  <deployment protocol="jms" provider="activemq">

-    <casPool numberOfCASes="3"/>

-    <service>

-      <inputQueue endpoint="MeetingDetectorTaeQueue" brokerURL="${defaultBrokerURL}"/>

-      <topDescriptor>

-        <import name="tutorial.ex4.MeetingDetectorTAE"/>

-      </topDescriptor>

-      <analysisEngine>

-        <delegates>

-          <remoteAnalysisEngine key="Meeting">

-            <inputQueue endpoint="MeetingAnnotator" brokerURL="${defaultBrokerURL}"/>

-            <serializer method="xmi"/>

-          </remoteAnalysisEngine>

-        </delegates>

-      </analysisEngine>

-    </service>

-  </deployment>

-  

-</analysisEngineDeploymentDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<analysisEngineDeploymentDescription xmlns="http://uima.apache.org/resourceSpecifier">
+  
+  <name>Meeting Detector TAE</name>
+  <description>Deploys Meeting Detector Aggregate AE that uses remotely deployed RoomNumberAnnotator.</description>
+  
+  <deployment protocol="jms" provider="activemq">
+    <casPool numberOfCASes="3"/>
+    <service>
+      <inputQueue endpoint="MeetingDetectorTaeQueue" brokerURL="${defaultBrokerURL}"/>
+      <topDescriptor>
+        <import name="tutorial.ex4.MeetingDetectorTAE"/>
+      </topDescriptor>
+      <analysisEngine>
+        <delegates>
+          <remoteAnalysisEngine key="Meeting">
+            <inputQueue endpoint="MeetingAnnotator" brokerURL="${defaultBrokerURL}"/>
+            <serializer method="xmi"/>
+          </remoteAnalysisEngine>
+        </delegates>
+      </analysisEngine>
+    </service>
+  </deployment>
+  
+</analysisEngineDeploymentDescription>
diff --git a/examples/tutorial/descriptors/MeetingAnnotatorCPP.xml b/examples/tutorial/descriptors/MeetingAnnotatorCPP.xml
index c2ab3a2..491d5ae 100644
--- a/examples/tutorial/descriptors/MeetingAnnotatorCPP.xml
+++ b/examples/tutorial/descriptors/MeetingAnnotatorCPP.xml
@@ -1,90 +1,90 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-

-	<!--

-	 ***************************************************************

-	 * Licensed to the Apache Software Foundation (ASF) under one

-	 * or more contributor license agreements.  See the NOTICE file

-	 * distributed with this work for additional information

-	 * regarding copyright ownership.  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.  See the License for the

-	 * specific language governing permissions and limitations

-	 * under the License.

-	 ***************************************************************

-   -->

-

-<!--

-	Descriptor for a primitive TAE that uses the TutorialDateTime annotator

--->

-<taeDescription xmlns="http://uima.apache.org/resourceSpecifier">

-	<frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-	<primitive>true</primitive>

-	<annotatorImplementationName>MeetingAnnotator</annotatorImplementationName>

-

-

-	<analysisEngineMetaData>

-		<name>Meeting Annotator</name>

-		<description>Detects meetings from co-occurrences of room numbers, dates, and times</description>

-		<version>1.0</version>

-		<vendor>IBM</vendor>

-

-		<configurationParameters>

-			<configurationParameter>

-				<name>WindowSize</name>

-				<description>Maximum number of characters within which a room number, a date, and two times must occur for a meeting annotation to be created.</description>

-				<type>Integer</type>

-				<multiValued>false</multiValued>

-				<mandatory>true</mandatory>

-			</configurationParameter>

-		</configurationParameters>

-

-		<configurationParameterSettings>

-			<nameValuePair>

-				<name>WindowSize</name>

-				<value>

-					<integer>200</integer>

-				</value>

-			</nameValuePair>

-		</configurationParameterSettings>

-

-		<!--

-			TypeSystem Definition

-		-->

-

-		<typeSystemDescription>

-		  <imports>

-		    <import location="TutorialTypeSystem.xml"/>

-		  </imports>

-		</typeSystemDescription>

-

-

-

-		<!--

-			Capabilities: Inputs, Outputs, and Preconditions

-		-->

-		<capabilities>

-			<capability>

-				<inputs>

-					<type allAnnotatorFeatures="true">org.apache.uima.tutorial.RoomNumber</type>

-					<type allAnnotatorFeatures="true">org.apache.uima.tutorial.TimeAnnot</type>

-					<type allAnnotatorFeatures="true">org.apache.uima.tutorial.DateAnnot</type>

-				</inputs>

-				<outputs>

-					<type allAnnotatorFeatures="true">org.apache.uima.tutorial.Meeting</type>

-				</outputs>

-				<languagesSupported>

-					<language>en</language>

-				</languagesSupported>

-			</capability>

-		</capabilities>

-

-	</analysisEngineMetaData>

-</taeDescription>

+<?xml version="1.0" encoding="UTF-8" ?>
+
+	<!--
+	 ***************************************************************
+	 * Licensed to the Apache Software Foundation (ASF) under one
+	 * or more contributor license agreements.  See the NOTICE file
+	 * distributed with this work for additional information
+	 * regarding copyright ownership.  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.  See the License for the
+	 * specific language governing permissions and limitations
+	 * under the License.
+	 ***************************************************************
+   -->
+
+<!--
+	Descriptor for a primitive TAE that uses the TutorialDateTime annotator
+-->
+<taeDescription xmlns="http://uima.apache.org/resourceSpecifier">
+	<frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+	<primitive>true</primitive>
+	<annotatorImplementationName>MeetingAnnotator</annotatorImplementationName>
+
+
+	<analysisEngineMetaData>
+		<name>Meeting Annotator</name>
+		<description>Detects meetings from co-occurrences of room numbers, dates, and times</description>
+		<version>1.0</version>
+		<vendor>IBM</vendor>
+
+		<configurationParameters>
+			<configurationParameter>
+				<name>WindowSize</name>
+				<description>Maximum number of characters within which a room number, a date, and two times must occur for a meeting annotation to be created.</description>
+				<type>Integer</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+		</configurationParameters>
+
+		<configurationParameterSettings>
+			<nameValuePair>
+				<name>WindowSize</name>
+				<value>
+					<integer>200</integer>
+				</value>
+			</nameValuePair>
+		</configurationParameterSettings>
+
+		<!--
+			TypeSystem Definition
+		-->
+
+		<typeSystemDescription>
+		  <imports>
+		    <import location="TutorialTypeSystem.xml"/>
+		  </imports>
+		</typeSystemDescription>
+
+
+
+		<!--
+			Capabilities: Inputs, Outputs, and Preconditions
+		-->
+		<capabilities>
+			<capability>
+				<inputs>
+					<type allAnnotatorFeatures="true">org.apache.uima.tutorial.RoomNumber</type>
+					<type allAnnotatorFeatures="true">org.apache.uima.tutorial.TimeAnnot</type>
+					<type allAnnotatorFeatures="true">org.apache.uima.tutorial.DateAnnot</type>
+				</inputs>
+				<outputs>
+					<type allAnnotatorFeatures="true">org.apache.uima.tutorial.Meeting</type>
+				</outputs>
+				<languagesSupported>
+					<language>en</language>
+				</languagesSupported>
+			</capability>
+		</capabilities>
+
+	</analysisEngineMetaData>
+</taeDescription>
diff --git a/examples/tutorial/src/MeetingAnnotator.mak b/examples/tutorial/src/MeetingAnnotator.mak
index d95f0a3..857614e 100644
--- a/examples/tutorial/src/MeetingAnnotator.mak
+++ b/examples/tutorial/src/MeetingAnnotator.mak
@@ -1,42 +1,42 @@
-#####################################

-# UNIX Makefile for a UIMACPP annotator

-#####################################

-

-# ---------------------------------------------------------------------------

-# Licensed to the Apache Software Foundation (ASF) under one or more

-# contributor license agreements.  See the NOTICE file distributed with

-# this work for additional information regarding copyright ownership.

-# 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.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ---------------------------------------------------------------------------

-

-# name of the annotator to be created

-TARGET_FILE=MeetingAnnotator

-

-# list of user's object files to be linked when building the annotator

-OBJS=MeetingAnnotator.o

-

-#Use this var to pass additional user-defined parameters to the compiler

-USER_CFLAGS=

-

-#Use this var to pass additional user-defined parameters to the linker

-USER_LINKFLAGS=

-

-# Set DEBUG=1 for a debug build (if not 1 a ship build will result)

-DEBUG=1

-

-# Set DLL_BUILD=1 to build an annotator (shared library)

-#    if not 1 an executable binary will be built

-DLL_BUILD=1

-

-# include file with generic compiler instructions

-include $(UIMACPP_HOME)/lib/base.mak

+#####################################
+# UNIX Makefile for a UIMACPP annotator
+#####################################
+
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+# name of the annotator to be created
+TARGET_FILE=MeetingAnnotator
+
+# list of user's object files to be linked when building the annotator
+OBJS=MeetingAnnotator.o
+
+#Use this var to pass additional user-defined parameters to the compiler
+USER_CFLAGS=
+
+#Use this var to pass additional user-defined parameters to the linker
+USER_LINKFLAGS=
+
+# Set DEBUG=1 for a debug build (if not 1 a ship build will result)
+DEBUG=1
+
+# Set DLL_BUILD=1 to build an annotator (shared library)
+#    if not 1 an executable binary will be built
+DLL_BUILD=1
+
+# include file with generic compiler instructions
+include $(UIMACPP_HOME)/lib/base.mak
diff --git a/examples/tutorial/src/MeetingAnnotator.vcproj b/examples/tutorial/src/MeetingAnnotator.vcproj
index db8288d..5861334 100644
--- a/examples/tutorial/src/MeetingAnnotator.vcproj
+++ b/examples/tutorial/src/MeetingAnnotator.vcproj
@@ -1,217 +1,217 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="MeetingAnnotator"

-	ProjectGUID="{69C8A769-7CEC-4D2A-B189-FE19606577B7}"

-	RootNamespace="MeetingAnnotator"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"

-				OutputFile="$(OutDir)/MeetingAnnotatorD.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)"

-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"

-				OutputFile="$(OutDir)/MeetingAnnotator.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\MeetingAnnotator.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="MeetingAnnotator"
+	ProjectGUID="{69C8A769-7CEC-4D2A-B189-FE19606577B7}"
+	RootNamespace="MeetingAnnotator"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uimaD.lib"
+				OutputFile="$(OutDir)/MeetingAnnotatorD.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libapr-1.lib xerces-c_2.lib icuuc.lib uima.lib"
+				OutputFile="$(OutDir)/MeetingAnnotator.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\MeetingAnnotator.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/m4/find_activemq.m4 b/m4/find_activemq.m4
index 328536a..40d8394 100644
--- a/m4/find_activemq.m4
+++ b/m4/find_activemq.m4
@@ -1,80 +1,80 @@
-# ===========================================================================

-#       Derived from http://www.gnu.org/software/autoconf-archive/ax_lib_xerces.html

-# ===========================================================================

-#

-# SYNOPSIS

-#

-#   AX_LIB_ICUC([MINIMUM-VERSION])

-#

-# DESCRIPTION

-#

-#   This macro provides tests of availability of ICU

-#   particular version or newer. This macros checks for ICU

-#   Parser headers and libraries and defines compilation flags

-#

-#   Macro supports following options and their values:

-#

-#     --with-activemq - path to ACTIVEMQ installation prefix 

-#

-#

-#   This macro calls:

-#

-#     AC_SUBST(ACTIVEMQ_CXXFLAGS)

-#     AC_SUBST(ACTIVEMQ_LDFLAGS)

-#     AC_SUBST(ACTIVEMQ_VERSION) - only if version requirement is used

-#

-#   And sets:

-#

-#     icu_found

-#

-

-AC_DEFUN([AMQ_FIND_AMQ],

-[

-  amq_found="no"

-

-  AC_MSG_CHECKING(for ActiveMQ 3.2 or later)

-  AC_ARG_WITH(activemq,

-     [ --with-activemq=PATH prefix for install ACTIVEMQ or leave out to use standard path ],

-   [

-      if test -d "$withval"; then

-        activemq_prefix="$withval"

-	activemq_install="$withval"

-	AC_SUBST(activemq_install) 

-      else

-        AC_MSG_WARN([Invalid ACTIVEMQ path $withval])

-        AC_MSG_ERROR([ACTIVEMQ not found. Please use --without-activemq or--with-activemq=PATH])

-      fi

-   ],

-   [

-      dnl Default behavior is implicit yes

-      if test -x /usr/local/bin/activemqcpp-config ; then

-        activemq_prefix=/usr/local

-      elif test -x /usr/bin/activemqcpp-config ; then

-        activemq_prefix=/usr

-      else

-        AC_MSG_ERROR([ACTIVEMQ not found. Please use --with-activemq= to the path])

-      fi

-   ])

-

-  if test -x "$activemq_prefix/bin/activemqcpp-config"; then

-    ACTIVEMQ_VERSION=`$activemq_prefix/bin/activemqcpp-config --version`

-    VERSION_CHECK=`expr $ACTIVEMQ_VERSION \>\= $1`

-    if test "$VERSION_CHECK" = "1"; then

-      amq_found="yes"

-      ACTIVEMQ_VER=`echo $activemq_prefix/include/activemq-cpp-* | sed -e 's/.*activemq-cpp-//'`

-      ACTIVEMQ_CXXFLAGS="-I$activemq_prefix/include/activemq-cpp-$ACTIVEMQ_VER"

-#     ACTIVEMQ_CXXFLAGS=`$activemq_prefix/bin/activemqcpp-config --exec-prefix=$activemq_prefix --include`

-      ACTIVEMQ_LDFLAGS=`$activemq_prefix/bin/activemqcpp-config --exec-prefix=$activemq_prefix --libs`

-      AC_SUBST(ACTIVEMQ_VERSION) 

-      AC_SUBST(ACTIVEMQ_CXXFLAGS)   

-      AC_SUBST(ACTIVEMQ_LDFLAGS)

-    else 

-      AC_MSG_ERROR([Invalid activemq version $ACTIVEMQ_VERSION found. activemq version $1 or higher is required]) 

-    fi  

-  else

-    AC_MSG_ERROR([activemqcpp-config script not found in $activemq_prefix/bin])

-  fi

- 

-  AC_MSG_RESULT($amq_found)

-

-])

+# ===========================================================================
+#       Derived from http://www.gnu.org/software/autoconf-archive/ax_lib_xerces.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_LIB_ICUC([MINIMUM-VERSION])
+#
+# DESCRIPTION
+#
+#   This macro provides tests of availability of ICU
+#   particular version or newer. This macros checks for ICU
+#   Parser headers and libraries and defines compilation flags
+#
+#   Macro supports following options and their values:
+#
+#     --with-activemq - path to ACTIVEMQ installation prefix 
+#
+#
+#   This macro calls:
+#
+#     AC_SUBST(ACTIVEMQ_CXXFLAGS)
+#     AC_SUBST(ACTIVEMQ_LDFLAGS)
+#     AC_SUBST(ACTIVEMQ_VERSION) - only if version requirement is used
+#
+#   And sets:
+#
+#     icu_found
+#
+
+AC_DEFUN([AMQ_FIND_AMQ],
+[
+  amq_found="no"
+
+  AC_MSG_CHECKING(for ActiveMQ 3.2 or later)
+  AC_ARG_WITH(activemq,
+     [ --with-activemq=PATH prefix for install ACTIVEMQ or leave out to use standard path ],
+   [
+      if test -d "$withval"; then
+        activemq_prefix="$withval"
+	activemq_install="$withval"
+	AC_SUBST(activemq_install) 
+      else
+        AC_MSG_WARN([Invalid ACTIVEMQ path $withval])
+        AC_MSG_ERROR([ACTIVEMQ not found. Please use --without-activemq or--with-activemq=PATH])
+      fi
+   ],
+   [
+      dnl Default behavior is implicit yes
+      if test -x /usr/local/bin/activemqcpp-config ; then
+        activemq_prefix=/usr/local
+      elif test -x /usr/bin/activemqcpp-config ; then
+        activemq_prefix=/usr
+      else
+        AC_MSG_ERROR([ACTIVEMQ not found. Please use --with-activemq= to the path])
+      fi
+   ])
+
+  if test -x "$activemq_prefix/bin/activemqcpp-config"; then
+    ACTIVEMQ_VERSION=`$activemq_prefix/bin/activemqcpp-config --version`
+    VERSION_CHECK=`expr $ACTIVEMQ_VERSION \>\= $1`
+    if test "$VERSION_CHECK" = "1"; then
+      amq_found="yes"
+      ACTIVEMQ_VER=`echo $activemq_prefix/include/activemq-cpp-* | sed -e 's/.*activemq-cpp-//'`
+      ACTIVEMQ_CXXFLAGS="-I$activemq_prefix/include/activemq-cpp-$ACTIVEMQ_VER"
+#     ACTIVEMQ_CXXFLAGS=`$activemq_prefix/bin/activemqcpp-config --exec-prefix=$activemq_prefix --include`
+      ACTIVEMQ_LDFLAGS=`$activemq_prefix/bin/activemqcpp-config --exec-prefix=$activemq_prefix --libs`
+      AC_SUBST(ACTIVEMQ_VERSION) 
+      AC_SUBST(ACTIVEMQ_CXXFLAGS)   
+      AC_SUBST(ACTIVEMQ_LDFLAGS)
+    else 
+      AC_MSG_ERROR([Invalid activemq version $ACTIVEMQ_VERSION found. activemq version $1 or higher is required]) 
+    fi  
+  else
+    AC_MSG_ERROR([activemqcpp-config script not found in $activemq_prefix/bin])
+  fi
+ 
+  AC_MSG_RESULT($amq_found)
+
+])
diff --git a/m4/find_icu.m4 b/m4/find_icu.m4
index 88651b3..6f1e7a4 100644
--- a/m4/find_icu.m4
+++ b/m4/find_icu.m4
@@ -1,78 +1,78 @@
-# ===========================================================================

-#       Derived from http://www.gnu.org/software/autoconf-archive/ax_lib_xerces.html

-# ===========================================================================

-#

-# SYNOPSIS

-#

-#   AX_LIB_ICUC([MINIMUM-VERSION])

-#

-# DESCRIPTION

-#

-#   This macro provides tests of availability of ICU

-#   particular version or newer. This macros checks for ICU

-#   Parser headers and libraries and defines compilation flags

-#

-#   Macro supports following options and their values:

-#

-#     --with-icu - path to ICU installation prefix

-#

-#

-#   This macro calls:

-#

-#     AC_SUBST(ICU_CPPFLAGS)

-#     AC_SUBST(ICU_LDFLAGS)

-#     AC_SUBST(ICU_VERSION) - only if version requirement is used

-#

-#   And sets:

-#

-#     icu_found

-#

-

-AC_DEFUN([ICU_FIND_ICU],

-[

-  icu_found="no"

-

-  AC_MSG_CHECKING(for ICU)

-  AC_ARG_WITH(icu,

-     [ --with-icu=PATH prefix for install ICU or will try standar path ],

-   [

-      if test -d "$withval"; then

-        icu_prefix="$withval"

-	icu_install="$withval"

-        AC_SUBST(icu_install)

-      else

-        AC_MSG_ERROR([Invalid ICU path $withval])

-      fi

-   ],

-   [

-      dnl Default behavior is implicit yes

-      if test -d /usr/local/include/unicode ; then

-        icu_prefix=/usr/local

-      elif test -d /usr/include/unicode ; then

-        icu_prefix=/usr

-      else

-        AC_MSG_ERROR([ICU not found. Please use --with-icu= to the path])

-      fi

-   ])

-

-  icu_found="yes"

-

-  if test -x "$icu_prefix/bin/icu-config"; then

-    ICU_VERSION=`$icu_prefix/bin/icu-config --prefix=$icu_prefix --version`

-    VERSION_CHECK=`expr $ICU_VERSION \>\= $1`

-    if test "$VERSION_CHECK" = "1"; then

-      ICU_CPPFLAGS="-I$icu_prefix/include"

-      ICU_LDFLAGS="-L$icu_prefix/lib -licui18n -licuuc -licuio -licudata"

-      AC_SUBST(ICU_CPPFLAGS)

-      AC_SUBST(ICU_LDFLAGS)

-      AC_MSG_RESULT($icu_found)

-    else

-      icu_found="no"

-      AC_MSG_ERROR([Invalid ICU version $ICU_VERSION found. ICU version $1 or higher is required])

-    fi 

-  else

-   icu_found="no"

-   AC_MSG_ERROR([icu_config script not found.])

-  fi

-

-])

+# ===========================================================================
+#       Derived from http://www.gnu.org/software/autoconf-archive/ax_lib_xerces.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_LIB_ICUC([MINIMUM-VERSION])
+#
+# DESCRIPTION
+#
+#   This macro provides tests of availability of ICU
+#   particular version or newer. This macros checks for ICU
+#   Parser headers and libraries and defines compilation flags
+#
+#   Macro supports following options and their values:
+#
+#     --with-icu - path to ICU installation prefix
+#
+#
+#   This macro calls:
+#
+#     AC_SUBST(ICU_CPPFLAGS)
+#     AC_SUBST(ICU_LDFLAGS)
+#     AC_SUBST(ICU_VERSION) - only if version requirement is used
+#
+#   And sets:
+#
+#     icu_found
+#
+
+AC_DEFUN([ICU_FIND_ICU],
+[
+  icu_found="no"
+
+  AC_MSG_CHECKING(for ICU)
+  AC_ARG_WITH(icu,
+     [ --with-icu=PATH prefix for install ICU or will try standar path ],
+   [
+      if test -d "$withval"; then
+        icu_prefix="$withval"
+	icu_install="$withval"
+        AC_SUBST(icu_install)
+      else
+        AC_MSG_ERROR([Invalid ICU path $withval])
+      fi
+   ],
+   [
+      dnl Default behavior is implicit yes
+      if test -d /usr/local/include/unicode ; then
+        icu_prefix=/usr/local
+      elif test -d /usr/include/unicode ; then
+        icu_prefix=/usr
+      else
+        AC_MSG_ERROR([ICU not found. Please use --with-icu= to the path])
+      fi
+   ])
+
+  icu_found="yes"
+
+  if test -x "$icu_prefix/bin/icu-config"; then
+    ICU_VERSION=`$icu_prefix/bin/icu-config --prefix=$icu_prefix --version`
+    VERSION_CHECK=`expr $ICU_VERSION \>\= $1`
+    if test "$VERSION_CHECK" = "1"; then
+      ICU_CPPFLAGS="-I$icu_prefix/include"
+      ICU_LDFLAGS="-L$icu_prefix/lib -licui18n -licuuc -licuio -licudata"
+      AC_SUBST(ICU_CPPFLAGS)
+      AC_SUBST(ICU_LDFLAGS)
+      AC_MSG_RESULT($icu_found)
+    else
+      icu_found="no"
+      AC_MSG_ERROR([Invalid ICU version $ICU_VERSION found. ICU version $1 or higher is required])
+    fi 
+  else
+   icu_found="no"
+   AC_MSG_ERROR([icu_config script not found.])
+  fi
+
+])
diff --git a/scriptators/perl/perltator.vcproj b/scriptators/perl/perltator.vcproj
index e55ba1b..12e9dff 100644
--- a/scriptators/perl/perltator.vcproj
+++ b/scriptators/perl/perltator.vcproj
@@ -1,255 +1,255 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="perltator"

-	ProjectGUID="{0BC37546-5E6B-4383-9984-EF348B9FB966}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="."

-			IntermediateDirectory="Debug"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(PERL5_INCLUDE)&quot;;&quot;$(UIMACPP_HOME)/include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;.."

-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib icuin.lib perl58.lib uima.lib libapr-1.lib"

-				OutputFile="$(OutDir)/perltator.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="$(PERL5_LIBDIR);$(UIMACPP_HOME)\lib"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/perltator.pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/perltator.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="."

-			IntermediateDirectory="Release"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories="&quot;$(PERL5_INCLUDE)&quot;;&quot;$(UIMACPP_HOME)/include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;.."

-				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib icuin.lib perl58.lib uima.lib libapr-1.lib"

-				OutputFile="$(OutDir)/perltator.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="$(PERL5_LIBDIR);$(UIMACPP_HOME)\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/perltator.pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/perltator.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\Perltator.cpp"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="WIN32"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\uima.i"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo PERL5_INCLUDE: %PERL5_INCLUDE%&#x0D;&#x0A;echo PERL5_LIB: %PERL5_LIB%&#x0D;&#x0A;echo SWIG_PATH: %SWIG_PATH%&#x0D;&#x0A;echo on&#x0D;&#x0A;%SWIG_PATH%\swig  -o uima_wrap.cxx -outdir . -c++ -perl5 &quot;$(InputPath)&quot;&#x0D;&#x0A;%SWIG_PATH%\swig -outdir . -c++ -perl5 -external-runtime uimaperlwrap.h&#x0D;&#x0A;"

-						Outputs="uima_wrap.cxx; uimaperlwrap.h; perltator.pl"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo PERL5_INCLUDE: %PERL5_INCLUDE%&#x0D;&#x0A;echo PERL5_LIB: %PERL5_LIB%&#x0D;&#x0A;echo SWIG_PATH: %SWIG_PATH%&#x0D;&#x0A;echo on&#x0D;&#x0A;%SWIG_PATH%\swig  -o uima_wrap.cxx -outdir . -c++ -perl5 &quot;$(InputPath)&quot;&#x0D;&#x0A;%SWIG_PATH%\swig -outdir . -c++ -perl5 -external-runtime uimaperlwrap.h&#x0D;&#x0A;"

-						Outputs="uima_wrap.cxx; uimaperlwrap.h; perltator.pl"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath=".\uima_wrap.cxx"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)/uima_wrap.obj"

-						CompileAs="2"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="perltator"
+	ProjectGUID="{0BC37546-5E6B-4383-9984-EF348B9FB966}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(PERL5_INCLUDE)&quot;;&quot;$(UIMACPP_HOME)/include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;.."
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib icuin.lib perl58.lib uima.lib libapr-1.lib"
+				OutputFile="$(OutDir)/perltator.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(PERL5_LIBDIR);$(UIMACPP_HOME)\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/perltator.pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/perltator.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(PERL5_INCLUDE)&quot;;&quot;$(UIMACPP_HOME)/include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;.."
+				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib icuin.lib perl58.lib uima.lib libapr-1.lib"
+				OutputFile="$(OutDir)/perltator.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(PERL5_LIBDIR);$(UIMACPP_HOME)\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/perltator.pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/perltator.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\Perltator.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="WIN32"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\uima.i"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo PERL5_INCLUDE: %PERL5_INCLUDE%&#x0D;&#x0A;echo PERL5_LIB: %PERL5_LIB%&#x0D;&#x0A;echo SWIG_PATH: %SWIG_PATH%&#x0D;&#x0A;echo on&#x0D;&#x0A;%SWIG_PATH%\swig  -o uima_wrap.cxx -outdir . -c++ -perl5 &quot;$(InputPath)&quot;&#x0D;&#x0A;%SWIG_PATH%\swig -outdir . -c++ -perl5 -external-runtime uimaperlwrap.h&#x0D;&#x0A;"
+						Outputs="uima_wrap.cxx; uimaperlwrap.h; perltator.pl"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo PERL5_INCLUDE: %PERL5_INCLUDE%&#x0D;&#x0A;echo PERL5_LIB: %PERL5_LIB%&#x0D;&#x0A;echo SWIG_PATH: %SWIG_PATH%&#x0D;&#x0A;echo on&#x0D;&#x0A;%SWIG_PATH%\swig  -o uima_wrap.cxx -outdir . -c++ -perl5 &quot;$(InputPath)&quot;&#x0D;&#x0A;%SWIG_PATH%\swig -outdir . -c++ -perl5 -external-runtime uimaperlwrap.h&#x0D;&#x0A;"
+						Outputs="uima_wrap.cxx; uimaperlwrap.h; perltator.pl"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\uima_wrap.cxx"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/uima_wrap.obj"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/scriptators/perl/winmake.cmd b/scriptators/perl/winmake.cmd
index 5f7754a..ad2b445 100644
--- a/scriptators/perl/winmake.cmd
+++ b/scriptators/perl/winmake.cmd
@@ -1,48 +1,48 @@
-@echo off

-

-REM   Licensed to the Apache Software Foundation (ASF) under one

-REM   or more contributor license agreements.  See the NOTICE file

-REM   distributed with this work for additional information

-REM   regarding copyright ownership.  The ASF licenses this file

-REM   to you under the Apache License, Version 2.0 (the

-REM   "License"); you may not use this file except in compliance

-REM   with the License.  You may obtain a copy of the License at

-REM

-REM    http://www.apache.org/licenses/LICENSE-2.0

-REM

-REM   Unless required by applicable law or agreed to in writing,

-REM   software distributed under the License is distributed on an

-REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-REM   KIND, either express or implied.  See the License for the

-REM   specific language governing permissions and limitations

-REM   under the License.

-

-

-if "%UIMACPP_HOME%" == "" goto TafRootNotSet

-if not exist "%UIMACPP_HOME%"\include\uima\cas.hpp goto UimaRootBad

-

-set SWIG_PATH=\swigwin-1.3.29

-if not exist %SWIG_PATH% goto SwigPathNotSet

-

-set PERL5_INCLUDE=\Perl\lib\CORE

-set PERL5_LIB=\Perl\lib\CORE

-set PERL5_LIBDIR=\Perl\lib\CORE

-if not exist %PERL5_LIB% goto PerlNotSet

-

-REM build Perltator

-devenv perltator.vcproj /build release 

-goto TheEnd

-

-:UimaRootBad

-echo UIMACPP_HOME is invalid

-goto TheEnd

-

-:SwigPathNotSet

-echo SWIG_PATH is invalid

-goto TheEnd

-

-:PerlNotSet

-echo Perl environment is invalid

-

-

-:TheEnd

+@echo off
+
+REM   Licensed to the Apache Software Foundation (ASF) under one
+REM   or more contributor license agreements.  See the NOTICE file
+REM   distributed with this work for additional information
+REM   regarding copyright ownership.  The ASF licenses this file
+REM   to you under the Apache License, Version 2.0 (the
+REM   "License"); you may not use this file except in compliance
+REM   with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM   Unless required by applicable law or agreed to in writing,
+REM   software distributed under the License is distributed on an
+REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM   KIND, either express or implied.  See the License for the
+REM   specific language governing permissions and limitations
+REM   under the License.
+
+
+if "%UIMACPP_HOME%" == "" goto TafRootNotSet
+if not exist "%UIMACPP_HOME%"\include\uima\cas.hpp goto UimaRootBad
+
+set SWIG_PATH=\swigwin-1.3.29
+if not exist %SWIG_PATH% goto SwigPathNotSet
+
+set PERL5_INCLUDE=\Perl\lib\CORE
+set PERL5_LIB=\Perl\lib\CORE
+set PERL5_LIBDIR=\Perl\lib\CORE
+if not exist %PERL5_LIB% goto PerlNotSet
+
+REM build Perltator
+devenv perltator.vcproj /build release 
+goto TheEnd
+
+:UimaRootBad
+echo UIMACPP_HOME is invalid
+goto TheEnd
+
+:SwigPathNotSet
+echo SWIG_PATH is invalid
+goto TheEnd
+
+:PerlNotSet
+echo Perl environment is invalid
+
+
+:TheEnd
diff --git a/scriptators/python/pythonnator.vcproj b/scriptators/python/pythonnator.vcproj
index 14c8d94..bb26445 100644
--- a/scriptators/python/pythonnator.vcproj
+++ b/scriptators/python/pythonnator.vcproj
@@ -1,263 +1,263 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="pythonnator"

-	ProjectGUID="{0BC37546-5E6B-4383-9984-EF348B9FB966}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="."

-			IntermediateDirectory="Debug"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(PYTHON_INCLUDE)&quot;;&quot;$(UIMACPP_HOME)/include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;PYTHON2_4;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib icuin.lib python24.lib uima.lib"

-				OutputFile="$(OutDir)/_pythonnator.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="$(PYTHON_LIBDIR);$(UIMACPP_HOME)\lib"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/pythonnator.pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/pythonnator.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="."

-			IntermediateDirectory="Release"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories="&quot;$(PYTHON_INCLUDE)&quot;;&quot;$(UIMACPP_HOME)/include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;PYTHON2_4;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib icuin.lib python24.lib uima.lib"

-				OutputFile="$(OutDir)/_pythonnator.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="$(PYTHON_LIBDIR);$(UIMACPP_HOME)\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/pythonnator.pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/pythonnator.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\Pythonnator.cpp"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="WIN32"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\uima.i"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo PYTHON_INCLUDE: %PYTHON_INCLUDE%&#x0D;&#x0A;echo PYTHON_LIB: %PYTHON_LIB%&#x0D;&#x0A;echo PYTHON_LIBDIR: %PYTHON_LIBDIR%&#x0D;&#x0A;echo SWIG_PATH: %SWIG_PATH%&#x0D;&#x0A;echo on&#x0D;&#x0A;%SWIG_PATH%\swig -outdir . -c++ -python -external-runtime uimapywrap.h&#x0D;&#x0A;%SWIG_PATH%\swig  -o uima_wrap.cxx -outdir . -c++ -python -oh uimapywrap.h &quot;$(InputPath)&quot;&#x0D;&#x0A;"

-						Outputs="uima_wrap.cxx; uimapywrap.h; pythonnator.py"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo PYTHON_INCLUDE: %PYTHON_INCLUDE%&#x0D;&#x0A;echo PYTHON_LIB: %PYTHON_LIB%&#x0D;&#x0A;echo PYTHON_LIBDIR: %PYTHON_LIBDIR%&#x0D;&#x0A;echo SWIG_PATH: %SWIG_PATH%&#x0D;&#x0A;echo on&#x0D;&#x0A;%SWIG_PATH%\swig -outdir . -c++ -python -external-runtime uimapywrap.h&#x0D;&#x0A;%SWIG_PATH%\swig  -o uima_wrap.cxx -outdir . -c++ -python -oh uimapywrap.h  &quot;$(InputPath)&quot;&#x0D;&#x0A;"

-						Outputs="uima_wrap.cxx; uimapywrap.h; pythonnator.py"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath=".\uima_wrap.cxx"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)/uima_wrap.obj"

-						CompileAs="2"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)/uima_wrap.obj"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pythonnator"
+	ProjectGUID="{0BC37546-5E6B-4383-9984-EF348B9FB966}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(PYTHON_INCLUDE)&quot;;&quot;$(UIMACPP_HOME)/include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;PYTHON2_4;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib icuin.lib python24.lib uima.lib"
+				OutputFile="$(OutDir)/_pythonnator.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(PYTHON_LIBDIR);$(UIMACPP_HOME)\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/pythonnator.pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/pythonnator.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(PYTHON_INCLUDE)&quot;;&quot;$(UIMACPP_HOME)/include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;PYTHON2_4;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib icuin.lib python24.lib uima.lib"
+				OutputFile="$(OutDir)/_pythonnator.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(PYTHON_LIBDIR);$(UIMACPP_HOME)\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/pythonnator.pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/pythonnator.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\Pythonnator.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="WIN32"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\uima.i"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo PYTHON_INCLUDE: %PYTHON_INCLUDE%&#x0D;&#x0A;echo PYTHON_LIB: %PYTHON_LIB%&#x0D;&#x0A;echo PYTHON_LIBDIR: %PYTHON_LIBDIR%&#x0D;&#x0A;echo SWIG_PATH: %SWIG_PATH%&#x0D;&#x0A;echo on&#x0D;&#x0A;%SWIG_PATH%\swig -outdir . -c++ -python -external-runtime uimapywrap.h&#x0D;&#x0A;%SWIG_PATH%\swig  -o uima_wrap.cxx -outdir . -c++ -python -oh uimapywrap.h &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Outputs="uima_wrap.cxx; uimapywrap.h; pythonnator.py"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo PYTHON_INCLUDE: %PYTHON_INCLUDE%&#x0D;&#x0A;echo PYTHON_LIB: %PYTHON_LIB%&#x0D;&#x0A;echo PYTHON_LIBDIR: %PYTHON_LIBDIR%&#x0D;&#x0A;echo SWIG_PATH: %SWIG_PATH%&#x0D;&#x0A;echo on&#x0D;&#x0A;%SWIG_PATH%\swig -outdir . -c++ -python -external-runtime uimapywrap.h&#x0D;&#x0A;%SWIG_PATH%\swig  -o uima_wrap.cxx -outdir . -c++ -python -oh uimapywrap.h  &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Outputs="uima_wrap.cxx; uimapywrap.h; pythonnator.py"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\uima_wrap.cxx"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/uima_wrap.obj"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/uima_wrap.obj"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/scriptators/python/winmake.cmd b/scriptators/python/winmake.cmd
index 4f1af28..810cb23 100644
--- a/scriptators/python/winmake.cmd
+++ b/scriptators/python/winmake.cmd
@@ -1,47 +1,47 @@
-@echo off

-

-REM   Licensed to the Apache Software Foundation (ASF) under one

-REM   or more contributor license agreements.  See the NOTICE file

-REM   distributed with this work for additional information

-REM   regarding copyright ownership.  The ASF licenses this file

-REM   to you under the Apache License, Version 2.0 (the

-REM   "License"); you may not use this file except in compliance

-REM   with the License.  You may obtain a copy of the License at

-REM

-REM    http://www.apache.org/licenses/LICENSE-2.0

-REM

-REM   Unless required by applicable law or agreed to in writing,

-REM   software distributed under the License is distributed on an

-REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-REM   KIND, either express or implied.  See the License for the

-REM   specific language governing permissions and limitations

-REM   under the License.

-

-if "%UIMACPP_HOME%" == "" goto TafRootNotSet

-if not exist "%UIMACPP_HOME%"\include\uima\cas.hpp goto UimaRootBad

-

-set SWIG_PATH=\swigwin-1.3.29

-if not exist %SWIG_PATH% goto SwigPathNotSet

-

-set PYTHON_INCLUDE=\Python24\include

-set PYTHON_LIB=\Python24\lib

-set PYTHON_LIBDIR=\Python24\libs

-if not exist %PYTHON_LIB% goto PythonNotSet

-

-REM build Pythonnator

-devenv pythonnator.vcproj /build release 

-goto TheEnd

-

-:UimaRootBad

-echo UIMACPP_HOME is invalid

-goto TheEnd

-

-:SwigPathNotSet

-echo SWIG_PATH is invalid

-goto TheEnd

-

-:PythonNotSet

-echo Python environment is invalid

-

-

-:TheEnd

+@echo off
+
+REM   Licensed to the Apache Software Foundation (ASF) under one
+REM   or more contributor license agreements.  See the NOTICE file
+REM   distributed with this work for additional information
+REM   regarding copyright ownership.  The ASF licenses this file
+REM   to you under the Apache License, Version 2.0 (the
+REM   "License"); you may not use this file except in compliance
+REM   with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM   Unless required by applicable law or agreed to in writing,
+REM   software distributed under the License is distributed on an
+REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM   KIND, either express or implied.  See the License for the
+REM   specific language governing permissions and limitations
+REM   under the License.
+
+if "%UIMACPP_HOME%" == "" goto TafRootNotSet
+if not exist "%UIMACPP_HOME%"\include\uima\cas.hpp goto UimaRootBad
+
+set SWIG_PATH=\swigwin-1.3.29
+if not exist %SWIG_PATH% goto SwigPathNotSet
+
+set PYTHON_INCLUDE=\Python24\include
+set PYTHON_LIB=\Python24\lib
+set PYTHON_LIBDIR=\Python24\libs
+if not exist %PYTHON_LIB% goto PythonNotSet
+
+REM build Pythonnator
+devenv pythonnator.vcproj /build release 
+goto TheEnd
+
+:UimaRootBad
+echo UIMACPP_HOME is invalid
+goto TheEnd
+
+:SwigPathNotSet
+echo SWIG_PATH is invalid
+goto TheEnd
+
+:PythonNotSet
+echo Python environment is invalid
+
+
+:TheEnd
diff --git a/scriptators/tcl/tclator.vcproj b/scriptators/tcl/tclator.vcproj
index 2865386..f5e87f5 100644
--- a/scriptators/tcl/tclator.vcproj
+++ b/scriptators/tcl/tclator.vcproj
@@ -1,257 +1,257 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="tclator"

-	ProjectGUID="{0BC37546-5E6B-4383-9984-EF348B9FB966}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="."

-			IntermediateDirectory="Debug"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(TCL_INCLUDE)&quot;;&quot;$(UIMACPP_HOME)/include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;.."

-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				ObjectFile="$(IntDir)/tclator.obj"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib icuin.lib tcl84.lib uima.lib libapr-1.lib"

-				OutputFile="$(OutDir)/tclator.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="$(TCL_LIBDIR);$(UIMACPP_HOME)\lib"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/tclator.pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/tclator.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="."

-			IntermediateDirectory="Release"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories="&quot;$(TCL_INCLUDE)&quot;;&quot;$(UIMACPP_HOME)/include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;.."

-				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				ObjectFile="$(IntDir)/tclator.obj"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib icuin.lib tcl84.lib uima.lib libapr-1.lib"

-				OutputFile="$(OutDir)/tclator.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="$(TCL_LIBDIR);$(UIMACPP_HOME)\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/tclator.pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/tclator.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\Tclator.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\uima.i"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo TCL_INCLUDE: %TCL_INCLUDE%&#x0D;&#x0A;echo TCL_LIBDIR: %TCL_LIBDIR%&#x0D;&#x0A;echo SWIG_PATH: %SWIG_PATH%&#x0D;&#x0A;echo on&#x0D;&#x0A;%SWIG_PATH%\swig -outdir . -c++ -tcl -external-runtime uimatclwrap.h&#x0D;&#x0A;%SWIG_PATH%\swig  -o uima_wrap.cxx -outdir . -c++ -tcl -oh uimatclwrap.h &quot;$(InputPath)&quot;&#x0D;&#x0A;&#x0D;&#x0A;"

-						Outputs="uima_wrap.cxx; uimatclwrap.h"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCustomBuildTool"

-						CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo TCL_INCLUDE: %TCL_INCLUDE%&#x0D;&#x0A;echo TCL_LIBDIR: %TCL_LIBDIR%&#x0D;&#x0A;echo SWIG_PATH: %SWIG_PATH%&#x0D;&#x0A;echo on&#x0D;&#x0A;%SWIG_PATH%\swig -outdir . -c++ -tcl -external-runtime uimatclwrap.h&#x0D;&#x0A;%SWIG_PATH%\swig  -o uima_wrap.cxx -outdir . -c++ -tcl -oh uimatclwrap.h  &quot;$(InputPath)&quot;&#x0D;&#x0A;&#x0D;&#x0A;"

-						Outputs="uima_wrap.cxx; uimatclwrap.h"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath=".\uima_wrap.cxx"

-				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)/uima_wrap.obj"

-						CompileAs="2"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)/uima_wrap.obj"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="tclator"
+	ProjectGUID="{0BC37546-5E6B-4383-9984-EF348B9FB966}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(TCL_INCLUDE)&quot;;&quot;$(UIMACPP_HOME)/include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;.."
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				ObjectFile="$(IntDir)/tclator.obj"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib icuin.lib tcl84.lib uima.lib libapr-1.lib"
+				OutputFile="$(OutDir)/tclator.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(TCL_LIBDIR);$(UIMACPP_HOME)\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/tclator.pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/tclator.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(TCL_INCLUDE)&quot;;&quot;$(UIMACPP_HOME)/include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;.."
+				PreprocessorDefinitions="TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				ObjectFile="$(IntDir)/tclator.obj"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib icuin.lib tcl84.lib uima.lib libapr-1.lib"
+				OutputFile="$(OutDir)/tclator.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(TCL_LIBDIR);$(UIMACPP_HOME)\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/tclator.pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/tclator.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\Tclator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\uima.i"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo TCL_INCLUDE: %TCL_INCLUDE%&#x0D;&#x0A;echo TCL_LIBDIR: %TCL_LIBDIR%&#x0D;&#x0A;echo SWIG_PATH: %SWIG_PATH%&#x0D;&#x0A;echo on&#x0D;&#x0A;%SWIG_PATH%\swig -outdir . -c++ -tcl -external-runtime uimatclwrap.h&#x0D;&#x0A;%SWIG_PATH%\swig  -o uima_wrap.cxx -outdir . -c++ -tcl -oh uimatclwrap.h &quot;$(InputPath)&quot;&#x0D;&#x0A;&#x0D;&#x0A;"
+						Outputs="uima_wrap.cxx; uimatclwrap.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo TCL_INCLUDE: %TCL_INCLUDE%&#x0D;&#x0A;echo TCL_LIBDIR: %TCL_LIBDIR%&#x0D;&#x0A;echo SWIG_PATH: %SWIG_PATH%&#x0D;&#x0A;echo on&#x0D;&#x0A;%SWIG_PATH%\swig -outdir . -c++ -tcl -external-runtime uimatclwrap.h&#x0D;&#x0A;%SWIG_PATH%\swig  -o uima_wrap.cxx -outdir . -c++ -tcl -oh uimatclwrap.h  &quot;$(InputPath)&quot;&#x0D;&#x0A;&#x0D;&#x0A;"
+						Outputs="uima_wrap.cxx; uimatclwrap.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\uima_wrap.cxx"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/uima_wrap.obj"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/uima_wrap.obj"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/scriptators/tcl/winmake.cmd b/scriptators/tcl/winmake.cmd
index 900d85b..b37d268 100644
--- a/scriptators/tcl/winmake.cmd
+++ b/scriptators/tcl/winmake.cmd
@@ -1,46 +1,46 @@
-@echo off

-

-REM   Licensed to the Apache Software Foundation (ASF) under one

-REM   or more contributor license agreements.  See the NOTICE file

-REM   distributed with this work for additional information

-REM   regarding copyright ownership.  The ASF licenses this file

-REM   to you under the Apache License, Version 2.0 (the

-REM   "License"); you may not use this file except in compliance

-REM   with the License.  You may obtain a copy of the License at

-REM

-REM    http://www.apache.org/licenses/LICENSE-2.0

-REM

-REM   Unless required by applicable law or agreed to in writing,

-REM   software distributed under the License is distributed on an

-REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-REM   KIND, either express or implied.  See the License for the

-REM   specific language governing permissions and limitations

-REM   under the License.

-

-if "%UIMACPP_HOME%" == "" goto TafRootNotSet

-if not exist "%UIMACPP_HOME%"\include\uima\cas.hpp goto UimaRootBad

-

-set SWIG_PATH=\swigwin-1.3.29

-if not exist %SWIG_PATH% goto SwigPathNotSet

-

-set TCL_INCLUDE=\Tcl\include

-set TCL_LIBDIR=\Tcl\lib

-if not exist %TCL_LIBDIR% goto TclNotSet

-

-REM build Tclnator

-devenv tclator.vcproj /build release 

-goto TheEnd

-

-:UimaRootBad

-echo UIMACPP_HOME is invalid

-goto TheEnd

-

-:SwigPathNotSet

-echo SWIG_PATH is invalid

-goto TheEnd

-

-:TclNotSet

-echo Tcl environments is invalid

-

-

-:TheEnd

+@echo off
+
+REM   Licensed to the Apache Software Foundation (ASF) under one
+REM   or more contributor license agreements.  See the NOTICE file
+REM   distributed with this work for additional information
+REM   regarding copyright ownership.  The ASF licenses this file
+REM   to you under the Apache License, Version 2.0 (the
+REM   "License"); you may not use this file except in compliance
+REM   with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM   Unless required by applicable law or agreed to in writing,
+REM   software distributed under the License is distributed on an
+REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM   KIND, either express or implied.  See the License for the
+REM   specific language governing permissions and limitations
+REM   under the License.
+
+if "%UIMACPP_HOME%" == "" goto TafRootNotSet
+if not exist "%UIMACPP_HOME%"\include\uima\cas.hpp goto UimaRootBad
+
+set SWIG_PATH=\swigwin-1.3.29
+if not exist %SWIG_PATH% goto SwigPathNotSet
+
+set TCL_INCLUDE=\Tcl\include
+set TCL_LIBDIR=\Tcl\lib
+if not exist %TCL_LIBDIR% goto TclNotSet
+
+REM build Tclnator
+devenv tclator.vcproj /build release 
+goto TheEnd
+
+:UimaRootBad
+echo UIMACPP_HOME is invalid
+goto TheEnd
+
+:SwigPathNotSet
+echo SWIG_PATH is invalid
+goto TheEnd
+
+:TclNotSet
+echo Tcl environments is invalid
+
+
+:TheEnd
diff --git a/src/cas/uima/annotator_generic.inl b/src/cas/uima/annotator_generic.inl
index cbd0d36..0c3c395 100644
--- a/src/cas/uima/annotator_generic.inl
+++ b/src/cas/uima/annotator_generic.inl
@@ -1,45 +1,45 @@
-#ifndef UIMA_ANALYSIS_COMPONENT_H

-#define UIMA_ANALYSIS_COMPONENT_H

-/** @name analysis_component.hpp

------------------------------------------------------------------------------

-

-

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

-

------------------------------------------------------------------------------

-

-   Description:  This file contains a generic wrapper module

-                 to map a user written C++ UIMA Component object to the

-                 required UIMA Annotator API C functions.

-                 It assumes that the the user typedefs its analysis component type

-                 to the name UserDefinedAnnotator

-

-     This replaces taf_annotator_generic.inl

-     and taf_casconsumer_generic.inl.

------------------------------------------------------------------------------

-

-   5/12/2006  Initial creation

-

--------------------------------------------------------------------------- */

-

-MAKE_AE(UserDefinedAnnotator);

-

-

-#endif /* UIMA_ANALYSIS_COMPONENT_H */

-/* <EOF> */

-

+#ifndef UIMA_ANALYSIS_COMPONENT_H
+#define UIMA_ANALYSIS_COMPONENT_H
+/** @name analysis_component.hpp
+-----------------------------------------------------------------------------
+
+
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+
+-----------------------------------------------------------------------------
+
+   Description:  This file contains a generic wrapper module
+                 to map a user written C++ UIMA Component object to the
+                 required UIMA Annotator API C functions.
+                 It assumes that the the user typedefs its analysis component type
+                 to the name UserDefinedAnnotator
+
+     This replaces taf_annotator_generic.inl
+     and taf_casconsumer_generic.inl.
+-----------------------------------------------------------------------------
+
+   5/12/2006  Initial creation
+
+-------------------------------------------------------------------------- */
+
+MAKE_AE(UserDefinedAnnotator);
+
+
+#endif /* UIMA_ANALYSIS_COMPONENT_H */
+/* <EOF> */
+
diff --git a/src/cas/uima/casconsumer_generic.inl b/src/cas/uima/casconsumer_generic.inl
index cbd0d36..0c3c395 100644
--- a/src/cas/uima/casconsumer_generic.inl
+++ b/src/cas/uima/casconsumer_generic.inl
@@ -1,45 +1,45 @@
-#ifndef UIMA_ANALYSIS_COMPONENT_H

-#define UIMA_ANALYSIS_COMPONENT_H

-/** @name analysis_component.hpp

------------------------------------------------------------------------------

-

-

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

-

------------------------------------------------------------------------------

-

-   Description:  This file contains a generic wrapper module

-                 to map a user written C++ UIMA Component object to the

-                 required UIMA Annotator API C functions.

-                 It assumes that the the user typedefs its analysis component type

-                 to the name UserDefinedAnnotator

-

-     This replaces taf_annotator_generic.inl

-     and taf_casconsumer_generic.inl.

------------------------------------------------------------------------------

-

-   5/12/2006  Initial creation

-

--------------------------------------------------------------------------- */

-

-MAKE_AE(UserDefinedAnnotator);

-

-

-#endif /* UIMA_ANALYSIS_COMPONENT_H */

-/* <EOF> */

-

+#ifndef UIMA_ANALYSIS_COMPONENT_H
+#define UIMA_ANALYSIS_COMPONENT_H
+/** @name analysis_component.hpp
+-----------------------------------------------------------------------------
+
+
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+
+-----------------------------------------------------------------------------
+
+   Description:  This file contains a generic wrapper module
+                 to map a user written C++ UIMA Component object to the
+                 required UIMA Annotator API C functions.
+                 It assumes that the the user typedefs its analysis component type
+                 to the name UserDefinedAnnotator
+
+     This replaces taf_annotator_generic.inl
+     and taf_casconsumer_generic.inl.
+-----------------------------------------------------------------------------
+
+   5/12/2006  Initial creation
+
+-------------------------------------------------------------------------- */
+
+MAKE_AE(UserDefinedAnnotator);
+
+
+#endif /* UIMA_ANALYSIS_COMPONENT_H */
+/* <EOF> */
+
diff --git a/src/checkEnvVars.bat b/src/checkEnvVars.bat
index 3d23a0c..3a19311 100644
--- a/src/checkEnvVars.bat
+++ b/src/checkEnvVars.bat
@@ -1,50 +1,50 @@
-@ECHO OFF

-

-REM   Licensed to the Apache Software Foundation (ASF) under one

-REM   or more contributor license agreements.  See the NOTICE file

-REM   distributed with this work for additional information

-REM   regarding copyright ownership.  The ASF licenses this file

-REM   to you under the Apache License, Version 2.0 (the

-REM   "License"); you may not use this file except in compliance

-REM   with the License.  You may obtain a copy of the License at

-REM

-REM    http://www.apache.org/licenses/LICENSE-2.0

-REM

-REM   Unless required by applicable law or agreed to in writing,

-REM   software distributed under the License is distributed on an

-REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-REM   KIND, either express or implied.  See the License for the

-REM   specific language governing permissions and limitations

-REM   under the License.

-

-@REM Called as a pre-build step to check some environment variables

-@REM UIMACPP_HOME is used as the default location of the apr & icu & xerces builds

-@REM which are include in the SDK

-@REM These may be overridden by setting APR_HOME or ICU_HOME or XERCES_HOME

-

-if not exist "%JAVA_HOME%\include\jni.h" (

-  echo Error: failed to find JDK headers in "%JAVA_HOME%"

-  goto end

-)

-

-if "%UIMACPP_HOME%"=="" goto noTAF

-if "%APR_HOME%"=="" echo Note: Using APR build under UIMACPP_HOME

-if "%ICU_HOME%"=="" echo Note: Using ICU build under UIMACPP_HOME

-if "%XERCES_HOME%"=="" echo Note: Using XERCES build under UIMACPP_HOME

-goto end

-

-:noTAF

-if "%APR_HOME%"=="" (

-  echo Error: Must set APR_HOME [or use SDK via UIMACPP_HOME]

-) else (

-  if "%ICU_HOME%"=="" (

-    echo Error: Must set ICU_HOME [or use SDK via UIMACPP_HOME]

-  ) else (

-    if "%XERCES_HOME%"=="" (

-      echo Error: Must set XERCES_HOME [or use SDK via UIMACPP_HOME]

-    ) else ( goto end ) 

-  )

-)

-echo **** Pre-build check failed ***

-exit 99

-:end

+@ECHO OFF
+
+REM   Licensed to the Apache Software Foundation (ASF) under one
+REM   or more contributor license agreements.  See the NOTICE file
+REM   distributed with this work for additional information
+REM   regarding copyright ownership.  The ASF licenses this file
+REM   to you under the Apache License, Version 2.0 (the
+REM   "License"); you may not use this file except in compliance
+REM   with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM   Unless required by applicable law or agreed to in writing,
+REM   software distributed under the License is distributed on an
+REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM   KIND, either express or implied.  See the License for the
+REM   specific language governing permissions and limitations
+REM   under the License.
+
+@REM Called as a pre-build step to check some environment variables
+@REM UIMACPP_HOME is used as the default location of the apr & icu & xerces builds
+@REM which are include in the SDK
+@REM These may be overridden by setting APR_HOME or ICU_HOME or XERCES_HOME
+
+if not exist "%JAVA_HOME%\include\jni.h" (
+  echo Error: failed to find JDK headers in "%JAVA_HOME%"
+  goto end
+)
+
+if "%UIMACPP_HOME%"=="" goto noTAF
+if "%APR_HOME%"=="" echo Note: Using APR build under UIMACPP_HOME
+if "%ICU_HOME%"=="" echo Note: Using ICU build under UIMACPP_HOME
+if "%XERCES_HOME%"=="" echo Note: Using XERCES build under UIMACPP_HOME
+goto end
+
+:noTAF
+if "%APR_HOME%"=="" (
+  echo Error: Must set APR_HOME [or use SDK via UIMACPP_HOME]
+) else (
+  if "%ICU_HOME%"=="" (
+    echo Error: Must set ICU_HOME [or use SDK via UIMACPP_HOME]
+  ) else (
+    if "%XERCES_HOME%"=="" (
+      echo Error: Must set XERCES_HOME [or use SDK via UIMACPP_HOME]
+    ) else ( goto end ) 
+  )
+)
+echo **** Pre-build check failed ***
+exit 99
+:end
diff --git a/src/framework/exceptions.cpp b/src/framework/exceptions.cpp
index 0108f5c..bf6b084 100644
--- a/src/framework/exceptions.cpp
+++ b/src/framework/exceptions.cpp
@@ -1,678 +1,678 @@
-/*

--------------------------------------------------------------------------------

-

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

-

--------------------------------------------------------------------------------

-

-

--------------------------------------------------------------------------------

-*/

-

-#if defined(_MSC_VER)

-#include <stdio.h>

-#include <eh.h>

-#include <windows.h>

-#include <winbase.h>

-#endif

-

-#include "uima/pragmas.hpp" //must be included first to disable warnings

-#include "uima/msg.h"

-#include <string>

-#include <sstream>

-

-#include "uima/macros.h"

-#include "uima/trace.hpp"

-

-#include "uima/strconvert.hpp"

-#include "uima/unistrref.hpp"

-#include "uima/comp_ids.h"

-#include "uima/exceptions.hpp"

-#include "uima/msgstrtab.h"

-

-using namespace std;

-

-namespace uima {

-

-///Constructor with just the message id

-  ErrorMessage::ErrorMessage(

-    TyMessageId                          utMsgId

-  ) :

-      iv_utMsgId(utMsgId) {

-    if ( iv_utMsgId == 0) {

-      iv_utMsgId = UIMA_MSG_ID_NO_MESSAGE_AVAILABLE;

-    }

-  }

-///Constructor with a single char * parameter

-  ErrorMessage::ErrorMessage(

-    TyMessageId                          utMsgId,

-    const char *                            cpszParam1

-  ) :

-      iv_utMsgId(utMsgId) {

-    assert( iv_utMsgId != 0 );

-    iv_vecParams.push_back((string)cpszParam1);

-  }

-

-///Constructor with a single string parameter

-  ErrorMessage::ErrorMessage(

-    TyMessageId           utMsgId,

-    const string &           crstrParam1

-  ) :

-      iv_utMsgId(utMsgId) {

-    assert( iv_utMsgId != 0 );

-    iv_vecParams.push_back(crstrParam1);

-  }

-

-///Constructor with a single UChar * parameter

-  ErrorMessage::ErrorMessage(

-    TyMessageId                         utMsgId,

-    const UChar *                          cpuszParam1

-  ) :

-      iv_utMsgId(utMsgId) {

-    assert( iv_utMsgId != 0 );

-    string s;

-    UnicodeStringRef(cpuszParam1).extract(s);         // Convert to default encoding for platform

-    iv_vecParams.push_back(s);

-  }

-

-///Constructor with a single UnicodeString parameter

-  ErrorMessage::ErrorMessage(

-    TyMessageId                         utMsgId,

-    const icu::UnicodeString &             crustrParam1

-  ) :

-      iv_utMsgId(utMsgId) {

-    assert( iv_utMsgId != 0 );

-    string s;

-    UnicodeStringRef(crustrParam1).extract(s);         // Convert to default encoding for platform

-    iv_vecParams.push_back(s);

-  }

-

-///Constructor with a single int parameter

-  ErrorMessage::ErrorMessage(

-    TyMessageId           utMsgId,

-    int                      iParam1

-  ) :

-      iv_utMsgId(utMsgId) {

-    assert( iv_utMsgId != 0 );

-    string s;

-    iv_vecParams.push_back(long2String(iParam1, s));

-  }

-

-///Constructor with a single unsigned int parameter

-  ErrorMessage::ErrorMessage(

-    TyMessageId           utMsgId,

-    unsigned int             uiParam1

-  ) :

-      iv_utMsgId(utMsgId) {

-    assert( iv_utMsgId != 0 );

-    string s;

-    iv_vecParams.push_back(long2String((int) uiParam1, s));

-  }

-

-

-///Constructor with a single long parameter

-  ErrorMessage::ErrorMessage(

-    TyMessageId           utMsgId,

-    long                     lParam1

-  ) :

-      iv_utMsgId(utMsgId) {

-    assert( iv_utMsgId != 0 );

-    string s;

-    iv_vecParams.push_back(long2String(lParam1, s));

-  }

-

-///Constructor with a single unsigned long parameter

-  ErrorMessage::ErrorMessage(

-    TyMessageId           utMsgId,

-    unsigned long            ulParam1

-  ) :

-      iv_utMsgId(utMsgId) {

-    assert( iv_utMsgId != 0 );

-    string s;

-    iv_vecParams.push_back(long2String((long) ulParam1, s));

-  }

-

-///Constructor with a single double parameter

-  ErrorMessage::ErrorMessage(

-    TyMessageId           utMsgId,

-    const double             dParam1

-  ) :

-      iv_utMsgId(utMsgId) {

-    assert( iv_utMsgId != 0 );

-    string s;

-    iv_vecParams.push_back(double2String(dParam1, s));

-  }

-

-///Constructor with a full parameter vector

-  ErrorMessage::ErrorMessage(

-    TyMessageId           utMsgId,

-    const vector<string> &   crvecParams

-  ) :

-      iv_utMsgId(utMsgId),

-      iv_vecParams(crvecParams) {

-    assert( iv_utMsgId != 0 );

-  }

-

-  

-  /*------------------------------- Constructors -------------------------------*/

-

-  ErrorContext::ErrorContext(

-    const ErrorMessage &     crclMessage,

-    const char*                   pszFilename,

-    const char*                   pszFunction,

-    unsigned long                 ulLineNumber

-  ):

-      iv_clMessage(crclMessage),

-      iv_pszFilename(pszFilename),

-      iv_pszFunction(pszFunction),

-      iv_ulLineNo(ulLineNumber) {}

-

-#ifdef OS_STL

-  Exception::~Exception()

-#else

-  Exception::~Exception() UIMA_THROW0()

-#endif

-  {}

-

-  /*------------------------------ Output Support ------------------------------*/

-

-  string

-  ErrorMessage::asString() const {

-

-    size_t numparams = getMessageParams().size();

-

-    // Check for unknown message id

-    if (iv_utMsgId < 0 || iv_utMsgId > UIMA_MSG_ID_SIGNATURE_END) {

-      return string("Unknown message id " + iv_utMsgId);

-    }

-

-    //parameter substitution

-

-    //locate message in message table

-    const TCHAR ** messages = gs_aszMessageStringTable;

-    const TCHAR * msg = messages[iv_utMsgId];

-

-    TCHAR * buf = new TCHAR[UIMA_MSG_MAX_STR_LEN];

-    memset(buf,'\0',UIMA_MSG_MAX_STR_LEN);

-

-    int numwritten=0;

-

-    TCHAR * trg = buf;

-    while (*msg) {

-      if (numwritten > UIMA_MSG_MAX_STR_LEN) {

-        break;

-      }

-      if (*msg == UIMA_MSG_REPLACE_CHAR) {

-        msg = msg+1;

-        if (*msg == UIMA_MSG_REPLACE_CHAR) {

-          *trg = *msg;

-          trg = trg +1;

-          ;

-          msg = msg+1;

-          numwritten++;

-        } else {  //replace %n with the corresponding param

-          unsigned long index;

-          int len;

-          string arg;

-          // determine the number of the specified argument ...

-          index = (unsigned long) atol(msg);

-          if (index > numparams)       // param not defined

-          {

-            arg = "???";      // replace it by "dont-know"

-          } else {

-            // ... the indexed argument ...

-            arg = iv_vecParams[index - 1]; // zero-based array!

-            //assert(arg.length() > 0);

-          }

-          len = arg.length();

-          // ... and then copy the argument

-          if (UIMA_MSG_MAX_STR_LEN-numwritten < len) {

-            len = UIMA_MSG_MAX_STR_LEN - numwritten;

-          }

-          if (len > 0) {

-            strncpy(trg, arg.c_str(), len);

-            trg = trg+len;

-          }

-          msg = msg+1;

-          while ( isdigit(*msg) ) { //handle arg number 10 or more

-            msg = msg+1;

-          }

-        }

-      } else {

-        *trg = *msg;

-        trg = trg+1;

-        msg = msg+1;

-      }

-    }

-    //cout << buf << endl;

-   string target(buf);

-   delete[] buf ;

-   return target;

-	 //string target;

-	 //target.assign(buf, UIMA_MSG_MAX_STR_LEN);                   // Copy the result to the string

-   //delete buf;

-	 //return target;

-  }

-

-  ostream &

-  operator << (

-    ostream &            os,

-    const ErrorMessage & errorMsg

-  ) {

-    os << errorMsg.asString();

-    return(os);

-  }

-

-  string

-  ErrorContext::asString() const {

-    string s;

-    s += getMessage().asString();

-    if (getFileName() != NULL) {

-      s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + "     File     : " + getFileName();

-    }

-    if (getFunctionName() != NULL) {

-      s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + "     Function : " + getFunctionName();

-    }

-    if (getLineNumber() != 0) {

-      string sNum;

-      long2String(getLineNumber(), sNum);

-      s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + "     Line     : " + sNum;

-    }

-

-    return(s);

-  }

-

-  ostream &

-  operator << (

-    ostream            & os,

-    const ErrorContext & errContext

-  ) {

-    os << errContext.asString();

-    return (os);

-  }

-

-  void ErrorMessage::reset(void) {

-    iv_utMsgId = UIMA_MSG_ID_NO_MESSAGE_AVAILABLE;

-    iv_vecParams.clear();

-  }

-

-  /* ----------------------------------------------------------------------- */

-  /*   ErrorInfo                                                        */

-  /* ----------------------------------------------------------------------- */

-

-  /*------------------------------- Statics  -----------------------------------*/

-//initialize static member var to an initial value

-

-  const char * ErrorInfo::cv_cpszContextPrefix   = "   While      : ";

-  const char * ErrorInfo::cv_cpszIndent          = "";

-

-

-  /*------------------------------- Constructors -------------------------------*/

-

-  ErrorInfo::ErrorInfo(

-    const ErrorMessage     & rclMessage,

-    TyErrorId                ulErrorId,

-    ErrorInfo::EnSeverity    enSeverity

-  ) :

-      iv_clErrorMsg(rclMessage),

-      iv_ulErrorId(ulErrorId),

-      iv_enSeverity(enSeverity),

-      iv_vecContexts() {}

-

-  ErrorInfo::ErrorInfo( void ) :

-      iv_clErrorMsg(),

-      iv_ulErrorId(UIMA_ERR_NONE),

-      iv_enSeverity(recoverable),

-      iv_vecContexts() {}

-

-  ErrorInfo::~ErrorInfo() {}

-

-//constructor (copy)

-//? Exception::Exception(

-//?   const Exception&            rclException

-//? )

-//? {

-//? }

-

-  /*---------------------------- Exception Context ----------------------------*/

-  void

-  ErrorInfo::addContext( const ErrorContext & crclContext ) {

-    iv_vecContexts.push_back(crclContext);

-  }

-

-  const ErrorContext *

-  ErrorInfo::contextPtrAtIndex( size_t uiContextIndex ) const {

-    if (uiContextIndex >= iv_vecContexts.size()) {

-      return(NULL);

-    }

-    return(&iv_vecContexts[uiContextIndex]);

-  }

-

-  /*------------------------------ Output Support ------------------------------*/

-  string

-  ErrorInfo::asString() const {

-    string s;

-    if (getErrorId() == UIMA_ERR_NONE) {

-      s += string("No Error\n");

-      return (s);

-    }

-    if (getErrorId() != UIMA_ERR_NONE) {

-      s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + "Error number  : ";

-      string sErr;

-      long2String( getErrorId(), sErr);

-      s += sErr;

-    }

-    s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + "Recoverable   : " + (isRecoverable() ? "Yes" : "No");

-    s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + "Error         : " + getMessage().asString();

-    for (size_t i = 0; i < contextCount(); ++i) {

-      s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + ErrorInfo::getGlobalErrorInfoContextPrefix();

-      assert(EXISTS(contextPtrAtIndex(i)));   //lint !e666: Expression with side effects passed to repeated parameter 1 in macro EXISTS

-      s += contextPtrAtIndex(i)->asString();

-    }

-    s += string("\n");

-

-    return (s);

-  }

-

-///output support for streams

-  ostream &

-  operator << (

-    ostream         & os,

-    const ErrorInfo & errInfo

-  ) {

-    os << errInfo.asString();

-    return(os);

-  }

-

-  void ErrorInfo::reset(void) {

-    iv_clErrorMsg.reset();

-    iv_ulErrorId = UIMA_ERR_NONE;

-    iv_enSeverity = recoverable;

-    iv_vecContexts.clear();

-  }

-

-  /* ----------------------------------------------------------------------- */

-  /*   Exception                                                        */

-  /* ----------------------------------------------------------------------- */

-

-  Exception::Exception(

-    const ErrorMessage    & rclMessage,

-    TyErrorId                 ulErrorId,

-    ErrorInfo::EnSeverity   enSeverity

-  ) :

-      EXCEPTION_BASE_CLASS(),

-      iv_clErrorInfo(rclMessage, ulErrorId, enSeverity) {}

-

-  Exception::Exception(

-    const ErrorInfo & crclErrorInfo

-  ) :

-      EXCEPTION_BASE_CLASS(),

-      iv_clErrorInfo(crclErrorInfo) {}

-

-  /*------------------------------ Exception Type ------------------------------*/

-

-  const char * Exception::getName() const {

-    return(_TEXT("unspecified exception"));

-  }

-

-  /*------------------------- Application Termination --------------------------*/

-  void Exception::terminate() {

-    exit(iv_clErrorInfo.getErrorId());  //lint !e713: Loss of precision (arg. no. 1) (unsigned long to int)

-  }

-

-  /*------------------------------ Throw Support -------------------------------*/

-  void Exception::assertParameter(

-    const char*       /*exceptionText*/,

-    ErrorContext   /*context*/ ) {

-    assert(false);

-    //not tested yet (and not used anywhere!)

-  }

-

-  /*------------------------- Logging Support ----------------------------------*/

-

-  void Exception::logExceptionData() {

-    util::Trace clTrace(util::enTraceDetailLow, UIMA_TRACE_ORIGIN, UIMA_TRACE_COMPID_EXCEPTIONS);

-

-    clTrace.dump(_TEXT("Exception occured"), asString().c_str());

-    //not implemented yet

-  }

-

-  /*------------------------------ Output Support ------------------------------*/

-  string

-  Exception::asString() const {

-    //output the (class) name of the exception and its error info after it.

-    return string("\n") +

-           ErrorInfo::getGlobalErrorInfoIndent() +

-           "Exception     : " +

-           getName() +

-           "\n" +

-           getErrorInfo().asString() +

-           "\n";

-  }

-

-

-

-  ostream &

-  operator << (

-    ostream            & os,

-    const Exception & exception

-  ) {

-    //output the (class) name of the exception and its error info after it.

-    os << exception.asString();

-    return(os);

-  }

-

-  /*------------------------------ Static Method -------------------------------*/

-

-  // Release contents of string container allocated by asString method

-

-  void

-  Exception::release(std::string & msg) {

-    msg.clear();               // Empty string

-    msg.reserve(1);            // Reduce capacity so will use internal buffer & free external one

-  }

-

-//private:

-  /*----------------------------- Hidden Functions -----------------------------*/

-  Exception& Exception::operator=( const Exception&   /*exc*/ ) {

-    assert(false);

-    return(*this);                                     //lint !e527  unreachable

-  }  //lint !e1745: member not assigned by private assignment operator

-

-  /* ----------------------------------------------------------------------- */

-  /*   Implementations of predefined exceptions                              */

-  /* ----------------------------------------------------------------------- */

-

-

-  /*

-    The following classes reimplement the ANSI standard exception hierarchy from

-    stdexcept.h as UIMACPP exceptions with context and message id support

-  */

-  UIMA_EXC_CLASSIMPLEMENT(Uima_logic_error        ,Exception);

-  UIMA_EXC_CLASSIMPLEMENT(Uima_runtime_error      ,Exception);

-

-  UIMA_EXC_CLASSIMPLEMENT(Uima_domain_error       ,Uima_logic_error);

-  UIMA_EXC_CLASSIMPLEMENT(Uima_invalid_argument   ,Uima_logic_error);

-  UIMA_EXC_CLASSIMPLEMENT(Uima_length_error       ,Uima_logic_error);

-  UIMA_EXC_CLASSIMPLEMENT(Uima_out_of_range       ,Uima_logic_error);

-

-  UIMA_EXC_CLASSIMPLEMENT(Uima_range_error        ,Uima_runtime_error);

-  UIMA_EXC_CLASSIMPLEMENT(Uima_overflow_error     ,Uima_runtime_error);

-  UIMA_EXC_CLASSIMPLEMENT(Uima_underflow_error    ,Uima_runtime_error);

-

-

-  /**

-    The following exceptions are used by helper test classes that are no longer in the UIMACPP library:

-          CommandLineDriver DocBuffer ParseHandlers

-  */

-  UIMA_EXC_CLASSIMPLEMENT(ConsoleAbortExc        ,Exception);

-  UIMA_EXC_CLASSIMPLEMENT(ParseHandlerExc        ,Exception);

-  UIMA_EXC_CLASSIMPLEMENT(ExcDocBuffer           ,Uima_out_of_range);

-

-  /** code page conversion errors */

-  UIMA_EXC_CLASSIMPLEMENT(CodePageConversionException, uima::Exception);

-  /**

-    The following exception is used to report failures from APR functions

-  */

-  UIMA_EXC_CLASSIMPLEMENT(AprFailureException, Exception);

-

-  /*

-    The following classes provide a starting point for an exception hierarchy

-  */

-//? UIMA_EXC_CLASSIMPLEMENT(ExcAssertionFailure, Exception);

-  UIMA_EXC_CLASSIMPLEMENT(ExcIllFormedInputError , Uima_runtime_error);

-  UIMA_EXC_CLASSIMPLEMENT(ExcInvalidParameter    , Uima_invalid_argument);

-  UIMA_EXC_CLASSIMPLEMENT(ExcIndexOutOfRange     , Uima_out_of_range);

-//? UIMA_EXC_CLASSIMPLEMENT(ExcDeviceError      ,Uima_runtime_error);

-  UIMA_EXC_CLASSIMPLEMENT(ExcInvalidRequest      , Uima_runtime_error);

-  UIMA_EXC_CLASSIMPLEMENT(ExcResourceExhausted   , Uima_runtime_error);

-  UIMA_EXC_CLASSIMPLEMENT(ExcOutOfMemory         , ExcResourceExhausted);

-//? UIMA_EXC_CLASSIMPLEMENT(ExcOutOfSystemResource, ResourceExhausted);

-//? UIMA_EXC_CLASSIMPLEMENT(ExcOutOfWindowResource, ResourceExhausted);

-  UIMA_EXC_CLASSIMPLEMENT(ExcFileNotFoundError   , Uima_runtime_error);

-

-// Windows specific CException

-  ExcWinCException::ExcWinCException(

-    ErrorMessage             clMessage,

-    TyErrorId                  ulErrorId,

-    ErrorInfo::EnSeverity    enSeverity

-  )

-      : Uima_runtime_error (clMessage, ulErrorId, enSeverity) {

-    ;

-  }

-

-  const char*

-  ExcWinCException :: getName() const {

-    return( "ExcWinCException" );

-  }

-

-  ExcWinCException::~ExcWinCException () CHILD_DESTRUCT_THROW0() {

-    ;

-  }

-

-  ExcWinCException::ExcWinCException (const ExcWinCException & a) : Uima_runtime_error (a) {

-    ;

-  }

-

-

-  // Windows exceptions can be mapped only when compiled with MS VC++

-#if defined(_MSC_VER)

-

-  void translation_func( unsigned int u, _EXCEPTION_POINTERS* pExp ) {

-    const char * cpszMsg = NULL;

-    switch (u) {

-    case EXCEPTION_ACCESS_VIOLATION:

-      cpszMsg ="\"ACCESS VIOLATION\"";

-      break;

-    case EXCEPTION_DATATYPE_MISALIGNMENT:

-      cpszMsg ="\"DATATYPE MISALIGNMENT\"";

-      break;

-    case EXCEPTION_BREAKPOINT:

-      cpszMsg ="\"BREAKPOINT\"";

-      break;

-    case EXCEPTION_SINGLE_STEP:

-      cpszMsg ="\"SINGLE STEP\"";

-      break;

-    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:

-      cpszMsg ="\"ARRAY BOUNDS EXCEEDED\"";

-      break;

-    case EXCEPTION_FLT_DENORMAL_OPERAND:

-      cpszMsg ="\"FLT DENORMAL OPERAND\"";

-      break;

-    case EXCEPTION_FLT_DIVIDE_BY_ZERO:

-      cpszMsg ="\"FLT DIVIDE_BY ZERO\"";

-      break;

-    case EXCEPTION_FLT_INEXACT_RESULT:

-      cpszMsg ="\"FLT INEXACT_RESULT\"";

-      break;

-    case EXCEPTION_FLT_INVALID_OPERATION:

-      cpszMsg ="\"FLT INVALID OPERATION\"";

-      break;

-    case EXCEPTION_FLT_OVERFLOW:

-      cpszMsg ="\"FLT OVERFLOW\"";

-      break;

-    case EXCEPTION_FLT_STACK_CHECK:

-      cpszMsg ="\"FLT STACK_CHECK\"";

-      break;

-    case EXCEPTION_FLT_UNDERFLOW:

-      cpszMsg ="\"FLT UNDERFLOW\"";

-      break;

-    case EXCEPTION_INT_DIVIDE_BY_ZERO:

-      cpszMsg ="\"INT DIVIDE BY ZERO\"";

-      break;

-    case EXCEPTION_INT_OVERFLOW:

-      cpszMsg ="\"INT OVERFLOW\"";

-      break;

-    case EXCEPTION_PRIV_INSTRUCTION:

-      cpszMsg ="\"PRIV INSTRUCTION\"";

-      break;

-    case EXCEPTION_IN_PAGE_ERROR:

-      cpszMsg ="\"IN PAGE_ERROR\"";

-      break;

-    case EXCEPTION_ILLEGAL_INSTRUCTION:

-      cpszMsg ="\"ILLEGAL INSTRUCTION\"";

-      break;

-    case EXCEPTION_NONCONTINUABLE_EXCEPTION:

-      cpszMsg ="\"NONCONTINUABLE EXCEPTION\"";

-      break;

-    case EXCEPTION_STACK_OVERFLOW:

-      cpszMsg ="\"STACK OVERFLOW\"";

-      break;

-    case EXCEPTION_INVALID_DISPOSITION:

-      cpszMsg ="\"INVALID DISPOSITION\"";

-      break;

-    case EXCEPTION_GUARD_PAGE:

-      cpszMsg ="\"GUARD PAGE\"";

-      break;

-    case EXCEPTION_INVALID_HANDLE:

-      cpszMsg ="\"INVALID HANDLE\"";

-      break;

-    case CONTROL_C_EXIT:

-      cpszMsg ="\"CONTROL C EXIT\"";

-      break;

-    default:

-      cpszMsg = "Unknows Windows C Exception";

-      break;

-    }

-    // throw our own type of exception so we know at least what was going on

-    // instead of just getting an unknown ... C++ excepition

-    throw ExcWinCException( ErrorMessage(UIMA_MSG_ID_EXC_WINDOWS_EXCEPTION, cpszMsg),

-                            (TyErrorId)UIMA_ERR_ENGINE_WINDOWS_EXCEPTION,

-                            ErrorInfo::unrecoverable);

-  }

-

-#define UIMA_ENVVAR_DONT_MAP_WINDOWS_EXCEPTIONS     "UIMA_DONT_MAP_WINDOWS_EXCEPTIONS"

-

-  // _set_se_translator should be called at the beginning of main

-  // since we have no access to main here, we declare a static var of a dummy

-  // type which does the _set_se_translator call in it's constructor

-  // Note: this only works if the compiler properly executes the ctors of

-  // such static vars in DLLs

-  class Dummy {

-  public:

-    Dummy( void ) {

-      if ( getenv(UIMA_ENVVAR_DONT_MAP_WINDOWS_EXCEPTIONS) == NULL) {

-        _set_se_translator( translation_func );

-      }

-    }

-  };

-  // static var of our dummy type

-  Dummy clDummy;

-#endif

-

-}

+/*
+-------------------------------------------------------------------------------
+
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+
+-------------------------------------------------------------------------------
+
+
+-------------------------------------------------------------------------------
+*/
+
+#if defined(_MSC_VER)
+#include <stdio.h>
+#include <eh.h>
+#include <windows.h>
+#include <winbase.h>
+#endif
+
+#include "uima/pragmas.hpp" //must be included first to disable warnings
+#include "uima/msg.h"
+#include <string>
+#include <sstream>
+
+#include "uima/macros.h"
+#include "uima/trace.hpp"
+
+#include "uima/strconvert.hpp"
+#include "uima/unistrref.hpp"
+#include "uima/comp_ids.h"
+#include "uima/exceptions.hpp"
+#include "uima/msgstrtab.h"
+
+using namespace std;
+
+namespace uima {
+
+///Constructor with just the message id
+  ErrorMessage::ErrorMessage(
+    TyMessageId                          utMsgId
+  ) :
+      iv_utMsgId(utMsgId) {
+    if ( iv_utMsgId == 0) {
+      iv_utMsgId = UIMA_MSG_ID_NO_MESSAGE_AVAILABLE;
+    }
+  }
+///Constructor with a single char * parameter
+  ErrorMessage::ErrorMessage(
+    TyMessageId                          utMsgId,
+    const char *                            cpszParam1
+  ) :
+      iv_utMsgId(utMsgId) {
+    assert( iv_utMsgId != 0 );
+    iv_vecParams.push_back((string)cpszParam1);
+  }
+
+///Constructor with a single string parameter
+  ErrorMessage::ErrorMessage(
+    TyMessageId           utMsgId,
+    const string &           crstrParam1
+  ) :
+      iv_utMsgId(utMsgId) {
+    assert( iv_utMsgId != 0 );
+    iv_vecParams.push_back(crstrParam1);
+  }
+
+///Constructor with a single UChar * parameter
+  ErrorMessage::ErrorMessage(
+    TyMessageId                         utMsgId,
+    const UChar *                          cpuszParam1
+  ) :
+      iv_utMsgId(utMsgId) {
+    assert( iv_utMsgId != 0 );
+    string s;
+    UnicodeStringRef(cpuszParam1).extract(s);         // Convert to default encoding for platform
+    iv_vecParams.push_back(s);
+  }
+
+///Constructor with a single UnicodeString parameter
+  ErrorMessage::ErrorMessage(
+    TyMessageId                         utMsgId,
+    const icu::UnicodeString &             crustrParam1
+  ) :
+      iv_utMsgId(utMsgId) {
+    assert( iv_utMsgId != 0 );
+    string s;
+    UnicodeStringRef(crustrParam1).extract(s);         // Convert to default encoding for platform
+    iv_vecParams.push_back(s);
+  }
+
+///Constructor with a single int parameter
+  ErrorMessage::ErrorMessage(
+    TyMessageId           utMsgId,
+    int                      iParam1
+  ) :
+      iv_utMsgId(utMsgId) {
+    assert( iv_utMsgId != 0 );
+    string s;
+    iv_vecParams.push_back(long2String(iParam1, s));
+  }
+
+///Constructor with a single unsigned int parameter
+  ErrorMessage::ErrorMessage(
+    TyMessageId           utMsgId,
+    unsigned int             uiParam1
+  ) :
+      iv_utMsgId(utMsgId) {
+    assert( iv_utMsgId != 0 );
+    string s;
+    iv_vecParams.push_back(long2String((int) uiParam1, s));
+  }
+
+
+///Constructor with a single long parameter
+  ErrorMessage::ErrorMessage(
+    TyMessageId           utMsgId,
+    long                     lParam1
+  ) :
+      iv_utMsgId(utMsgId) {
+    assert( iv_utMsgId != 0 );
+    string s;
+    iv_vecParams.push_back(long2String(lParam1, s));
+  }
+
+///Constructor with a single unsigned long parameter
+  ErrorMessage::ErrorMessage(
+    TyMessageId           utMsgId,
+    unsigned long            ulParam1
+  ) :
+      iv_utMsgId(utMsgId) {
+    assert( iv_utMsgId != 0 );
+    string s;
+    iv_vecParams.push_back(long2String((long) ulParam1, s));
+  }
+
+///Constructor with a single double parameter
+  ErrorMessage::ErrorMessage(
+    TyMessageId           utMsgId,
+    const double             dParam1
+  ) :
+      iv_utMsgId(utMsgId) {
+    assert( iv_utMsgId != 0 );
+    string s;
+    iv_vecParams.push_back(double2String(dParam1, s));
+  }
+
+///Constructor with a full parameter vector
+  ErrorMessage::ErrorMessage(
+    TyMessageId           utMsgId,
+    const vector<string> &   crvecParams
+  ) :
+      iv_utMsgId(utMsgId),
+      iv_vecParams(crvecParams) {
+    assert( iv_utMsgId != 0 );
+  }
+
+  
+  /*------------------------------- Constructors -------------------------------*/
+
+  ErrorContext::ErrorContext(
+    const ErrorMessage &     crclMessage,
+    const char*                   pszFilename,
+    const char*                   pszFunction,
+    unsigned long                 ulLineNumber
+  ):
+      iv_clMessage(crclMessage),
+      iv_pszFilename(pszFilename),
+      iv_pszFunction(pszFunction),
+      iv_ulLineNo(ulLineNumber) {}
+
+#ifdef OS_STL
+  Exception::~Exception()
+#else
+  Exception::~Exception() UIMA_THROW0()
+#endif
+  {}
+
+  /*------------------------------ Output Support ------------------------------*/
+
+  string
+  ErrorMessage::asString() const {
+
+    size_t numparams = getMessageParams().size();
+
+    // Check for unknown message id
+    if (iv_utMsgId < 0 || iv_utMsgId > UIMA_MSG_ID_SIGNATURE_END) {
+      return string("Unknown message id " + iv_utMsgId);
+    }
+
+    //parameter substitution
+
+    //locate message in message table
+    const TCHAR ** messages = gs_aszMessageStringTable;
+    const TCHAR * msg = messages[iv_utMsgId];
+
+    TCHAR * buf = new TCHAR[UIMA_MSG_MAX_STR_LEN];
+    memset(buf,'\0',UIMA_MSG_MAX_STR_LEN);
+
+    int numwritten=0;
+
+    TCHAR * trg = buf;
+    while (*msg) {
+      if (numwritten > UIMA_MSG_MAX_STR_LEN) {
+        break;
+      }
+      if (*msg == UIMA_MSG_REPLACE_CHAR) {
+        msg = msg+1;
+        if (*msg == UIMA_MSG_REPLACE_CHAR) {
+          *trg = *msg;
+          trg = trg +1;
+          ;
+          msg = msg+1;
+          numwritten++;
+        } else {  //replace %n with the corresponding param
+          unsigned long index;
+          int len;
+          string arg;
+          // determine the number of the specified argument ...
+          index = (unsigned long) atol(msg);
+          if (index > numparams)       // param not defined
+          {
+            arg = "???";      // replace it by "dont-know"
+          } else {
+            // ... the indexed argument ...
+            arg = iv_vecParams[index - 1]; // zero-based array!
+            //assert(arg.length() > 0);
+          }
+          len = arg.length();
+          // ... and then copy the argument
+          if (UIMA_MSG_MAX_STR_LEN-numwritten < len) {
+            len = UIMA_MSG_MAX_STR_LEN - numwritten;
+          }
+          if (len > 0) {
+            strncpy(trg, arg.c_str(), len);
+            trg = trg+len;
+          }
+          msg = msg+1;
+          while ( isdigit(*msg) ) { //handle arg number 10 or more
+            msg = msg+1;
+          }
+        }
+      } else {
+        *trg = *msg;
+        trg = trg+1;
+        msg = msg+1;
+      }
+    }
+    //cout << buf << endl;
+   string target(buf);
+   delete[] buf ;
+   return target;
+	 //string target;
+	 //target.assign(buf, UIMA_MSG_MAX_STR_LEN);                   // Copy the result to the string
+   //delete buf;
+	 //return target;
+  }
+
+  ostream &
+  operator << (
+    ostream &            os,
+    const ErrorMessage & errorMsg
+  ) {
+    os << errorMsg.asString();
+    return(os);
+  }
+
+  string
+  ErrorContext::asString() const {
+    string s;
+    s += getMessage().asString();
+    if (getFileName() != NULL) {
+      s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + "     File     : " + getFileName();
+    }
+    if (getFunctionName() != NULL) {
+      s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + "     Function : " + getFunctionName();
+    }
+    if (getLineNumber() != 0) {
+      string sNum;
+      long2String(getLineNumber(), sNum);
+      s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + "     Line     : " + sNum;
+    }
+
+    return(s);
+  }
+
+  ostream &
+  operator << (
+    ostream            & os,
+    const ErrorContext & errContext
+  ) {
+    os << errContext.asString();
+    return (os);
+  }
+
+  void ErrorMessage::reset(void) {
+    iv_utMsgId = UIMA_MSG_ID_NO_MESSAGE_AVAILABLE;
+    iv_vecParams.clear();
+  }
+
+  /* ----------------------------------------------------------------------- */
+  /*   ErrorInfo                                                        */
+  /* ----------------------------------------------------------------------- */
+
+  /*------------------------------- Statics  -----------------------------------*/
+//initialize static member var to an initial value
+
+  const char * ErrorInfo::cv_cpszContextPrefix   = "   While      : ";
+  const char * ErrorInfo::cv_cpszIndent          = "";
+
+
+  /*------------------------------- Constructors -------------------------------*/
+
+  ErrorInfo::ErrorInfo(
+    const ErrorMessage     & rclMessage,
+    TyErrorId                ulErrorId,
+    ErrorInfo::EnSeverity    enSeverity
+  ) :
+      iv_clErrorMsg(rclMessage),
+      iv_ulErrorId(ulErrorId),
+      iv_enSeverity(enSeverity),
+      iv_vecContexts() {}
+
+  ErrorInfo::ErrorInfo( void ) :
+      iv_clErrorMsg(),
+      iv_ulErrorId(UIMA_ERR_NONE),
+      iv_enSeverity(recoverable),
+      iv_vecContexts() {}
+
+  ErrorInfo::~ErrorInfo() {}
+
+//constructor (copy)
+//? Exception::Exception(
+//?   const Exception&            rclException
+//? )
+//? {
+//? }
+
+  /*---------------------------- Exception Context ----------------------------*/
+  void
+  ErrorInfo::addContext( const ErrorContext & crclContext ) {
+    iv_vecContexts.push_back(crclContext);
+  }
+
+  const ErrorContext *
+  ErrorInfo::contextPtrAtIndex( size_t uiContextIndex ) const {
+    if (uiContextIndex >= iv_vecContexts.size()) {
+      return(NULL);
+    }
+    return(&iv_vecContexts[uiContextIndex]);
+  }
+
+  /*------------------------------ Output Support ------------------------------*/
+  string
+  ErrorInfo::asString() const {
+    string s;
+    if (getErrorId() == UIMA_ERR_NONE) {
+      s += string("No Error\n");
+      return (s);
+    }
+    if (getErrorId() != UIMA_ERR_NONE) {
+      s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + "Error number  : ";
+      string sErr;
+      long2String( getErrorId(), sErr);
+      s += sErr;
+    }
+    s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + "Recoverable   : " + (isRecoverable() ? "Yes" : "No");
+    s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + "Error         : " + getMessage().asString();
+    for (size_t i = 0; i < contextCount(); ++i) {
+      s += string("\n") + ErrorInfo::getGlobalErrorInfoIndent() + ErrorInfo::getGlobalErrorInfoContextPrefix();
+      assert(EXISTS(contextPtrAtIndex(i)));   //lint !e666: Expression with side effects passed to repeated parameter 1 in macro EXISTS
+      s += contextPtrAtIndex(i)->asString();
+    }
+    s += string("\n");
+
+    return (s);
+  }
+
+///output support for streams
+  ostream &
+  operator << (
+    ostream         & os,
+    const ErrorInfo & errInfo
+  ) {
+    os << errInfo.asString();
+    return(os);
+  }
+
+  void ErrorInfo::reset(void) {
+    iv_clErrorMsg.reset();
+    iv_ulErrorId = UIMA_ERR_NONE;
+    iv_enSeverity = recoverable;
+    iv_vecContexts.clear();
+  }
+
+  /* ----------------------------------------------------------------------- */
+  /*   Exception                                                        */
+  /* ----------------------------------------------------------------------- */
+
+  Exception::Exception(
+    const ErrorMessage    & rclMessage,
+    TyErrorId                 ulErrorId,
+    ErrorInfo::EnSeverity   enSeverity
+  ) :
+      EXCEPTION_BASE_CLASS(),
+      iv_clErrorInfo(rclMessage, ulErrorId, enSeverity) {}
+
+  Exception::Exception(
+    const ErrorInfo & crclErrorInfo
+  ) :
+      EXCEPTION_BASE_CLASS(),
+      iv_clErrorInfo(crclErrorInfo) {}
+
+  /*------------------------------ Exception Type ------------------------------*/
+
+  const char * Exception::getName() const {
+    return(_TEXT("unspecified exception"));
+  }
+
+  /*------------------------- Application Termination --------------------------*/
+  void Exception::terminate() {
+    exit(iv_clErrorInfo.getErrorId());  //lint !e713: Loss of precision (arg. no. 1) (unsigned long to int)
+  }
+
+  /*------------------------------ Throw Support -------------------------------*/
+  void Exception::assertParameter(
+    const char*       /*exceptionText*/,
+    ErrorContext   /*context*/ ) {
+    assert(false);
+    //not tested yet (and not used anywhere!)
+  }
+
+  /*------------------------- Logging Support ----------------------------------*/
+
+  void Exception::logExceptionData() {
+    util::Trace clTrace(util::enTraceDetailLow, UIMA_TRACE_ORIGIN, UIMA_TRACE_COMPID_EXCEPTIONS);
+
+    clTrace.dump(_TEXT("Exception occured"), asString().c_str());
+    //not implemented yet
+  }
+
+  /*------------------------------ Output Support ------------------------------*/
+  string
+  Exception::asString() const {
+    //output the (class) name of the exception and its error info after it.
+    return string("\n") +
+           ErrorInfo::getGlobalErrorInfoIndent() +
+           "Exception     : " +
+           getName() +
+           "\n" +
+           getErrorInfo().asString() +
+           "\n";
+  }
+
+
+
+  ostream &
+  operator << (
+    ostream            & os,
+    const Exception & exception
+  ) {
+    //output the (class) name of the exception and its error info after it.
+    os << exception.asString();
+    return(os);
+  }
+
+  /*------------------------------ Static Method -------------------------------*/
+
+  // Release contents of string container allocated by asString method
+
+  void
+  Exception::release(std::string & msg) {
+    msg.clear();               // Empty string
+    msg.reserve(1);            // Reduce capacity so will use internal buffer & free external one
+  }
+
+//private:
+  /*----------------------------- Hidden Functions -----------------------------*/
+  Exception& Exception::operator=( const Exception&   /*exc*/ ) {
+    assert(false);
+    return(*this);                                     //lint !e527  unreachable
+  }  //lint !e1745: member not assigned by private assignment operator
+
+  /* ----------------------------------------------------------------------- */
+  /*   Implementations of predefined exceptions                              */
+  /* ----------------------------------------------------------------------- */
+
+
+  /*
+    The following classes reimplement the ANSI standard exception hierarchy from
+    stdexcept.h as UIMACPP exceptions with context and message id support
+  */
+  UIMA_EXC_CLASSIMPLEMENT(Uima_logic_error        ,Exception);
+  UIMA_EXC_CLASSIMPLEMENT(Uima_runtime_error      ,Exception);
+
+  UIMA_EXC_CLASSIMPLEMENT(Uima_domain_error       ,Uima_logic_error);
+  UIMA_EXC_CLASSIMPLEMENT(Uima_invalid_argument   ,Uima_logic_error);
+  UIMA_EXC_CLASSIMPLEMENT(Uima_length_error       ,Uima_logic_error);
+  UIMA_EXC_CLASSIMPLEMENT(Uima_out_of_range       ,Uima_logic_error);
+
+  UIMA_EXC_CLASSIMPLEMENT(Uima_range_error        ,Uima_runtime_error);
+  UIMA_EXC_CLASSIMPLEMENT(Uima_overflow_error     ,Uima_runtime_error);
+  UIMA_EXC_CLASSIMPLEMENT(Uima_underflow_error    ,Uima_runtime_error);
+
+
+  /**
+    The following exceptions are used by helper test classes that are no longer in the UIMACPP library:
+          CommandLineDriver DocBuffer ParseHandlers
+  */
+  UIMA_EXC_CLASSIMPLEMENT(ConsoleAbortExc        ,Exception);
+  UIMA_EXC_CLASSIMPLEMENT(ParseHandlerExc        ,Exception);
+  UIMA_EXC_CLASSIMPLEMENT(ExcDocBuffer           ,Uima_out_of_range);
+
+  /** code page conversion errors */
+  UIMA_EXC_CLASSIMPLEMENT(CodePageConversionException, uima::Exception);
+  /**
+    The following exception is used to report failures from APR functions
+  */
+  UIMA_EXC_CLASSIMPLEMENT(AprFailureException, Exception);
+
+  /*
+    The following classes provide a starting point for an exception hierarchy
+  */
+//? UIMA_EXC_CLASSIMPLEMENT(ExcAssertionFailure, Exception);
+  UIMA_EXC_CLASSIMPLEMENT(ExcIllFormedInputError , Uima_runtime_error);
+  UIMA_EXC_CLASSIMPLEMENT(ExcInvalidParameter    , Uima_invalid_argument);
+  UIMA_EXC_CLASSIMPLEMENT(ExcIndexOutOfRange     , Uima_out_of_range);
+//? UIMA_EXC_CLASSIMPLEMENT(ExcDeviceError      ,Uima_runtime_error);
+  UIMA_EXC_CLASSIMPLEMENT(ExcInvalidRequest      , Uima_runtime_error);
+  UIMA_EXC_CLASSIMPLEMENT(ExcResourceExhausted   , Uima_runtime_error);
+  UIMA_EXC_CLASSIMPLEMENT(ExcOutOfMemory         , ExcResourceExhausted);
+//? UIMA_EXC_CLASSIMPLEMENT(ExcOutOfSystemResource, ResourceExhausted);
+//? UIMA_EXC_CLASSIMPLEMENT(ExcOutOfWindowResource, ResourceExhausted);
+  UIMA_EXC_CLASSIMPLEMENT(ExcFileNotFoundError   , Uima_runtime_error);
+
+// Windows specific CException
+  ExcWinCException::ExcWinCException(
+    ErrorMessage             clMessage,
+    TyErrorId                  ulErrorId,
+    ErrorInfo::EnSeverity    enSeverity
+  )
+      : Uima_runtime_error (clMessage, ulErrorId, enSeverity) {
+    ;
+  }
+
+  const char*
+  ExcWinCException :: getName() const {
+    return( "ExcWinCException" );
+  }
+
+  ExcWinCException::~ExcWinCException () CHILD_DESTRUCT_THROW0() {
+    ;
+  }
+
+  ExcWinCException::ExcWinCException (const ExcWinCException & a) : Uima_runtime_error (a) {
+    ;
+  }
+
+
+  // Windows exceptions can be mapped only when compiled with MS VC++
+#if defined(_MSC_VER)
+
+  void translation_func( unsigned int u, _EXCEPTION_POINTERS* pExp ) {
+    const char * cpszMsg = NULL;
+    switch (u) {
+    case EXCEPTION_ACCESS_VIOLATION:
+      cpszMsg ="\"ACCESS VIOLATION\"";
+      break;
+    case EXCEPTION_DATATYPE_MISALIGNMENT:
+      cpszMsg ="\"DATATYPE MISALIGNMENT\"";
+      break;
+    case EXCEPTION_BREAKPOINT:
+      cpszMsg ="\"BREAKPOINT\"";
+      break;
+    case EXCEPTION_SINGLE_STEP:
+      cpszMsg ="\"SINGLE STEP\"";
+      break;
+    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
+      cpszMsg ="\"ARRAY BOUNDS EXCEEDED\"";
+      break;
+    case EXCEPTION_FLT_DENORMAL_OPERAND:
+      cpszMsg ="\"FLT DENORMAL OPERAND\"";
+      break;
+    case EXCEPTION_FLT_DIVIDE_BY_ZERO:
+      cpszMsg ="\"FLT DIVIDE_BY ZERO\"";
+      break;
+    case EXCEPTION_FLT_INEXACT_RESULT:
+      cpszMsg ="\"FLT INEXACT_RESULT\"";
+      break;
+    case EXCEPTION_FLT_INVALID_OPERATION:
+      cpszMsg ="\"FLT INVALID OPERATION\"";
+      break;
+    case EXCEPTION_FLT_OVERFLOW:
+      cpszMsg ="\"FLT OVERFLOW\"";
+      break;
+    case EXCEPTION_FLT_STACK_CHECK:
+      cpszMsg ="\"FLT STACK_CHECK\"";
+      break;
+    case EXCEPTION_FLT_UNDERFLOW:
+      cpszMsg ="\"FLT UNDERFLOW\"";
+      break;
+    case EXCEPTION_INT_DIVIDE_BY_ZERO:
+      cpszMsg ="\"INT DIVIDE BY ZERO\"";
+      break;
+    case EXCEPTION_INT_OVERFLOW:
+      cpszMsg ="\"INT OVERFLOW\"";
+      break;
+    case EXCEPTION_PRIV_INSTRUCTION:
+      cpszMsg ="\"PRIV INSTRUCTION\"";
+      break;
+    case EXCEPTION_IN_PAGE_ERROR:
+      cpszMsg ="\"IN PAGE_ERROR\"";
+      break;
+    case EXCEPTION_ILLEGAL_INSTRUCTION:
+      cpszMsg ="\"ILLEGAL INSTRUCTION\"";
+      break;
+    case EXCEPTION_NONCONTINUABLE_EXCEPTION:
+      cpszMsg ="\"NONCONTINUABLE EXCEPTION\"";
+      break;
+    case EXCEPTION_STACK_OVERFLOW:
+      cpszMsg ="\"STACK OVERFLOW\"";
+      break;
+    case EXCEPTION_INVALID_DISPOSITION:
+      cpszMsg ="\"INVALID DISPOSITION\"";
+      break;
+    case EXCEPTION_GUARD_PAGE:
+      cpszMsg ="\"GUARD PAGE\"";
+      break;
+    case EXCEPTION_INVALID_HANDLE:
+      cpszMsg ="\"INVALID HANDLE\"";
+      break;
+    case CONTROL_C_EXIT:
+      cpszMsg ="\"CONTROL C EXIT\"";
+      break;
+    default:
+      cpszMsg = "Unknows Windows C Exception";
+      break;
+    }
+    // throw our own type of exception so we know at least what was going on
+    // instead of just getting an unknown ... C++ excepition
+    throw ExcWinCException( ErrorMessage(UIMA_MSG_ID_EXC_WINDOWS_EXCEPTION, cpszMsg),
+                            (TyErrorId)UIMA_ERR_ENGINE_WINDOWS_EXCEPTION,
+                            ErrorInfo::unrecoverable);
+  }
+
+#define UIMA_ENVVAR_DONT_MAP_WINDOWS_EXCEPTIONS     "UIMA_DONT_MAP_WINDOWS_EXCEPTIONS"
+
+  // _set_se_translator should be called at the beginning of main
+  // since we have no access to main here, we declare a static var of a dummy
+  // type which does the _set_se_translator call in it's constructor
+  // Note: this only works if the compiler properly executes the ctors of
+  // such static vars in DLLs
+  class Dummy {
+  public:
+    Dummy( void ) {
+      if ( getenv(UIMA_ENVVAR_DONT_MAP_WINDOWS_EXCEPTIONS) == NULL) {
+        _set_se_translator( translation_func );
+      }
+    }
+  };
+  // static var of our dummy type
+  Dummy clDummy;
+#endif
+
+}
diff --git a/src/install.vcproj b/src/install.vcproj
index 044fcdf..6cac0d8 100644
--- a/src/install.vcproj
+++ b/src/install.vcproj
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="install"

-	ProjectGUID="{023122EC-3490-49E1-ABE6-B7D755E757B0}"

-	RootNamespace="install"

-	Keyword="MakeFileProj">

-

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\$(ConfigurationName)"

-			IntermediateDirectory="..\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="10"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			UseOfMFC="0">

-

-			<Tool

-				Name="VCPreBuildEventTool"/>

-

-			<Tool

-				Name="VCCustomBuildTool"/>

-

-			<Tool

-				Name="VCMIDLTool"/>

-

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="$(ProjectDir)installUimaCpp.bat $(ConfigurationName)"/>

-

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\$(ConfigurationName)"

-			IntermediateDirectory="..\$(ConfigurationName)\$(ProjectName)"

-			ConfigurationType="10"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			UseOfMFC="0">

-

-			<Tool

-				Name="VCPreBuildEventTool"/>

-

-			<Tool

-				Name="VCCustomBuildTool"/>

-

-			<Tool

-				Name="VCMIDLTool"/>

-

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="$(ProjectDir)\installUimaCpp.bat $(ConfigurationName)"/>

-

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-	</Files>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="install"
+	ProjectGUID="{023122EC-3490-49E1-ABE6-B7D755E757B0}"
+	RootNamespace="install"
+	Keyword="MakeFileProj">
+
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\$(ConfigurationName)"
+			IntermediateDirectory="..\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="10"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0">
+
+			<Tool
+				Name="VCPreBuildEventTool"/>
+
+			<Tool
+				Name="VCCustomBuildTool"/>
+
+			<Tool
+				Name="VCMIDLTool"/>
+
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="$(ProjectDir)installUimaCpp.bat $(ConfigurationName)"/>
+
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\$(ConfigurationName)"
+			IntermediateDirectory="..\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="10"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0">
+
+			<Tool
+				Name="VCPreBuildEventTool"/>
+
+			<Tool
+				Name="VCCustomBuildTool"/>
+
+			<Tool
+				Name="VCMIDLTool"/>
+
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="$(ProjectDir)\installUimaCpp.bat $(ConfigurationName)"/>
+
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+	</Files>
+</VisualStudioProject>
diff --git a/src/installUimaCpp.bat b/src/installUimaCpp.bat
index 9c99ecd..e31bb55 100644
--- a/src/installUimaCpp.bat
+++ b/src/installUimaCpp.bat
@@ -1,59 +1,59 @@
-@ECHO OFF

-

-REM   Licensed to the Apache Software Foundation (ASF) under one

-REM   or more contributor license agreements.  See the NOTICE file

-REM   distributed with this work for additional information

-REM   regarding copyright ownership.  The ASF licenses this file

-REM   to you under the Apache License, Version 2.0 (the

-REM   "License"); you may not use this file except in compliance

-REM   with the License.  You may obtain a copy of the License at

-REM

-REM    http://www.apache.org/licenses/LICENSE-2.0

-REM

-REM   Unless required by applicable law or agreed to in writing,

-REM   software distributed under the License is distributed on an

-REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-REM   KIND, either express or implied.  See the License for the

-REM   specific language governing permissions and limitations

-REM   under the License.

-

-@REM     Installs UIMA C++ files

-@REM     Called as a post-build step in the install project

-@REM     Copies ALL include files and the lib & dlls 

-@REM     First arg is the build configuration, i.e. Release or Debug

-@REM     Installs in the directory specified by environment variable UIMA_INSTALLDIR

-@REM     default is 'install' under the uimacpp directory

-@REM     if set to the UIMACPP_HOME of the SDK will replace the entries in the SDK

-

-@if "%~1"=="Release" goto run

-@if "%~1"=="Debug" goto run

-@ECHO Invalid arg for _InstallUimaCPP; specify Debug or Release

-goto end

-

-:run

-@SETLOCAL

-

-@REM Every dir has a nul entry

-

-@if NOT "%UIMA_INSTALLDIR%"=="" goto HAVEDIR

-  set UIMA_INSTALLDIR=..\install

-  @if not exist %UIMA_INSTALLDIR%\nul mkdir %UIMA_INSTALLDIR%

-@:HAVEDIR

-@if not exist %UIMA_INSTALLDIR%\include\nul mkdir %UIMA_INSTALLDIR%\include

-@if not exist %UIMA_INSTALLDIR%\include\uima\nul mkdir %UIMA_INSTALLDIR%\include\uima

-@copy cas\uima\*.hpp       %UIMA_INSTALLDIR%\include\uima

-@copy cas\uima\*.inl       %UIMA_INSTALLDIR%\include\uima

-@copy framework\uima\*.hpp %UIMA_INSTALLDIR%\include\uima

-@copy framework\uima\*.h   %UIMA_INSTALLDIR%\include\uima

-

-@if not exist %UIMA_INSTALLDIR%\data\nul mkdir %UIMA_INSTALLDIR%\data

-@copy ..\data\*.xsd %UIMA_INSTALLDIR%\data

-

-@if not exist %UIMA_INSTALLDIR%\lib\nul mkdir %UIMA_INSTALLDIR%\lib

-@copy ..\%1\lib\*.lib %UIMA_INSTALLDIR%\lib

-

-@if not exist %UIMA_INSTALLDIR%\bin\nul mkdir %UIMA_INSTALLDIR%\bin

-@copy ..\%1\bin\*.dll %UIMA_INSTALLDIR%\bin

-@copy ..\%1\bin\*.exe %UIMA_INSTALLDIR%\bin

-

-:end

+@ECHO OFF
+
+REM   Licensed to the Apache Software Foundation (ASF) under one
+REM   or more contributor license agreements.  See the NOTICE file
+REM   distributed with this work for additional information
+REM   regarding copyright ownership.  The ASF licenses this file
+REM   to you under the Apache License, Version 2.0 (the
+REM   "License"); you may not use this file except in compliance
+REM   with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM   Unless required by applicable law or agreed to in writing,
+REM   software distributed under the License is distributed on an
+REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM   KIND, either express or implied.  See the License for the
+REM   specific language governing permissions and limitations
+REM   under the License.
+
+@REM     Installs UIMA C++ files
+@REM     Called as a post-build step in the install project
+@REM     Copies ALL include files and the lib & dlls 
+@REM     First arg is the build configuration, i.e. Release or Debug
+@REM     Installs in the directory specified by environment variable UIMA_INSTALLDIR
+@REM     default is 'install' under the uimacpp directory
+@REM     if set to the UIMACPP_HOME of the SDK will replace the entries in the SDK
+
+@if "%~1"=="Release" goto run
+@if "%~1"=="Debug" goto run
+@ECHO Invalid arg for _InstallUimaCPP; specify Debug or Release
+goto end
+
+:run
+@SETLOCAL
+
+@REM Every dir has a nul entry
+
+@if NOT "%UIMA_INSTALLDIR%"=="" goto HAVEDIR
+  set UIMA_INSTALLDIR=..\install
+  @if not exist %UIMA_INSTALLDIR%\nul mkdir %UIMA_INSTALLDIR%
+@:HAVEDIR
+@if not exist %UIMA_INSTALLDIR%\include\nul mkdir %UIMA_INSTALLDIR%\include
+@if not exist %UIMA_INSTALLDIR%\include\uima\nul mkdir %UIMA_INSTALLDIR%\include\uima
+@copy cas\uima\*.hpp       %UIMA_INSTALLDIR%\include\uima
+@copy cas\uima\*.inl       %UIMA_INSTALLDIR%\include\uima
+@copy framework\uima\*.hpp %UIMA_INSTALLDIR%\include\uima
+@copy framework\uima\*.h   %UIMA_INSTALLDIR%\include\uima
+
+@if not exist %UIMA_INSTALLDIR%\data\nul mkdir %UIMA_INSTALLDIR%\data
+@copy ..\data\*.xsd %UIMA_INSTALLDIR%\data
+
+@if not exist %UIMA_INSTALLDIR%\lib\nul mkdir %UIMA_INSTALLDIR%\lib
+@copy ..\%1\lib\*.lib %UIMA_INSTALLDIR%\lib
+
+@if not exist %UIMA_INSTALLDIR%\bin\nul mkdir %UIMA_INSTALLDIR%\bin
+@copy ..\%1\bin\*.dll %UIMA_INSTALLDIR%\bin
+@copy ..\%1\bin\*.exe %UIMA_INSTALLDIR%\bin
+
+:end
diff --git a/src/runaecpp.vcproj b/src/runaecpp.vcproj
index 3adf462..e3cd983 100644
--- a/src/runaecpp.vcproj
+++ b/src/runaecpp.vcproj
@@ -1,213 +1,213 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="runaecpp"

-	ProjectGUID="{9F230EC0-DB18-46AC-BB02-DC1E6974A463}"

-	RootNamespace="xcasdriver"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="../Debug/bin"

-			IntermediateDirectory="$(OutDir)/../$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="cas;framework;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(JAVA_HOME)\include&quot;;&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				IgnoreStandardIncludePath="false"

-				MinimalRebuild="true"

-				ExceptionHandling="1"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"

-				OutputFile="$(OutDir)/runAECppD.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(OutDir)\..\lib&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="../Release/bin"

-			IntermediateDirectory="$(OutDir)/../$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories="cas;framework;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(JAVA_HOME)\include&quot;;&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"

-				OutputFile="$(OutDir)/runAECpp.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(OutDir)\..\lib&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="utils\runAECpp.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="runaecpp"
+	ProjectGUID="{9F230EC0-DB18-46AC-BB02-DC1E6974A463}"
+	RootNamespace="xcasdriver"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../Debug/bin"
+			IntermediateDirectory="$(OutDir)/../$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="cas;framework;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(JAVA_HOME)\include&quot;;&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				IgnoreStandardIncludePath="false"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
+				OutputFile="$(OutDir)/runAECppD.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)\..\lib&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="../Release/bin"
+			IntermediateDirectory="$(OutDir)/../$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories="cas;framework;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(JAVA_HOME)\include&quot;;&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
+				OutputFile="$(OutDir)/runAECpp.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)\..\lib&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="utils\runAECpp.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/data/ExampleCas/newprimitives.xcas b/src/test/data/ExampleCas/newprimitives.xcas
index 41cac37..3ef267d 100644
--- a/src/test/data/ExampleCas/newprimitives.xcas
+++ b/src/test/data/ExampleCas/newprimitives.xcas
@@ -1,127 +1,127 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-

-<CAS>

- <uima.cas.Sofa _indexed="0" _id="1" sofaNum="2" sofaID="EnglishDocument" sofaString="this beer is good"/>

- <uima.tcas.DocumentAnnotation _indexed="2" _id="8" _ref_sofa="1" begin="0" end="17" language=""/>

- <test.primitives.Example _indexed="2" _id="13" _ref_sofa="1" begin="1" end="5" floatFeature="1.1" stringFeature="string1" boolFeature="0" byteFeature="122" shortFeature="10" longFeature="10000" doubleFeature="2.1e+011" _ref_intArrayFeature="76" _ref_floatArrayFeature="99" _ref_stringArrayFeature="53" _ref_boolArrayFeature="109" _ref_byteArrayFeature="106" _ref_shortArrayFeature="112" _ref_longArrayFeature="115" _ref_doubleArrayFeature="118" _ref_intListFeature="61" _ref_floatListFeature="84" _ref_stringListFeature="38" _ref_fsListFeature="133" _ref_fsArrayFeature="136"/>

- <uima.cas.EmptyStringList _id="37"/>

- <uima.cas.NonEmptyStringList _id="38" head="string1" _ref_tail="41"/>

- <uima.cas.NonEmptyStringList _id="41" head="string3" _ref_tail="44"/>

- <uima.cas.NonEmptyStringList _id="44" head="string2" _ref_tail="47"/>

- <uima.cas.NonEmptyStringList _id="47" head="string5" _ref_tail="50"/>

- <uima.cas.NonEmptyStringList _id="50" head="string4" _ref_tail="37"/>

- <uima.cas.StringArray _id="53" size="5">

-  <i>string1</i>

-  <i>string3</i>

-  <i>string2</i>

-  <i>string5</i>

-  <i>string4</i>

- </uima.cas.StringArray>

- <uima.cas.EmptyIntegerList _id="60"/>

- <uima.cas.NonEmptyIntegerList _id="61" head="1" _ref_tail="64"/>

- <uima.cas.NonEmptyIntegerList _id="64" head="2" _ref_tail="67"/>

- <uima.cas.NonEmptyIntegerList _id="67" head="3" _ref_tail="70"/>

- <uima.cas.NonEmptyIntegerList _id="70" head="4" _ref_tail="73"/>

- <uima.cas.NonEmptyIntegerList _id="73" head="5" _ref_tail="60"/>

- <uima.cas.IntegerArray _id="76" size="5">

-  <i>1</i>

-  <i>2</i>

-  <i>3</i>

-  <i>4</i>

-  <i>5</i>

- </uima.cas.IntegerArray>

- <uima.cas.EmptyFloatList _id="83"/>

- <uima.cas.NonEmptyFloatList _id="84" head="1.1" _ref_tail="87"/>

- <uima.cas.NonEmptyFloatList _id="87" head="2.2" _ref_tail="90"/>

- <uima.cas.NonEmptyFloatList _id="90" head="3.3" _ref_tail="93"/>

- <uima.cas.NonEmptyFloatList _id="93" head="4.4" _ref_tail="96"/>

- <uima.cas.NonEmptyFloatList _id="96" head="5.5" _ref_tail="83"/>

- <uima.cas.FloatArray _id="99" size="5">

-  <i>1.1</i>

-  <i>2.2</i>

-  <i>3.3</i>

-  <i>4.4</i>

-  <i>5.5</i>

- </uima.cas.FloatArray>

- <uima.cas.ByteArray _id="106" size="5">

-  <i>97</i>

-  <i>98</i>

-  <i>99</i>

-  <i>99</i>

-  <i>100</i>

- </uima.cas.ByteArray>

- <uima.cas.BooleanArray _id="109" size="20">

-  <i>1</i>

-  <i>0</i>

-  <i>1</i>

-  <i>0</i>

-  <i>1</i>

-  <i>0</i>

-  <i>1</i>

-  <i>0</i>

-  <i>1</i>

-  <i>0</i>

-  <i>1</i>

-  <i>0</i>

-  <i>1</i>

-  <i>0</i>

-  <i>1</i>

-  <i>0</i>

-  <i>1</i>

-  <i>0</i>

-  <i>1</i>

-  <i>0</i>

- </uima.cas.BooleanArray>

- <uima.cas.ShortArray _id="112" size="5">

-  <i>10</i>

-  <i>20</i>

-  <i>30</i>

-  <i>40</i>

-  <i>50</i>

- </uima.cas.ShortArray>

- <uima.cas.LongArray _id="115" size="5">

-  <i>10000</i>

-  <i>20000</i>

-  <i>30000</i>

-  <i>40000</i>

-  <i>50000</i>

- </uima.cas.LongArray>

- <uima.cas.DoubleArray _id="118" size="5">

-  <i>2.1e+011</i>

-  <i>3.1e+011</i>

-  <i>4.1e+011</i>

-  <i>5.1e+011</i>

-  <i>6.1e+011</i>

- </uima.cas.DoubleArray>

- <uima.cas.EmptyFSList _id="121"/>

- <uima.tcas.Annotation _id="122" _ref_sofa="1" begin="0" end="5"/>

- <uima.cas.NonEmptyFSList _id="126" _ref_head="122" _ref_tail="121"/>

- <uima.tcas.Annotation _id="129" _ref_sofa="1" begin="1" end="6"/>

- <uima.cas.NonEmptyFSList _id="133" _ref_head="129" _ref_tail="126"/>

- <uima.cas.FSArray _id="136" size="3">

- <i>141</i>

- <i>145</i>

- <i>149</i>

-</uima.cas.FSArray>

- <uima.tcas.Annotation _id="141" _ref_sofa="1" begin="0" end="5"/>

- <uima.tcas.Annotation _id="145" _ref_sofa="1" begin="1" end="6"/>

- <uima.tcas.Annotation _id="149" _ref_sofa="1" begin="2" end="7"/>

-</CAS>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+<CAS>
+ <uima.cas.Sofa _indexed="0" _id="1" sofaNum="2" sofaID="EnglishDocument" sofaString="this beer is good"/>
+ <uima.tcas.DocumentAnnotation _indexed="2" _id="8" _ref_sofa="1" begin="0" end="17" language=""/>
+ <test.primitives.Example _indexed="2" _id="13" _ref_sofa="1" begin="1" end="5" floatFeature="1.1" stringFeature="string1" boolFeature="0" byteFeature="122" shortFeature="10" longFeature="10000" doubleFeature="2.1e+011" _ref_intArrayFeature="76" _ref_floatArrayFeature="99" _ref_stringArrayFeature="53" _ref_boolArrayFeature="109" _ref_byteArrayFeature="106" _ref_shortArrayFeature="112" _ref_longArrayFeature="115" _ref_doubleArrayFeature="118" _ref_intListFeature="61" _ref_floatListFeature="84" _ref_stringListFeature="38" _ref_fsListFeature="133" _ref_fsArrayFeature="136"/>
+ <uima.cas.EmptyStringList _id="37"/>
+ <uima.cas.NonEmptyStringList _id="38" head="string1" _ref_tail="41"/>
+ <uima.cas.NonEmptyStringList _id="41" head="string3" _ref_tail="44"/>
+ <uima.cas.NonEmptyStringList _id="44" head="string2" _ref_tail="47"/>
+ <uima.cas.NonEmptyStringList _id="47" head="string5" _ref_tail="50"/>
+ <uima.cas.NonEmptyStringList _id="50" head="string4" _ref_tail="37"/>
+ <uima.cas.StringArray _id="53" size="5">
+  <i>string1</i>
+  <i>string3</i>
+  <i>string2</i>
+  <i>string5</i>
+  <i>string4</i>
+ </uima.cas.StringArray>
+ <uima.cas.EmptyIntegerList _id="60"/>
+ <uima.cas.NonEmptyIntegerList _id="61" head="1" _ref_tail="64"/>
+ <uima.cas.NonEmptyIntegerList _id="64" head="2" _ref_tail="67"/>
+ <uima.cas.NonEmptyIntegerList _id="67" head="3" _ref_tail="70"/>
+ <uima.cas.NonEmptyIntegerList _id="70" head="4" _ref_tail="73"/>
+ <uima.cas.NonEmptyIntegerList _id="73" head="5" _ref_tail="60"/>
+ <uima.cas.IntegerArray _id="76" size="5">
+  <i>1</i>
+  <i>2</i>
+  <i>3</i>
+  <i>4</i>
+  <i>5</i>
+ </uima.cas.IntegerArray>
+ <uima.cas.EmptyFloatList _id="83"/>
+ <uima.cas.NonEmptyFloatList _id="84" head="1.1" _ref_tail="87"/>
+ <uima.cas.NonEmptyFloatList _id="87" head="2.2" _ref_tail="90"/>
+ <uima.cas.NonEmptyFloatList _id="90" head="3.3" _ref_tail="93"/>
+ <uima.cas.NonEmptyFloatList _id="93" head="4.4" _ref_tail="96"/>
+ <uima.cas.NonEmptyFloatList _id="96" head="5.5" _ref_tail="83"/>
+ <uima.cas.FloatArray _id="99" size="5">
+  <i>1.1</i>
+  <i>2.2</i>
+  <i>3.3</i>
+  <i>4.4</i>
+  <i>5.5</i>
+ </uima.cas.FloatArray>
+ <uima.cas.ByteArray _id="106" size="5">
+  <i>97</i>
+  <i>98</i>
+  <i>99</i>
+  <i>99</i>
+  <i>100</i>
+ </uima.cas.ByteArray>
+ <uima.cas.BooleanArray _id="109" size="20">
+  <i>1</i>
+  <i>0</i>
+  <i>1</i>
+  <i>0</i>
+  <i>1</i>
+  <i>0</i>
+  <i>1</i>
+  <i>0</i>
+  <i>1</i>
+  <i>0</i>
+  <i>1</i>
+  <i>0</i>
+  <i>1</i>
+  <i>0</i>
+  <i>1</i>
+  <i>0</i>
+  <i>1</i>
+  <i>0</i>
+  <i>1</i>
+  <i>0</i>
+ </uima.cas.BooleanArray>
+ <uima.cas.ShortArray _id="112" size="5">
+  <i>10</i>
+  <i>20</i>
+  <i>30</i>
+  <i>40</i>
+  <i>50</i>
+ </uima.cas.ShortArray>
+ <uima.cas.LongArray _id="115" size="5">
+  <i>10000</i>
+  <i>20000</i>
+  <i>30000</i>
+  <i>40000</i>
+  <i>50000</i>
+ </uima.cas.LongArray>
+ <uima.cas.DoubleArray _id="118" size="5">
+  <i>2.1e+011</i>
+  <i>3.1e+011</i>
+  <i>4.1e+011</i>
+  <i>5.1e+011</i>
+  <i>6.1e+011</i>
+ </uima.cas.DoubleArray>
+ <uima.cas.EmptyFSList _id="121"/>
+ <uima.tcas.Annotation _id="122" _ref_sofa="1" begin="0" end="5"/>
+ <uima.cas.NonEmptyFSList _id="126" _ref_head="122" _ref_tail="121"/>
+ <uima.tcas.Annotation _id="129" _ref_sofa="1" begin="1" end="6"/>
+ <uima.cas.NonEmptyFSList _id="133" _ref_head="129" _ref_tail="126"/>
+ <uima.cas.FSArray _id="136" size="3">
+ <i>141</i>
+ <i>145</i>
+ <i>149</i>
+</uima.cas.FSArray>
+ <uima.tcas.Annotation _id="141" _ref_sofa="1" begin="0" end="5"/>
+ <uima.tcas.Annotation _id="145" _ref_sofa="1" begin="1" end="6"/>
+ <uima.tcas.Annotation _id="149" _ref_sofa="1" begin="2" end="7"/>
+</CAS>
diff --git a/src/test/data/ExampleCas/newprimitivesPartialTypeSystem.xml b/src/test/data/ExampleCas/newprimitivesPartialTypeSystem.xml
index 1424343..52ad05c 100644
--- a/src/test/data/ExampleCas/newprimitivesPartialTypeSystem.xml
+++ b/src/test/data/ExampleCas/newprimitivesPartialTypeSystem.xml
@@ -1,143 +1,143 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-

-      <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">

-       <types>

-         <typeDescription>

-              <name>test.primitives.Example</name>

-              <description></description>

-              <supertypeName>uima.tcas.Annotation</supertypeName>

-              <features>

-         <!--

-         <featureDescription>

-           <name>floatFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.Float</rangeTypeName>

-         </featureDescription>

-        

-         <featureDescription>

-           <name>stringFeature</name>

-           <description></description>

-          <rangeTypeName>uima.cas.String</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>boolFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.Boolean</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>byteFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.Byte</rangeTypeName>

-         </featureDescription>

-         -->

-         <featureDescription>

-           <name>shortFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.Short</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>longFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.Long</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>doubleFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.Double</rangeTypeName>

-         </featureDescription>

-<!---

-         <featureDescription>

-           <name>intArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.IntegerArray</rangeTypeName>

-         </featureDescription>

--->

-         <featureDescription>

-           <name>floatArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.FloatArray</rangeTypeName>

-         </featureDescription>

-<!---

-         <featureDescription>

-           <name>stringArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.StringArray</rangeTypeName>

-         </featureDescription>

--->

-         <featureDescription>

-           <name>boolArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.BooleanArray</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>byteArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.ByteArray</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>shortArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.ShortArray</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>longArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.LongArray</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>doubleArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.DoubleArray</rangeTypeName>

-         </featureDescription>

-	  <featureDescription>

-          <name>intListFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.IntegerList</rangeTypeName>

-        </featureDescription>

-	  <featureDescription>

-           <name>floatListFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.FloatList</rangeTypeName>

-         </featureDescription>

-<!--

-	   <featureDescription>

-           <name>stringListFeature</name>

-           <description></description>

-          <rangeTypeName>uima.cas.StringList</rangeTypeName>

-         </featureDescription>

-

-

- 		<featureDescription>

-           <name>fsListFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.FSList</rangeTypeName>

-         </featureDescription>

--->

-	   <featureDescription>

-          <name>fsArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.FSArray</rangeTypeName>

-         </featureDescription>

-

-              </features>

-        </typeDescription>

-       </types>

-      </typeSystemDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+      <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
+       <types>
+         <typeDescription>
+              <name>test.primitives.Example</name>
+              <description></description>
+              <supertypeName>uima.tcas.Annotation</supertypeName>
+              <features>
+         <!--
+         <featureDescription>
+           <name>floatFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.Float</rangeTypeName>
+         </featureDescription>
+        
+         <featureDescription>
+           <name>stringFeature</name>
+           <description></description>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>boolFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.Boolean</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>byteFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.Byte</rangeTypeName>
+         </featureDescription>
+         -->
+         <featureDescription>
+           <name>shortFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.Short</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>longFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.Long</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>doubleFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.Double</rangeTypeName>
+         </featureDescription>
+<!---
+         <featureDescription>
+           <name>intArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.IntegerArray</rangeTypeName>
+         </featureDescription>
+-->
+         <featureDescription>
+           <name>floatArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.FloatArray</rangeTypeName>
+         </featureDescription>
+<!---
+         <featureDescription>
+           <name>stringArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.StringArray</rangeTypeName>
+         </featureDescription>
+-->
+         <featureDescription>
+           <name>boolArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.BooleanArray</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>byteArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.ByteArray</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>shortArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.ShortArray</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>longArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.LongArray</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>doubleArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.DoubleArray</rangeTypeName>
+         </featureDescription>
+	  <featureDescription>
+          <name>intListFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.IntegerList</rangeTypeName>
+        </featureDescription>
+	  <featureDescription>
+           <name>floatListFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.FloatList</rangeTypeName>
+         </featureDescription>
+<!--
+	   <featureDescription>
+           <name>stringListFeature</name>
+           <description></description>
+          <rangeTypeName>uima.cas.StringList</rangeTypeName>
+         </featureDescription>
+
+
+ 		<featureDescription>
+           <name>fsListFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.FSList</rangeTypeName>
+         </featureDescription>
+-->
+	   <featureDescription>
+          <name>fsArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.FSArray</rangeTypeName>
+         </featureDescription>
+
+              </features>
+        </typeDescription>
+       </types>
+      </typeSystemDescription>
diff --git a/src/test/data/ExampleCas/newprimitivesTypeSystem.xml b/src/test/data/ExampleCas/newprimitivesTypeSystem.xml
index a91ea7b..d7feeb6 100644
--- a/src/test/data/ExampleCas/newprimitivesTypeSystem.xml
+++ b/src/test/data/ExampleCas/newprimitivesTypeSystem.xml
@@ -1,142 +1,142 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-

-      <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">

-       <types>

-         <typeDescription>

-              <name>test.primitives.Example</name>

-              <description></description>

-              <supertypeName>uima.tcas.Annotation</supertypeName>

-              <features>

-         <featureDescription>

-           <name>floatFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.Float</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>stringFeature</name>

-           <description></description>

-          <rangeTypeName>uima.cas.String</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>boolFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.Boolean</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>byteFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.Byte</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>shortFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.Short</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>longFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.Long</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>doubleFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.Double</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>intArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.IntegerArray</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>floatArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.FloatArray</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>stringArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.StringArray</rangeTypeName>

-           </featureDescription>

-         <featureDescription>

-           <name>stringArrayFeatureMultiRef</name>

-           <description></description>

-           <rangeTypeName>uima.cas.StringArray</rangeTypeName>

-           <multipleReferencesAllowed> true </multipleReferencesAllowed>

-         </featureDescription>

-         <featureDescription>

-          <name>otherAnnotation</name>

-          <description></description>

-          <rangeTypeName>uima.tcas.Annotation</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>boolArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.BooleanArray</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>byteArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.ByteArray</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>shortArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.ShortArray</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>longArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.LongArray</rangeTypeName>

-         </featureDescription>

-         <featureDescription>

-           <name>doubleArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.DoubleArray</rangeTypeName>

-         </featureDescription>

-	  <featureDescription>

-          <name>intListFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.IntegerList</rangeTypeName>

-        </featureDescription>

-	  <featureDescription>

-           <name>floatListFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.FloatList</rangeTypeName>

-         </featureDescription>

-	   <featureDescription>

-           <name>stringListFeature</name>

-           <description></description>

-          <rangeTypeName>uima.cas.StringList</rangeTypeName>

-         </featureDescription>

-	   <featureDescription>

-           <name>fsListFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.FSList</rangeTypeName>

-         </featureDescription>

-	   <featureDescription>

-          <name>fsArrayFeature</name>

-           <description></description>

-           <rangeTypeName>uima.cas.FSArray</rangeTypeName>

-         </featureDescription>

-              </features>

-        </typeDescription>

-       </types>

-      </typeSystemDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+      <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
+       <types>
+         <typeDescription>
+              <name>test.primitives.Example</name>
+              <description></description>
+              <supertypeName>uima.tcas.Annotation</supertypeName>
+              <features>
+         <featureDescription>
+           <name>floatFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.Float</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>stringFeature</name>
+           <description></description>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>boolFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.Boolean</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>byteFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.Byte</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>shortFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.Short</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>longFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.Long</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>doubleFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.Double</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>intArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.IntegerArray</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>floatArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.FloatArray</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>stringArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.StringArray</rangeTypeName>
+           </featureDescription>
+         <featureDescription>
+           <name>stringArrayFeatureMultiRef</name>
+           <description></description>
+           <rangeTypeName>uima.cas.StringArray</rangeTypeName>
+           <multipleReferencesAllowed> true </multipleReferencesAllowed>
+         </featureDescription>
+         <featureDescription>
+          <name>otherAnnotation</name>
+          <description></description>
+          <rangeTypeName>uima.tcas.Annotation</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>boolArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.BooleanArray</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>byteArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.ByteArray</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>shortArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.ShortArray</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>longArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.LongArray</rangeTypeName>
+         </featureDescription>
+         <featureDescription>
+           <name>doubleArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.DoubleArray</rangeTypeName>
+         </featureDescription>
+	  <featureDescription>
+          <name>intListFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.IntegerList</rangeTypeName>
+        </featureDescription>
+	  <featureDescription>
+           <name>floatListFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.FloatList</rangeTypeName>
+         </featureDescription>
+	   <featureDescription>
+           <name>stringListFeature</name>
+           <description></description>
+          <rangeTypeName>uima.cas.StringList</rangeTypeName>
+         </featureDescription>
+	   <featureDescription>
+           <name>fsListFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.FSList</rangeTypeName>
+         </featureDescription>
+	   <featureDescription>
+          <name>fsArrayFeature</name>
+           <description></description>
+           <rangeTypeName>uima.cas.FSArray</rangeTypeName>
+         </featureDescription>
+              </features>
+        </typeDescription>
+       </types>
+      </typeSystemDescription>
diff --git a/src/test/data/ExampleCas/testTae.xml b/src/test/data/ExampleCas/testTae.xml
index 73a3f4a..a84029d 100644
--- a/src/test/data/ExampleCas/testTae.xml
+++ b/src/test/data/ExampleCas/testTae.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8" ?> 

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-

-<taeDescription xmlns="http://uima.apache.org/resourceSpecifier">

-  <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-  <primitive>true</primitive>

-<annotatorImplementationName>dummyAnnot</annotatorImplementationName>

-

-

-<analysisEngineMetaData>

-  <name>dummy</name>

-  <description>place holder for type and index definitinons.</description>

-  <version>1.0</version>

-  <vendor>IBM</vendor>

-

-

-<!--

-  Configuration Parameter Definitions

--->

-        <configurationParameters/>

-

-<!--

-        Values for the configuration parameters

--->

-        <configurationParameterSettings/>

- 

-

-<!--

-        TypeSystem Definition

--->

-

-<typeSystemDescription>

-  <imports>

-    <import location="testTypeSystem.xml"/>

-  </imports>

-</typeSystemDescription>

-        

-

-<!--

-Capabilities: Inputs, Outputs, and Preconditions

--->

-<capabilities>

-  <capability>

-    <inputs/>

-    <outputs/>

-    <languagesSupported/>

-  </capability>

-</capabilities>

-

-</analysisEngineMetaData>

-</taeDescription>

+<?xml version="1.0" encoding="UTF-8" ?> 
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+<taeDescription xmlns="http://uima.apache.org/resourceSpecifier">
+  <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+  <primitive>true</primitive>
+<annotatorImplementationName>dummyAnnot</annotatorImplementationName>
+
+
+<analysisEngineMetaData>
+  <name>dummy</name>
+  <description>place holder for type and index definitinons.</description>
+  <version>1.0</version>
+  <vendor>IBM</vendor>
+
+
+<!--
+  Configuration Parameter Definitions
+-->
+        <configurationParameters/>
+
+<!--
+        Values for the configuration parameters
+-->
+        <configurationParameterSettings/>
+ 
+
+<!--
+        TypeSystem Definition
+-->
+
+<typeSystemDescription>
+  <imports>
+    <import location="testTypeSystem.xml"/>
+  </imports>
+</typeSystemDescription>
+        
+
+<!--
+Capabilities: Inputs, Outputs, and Preconditions
+-->
+<capabilities>
+  <capability>
+    <inputs/>
+    <outputs/>
+    <languagesSupported/>
+  </capability>
+</capabilities>
+
+</analysisEngineMetaData>
+</taeDescription>
diff --git a/src/test/data/ExampleCas/v1MultiSofaCas.xml b/src/test/data/ExampleCas/v1MultiSofaCas.xml
index 3cce7bb..46d0b7f 100644
--- a/src/test/data/ExampleCas/v1MultiSofaCas.xml
+++ b/src/test/data/ExampleCas/v1MultiSofaCas.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-

-<CAS>

-    <uima.cas.Sofa _indexed="0" _id="1" sofaNum="1" sofaID="EnglishDocument" mimeType="text" sofaString="this beer is good"/>

-    <uima.cas.Sofa _indexed="0" _id="13" sofaNum="2" sofaID="GermanDocument" mimeType="text" sofaString="das bier ist gut"/>

-    <uima.cas.Sofa _indexed="0" _id="25" sofaNum="3" sofaID="FrenchDocument" mimeType="cette biere est bonne" sofaString="cette biere est bonne"/>

-    <uima.cas.Sofa _indexed="0" _id="94" sofaNum="4" sofaID="_DefaultTextSofaName" mimeType="text" sofaString="some text for the default text sofa."/>

-    <uima.tcas.Annotation _indexed="1" _id="37" sofa="1" begin="0" end="4"/>

-    <uima.tcas.Annotation _indexed="1" _id="50" sofa="1" begin="5" end="9"/>

-    <uima.tcas.Annotation _indexed="1" _id="63" sofa="1" begin="10" end="12"/>

-    <uima.tcas.Annotation _indexed="1" _id="76" sofa="1" begin="13" end="17"/>

-    <uima.tcas.DocumentAnnotation _indexed="1" _id="8" sofa="1" begin="0" end="17" language="x-unspecified"/>

-    <uima.tcas.DocumentAnnotation _indexed="2" _id="20" sofa="2" begin="0" end="16" language="x-unspecified"/>

-    <sofa.test.CrossAnnotation _indexed="2" _id="45" sofa="2" begin="0" end="3" _ref_otherAnnotation="37"/>

-    <sofa.test.CrossAnnotation _indexed="2" _id="58" sofa="2" begin="4" end="8" _ref_otherAnnotation="50"/>

-    <sofa.test.CrossAnnotation _indexed="2" _id="71" sofa="2" begin="9" end="12" _ref_otherAnnotation="63"/>

-    <sofa.test.CrossAnnotation _indexed="2" _id="84" sofa="2" begin="13" end="16" _ref_otherAnnotation="76"/>

-    <uima.tcas.Annotation _indexed="3" _id="41" sofa="3" begin="0" end="5"/>

-    <uima.tcas.Annotation _indexed="3" _id="54" sofa="3" begin="6" end="11"/>

-    <uima.tcas.Annotation _indexed="3" _id="67" sofa="3" begin="12" end="15"/>

-    <uima.tcas.Annotation _indexed="3" _id="80" sofa="3" begin="16" end="21"/>

-    <uima.tcas.DocumentAnnotation _indexed="3" _id="32" sofa="3" begin="0" end="21" language="x-unspecified"/>

-    <uima.tcas.DocumentAnnotation _indexed="4" _id="101" sofa="4" begin="0" end="36" language="x-unspecified"/>

-</CAS>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+<CAS>
+    <uima.cas.Sofa _indexed="0" _id="1" sofaNum="1" sofaID="EnglishDocument" mimeType="text" sofaString="this beer is good"/>
+    <uima.cas.Sofa _indexed="0" _id="13" sofaNum="2" sofaID="GermanDocument" mimeType="text" sofaString="das bier ist gut"/>
+    <uima.cas.Sofa _indexed="0" _id="25" sofaNum="3" sofaID="FrenchDocument" mimeType="cette biere est bonne" sofaString="cette biere est bonne"/>
+    <uima.cas.Sofa _indexed="0" _id="94" sofaNum="4" sofaID="_DefaultTextSofaName" mimeType="text" sofaString="some text for the default text sofa."/>
+    <uima.tcas.Annotation _indexed="1" _id="37" sofa="1" begin="0" end="4"/>
+    <uima.tcas.Annotation _indexed="1" _id="50" sofa="1" begin="5" end="9"/>
+    <uima.tcas.Annotation _indexed="1" _id="63" sofa="1" begin="10" end="12"/>
+    <uima.tcas.Annotation _indexed="1" _id="76" sofa="1" begin="13" end="17"/>
+    <uima.tcas.DocumentAnnotation _indexed="1" _id="8" sofa="1" begin="0" end="17" language="x-unspecified"/>
+    <uima.tcas.DocumentAnnotation _indexed="2" _id="20" sofa="2" begin="0" end="16" language="x-unspecified"/>
+    <sofa.test.CrossAnnotation _indexed="2" _id="45" sofa="2" begin="0" end="3" _ref_otherAnnotation="37"/>
+    <sofa.test.CrossAnnotation _indexed="2" _id="58" sofa="2" begin="4" end="8" _ref_otherAnnotation="50"/>
+    <sofa.test.CrossAnnotation _indexed="2" _id="71" sofa="2" begin="9" end="12" _ref_otherAnnotation="63"/>
+    <sofa.test.CrossAnnotation _indexed="2" _id="84" sofa="2" begin="13" end="16" _ref_otherAnnotation="76"/>
+    <uima.tcas.Annotation _indexed="3" _id="41" sofa="3" begin="0" end="5"/>
+    <uima.tcas.Annotation _indexed="3" _id="54" sofa="3" begin="6" end="11"/>
+    <uima.tcas.Annotation _indexed="3" _id="67" sofa="3" begin="12" end="15"/>
+    <uima.tcas.Annotation _indexed="3" _id="80" sofa="3" begin="16" end="21"/>
+    <uima.tcas.DocumentAnnotation _indexed="3" _id="32" sofa="3" begin="0" end="21" language="x-unspecified"/>
+    <uima.tcas.DocumentAnnotation _indexed="4" _id="101" sofa="4" begin="0" end="36" language="x-unspecified"/>
+</CAS>
diff --git a/src/test/data/descriptors/SimpleTextSegmenter.xml b/src/test/data/descriptors/SimpleTextSegmenter.xml
index f703343..9499ef8 100644
--- a/src/test/data/descriptors/SimpleTextSegmenter.xml
+++ b/src/test/data/descriptors/SimpleTextSegmenter.xml
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8" ?> 

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<!-- For testing only. -->

-

-<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">

-<frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-<primitive>true</primitive>

-<annotatorImplementationName>libSimpleTextSegmenter</annotatorImplementationName>

- 

-<analysisEngineMetaData>

-	<name>Simple Text Segmenter</name>

-	<description>Splits a text document into pieces. The point at which the text is split is determined by SegmentDelimiter configuration parameter which defaults to new line ('\n')</description>

-	<version>1.0</version>

-	<vendor>IBM</vendor>

-	

-	<configurationParameters>

-		<configurationParameter>

-			<name>SegmentDelimiter</name>

-			<description>segment delimiter</description>

-			<type>String</type>

-			<multiValued>false</multiValued>

-			<mandatory>false</mandatory>

-		</configurationParameter>

-	</configurationParameters>

-	<configurationParameterSettings>

-		<nameValuePair>

-			<name>SegmentDelimiter</name>

-			<value>

-				<string>.</string>

-			</value>

-		</nameValuePair>

-	</configurationParameterSettings>

-

-	<typeSystemDescription/>

-

-	<fsIndexCollection>

-	 <fsIndexes>

-	   <fsIndexDescription>

-	      <label>TestIndex</label>

-	      <typeName>uima.cas.TOP</typeName>

-	      <kind>bag</kind>

-	      <keys/>

-	    </fsIndexDescription>

-          </fsIndexes>

-        </fsIndexCollection>

-		

-	<capabilities>

-		<capability>

-			<outputs/>

-		</capability>

-	</capabilities>

-	

-	<operationalProperties>

-		<modifiesCas>false</modifiesCas>

-		<multipleDeploymentAllowed>true</multipleDeploymentAllowed>

-		<outputsNewCASes>true</outputsNewCASes>

-	</operationalProperties>

-	

-</analysisEngineMetaData>

-</analysisEngineDescription>

+<?xml version="1.0" encoding="UTF-8" ?> 
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<!-- For testing only. -->
+
+<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
+<frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+<primitive>true</primitive>
+<annotatorImplementationName>libSimpleTextSegmenter</annotatorImplementationName>
+ 
+<analysisEngineMetaData>
+	<name>Simple Text Segmenter</name>
+	<description>Splits a text document into pieces. The point at which the text is split is determined by SegmentDelimiter configuration parameter which defaults to new line ('\n')</description>
+	<version>1.0</version>
+	<vendor>IBM</vendor>
+	
+	<configurationParameters>
+		<configurationParameter>
+			<name>SegmentDelimiter</name>
+			<description>segment delimiter</description>
+			<type>String</type>
+			<multiValued>false</multiValued>
+			<mandatory>false</mandatory>
+		</configurationParameter>
+	</configurationParameters>
+	<configurationParameterSettings>
+		<nameValuePair>
+			<name>SegmentDelimiter</name>
+			<value>
+				<string>.</string>
+			</value>
+		</nameValuePair>
+	</configurationParameterSettings>
+
+	<typeSystemDescription/>
+
+	<fsIndexCollection>
+	 <fsIndexes>
+	   <fsIndexDescription>
+	      <label>TestIndex</label>
+	      <typeName>uima.cas.TOP</typeName>
+	      <kind>bag</kind>
+	      <keys/>
+	    </fsIndexDescription>
+          </fsIndexes>
+        </fsIndexCollection>
+		
+	<capabilities>
+		<capability>
+			<outputs/>
+		</capability>
+	</capabilities>
+	
+	<operationalProperties>
+		<modifiesCas>false</modifiesCas>
+		<multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+		<outputsNewCASes>true</outputsNewCASes>
+	</operationalProperties>
+	
+</analysisEngineMetaData>
+</analysisEngineDescription>
diff --git a/src/test/data/descriptors/TextSegmentConsumer.xml b/src/test/data/descriptors/TextSegmentConsumer.xml
index 701c143..2c4477c 100644
--- a/src/test/data/descriptors/TextSegmentConsumer.xml
+++ b/src/test/data/descriptors/TextSegmentConsumer.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8" ?> 

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<!-- For testing only. -->

-

-<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">

-<frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-<primitive>true</primitive>

-<annotatorImplementationName>libTextSegmentConsumer</annotatorImplementationName>

- 

-<analysisEngineMetaData>

-	<name>Text Segment Consumer</name>

-	<description>Counts number of segments.</description>

-	<version>1.0</version>

-	<vendor>IBM</vendor>

-	

-	<configurationParameters>

-		<configurationParameter>

-			<name>TotalNumberOfSegments</name>

-			<description>total num of segments</description>

-			<type>Integer</type>

-			<multiValued>false</multiValued>

-			<mandatory>false</mandatory>

-		</configurationParameter>

-	</configurationParameters>

-	<configurationParameterSettings>

-		<nameValuePair>

-			<name>TotalNumberOfSegments</name>

-			<value>

-				<integer>3</integer>

-			</value>

-		</nameValuePair>

-	</configurationParameterSettings>

-

-	<typeSystemDescription>

-	  <imports>

-		<import name="org.apache.uima.examples.SourceDocumentInformation"/>

-	  </imports>

-	</typeSystemDescription>

-		

-	<capabilities>

-		<capability>

-			<outputs/>

-		</capability>

-	</capabilities>

-	

-	<operationalProperties>

-		<modifiesCas>false</modifiesCas>

-		<multipleDeploymentAllowed>true</multipleDeploymentAllowed>

-		<!--segmenter>true</segmenter-->

-	</operationalProperties>

-	

-</analysisEngineMetaData>

-</analysisEngineDescription>

+<?xml version="1.0" encoding="UTF-8" ?> 
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<!-- For testing only. -->
+
+<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
+<frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+<primitive>true</primitive>
+<annotatorImplementationName>libTextSegmentConsumer</annotatorImplementationName>
+ 
+<analysisEngineMetaData>
+	<name>Text Segment Consumer</name>
+	<description>Counts number of segments.</description>
+	<version>1.0</version>
+	<vendor>IBM</vendor>
+	
+	<configurationParameters>
+		<configurationParameter>
+			<name>TotalNumberOfSegments</name>
+			<description>total num of segments</description>
+			<type>Integer</type>
+			<multiValued>false</multiValued>
+			<mandatory>false</mandatory>
+		</configurationParameter>
+	</configurationParameters>
+	<configurationParameterSettings>
+		<nameValuePair>
+			<name>TotalNumberOfSegments</name>
+			<value>
+				<integer>3</integer>
+			</value>
+		</nameValuePair>
+	</configurationParameterSettings>
+
+	<typeSystemDescription>
+	  <imports>
+		<import name="org.apache.uima.examples.SourceDocumentInformation"/>
+	  </imports>
+	</typeSystemDescription>
+		
+	<capabilities>
+		<capability>
+			<outputs/>
+		</capability>
+	</capabilities>
+	
+	<operationalProperties>
+		<modifiesCas>false</modifiesCas>
+		<multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+		<!--segmenter>true</segmenter-->
+	</operationalProperties>
+	
+</analysisEngineMetaData>
+</analysisEngineDescription>
diff --git a/src/test/data/descriptors/dump.xml b/src/test/data/descriptors/dump.xml
index 91bdefe..c263314 100644
--- a/src/test/data/descriptors/dump.xml
+++ b/src/test/data/descriptors/dump.xml
@@ -1,153 +1,153 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<taeDescription

-   xmlns="http://uima.apache.org/resourceSpecifier"

-   >

-   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-<primitive>true</primitive>

-   <annotatorImplementationName>libdump</annotatorImplementationName>

-

-   <analysisEngineMetaData>

-      <name>AnnotationDumpAnnotator</name>

-      <description>This annotator dumps ANs and TEs of a particular type(range) out to a stream. The stream and the structure of the Output are specified by the user</description>

-      <version>1.0</version>

-      <vendor>IBM Corporation</vendor>

-

-      <configurationParameters>

-         <configurationParameter>

-            <name>OutputFile</name>

-            <description>The name of the file that will contain the dumped TCAS</description>

-            <type>String</type>

-            <multiValued>false</multiValued>

-            <mandatory>true</mandatory>

-                     </configurationParameter>

-

-         <configurationParameter>

-            <name>AppendFile</name>

-            <description>If true, the result of the dump is appended to OutputFile</description>

-            <type>Boolean</type>

-            <multiValued>false</multiValued>

-            <mandatory>true</mandatory>

-                     </configurationParameter>

-

-         <configurationParameter>

-            <name>DumpDocBuffer</name>

-            <description>If true, the content of the document buffer is dumped as well</description>

-            <type>Boolean</type>

-            <multiValued>false</multiValued>

-            <mandatory>true</mandatory>

-                     </configurationParameter>

-

-         <configurationParameter>

-            <name>SaveDocBuffer</name>

-            <description></description>

-            <type>Boolean</type>

-            <multiValued>false</multiValued>

-            <mandatory>true</mandatory>

-                     </configurationParameter>

-

-         <configurationParameter>

-            <name>OutputStyle</name>

-            <description>Determmins the format of the output. Currently, only XML is supported</description>

-            <type>Integer</type>

-            <multiValued>false</multiValued>

-            <mandatory>true</mandatory>

-                     </configurationParameter>

-

-         <configurationParameter>

-            <name>OutputTypes</name>

-            <description>Used to test extraction of multi-valued parameters</description>

-            <type>String</type>

-            <multiValued>true</multiValued>

-            <mandatory>false</mandatory>

-         </configurationParameter>

-

-      </configurationParameters>

-

-      <configurationParameterSettings>

-         <nameValuePair>

-            <name>OutputFile</name>

-            <value>

-               <string>ANDump.xml</string>

-            </value>

-         </nameValuePair>

-         <nameValuePair>

-            <name>AppendFile</name>

-            <value>

-               <boolean>false</boolean>

-            </value>

-         </nameValuePair>

-         <nameValuePair>

-            <name>DumpDocBuffer</name>

-            <value>

-               <boolean>false</boolean>

-            </value>

-         </nameValuePair>

-         <nameValuePair>

-            <name>SaveDocBuffer</name>

-            <value>

-               <boolean>false</boolean>

-            </value>

-         </nameValuePair>

-         <nameValuePair>

-            <name>OutputStyle</name>

-            <value>

-               <integer>0</integer>

-            </value>

-         </nameValuePair>

-         <nameValuePair>

-            <name>OutputTypes</name>

-            <value>

-               <array>

-                  <string>Four</string>

-                  <string>output</string>

-                  <string>type</string>

-                  <string>values</string>

-               </array>

-            </value>

-         </nameValuePair>

-      </configurationParameterSettings>

-

-      <typeSystemDescription>

-         <types/>

-      </typeSystemDescription>

-

-      <fsIndexes>

-      </fsIndexes>

-

-      <capabilities>

-         <capability>

-            <inputs/>

-

-            <outputs/>

-

-            <languagesSupported>

-               <language>x-unspecified</language>

-            </languagesSupported>

-         </capability>

-      </capabilities>

-

-   </analysisEngineMetaData>

-</taeDescription>

-

+<?xml version="1.0" encoding="UTF-8" ?>
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<taeDescription
+   xmlns="http://uima.apache.org/resourceSpecifier"
+   >
+   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+<primitive>true</primitive>
+   <annotatorImplementationName>libdump</annotatorImplementationName>
+
+   <analysisEngineMetaData>
+      <name>AnnotationDumpAnnotator</name>
+      <description>This annotator dumps ANs and TEs of a particular type(range) out to a stream. The stream and the structure of the Output are specified by the user</description>
+      <version>1.0</version>
+      <vendor>IBM Corporation</vendor>
+
+      <configurationParameters>
+         <configurationParameter>
+            <name>OutputFile</name>
+            <description>The name of the file that will contain the dumped TCAS</description>
+            <type>String</type>
+            <multiValued>false</multiValued>
+            <mandatory>true</mandatory>
+                     </configurationParameter>
+
+         <configurationParameter>
+            <name>AppendFile</name>
+            <description>If true, the result of the dump is appended to OutputFile</description>
+            <type>Boolean</type>
+            <multiValued>false</multiValued>
+            <mandatory>true</mandatory>
+                     </configurationParameter>
+
+         <configurationParameter>
+            <name>DumpDocBuffer</name>
+            <description>If true, the content of the document buffer is dumped as well</description>
+            <type>Boolean</type>
+            <multiValued>false</multiValued>
+            <mandatory>true</mandatory>
+                     </configurationParameter>
+
+         <configurationParameter>
+            <name>SaveDocBuffer</name>
+            <description></description>
+            <type>Boolean</type>
+            <multiValued>false</multiValued>
+            <mandatory>true</mandatory>
+                     </configurationParameter>
+
+         <configurationParameter>
+            <name>OutputStyle</name>
+            <description>Determmins the format of the output. Currently, only XML is supported</description>
+            <type>Integer</type>
+            <multiValued>false</multiValued>
+            <mandatory>true</mandatory>
+                     </configurationParameter>
+
+         <configurationParameter>
+            <name>OutputTypes</name>
+            <description>Used to test extraction of multi-valued parameters</description>
+            <type>String</type>
+            <multiValued>true</multiValued>
+            <mandatory>false</mandatory>
+         </configurationParameter>
+
+      </configurationParameters>
+
+      <configurationParameterSettings>
+         <nameValuePair>
+            <name>OutputFile</name>
+            <value>
+               <string>ANDump.xml</string>
+            </value>
+         </nameValuePair>
+         <nameValuePair>
+            <name>AppendFile</name>
+            <value>
+               <boolean>false</boolean>
+            </value>
+         </nameValuePair>
+         <nameValuePair>
+            <name>DumpDocBuffer</name>
+            <value>
+               <boolean>false</boolean>
+            </value>
+         </nameValuePair>
+         <nameValuePair>
+            <name>SaveDocBuffer</name>
+            <value>
+               <boolean>false</boolean>
+            </value>
+         </nameValuePair>
+         <nameValuePair>
+            <name>OutputStyle</name>
+            <value>
+               <integer>0</integer>
+            </value>
+         </nameValuePair>
+         <nameValuePair>
+            <name>OutputTypes</name>
+            <value>
+               <array>
+                  <string>Four</string>
+                  <string>output</string>
+                  <string>type</string>
+                  <string>values</string>
+               </array>
+            </value>
+         </nameValuePair>
+      </configurationParameterSettings>
+
+      <typeSystemDescription>
+         <types/>
+      </typeSystemDescription>
+
+      <fsIndexes>
+      </fsIndexes>
+
+      <capabilities>
+         <capability>
+            <inputs/>
+
+            <outputs/>
+
+            <languagesSupported>
+               <language>x-unspecified</language>
+            </languagesSupported>
+         </capability>
+      </capabilities>
+
+   </analysisEngineMetaData>
+</taeDescription>
+
diff --git a/src/test/data/descriptors/javaaggregate.xml b/src/test/data/descriptors/javaaggregate.xml
index 4bc6f20..08ed361 100644
--- a/src/test/data/descriptors/javaaggregate.xml
+++ b/src/test/data/descriptors/javaaggregate.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  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.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- -->

-

-<taeDescription xmlns="http://uima.apache.org/resourceSpecifier">

-  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>

-  <primitive>false</primitive>

-  <delegateAnalysisEngineSpecifiers>

-    <delegateAnalysisEngine key="Segmenter">

-      <import location="SimpleTextSegmenter.xml"/>

-    </delegateAnalysisEngine>

-    <delegateAnalysisEngine key="Consumer">

-      <import location="TextSegmentConsumer.xml"/>

-    </delegateAnalysisEngine>

-  </delegateAnalysisEngineSpecifiers>

-	

-  <analysisEngineMetaData>

-    <name>Example Aggregate TAE including a Segmenter</name>

-    <description>For testing only</description>

-    <configurationParameters/>

-    <configurationParameterSettings/>

-    <flowConstraints>

-      <fixedFlow>

-        <node>Segmenter</node>

-        <node>Consumer</node>

-      </fixedFlow>

-    </flowConstraints>

-    <capabilities>

-      <capability>

-        <inputs/>

-        <outputs/>

-      </capability>

-    </capabilities>

-	<operationalProperties>

-		<modifiesCas>true</modifiesCas>

-		<multipleDeploymentAllowed>true</multipleDeploymentAllowed>

-		<outputsNewCASes>true</outputsNewCASes>

-	</operationalProperties>

-  </analysisEngineMetaData>

-</taeDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+<taeDescription xmlns="http://uima.apache.org/resourceSpecifier">
+  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
+  <primitive>false</primitive>
+  <delegateAnalysisEngineSpecifiers>
+    <delegateAnalysisEngine key="Segmenter">
+      <import location="SimpleTextSegmenter.xml"/>
+    </delegateAnalysisEngine>
+    <delegateAnalysisEngine key="Consumer">
+      <import location="TextSegmentConsumer.xml"/>
+    </delegateAnalysisEngine>
+  </delegateAnalysisEngineSpecifiers>
+	
+  <analysisEngineMetaData>
+    <name>Example Aggregate TAE including a Segmenter</name>
+    <description>For testing only</description>
+    <configurationParameters/>
+    <configurationParameterSettings/>
+    <flowConstraints>
+      <fixedFlow>
+        <node>Segmenter</node>
+        <node>Consumer</node>
+      </fixedFlow>
+    </flowConstraints>
+    <capabilities>
+      <capability>
+        <inputs/>
+        <outputs/>
+      </capability>
+    </capabilities>
+	<operationalProperties>
+		<modifiesCas>true</modifiesCas>
+		<multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+		<outputsNewCASes>true</outputsNewCASes>
+	</operationalProperties>
+  </analysisEngineMetaData>
+</taeDescription>
diff --git a/src/test/data/descriptors/stopword.xml b/src/test/data/descriptors/stopword.xml
index eca2bfd..3e9d7cf 100644
--- a/src/test/data/descriptors/stopword.xml
+++ b/src/test/data/descriptors/stopword.xml
@@ -1,121 +1,121 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<taeDescription

-   xmlns="http://uima.apache.org/resourceSpecifier" >

-   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-<primitive>true</primitive>

-   <annotatorImplementationName>libstw</annotatorImplementationName>

-

-   <analysisEngineMetaData>

-      <name>StopwordList</name>

-      <description>This annotates tokens as stopwords by list lookup.</description>

-      <version>1.0</version>

-      <vendor>IBM Corporation</vendor>

-

-      <configurationParameters>

-         <configurationParameter>

-            <name>MinTokenLength</name>

-            <description>All tokens with less length are considered stopwords</description>

-            <type>Integer</type>

-            <multiValued>false</multiValued>

-            <mandatory>false</mandatory>

-                     </configurationParameter>

-         <configurationParameter>

-            <name>MinUpperCaseTokenLength</name>

-            <description>All uppercase tokens with less length are considered stopwords</description>

-            <type>Integer</type>

-            <multiValued>false</multiValued>

-            <mandatory>false</mandatory>

-                     </configurationParameter>

-         <configurationParameter>

-            <name>UseAlternateTerritories</name>

-            <description>If true, stopword resources for altarenate territories are loaded</description>

-            <type>Boolean</type>

-            <multiValued>false</multiValued>

-            <mandatory>false</mandatory>

-                     </configurationParameter>

-         <configurationParameter>

-            <name>FeatureName</name>

-            <description>Fully qualified name of the feature to be set if a token is a stopword. Feature must have int range.</description>

-            <type>String</type>

-            <multiValued>false</multiValued>

-            <mandatory>false</mandatory>

-                     </configurationParameter>

-      </configurationParameters>

-

-      <configurationParameterSettings>

-      </configurationParameterSettings>

-

-      <typeSystemDescription>

-         <imports>

-             <import location="tt_typesystem.xml"/>

-         </imports>

-      </typeSystemDescription>

-

-      <fsIndexes>

-      </fsIndexes>

-

-      <capabilities>

-         <capability>

-            <inputs>

-               <type>uima.tt.TokenAnnotation</type>

-            </inputs>

-

-            <outputs>

-               <feature>uima.tt.TokenAnnotation:stopwordToken</feature>

-            </outputs>

-

-            <languagesSupported>

-               <!--<language>x-unspecified</language> -->

-               <language>ar</language>

-               <language>ca</language>

-               <language>da</language>

-               <language>de</language>

-               <language>de-CH</language>

-               <language>el</language>

-               <language>en-US</language>

-               <language>en-GB</language>

-               <language>es</language>

-               <language>fi</language>

-               <language>fr</language>

-               <language>fr-CA</language>

-               <language>he</language>

-               <language>is</language>

-               <language>it</language>

-               <language>nb</language>

-               <language>nl</language>

-               <language>no</language>

-               <language>pt-BR</language>

-               <language>pt</language>

-               <language>ru</language>

-               <language>sv</language>

-               <language>zh-CN</language>

-               <language>zh-TW</language>

-            </languagesSupported>

-         </capability>

-      </capabilities>

-

-   </analysisEngineMetaData>

-</taeDescription>

-

+<?xml version="1.0" encoding="UTF-8" ?>
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<taeDescription
+   xmlns="http://uima.apache.org/resourceSpecifier" >
+   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+<primitive>true</primitive>
+   <annotatorImplementationName>libstw</annotatorImplementationName>
+
+   <analysisEngineMetaData>
+      <name>StopwordList</name>
+      <description>This annotates tokens as stopwords by list lookup.</description>
+      <version>1.0</version>
+      <vendor>IBM Corporation</vendor>
+
+      <configurationParameters>
+         <configurationParameter>
+            <name>MinTokenLength</name>
+            <description>All tokens with less length are considered stopwords</description>
+            <type>Integer</type>
+            <multiValued>false</multiValued>
+            <mandatory>false</mandatory>
+                     </configurationParameter>
+         <configurationParameter>
+            <name>MinUpperCaseTokenLength</name>
+            <description>All uppercase tokens with less length are considered stopwords</description>
+            <type>Integer</type>
+            <multiValued>false</multiValued>
+            <mandatory>false</mandatory>
+                     </configurationParameter>
+         <configurationParameter>
+            <name>UseAlternateTerritories</name>
+            <description>If true, stopword resources for altarenate territories are loaded</description>
+            <type>Boolean</type>
+            <multiValued>false</multiValued>
+            <mandatory>false</mandatory>
+                     </configurationParameter>
+         <configurationParameter>
+            <name>FeatureName</name>
+            <description>Fully qualified name of the feature to be set if a token is a stopword. Feature must have int range.</description>
+            <type>String</type>
+            <multiValued>false</multiValued>
+            <mandatory>false</mandatory>
+                     </configurationParameter>
+      </configurationParameters>
+
+      <configurationParameterSettings>
+      </configurationParameterSettings>
+
+      <typeSystemDescription>
+         <imports>
+             <import location="tt_typesystem.xml"/>
+         </imports>
+      </typeSystemDescription>
+
+      <fsIndexes>
+      </fsIndexes>
+
+      <capabilities>
+         <capability>
+            <inputs>
+               <type>uima.tt.TokenAnnotation</type>
+            </inputs>
+
+            <outputs>
+               <feature>uima.tt.TokenAnnotation:stopwordToken</feature>
+            </outputs>
+
+            <languagesSupported>
+               <!--<language>x-unspecified</language> -->
+               <language>ar</language>
+               <language>ca</language>
+               <language>da</language>
+               <language>de</language>
+               <language>de-CH</language>
+               <language>el</language>
+               <language>en-US</language>
+               <language>en-GB</language>
+               <language>es</language>
+               <language>fi</language>
+               <language>fr</language>
+               <language>fr-CA</language>
+               <language>he</language>
+               <language>is</language>
+               <language>it</language>
+               <language>nb</language>
+               <language>nl</language>
+               <language>no</language>
+               <language>pt-BR</language>
+               <language>pt</language>
+               <language>ru</language>
+               <language>sv</language>
+               <language>zh-CN</language>
+               <language>zh-TW</language>
+            </languagesSupported>
+         </capability>
+      </capabilities>
+
+   </analysisEngineMetaData>
+</taeDescription>
+
diff --git a/src/test/data/descriptors/stopwordtest.xml b/src/test/data/descriptors/stopwordtest.xml
index c41e757..466e611 100644
--- a/src/test/data/descriptors/stopwordtest.xml
+++ b/src/test/data/descriptors/stopwordtest.xml
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<taeDescription

-   xmlns="http://uima.apache.org/resourceSpecifier"

-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-   xsi:schemaLocation="http://uima.apache.org/resourceSpecifier http://uima.apache.org/resourceSpecifierSchema.xsd"

-   >

-   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-<primitive>false</primitive>

-   <delegateAnalysisEngineSpecifiers>

-      <delegateAnalysisEngine key="tok">

-         <import location="tok.xml" />

-      </delegateAnalysisEngine>

-      <delegateAnalysisEngine key="stw">

-         <import location="stopword.xml" />

-      </delegateAnalysisEngine>

-      <delegateAnalysisEngine key="dump">

-         <import location="dump.xml" />

-      </delegateAnalysisEngine>

-   </delegateAnalysisEngineSpecifiers>

-

-   <analysisEngineMetaData>

-      <name>TokTestApp</name>

-      <description></description>

-      <version>1.0</version>

-      <vendor>IBM Corporation</vendor>

-

-      <configurationParameters>

-         <configurationParameter>

-            <name>OutputFile</name>

-            <description>The name of the file that will contain the dumped TCAS</description>

-            <type>String</type>

-            <multiValued>false</multiValued>

-            <mandatory>true</mandatory>

-                     </configurationParameter>

-

-      </configurationParameters>

-

-      <configurationParameterSettings>

-         <nameValuePair>

-            <name>OutputFile</name>

-            <value>

-               <string><envVarRef>TEMP</envVarRef>/stopwordtest.xml</string>

-            </value>

-         </nameValuePair>

-      </configurationParameterSettings>

-

-      <flowConstraints>

-         <fixedFlow>

-            <node>tok</node>

-            <node>stw</node>

-            <node>dump</node>

-         </fixedFlow>

-      </flowConstraints>

-

-      <fsIndexes>

-      </fsIndexes>

-

-      <capabilities>

-         <capability>

-            <inputs/>

-

-            <outputs>

-               <type>uima.tt.TokenAnnotation</type>

-               <feature>uima.tt.TokenAnnotation:stopwordToken</feature>

-            </outputs>

-

-            <languagesSupported>

-               <language>x-unspecified</language>

-            </languagesSupported>

-         </capability>

-      </capabilities>

-

-   </analysisEngineMetaData>

-</taeDescription>

-

-

+<?xml version="1.0" encoding="UTF-8" ?>
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<taeDescription
+   xmlns="http://uima.apache.org/resourceSpecifier"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://uima.apache.org/resourceSpecifier http://uima.apache.org/resourceSpecifierSchema.xsd"
+   >
+   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+<primitive>false</primitive>
+   <delegateAnalysisEngineSpecifiers>
+      <delegateAnalysisEngine key="tok">
+         <import location="tok.xml" />
+      </delegateAnalysisEngine>
+      <delegateAnalysisEngine key="stw">
+         <import location="stopword.xml" />
+      </delegateAnalysisEngine>
+      <delegateAnalysisEngine key="dump">
+         <import location="dump.xml" />
+      </delegateAnalysisEngine>
+   </delegateAnalysisEngineSpecifiers>
+
+   <analysisEngineMetaData>
+      <name>TokTestApp</name>
+      <description></description>
+      <version>1.0</version>
+      <vendor>IBM Corporation</vendor>
+
+      <configurationParameters>
+         <configurationParameter>
+            <name>OutputFile</name>
+            <description>The name of the file that will contain the dumped TCAS</description>
+            <type>String</type>
+            <multiValued>false</multiValued>
+            <mandatory>true</mandatory>
+                     </configurationParameter>
+
+      </configurationParameters>
+
+      <configurationParameterSettings>
+         <nameValuePair>
+            <name>OutputFile</name>
+            <value>
+               <string><envVarRef>TEMP</envVarRef>/stopwordtest.xml</string>
+            </value>
+         </nameValuePair>
+      </configurationParameterSettings>
+
+      <flowConstraints>
+         <fixedFlow>
+            <node>tok</node>
+            <node>stw</node>
+            <node>dump</node>
+         </fixedFlow>
+      </flowConstraints>
+
+      <fsIndexes>
+      </fsIndexes>
+
+      <capabilities>
+         <capability>
+            <inputs/>
+
+            <outputs>
+               <type>uima.tt.TokenAnnotation</type>
+               <feature>uima.tt.TokenAnnotation:stopwordToken</feature>
+            </outputs>
+
+            <languagesSupported>
+               <language>x-unspecified</language>
+            </languagesSupported>
+         </capability>
+      </capabilities>
+
+   </analysisEngineMetaData>
+</taeDescription>
+
+
diff --git a/src/test/data/descriptors/testspec_enus.xml b/src/test/data/descriptors/testspec_enus.xml
index 43070d0..7d14df0 100644
--- a/src/test/data/descriptors/testspec_enus.xml
+++ b/src/test/data/descriptors/testspec_enus.xml
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<taeDescription

-   xmlns="http://uima.apache.org/resourceSpecifier" 

-   >

-   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-<primitive>true</primitive>

-   <annotatorImplementationName>libtest</annotatorImplementationName>

-

-   <analysisEngineMetaData>

-      <name>TestAnnotator1</name>

-      <description>Test annotator for dump annotator</description>

-      <version>1.0</version>

-      <vendor>IBM Corporation</vendor>

-

-      <configurationParameters>

-      </configurationParameters>

-

-      <configurationParameterSettings>

-      </configurationParameterSettings>

-

-      <typeSystemDescription>

-         <types>

-             <import location="tt_typesystem.xml"/>

-            <typeDescription>

-               <name>TestDump</name>

-               <description>Created for test reasons</description>

-               <supertypeName>uima.cas.TOP</supertypeName>

-            </typeDescription>

-         </types>

-      </typeSystemDescription>

-

-      <fsIndexes>

-      </fsIndexes>

-

-      <capabilities>

-         <capability>

-            <inputs/>

-

-            <outputs>

-               <type>TestDump</type>

-            </outputs>

-

-            <languagesSupported>

-               <language>en-us</language>

-            </languagesSupported>

-         </capability>

-      </capabilities>

-

-   </analysisEngineMetaData>

-</taeDescription>

-

+<?xml version="1.0" encoding="UTF-8" ?>
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<taeDescription
+   xmlns="http://uima.apache.org/resourceSpecifier" 
+   >
+   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+<primitive>true</primitive>
+   <annotatorImplementationName>libtest</annotatorImplementationName>
+
+   <analysisEngineMetaData>
+      <name>TestAnnotator1</name>
+      <description>Test annotator for dump annotator</description>
+      <version>1.0</version>
+      <vendor>IBM Corporation</vendor>
+
+      <configurationParameters>
+      </configurationParameters>
+
+      <configurationParameterSettings>
+      </configurationParameterSettings>
+
+      <typeSystemDescription>
+         <types>
+             <import location="tt_typesystem.xml"/>
+            <typeDescription>
+               <name>TestDump</name>
+               <description>Created for test reasons</description>
+               <supertypeName>uima.cas.TOP</supertypeName>
+            </typeDescription>
+         </types>
+      </typeSystemDescription>
+
+      <fsIndexes>
+      </fsIndexes>
+
+      <capabilities>
+         <capability>
+            <inputs/>
+
+            <outputs>
+               <type>TestDump</type>
+            </outputs>
+
+            <languagesSupported>
+               <language>en-us</language>
+            </languagesSupported>
+         </capability>
+      </capabilities>
+
+   </analysisEngineMetaData>
+</taeDescription>
+
diff --git a/src/test/data/descriptors/testspec_nolangs.xml b/src/test/data/descriptors/testspec_nolangs.xml
index 2c3a4be..d2b5514 100644
--- a/src/test/data/descriptors/testspec_nolangs.xml
+++ b/src/test/data/descriptors/testspec_nolangs.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<taeDescription

-   xmlns="http://uima.apache.org/resourceSpecifier"

-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-   xsi:schemaLocation="http://uima.apache.org/resourceSpecifier http://uima.apache.org/resourceSpecifierSchema.xsd"

-   >

-   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-   <primitive>true</primitive>

-   <annotatorImplementationName>libtest</annotatorImplementationName>

-

-   <analysisEngineMetaData>

-      <name>TestAnnotator</name>

-      <description>Test annotator for dump annotator</description>

-      <version>1.0</version>

-      <vendor>IBM Corporation</vendor>

-

-      <configurationParameters>

-      </configurationParameters>

-

-      <configurationParameterSettings>

-      </configurationParameterSettings>

-

-      <typeSystemDescription>

-         <types>

-            <typeDescription>

-               <name>TestDump</name>

-               <description>Created for test reasons</description>

-               <supertypeName>TOP</supertypeName>

-            </typeDescription>

-         </types>

-      </typeSystemDescription>

-

-      <fsIndexes>

-      </fsIndexes>

-

-      <capabilities>

-         <capability>

-            <inputs/>

-

-            <outputs>

-               <type>TestDump</type>

-            </outputs>

-

-            <languagesSupported/>

-         </capability>

-      </capabilities>

-

-   </analysisEngineMetaData>

-</taeDescription>

-

+<?xml version="1.0" encoding="UTF-8" ?>
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<taeDescription
+   xmlns="http://uima.apache.org/resourceSpecifier"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://uima.apache.org/resourceSpecifier http://uima.apache.org/resourceSpecifierSchema.xsd"
+   >
+   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+   <primitive>true</primitive>
+   <annotatorImplementationName>libtest</annotatorImplementationName>
+
+   <analysisEngineMetaData>
+      <name>TestAnnotator</name>
+      <description>Test annotator for dump annotator</description>
+      <version>1.0</version>
+      <vendor>IBM Corporation</vendor>
+
+      <configurationParameters>
+      </configurationParameters>
+
+      <configurationParameterSettings>
+      </configurationParameterSettings>
+
+      <typeSystemDescription>
+         <types>
+            <typeDescription>
+               <name>TestDump</name>
+               <description>Created for test reasons</description>
+               <supertypeName>TOP</supertypeName>
+            </typeDescription>
+         </types>
+      </typeSystemDescription>
+
+      <fsIndexes>
+      </fsIndexes>
+
+      <capabilities>
+         <capability>
+            <inputs/>
+
+            <outputs>
+               <type>TestDump</type>
+            </outputs>
+
+            <languagesSupported/>
+         </capability>
+      </capabilities>
+
+   </analysisEngineMetaData>
+</taeDescription>
+
diff --git a/src/test/data/descriptors/testspec_several.xml b/src/test/data/descriptors/testspec_several.xml
index de27a82..b7bb83a 100644
--- a/src/test/data/descriptors/testspec_several.xml
+++ b/src/test/data/descriptors/testspec_several.xml
@@ -1,93 +1,93 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<taeDescription

-   xmlns="http://uima.apache.org/resourceSpecifier"

-   >

-   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-<primitive>true</primitive>

-   <annotatorImplementationName>libtest</annotatorImplementationName>

-

-   <analysisEngineMetaData>

-      <name>TestAnnotator</name>

-      <description>Test annotator for dump annotator</description>

-      <version>1.0</version>

-      <vendor>IBM Corporation</vendor>

-

-      <configurationParameters>

-         <configurationParameter>

-            <name>ProcessUnspecifiedTerritories</name>

-            <description></description>

-            <type>Boolean</type>

-            <multiValued>false</multiValued>

-            <mandatory>false</mandatory>

-                     </configurationParameter>

-      </configurationParameters>

-

-      <configurationParameterSettings>

-         <nameValuePair>

-            <name>ProcessUnspecifiedTerritories</name>

-            <value>

-               <boolean>true</boolean>

-            </value>

-         </nameValuePair>

-

-      </configurationParameterSettings>

-

-      <typeSystemDescription>

-         <imports>

-             <import location="tt_typesystem.xml"/>

-         </imports>

-	   <types>

-            <typeDescription>

-               <name>TestDump</name>

-               <description>Created for test reasons</description>

-               <supertypeName>uima.cas.TOP</supertypeName>

-            </typeDescription>

-         </types>

-      </typeSystemDescription>

-

-      <fsIndexes>

-      </fsIndexes>

-

-      <capabilities>

-         <capability>

-            <inputs/>

-

-            <outputs>

-               <type>TestDump</type>

-            </outputs>

-

-            <languagesSupported>

-               <language>en-us</language>

-               <language>ar</language>

-               <language>de</language>

-               <language>en-ca</language>

-               <language>it-it</language>

-            </languagesSupported>

-         </capability>

-      </capabilities>

-

-   </analysisEngineMetaData>

-</taeDescription>

-

+<?xml version="1.0" encoding="UTF-8" ?>
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<taeDescription
+   xmlns="http://uima.apache.org/resourceSpecifier"
+   >
+   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+<primitive>true</primitive>
+   <annotatorImplementationName>libtest</annotatorImplementationName>
+
+   <analysisEngineMetaData>
+      <name>TestAnnotator</name>
+      <description>Test annotator for dump annotator</description>
+      <version>1.0</version>
+      <vendor>IBM Corporation</vendor>
+
+      <configurationParameters>
+         <configurationParameter>
+            <name>ProcessUnspecifiedTerritories</name>
+            <description></description>
+            <type>Boolean</type>
+            <multiValued>false</multiValued>
+            <mandatory>false</mandatory>
+                     </configurationParameter>
+      </configurationParameters>
+
+      <configurationParameterSettings>
+         <nameValuePair>
+            <name>ProcessUnspecifiedTerritories</name>
+            <value>
+               <boolean>true</boolean>
+            </value>
+         </nameValuePair>
+
+      </configurationParameterSettings>
+
+      <typeSystemDescription>
+         <imports>
+             <import location="tt_typesystem.xml"/>
+         </imports>
+	   <types>
+            <typeDescription>
+               <name>TestDump</name>
+               <description>Created for test reasons</description>
+               <supertypeName>uima.cas.TOP</supertypeName>
+            </typeDescription>
+         </types>
+      </typeSystemDescription>
+
+      <fsIndexes>
+      </fsIndexes>
+
+      <capabilities>
+         <capability>
+            <inputs/>
+
+            <outputs>
+               <type>TestDump</type>
+            </outputs>
+
+            <languagesSupported>
+               <language>en-us</language>
+               <language>ar</language>
+               <language>de</language>
+               <language>en-ca</language>
+               <language>it-it</language>
+            </languagesSupported>
+         </capability>
+      </capabilities>
+
+   </analysisEngineMetaData>
+</taeDescription>
+
diff --git a/src/test/data/descriptors/tok.xml b/src/test/data/descriptors/tok.xml
index 8be5a8b..2f0d130 100644
--- a/src/test/data/descriptors/tok.xml
+++ b/src/test/data/descriptors/tok.xml
@@ -1,181 +1,181 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<taeDescription

-   xmlns="http://uima.apache.org/resourceSpecifier"

-    xmlns:xi="http://www.w3.org/2001/XInclude"

->

-    <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-    <primitive>true</primitive>

-    <annotatorImplementationName>libtoknz</annotatorImplementationName>

-

-    <analysisEngineMetaData>

-        <name>UnicodeTokenizer</name>

-        <description>This annotator extracts tokens from text based on their Unicdoe character properties and simple rules.</description>

-        <version>1.0</version>

-        <vendor>IBM Corporation</vendor>

-

-        <configurationParameters defaultGroup="x-unspecified">

-            <configurationGroup names="x-unspecified">

-                <configurationParameter>

-                    <name>TokenNumbersIncludeStopwords</name>

-                    <description>If true token numbers are counted including stopwords</description>

-                    <type>Boolean</type>

-                    <multiValued>false</multiValued>

-                    <mandatory>true</mandatory>

-                </configurationParameter>

-

-                <configurationParameter>

-                    <name>UseRelativeTokenAndSentenceNumbers</name>

-                    <description>If true token and sentence numbers are reset to 1 for each new sentence/paragraph</description>

-                    <type>Boolean</type>

-                    <multiValued>false</multiValued>

-                    <mandatory>true</mandatory>

-                </configurationParameter>

-

-                <configurationParameter>

-                    <name>IgnorePunctuationTokens</name>

-                    <description>If true, punctuation tokens are ignored</description>

-                    <type>Boolean</type>

-                    <multiValued>false</multiValued>

-                    <mandatory>true</mandatory>

-                </configurationParameter>

-

-            </configurationGroup>

-        </configurationParameters>

-

-        <configurationParameterSettings>

-            <settingsForGroup name="x-unspecified">

-                <nameValuePair>

-                    <name>TokenNumbersIncludeStopwords</name>

-                    <value>

-                        <boolean>true</boolean>

-                    </value>

-                </nameValuePair>

-

-                <nameValuePair>

-                    <name>UseRelativeTokenAndSentenceNumbers</name>

-                    <value>

-                        <boolean>false</boolean>

-                    </value>

-                </nameValuePair>

-

-                <nameValuePair>

-                    <name>IgnorePunctuationTokens</name>

-                    <value>

-                        <boolean>false</boolean>

-                    </value>

-                </nameValuePair>

-

-            </settingsForGroup>

-        </configurationParameterSettings>

-

-        <typeSystemDescription>

-            <imports>

-                <import location="tt_typesystem.xml"/>

-            </imports>

- 		<types>

-                    <typeDescription>

-                        <name>uima.tt.TokenAnnotation</name>

-                        <description></description>

-                        <supertypeName>uima.tt.LexicalAnnotation</supertypeName>

-                        <features>

-                            <featureDescription>

-                                <name>stem</name>

-                                <description></description>

-                                <rangeTypeName>uima.cas.String</rangeTypeName>

-                            </featureDescription>

-                        </features>

-                    </typeDescription>

-                </types>

-        </typeSystemDescription>

-

-        <fsIndexes>

-        </fsIndexes>

-

-        <capabilities>

-            <capability>

-                <inputs>

-                </inputs>

-

-                <outputs>

-                    <type>uima.tt.TokenAnnotation</type>

-                    <type>uima.tt.SentenceAnnotation</type>

-                    <type>uima.tt.ParagraphAnnotation</type>

-                </outputs>

-

-                <languagesSupported>

-                    <language>af</language>

-                    <language>be</language>

-                    <language>bg</language>

-                    <language>ca</language>

-                    <language>cs</language>

-                    <language>da</language>

-                    <language>de</language>

-                    <language>en</language>

-                    <language>el</language>

-                    <language>es</language>

-                    <language>et</language>

-                    <language>fi</language>

-                    <language>fr</language>

-                    <language>hr</language>

-                    <language>hi</language>

-                    <language>hu</language>

-                    <language>is</language>

-                    <language>it</language>

-                    <language>lt</language>

-                    <language>lv</language>

-                    <language>mk</language>

-                    <language>nl</language>

-                    <language>nb</language>

-                    <language>no</language>

-                    <language>pl</language>

-                    <language>pt</language>

-                    <language>ro</language>

-                    <language>ru</language>

-                    <language>sh</language>

-                    <language>sk</language>

-                    <language>sl</language>

-                    <language>sr</language>

-                    <language>sq</language>

-                    <language>sv</language>

-                    <language>tr</language>

-                    <language>uk</language>

-                    <language>vi</language>

-                </languagesSupported>

-            </capability>

-            <capability>

-                <inputs>

-                </inputs>

-                <outputs>

-                    <feature>uima.tt.TokenAnnotation:stem</feature>

-                </outputs>

-                <languagesSupported>

-                    <language>en</language>

-                </languagesSupported>

-            </capability>

-        </capabilities>

-

-    </analysisEngineMetaData>

-</taeDescription>

-

+<?xml version="1.0" encoding="UTF-8" ?>
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<taeDescription
+   xmlns="http://uima.apache.org/resourceSpecifier"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+>
+    <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+    <primitive>true</primitive>
+    <annotatorImplementationName>libtoknz</annotatorImplementationName>
+
+    <analysisEngineMetaData>
+        <name>UnicodeTokenizer</name>
+        <description>This annotator extracts tokens from text based on their Unicdoe character properties and simple rules.</description>
+        <version>1.0</version>
+        <vendor>IBM Corporation</vendor>
+
+        <configurationParameters defaultGroup="x-unspecified">
+            <configurationGroup names="x-unspecified">
+                <configurationParameter>
+                    <name>TokenNumbersIncludeStopwords</name>
+                    <description>If true token numbers are counted including stopwords</description>
+                    <type>Boolean</type>
+                    <multiValued>false</multiValued>
+                    <mandatory>true</mandatory>
+                </configurationParameter>
+
+                <configurationParameter>
+                    <name>UseRelativeTokenAndSentenceNumbers</name>
+                    <description>If true token and sentence numbers are reset to 1 for each new sentence/paragraph</description>
+                    <type>Boolean</type>
+                    <multiValued>false</multiValued>
+                    <mandatory>true</mandatory>
+                </configurationParameter>
+
+                <configurationParameter>
+                    <name>IgnorePunctuationTokens</name>
+                    <description>If true, punctuation tokens are ignored</description>
+                    <type>Boolean</type>
+                    <multiValued>false</multiValued>
+                    <mandatory>true</mandatory>
+                </configurationParameter>
+
+            </configurationGroup>
+        </configurationParameters>
+
+        <configurationParameterSettings>
+            <settingsForGroup name="x-unspecified">
+                <nameValuePair>
+                    <name>TokenNumbersIncludeStopwords</name>
+                    <value>
+                        <boolean>true</boolean>
+                    </value>
+                </nameValuePair>
+
+                <nameValuePair>
+                    <name>UseRelativeTokenAndSentenceNumbers</name>
+                    <value>
+                        <boolean>false</boolean>
+                    </value>
+                </nameValuePair>
+
+                <nameValuePair>
+                    <name>IgnorePunctuationTokens</name>
+                    <value>
+                        <boolean>false</boolean>
+                    </value>
+                </nameValuePair>
+
+            </settingsForGroup>
+        </configurationParameterSettings>
+
+        <typeSystemDescription>
+            <imports>
+                <import location="tt_typesystem.xml"/>
+            </imports>
+ 		<types>
+                    <typeDescription>
+                        <name>uima.tt.TokenAnnotation</name>
+                        <description></description>
+                        <supertypeName>uima.tt.LexicalAnnotation</supertypeName>
+                        <features>
+                            <featureDescription>
+                                <name>stem</name>
+                                <description></description>
+                                <rangeTypeName>uima.cas.String</rangeTypeName>
+                            </featureDescription>
+                        </features>
+                    </typeDescription>
+                </types>
+        </typeSystemDescription>
+
+        <fsIndexes>
+        </fsIndexes>
+
+        <capabilities>
+            <capability>
+                <inputs>
+                </inputs>
+
+                <outputs>
+                    <type>uima.tt.TokenAnnotation</type>
+                    <type>uima.tt.SentenceAnnotation</type>
+                    <type>uima.tt.ParagraphAnnotation</type>
+                </outputs>
+
+                <languagesSupported>
+                    <language>af</language>
+                    <language>be</language>
+                    <language>bg</language>
+                    <language>ca</language>
+                    <language>cs</language>
+                    <language>da</language>
+                    <language>de</language>
+                    <language>en</language>
+                    <language>el</language>
+                    <language>es</language>
+                    <language>et</language>
+                    <language>fi</language>
+                    <language>fr</language>
+                    <language>hr</language>
+                    <language>hi</language>
+                    <language>hu</language>
+                    <language>is</language>
+                    <language>it</language>
+                    <language>lt</language>
+                    <language>lv</language>
+                    <language>mk</language>
+                    <language>nl</language>
+                    <language>nb</language>
+                    <language>no</language>
+                    <language>pl</language>
+                    <language>pt</language>
+                    <language>ro</language>
+                    <language>ru</language>
+                    <language>sh</language>
+                    <language>sk</language>
+                    <language>sl</language>
+                    <language>sr</language>
+                    <language>sq</language>
+                    <language>sv</language>
+                    <language>tr</language>
+                    <language>uk</language>
+                    <language>vi</language>
+                </languagesSupported>
+            </capability>
+            <capability>
+                <inputs>
+                </inputs>
+                <outputs>
+                    <feature>uima.tt.TokenAnnotation:stem</feature>
+                </outputs>
+                <languagesSupported>
+                    <language>en</language>
+                </languagesSupported>
+            </capability>
+        </capabilities>
+
+    </analysisEngineMetaData>
+</taeDescription>
+
diff --git a/src/test/data/descriptors/toktest.xml b/src/test/data/descriptors/toktest.xml
index 34a4631..597235d 100644
--- a/src/test/data/descriptors/toktest.xml
+++ b/src/test/data/descriptors/toktest.xml
@@ -1,97 +1,97 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<taeDescription

-   xmlns="http://uima.apache.org/resourceSpecifier"

-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-   xsi:schemaLocation="http://uima.apache.org/resourceSpecifier http://uima.apache.org/resourceSpecifierSchema.xsd"

-   >

-   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>

-<primitive>false</primitive>

-   <delegateAnalysisEngineSpecifiers>

-      <delegateAnalysisEngine key="tok">

-         <import location="tok.xml" />

-      </delegateAnalysisEngine>

-      <delegateAnalysisEngine key="dump">

-         <import location="dump.xml" />

-      </delegateAnalysisEngine>

-   </delegateAnalysisEngineSpecifiers>

-

-   <analysisEngineMetaData>

-      <name>TokTestApp</name>

-      <description></description>

-      <version>1.0</version>

-      <vendor>IBM Corporation</vendor>

-

-      <configurationParameters>

-         <configurationParameter>

-            <name>OutputFile</name>

-            <description>The name of the file that will contain the dumped TCAS</description>

-            <type>String</type>

-            <multiValued>false</multiValued>

-            <mandatory>true</mandatory>

-                     </configurationParameter>

-

-      </configurationParameters>

-

-      <configurationParameterSettings>

-         <nameValuePair>

-            <name>OutputFile</name>

-            <value>

-               <string><envVarRef>TEMP</envVarRef>/toktest.xml</string>

-            </value>

-         </nameValuePair>

-      </configurationParameterSettings>

-

-      <flowConstraints>

-         <fixedFlow>

-            <node>tok</node>

-            <node>dump</node>

-         </fixedFlow>

-      </flowConstraints>

-

-      <fsIndexes>

-      </fsIndexes>

-

-      <capabilities>

-         <capability>

-            <inputs/>

-

-            <outputs>

-               <type>uima.tt.TokenAnnotation</type>

-               <type>uima.tt.SentenceAnnotation</type>

-               <type>uima.tt.ParagraphAnnotation</type>

-            </outputs>

-

-            <languagesSupported>

-               <language>x-unspecified</language>

-            </languagesSupported>

-         </capability>

-      </capabilities>

-

-   </analysisEngineMetaData>

-</taeDescription>

-

-

-

-

+<?xml version="1.0" encoding="UTF-8" ?>
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<taeDescription
+   xmlns="http://uima.apache.org/resourceSpecifier"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://uima.apache.org/resourceSpecifier http://uima.apache.org/resourceSpecifierSchema.xsd"
+   >
+   <frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+<primitive>false</primitive>
+   <delegateAnalysisEngineSpecifiers>
+      <delegateAnalysisEngine key="tok">
+         <import location="tok.xml" />
+      </delegateAnalysisEngine>
+      <delegateAnalysisEngine key="dump">
+         <import location="dump.xml" />
+      </delegateAnalysisEngine>
+   </delegateAnalysisEngineSpecifiers>
+
+   <analysisEngineMetaData>
+      <name>TokTestApp</name>
+      <description></description>
+      <version>1.0</version>
+      <vendor>IBM Corporation</vendor>
+
+      <configurationParameters>
+         <configurationParameter>
+            <name>OutputFile</name>
+            <description>The name of the file that will contain the dumped TCAS</description>
+            <type>String</type>
+            <multiValued>false</multiValued>
+            <mandatory>true</mandatory>
+                     </configurationParameter>
+
+      </configurationParameters>
+
+      <configurationParameterSettings>
+         <nameValuePair>
+            <name>OutputFile</name>
+            <value>
+               <string><envVarRef>TEMP</envVarRef>/toktest.xml</string>
+            </value>
+         </nameValuePair>
+      </configurationParameterSettings>
+
+      <flowConstraints>
+         <fixedFlow>
+            <node>tok</node>
+            <node>dump</node>
+         </fixedFlow>
+      </flowConstraints>
+
+      <fsIndexes>
+      </fsIndexes>
+
+      <capabilities>
+         <capability>
+            <inputs/>
+
+            <outputs>
+               <type>uima.tt.TokenAnnotation</type>
+               <type>uima.tt.SentenceAnnotation</type>
+               <type>uima.tt.ParagraphAnnotation</type>
+            </outputs>
+
+            <languagesSupported>
+               <language>x-unspecified</language>
+            </languagesSupported>
+         </capability>
+      </capabilities>
+
+   </analysisEngineMetaData>
+</taeDescription>
+
+
+
+
diff --git a/src/test/data/descriptors/tt_core_typesystem.xml b/src/test/data/descriptors/tt_core_typesystem.xml
index c4e6d90..56eea34 100644
--- a/src/test/data/descriptors/tt_core_typesystem.xml
+++ b/src/test/data/descriptors/tt_core_typesystem.xml
@@ -1,225 +1,225 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<typeSystemDescription>

-    <types>

-       <typeDescription>

-            <name>uima.tcas.DocumentAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tcas.Annotation</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>categories</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>languageCandidates</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>id</name>

-                    <description>Document id, such as a URL</description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-       <typeDescription>

-           <name>uima.tt.TTAnnotation</name>

-           <description></description>

-           <supertypeName>uima.tcas.Annotation</supertypeName>

-       </typeDescription>

-       <typeDescription>

-           <name>uima.tt.DocStructureAnnotation</name>

-           <description></description>

-           <supertypeName>uima.tt.TTAnnotation</supertypeName>

-       </typeDescription>

-        <typeDescription>

-            <name>uima.tt.ParagraphAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.DocStructureAnnotation</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>paragraphNumber</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.SentenceAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.DocStructureAnnotation</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>sentenceNumber</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.LexicalAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.TTAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.TokenLikeAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.LexicalAnnotation</supertypeName>

-            <features>

-               <featureDescription>

-                   <name>lemma</name>

-                   <description></description>

-                   <rangeTypeName>uima.tt.Lemma</rangeTypeName>

-               </featureDescription>

-                <featureDescription>

-                    <name>lemmaEntries</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>tokenNumber</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>tokenProperties</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>stopwordToken</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>synonymEntries</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSList</rangeTypeName>

-                </featureDescription>

-               <featureDescription>

-                   <name>normalizedCoveredText</name>

-                   <description>In cases where the covered text can not be used as-is an annotator may store a normalized representation in this feature</description>

-                   <rangeTypeName>uima.cas.String</rangeTypeName>

-               </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.TokenAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.TokenLikeAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.CompPartAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.TokenLikeAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.KeyStringEntry</name>

-            <description></description>

-            <supertypeName>uima.cas.TOP</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>key</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.Lemma</name>

-            <description></description>

-            <supertypeName>uima.tt.KeyStringEntry</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>partOfSpeech</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>morphID</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.Synonym</name>

-            <description></description>

-            <supertypeName>uima.tt.KeyStringEntry</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.CategoryConfidencePair</name>

-            <description></description>

-            <supertypeName>uima.cas.TOP</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>categoryString</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>categoryConfidence</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Float</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>mostSpecific</name>

-                    <description>flag, if category is the most specific for that document in this taxonomy</description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>taxonomy</name>

-                    <description>name of the taxonomy the category belongs to, therefore a document could

-                               have categories from different taxonomies</description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.LanguageConfidencePair</name>

-            <description></description>

-            <supertypeName>uima.cas.TOP</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>languageConfidence</name>

-                    <description>A number between 0 and 1 describing the confidence</description>

-                    <rangeTypeName>uima.cas.Float</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>language</name>

-                    <description>The ISO name of the language</description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>languageID</name>

-                    <description>The language as TAF number</description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-    </types>

-</typeSystemDescription>

-

+<?xml version="1.0" encoding="UTF-8" ?>
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<typeSystemDescription>
+    <types>
+       <typeDescription>
+            <name>uima.tcas.DocumentAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tcas.Annotation</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>categories</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>languageCandidates</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>id</name>
+                    <description>Document id, such as a URL</description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+       <typeDescription>
+           <name>uima.tt.TTAnnotation</name>
+           <description></description>
+           <supertypeName>uima.tcas.Annotation</supertypeName>
+       </typeDescription>
+       <typeDescription>
+           <name>uima.tt.DocStructureAnnotation</name>
+           <description></description>
+           <supertypeName>uima.tt.TTAnnotation</supertypeName>
+       </typeDescription>
+        <typeDescription>
+            <name>uima.tt.ParagraphAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.DocStructureAnnotation</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>paragraphNumber</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.SentenceAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.DocStructureAnnotation</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>sentenceNumber</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.LexicalAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.TTAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.TokenLikeAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.LexicalAnnotation</supertypeName>
+            <features>
+               <featureDescription>
+                   <name>lemma</name>
+                   <description></description>
+                   <rangeTypeName>uima.tt.Lemma</rangeTypeName>
+               </featureDescription>
+                <featureDescription>
+                    <name>lemmaEntries</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>tokenNumber</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>tokenProperties</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>stopwordToken</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>synonymEntries</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSList</rangeTypeName>
+                </featureDescription>
+               <featureDescription>
+                   <name>normalizedCoveredText</name>
+                   <description>In cases where the covered text can not be used as-is an annotator may store a normalized representation in this feature</description>
+                   <rangeTypeName>uima.cas.String</rangeTypeName>
+               </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.TokenAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.TokenLikeAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.CompPartAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.TokenLikeAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.KeyStringEntry</name>
+            <description></description>
+            <supertypeName>uima.cas.TOP</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>key</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.Lemma</name>
+            <description></description>
+            <supertypeName>uima.tt.KeyStringEntry</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>partOfSpeech</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>morphID</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.Synonym</name>
+            <description></description>
+            <supertypeName>uima.tt.KeyStringEntry</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.CategoryConfidencePair</name>
+            <description></description>
+            <supertypeName>uima.cas.TOP</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>categoryString</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>categoryConfidence</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Float</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>mostSpecific</name>
+                    <description>flag, if category is the most specific for that document in this taxonomy</description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>taxonomy</name>
+                    <description>name of the taxonomy the category belongs to, therefore a document could
+                               have categories from different taxonomies</description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.LanguageConfidencePair</name>
+            <description></description>
+            <supertypeName>uima.cas.TOP</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>languageConfidence</name>
+                    <description>A number between 0 and 1 describing the confidence</description>
+                    <rangeTypeName>uima.cas.Float</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>language</name>
+                    <description>The ISO name of the language</description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>languageID</name>
+                    <description>The language as TAF number</description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+    </types>
+</typeSystemDescription>
+
diff --git a/src/test/data/descriptors/tt_indexes.xml b/src/test/data/descriptors/tt_indexes.xml
index db478cf..056bbac 100644
--- a/src/test/data/descriptors/tt_indexes.xml
+++ b/src/test/data/descriptors/tt_indexes.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<fsIndexes>

-    <fsIndexDescription>

-        <label>LemmaIndex</label>

-        <typeName>uima.tt.Lemma</typeName>

-        <kind>set</kind>

-        <keys>

-            <fsIndexKey>

-                <featureName>partOfSpeech</featureName>

-                <comparator>standard</comparator>

-            </fsIndexKey>

-            <fsIndexKey>

-                <featureName>key</featureName>

-                <comparator>standard</comparator>

-            </fsIndexKey>

-            <fsIndexKey>

-                <featureName>morphID</featureName>

-                <comparator>standard</comparator>

-            </fsIndexKey>

-        </keys>

-    </fsIndexDescription>

-    <fsIndexDescription>

-        <label>CanonicalFormIndex</label>

-        <typeName>uima.tt.CanonicalForm</typeName>

-        <kind>set</kind>

-        <keys>

-            <fsIndexKey>

-                <featureName>key</featureName>

-                <comparator>standard</comparator>

-            </fsIndexKey>

-        </keys>

-    </fsIndexDescription>

-    <fsIndexDescription>

-        <label>SynonymIndex</label>

-        <typeName>uima.tt.Synonym</typeName>

-        <kind>set</kind>

-        <keys>

-            <fsIndexKey>

-                <featureName>key</featureName>

-                <comparator>standard</comparator>

-            </fsIndexKey>

-        </keys>

-    </fsIndexDescription>

-    <fsIndexDescription>

-        <label>RelationIndex</label>

-        <typeName>uima.tt.Relation</typeName>

-        <kind>bag</kind>

-    </fsIndexDescription>

-</fsIndexes>

-

+<?xml version="1.0" encoding="UTF-8" ?>
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<fsIndexes>
+    <fsIndexDescription>
+        <label>LemmaIndex</label>
+        <typeName>uima.tt.Lemma</typeName>
+        <kind>set</kind>
+        <keys>
+            <fsIndexKey>
+                <featureName>partOfSpeech</featureName>
+                <comparator>standard</comparator>
+            </fsIndexKey>
+            <fsIndexKey>
+                <featureName>key</featureName>
+                <comparator>standard</comparator>
+            </fsIndexKey>
+            <fsIndexKey>
+                <featureName>morphID</featureName>
+                <comparator>standard</comparator>
+            </fsIndexKey>
+        </keys>
+    </fsIndexDescription>
+    <fsIndexDescription>
+        <label>CanonicalFormIndex</label>
+        <typeName>uima.tt.CanonicalForm</typeName>
+        <kind>set</kind>
+        <keys>
+            <fsIndexKey>
+                <featureName>key</featureName>
+                <comparator>standard</comparator>
+            </fsIndexKey>
+        </keys>
+    </fsIndexDescription>
+    <fsIndexDescription>
+        <label>SynonymIndex</label>
+        <typeName>uima.tt.Synonym</typeName>
+        <kind>set</kind>
+        <keys>
+            <fsIndexKey>
+                <featureName>key</featureName>
+                <comparator>standard</comparator>
+            </fsIndexKey>
+        </keys>
+    </fsIndexDescription>
+    <fsIndexDescription>
+        <label>RelationIndex</label>
+        <typeName>uima.tt.Relation</typeName>
+        <kind>bag</kind>
+    </fsIndexDescription>
+</fsIndexes>
+
diff --git a/src/test/data/descriptors/tt_typesystem.xml b/src/test/data/descriptors/tt_typesystem.xml
index 694dfd0..17bc1ae 100644
--- a/src/test/data/descriptors/tt_typesystem.xml
+++ b/src/test/data/descriptors/tt_typesystem.xml
@@ -1,596 +1,596 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-

-   <!--

-    ***************************************************************

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  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.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

-    ***************************************************************

-   -->

-

-<typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">

-    <types>

-        <typeDescription>

-            <name>uima.tt.TTAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tcas.Annotation</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>parent</name>

-                    <description></description>

-                    <rangeTypeName>uima.tcas.Annotation</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>children</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSList</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.DocStructureAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.TTAnnotation</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>markupTag</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tcas.DocumentAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tcas.Annotation</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>languageAsUIMANbr</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>id</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>summary</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>keywords</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.StringList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>categories</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>languageCandidates</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>xml_DocumentMetaName</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>xml_DocumentMetaContent</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.MarkupAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.DocStructureAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.SUM_IntendedSummary</name>

-            <description></description>

-            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.TitleMarkup</name>

-            <description></description>

-            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.HeadingMarkup</name>

-            <description></description>

-            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>headingLevel</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.ListMarkup</name>

-            <description></description>

-            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.UnorderedListMarkup</name>

-            <description></description>

-            <supertypeName>uima.tt.ListMarkup</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.OrderedListMarkup</name>

-            <description></description>

-            <supertypeName>uima.tt.ListMarkup</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.TableMarkup</name>

-            <description></description>

-            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.CaptionMarkup</name>

-            <description></description>

-            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.MiscMarkup</name>

-            <description></description>

-            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.SectionAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.DocStructureAnnotation</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>sectionLabel</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.ParagraphAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.DocStructureAnnotation</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>paragraphNumber</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.SentenceAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.DocStructureAnnotation</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>positiveSentenceScoresList</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FloatList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>negativeSentenceScoresList</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FloatList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>sentenceNumber</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.DiscourseAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.TTAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.TopicSegmentAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.DiscourseAnnotation</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>topicSegmentNumber</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.SyntacticAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.TTAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.LexicalAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.TTAnnotation</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>lexCanonicalForm</name>

-                    <description></description>

-                    <rangeTypeName>uima.tt.CanonicalForm</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>lexCanonicalFormConfidence</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Float</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>variantForm</name>

-                    <description></description>

-                    <rangeTypeName>uima.tt.VariantForm</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>positiveKeywordScoresList</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FloatList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>negativeKeywordScoresList</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FloatList</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.MultiTokenAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.LexicalAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.TermAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.MultiTokenAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.NameAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.MultiTokenAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.MiscName</name>

-            <description></description>

-            <supertypeName>uima.tt.NameAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.OrgName</name>

-            <description></description>

-            <supertypeName>uima.tt.NameAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.PersonName</name>

-            <description></description>

-            <supertypeName>uima.tt.NameAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.PlaceName</name>

-            <description></description>

-            <supertypeName>uima.tt.NameAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.AbbreviationAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.MultiTokenAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.ExpressionAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.MultiTokenAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.NumericExpression</name>

-            <description></description>

-            <supertypeName>uima.tt.ExpressionAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.OrdinalExpression</name>

-            <description></description>

-            <supertypeName>uima.tt.NumericExpression</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.CardinalExpression</name>

-            <description></description>

-            <supertypeName>uima.tt.NumericExpression</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.PercentExpression</name>

-            <description></description>

-            <supertypeName>uima.tt.NumericExpression</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.MonetaryExpression</name>

-            <description></description>

-            <supertypeName>uima.tt.ExpressionAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.TemporalExpression</name>

-            <description></description>

-            <supertypeName>uima.tt.ExpressionAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.DateExpression</name>

-            <description></description>

-            <supertypeName>uima.tt.TemporalExpression</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.TimeExpression</name>

-            <description></description>

-            <supertypeName>uima.tt.TemporalExpression</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.URLExpression</name>

-            <description></description>

-            <supertypeName>uima.tt.ExpressionAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.TokenAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.LexicalAnnotation</supertypeName>

-            <features>

-               <featureDescription>

-                   <name>lemmas</name>

-                   <description></description>

-                   <rangeTypeName>uima.tt.Lemma</rangeTypeName>

-               </featureDescription>

-                <featureDescription>

-                    <name>lemmaEntries</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>tokenNumber</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>tokenProperties</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>stopwordToken</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>synonymEntries</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>inflectedForms</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.StringList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>spellAid</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.StringList</rangeTypeName>

-                </featureDescription>

-               <featureDescription>

-                   <name>normalizedCoveredText</name>

-                   <description>In cases where the covered text can not be used as-is an annotator may store a normalized representation in this feature</description>

-                   <rangeTypeName>uima.cas.String</rangeTypeName>

-               </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.CompPartAnnotation</name>

-            <description></description>

-            <supertypeName>uima.tt.LexicalAnnotation</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.KeyStringEntry</name>

-            <description></description>

-            <supertypeName>uima.cas.TOP</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>key</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.Lemma</name>

-            <description></description>

-            <supertypeName>uima.tt.KeyStringEntry</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>partOfSpeech</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>morphID</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.Synonym</name>

-            <description></description>

-            <supertypeName>uima.tt.KeyStringEntry</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.VariantForm</name>

-            <description></description>

-            <supertypeName>uima.tt.KeyStringEntry</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>canonicalForm</name>

-                    <description></description>

-                    <rangeTypeName>uima.tt.CanonicalForm</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>variantFormFrequency</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>variantFormKind</name>

-                    <description></description>

-                    <rangeTypeName>uima.tt.VariantKind</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.TokenVariantForm</name>

-            <description></description>

-            <supertypeName>uima.tt.VariantForm</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>variantLemmaEntries</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSList</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.ComplexVariantForm</name>

-            <description></description>

-            <supertypeName>uima.tt.VariantForm</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>complexVariantCompoundList</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSList</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>complexVariantHeadCompound</name>

-                    <description></description>

-                    <rangeTypeName>uima.tt.Lemma</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.CanonicalForm</name>

-            <description></description>

-            <supertypeName>uima.tt.KeyStringEntry</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>canonicalFormFrequency</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>canonicalFormKind</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>canonicalFormVariants</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSList</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.CategoryConfidencePair</name>

-            <description></description>

-            <supertypeName>uima.cas.TOP</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>categoryString</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>categoryConfidence</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Float</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.LanguageConfidencePair</name>

-            <description></description>

-            <supertypeName>uima.cas.TOP</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>languageConfidence</name>

-                    <description>A number between 0 and 1 describing the confidence</description>

-                    <rangeTypeName>uima.cas.Float</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>language</name>

-                    <description>The ISO name of the language</description>

-                    <rangeTypeName>uima.cas.String</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>languageID</name>

-                    <description>The language as TAF number</description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.Relation</name>

-            <description></description>

-            <supertypeName>uima.cas.TOP</supertypeName>

-            <features>

-                <featureDescription>

-                    <name>relationFrequency</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.Integer</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>relationName</name>

-                    <description></description>

-                    <rangeTypeName>uima.tt.CanonicalForm</rangeTypeName>

-                </featureDescription>

-                <featureDescription>

-                    <name>relationArguments</name>

-                    <description></description>

-                    <rangeTypeName>uima.cas.FSArray</rangeTypeName>

-                </featureDescription>

-            </features>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.VariantKind</name>

-            <description></description>

-            <supertypeName>uima.cas.TOP</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.VariantKind_Abbreviation</name>

-            <description></description>

-            <supertypeName>uima.tt.VariantKind</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.VariantKind_ShortForm</name>

-            <description></description>

-            <supertypeName>uima.tt.VariantKind</supertypeName>

-        </typeDescription>

-        <typeDescription>

-            <name>uima.tt.VariantKind_CanonicalVariant</name>

-            <description></description>

-            <supertypeName>uima.tt.VariantKind</supertypeName>

-        </typeDescription>

-    </types>

-</typeSystemDescription>

-

+<?xml version="1.0" encoding="UTF-8" ?>
+
+   <!--
+    ***************************************************************
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  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.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+    ***************************************************************
+   -->
+
+<typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
+    <types>
+        <typeDescription>
+            <name>uima.tt.TTAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tcas.Annotation</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>parent</name>
+                    <description></description>
+                    <rangeTypeName>uima.tcas.Annotation</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>children</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSList</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.DocStructureAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.TTAnnotation</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>markupTag</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tcas.DocumentAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tcas.Annotation</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>languageAsUIMANbr</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>id</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>summary</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>keywords</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.StringList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>categories</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>languageCandidates</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>xml_DocumentMetaName</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>xml_DocumentMetaContent</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.MarkupAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.DocStructureAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.SUM_IntendedSummary</name>
+            <description></description>
+            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.TitleMarkup</name>
+            <description></description>
+            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.HeadingMarkup</name>
+            <description></description>
+            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>headingLevel</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.ListMarkup</name>
+            <description></description>
+            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.UnorderedListMarkup</name>
+            <description></description>
+            <supertypeName>uima.tt.ListMarkup</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.OrderedListMarkup</name>
+            <description></description>
+            <supertypeName>uima.tt.ListMarkup</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.TableMarkup</name>
+            <description></description>
+            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.CaptionMarkup</name>
+            <description></description>
+            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.MiscMarkup</name>
+            <description></description>
+            <supertypeName>uima.tt.MarkupAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.SectionAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.DocStructureAnnotation</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>sectionLabel</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.ParagraphAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.DocStructureAnnotation</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>paragraphNumber</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.SentenceAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.DocStructureAnnotation</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>positiveSentenceScoresList</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FloatList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>negativeSentenceScoresList</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FloatList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>sentenceNumber</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.DiscourseAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.TTAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.TopicSegmentAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.DiscourseAnnotation</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>topicSegmentNumber</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.SyntacticAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.TTAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.LexicalAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.TTAnnotation</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>lexCanonicalForm</name>
+                    <description></description>
+                    <rangeTypeName>uima.tt.CanonicalForm</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>lexCanonicalFormConfidence</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Float</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>variantForm</name>
+                    <description></description>
+                    <rangeTypeName>uima.tt.VariantForm</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>positiveKeywordScoresList</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FloatList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>negativeKeywordScoresList</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FloatList</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.MultiTokenAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.LexicalAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.TermAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.MultiTokenAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.NameAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.MultiTokenAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.MiscName</name>
+            <description></description>
+            <supertypeName>uima.tt.NameAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.OrgName</name>
+            <description></description>
+            <supertypeName>uima.tt.NameAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.PersonName</name>
+            <description></description>
+            <supertypeName>uima.tt.NameAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.PlaceName</name>
+            <description></description>
+            <supertypeName>uima.tt.NameAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.AbbreviationAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.MultiTokenAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.ExpressionAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.MultiTokenAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.NumericExpression</name>
+            <description></description>
+            <supertypeName>uima.tt.ExpressionAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.OrdinalExpression</name>
+            <description></description>
+            <supertypeName>uima.tt.NumericExpression</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.CardinalExpression</name>
+            <description></description>
+            <supertypeName>uima.tt.NumericExpression</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.PercentExpression</name>
+            <description></description>
+            <supertypeName>uima.tt.NumericExpression</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.MonetaryExpression</name>
+            <description></description>
+            <supertypeName>uima.tt.ExpressionAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.TemporalExpression</name>
+            <description></description>
+            <supertypeName>uima.tt.ExpressionAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.DateExpression</name>
+            <description></description>
+            <supertypeName>uima.tt.TemporalExpression</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.TimeExpression</name>
+            <description></description>
+            <supertypeName>uima.tt.TemporalExpression</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.URLExpression</name>
+            <description></description>
+            <supertypeName>uima.tt.ExpressionAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.TokenAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.LexicalAnnotation</supertypeName>
+            <features>
+               <featureDescription>
+                   <name>lemmas</name>
+                   <description></description>
+                   <rangeTypeName>uima.tt.Lemma</rangeTypeName>
+               </featureDescription>
+                <featureDescription>
+                    <name>lemmaEntries</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>tokenNumber</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>tokenProperties</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>stopwordToken</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>synonymEntries</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>inflectedForms</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.StringList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>spellAid</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.StringList</rangeTypeName>
+                </featureDescription>
+               <featureDescription>
+                   <name>normalizedCoveredText</name>
+                   <description>In cases where the covered text can not be used as-is an annotator may store a normalized representation in this feature</description>
+                   <rangeTypeName>uima.cas.String</rangeTypeName>
+               </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.CompPartAnnotation</name>
+            <description></description>
+            <supertypeName>uima.tt.LexicalAnnotation</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.KeyStringEntry</name>
+            <description></description>
+            <supertypeName>uima.cas.TOP</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>key</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.Lemma</name>
+            <description></description>
+            <supertypeName>uima.tt.KeyStringEntry</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>partOfSpeech</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>morphID</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.Synonym</name>
+            <description></description>
+            <supertypeName>uima.tt.KeyStringEntry</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.VariantForm</name>
+            <description></description>
+            <supertypeName>uima.tt.KeyStringEntry</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>canonicalForm</name>
+                    <description></description>
+                    <rangeTypeName>uima.tt.CanonicalForm</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>variantFormFrequency</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>variantFormKind</name>
+                    <description></description>
+                    <rangeTypeName>uima.tt.VariantKind</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.TokenVariantForm</name>
+            <description></description>
+            <supertypeName>uima.tt.VariantForm</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>variantLemmaEntries</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSList</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.ComplexVariantForm</name>
+            <description></description>
+            <supertypeName>uima.tt.VariantForm</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>complexVariantCompoundList</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSList</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>complexVariantHeadCompound</name>
+                    <description></description>
+                    <rangeTypeName>uima.tt.Lemma</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.CanonicalForm</name>
+            <description></description>
+            <supertypeName>uima.tt.KeyStringEntry</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>canonicalFormFrequency</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>canonicalFormKind</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>canonicalFormVariants</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSList</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.CategoryConfidencePair</name>
+            <description></description>
+            <supertypeName>uima.cas.TOP</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>categoryString</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>categoryConfidence</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Float</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.LanguageConfidencePair</name>
+            <description></description>
+            <supertypeName>uima.cas.TOP</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>languageConfidence</name>
+                    <description>A number between 0 and 1 describing the confidence</description>
+                    <rangeTypeName>uima.cas.Float</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>language</name>
+                    <description>The ISO name of the language</description>
+                    <rangeTypeName>uima.cas.String</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>languageID</name>
+                    <description>The language as TAF number</description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.Relation</name>
+            <description></description>
+            <supertypeName>uima.cas.TOP</supertypeName>
+            <features>
+                <featureDescription>
+                    <name>relationFrequency</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.Integer</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>relationName</name>
+                    <description></description>
+                    <rangeTypeName>uima.tt.CanonicalForm</rangeTypeName>
+                </featureDescription>
+                <featureDescription>
+                    <name>relationArguments</name>
+                    <description></description>
+                    <rangeTypeName>uima.cas.FSArray</rangeTypeName>
+                </featureDescription>
+            </features>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.VariantKind</name>
+            <description></description>
+            <supertypeName>uima.cas.TOP</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.VariantKind_Abbreviation</name>
+            <description></description>
+            <supertypeName>uima.tt.VariantKind</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.VariantKind_ShortForm</name>
+            <description></description>
+            <supertypeName>uima.tt.VariantKind</supertypeName>
+        </typeDescription>
+        <typeDescription>
+            <name>uima.tt.VariantKind_CanonicalVariant</name>
+            <description></description>
+            <supertypeName>uima.tt.VariantKind</supertypeName>
+        </typeDescription>
+    </types>
+</typeSystemDescription>
+
diff --git a/src/test/fvt.bat b/src/test/fvt.bat
index 5b9e4d3..56a1d24 100644
--- a/src/test/fvt.bat
+++ b/src/test/fvt.bat
@@ -1,59 +1,59 @@
-@echo off

-

-REM   Licensed to the Apache Software Foundation (ASF) under one

-REM   or more contributor license agreements.  See the NOTICE file

-REM   distributed with this work for additional information

-REM   regarding copyright ownership.  The ASF licenses this file

-REM   to you under the Apache License, Version 2.0 (the

-REM   "License"); you may not use this file except in compliance

-REM   with the License.  You may obtain a copy of the License at

-REM

-REM    http://www.apache.org/licenses/LICENSE-2.0

-REM

-REM   Unless required by applicable law or agreed to in writing,

-REM   software distributed under the License is distributed on an

-REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-REM   KIND, either express or implied.  See the License for the

-REM   specific language governing permissions and limitations

-REM   under the License.

-

-setlocal

-

-if "%UIMACPP_HOME%"=="" (

-  set UIMACPP_HOME=..\..\install

-)

-

-REM default location of descriptors 

-if "%UIMACPP_DATAPATH%"=="" set UIMACPP_DATAPATH=.\data

-

-REM add location of apr, icu, xerces and uimacpp binaries to the path 

-set PATH=..\..\install\bin;%APR_HOME%\Release;%ICU_HOME%\bin;%XERCES_HOME%\bin;%UIMACPP_HOME%\bin;%PATH%

-

-set RM=\windows\system32\cmd /C del

-

-if "%~2"=="debug" (

-  set DEBUG_FVT="devenv /debugexe "

-)

-if "%UIMACPP_STREAMHANDLERS%"=="" set UIMACPP_STREAMHANDLERS=file:SofaStreamHandlerFile

-

-set UIMACPPTEST_JNI=call "%UIMA_HOME%\bin\runAE" data\descriptors\javaaggregate.xml data\segmenterinput

-

-if "%UIMA_HOME%" == "" (

-	set UIMACPPTEST_JNI=@echo "UIMA_HOME is not set. The JNI test was not run."

-)

-

-if "%~1" == "debug" (

-  nmake -f fvtTestfile.debug %2

-)

-if "%~2" == "debug" (

-  nmake -f fvtTestfile.debug %1

-)

-if not "%~2" == "debug" (

-  if not "%~1" == "debug" (

-    nmake -f fvtTestfile %1

-  )

-)

-

-goto end

-

-:end

+@echo off
+
+REM   Licensed to the Apache Software Foundation (ASF) under one
+REM   or more contributor license agreements.  See the NOTICE file
+REM   distributed with this work for additional information
+REM   regarding copyright ownership.  The ASF licenses this file
+REM   to you under the Apache License, Version 2.0 (the
+REM   "License"); you may not use this file except in compliance
+REM   with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM   Unless required by applicable law or agreed to in writing,
+REM   software distributed under the License is distributed on an
+REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM   KIND, either express or implied.  See the License for the
+REM   specific language governing permissions and limitations
+REM   under the License.
+
+setlocal
+
+if "%UIMACPP_HOME%"=="" (
+  set UIMACPP_HOME=..\..\install
+)
+
+REM default location of descriptors 
+if "%UIMACPP_DATAPATH%"=="" set UIMACPP_DATAPATH=.\data
+
+REM add location of apr, icu, xerces and uimacpp binaries to the path 
+set PATH=..\..\install\bin;%APR_HOME%\Release;%ICU_HOME%\bin;%XERCES_HOME%\bin;%UIMACPP_HOME%\bin;%PATH%
+
+set RM=\windows\system32\cmd /C del
+
+if "%~2"=="debug" (
+  set DEBUG_FVT="devenv /debugexe "
+)
+if "%UIMACPP_STREAMHANDLERS%"=="" set UIMACPP_STREAMHANDLERS=file:SofaStreamHandlerFile
+
+set UIMACPPTEST_JNI=call "%UIMA_HOME%\bin\runAE" data\descriptors\javaaggregate.xml data\segmenterinput
+
+if "%UIMA_HOME%" == "" (
+	set UIMACPPTEST_JNI=@echo "UIMA_HOME is not set. The JNI test was not run."
+)
+
+if "%~1" == "debug" (
+  nmake -f fvtTestfile.debug %2
+)
+if "%~2" == "debug" (
+  nmake -f fvtTestfile.debug %1
+)
+if not "%~2" == "debug" (
+  if not "%~1" == "debug" (
+    nmake -f fvtTestfile %1
+  )
+)
+
+goto end
+
+:end
diff --git a/src/test/fvtTestfile b/src/test/fvtTestfile
index c519227..c4df9c8 100644
--- a/src/test/fvtTestfile
+++ b/src/test/fvtTestfile
@@ -1,59 +1,59 @@
-# ---------------------------------------------------------------------------

-# Licensed to the Apache Software Foundation (ASF) under one or more

-# contributor license agreements.  See the NOTICE file distributed with

-# this work for additional information regarding copyright ownership.

-# 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.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ---------------------------------------------------------------------------

-

-all:	cas sofa engine typepriority language iterators casserializer primitivetypes xcasdeserialization xmideserialization jni

-

-cas:

-	$(DEBUG_FVT)test_cas

-

-sofa:

-	$(DEBUG_FVT)test_sofa

-	$(RM) temp.xcas

-

-engine:	

-	$(DEBUG_FVT)test_engine 

-

-typepriority:

-	$(DEBUG_FVT)test_typepriority

-	$(RM) ANDump.xml

-

-language:

-	$(DEBUG_FVT)test_language

-

-iterators:	

-	$(DEBUG_FVT)test_iterators

-

-casserializer:

-	$(DEBUG_FVT)test_casserializer

-

-primitivetypes:

-	$(DEBUG_FVT)test_primitivetypes

-	$(RM) temp.xcas

-	$(RM) testprimitivetypes.xmi

-

-xcasdeserialization:

-	$(DEBUG_FVT)test_xcasdeserialization

-	$(RM) temp.xcas

-

-xmideserialization:

-	$(DEBUG_FVT)test_xmideserialization

-	$(RM) temp.xmi

-	$(RM) oots.xmi

-	$(RM) oots2.xmi

-

-jni:

-	$(UIMACPPTEST_JNI)

+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+all:	cas sofa engine typepriority language iterators casserializer primitivetypes xcasdeserialization xmideserialization jni
+
+cas:
+	$(DEBUG_FVT)test_cas
+
+sofa:
+	$(DEBUG_FVT)test_sofa
+	$(RM) temp.xcas
+
+engine:	
+	$(DEBUG_FVT)test_engine 
+
+typepriority:
+	$(DEBUG_FVT)test_typepriority
+	$(RM) ANDump.xml
+
+language:
+	$(DEBUG_FVT)test_language
+
+iterators:	
+	$(DEBUG_FVT)test_iterators
+
+casserializer:
+	$(DEBUG_FVT)test_casserializer
+
+primitivetypes:
+	$(DEBUG_FVT)test_primitivetypes
+	$(RM) temp.xcas
+	$(RM) testprimitivetypes.xmi
+
+xcasdeserialization:
+	$(DEBUG_FVT)test_xcasdeserialization
+	$(RM) temp.xcas
+
+xmideserialization:
+	$(DEBUG_FVT)test_xmideserialization
+	$(RM) temp.xmi
+	$(RM) oots.xmi
+	$(RM) oots2.xmi
+
+jni:
+	$(UIMACPPTEST_JNI)
diff --git a/src/test/fvtTestfile.debug b/src/test/fvtTestfile.debug
index a89e96a..8149368 100644
--- a/src/test/fvtTestfile.debug
+++ b/src/test/fvtTestfile.debug
@@ -1,59 +1,59 @@
-# ---------------------------------------------------------------------------

-# Licensed to the Apache Software Foundation (ASF) under one or more

-# contributor license agreements.  See the NOTICE file distributed with

-# this work for additional information regarding copyright ownership.

-# 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.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-# ---------------------------------------------------------------------------

-

-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)

+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+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)
diff --git a/src/test/src/MeetingAnnotator.vcproj b/src/test/src/MeetingAnnotator.vcproj
index 69cc43b..b183f30 100644
--- a/src/test/src/MeetingAnnotator.vcproj
+++ b/src/test/src/MeetingAnnotator.vcproj
@@ -1,213 +1,213 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="MeetingAnnotator"

-	ProjectGUID="{5FCF9633-6CEE-40B2-A906-528E50C067D2}"

-	RootNamespace="MeetingAnnotator"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/$(ProjectName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"

-				OutputFile="$(OutDir)\$(ProjectName).dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/$(ProjectName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="MeetingAnnotator.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="MeetingAnnotator"
+	ProjectGUID="{5FCF9633-6CEE-40B2-A906-528E50C067D2}"
+	RootNamespace="MeetingAnnotator"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/$(ProjectName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/$(ProjectName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="MeetingAnnotator.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/SimpleTextSegmenter.vcproj b/src/test/src/SimpleTextSegmenter.vcproj
index 4d20901..55038ae 100644
--- a/src/test/src/SimpleTextSegmenter.vcproj
+++ b/src/test/src/SimpleTextSegmenter.vcproj
@@ -1,213 +1,213 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="SimpleTextSegmenter"

-	ProjectGUID="{C8ADD1C0-6848-4081-A3CA-17197150FCAE}"

-	RootNamespace="SimpleTextSegmenter"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/$(ProjectName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"

-				OutputFile="$(OutDir)\lib$(ProjectName).dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/$(ProjectName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="SimpleTextSegmenter.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="SimpleTextSegmenter"
+	ProjectGUID="{C8ADD1C0-6848-4081-A3CA-17197150FCAE}"
+	RootNamespace="SimpleTextSegmenter"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/$(ProjectName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"
+				OutputFile="$(OutDir)\lib$(ProjectName).dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/$(ProjectName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="SimpleTextSegmenter.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/SofaStreamHandlerFile.vcproj b/src/test/src/SofaStreamHandlerFile.vcproj
index 5fdb2a5..d74c087 100644
--- a/src/test/src/SofaStreamHandlerFile.vcproj
+++ b/src/test/src/SofaStreamHandlerFile.vcproj
@@ -1,213 +1,213 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="SofaStreamHandlerFile"

-	ProjectGUID="{D72FCAE5-A23C-44B0-BC67-7433460F7DD6}"

-	RootNamespace="SofaStreamHandlerFile"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/$(ProjectName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"

-				OutputFile="$(OutDir)\$(ProjectName).dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/$(ProjectName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="SofaStreamHandlerFile.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="SofaStreamHandlerFile"
+	ProjectGUID="{D72FCAE5-A23C-44B0-BC67-7433460F7DD6}"
+	RootNamespace="SofaStreamHandlerFile"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/$(ProjectName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/$(ProjectName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="SofaStreamHandlerFile.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/TextSegmentConsumer.vcproj b/src/test/src/TextSegmentConsumer.vcproj
index 44f6a8d..c6112b5 100644
--- a/src/test/src/TextSegmentConsumer.vcproj
+++ b/src/test/src/TextSegmentConsumer.vcproj
@@ -1,213 +1,213 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="TextSegmentConsumer"

-	ProjectGUID="{D9C3A8F1-4E55-4CE2-8142-FB32D694F45E}"

-	RootNamespace="TextSegmentConsumer"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/$(ProjectName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"

-				OutputFile="$(OutDir)\lib$(ProjectName).dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/$(ProjectName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="TextSegmentConsumer.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="TextSegmentConsumer"
+	ProjectGUID="{D9C3A8F1-4E55-4CE2-8142-FB32D694F45E}"
+	RootNamespace="TextSegmentConsumer"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/$(ProjectName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"
+				OutputFile="$(OutDir)\lib$(ProjectName).dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/$(ProjectName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="TextSegmentConsumer.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/plugin_annotator_dump.vcproj b/src/test/src/plugin_annotator_dump.vcproj
index e2cbb99..aa4950c 100644
--- a/src/test/src/plugin_annotator_dump.vcproj
+++ b/src/test/src/plugin_annotator_dump.vcproj
@@ -1,216 +1,216 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="plugin_annotator_dump"

-	ProjectGUID="{0BC37546-5E6B-4383-9984-EF348B9FB966}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/libdump.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"

-				OutputFile="$(OutDir)\libdump.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/libdump.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="annotator_dump.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="include\annotator_dump.hpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="plugin_annotator_dump"
+	ProjectGUID="{0BC37546-5E6B-4383-9984-EF348B9FB966}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="icuuc.lib libapr-1.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/libdump.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="icuuc.lib libapr-1.lib uima.lib"
+				OutputFile="$(OutDir)\libdump.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/libdump.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="annotator_dump.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="include\annotator_dump.hpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/plugin_tokenizer.vcproj b/src/test/src/plugin_tokenizer.vcproj
index 98223fe..1108b85 100644
--- a/src/test/src/plugin_tokenizer.vcproj
+++ b/src/test/src/plugin_tokenizer.vcproj
@@ -1,228 +1,228 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="plugin_tokenizer"

-	ProjectGUID="{05B599CC-FBF4-4D21-8DAF-4DCAE35A116A}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="icuuc.lib uimaD.lib libapr-1.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				ImportLibrary="$(OutDir)/libitutoknz.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="icuuc.lib uima.lib"

-				OutputFile="$(OutDir)\libtoknz.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				ImportLibrary="$(OutDir)/libitutoknz.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="annotator_tok.cpp"

-				>

-			</File>

-			<File

-				RelativePath="ss_tokenizer.cpp"

-				>

-			</File>

-			<File

-				RelativePath="tt_types.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="include\annotator_tok.hpp"

-				>

-			</File>

-			<File

-				RelativePath="include\ss_tokenizer.hpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="plugin_tokenizer"
+	ProjectGUID="{05B599CC-FBF4-4D21-8DAF-4DCAE35A116A}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="icuuc.lib uimaD.lib libapr-1.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/libitutoknz.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="icuuc.lib uima.lib"
+				OutputFile="$(OutDir)\libtoknz.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/libitutoknz.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="annotator_tok.cpp"
+				>
+			</File>
+			<File
+				RelativePath="ss_tokenizer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="tt_types.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="include\annotator_tok.hpp"
+				>
+			</File>
+			<File
+				RelativePath="include\ss_tokenizer.hpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/test_cas.vcproj b/src/test/src/test_cas.vcproj
index 5cd4dd7..c4420ec 100644
--- a/src/test/src/test_cas.vcproj
+++ b/src/test/src/test_cas.vcproj
@@ -1,215 +1,215 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="test_cas"

-	ProjectGUID="{87F00969-FF24-4446-A128-2F3EA5D00DE1}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"

-				OutputFile="$(OutDir)/test_cas.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="test_cas.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\tt_types.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test_cas"
+	ProjectGUID="{87F00969-FF24-4446-A128-2F3EA5D00DE1}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
+				OutputFile="$(OutDir)/test_cas.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="test_cas.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\tt_types.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/test_casserializer.vcproj b/src/test/src/test_casserializer.vcproj
index 445350e..0391c00 100644
--- a/src/test/src/test_casserializer.vcproj
+++ b/src/test/src/test_casserializer.vcproj
@@ -1,209 +1,209 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="test_casserializer"

-	ProjectGUID="{C1CC67C7-6514-4C9A-88B6-02678AA4DD5B}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"

-				OutputFile="$(OutDir)/test_casserializer.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="test_casserializer.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test_casserializer"
+	ProjectGUID="{C1CC67C7-6514-4C9A-88B6-02678AA4DD5B}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
+				OutputFile="$(OutDir)/test_casserializer.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="test_casserializer.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/test_engine.vcproj b/src/test/src/test_engine.vcproj
index eb09cac..da97c42 100644
--- a/src/test/src/test_engine.vcproj
+++ b/src/test/src/test_engine.vcproj
@@ -1,218 +1,218 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="test_engine"

-	ProjectGUID="{EC9D70CD-3EAB-45F7-B779-5D82370BFF5B}"

-	RootNamespace="test_engine"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir).."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"

-				OutputFile="$(OutDir)/test_engine.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="conui.cpp"

-				>

-			</File>

-			<File

-				RelativePath="doc_buffer.cpp"

-				>

-			</File>

-			<File

-				RelativePath="test_engine.cpp"

-				>

-			</File>

-			<Filter

-				Name="Header Files"

-				Filter="h;hpp;hxx;hm;inl;inc;xsd"

-				UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-				>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test_engine"
+	ProjectGUID="{EC9D70CD-3EAB-45F7-B779-5D82370BFF5B}"
+	RootNamespace="test_engine"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir).."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
+				OutputFile="$(OutDir)/test_engine.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="conui.cpp"
+				>
+			</File>
+			<File
+				RelativePath="doc_buffer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="test_engine.cpp"
+				>
+			</File>
+			<Filter
+				Name="Header Files"
+				Filter="h;hpp;hxx;hm;inl;inc;xsd"
+				UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+				>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/test_iterators.vcproj b/src/test/src/test_iterators.vcproj
index d9d6c5a..638ee41 100644
--- a/src/test/src/test_iterators.vcproj
+++ b/src/test/src/test_iterators.vcproj
@@ -1,213 +1,213 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="test_iterators"

-	ProjectGUID="{02C73C58-59FF-494D-95C6-11CF049217BD}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"

-				OutputFile="$(OutDir)\test_iterators.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="test_iterators.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\tt_types.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test_iterators"
+	ProjectGUID="{02C73C58-59FF-494D-95C6-11CF049217BD}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
+				OutputFile="$(OutDir)\test_iterators.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="test_iterators.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\tt_types.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/test_language.vcproj b/src/test/src/test_language.vcproj
index d704ddc..cb1f3ca 100644
--- a/src/test/src/test_language.vcproj
+++ b/src/test/src/test_language.vcproj
@@ -1,209 +1,209 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="test_language"

-	ProjectGUID="{562C331B-2F3C-4F39-8A7C-ECD9611D1E25}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"

-				OutputFile="$(OutDir)/test_language.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="test_language.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test_language"
+	ProjectGUID="{562C331B-2F3C-4F39-8A7C-ECD9611D1E25}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib uima.lib"
+				OutputFile="$(OutDir)/test_language.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="test_language.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/test_primitivetypes.vcproj b/src/test/src/test_primitivetypes.vcproj
index 13d2857..4fb10fb 100644
--- a/src/test/src/test_primitivetypes.vcproj
+++ b/src/test/src/test_primitivetypes.vcproj
@@ -1,209 +1,209 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="test_primitivetypes"

-	ProjectGUID="{738AB617-12DE-4717-9F89-A2329BA677AF}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"

-				OutputFile="$(OutDir)/test_primitivetypes.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\test_primitivetypes.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test_primitivetypes"
+	ProjectGUID="{738AB617-12DE-4717-9F89-A2329BA677AF}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"
+				OutputFile="$(OutDir)/test_primitivetypes.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\test_primitivetypes.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/test_sofa.vcproj b/src/test/src/test_sofa.vcproj
index 0de7abe..c373a22 100644
--- a/src/test/src/test_sofa.vcproj
+++ b/src/test/src/test_sofa.vcproj
@@ -1,209 +1,209 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="test_sofa"

-	ProjectGUID="{8AB85254-F10F-45E9-9C86-14350802733C}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"

-				OutputFile="$(OutDir)/test_sofa.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="test_sofa.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test_sofa"
+	ProjectGUID="{8AB85254-F10F-45E9-9C86-14350802733C}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"
+				OutputFile="$(OutDir)/test_sofa.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="test_sofa.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/test_typepriority.vcproj b/src/test/src/test_typepriority.vcproj
index 6533e77..d6f329c 100644
--- a/src/test/src/test_typepriority.vcproj
+++ b/src/test/src/test_typepriority.vcproj
@@ -1,213 +1,213 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="test_typepriority"

-	ProjectGUID="{2A4A561A-F304-4280-9238-DD2C1C82F8AE}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"

-				OutputFile="$(OutDir)/test_typepriority.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="test_typepriority.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\tt_types.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test_typepriority"
+	ProjectGUID="{2A4A561A-F304-4280-9238-DD2C1C82F8AE}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"
+				OutputFile="$(OutDir)/test_typepriority.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="test_typepriority.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\tt_types.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/test_xcasdeserialization.vcproj b/src/test/src/test_xcasdeserialization.vcproj
index 990c9a1..9d069f1 100644
--- a/src/test/src/test_xcasdeserialization.vcproj
+++ b/src/test/src/test_xcasdeserialization.vcproj
@@ -1,209 +1,209 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="test_xcasdeserialization"

-	ProjectGUID="{23C6D0B9-1C35-4F32-A579-E8887492E841}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"

-				OutputFile="$(OutDir)/test_xcasdeserialization.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="test_xcasdeserialization.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test_xcasdeserialization"
+	ProjectGUID="{23C6D0B9-1C35-4F32-A579-E8887492E841}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"
+				OutputFile="$(OutDir)/test_xcasdeserialization.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="test_xcasdeserialization.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/src/test_xmideserialization.vcproj b/src/test/src/test_xmideserialization.vcproj
index d896736..5490b9c 100644
--- a/src/test/src/test_xmideserialization.vcproj
+++ b/src/test/src/test_xmideserialization.vcproj
@@ -1,209 +1,209 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="test_xmideserialization"

-	ProjectGUID="{CB5B1E1D-CE35-4A00-A42E-111646785BC4}"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"

-				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"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(InputDir)\.."

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"

-				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				BasicRuntimeChecks="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"

-				OutputFile="$(OutDir)/test_xmideserialization.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="test_xmideserialization.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test_xmideserialization"
+	ProjectGUID="{CB5B1E1D-CE35-4A00-A42E-111646785BC4}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uimaD.lib"
+				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"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(InputDir)\.."
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				AdditionalIncludeDirectories=".;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;;..\..\cas;..\..\framework"
+				PreprocessorDefinitions="UIMA_SUPPRESS_TIMING;TRACEOFF;NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib uima.lib"
+				OutputFile="$(OutDir)/test_xmideserialization.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;;..\..\..\install\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="test_xmideserialization.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/test/test.sln b/src/test/test.sln
index 7a7d81d..026dde3 100644
--- a/src/test/test.sln
+++ b/src/test/test.sln
@@ -1,109 +1,109 @@
-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_annotator_dump", "src\plugin_annotator_dump.vcproj", "{0BC37546-5E6B-4383-9984-EF348B9FB966}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_tokenizer", "src\plugin_tokenizer.vcproj", "{05B599CC-FBF4-4D21-8DAF-4DCAE35A116A}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_casserializer", "src\test_casserializer.vcproj", "{C1CC67C7-6514-4C9A-88B6-02678AA4DD5B}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_engine", "src\test_engine.vcproj", "{EC9D70CD-3EAB-45F7-B779-5D82370BFF5B}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_language", "src\test_language.vcproj", "{562C331B-2F3C-4F39-8A7C-ECD9611D1E25}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_typepriority", "src\test_typepriority.vcproj", "{2A4A561A-F304-4280-9238-DD2C1C82F8AE}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_iterators", "src\test_iterators.vcproj", "{02C73C58-59FF-494D-95C6-11CF049217BD}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cas", "src\test_cas.vcproj", "{87F00969-FF24-4446-A128-2F3EA5D00DE1}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_sofa", "src\test_sofa.vcproj", "{8AB85254-F10F-45E9-9C86-14350802733C}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xcasdeserialization", "src\test_xcasdeserialization.vcproj", "{23C6D0B9-1C35-4F32-A579-E8887492E841}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SofaStreamHandlerFile", "src\SofaStreamHandlerFile.vcproj", "{D72FCAE5-A23C-44B0-BC67-7433460F7DD6}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_primitivetypes", "src\test_primitivetypes.vcproj", "{738AB617-12DE-4717-9F89-A2329BA677AF}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleTextSegmenter", "src\SimpleTextSegmenter.vcproj", "{C8ADD1C0-6848-4081-A3CA-17197150FCAE}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MeetingAnnotator", "src\MeetingAnnotator.vcproj", "{5FCF9633-6CEE-40B2-A906-528E50C067D2}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextSegmentConsumer", "src\TextSegmentConsumer.vcproj", "{D9C3A8F1-4E55-4CE2-8142-FB32D694F45E}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xmideserialization", "src\test_xmideserialization.vcproj", "{CB5B1E1D-CE35-4A00-A42E-111646785BC4}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{0BC37546-5E6B-4383-9984-EF348B9FB966}.Debug|Win32.ActiveCfg = Debug|Win32

-		{0BC37546-5E6B-4383-9984-EF348B9FB966}.Debug|Win32.Build.0 = Debug|Win32

-		{0BC37546-5E6B-4383-9984-EF348B9FB966}.Release|Win32.ActiveCfg = Release|Win32

-		{0BC37546-5E6B-4383-9984-EF348B9FB966}.Release|Win32.Build.0 = Release|Win32

-		{05B599CC-FBF4-4D21-8DAF-4DCAE35A116A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{05B599CC-FBF4-4D21-8DAF-4DCAE35A116A}.Debug|Win32.Build.0 = Debug|Win32

-		{05B599CC-FBF4-4D21-8DAF-4DCAE35A116A}.Release|Win32.ActiveCfg = Release|Win32

-		{05B599CC-FBF4-4D21-8DAF-4DCAE35A116A}.Release|Win32.Build.0 = Release|Win32

-		{C1CC67C7-6514-4C9A-88B6-02678AA4DD5B}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C1CC67C7-6514-4C9A-88B6-02678AA4DD5B}.Debug|Win32.Build.0 = Debug|Win32

-		{C1CC67C7-6514-4C9A-88B6-02678AA4DD5B}.Release|Win32.ActiveCfg = Release|Win32

-		{C1CC67C7-6514-4C9A-88B6-02678AA4DD5B}.Release|Win32.Build.0 = Release|Win32

-		{EC9D70CD-3EAB-45F7-B779-5D82370BFF5B}.Debug|Win32.ActiveCfg = Debug|Win32

-		{EC9D70CD-3EAB-45F7-B779-5D82370BFF5B}.Debug|Win32.Build.0 = Debug|Win32

-		{EC9D70CD-3EAB-45F7-B779-5D82370BFF5B}.Release|Win32.ActiveCfg = Release|Win32

-		{EC9D70CD-3EAB-45F7-B779-5D82370BFF5B}.Release|Win32.Build.0 = Release|Win32

-		{562C331B-2F3C-4F39-8A7C-ECD9611D1E25}.Debug|Win32.ActiveCfg = Debug|Win32

-		{562C331B-2F3C-4F39-8A7C-ECD9611D1E25}.Debug|Win32.Build.0 = Debug|Win32

-		{562C331B-2F3C-4F39-8A7C-ECD9611D1E25}.Release|Win32.ActiveCfg = Release|Win32

-		{562C331B-2F3C-4F39-8A7C-ECD9611D1E25}.Release|Win32.Build.0 = Release|Win32

-		{2A4A561A-F304-4280-9238-DD2C1C82F8AE}.Debug|Win32.ActiveCfg = Debug|Win32

-		{2A4A561A-F304-4280-9238-DD2C1C82F8AE}.Debug|Win32.Build.0 = Debug|Win32

-		{2A4A561A-F304-4280-9238-DD2C1C82F8AE}.Release|Win32.ActiveCfg = Release|Win32

-		{2A4A561A-F304-4280-9238-DD2C1C82F8AE}.Release|Win32.Build.0 = Release|Win32

-		{02C73C58-59FF-494D-95C6-11CF049217BD}.Debug|Win32.ActiveCfg = Debug|Win32

-		{02C73C58-59FF-494D-95C6-11CF049217BD}.Debug|Win32.Build.0 = Debug|Win32

-		{02C73C58-59FF-494D-95C6-11CF049217BD}.Release|Win32.ActiveCfg = Release|Win32

-		{02C73C58-59FF-494D-95C6-11CF049217BD}.Release|Win32.Build.0 = Release|Win32

-		{87F00969-FF24-4446-A128-2F3EA5D00DE1}.Debug|Win32.ActiveCfg = Debug|Win32

-		{87F00969-FF24-4446-A128-2F3EA5D00DE1}.Debug|Win32.Build.0 = Debug|Win32

-		{87F00969-FF24-4446-A128-2F3EA5D00DE1}.Release|Win32.ActiveCfg = Release|Win32

-		{87F00969-FF24-4446-A128-2F3EA5D00DE1}.Release|Win32.Build.0 = Release|Win32

-		{8AB85254-F10F-45E9-9C86-14350802733C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8AB85254-F10F-45E9-9C86-14350802733C}.Debug|Win32.Build.0 = Debug|Win32

-		{8AB85254-F10F-45E9-9C86-14350802733C}.Release|Win32.ActiveCfg = Release|Win32

-		{8AB85254-F10F-45E9-9C86-14350802733C}.Release|Win32.Build.0 = Release|Win32

-		{23C6D0B9-1C35-4F32-A579-E8887492E841}.Debug|Win32.ActiveCfg = Debug|Win32

-		{23C6D0B9-1C35-4F32-A579-E8887492E841}.Debug|Win32.Build.0 = Debug|Win32

-		{23C6D0B9-1C35-4F32-A579-E8887492E841}.Release|Win32.ActiveCfg = Release|Win32

-		{23C6D0B9-1C35-4F32-A579-E8887492E841}.Release|Win32.Build.0 = Release|Win32

-		{D72FCAE5-A23C-44B0-BC67-7433460F7DD6}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D72FCAE5-A23C-44B0-BC67-7433460F7DD6}.Debug|Win32.Build.0 = Debug|Win32

-		{D72FCAE5-A23C-44B0-BC67-7433460F7DD6}.Release|Win32.ActiveCfg = Release|Win32

-		{D72FCAE5-A23C-44B0-BC67-7433460F7DD6}.Release|Win32.Build.0 = Release|Win32

-		{738AB617-12DE-4717-9F89-A2329BA677AF}.Debug|Win32.ActiveCfg = Debug|Win32

-		{738AB617-12DE-4717-9F89-A2329BA677AF}.Debug|Win32.Build.0 = Debug|Win32

-		{738AB617-12DE-4717-9F89-A2329BA677AF}.Release|Win32.ActiveCfg = Release|Win32

-		{738AB617-12DE-4717-9F89-A2329BA677AF}.Release|Win32.Build.0 = Release|Win32

-		{C8ADD1C0-6848-4081-A3CA-17197150FCAE}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C8ADD1C0-6848-4081-A3CA-17197150FCAE}.Debug|Win32.Build.0 = Debug|Win32

-		{C8ADD1C0-6848-4081-A3CA-17197150FCAE}.Release|Win32.ActiveCfg = Release|Win32

-		{C8ADD1C0-6848-4081-A3CA-17197150FCAE}.Release|Win32.Build.0 = Release|Win32

-		{5FCF9633-6CEE-40B2-A906-528E50C067D2}.Debug|Win32.ActiveCfg = Debug|Win32

-		{5FCF9633-6CEE-40B2-A906-528E50C067D2}.Debug|Win32.Build.0 = Debug|Win32

-		{5FCF9633-6CEE-40B2-A906-528E50C067D2}.Release|Win32.ActiveCfg = Release|Win32

-		{5FCF9633-6CEE-40B2-A906-528E50C067D2}.Release|Win32.Build.0 = Release|Win32

-		{D9C3A8F1-4E55-4CE2-8142-FB32D694F45E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D9C3A8F1-4E55-4CE2-8142-FB32D694F45E}.Debug|Win32.Build.0 = Debug|Win32

-		{D9C3A8F1-4E55-4CE2-8142-FB32D694F45E}.Release|Win32.ActiveCfg = Release|Win32

-		{D9C3A8F1-4E55-4CE2-8142-FB32D694F45E}.Release|Win32.Build.0 = Release|Win32

-		{CB5B1E1D-CE35-4A00-A42E-111646785BC4}.Debug|Win32.ActiveCfg = Debug|Win32

-		{CB5B1E1D-CE35-4A00-A42E-111646785BC4}.Debug|Win32.Build.0 = Debug|Win32

-		{CB5B1E1D-CE35-4A00-A42E-111646785BC4}.Release|Win32.ActiveCfg = Release|Win32

-		{CB5B1E1D-CE35-4A00-A42E-111646785BC4}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_annotator_dump", "src\plugin_annotator_dump.vcproj", "{0BC37546-5E6B-4383-9984-EF348B9FB966}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_tokenizer", "src\plugin_tokenizer.vcproj", "{05B599CC-FBF4-4D21-8DAF-4DCAE35A116A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_casserializer", "src\test_casserializer.vcproj", "{C1CC67C7-6514-4C9A-88B6-02678AA4DD5B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_engine", "src\test_engine.vcproj", "{EC9D70CD-3EAB-45F7-B779-5D82370BFF5B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_language", "src\test_language.vcproj", "{562C331B-2F3C-4F39-8A7C-ECD9611D1E25}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_typepriority", "src\test_typepriority.vcproj", "{2A4A561A-F304-4280-9238-DD2C1C82F8AE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_iterators", "src\test_iterators.vcproj", "{02C73C58-59FF-494D-95C6-11CF049217BD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cas", "src\test_cas.vcproj", "{87F00969-FF24-4446-A128-2F3EA5D00DE1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_sofa", "src\test_sofa.vcproj", "{8AB85254-F10F-45E9-9C86-14350802733C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xcasdeserialization", "src\test_xcasdeserialization.vcproj", "{23C6D0B9-1C35-4F32-A579-E8887492E841}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SofaStreamHandlerFile", "src\SofaStreamHandlerFile.vcproj", "{D72FCAE5-A23C-44B0-BC67-7433460F7DD6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_primitivetypes", "src\test_primitivetypes.vcproj", "{738AB617-12DE-4717-9F89-A2329BA677AF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleTextSegmenter", "src\SimpleTextSegmenter.vcproj", "{C8ADD1C0-6848-4081-A3CA-17197150FCAE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MeetingAnnotator", "src\MeetingAnnotator.vcproj", "{5FCF9633-6CEE-40B2-A906-528E50C067D2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextSegmentConsumer", "src\TextSegmentConsumer.vcproj", "{D9C3A8F1-4E55-4CE2-8142-FB32D694F45E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xmideserialization", "src\test_xmideserialization.vcproj", "{CB5B1E1D-CE35-4A00-A42E-111646785BC4}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0BC37546-5E6B-4383-9984-EF348B9FB966}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0BC37546-5E6B-4383-9984-EF348B9FB966}.Debug|Win32.Build.0 = Debug|Win32
+		{0BC37546-5E6B-4383-9984-EF348B9FB966}.Release|Win32.ActiveCfg = Release|Win32
+		{0BC37546-5E6B-4383-9984-EF348B9FB966}.Release|Win32.Build.0 = Release|Win32
+		{05B599CC-FBF4-4D21-8DAF-4DCAE35A116A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{05B599CC-FBF4-4D21-8DAF-4DCAE35A116A}.Debug|Win32.Build.0 = Debug|Win32
+		{05B599CC-FBF4-4D21-8DAF-4DCAE35A116A}.Release|Win32.ActiveCfg = Release|Win32
+		{05B599CC-FBF4-4D21-8DAF-4DCAE35A116A}.Release|Win32.Build.0 = Release|Win32
+		{C1CC67C7-6514-4C9A-88B6-02678AA4DD5B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C1CC67C7-6514-4C9A-88B6-02678AA4DD5B}.Debug|Win32.Build.0 = Debug|Win32
+		{C1CC67C7-6514-4C9A-88B6-02678AA4DD5B}.Release|Win32.ActiveCfg = Release|Win32
+		{C1CC67C7-6514-4C9A-88B6-02678AA4DD5B}.Release|Win32.Build.0 = Release|Win32
+		{EC9D70CD-3EAB-45F7-B779-5D82370BFF5B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EC9D70CD-3EAB-45F7-B779-5D82370BFF5B}.Debug|Win32.Build.0 = Debug|Win32
+		{EC9D70CD-3EAB-45F7-B779-5D82370BFF5B}.Release|Win32.ActiveCfg = Release|Win32
+		{EC9D70CD-3EAB-45F7-B779-5D82370BFF5B}.Release|Win32.Build.0 = Release|Win32
+		{562C331B-2F3C-4F39-8A7C-ECD9611D1E25}.Debug|Win32.ActiveCfg = Debug|Win32
+		{562C331B-2F3C-4F39-8A7C-ECD9611D1E25}.Debug|Win32.Build.0 = Debug|Win32
+		{562C331B-2F3C-4F39-8A7C-ECD9611D1E25}.Release|Win32.ActiveCfg = Release|Win32
+		{562C331B-2F3C-4F39-8A7C-ECD9611D1E25}.Release|Win32.Build.0 = Release|Win32
+		{2A4A561A-F304-4280-9238-DD2C1C82F8AE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2A4A561A-F304-4280-9238-DD2C1C82F8AE}.Debug|Win32.Build.0 = Debug|Win32
+		{2A4A561A-F304-4280-9238-DD2C1C82F8AE}.Release|Win32.ActiveCfg = Release|Win32
+		{2A4A561A-F304-4280-9238-DD2C1C82F8AE}.Release|Win32.Build.0 = Release|Win32
+		{02C73C58-59FF-494D-95C6-11CF049217BD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{02C73C58-59FF-494D-95C6-11CF049217BD}.Debug|Win32.Build.0 = Debug|Win32
+		{02C73C58-59FF-494D-95C6-11CF049217BD}.Release|Win32.ActiveCfg = Release|Win32
+		{02C73C58-59FF-494D-95C6-11CF049217BD}.Release|Win32.Build.0 = Release|Win32
+		{87F00969-FF24-4446-A128-2F3EA5D00DE1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{87F00969-FF24-4446-A128-2F3EA5D00DE1}.Debug|Win32.Build.0 = Debug|Win32
+		{87F00969-FF24-4446-A128-2F3EA5D00DE1}.Release|Win32.ActiveCfg = Release|Win32
+		{87F00969-FF24-4446-A128-2F3EA5D00DE1}.Release|Win32.Build.0 = Release|Win32
+		{8AB85254-F10F-45E9-9C86-14350802733C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8AB85254-F10F-45E9-9C86-14350802733C}.Debug|Win32.Build.0 = Debug|Win32
+		{8AB85254-F10F-45E9-9C86-14350802733C}.Release|Win32.ActiveCfg = Release|Win32
+		{8AB85254-F10F-45E9-9C86-14350802733C}.Release|Win32.Build.0 = Release|Win32
+		{23C6D0B9-1C35-4F32-A579-E8887492E841}.Debug|Win32.ActiveCfg = Debug|Win32
+		{23C6D0B9-1C35-4F32-A579-E8887492E841}.Debug|Win32.Build.0 = Debug|Win32
+		{23C6D0B9-1C35-4F32-A579-E8887492E841}.Release|Win32.ActiveCfg = Release|Win32
+		{23C6D0B9-1C35-4F32-A579-E8887492E841}.Release|Win32.Build.0 = Release|Win32
+		{D72FCAE5-A23C-44B0-BC67-7433460F7DD6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D72FCAE5-A23C-44B0-BC67-7433460F7DD6}.Debug|Win32.Build.0 = Debug|Win32
+		{D72FCAE5-A23C-44B0-BC67-7433460F7DD6}.Release|Win32.ActiveCfg = Release|Win32
+		{D72FCAE5-A23C-44B0-BC67-7433460F7DD6}.Release|Win32.Build.0 = Release|Win32
+		{738AB617-12DE-4717-9F89-A2329BA677AF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{738AB617-12DE-4717-9F89-A2329BA677AF}.Debug|Win32.Build.0 = Debug|Win32
+		{738AB617-12DE-4717-9F89-A2329BA677AF}.Release|Win32.ActiveCfg = Release|Win32
+		{738AB617-12DE-4717-9F89-A2329BA677AF}.Release|Win32.Build.0 = Release|Win32
+		{C8ADD1C0-6848-4081-A3CA-17197150FCAE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C8ADD1C0-6848-4081-A3CA-17197150FCAE}.Debug|Win32.Build.0 = Debug|Win32
+		{C8ADD1C0-6848-4081-A3CA-17197150FCAE}.Release|Win32.ActiveCfg = Release|Win32
+		{C8ADD1C0-6848-4081-A3CA-17197150FCAE}.Release|Win32.Build.0 = Release|Win32
+		{5FCF9633-6CEE-40B2-A906-528E50C067D2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5FCF9633-6CEE-40B2-A906-528E50C067D2}.Debug|Win32.Build.0 = Debug|Win32
+		{5FCF9633-6CEE-40B2-A906-528E50C067D2}.Release|Win32.ActiveCfg = Release|Win32
+		{5FCF9633-6CEE-40B2-A906-528E50C067D2}.Release|Win32.Build.0 = Release|Win32
+		{D9C3A8F1-4E55-4CE2-8142-FB32D694F45E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D9C3A8F1-4E55-4CE2-8142-FB32D694F45E}.Debug|Win32.Build.0 = Debug|Win32
+		{D9C3A8F1-4E55-4CE2-8142-FB32D694F45E}.Release|Win32.ActiveCfg = Release|Win32
+		{D9C3A8F1-4E55-4CE2-8142-FB32D694F45E}.Release|Win32.Build.0 = Release|Win32
+		{CB5B1E1D-CE35-4A00-A42E-111646785BC4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CB5B1E1D-CE35-4A00-A42E-111646785BC4}.Debug|Win32.Build.0 = Debug|Win32
+		{CB5B1E1D-CE35-4A00-A42E-111646785BC4}.Release|Win32.ActiveCfg = Release|Win32
+		{CB5B1E1D-CE35-4A00-A42E-111646785BC4}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/src/uimacpp.sln b/src/uimacpp.sln
index 84d2d15..7ab8980 100644
--- a/src/uimacpp.sln
+++ b/src/uimacpp.sln
@@ -1,48 +1,48 @@
-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uimacpp", "uimacpp.vcproj", "{70B51CFD-850A-44D1-BF14-A44A1CB27550}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{023122EC-3490-49E1-ABE6-B7D755E757B0}"

-	ProjectSection(ProjectDependencies) = postProject

-		{70B51CFD-850A-44D1-BF14-A44A1CB27550} = {70B51CFD-850A-44D1-BF14-A44A1CB27550}

-		{9F230EC0-DB18-46AC-BB02-DC1E6974A463} = {9F230EC0-DB18-46AC-BB02-DC1E6974A463}

-		{BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A} = {BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runaecpp", "runaecpp.vcproj", "{9F230EC0-DB18-46AC-BB02-DC1E6974A463}"

-	ProjectSection(ProjectDependencies) = postProject

-		{70B51CFD-850A-44D1-BF14-A44A1CB27550} = {70B51CFD-850A-44D1-BF14-A44A1CB27550}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deployCppService", "deployCppService.vcproj", "{BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}"

-	ProjectSection(ProjectDependencies) = postProject

-		{70B51CFD-850A-44D1-BF14-A44A1CB27550} = {70B51CFD-850A-44D1-BF14-A44A1CB27550}

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{70B51CFD-850A-44D1-BF14-A44A1CB27550}.Debug|Win32.ActiveCfg = Debug|Win32

-		{70B51CFD-850A-44D1-BF14-A44A1CB27550}.Debug|Win32.Build.0 = Debug|Win32

-		{70B51CFD-850A-44D1-BF14-A44A1CB27550}.Release|Win32.ActiveCfg = Release|Win32

-		{70B51CFD-850A-44D1-BF14-A44A1CB27550}.Release|Win32.Build.0 = Release|Win32

-		{023122EC-3490-49E1-ABE6-B7D755E757B0}.Debug|Win32.ActiveCfg = Debug|Win32

-		{023122EC-3490-49E1-ABE6-B7D755E757B0}.Debug|Win32.Build.0 = Debug|Win32

-		{023122EC-3490-49E1-ABE6-B7D755E757B0}.Release|Win32.ActiveCfg = Release|Win32

-		{023122EC-3490-49E1-ABE6-B7D755E757B0}.Release|Win32.Build.0 = Release|Win32

-		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Debug|Win32.ActiveCfg = Debug|Win32

-		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Debug|Win32.Build.0 = Debug|Win32

-		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Release|Win32.ActiveCfg = Release|Win32

-		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Release|Win32.Build.0 = Release|Win32

-		{BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}.Debug|Win32.Build.0 = Debug|Win32

-		{BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}.Release|Win32.ActiveCfg = Release|Win32

-		{BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uimacpp", "uimacpp.vcproj", "{70B51CFD-850A-44D1-BF14-A44A1CB27550}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{023122EC-3490-49E1-ABE6-B7D755E757B0}"
+	ProjectSection(ProjectDependencies) = postProject
+		{70B51CFD-850A-44D1-BF14-A44A1CB27550} = {70B51CFD-850A-44D1-BF14-A44A1CB27550}
+		{9F230EC0-DB18-46AC-BB02-DC1E6974A463} = {9F230EC0-DB18-46AC-BB02-DC1E6974A463}
+		{BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A} = {BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runaecpp", "runaecpp.vcproj", "{9F230EC0-DB18-46AC-BB02-DC1E6974A463}"
+	ProjectSection(ProjectDependencies) = postProject
+		{70B51CFD-850A-44D1-BF14-A44A1CB27550} = {70B51CFD-850A-44D1-BF14-A44A1CB27550}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deployCppService", "deployCppService.vcproj", "{BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{70B51CFD-850A-44D1-BF14-A44A1CB27550} = {70B51CFD-850A-44D1-BF14-A44A1CB27550}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{70B51CFD-850A-44D1-BF14-A44A1CB27550}.Debug|Win32.ActiveCfg = Debug|Win32
+		{70B51CFD-850A-44D1-BF14-A44A1CB27550}.Debug|Win32.Build.0 = Debug|Win32
+		{70B51CFD-850A-44D1-BF14-A44A1CB27550}.Release|Win32.ActiveCfg = Release|Win32
+		{70B51CFD-850A-44D1-BF14-A44A1CB27550}.Release|Win32.Build.0 = Release|Win32
+		{023122EC-3490-49E1-ABE6-B7D755E757B0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{023122EC-3490-49E1-ABE6-B7D755E757B0}.Debug|Win32.Build.0 = Debug|Win32
+		{023122EC-3490-49E1-ABE6-B7D755E757B0}.Release|Win32.ActiveCfg = Release|Win32
+		{023122EC-3490-49E1-ABE6-B7D755E757B0}.Release|Win32.Build.0 = Release|Win32
+		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Debug|Win32.Build.0 = Debug|Win32
+		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Release|Win32.ActiveCfg = Release|Win32
+		{9F230EC0-DB18-46AC-BB02-DC1E6974A463}.Release|Win32.Build.0 = Release|Win32
+		{BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}.Debug|Win32.Build.0 = Debug|Win32
+		{BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}.Release|Win32.ActiveCfg = Release|Win32
+		{BB5DD1BE-CCC4-42DD-A8C7-A607D1970A5A}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/src/uimacpp.vcproj b/src/uimacpp.vcproj
index c49e441..50f2316 100644
--- a/src/uimacpp.vcproj
+++ b/src/uimacpp.vcproj
@@ -1,973 +1,973 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="uimacpp"

-	ProjectGUID="{70B51CFD-850A-44D1-BF14-A44A1CB27550}"

-	RootNamespace="uimacpp"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\Debug\lib"

-			IntermediateDirectory="..\Debug\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine="checkEnvVars"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="/EHac"

-				Optimization="0"

-				AdditionalIncludeDirectories="cas;framework;jni;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(JAVA_HOME)\include&quot;;&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="_UIMA_LIBRARY_;UIMA_VERSION=1.4.4;UIMA_SUPPRESS_TIMING;WIN32;_WINDOWS;_USRDLL;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				IgnoreStandardIncludePath="false"

-				GeneratePreprocessedFile="0"

-				MinimalRebuild="false"

-				ExceptionHandling="0"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib"

-				OutputFile="$(OutDir)\..\bin\uimaD.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				GenerateMapFile="true"

-				MapFileName="$(OutDir)\$(TargetName).map"

-				SubSystem="2"

-				OptimizeReferences="0"

-				EnableCOMDATFolding="0"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\Release\lib"

-			IntermediateDirectory="..\Release\$(ProjectName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine="checkEnvVars"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="/EHac"

-				Optimization="3"

-				AdditionalIncludeDirectories="cas;framework;jni;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(JAVA_HOME)\include&quot;;&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"

-				PreprocessorDefinitions="_UIMA_LIBRARY_;UIMA_VERSION=1.4.4;UIMA_SUPPRESS_TIMING;WIN32;_WINDOWS;_USRDLL;TRACEOFF;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib"

-				OutputFile="$(OutDir)\..\bin\uima.dll"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;"

-				GenerateDebugInformation="false"

-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

-				GenerateMapFile="true"

-				MapFileName="$(OutDir)\$(TargetName).map"

-				SubSystem="2"

-				OptimizeReferences="0"

-				EnableCOMDATFolding="0"

-				ImportLibrary="$(OutDir)/$(TargetName).lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="framework\annotator.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\annotator_context.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\annotator_mgr.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\arrayfs.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\cas.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\casdefinition.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\casexception.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\casiterator.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\caspool.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\caswriter_abase.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\config_param.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\consoleui.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\cp2ucnvrt.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\dottypesystemwriter.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\engine.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\exceptions.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\featurestructure.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\fsfilterbuilder.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\fsindex.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\fsindexrepository.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\fsiterator.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\ftools.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\internal_aggregate_engine.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\internal_capability_container.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\internal_casdeserializer.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\internal_casimpl.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\internal_casserializer.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\internal_engine_base.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\internal_fspromoter.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\internal_jedii_engine.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\internal_primitive_engine.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\internal_serializedcas.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\internal_typeshortcuts.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\internal_xmlconstants.cpp"

-				>

-			</File>

-			<File

-				RelativePath="jni\jni.cpp"

-				>

-			</File>

-			<File

-				RelativePath="jni\jni_string.cpp"

-				>

-			</File>

-			<File

-				RelativePath="jni\jni_utils.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\language.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\listfs.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\log.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\lowlevel_fsheap.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\lowlevel_index.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\lowlevel_indexcomparator.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\lowlevel_indexdefinition.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\lowlevel_indexrepository.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\lowlevel_internal_indexes.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\lowlevel_typesystem.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\res_abase.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\res_annotator.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\resmgr.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\sofastream.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\strtools.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\taemetadata.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\taespecifier.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\taespecifierbuilder.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\timedatetools.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\token_properties.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\typenamespace.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\typesystem.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\typesystemdescription.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\u2cpcnvrt.cpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\unistrref.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\xcasdeserializer.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\xcasdeserializer_handler.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\cas\xmideserializer.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\cas\xmideserializer_handler.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\cas\xmiwriter.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\xmlerror_handler.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\xmltypesystemreader.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\xmltypesystemwriter.cpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\xmlwriter.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="framework\uima\annotator.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\annotator_abase.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\annotator_aux.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\annotator_context.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\annotator_generic.inl"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\annotator_mgr.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\annotator_timing.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\arrayfs.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\assertmsg.h"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\capability.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\cas.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\casconsumer_generic.inl"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\casdefinition.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\casexception.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\casiterator.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\caspool.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\caswriter_abase.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\ccsid.hpp"

-				>

-			</File>

-			<File

-				RelativePath="jni\uima\com_ibm_itu_JTafEngine.h"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\comp_ids.h"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\config_param.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\configure.h"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\consoleui.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\cp2ucnvrt.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\dirwalk.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\dllfile.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\dottypesystemwriter.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\endian.h"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\engine.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\engine_state.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\envvar.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\envvars.h"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\err_ids.h"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\exceptions.hpp"

-				>

-			</File>

-			<File

-				RelativePath=".\cas\uima\featurestructure.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\filename.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\filter_abase.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\fsfilterbuilder.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\fsindex.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\fsindexrepository.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\fsiterator.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\ftools.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\importdescription.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\internal_aggregate_engine.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\internal_capability_container.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\internal_casdeserializer.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\internal_casimpl.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\internal_casserializer.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\internal_engine_base.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\internal_fspromoter.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\internal_fsvalue_accessors.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\internal_jedii_engine.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\internal_primitive_engine.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\internal_serializedcas.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\internal_tcasimpl.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\internal_typeshortcuts.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\internal_xmlconstants.hpp"

-				>

-			</File>

-			<File

-				RelativePath="jni\uima\jni.hpp"

-				>

-			</File>

-			<File

-				RelativePath="jni\uima\jni_string.hpp"

-				>

-			</File>

-			<File

-				RelativePath="jni\uima\jni_utils.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\language.hpp"

-				>

-			</File>

-			<File

-				RelativePath=".\cas\uima\listfs.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\location.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\log.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\lowlevel_defaultfsiterator.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\lowlevel_fsfilter.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\lowlevel_fsheap.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\lowlevel_index.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\lowlevel_indexcomparator.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\lowlevel_indexdefinition.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\lowlevel_indexiterator.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\lowlevel_indexrepository.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\lowlevel_internal_heap.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\lowlevel_internal_indexes.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\lowlevel_internal_indexfactory.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\lowlevel_typedefs.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\lowlevel_typesystem.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\macros.h"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\msg.h"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\msgstrtab.h"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\pragmas.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\res_abase.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\res_annotator.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\resmgr.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\result_specification.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\sofaid.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\sofamapping.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\sofastream.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\sofastreamhandler.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\stltools.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\strconvert.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\strtools.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\taemetadata.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\taespecifier.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\taespecifierbuilder.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\tcas.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\text.h"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\timedatetools.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\token_properties.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\trace.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\type_or_feature.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\typenamespace.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\types.h"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\typesystem.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\typesystemdescription.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\u2cpcnvrt.hpp"

-				>

-			</File>

-			<File

-				RelativePath="framework\uima\unistrref.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\xcasdeserializer.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\xcasdeserializer_handler.hpp"

-				>

-			</File>

-			<File

-				RelativePath=".\cas\uima\xmideserializer.hpp"

-				>

-			</File>

-			<File

-				RelativePath=".\cas\uima\xmideserializer_handler.hpp"

-				>

-			</File>

-			<File

-				RelativePath=".\cas\uima\xmishareddata.hpp"

-				>

-			</File>

-			<File

-				RelativePath=".\cas\uima\xmiwriter.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\xmlerror_handler.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\xmltypesystemreader.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\xmltypesystemwriter.hpp"

-				>

-			</File>

-			<File

-				RelativePath="cas\uima\xmlwriter.hpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="uimacpp"
+	ProjectGUID="{70B51CFD-850A-44D1-BF14-A44A1CB27550}"
+	RootNamespace="uimacpp"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\Debug\lib"
+			IntermediateDirectory="..\Debug\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="checkEnvVars"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/EHac"
+				Optimization="0"
+				AdditionalIncludeDirectories="cas;framework;jni;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(JAVA_HOME)\include&quot;;&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="_UIMA_LIBRARY_;UIMA_VERSION=1.4.4;UIMA_SUPPRESS_TIMING;WIN32;_WINDOWS;_USRDLL;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				IgnoreStandardIncludePath="false"
+				GeneratePreprocessedFile="0"
+				MinimalRebuild="false"
+				ExceptionHandling="0"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib"
+				OutputFile="$(OutDir)\..\bin\uimaD.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)\$(TargetName).map"
+				SubSystem="2"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\Release\lib"
+			IntermediateDirectory="..\Release\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="checkEnvVars"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/EHac"
+				Optimization="3"
+				AdditionalIncludeDirectories="cas;framework;jni;&quot;$(APR_HOME)\include&quot;;&quot;$(ICU_HOME)\include&quot;;&quot;$(XERCES_HOME)\include&quot;;&quot;$(JAVA_HOME)\include&quot;;&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(UIMACPP_HOME)\include&quot;;&quot;$(UIMACPP_HOME)\include\apr&quot;"
+				PreprocessorDefinitions="_UIMA_LIBRARY_;UIMA_VERSION=1.4.4;UIMA_SUPPRESS_TIMING;WIN32;_WINDOWS;_USRDLL;TRACEOFF;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_2.lib icuuc.lib libapr-1.lib"
+				OutputFile="$(OutDir)\..\bin\uima.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;$(APR_HOME)\Release&quot;;&quot;$(XERCES_HOME)\lib&quot;;&quot;$(ICU_HOME)\lib&quot;;&quot;$(UIMACPP_HOME)\lib&quot;"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+				GenerateMapFile="true"
+				MapFileName="$(OutDir)\$(TargetName).map"
+				SubSystem="2"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="framework\annotator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\annotator_context.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\annotator_mgr.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\arrayfs.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\cas.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\casdefinition.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\casexception.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\casiterator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\caspool.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\caswriter_abase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\config_param.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\consoleui.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\cp2ucnvrt.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\dottypesystemwriter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\engine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\exceptions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\featurestructure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\fsfilterbuilder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\fsindex.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\fsindexrepository.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\fsiterator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\ftools.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\internal_aggregate_engine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\internal_capability_container.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\internal_casdeserializer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\internal_casimpl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\internal_casserializer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\internal_engine_base.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\internal_fspromoter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\internal_jedii_engine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\internal_primitive_engine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\internal_serializedcas.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\internal_typeshortcuts.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\internal_xmlconstants.cpp"
+				>
+			</File>
+			<File
+				RelativePath="jni\jni.cpp"
+				>
+			</File>
+			<File
+				RelativePath="jni\jni_string.cpp"
+				>
+			</File>
+			<File
+				RelativePath="jni\jni_utils.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\language.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\listfs.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\log.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\lowlevel_fsheap.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\lowlevel_index.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\lowlevel_indexcomparator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\lowlevel_indexdefinition.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\lowlevel_indexrepository.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\lowlevel_internal_indexes.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\lowlevel_typesystem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\res_abase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\res_annotator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\resmgr.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\sofastream.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\strtools.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\taemetadata.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\taespecifier.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\taespecifierbuilder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\timedatetools.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\token_properties.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\typenamespace.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\typesystem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\typesystemdescription.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\u2cpcnvrt.cpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\unistrref.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\xcasdeserializer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\xcasdeserializer_handler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cas\xmideserializer.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cas\xmideserializer_handler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cas\xmiwriter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\xmlerror_handler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\xmltypesystemreader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\xmltypesystemwriter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\xmlwriter.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="framework\uima\annotator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\annotator_abase.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\annotator_aux.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\annotator_context.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\annotator_generic.inl"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\annotator_mgr.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\annotator_timing.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\arrayfs.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\assertmsg.h"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\capability.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\cas.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\casconsumer_generic.inl"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\casdefinition.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\casexception.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\casiterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\caspool.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\caswriter_abase.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\ccsid.hpp"
+				>
+			</File>
+			<File
+				RelativePath="jni\uima\com_ibm_itu_JTafEngine.h"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\comp_ids.h"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\config_param.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\configure.h"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\consoleui.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\cp2ucnvrt.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\dirwalk.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\dllfile.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\dottypesystemwriter.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\endian.h"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\engine.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\engine_state.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\envvar.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\envvars.h"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\err_ids.h"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\exceptions.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cas\uima\featurestructure.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\filename.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\filter_abase.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\fsfilterbuilder.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\fsindex.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\fsindexrepository.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\fsiterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\ftools.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\importdescription.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\internal_aggregate_engine.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\internal_capability_container.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\internal_casdeserializer.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\internal_casimpl.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\internal_casserializer.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\internal_engine_base.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\internal_fspromoter.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\internal_fsvalue_accessors.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\internal_jedii_engine.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\internal_primitive_engine.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\internal_serializedcas.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\internal_tcasimpl.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\internal_typeshortcuts.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\internal_xmlconstants.hpp"
+				>
+			</File>
+			<File
+				RelativePath="jni\uima\jni.hpp"
+				>
+			</File>
+			<File
+				RelativePath="jni\uima\jni_string.hpp"
+				>
+			</File>
+			<File
+				RelativePath="jni\uima\jni_utils.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\language.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cas\uima\listfs.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\location.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\log.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\lowlevel_defaultfsiterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\lowlevel_fsfilter.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\lowlevel_fsheap.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\lowlevel_index.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\lowlevel_indexcomparator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\lowlevel_indexdefinition.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\lowlevel_indexiterator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\lowlevel_indexrepository.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\lowlevel_internal_heap.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\lowlevel_internal_indexes.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\lowlevel_internal_indexfactory.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\lowlevel_typedefs.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\lowlevel_typesystem.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\macros.h"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\msg.h"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\msgstrtab.h"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\pragmas.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\res_abase.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\res_annotator.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\resmgr.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\result_specification.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\sofaid.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\sofamapping.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\sofastream.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\sofastreamhandler.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\stltools.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\strconvert.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\strtools.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\taemetadata.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\taespecifier.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\taespecifierbuilder.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\tcas.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\text.h"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\timedatetools.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\token_properties.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\trace.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\type_or_feature.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\typenamespace.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\types.h"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\typesystem.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\typesystemdescription.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\u2cpcnvrt.hpp"
+				>
+			</File>
+			<File
+				RelativePath="framework\uima\unistrref.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\xcasdeserializer.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\xcasdeserializer_handler.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cas\uima\xmideserializer.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cas\uima\xmideserializer_handler.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cas\uima\xmishareddata.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cas\uima\xmiwriter.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\xmlerror_handler.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\xmltypesystemreader.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\xmltypesystemwriter.hpp"
+				>
+			</File>
+			<File
+				RelativePath="cas\uima\xmlwriter.hpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/winmake.cmd b/src/winmake.cmd
index 6822d02..800c247 100644
--- a/src/winmake.cmd
+++ b/src/winmake.cmd
@@ -1,64 +1,64 @@
-@echo off

-

-REM   Licensed to the Apache Software Foundation (ASF) under one

-REM   or more contributor license agreements.  See the NOTICE file

-REM   distributed with this work for additional information

-REM   regarding copyright ownership.  The ASF licenses this file

-REM   to you under the Apache License, Version 2.0 (the

-REM   "License"); you may not use this file except in compliance

-REM   with the License.  You may obtain a copy of the License at

-REM

-REM    http://www.apache.org/licenses/LICENSE-2.0

-REM

-REM   Unless required by applicable law or agreed to in writing,

-REM   software distributed under the License is distributed on an

-REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-REM   KIND, either express or implied.  See the License for the

-REM   specific language governing permissions and limitations

-REM   under the License.

-

-setlocal

-

-REM Unset UIMACPP_HOME to avoid build problems

-set UIMACPP_HOME=

-

-REM need a Java JRE for the JNI interface

-if not exist %JAVA_HOME%\include\jni.h goto nojava

-

-REM Other requied dependencies

-if "%APR_HOME%"==""     goto noapr

-if "%ICU_HOME%"==""     goto noicu

-if "%XERCES_HOME%"==""  goto noxerces

-

-REM Optional dependency

-if "%ACTIVEMQ_HOME%"==""  (

-  echo WARNING: ACTIVEMQ_HOME not set, deployCppService will fail to build.

-)

-

-REM Start project build

-if "%~1" == "" (

- set OPERATION=/build release

-) else (

- set OPERATION=%1 %2 %3 %4 %5

-)

-echo devenv uimacpp.sln %OPERATION%

-devenv uimacpp.sln %OPERATION%

-goto end

-

-:noapr

-echo need APR_HOME to be set

-goto end

-

-:noicu

-echo need ICU_HOME to be set

-goto end

-

-:noxerces

-echo need XERCES_HOME to be set

-goto end

-

-:nojava

-echo JAVA_HOME is not set or does not contain include\jni.h

-

-:end

-endlocal

+@echo off
+
+REM   Licensed to the Apache Software Foundation (ASF) under one
+REM   or more contributor license agreements.  See the NOTICE file
+REM   distributed with this work for additional information
+REM   regarding copyright ownership.  The ASF licenses this file
+REM   to you under the Apache License, Version 2.0 (the
+REM   "License"); you may not use this file except in compliance
+REM   with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM   Unless required by applicable law or agreed to in writing,
+REM   software distributed under the License is distributed on an
+REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM   KIND, either express or implied.  See the License for the
+REM   specific language governing permissions and limitations
+REM   under the License.
+
+setlocal
+
+REM Unset UIMACPP_HOME to avoid build problems
+set UIMACPP_HOME=
+
+REM need a Java JRE for the JNI interface
+if not exist %JAVA_HOME%\include\jni.h goto nojava
+
+REM Other requied dependencies
+if "%APR_HOME%"==""     goto noapr
+if "%ICU_HOME%"==""     goto noicu
+if "%XERCES_HOME%"==""  goto noxerces
+
+REM Optional dependency
+if "%ACTIVEMQ_HOME%"==""  (
+  echo WARNING: ACTIVEMQ_HOME not set, deployCppService will fail to build.
+)
+
+REM Start project build
+if "%~1" == "" (
+ set OPERATION=/build release
+) else (
+ set OPERATION=%1 %2 %3 %4 %5
+)
+echo devenv uimacpp.sln %OPERATION%
+devenv uimacpp.sln %OPERATION%
+goto end
+
+:noapr
+echo need APR_HOME to be set
+goto end
+
+:noicu
+echo need ICU_HOME to be set
+goto end
+
+:noxerces
+echo need XERCES_HOME to be set
+goto end
+
+:nojava
+echo JAVA_HOME is not set or does not contain include\jni.h
+
+:end
+endlocal