svn commit: r707144 - in /cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws: JaxWsClientProxy.java context/WrappedMessageContext.java

[dkulp]

Author: dkulp
Date: Wed Oct 22 10:39:28 2008
New Revision: 707144

URL: http://svn.apache.org/viewvc?rev=707144&view=rev
Log:
More compile failures

Modified:
    
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
    
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java

Modified: 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java?rev=707144&r1=707143&r2=707144&view=diff
==============================================================================
--- 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
 Wed Oct 22 10:39:28 2008
@@ -107,9 +107,9 @@
         Object result = null;
         try {
             if (isAsync) {
-                result = invokeAsync(method, oi, params);
+                result = invokeAsync(method, oi, args);
             } else {
-                result = invokeSync(method, oi, params);
+                result = invokeSync(method, oi, args);
             }
         } catch (WebServiceException wex) {
             throw wex.fillInStackTrace();
@@ -144,11 +144,11 @@
         
         // need to do context mapping from cxf message to jax-ws
         
ContextPropertiesMapping.mapResponsefromCxf2Jaxws(client.getResponseContext());
-        Map<String, Scope> scopes = CastUtils.cast((Map<?, 
?>)respContext.get(WrappedMessageContext.SCOPES));
+        Map<String, Scope> scopes = CastUtils.cast((Map<?, 
?>)client.getResponseContext().get(WrappedMessageContext.SCOPES));
         if (scopes != null) {
             for (Map.Entry<String, Scope> scope : scopes.entrySet()) {
                 if (scope.getValue() == Scope.HANDLER) {
-                    respContext.remove(scope.getKey());
+                    client.getResponseContext().remove(scope.getKey());
                 }
             }
         }
@@ -230,12 +230,10 @@
     
     public Map<String, Object> getRequestContext() {
         return new WrappedMessageContext(this.getClient().getRequestContext(),
-                                         null,
                                          Scope.APPLICATION);
     }
     public Map<String, Object> getResponseContext() {
         return new WrappedMessageContext(this.getClient().getResponseContext(),
-                                                          null,
                                                           Scope.APPLICATION);
     }
 

Modified: 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java?rev=707144&r1=707143&r2=707144&view=diff
==============================================================================
--- 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
 Wed Oct 22 10:39:28 2008
@@ -24,8 +24,10 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.xml.ws.BindingProvider;
 import javax.xml.ws.handler.MessageContext;
 
+import org.apache.cxf.configuration.security.AuthorizationPolicy;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;