cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r573607 - in /incubator/cxf/trunk: rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ rt/transports/http/src/main/resources/schemas/wsdl/ systests/src/test/java/org/apache/cxf/systest/mtom/
Date Fri, 07 Sep 2007 15:18:38 GMT
Author: dkulp
Date: Fri Sep  7 08:18:37 2007
New Revision: 573607

URL: http://svn.apache.org/viewvc?rev=573607&view=rev
Log:
Fix for JWS tck regression

Modified:
    incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java

Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=573607&r1=573606&r2=573607&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Fri Sep  7 08:18:37 2007
@@ -421,21 +421,22 @@
     protected void initializeWrappedSchema(ServiceInfo serviceInfo) {
         for (OperationInfo op : serviceInfo.getInterface().getOperations()) {
             if (op.getUnwrappedOperation() != null) {
-                if (op.hasInput() 
-                    && op.getInput().getMessageParts().get(0).getTypeClass() == null)
{
+                if (op.hasInput()) { 
+                    if (op.getInput().getMessageParts().get(0).getTypeClass() == null) {
                     
-                    QName wraperBeanName = op.getInput().getMessageParts().get(0).getElementQName();
-                    XmlSchemaElement e = null;
-                    for (SchemaInfo s : serviceInfo.getSchemas()) {
-                        e = s.getElementByQName(wraperBeanName);
-                        if (e != null) {
-                            op.getInput().getMessageParts().get(0).setXmlSchema(e);
-                            break;
+                        QName wraperBeanName = op.getInput().getMessageParts().get(0).getElementQName();
+                        XmlSchemaElement e = null;
+                        for (SchemaInfo s : serviceInfo.getSchemas()) {
+                            e = s.getElementByQName(wraperBeanName);
+                            if (e != null) {
+                                op.getInput().getMessageParts().get(0).setXmlSchema(e);
+                                break;
+                            }
+                        }
+                        if (e == null) {
+                            createWrappedSchema(serviceInfo, op.getInput(),
+                                                op.getUnwrappedOperation().getInput(), wraperBeanName);
                         }
-                    }
-                    if (e == null) {
-                        createWrappedSchema(serviceInfo, op.getInput(),
-                                            op.getUnwrappedOperation().getInput(), wraperBeanName);
                     }
 
                     for (MessagePartInfo mpi : op.getInput().getMessageParts()) {
@@ -451,22 +452,22 @@
 
 
                 }
-                if (op.hasOutput()
-                    && op.getOutput().getMessageParts().get(0).getTypeClass() ==
null) {
+                if (op.hasOutput()) {
+                    if (op.getOutput().getMessageParts().get(0).getTypeClass() == null) {
                     
-                    QName wraperBeanName = op.getOutput().getMessageParts().get(0).getElementQName();
-                    XmlSchemaElement e = null;
-                    for (SchemaInfo s : serviceInfo.getSchemas()) {
-                        e = s.getElementByQName(wraperBeanName);
-                        if (e != null) {
-                            break;
+                        QName wraperBeanName = op.getOutput().getMessageParts().get(0).getElementQName();
+                        XmlSchemaElement e = null;
+                        for (SchemaInfo s : serviceInfo.getSchemas()) {
+                            e = s.getElementByQName(wraperBeanName);
+                            if (e != null) {
+                                break;
+                            }
+                        }
+                        if (e == null) {
+                            createWrappedSchema(serviceInfo, op.getOutput(), op.getUnwrappedOperation()
+                                .getOutput(), wraperBeanName);
                         }
                     }
-                    if (e == null) {
-                        createWrappedSchema(serviceInfo, op.getOutput(), op.getUnwrappedOperation()
-                            .getOutput(), wraperBeanName);
-                    }
-
                     for (MessagePartInfo mpi : op.getOutput().getMessageParts()) {
                         if (Boolean.TRUE.equals(mpi.getProperty(HEADER))) {
                             QName qn = (QName)mpi.getProperty(ELEMENT_NAME);
@@ -717,7 +718,6 @@
                 seq.getItems().add(el);
             }
             if (Boolean.TRUE.equals(mpi.getProperty(HEADER))) {
-
                 QName qn = (QName)mpi.getProperty(ELEMENT_NAME);
 
                 el.setName(qn.getLocalPart());

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=573607&r1=573606&r2=573607&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 Fri
Sep  7 08:18:37 2007
@@ -73,7 +73,7 @@
                     </xs:annotation>      
                 </xs:attribute>
 
-                <xs:attribute name="HonorKeepAlive" type="xs:boolean" use="optional" default="false">
+                <xs:attribute name="HonorKeepAlive" type="xs:boolean" use="optional" default="true">
                     <xs:annotation>
                         <xs:documentation>
                         When set to Yes, the request socket will remain open after the reply
is 
@@ -249,7 +249,7 @@
                     </xs:annotation>      
                 </xs:attribute>
 
-                <xs:attribute name="Connection" type="http-conf:connectionType" use="optional"
default="close">
+                <xs:attribute name="Connection" type="http-conf:connectionType" use="optional"
default="Keep-Alive">
                     <xs:annotation>
                         <xs:documentation>
                         The connection disposition.  If close the connection to the server
is closed 

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java?rev=573607&r1=573606&r2=573607&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
Fri Sep  7 08:18:37 2007
@@ -178,7 +178,9 @@
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         IOUtils.copy(inAtt.getDataHandler().getInputStream(), out);
         out.close();
-        assertTrue("Wrong size: " + out.size(), out.size() > 980 && out.size()
< 1020);
+        assertTrue("Wrong size: " + out.size()
+                   + "\n" + out.toString(),
+                   out.size() > 970 && out.size() < 1020);
     }
 
     @Override



Mime
View raw message