cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r540297 - in /incubator/cxf/trunk: common/common/src/main/java/org/apache/cxf/helpers/ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/
Date Mon, 21 May 2007 21:05:31 GMT
Author: dkulp
Date: Mon May 21 14:05:30 2007
New Revision: 540297

URL: http://svn.apache.org/viewvc?view=rev&rev=540297
Log:
Revert some changes that are causing JAX-WS compliance issues.  Will re-look at the problem
later.

Modified:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java
    incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
    incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java?view=diff&rev=540297&r1=540296&r2=540297
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java Mon
May 21 14:05:30 2007
@@ -21,6 +21,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -92,6 +93,11 @@
     public static Document parse(InputSource is) throws ParserConfigurationException, SAXException,
         IOException {
         return getParser().parse(is.getSystemId());
+    }
+    
+    public static Document parse(File is) throws ParserConfigurationException, SAXException,
+        IOException {
+        return getParser().parse(is);
     }
 
     public static Document parse(InputStream in) throws ParserConfigurationException, SAXException,

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?view=diff&rev=540297&r1=540296&r2=540297
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
(original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Mon May 21 14:05:30 2007
@@ -60,7 +60,6 @@
         
         Type genericType = (Type) part.getProperty("generic.type");
         if (genericType != null) {
-            addType(genericType);
             if (isFromWrapper
                 && genericType instanceof Class
                 && ((Class)genericType).isArray()) {
@@ -71,7 +70,7 @@
                     genericType = cl2.getComponentType();
                 }
             }
-            //addType(genericType);
+            addType(genericType);
             
             if (Collection.class.isAssignableFrom(clazz) 
                 && genericType instanceof ParameterizedType) {

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java?view=diff&rev=540297&r1=540296&r2=540297
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
(original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
Mon May 21 14:05:30 2007
@@ -124,7 +124,7 @@
 
                 boolean isFromWrapper = part.getMessageInfo().getOperation().isUnwrapped();
                 if (isFromWrapper && clazz.isArray() && !Byte.TYPE.equals(clazz.getComponentType()))
{
-                    //clazz = clazz.getComponentType();
+                    clazz = clazz.getComponentType();
                 }
                 JaxBeanInfo<?> beanInfo = context.getBeanInfo(clazz);
                 if (beanInfo == null) {

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl?view=diff&rev=540297&r1=540296&r2=540297
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
Mon May 21 14:05:30 2007
@@ -20,7 +20,7 @@
 
 <wsdl:definitions name="Database" targetNamespace="http://cxf523.fortest.tools.cxf.apache.org/"
xmlns:ns1="http://cxf523.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://cxf523.fortest.tools.cxf.apache.org/"
attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf523.fortest.tools.cxf.apache.org/">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf523.fortest.tools.cxf.apache.org/"
attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf523.fortest.tools.cxf.apache.org/">
 <xs:complexType name="operation0ResponseType">
 <xs:sequence>
 <xs:element minOccurs="0" name="birth" type="xs:dateTime"/>
@@ -31,25 +31,20 @@
 <xs:element minOccurs="0" name="species" type="xs:string"/>
 </xs:sequence>
 </xs:complexType>
-<xs:complexType final="#all" name="operation0ResponseTypeArray">
-<xs:sequence>
-<xs:element maxOccurs="unbounded" minOccurs="0" name="item" nillable="true" type="tns:operation0ResponseType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:element name="DBServiceFault" type="tns:DBServiceFault"/>
+<xs:element name="DBServiceFault" type="DBServiceFault"/>
 <xs:complexType name="DBServiceFault">
 <xs:sequence>
 <xs:element name="message" nillable="true" type="xs:string"/>
 </xs:sequence>
 </xs:complexType>
-<xs:element name="operation0" type="tns:operation0"/>
+<xs:element name="operation0" type="operation0"/>
 <xs:complexType name="operation0">
 <xs:sequence/>
 </xs:complexType>
-<xs:element name="operation0Response" type="tns:operation0Response"/>
+<xs:element name="operation0Response" type="operation0Response"/>
 <xs:complexType name="operation0Response">
 <xs:sequence>
-<xs:element maxOccurs="unbounded" minOccurs="0" name="return" type="tns:operation0ResponseType"/>
+<xs:element maxOccurs="unbounded" minOccurs="0" name="return" type="operation0ResponseType"/>
 </xs:sequence>
 </xs:complexType>
 </xs:schema>



Mime
View raw message