You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/07/12 19:34:45 UTC
svn commit: r1502631 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/ws/addressing/Names.java
api/src/main/java/org/apache/cxf/ws/addressing/WSAContextUtils.java
rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
Author: dkulp
Date: Fri Jul 12 17:34:45 2013
New Revision: 1502631
URL: http://svn.apache.org/r1502631
Log:
Remove some unused code
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/Names.java
cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/WSAContextUtils.java
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/Names.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/Names.java?rev=1502631&r1=1502630&r2=1502631&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/Names.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/Names.java Fri Jul 12 17:34:45 2013
@@ -109,8 +109,6 @@ public final class Names {
"/fault";
public static final String WSA_DEFAULT_FAULT_ACTION =
WSA_NAMESPACE_NAME + WSA_FAULT_DELIMITER;
- // REVISIT delimiter should be ":" if target namespace is a URN
- public static final String WSA_ACTION_DELIMITER = "/";
public static final String WSAW_ACTION_NAME = "Action";
public static final QName WSAW_ACTION_QNAME =
@@ -172,13 +170,6 @@ public final class Names {
public static final String INVALID_CARDINALITY_NAME = "InvalidCardinality";
public static final QName INVALID_CARDINALITY_QNAME = new QName(WSA_NAMESPACE_NAME,
INVALID_CARDINALITY_NAME);
-
- public static final String SOAP11HTTP_ADDRESSING_BINDING =
- "http://schemas.xmlsoap.org/soap/envelope/?addressing=ms";
- public static final String SOAP12HTTP_ADDRESSING_BINDING =
- "http://www.w3.org/2003/05/soap-envelope?addressing=ms";
-
- public static final String SOAP_ACTION_HEADER = "SOAPAction";
/**
* The set of headers understood by the protocol binding.
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/WSAContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/WSAContextUtils.java?rev=1502631&r1=1502630&r2=1502631&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/WSAContextUtils.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/WSAContextUtils.java Fri Jul 12 17:34:45 2013
@@ -21,7 +21,6 @@ package org.apache.cxf.ws.addressing;
import org.apache.cxf.message.Message;
-import org.apache.cxf.transport.Conduit;
/**
@@ -31,8 +30,6 @@ public final class WSAContextUtils {
public static final String REPLYTO_PROPERTY =
"org.apache.cxf.ws.addressing.replyto";
- private static final String TO_PROPERTY =
- "org.apache.cxf.ws.addressing.to";
private static final String USING_PROPERTY =
"org.apache.cxf.ws.addressing.using";
@@ -43,16 +40,6 @@ public final class WSAContextUtils {
}
/**
- * Store UsingAddressing override flag in the context
- *
- * @param override true if UsingAddressing should be overridden
- * @param message the current message
- */
- public static void storeUsingAddressing(boolean override, Message message) {
- message.put(USING_PROPERTY, Boolean.valueOf(override));
- }
-
- /**
* Retrieve UsingAddressing override flag from the context
*
* @param message the current message
@@ -63,33 +50,6 @@ public final class WSAContextUtils {
return override == null || override.booleanValue();
}
- /**
- * Store To EPR in the context
- *
- * @param to the To EPR
- * @param message the current message
- */
- public static void storeTo(EndpointReferenceType to,
- Message message) {
- message.put(TO_PROPERTY, to);
- }
-
- /**
- * Retrieve To EPR from the context.
- *
- * @param conduit the Conduit if available
- * @param message the current message
- * @return the retrieved EPR
- */
- public static EndpointReferenceType retrieveTo(Conduit conduit,
- Message message) {
- EndpointReferenceType to = null;
- if (conduit != null) {
- to = conduit.getTarget();
- } else {
- to = (EndpointReferenceType)message.get(TO_PROPERTY);
- }
- return to;
- }
+
}
Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=1502631&r1=1502630&r2=1502631&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java Fri Jul 12 17:34:45 2013
@@ -741,8 +741,7 @@ public class MAPCodec extends AbstractSo
Map<String, List<String>> mimeHeaders = CastUtils.cast((Map<?, ?>)
message.get(Message.MIME_HEADERS));
if (mimeHeaders != null) {
- List<String> soapActionHeaders =
- mimeHeaders.get(Names.SOAP_ACTION_HEADER);
+ List<String> soapActionHeaders = mimeHeaders.get("SOAPAction");
// only propogate to SOAPAction header if currently non-empty
if (!(soapActionHeaders == null
|| soapActionHeaders.size() == 0