cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r806627 - in /cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript: Messages.properties ParticleInfo.java
Date Fri, 21 Aug 2009 16:24:21 GMT
Author: bimargulies
Date: Fri Aug 21 16:24:21 2009
New Revision: 806627

URL: http://svn.apache.org/viewvc?rev=806627&view=rev
Log:
Merge branch 'benson' into trunk

Conflicts:
	rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties
	rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java

Modified:
    cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties
    cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java

Modified: cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties?rev=806627&r1=806626&r2=806627&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties (original)
+++ cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/Messages.properties Fri
Aug 21 16:24:21 2009
@@ -33,4 +33,4 @@
 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} has no type.
+ELEMENT_WITH_NO_TYPE=Element {0} {1} has no type.

Modified: cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java?rev=806627&r1=806626&r2=806627&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java (original)
+++ cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java Fri
Aug 21 16:24:21 2009
@@ -206,7 +206,8 @@
         elementInfo.type = element.getSchemaType();
         if (elementInfo.type == null) {
             if (element.getSchemaTypeName() == null) {
-                Message message = new Message("ELEMENT_WITH_NO_TYPE", LOG, XmlSchemaUtils
+                Message message = new Message("ELEMENT_WITH_NO_TYPE", LOG, element.getName(),
+                                              XmlSchemaUtils
                                               .cleanedUpSchemaSource(elementInfo.getParticle()));
                 LOG.severe(message.toString());
                 throw new UnsupportedConstruct(message);



Mime
View raw message