cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r666739 - in /cxf/branches/2.0.x-fixes: api/src/main/java/org/apache/cxf/wsdl/WSDLManager.java rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Date Wed, 11 Jun 2008 17:20:50 GMT
Author: dkulp
Date: Wed Jun 11 10:20:50 2008
New Revision: 666739

URL: http://svn.apache.org/viewvc?rev=666739&view=rev
Log:
Fix build failures from the merges

Modified:
    cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/WSDLManager.java
    cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
    cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java

Modified: cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/WSDLManager.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/WSDLManager.java?rev=666739&r1=666738&r2=666739&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/WSDLManager.java (original)
+++ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/WSDLManager.java Wed Jun
11 10:20:50 2008
@@ -106,4 +106,11 @@
      */
     void putSchemasForDefinition(Definition wsdl, ServiceSchemaInfo schemas);
     
+    
+    /**
+     * If the definition is cached, remove it from the cache
+     * @param wsdl
+     */
+    void removeDefinition(Definition wsdl);
+    
 }

Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?rev=666739&r1=666738&r2=666739&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
Wed Jun 11 10:20:50 2008
@@ -21,8 +21,10 @@
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;

Modified: cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=666739&r1=666738&r2=666739&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Wed Jun 11 10:20:50 2008
@@ -42,6 +42,7 @@
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
+import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.FaultInfo;
 import org.apache.cxf.service.model.MessageInfo;
@@ -476,7 +477,7 @@
             op = ((UnwrappedOperationInfo)op).getWrappedOperation();
         }
         
-        String actionUri = (String) message.get(SoapBindingConstants.SOAP_ACTION);
+        String actionUri = (String) message.get(SoapConstants.SOAP_ACTION);
         if (actionUri != null) {
             return actionUri;
         }



Mime
View raw message