cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r648008 - in /incubator/cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/xmlschema/ rt/core/src/main/java/org/apache/cxf/service/ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ rt/frontend/si...
Date Mon, 14 Apr 2008 21:32:07 GMT
Author: dkulp
Date: Mon Apr 14 14:32:05 2008
New Revision: 648008

URL: http://svn.apache.org/viewvc?rev=648008&view=rev
Log:
Merged revisions 648006 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r648006 | dkulp | 2008-04-14 17:28:08 -0400 (Mon, 14 Apr 2008) | 3 lines
  
  [CXF-1523]Fix more empty namespace issues with Aegis
  Make the ServiceModelSchemaValidator stuff level FINE instead of INFO and only run if it
really would log something.
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
    incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
    incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java?rev=648008&r1=648007&r2=648008&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
Mon Apr 14 14:32:05 2008
@@ -236,7 +236,7 @@
         XmlSchemaElement element = schemaCollection.getElementByQName(elementQName);
         if (element == null) {
             throw new InvalidXmlSchemaReferenceException(referrer 
-                                                         + " references element "
+                                                         + " references non-existent element
"
                                                          + elementQName);
         }
     }
@@ -245,7 +245,7 @@
         XmlSchemaType type = schemaCollection.getTypeByQName(typeQName);
         if (type == null) {
             throw new InvalidXmlSchemaReferenceException(referrer 
-                                                         + " references type "
+                                                         + " references non-existent type
"
                                                          + typeQName);
         }
     }

Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java?rev=648008&r1=648007&r2=648008&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
Mon Apr 14 14:32:05 2008
@@ -50,9 +50,11 @@
             } catch (InvalidXmlSchemaReferenceException ixsre) {
                 complaints.append(part.getName() + " part element name " + ixsre.getMessage()
+ "\n");
             }
-        } else {
+        } else if (!part.getMessageInfo().getOperation().isUnwrapped()) {
             if (part.getTypeQName() == null) {
-                complaints.append(part.getName() + " part type QName null.\n");
+                complaints.append(part.getName() + " of message " 
+                                  + part.getMessageInfo().getName() 
+                                  + " part type QName null.\n");
             } else {
                 try {
                     schemaCollection.validateTypeName(part.getName(), part.getTypeQName());

Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java?rev=648008&r1=648007&r2=648008&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
Mon Apr 14 14:32:05 2008
@@ -94,7 +94,7 @@
     }
 
     private void writeStartElement() throws XMLStreamException {
-        if (namespace != null) {
+        if (!StringUtils.isEmpty(namespace)) {
             boolean declare = false;
 
             String decPrefix = writer.getNamespaceContext().getPrefix(namespace);

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=648008&r1=648007&r2=648008&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Mon Apr 14 14:32:05 2008
@@ -347,11 +347,13 @@
                 }
             }
         }
-        ServiceModelSchemaValidator validator = new ServiceModelSchemaValidator(serviceInfo);
-        validator.walk();
-        String validationComplaints = validator.getComplaints();
-        if (!"".equals(validationComplaints)) {
-            LOG.info(validationComplaints);
+        if (LOG.isLoggable(Level.FINE)) {
+            ServiceModelSchemaValidator validator = new ServiceModelSchemaValidator(serviceInfo);
+            validator.walk();
+            String validationComplaints = validator.getComplaints();
+            if (!"".equals(validationComplaints)) {
+                LOG.fine(validationComplaints);
+            }
         }
     }
 



Mime
View raw message