svn commit: r1040595 - /uima/uimaj/trunk/uimaj-core/src/main/resources/org/apache/uima/cas/impl/xcas.properties

[sc...@apache.org]

Author: schor
Date: Tue Nov 30 16:02:03 2010
New Revision: 1040595

URL: http://svn.apache.org/viewvc?rev=1040595&view=rev
Log:
[UIMA-1922] Change error messages for deserialization of CASes for those which could come from either XCAS or XMI-CAS to indicate that (rather than say they're regarding XCAS only).

Modified:
    uima/uimaj/trunk/uimaj-core/src/main/resources/org/apache/uima/cas/impl/xcas.properties

Modified: uima/uimaj/trunk/uimaj-core/src/main/resources/org/apache/uima/cas/impl/xcas.properties
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/resources/org/apache/uima/cas/impl/xcas.properties?rev=1040595&r1=1040594&r2=1040595&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/resources/org/apache/uima/cas/impl/xcas.properties (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/resources/org/apache/uima/cas/impl/xcas.properties Tue Nov 30 16:02:03 2010
@@ -21,15 +21,15 @@
 #       both *XCAS* and *XMI-CAS*
 
 WRONG_ROOT_TAG = Error parsing XCAS from source {0} at line {1}, column {2}: expected <CAS> root tag but found: <{3}>.
-TEXT_EXPECTED = Error parsing XCAS from source {0} at line {1}, column {2}: expected text but found element: <{3}>.
+TEXT_EXPECTED = Error parsing XCAS or XMI-CAS from source {0} at line {1}, column {2}: expected text but found element: <{3}>.
 ARRAY_ELE_EXPECTED = Error parsing XCAS from source {0} at line {1}, column {2}: expected array element <i> but found: <{3}>.
 ARRAY_ELE_ATTRS = Error parsing XCAS from source {0} at line {1}, column {2}: array element <i> may not have attributes.
-UNKNOWN_TYPE = Error parsing XCAS from source {0} at line {1}, column {2}: unknown type: {3}.
-ILLEGAL_ID = Error parsing XCAS from source {0} at line {1}, column {2}: value of _id attribute must be integer, but is: {3}.
+UNKNOWN_TYPE = Error parsing XCAS or XMI-CAS from source {0} at line {1}, column {2}: unknown type: {3}.
+ILLEGAL_ID = Error parsing XCAS or XMI-CAS from source {0} at line {1}, column {2}: value of _id attribute must be integer, but is: {3}.
 ILLEGAL_ARRAY_SIZE = Error parsing XCAS from source {0} at line {1}, column {2}: size of array must be >= 0, but is: {3}.
 ILLEGAL_ARRAY_ATTR = Error parsing XCAS from source {0} at line {1}, column {2}: unknown attribute for array type: {3}.
-UNKNOWN_FEATURE = Error parsing XCAS from source {0} at line {1}, column {2}: unknown feature: {3}.
-INTEGER_EXPECTED = Error parsing XCAS from source {0} at line {1}, column {2}: expected integer value, but found: {3}.
-FLOAT_EXPECTED = Error parsing XCAS from source {0} at line {1}, column {2}: expected float value, but found: {3}.
+UNKNOWN_FEATURE = Error parsing XCAS or XMI-CAS from source {0} at line {1}, column {2}: unknown feature: {3}.
+INTEGER_EXPECTED = Error parsing XCAS or XMI-CAS from source {0} at line {1}, column {2}: expected integer value, but found: {3}.
+FLOAT_EXPECTED = Error parsing XCAS or XMI-CAS from source {0} at line {1}, column {2}: expected float value, but found: {3}.
 EXCESS_ARRAY_ELE = Error parsing XCAS from source {0} at line {1}, column {2}: number of array elements exceeds specified array size.
 UNKNOWN_ID = Error parsing XMI-CAS from source {0} at line {1}, column {2}: xmi id {3} is referenced but not defined.