cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1056485 - in /cxf/trunk/rt/frontend: jaxws/src/test/java/org/apache/cxf/jaxws/service/echoFoo.xsd simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Date Fri, 07 Jan 2011 20:18:18 GMT
Author: dkulp
Date: Fri Jan  7 20:18:18 2011
New Revision: 1056485

URL: http://svn.apache.org/viewvc?rev=1056485&view=rev
Log:
Creating an XmlSchemaImport auto adds it to the schema.  Thus, if we
also add, we get duplicates.

Modified:
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/echoFoo.xsd
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/echoFoo.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/echoFoo.xsd?rev=1056485&r1=1056484&r2=1056485&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/echoFoo.xsd (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/echoFoo.xsd Fri
Jan  7 20:18:18 2011
@@ -4,8 +4,10 @@
   targetNamespace="http://service.jaxws.cxf.apache.org/fooStuff">
   <xs:complexType name="foo">
     <xs:annotation>
+        <xs:documentation>
       bibbity bob
       <!-- foo bar -->
+        </xs:documentation>
     </xs:annotation>
     <xs:sequence>
     </xs:sequence>

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=1056485&r1=1056484&r2=1056485&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Fri Jan  7 20:18:18 2011
@@ -1198,7 +1198,9 @@ public class ReflectionServiceFactoryBea
             if (this.schemaLocationMapping.get(ns) != null) {
                 is.setSchemaLocation(this.schemaLocationMapping.get(ns));
             }
-            schema.getItems().add(is);
+            if (!schema.getItems().contains(is)) {
+                schema.getItems().add(is);
+            }
         }
     }
 



Mime
View raw message