You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2006/11/16 11:44:08 UTC
svn commit: r475676 - in
/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing:
AddressingFinalInHandler.java AddressingHandler.java
AddressingInHandler.java AddressingOutHandler.java
AddressingSubmissionInHandler.java
Author: davidillsley
Date: Thu Nov 16 02:44:07 2006
New Revision: 475676
URL: http://svn.apache.org/viewvc?view=rev&rev=475676
Log:
Fix for AXIS2-1517
Remove AddressingHandler and serialVersionUIDs as not needed
Removed:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingHandler.java
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingSubmissionInHandler.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java?view=diff&rev=475676&r1=475675&r2=475676
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java Thu Nov 16 02:44:07 2006
@@ -1,22 +1,21 @@
package org.apache.axis2.handlers.addressing;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.AddressingFaultsHelper;
+import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.MessageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -37,13 +36,11 @@
public class AddressingFinalInHandler extends AddressingInHandler {
private static final Log log = LogFactory.getLog(AddressingFinalInHandler.class);
- private static final long serialVersionUID = -4020680449342946484L;
-
+
public AddressingFinalInHandler() {
addressingNamespace = Final.WSA_NAMESPACE;
addressingVersion = "WS-Addressing Final";
}
-
protected void extractToEprReferenceParameters(EndpointReference toEPR, SOAPHeader header, String namespace) {
Iterator headerBlocks = header.getChildElements();
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?view=diff&rev=475676&r1=475675&r2=475676
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java Thu Nov 16 02:44:07 2006
@@ -16,32 +16,32 @@
package org.apache.axis2.handlers.addressing;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.addressing.AddressingFaultsHelper;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.axis2.addressing.AddressingFaultsHelper;
import org.apache.axis2.addressing.RelatesTo;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.util.JavaUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-public abstract class AddressingInHandler extends AddressingHandler implements AddressingConstants {
-
- private static final long serialVersionUID = 3907988439637261572L;
+public abstract class AddressingInHandler extends AbstractHandler implements AddressingConstants {
+ protected String addressingNamespace = Final.WSA_NAMESPACE; // defaulting to final version
+ protected String addressingVersion = null;
private static final Log log = LogFactory.getLog(AddressingInHandler.class);
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?view=diff&rev=475676&r1=475675&r2=475676
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java Thu Nov 16 02:44:07 2006
@@ -32,8 +32,11 @@
import org.apache.axis2.addressing.RelatesTo;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.util.Utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
@@ -41,8 +44,10 @@
import java.util.List;
import java.util.Map;
-public class AddressingOutHandler extends AddressingHandler {
+public class AddressingOutHandler extends AbstractHandler implements AddressingConstants {
+ private static final Log log = LogFactory.getLog(AddressingOutHandler.class);
+
public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
// it should be able to disable addressing by some one.
Object property = msgContext.getProperty(DISABLE_ADDRESSING_FOR_OUT_MESSAGES);
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingSubmissionInHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingSubmissionInHandler.java?view=diff&rev=475676&r1=475675&r2=475676
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingSubmissionInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingSubmissionInHandler.java Thu Nov 16 02:44:07 2006
@@ -29,10 +29,9 @@
*/
public class AddressingSubmissionInHandler extends AddressingInHandler {
-
+
private static final Log log = LogFactory.getLog(AddressingSubmissionInHandler.class);
- private static final long serialVersionUID = 365417374773955107L;
-
+
public AddressingSubmissionInHandler() {
addressingNamespace = Submission.WSA_NAMESPACE;
addressingVersion = "WS-Addressing Submission";
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org