You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/02/27 18:27:41 UTC
svn commit: r1450865 - in /cxf/branches/2.7.x-fixes:
api/src/main/java/org/apache/cxf/common/xmlschema/
rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/
rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/
Author: dkulp
Date: Wed Feb 27 17:27:41 2013
New Revision: 1450865
URL: http://svn.apache.org/r1450865
Log:
Merged revisions 1450860 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1450860 | dkulp | 2013-02-27 09:25:44 -0800 (Wed, 27 Feb 2013) | 2 lines
[CXF-4820] Fix some Message.properties that are in the wrong place, no longer used, etc...
........
Modified:
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties
cxf/branches/2.7.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/Messages.properties
cxf/branches/2.7.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/Messages.properties
Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties?rev=1450865&r1=1450864&r2=1450865&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties Wed Feb 27 17:27:41 2013
@@ -19,12 +19,11 @@
#
#
MULTIPLE_ANY= Multiple xs:any constructs in {0}.
-ELEMENT_MISSING_TYPE= Root element {0} refers to undefined type {1} in {2}.
UNSUPPORTED_TYPE_CONSTRUCT= Unsupported schema construct {0}.
-ELEMENT_DANGLING_REFERENCE= Element {0} refers to undefined element {1}.
NON_SEQUENCE_PARTICLE=Limitation: Type {0} is not defined as a sequence. {1}
-NON_ELEMENT_CHILD=Limitation: Non-Element sequence member {0} of {1}. {2}
-ABSTRACT_ELEMENT=Limitation: Abstract element {0} of {1}. {2}
ELEMENT_HAS_NO_TYPE=Element {0} has no type in the schema. {1}
ELEMENT_TYPE_MISSING=Element {0} references type {1} which is not defined.
-ELEMENT_SCHEMA_MISSING=Element {0} contained in missing schema.
+GROUP_CHILD=Limitation: unsupported construct {0} found in {1}. {2}
+NON_PARTICLE_CHILD=Limitation: Non-particle sequence member {0} of {1}. {2}
+NON_ANNOTATED_ATTRIBUTE=Limitation: Non-attribute member {0} or {1}. {2}
+EXOTIC_ATTRIBUTE=Limitation: unsupported non-attribute {0} found in {1}. {2}
Modified: cxf/branches/2.7.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/Messages.properties?rev=1450865&r1=1450864&r2=1450865&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/Messages.properties (original)
+++ cxf/branches/2.7.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/Messages.properties Wed Feb 27 17:27:41 2013
@@ -19,18 +19,9 @@
#
#
NON_SEQUENCE_PARTICLE=JavaScript limitation: Type {0} is not defined as a sequence. {1}
-NON_ELEMENT_CHILD=JavaScript limitation: Non-Element sequence member {0} of {1}. {2}
-NON_PARTICLE_CHILD=JavaScript limitation: Non-particle sequence member {0} of {1}. {2}
-NON_ANNOTATED_ATTRIBUTE=JavaScript limitation: Non-attribute member {0} or {1}. {2}
-EXOTIC_ATTRIBUTE=JavaScript limitation: unsupported non-attribute {0} found in {1}. {2}
-GROUP_CHILD=JavaScript limitation: unsupported xs:group {0} found in {1}. {2}
ABSTRACT_ELEMENT=JavaScript limitation: Abstract element {0} of {1}. {2}
-ELEMENT_HAS_NO_TYPE=Element {0} has no type in the schema. {1}
-ELEMENT_TYPE_MISSING=Element {0} references type {1} which is not defined.
-ELEMENT_SCHEMA_MISSING=Element {0} contained in missing schema.
+]ELEMENT_SCHEMA_MISSING=Element {0} contained in missing schema.
IMPOSSIBLE_GLOBAL_ITEM= JavaScript limitation: Element or xs:any at {0} used in a context that requires a global name, but it, and its type, are anonymous.
MISSING_TYPE=Type {0} is missing from the WSDL schema for element {1}. {2}
-ATTRIBUTE_DANGLING_REFERENCE=Attribute {0} refers to undefined attribute {1}.
ELEMENT_DANGLING_REFERENCE= Element {0} refers to undefined element {1}.
UNSUPPORTED_ATTRIBUTE_ITEM= Unsupported {0} in {1}.
-ELEMENT_WITH_NO_TYPE=Element {0} {1} has no type.
Modified: cxf/branches/2.7.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/Messages.properties?rev=1450865&r1=1450864&r2=1450865&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/Messages.properties (original)
+++ cxf/branches/2.7.x-fixes/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/Messages.properties Wed Feb 27 17:27:41 2013
@@ -23,8 +23,5 @@ ELEMENT_MISSING_TYPE= Root element {0} r
UNSUPPORTED_TYPE_CONSTRUCT= Unsupported schema construct {0}.
ELEMENT_DANGLING_REFERENCE= Element {0} refers to undefined element {1}.
NON_SEQUENCE_PARTICLE=JavaScript limitation: Type {0} is not defined as a sequence. {1}
-NON_ELEMENT_CHILD=JavaScript limitation: Non-Element sequence member {0} of {1}. {2}
ABSTRACT_ELEMENT=JavaScript limitation: Abstract element {0} of {1}. {2}
-ELEMENT_HAS_NO_TYPE=Element {0} has no type in the schema. {1}
-ELEMENT_TYPE_MISSING=Element {0} references type {1} which is not defined.
ELEMENT_SCHEMA_MISSING=Element {0} contained in missing schema.
\ No newline at end of file