cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r541817 - in /incubator/cxf/trunk: benchmark/performance/basic_type/bin/ benchmark/performance/etc/ codegen-plugin/ common/common/ common/xjc/dv-test/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ rt/frontend/jaxws/src/main/java/org...
Date Fri, 25 May 2007 23:23:48 GMT
Author: dkulp
Date: Fri May 25 16:23:47 2007
New Revision: 541817

URL: http://svn.apache.org/viewvc?view=rev&rev=541817
Log:
Update context property mapping to meet specs
Map attachments into Logical handlers


Modified:
    incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client
    incubator/cxf/trunk/benchmark/performance/etc/common_build.xml
    incubator/cxf/trunk/codegen-plugin/pom.xml
    incubator/cxf/trunk/common/common/pom.xml
    incubator/cxf/trunk/common/xjc/dv-test/pom.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptor.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentProviderXMLClientServerTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java
    incubator/cxf/trunk/wsdlgen-plugin/pom.xml

Modified: incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client (original)
+++ incubator/cxf/trunk/benchmark/performance/basic_type/bin/run_client Fri May 25 16:23:47
2007
@@ -7,8 +7,6 @@
 THREADS=0
 PIPE=
 
-cd .. 
-
 for i in $@
 do 
   if [ "$i" = "-Operartion" ]
@@ -45,6 +43,7 @@
 
 done
 
+cd ..
 ant client -Dcxf.running.time=$AMOUNT -Dcxf.operation=$OPERARTION -Dcxf.basedon=$BASEDON
-Dcxf.packet.size=$PACKETSIZE -Dcxf.threads=$THREADS $PIPE
 
 

Modified: incubator/cxf/trunk/benchmark/performance/etc/common_build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/benchmark/performance/etc/common_build.xml?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/benchmark/performance/etc/common_build.xml (original)
+++ incubator/cxf/trunk/benchmark/performance/etc/common_build.xml Fri May 25 16:23:47 2007
@@ -14,7 +14,7 @@
 
     <!-- Setup for building in a source build -->
     <condition property="srcbuild_paths.file" value="./srcbuild_paths.xml"> 
-        <available file="../../modules/cxf-manifest-incubator.jar"/>
+        <available file="../../lib/cxf-manifest-incubator.jar"/>
     </condition> 
     <!-- default setting --> 
     <property name="srcbuild_paths.file" value="../../../distribution/target/srcbuild_paths.xml"/>

@@ -58,7 +58,7 @@
     <path id="cxf.classpath">
         <pathelement location="${build.classes.dir}"/>
         <pathelement path="${srcbuild.classpath}"/>
-        <pathelement location="${cxf.home}/modules/cxf-manifest-incubator.jar"/>
+        <pathelement location="${cxf.home}/lib/cxf-manifest-incubator.jar"/>
 	<pathelement location="${testbase.classes.dir}"/>
     </path>
     <condition property="thirdparty.classpath" value="">
@@ -198,7 +198,7 @@
             </condition>
             <property name="binding.arg" value=""/>
 
-            <java failonerror="true" classname="org.apache.cxf.tools.wsdl2java.WSDLToJava"
fork="yes">
+            <java failonerror="true" classname="org.apache.cxf.tools.wsdlto.WSDLToJava"
fork="yes">
                 <classpath>
                     <path refid="cxf.classpath" />
                 </classpath>

Modified: incubator/cxf/trunk/codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/codegen-plugin/pom.xml?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/codegen-plugin/pom.xml (original)
+++ incubator/cxf/trunk/codegen-plugin/pom.xml Fri May 25 16:23:47 2007
@@ -80,7 +80,7 @@
     <repositories>
         <repository>
             <id>java.net</id>
-            <url>https://maven-repository.dev.java.net/repository/</url>
+            <url>http://download.java.net/maven/1/</url>
             <layout>legacy</layout>
         </repository>
     </repositories>

Modified: incubator/cxf/trunk/common/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/pom.xml?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/common/common/pom.xml (original)
+++ incubator/cxf/trunk/common/common/pom.xml Fri May 25 16:23:47 2007
@@ -139,7 +139,7 @@
     <repositories>
         <repository>
             <id>java.net</id>
-            <url>https://maven-repository.dev.java.net/repository/</url>
+            <url>http://download.java.net/maven/1/</url>
             <layout>legacy</layout>
         </repository>
     </repositories>

Modified: incubator/cxf/trunk/common/xjc/dv-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/xjc/dv-test/pom.xml?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/common/xjc/dv-test/pom.xml (original)
+++ incubator/cxf/trunk/common/xjc/dv-test/pom.xml Fri May 25 16:23:47 2007
@@ -36,7 +36,7 @@
         <pluginRepository>
             <id>java.net</id>
             <name>java.net Maven Repository</name>
-            <url>https://maven-repository.dev.java.net/nonav/repository/</url>
+            <url>http://download.java.net/maven/1/</url>
             <layout>legacy</layout>
         </pluginRepository>
     </pluginRepositories>

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
Fri May 25 16:23:47 2007
@@ -85,7 +85,7 @@
             ctx.put(key.getKey(), key.getValue());
             ctx.setScope(key.getKey(), Scope.HANDLER);
         }
-        
+                
         //update the webservice response context
         ContextPropertiesMapping.updateWebServiceContext(exchange, ctx);
         //clear the WebServiceContextImpl's ThreadLocal variable

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptor.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptor.java
Fri May 25 16:23:47 2007
@@ -45,7 +45,7 @@
         onCompletion(message);
     }
     
-    protected MessageContext createProtocolMessageContext(Message message) {
+    protected MessageContext createProtocolMessageContext(T message) {
         return new WrappedMessageContext(message, Scope.HANDLER);
     }
 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerInInterceptor.java
Fri May 25 16:23:47 2007
@@ -31,6 +31,7 @@
 import org.apache.cxf.jaxws.handler.AbstractJAXWSHandlerInterceptor;
 import org.apache.cxf.jaxws.handler.HandlerChainInvoker;
 import org.apache.cxf.jaxws.handler.soap.SOAPHandlerInterceptor;
+import org.apache.cxf.jaxws.support.ContextPropertiesMapping;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.staxutils.StaxUtils;
@@ -57,6 +58,8 @@
         LogicalMessageContextImpl lctx = new LogicalMessageContextImpl(message);
         invoker.setLogicalMessageContext(lctx);
         boolean requestor = isRequestor(message);
+        
+        ContextPropertiesMapping.mapCxf2Jaxws(message.getExchange(), lctx, requestor);
         if (!invoker.invokeLogicalHandlers(requestor, lctx)) {
             if (!requestor) {
                 //server side 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
Fri May 25 16:23:47 2007
@@ -33,6 +33,7 @@
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.jaxws.handler.AbstractJAXWSHandlerInterceptor;
 import org.apache.cxf.jaxws.handler.HandlerChainInvoker;
+import org.apache.cxf.jaxws.support.ContextPropertiesMapping;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseInterceptorChain;
@@ -93,6 +94,9 @@
             LogicalMessageContextImpl lctx = new LogicalMessageContextImpl(message);
             invoker.setLogicalMessageContext(lctx);
             boolean requestor = isRequestor(message);
+            
+            ContextPropertiesMapping.mapCxf2Jaxws(message.getExchange(), lctx, requestor);
+            
             
             XMLStreamReader reader = (XMLStreamReader)message.get("LogicalHandlerInterceptor.INREADER");
             SOAPMessage origMessage = null;

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
Fri May 25 16:23:47 2007
@@ -39,7 +39,6 @@
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxws.handler.AbstractProtocolHandlerInterceptor;
 import org.apache.cxf.jaxws.handler.HandlerChainInvoker;
-import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.staxutils.StaxUtils;
 
@@ -117,7 +116,7 @@
     }
     
     @Override
-    protected MessageContext createProtocolMessageContext(Message message) {
+    protected MessageContext createProtocolMessageContext(SoapMessage message) {
         return new SOAPMessageContextImpl(message);
     }
     

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
Fri May 25 16:23:47 2007
@@ -47,7 +47,6 @@
 import org.apache.cxf.interceptor.StaxOutInterceptor;
 import org.apache.cxf.jaxws.handler.AbstractProtocolHandlerInterceptor;
 import org.apache.cxf.jaxws.handler.HandlerChainInvoker;
-import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 
 
@@ -166,7 +165,7 @@
     }
     
     @Override
-    protected MessageContext createProtocolMessageContext(Message message) {
+    protected MessageContext createProtocolMessageContext(SoapMessage message) {
         return new SOAPMessageContextImpl(message);
     }
 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
Fri May 25 16:23:47 2007
@@ -49,6 +49,7 @@
 import org.apache.cxf.interceptor.StaxOutInterceptor;
 import org.apache.cxf.jaxws.handler.AbstractProtocolHandlerInterceptor;
 import org.apache.cxf.jaxws.handler.HandlerChainInvoker;
+import org.apache.cxf.jaxws.support.ContextPropertiesMapping;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseInterceptorChain;
@@ -203,8 +204,11 @@
     }
     
     @Override
-    protected MessageContext createProtocolMessageContext(Message message) {
-        return new SOAPMessageContextImpl(message);
+    protected MessageContext createProtocolMessageContext(SoapMessage message) {
+        SOAPMessageContextImpl sm = new SOAPMessageContextImpl(message);
+        boolean requestor = isRequestor(message);
+        ContextPropertiesMapping.mapCxf2Jaxws(message.getExchange(), sm, requestor);
+        return sm;
     }
     
     private XMLStreamReader createXMLStreamReaderFromSOAPMessage(SOAPMessage soapMessage)
{

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java
Fri May 25 16:23:47 2007
@@ -36,6 +36,7 @@
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.headers.Header;
+import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxws.context.WrappedMessageContext;
 import org.apache.cxf.message.Attachment;
 import org.apache.cxf.message.Exchange;
@@ -150,36 +151,64 @@
             context.put(BindingProvider.USERNAME_PROPERTY, authPolicy.getUserName());
             context.put(BindingProvider.PASSWORD_PROPERTY, authPolicy.getPassword());
         }
+        
     }
     
     
     public static MessageContext createWebServiceContext(Exchange exchange) {
-        MessageContext ctx = new WrappedMessageContext(exchange.getInMessage(), Scope.APPLICATION);
-        mapCxf2Jaxws(ctx);        
-        addMessageAttachments(ctx, 
-                              exchange.getInMessage(), 
-                              MessageContext.INBOUND_MESSAGE_ATTACHMENTS);
+        WrappedMessageContext ctx = new WrappedMessageContext(exchange.getInMessage(), Scope.APPLICATION);
+        mapCxf2Jaxws(exchange, ctx, false);
+        return ctx;
+    }
 
-        Object requestHeaders = 
-            exchange.getInMessage().get(Message.PROTOCOL_HEADERS);
-        if (null != requestHeaders) {
-            ctx.put(MessageContext.HTTP_REQUEST_HEADERS, requestHeaders);
+    public static void mapCxf2Jaxws(Exchange exchange, WrappedMessageContext ctx, boolean
requestor) {
+        mapCxf2Jaxws(ctx);        
+        Message inMessage = exchange.getInMessage();
+        Message outMessage = exchange.getOutMessage();
         
-            Message outMessage = exchange.getOutMessage();
-            if (outMessage == null) {
-                Endpoint ep = exchange.get(Endpoint.class);
-                outMessage = ep.getBinding().createMessage();
-                exchange.setOutMessage(outMessage);
+        if (inMessage == null
+            && Boolean.TRUE.equals(ctx.get(Message.INBOUND_MESSAGE))) {
+            //inbound partial responses and stuff are not set in the exchange
+            inMessage = ctx.getWrappedMessage();
+        }
+        
+        if (inMessage != null) {
+            addMessageAttachments(ctx, 
+                                  inMessage, 
+                                  MessageContext.INBOUND_MESSAGE_ATTACHMENTS);
+            
+            Object inHeaders = 
+                inMessage.get(Message.PROTOCOL_HEADERS);
+            if (null != inHeaders) {
+                if (requestor) {
+                    ctx.put(MessageContext.HTTP_RESPONSE_HEADERS, inHeaders);
+                } else {
+                    ctx.put(MessageContext.HTTP_REQUEST_HEADERS, inHeaders);            
       
+                }
+            
+                outMessage = exchange.getOutMessage();
+                if (outMessage == null) {
+                    Endpoint ep = exchange.get(Endpoint.class);
+                    outMessage = ep.getBinding().createMessage();
+                    exchange.setOutMessage(outMessage);
+                }
             }
-            Object responseHeaders =
+
+        }
+
+        if (outMessage != null) {
+            addMessageAttachments(ctx, 
+                              outMessage, 
+                              MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS);
+            Object outHeaders =
                 outMessage.get(Message.PROTOCOL_HEADERS);
-            if (responseHeaders == null) {
-                responseHeaders = new HashMap<String, List<String>>();
-                outMessage.put(Message.PROTOCOL_HEADERS, responseHeaders);
+            
+            if (outHeaders != null && !requestor) {
+                ctx.put(MessageContext.HTTP_REQUEST_HEADERS, outHeaders);
             }
-            ctx.put(MessageContext.HTTP_RESPONSE_HEADERS, responseHeaders);
         }
-        return ctx;
+
+       
     }
     
     private static void addMessageAttachments(MessageContext ctx,
@@ -217,6 +246,18 @@
             Iterator iter = ((List) ctx.get(Header.HEADER_LIST)).iterator();
             while (iter.hasNext()) {
                 sm.getHeaders().add((Header) iter.next());
+            }
+        }
+        if (ctx.containsKey(MessageContext.HTTP_RESPONSE_HEADERS)) {
+            Map<String, List<String>> other = CastUtils
+                .cast((Map<?, ?>)ctx.get(MessageContext.HTTP_RESPONSE_HEADERS));
+            Map<String, List<String>> heads = CastUtils
+                .cast((Map<?, ?>)exchange.getOutMessage().get(Message.PROTOCOL_HEADERS));
+            if (heads != null) {
+                heads.putAll(other);
+            } else if (!other.isEmpty()) {
+                exchange.getOutMessage().put(Message.PROTOCOL_HEADERS, 
+                                             ctx.get(MessageContext.HTTP_RESPONSE_HEADERS));
             }
         }
     }

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
Fri May 25 16:23:47 2007
@@ -21,6 +21,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TreeSet;
 
 import javax.xml.ws.Binding;
 import javax.xml.ws.LogicalMessage;
@@ -80,6 +81,7 @@
         });
         expect(invoker.getLogicalHandlers()).andReturn(list);
         expect(message.getExchange()).andReturn(exchange).anyTimes();
+        expect(message.keySet()).andReturn(new TreeSet<String>()).anyTimes();
         expect(exchange.get(HandlerChainInvoker.class)).andReturn(invoker);
         expect(exchange.getOutMessage()).andReturn(message);
         expect(invoker.invokeLogicalHandlers(eq(false), isA(LogicalMessageContext.class)))

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
Fri May 25 16:23:47 2007
@@ -109,7 +109,7 @@
         assertNotNull("the request header should not be null", requestHeader);
         assertEquals("we should get the request header", requestHeader, HEADER);        
         Object responseHeader = ctx.get(MessageContext.HTTP_RESPONSE_HEADERS);
-        assertNotNull("the response header should not be null", responseHeader);        
+        assertNull("the response header should be null", responseHeader);        
         Object outMessageHeader = outMessage.get(Message.PROTOCOL_HEADERS);
         assertEquals("the outMessage PROTOCOL_HEADERS should be update", responseHeader,
outMessageHeader);
         
@@ -139,7 +139,10 @@
         EasyMock.expectLastCall().andReturn(hdrList);
         ctx.get(Header.HEADER_LIST);
         EasyMock.expectLastCall().andReturn(hdrList);
-        
+
+        ctx.containsKey(MessageContext.HTTP_RESPONSE_HEADERS);
+        EasyMock.expectLastCall().andReturn(false);
+
         EasyMock.replay(ctx);
         
         ContextPropertiesMapping.updateWebServiceContext(xchng, ctx);

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentProviderXMLClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentProviderXMLClientServerTest.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentProviderXMLClientServerTest.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentProviderXMLClientServerTest.java
Fri May 25 16:23:47 2007
@@ -64,7 +64,7 @@
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue("server did not launch correctly",
-                launchServer(Server.class));
+                launchServer(Server.class, true));
     }
 
     @Test

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentStreamSourceXMLProvider.java
Fri May 25 16:23:47 2007
@@ -25,6 +25,7 @@
 import java.io.InputStream;
 import java.io.StringReader;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -99,8 +100,14 @@
             }
             buf.append("</response>");
             
-            Map<Object, List<?>> respHeaders = CastUtils
-                .cast((Map)mc.get(MessageContext.HTTP_RESPONSE_HEADERS));
+            Map<String, List<String>> respHeaders = CastUtils
+                .cast((Map<?, ?>)mc.get(MessageContext.HTTP_RESPONSE_HEADERS));
+            if (respHeaders == null) {
+                respHeaders = new HashMap<String, List<String>>();
+                mc.put(MessageContext.HTTP_RESPONSE_HEADERS, respHeaders);
+            }
+
+            
             List<String> contentTypeValues = new ArrayList<String>();
             contentTypeValues.add("application/xml+custom");
             respHeaders.put(Message.CONTENT_TYPE, contentTypeValues);

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProvider.java
Fri May 25 16:23:47 2007
@@ -21,6 +21,7 @@
 
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -64,6 +65,10 @@
         
         Map<String, List<String>> responseHeader =
             CastUtils.cast((Map)mc.get(MessageContext.HTTP_RESPONSE_HEADERS));
+        if (responseHeader == null) {
+            responseHeader = new HashMap<String, List<String>>();
+            mc.put(MessageContext.HTTP_RESPONSE_HEADERS, responseHeader);
+        }
         List<String> values = new ArrayList<String>();
         values.add("hello1");
         values.add("hello2");

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/RestSourcePayloadProviderHttpBinding.java
Fri May 25 16:23:47 2007
@@ -21,6 +21,7 @@
 
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -59,6 +60,11 @@
         
         Map<String, List<String>> responseHeader =
             CastUtils.cast((Map)mc.get(MessageContext.HTTP_RESPONSE_HEADERS));
+        if (responseHeader == null) {
+            responseHeader = new HashMap<String, List<String>>();
+            mc.put(MessageContext.HTTP_RESPONSE_HEADERS, responseHeader);
+        }
+
         List<String> values = new ArrayList<String>();
         values.add("hello1");
         values.add("hello2");

Modified: incubator/cxf/trunk/wsdlgen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/wsdlgen-plugin/pom.xml?view=diff&rev=541817&r1=541816&r2=541817
==============================================================================
--- incubator/cxf/trunk/wsdlgen-plugin/pom.xml (original)
+++ incubator/cxf/trunk/wsdlgen-plugin/pom.xml Fri May 25 16:23:47 2007
@@ -58,7 +58,7 @@
     <repositories>
         <repository>
             <id>java.net</id>
-            <url>https://maven-repository.dev.java.net/repository/</url>
+            <url>http://download.java.net/maven/1/</url>
             <layout>legacy</layout>
         </repository>
     </repositories>



Mime
View raw message