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:[EMAIL PROTECTED]'getSubmitBean']",
doc);
assertValid("//xsd:[EMAIL PROTECTED]'getSubmitBean']/xsd:sequence"
- + "/xsd:[EMAIL PROTECTED]'bleh'[EMAIL
PROTECTED]'string'[EMAIL PROTECTED]'0']", doc);
+ + "/xsd:[EMAIL PROTECTED]'bleh'[EMAIL
PROTECTED]'xsd:string'[EMAIL PROTECTED]'0']", doc);
assertValid("//xsd:[EMAIL PROTECTED]'getSubmitBean']/xsd:sequence"
+ "/xsd:[EMAIL PROTECTED]'bean'[EMAIL
PROTECTED]'SimpleBean'[EMAIL PROTECTED]'0']", doc);
@@ -89,7 +89,7 @@
"/wsdl:definitions/wsdl:types"
+ "/xsd:[EMAIL
PROTECTED]'http://services.aegis.cxf.apache.org']"
+ "/xsd:[EMAIL
PROTECTED]"SimpleBean\"]/xsd:sequence/xsd:element"
- + "[EMAIL PROTECTED]"string\"]",
+ + "[EMAIL PROTECTED]"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:[EMAIL
PROTECTED]'AnnotatedBean2']/xsd:sequence/xsd:element"
- + "[EMAIL PROTECTED]'element'[EMAIL PROTECTED]'string']",
+ + "[EMAIL PROTECTED]'element'[EMAIL
PROTECTED]'xsd:string']",
wsdl);
assertValid(
"//xsd:[EMAIL PROTECTED]'AnnotatedBean2']/xsd:attribute"
- + "[EMAIL PROTECTED]'attribute'[EMAIL PROTECTED]'string']",
+ + "[EMAIL PROTECTED]'attribute'[EMAIL
PROTECTED]'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:[EMAIL PROTECTED]'getValuesResponse']//xsd:element"
- + "[EMAIL PROTECTED]'return'[EMAIL PROTECTED]'string']",
+ + "[EMAIL PROTECTED]'return'[EMAIL
PROTECTED]'xsd:string']",
wsdl);
assertValid(
"//xsd:[EMAIL PROTECTED]'getValuesResponse']//xsd:element"
- + "[EMAIL PROTECTED]'return1'[EMAIL PROTECTED]'string']",
+ + "[EMAIL PROTECTED]'return1'[EMAIL
PROTECTED]'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:[EMAIL PROTECTED]'inputCurrency'[EMAIL
PROTECTED]'0']", wsdl);
- assertValid("//xsd:[EMAIL PROTECTED]'Currency']/xsd:[EMAIL
PROTECTED]'string']", wsdl);
- assertValid("//xsd:[EMAIL PROTECTED]'string']/xsd:[EMAIL
PROTECTED]'USD']", wsdl);
- assertValid("//xsd:[EMAIL PROTECTED]'string']/xsd:[EMAIL
PROTECTED]'EURO']", wsdl);
- assertValid("//xsd:[EMAIL PROTECTED]'string']/xsd:[EMAIL
PROTECTED]'POUNDS']", wsdl);
+ assertValid("//xsd:[EMAIL PROTECTED]'Currency']/xsd:[EMAIL
PROTECTED]'xsd:string']", wsdl);
+ assertValid("//xsd:[EMAIL PROTECTED]'xsd:string']/xsd:[EMAIL
PROTECTED]'USD']", wsdl);
+ assertValid("//xsd:[EMAIL PROTECTED]'xsd:string']/xsd:[EMAIL
PROTECTED]'EURO']", wsdl);
+ assertValid("//xsd:[EMAIL PROTECTED]'xsd:string']/xsd:[EMAIL
PROTECTED]'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
