cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r572742 - in /incubator/cxf/trunk/rt: databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ trans...
Date Tue, 04 Sep 2007 17:15:45 GMT
Author: dkulp
Date: Tue Sep  4 10:15:44 2007
New Revision: 572742

URL: http://svn.apache.org/viewvc?rev=572742&view=rev
Log:
[CXF-959] Apply patch from Benson Margulies - Thanks!
Change receive timeout in http to 60 seconds to match the ClientImpl case when not using HTTP.
(and make debugging easier)

Modified:
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
    incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=572742&r1=572741&r2=572742&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
(original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
Tue Sep  4 10:15:44 2007
@@ -247,6 +247,7 @@
     }
 
     private void createSchemas(Service s, Set<Type> deps) {
+
         Map<String, Set<Type>> tns2Type = new HashMap<String, Set<Type>>();
         for (Type t : deps) {
             String ns = t.getSchemaType().getNamespaceURI();
@@ -293,6 +294,7 @@
                     info.setElement(schema.getDocumentElement());
 
                     XmlSchema xmlSchema = col.read(schema.getDocumentElement());
+                    xmlSchema.setNamespaceContext(nsMap);
                     info.setSchema(xmlSchema);
 
                     info.setSystemId(entry.getKey());

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java?rev=572742&r1=572741&r2=572742&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
(original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
Tue Sep  4 10:15:44 2007
@@ -64,7 +64,7 @@
                     + "xsd:element[@name='getSubmitBean']",
                     doc);
         assertValid("//xsd:complexType[@name='getSubmitBean']/xsd:sequence"
-                    + "/xsd:element[@name='bleh'][@type='string'][@minOccurs='0']", doc);
+                    + "/xsd:element[@name='bleh'][@type='xsd:string'][@minOccurs='0']", doc);
         assertValid("//xsd:complexType[@name='getSubmitBean']/xsd:sequence"
                     + "/xsd:element[@name='bean'][@type='SimpleBean'][@minOccurs='0']", doc);
 
@@ -89,7 +89,7 @@
                     "/wsdl:definitions/wsdl:types"
                         + "/xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']"
                         + "/xsd:complexType[@name=\"SimpleBean\"]/xsd:sequence/xsd:element"
-                        + "[@type=\"string\"]",
+                        + "[@type=\"xsd:string\"]",
                     doc);
     }
 

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java?rev=572742&r1=572741&r2=572742&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
(original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
Tue Sep  4 10:15:44 2007
@@ -158,11 +158,11 @@
 
         assertValid(
                     "//xsd:complexType[@name='AnnotatedBean2']/xsd:sequence/xsd:element"
-                    + "[@name='element'][@type='string']",
+                    + "[@name='element'][@type='xsd:string']",
                     wsdl);
         assertValid(
                     "//xsd:complexType[@name='AnnotatedBean2']/xsd:attribute"
-                    + "[@name='attribute'][@type='string']",
+                    + "[@name='attribute'][@type='xsd:string']",
                     wsdl);
     }
 

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java?rev=572742&r1=572741&r2=572742&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
(original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
Tue Sep  4 10:15:44 2007
@@ -44,11 +44,11 @@
  
         assertValid(
                     "//xsd:complexType[@name='getValuesResponse']//xsd:element"
-                    + "[@name='return'][@type='string']",
+                    + "[@name='return'][@type='xsd:string']",
                     wsdl);
         assertValid(
                     "//xsd:complexType[@name='getValuesResponse']//xsd:element"
-                    + "[@name='return1'][@type='string']",
+                    + "[@name='return1'][@type='xsd:string']",
                     wsdl);
     }
 }

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java?rev=572742&r1=572741&r2=572742&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
(original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
Tue Sep  4 10:15:44 2007
@@ -114,10 +114,10 @@
         Document wsdl = getWSDLDocument("CurrencyService");
 
         assertValid("//xsd:element[@name='inputCurrency'][@minOccurs='0']", wsdl);
-        assertValid("//xsd:simpleType[@name='Currency']/xsd:restriction[@base='string']",
wsdl);
-        assertValid("//xsd:restriction[@base='string']/xsd:enumeration[@value='USD']", wsdl);
-        assertValid("//xsd:restriction[@base='string']/xsd:enumeration[@value='EURO']", wsdl);
-        assertValid("//xsd:restriction[@base='string']/xsd:enumeration[@value='POUNDS']",
wsdl);
+        assertValid("//xsd:simpleType[@name='Currency']/xsd:restriction[@base='xsd:string']",
wsdl);
+        assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='USD']",
wsdl);
+        assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='EURO']",
wsdl);
+        assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='POUNDS']",
wsdl);
     }
 
     @Test

Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd?rev=572742&r1=572741&r2=572742&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd Tue
Sep  4 10:15:44 2007
@@ -161,7 +161,7 @@
                     </xs:annotation>      
                 </xs:attribute>
 
-                <xs:attribute name="ReceiveTimeout" type="xs:unsignedInt" use="optional"
default="30000">
+                <xs:attribute name="ReceiveTimeout" type="xs:unsignedInt" use="optional"
default="60000">
                     <xs:annotation>
                         <xs:documentation>
                         Receive timeout in milliseconds, 0 is infinite



Mime
View raw message