ips 2005/02/14 15:51:33
Modified: addressing/src/org/apache/axis/message/addressing
Address.java AddressingHeaders.java
AttributedQName.java AttributedURI.java
Constants.java EndpointReference.java
EndpointReferenceType.java FaultSubcodeValues.java
PortType.java ReferenceParametersType.java
ReferencePropertiesType.java RelatesTo.java
ReplyAfterType.java ServiceNameType.java To.java
addressing/src/org/apache/axis/message/addressing/handler
AddressingHandler.java
addressing/src/org/apache/axis/message/addressing/util
AddressingUtils.java
addressing/src/org/apache/ws/addressing/handler
AbstractAddressingHandler.java
ServerSideAddressingHandler.java
addressing/test/addressing TestEPR.java TestSerDeser.java
addressing/test/org/apache/ws/addressing/handler
AbstractAddressingHandlerTestCase.java
ClientSideAddressingHandlerTestCase.java
Log:
started adding support for simultaneous support of multiple revisions of WSA
spec
Revision Changes Path
1.4 +1 -1
ws-fx/addressing/src/org/apache/axis/message/addressing/Address.java
Index: Address.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/Address.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Address.java 19 Nov 2004 17:56:06 -0000 1.3
+++ Address.java 14 Feb 2005 23:51:32 -0000 1.4
@@ -57,7 +57,7 @@
* @param parent
*/
public void append(Element parent) {
- Element child =
parent.getOwnerDocument().createElementNS(Constants.NS_URI_ADDRESSING,
+ Element child =
parent.getOwnerDocument().createElementNS(Constants.NS_URI_ADDRESSING_DEFAULT,
Constants.ADDRESS);
child.appendChild(parent.getOwnerDocument().createTextNode(toString()));
parent.appendChild(child);
1.15 +22 -11
ws-fx/addressing/src/org/apache/axis/message/addressing/AddressingHeaders.java
Index: AddressingHeaders.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/AddressingHeaders.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AddressingHeaders.java 14 Jul 2004 20:01:21 -0000 1.14
+++ AddressingHeaders.java 14 Feb 2005 23:51:32 -0000 1.15
@@ -14,7 +14,6 @@
* limitations under the License.
*
*/
-
package org.apache.axis.message.addressing;
import org.apache.axis.message.addressing.util.AddressingUtils;
@@ -92,6 +91,8 @@
*/
private boolean setMustUnderstand = false;
+ private String nsURI = Constants.NS_URI_ADDRESSING_DEFAULT;
+
/**
* Constructor AddressingHeaders
*/
@@ -175,23 +176,23 @@
if (header == null) {
return;
}
-
+
Iterator iter = header.examineHeaderElements(actorURI);
-
+
while(iter.hasNext()) {
- SOAPHeaderElement headerElement =
+ SOAPHeaderElement headerElement =
(SOAPHeaderElement)iter.next();
-
+
Name name = headerElement.getElementName();
-
- if (name.getURI().equals(Constants.NS_URI_ADDRESSING)) {
+ if (AddressingUtils.isAddressingNamespaceURI(name.getURI())) {
// it's a WSA header
String localName = name.getLocalName();
-
+
if (localName.equals(Constants.MESSAGE_ID)) {
messageID = new MessageID(headerElement);
} else if (localName.equals(Constants.TO)) {
to = new To(headerElement);
+ nsURI = headerElement.getNamespaceURI();
} else if (localName.equals(Constants.ACTION)) {
action = new Action(headerElement);
} else if (localName.equals(Constants.FROM)) {
@@ -210,7 +211,7 @@
}
} else {
// its a reference property - check if it was added to
refProps
- if (!processReferenceProperty(headerElement,
+ if (!processReferenceProperty(headerElement,
refPropsQNames)) {
continue;
}
@@ -233,6 +234,16 @@
((org.apache.axis.message.SOAPHeaderElement)headerElement).setProcessed(true);
}
}
+
+ }
+
+ /**
+ * Returns the WSA namespace URI used in this set of headers.
+ *
+ * @return the WSA namespace URI used in this set of headers
+ */
+ public String getNamespaceURI() {
+ return nsURI;
}
/**
@@ -333,7 +344,7 @@
* Method toEnvelope
*
* @param env
- * @throws SOAPException
+ * @throws javax.xml.soap.SOAPException
* @throws ParserConfigurationException
*/
public void toEnvelope(SOAPEnvelope env, String actorURI)
@@ -341,7 +352,7 @@
if (env.getNamespaceURI(Constants.NS_PREFIX_ADDRESSING) == null) {
env.addNamespaceDeclaration(Constants.NS_PREFIX_ADDRESSING,
- Constants.NS_URI_ADDRESSING);
+ getNamespaceURI());
}
AddressingUtils.removeHeaders(env.getHeader(), actorURI);
1.9 +1 -2
ws-fx/addressing/src/org/apache/axis/message/addressing/AttributedQName.java
Index: AttributedQName.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/AttributedQName.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AttributedQName.java 16 Oct 2004 18:27:46 -0000 1.8
+++ AttributedQName.java 14 Feb 2005 23:51:32 -0000 1.9
@@ -70,8 +70,7 @@
*/
public void append(Element parent, String elementName) {
Document doc = parent.getOwnerDocument();
- Element pt = doc.createElementNS(Constants.NS_URI_ADDRESSING,
- elementName);
+ Element pt =
doc.createElementNS(Constants.NS_URI_ADDRESSING_DEFAULT, elementName);
String value = XMLUtils.getStringForQName(this, pt);
pt.appendChild(doc.createTextNode(value));
parent.appendChild(pt);
1.14 +5 -5
ws-fx/addressing/src/org/apache/axis/message/addressing/AttributedURI.java
Index: AttributedURI.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/AttributedURI.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AttributedURI.java 16 Oct 2004 18:27:46 -0000 1.13
+++ AttributedURI.java 14 Feb 2005 23:51:32 -0000 1.14
@@ -26,6 +26,7 @@
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPHeaderElement;
import javax.xml.soap.Name;
+import javax.xml.namespace.QName;
import java.util.Iterator;
import java.util.List;
@@ -94,22 +95,21 @@
*/
public void append(Element parent, String elementName) {
Document doc = parent.getOwnerDocument();
- Element child = doc.createElementNS(Constants.NS_URI_ADDRESSING,
- elementName);
+ Element child =
doc.createElementNS(Constants.NS_URI_ADDRESSING_DEFAULT, elementName);
child.appendChild(doc.createTextNode(toString()));
parent.appendChild(child);
}
protected SOAPHeaderElement toSOAPHeaderElement(SOAPEnvelope env,
String actorURI,
- String name)
+ String name)
throws Exception {
if (name == null) {
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException("A null value for the name
parameter is not allowed.");
}
Name nm = env.createName(name,
Constants.NS_PREFIX_ADDRESSING,
- Constants.NS_URI_ADDRESSING);
+ Constants.NS_URI_ADDRESSING_DEFAULT);
SOAPHeader header = env.getHeader();
if (header == null) {
header = env.addHeader();
1.11 +29 -35
ws-fx/addressing/src/org/apache/axis/message/addressing/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/Constants.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Constants.java 8 Nov 2004 18:26:21 -0000 1.10
+++ Constants.java 14 Feb 2005 23:51:32 -0000 1.11
@@ -14,57 +14,69 @@
* limitations under the License.
*
*/
-
package org.apache.axis.message.addressing;
import javax.xml.namespace.QName;
+import java.util.HashSet;
+import java.util.Set;
/**
* Interface Constants
*
* @author Davanum Srinivas ([EMAIL PROTECTED])
*/
-public class Constants {
+public abstract class Constants {
/**
- * Field NS_PREFIX_ADDRESSING
+ * A prefix for the WSA namespace.
*/
public static final String NS_PREFIX_ADDRESSING = "wsa";
/**
- * Field NS_URI_ADDRESSING_03
+ * Namespace for 2003/03 revision of WSA schema.
*/
- public static final String NS_URI_ADDRESSING_03 =
+ public static final String NS_URI_ADDRESSING_2003_03 =
"http://schemas.xmlsoap.org/ws/2003/03/addressing";;
/**
- * Field NS_URI_ADDRESSING_04
+ * Namespace for 2004/03 revision of WSA schema.
*/
- public static final String NS_URI_ADDRESSING_04 =
+ public static final String NS_URI_ADDRESSING_2004_03 =
"http://schemas.xmlsoap.org/ws/2004/03/addressing";;
/**
- * Field NS_URI_ADDRESSING_04
+ * Namespace for 2004/08 revision of WSA schema.
*/
- public static final String NS_URI_ADDRESSING_08 =
+ public static final String NS_URI_ADDRESSING_2004_08 =
"http://schemas.xmlsoap.org/ws/2004/08/addressing";;
/**
* Field NS_URI_ADDRESSING (default)
*/
- public static final String NS_URI_ADDRESSING =
- NS_URI_ADDRESSING_08;
+ public static final String NS_URI_ADDRESSING_DEFAULT =
+ NS_URI_ADDRESSING_2004_08;
+
+ /**
+ * A set that contains the namespace URIs (as Strings) for the various
revisions of
+ * Addressing that we support.
+ */
+ public static final Set ADDRESSING_NS_URI_SET = new HashSet();
+ static {
+ ADDRESSING_NS_URI_SET.add( NS_URI_ADDRESSING_2003_03 );
+ ADDRESSING_NS_URI_SET.add( NS_URI_ADDRESSING_2004_03 );
+ ADDRESSING_NS_URI_SET.add( NS_URI_ADDRESSING_2004_08 );
+ }
/**
* Field FAULT_ACTION
*/
- public static final String FAULT_ACTION = NS_URI_ADDRESSING +
+ public static final String FAULT_ACTION = NS_URI_ADDRESSING_DEFAULT +
"/fault";
/**
* Field NS_URI_ANONYMOUS
*/
- public static final String NS_URI_ANONYMOUS = NS_URI_ADDRESSING
+ public static final String NS_URI_ANONYMOUS = NS_URI_ADDRESSING_DEFAULT
+ "/role/anonymous";
/**
@@ -153,24 +165,6 @@
public static final String RECIPIENT = "Recipient";
/**
- * Field QNAME_ENDPOINT_REFERENCE
- */
- public static final QName QNAME_ENDPOINT_REFERENCE =
- new QName(NS_URI_ADDRESSING, ENDPOINT_REFERENCE);
-
- /**
- * Field QNAME_ADDRESS
- */
- public static final QName QNAME_ADDRESS =
- new QName(NS_URI_ADDRESSING, ADDRESS);
-
- /**
- * Field QNAME_REFERENCE_PROPERTIES
- */
- public static final QName QNAME_REFERENCE_PROPERTIES =
- new QName(NS_URI_ADDRESSING, REFERENCE_PROPERTIES);
-
- /**
* Field QNAME_RESPONSE
*/
public static final QName QNAME_RESPONSE;
@@ -228,13 +222,13 @@
* Field QNAME_ACTION
*/
public static final QName QNAME_ACTION =
- new QName(NS_URI_ADDRESSING, ACTION);
+ new QName(NS_URI_ADDRESSING_DEFAULT, ACTION);
static {
- if (NS_URI_ADDRESSING.equals(NS_URI_ADDRESSING_04)) {
- QNAME_RESPONSE = new QName(NS_URI_ADDRESSING, REPLY);
+ if (NS_URI_ADDRESSING_DEFAULT.equals(NS_URI_ADDRESSING_2004_03)) {
+ QNAME_RESPONSE = new QName(NS_URI_ADDRESSING_DEFAULT, REPLY);
} else {
- QNAME_RESPONSE = new QName(NS_URI_ADDRESSING, RESPONSE);
+ QNAME_RESPONSE = new QName(NS_URI_ADDRESSING_DEFAULT, RESPONSE);
}
}
1.18 +3 -3
ws-fx/addressing/src/org/apache/axis/message/addressing/EndpointReference.java
Index: EndpointReference.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/EndpointReference.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- EndpointReference.java 19 Nov 2004 17:56:06 -0000 1.17
+++ EndpointReference.java 14 Feb 2005 23:51:32 -0000 1.18
@@ -105,7 +105,7 @@
while(iter.hasNext()) {
javax.xml.soap.Node child = (javax.xml.soap.Node)iter.next();
if (child instanceof SOAPElement) {
- if (!Constants.NS_URI_ADDRESSING.equals(
+ if (!Constants.NS_URI_ADDRESSING_DEFAULT.equals(
child.getNamespaceURI())) {
// skip now. does not handle extensibiliy elements now
continue;
@@ -146,7 +146,7 @@
for (int i=0;i<children.getLength();i++) {
Node child = (Node)children.item(i);
if (child instanceof Element) {
- if (!Constants.NS_URI_ADDRESSING.equals(
+ if (!Constants.NS_URI_ADDRESSING_DEFAULT.equals(
child.getNamespaceURI())) {
// skip now. does not handle extensibiliy elements now
continue;
@@ -199,7 +199,7 @@
}
}
- Element parent = doc.createElementNS(Constants.NS_URI_ADDRESSING,
+ Element parent =
doc.createElementNS(Constants.NS_URI_ADDRESSING_DEFAULT,
elementName);
if (doc.getDocumentElement() == null) {
doc.appendChild(parent);
1.17 +11 -11
ws-fx/addressing/src/org/apache/axis/message/addressing/EndpointReferenceType.java
Index: EndpointReferenceType.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/EndpointReferenceType.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- EndpointReferenceType.java 17 Oct 2004 03:14:59 -0000 1.16
+++ EndpointReferenceType.java 14 Feb 2005 23:51:32 -0000 1.17
@@ -334,34 +334,34 @@
new
org.apache.axis.description.TypeDesc(EndpointReferenceType.class, true);
static {
- typeDesc.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING,
"EndpointReferenceType"));
+ typeDesc.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT,
"EndpointReferenceType"));
org.apache.axis.description.ElementDesc elemField = new
org.apache.axis.description.ElementDesc();
elemField.setFieldName("address");
- elemField.setXmlName(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING, "Address"));
- elemField.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING, "AttributedURI"));
+ elemField.setXmlName(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "Address"));
+ elemField.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT,
"AttributedURI"));
typeDesc.addFieldDesc(elemField);
elemField = new org.apache.axis.description.ElementDesc();
elemField.setFieldName("properties");
- elemField.setXmlName(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING, "ReferenceProperties"));
- elemField.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING,
"ReferencePropertiesType"));
+ elemField.setXmlName(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT,
"ReferenceProperties"));
+ elemField.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT,
"ReferencePropertiesType"));
elemField.setMinOccurs(0);
typeDesc.addFieldDesc(elemField);
elemField = new org.apache.axis.description.ElementDesc();
elemField.setFieldName("parameters");
- elemField.setXmlName(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING, "ReferenceParameters"));
- elemField.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING,
"ReferenceParametersType"));
+ elemField.setXmlName(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT,
"ReferenceParameters"));
+ elemField.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT,
"ReferenceParametersType"));
elemField.setMinOccurs(0);
typeDesc.addFieldDesc(elemField);
elemField = new org.apache.axis.description.ElementDesc();
elemField.setFieldName("portType");
- elemField.setXmlName(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING, "PortType"));
- elemField.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING, "AttributedQName"));
+ elemField.setXmlName(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "PortType"));
+ elemField.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT,
"AttributedQName"));
elemField.setMinOccurs(0);
typeDesc.addFieldDesc(elemField);
elemField = new org.apache.axis.description.ElementDesc();
elemField.setFieldName("serviceName");
- elemField.setXmlName(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING, "ServiceName"));
- elemField.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING, "ServiceNameType"));
+ elemField.setXmlName(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "ServiceName"));
+ elemField.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT,
"ServiceNameType"));
elemField.setMinOccurs(0);
typeDesc.addFieldDesc(elemField);
}
1.3 +6 -6
ws-fx/addressing/src/org/apache/axis/message/addressing/FaultSubcodeValues.java
Index: FaultSubcodeValues.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/FaultSubcodeValues.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FaultSubcodeValues.java 16 Oct 2004 18:27:46 -0000 1.2
+++ FaultSubcodeValues.java 14 Feb 2005 23:51:32 -0000 1.3
@@ -45,11 +45,11 @@
_table_.put(_value_,this);
}
- public static final javax.xml.namespace.QName _value1 =
javax.xml.namespace.QName.valueOf("{" + Constants.NS_URI_ADDRESSING +
"}InvalidMessageInformationHeader");
- public static final javax.xml.namespace.QName _value2 =
javax.xml.namespace.QName.valueOf("{" + Constants.NS_URI_ADDRESSING +
"}MessageInformationHeaderRequired");
- public static final javax.xml.namespace.QName _value3 =
javax.xml.namespace.QName.valueOf("{" + Constants.NS_URI_ADDRESSING +
"}DestinationUnreachable");
- public static final javax.xml.namespace.QName _value4 =
javax.xml.namespace.QName.valueOf("{" + Constants.NS_URI_ADDRESSING +
"}ActionNotSupported");
- public static final javax.xml.namespace.QName _value5 =
javax.xml.namespace.QName.valueOf("{" + Constants.NS_URI_ADDRESSING +
"}EndpointUnavailable");
+ public static final javax.xml.namespace.QName _value1 =
javax.xml.namespace.QName.valueOf("{" + Constants.NS_URI_ADDRESSING_DEFAULT +
"}InvalidMessageInformationHeader");
+ public static final javax.xml.namespace.QName _value2 =
javax.xml.namespace.QName.valueOf("{" + Constants.NS_URI_ADDRESSING_DEFAULT +
"}MessageInformationHeaderRequired");
+ public static final javax.xml.namespace.QName _value3 =
javax.xml.namespace.QName.valueOf("{" + Constants.NS_URI_ADDRESSING_DEFAULT +
"}DestinationUnreachable");
+ public static final javax.xml.namespace.QName _value4 =
javax.xml.namespace.QName.valueOf("{" + Constants.NS_URI_ADDRESSING_DEFAULT +
"}ActionNotSupported");
+ public static final javax.xml.namespace.QName _value5 =
javax.xml.namespace.QName.valueOf("{" + Constants.NS_URI_ADDRESSING_DEFAULT +
"}EndpointUnavailable");
public static final FaultSubcodeValues value1 = new
FaultSubcodeValues(_value1);
public static final FaultSubcodeValues value2 = new
FaultSubcodeValues(_value2);
public static final FaultSubcodeValues value3 = new
FaultSubcodeValues(_value3);
@@ -96,7 +96,7 @@
new org.apache.axis.description.TypeDesc(FaultSubcodeValues.class);
static {
- typeDesc.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING, "FaultSubcodeValues"));
+ typeDesc.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT,
"FaultSubcodeValues"));
}
/**
* Return type metadata object
1.6 +1 -1
ws-fx/addressing/src/org/apache/axis/message/addressing/PortType.java
Index: PortType.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/PortType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PortType.java 19 Nov 2004 17:56:06 -0000 1.5
+++ PortType.java 14 Feb 2005 23:51:32 -0000 1.6
@@ -60,7 +60,7 @@
*/
public void append(Element parent) {
Element pt = parent.getOwnerDocument().createElementNS(
- Constants.NS_URI_ADDRESSING,
+ Constants.NS_URI_ADDRESSING_DEFAULT,
Constants.PORT_TYPE
);
String value = XMLUtils.getStringForQName(this, pt);
1.3 +2 -2
ws-fx/addressing/src/org/apache/axis/message/addressing/ReferenceParametersType.java
Index: ReferenceParametersType.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/ReferenceParametersType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReferenceParametersType.java 17 Oct 2004 03:14:59 -0000 1.2
+++ ReferenceParametersType.java 14 Feb 2005 23:51:32 -0000 1.3
@@ -156,7 +156,7 @@
*/
public void append(Element parent, String elementName) {
Document doc = parent.getOwnerDocument();
- Element refProp = doc.createElementNS(Constants.NS_URI_ADDRESSING,
+ Element refProp =
doc.createElementNS(Constants.NS_URI_ADDRESSING_DEFAULT,
elementName);
MessageElement [] any = get_any();
if (any != null) {
@@ -212,7 +212,7 @@
new
org.apache.axis.description.TypeDesc(ReferenceParametersType.class, true);
static {
- typeDesc.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING,
"ReferenceParametersType"));
+ typeDesc.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT,
"ReferenceParametersType"));
}
/**
1.16 +2 -2
ws-fx/addressing/src/org/apache/axis/message/addressing/ReferencePropertiesType.java
Index: ReferencePropertiesType.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/ReferencePropertiesType.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ReferencePropertiesType.java 19 Nov 2004 17:56:06 -0000 1.15
+++ ReferencePropertiesType.java 14 Feb 2005 23:51:32 -0000 1.16
@@ -164,7 +164,7 @@
*/
public void append(Element parent, String elementName) {
Document doc = parent.getOwnerDocument();
- Element refProp = doc.createElementNS(Constants.NS_URI_ADDRESSING,
+ Element refProp =
doc.createElementNS(Constants.NS_URI_ADDRESSING_DEFAULT,
elementName);
MessageElement [] any = get_any();
if (any != null) {
@@ -260,7 +260,7 @@
new
org.apache.axis.description.TypeDesc(ReferencePropertiesType.class, true);
static {
- typeDesc.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING,
"ReferencePropertiesType"));
+ typeDesc.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT,
"ReferencePropertiesType"));
}
/**
1.12 +1 -1
ws-fx/addressing/src/org/apache/axis/message/addressing/RelatesTo.java
Index: RelatesTo.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/RelatesTo.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RelatesTo.java 16 Oct 2004 18:27:46 -0000 1.11
+++ RelatesTo.java 14 Feb 2005 23:51:32 -0000 1.12
@@ -103,7 +103,7 @@
throws Exception {
Name nm = env.createName(Constants.RELATES_TO,
Constants.NS_PREFIX_ADDRESSING,
- Constants.NS_URI_ADDRESSING);
+ Constants.NS_URI_ADDRESSING_DEFAULT);
SOAPHeader header = env.getHeader();
if (header == null) {
header = env.addHeader();
1.3 +1 -1
ws-fx/addressing/src/org/apache/axis/message/addressing/ReplyAfterType.java
Index: ReplyAfterType.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/ReplyAfterType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReplyAfterType.java 16 Oct 2004 18:27:46 -0000 1.2
+++ ReplyAfterType.java 14 Feb 2005 23:51:32 -0000 1.3
@@ -163,7 +163,7 @@
new org.apache.axis.description.TypeDesc(ReplyAfterType.class,
true);
static {
- typeDesc.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING, "ReplyAfterType"));
+ typeDesc.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT,
"ReplyAfterType"));
org.apache.axis.description.ElementDesc elemField =
new org.apache.axis.description.ElementDesc();
1.11 +2 -2
ws-fx/addressing/src/org/apache/axis/message/addressing/ServiceNameType.java
Index: ServiceNameType.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/ServiceNameType.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ServiceNameType.java 19 Nov 2004 17:56:06 -0000 1.10
+++ ServiceNameType.java 14 Feb 2005 23:51:32 -0000 1.11
@@ -114,7 +114,7 @@
*/
public void append(Element parent, String elementName) {
Element sn = parent.getOwnerDocument().createElementNS(
- Constants.NS_URI_ADDRESSING,
+ Constants.NS_URI_ADDRESSING_DEFAULT,
elementName);
String value = XMLUtils.getStringForQName(this, sn);
sn.appendChild(parent.getOwnerDocument().createTextNode(value));
@@ -151,7 +151,7 @@
new org.apache.axis.description.TypeDesc(ServiceNameType.class,
true);
static {
- typeDesc.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING, "ServiceNameType"));
+ typeDesc.setXmlType(new
javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT,
"ServiceNameType"));
org.apache.axis.description.AttributeDesc attrField = new
org.apache.axis.description.AttributeDesc();
attrField.setFieldName("port");
attrField.setXmlName(new javax.xml.namespace.QName("", "PortName"));
1.8 +0 -2
ws-fx/addressing/src/org/apache/axis/message/addressing/To.java
Index: To.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/To.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- To.java 16 Oct 2004 18:27:46 -0000 1.7
+++ To.java 14 Feb 2005 23:51:32 -0000 1.8
@@ -21,8 +21,6 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPHeaderElement;
-import org.w3c.dom.Element;
-
/**
* Java content class for To element declaration.
* <p>The following schema fragment specifies the expected content contained
within this java content object. (defined at
http://schemas.xmlsoap.org/ws/2004/08/addressing line 78)
1.30 +1 -1
ws-fx/addressing/src/org/apache/axis/message/addressing/handler/AddressingHandler.java
Index: AddressingHandler.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/handler/AddressingHandler.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- AddressingHandler.java 17 Nov 2004 19:31:24 -0000 1.29
+++ AddressingHandler.java 14 Feb 2005 23:51:32 -0000 1.30
@@ -160,7 +160,7 @@
}
// set action for fault only with 04 spec. 03 spec unclear on that
issue
- if
(Constants.NS_URI_ADDRESSING.equals(Constants.NS_URI_ADDRESSING_04)) {
+ if
(Constants.NS_URI_ADDRESSING_DEFAULT.equals(Constants.NS_URI_ADDRESSING_2004_03))
{
resHeaders.setAction(new Action(new
URI(Constants.FAULT_ACTION)));
}
1.5 +6 -2
ws-fx/addressing/src/org/apache/axis/message/addressing/util/AddressingUtils.java
Index: AddressingUtils.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/util/AddressingUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AddressingUtils.java 28 Jul 2004 14:20:20 -0000 1.4
+++ AddressingUtils.java 14 Feb 2005 23:51:32 -0000 1.5
@@ -60,7 +60,7 @@
while (headers.hasNext()) {
SOAPHeaderElement hElement = (SOAPHeaderElement) headers.next();
Name hName = hElement.getElementName();
- if (Constants.NS_URI_ADDRESSING.equals(hName.getURI()) &&
+ if (isAddressingNamespaceURI( hName.getURI() ) &&
hName.getLocalName().equals(headerName)) {
existingElements.add(hElement);
}
@@ -71,6 +71,10 @@
}
}
+ public static boolean isAddressingNamespaceURI( String nsURI ) {
+ return Constants.ADDRESSING_NS_URI_SET.contains( nsURI );
+ }
+
/**
* Removes all instances of all WS-Addressing headers for a given
* actor.
@@ -85,7 +89,7 @@
while (headers.hasNext()) {
SOAPHeaderElement hElement = (SOAPHeaderElement) headers.next();
Name hName = hElement.getElementName();
- if (Constants.NS_URI_ADDRESSING.equals(hName.getURI())) {
+ if (isAddressingNamespaceURI( hName.getURI() )) {
existingElements.add(hElement);
}
}
1.4 +24 -8
ws-fx/addressing/src/org/apache/ws/addressing/handler/AbstractAddressingHandler.java
Index: AbstractAddressingHandler.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/ws/addressing/handler/AbstractAddressingHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractAddressingHandler.java 20 Aug 2004 01:40:47 -0000 1.3
+++ AbstractAddressingHandler.java 14 Feb 2005 23:51:32 -0000 1.4
@@ -51,14 +51,30 @@
static final String UUID_URI_SCHEME = "uuid";
private static final QName[] UNDERSTOOD_HEADERS = new QName[]{
- new QName( Constants.NS_URI_ADDRESSING, Constants.ACTION ),
- new QName( Constants.NS_URI_ADDRESSING, Constants.FAULT_TO ),
- new QName( Constants.NS_URI_ADDRESSING, Constants.FROM ),
- new QName( Constants.NS_URI_ADDRESSING, Constants.MESSAGE_ID ),
- new QName( Constants.NS_URI_ADDRESSING, Constants.RECIPIENT ),
- new QName( Constants.NS_URI_ADDRESSING, Constants.RELATES_TO ),
- new QName( Constants.NS_URI_ADDRESSING, Constants.REPLY_TO ),
- new QName( Constants.NS_URI_ADDRESSING, Constants.TO ),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.ACTION),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.FAULT_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.FROM),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.MESSAGE_ID),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.RECIPIENT),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.RELATES_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.REPLY_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.ACTION),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.FAULT_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.FROM),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.MESSAGE_ID),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.RECIPIENT),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.RELATES_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.REPLY_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.ACTION),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.FAULT_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.FROM),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.MESSAGE_ID),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.RECIPIENT),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.RELATES_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.REPLY_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.TO)
};
/**
1.3 +2 -2
ws-fx/addressing/src/org/apache/ws/addressing/handler/ServerSideAddressingHandler.java
Index: ServerSideAddressingHandler.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/src/org/apache/ws/addressing/handler/ServerSideAddressingHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerSideAddressingHandler.java 20 Aug 2004 01:40:47 -0000 1.2
+++ ServerSideAddressingHandler.java 14 Feb 2005 23:51:32 -0000 1.3
@@ -166,8 +166,8 @@
AddressingHeaders resHeaders =
AddressingUtils.getResponseHeaders( msgContext );
processFromHeader( reqHeaders, resHeaders );
- // set action for fault only with 04 spec. 03 spec unclear on that
issue
- if ( Constants.NS_URI_ADDRESSING.equals(
Constants.NS_URI_ADDRESSING_04 ) )
+ // set action for fault only with 04 spec; 03 spec unclear on that
issue
+ if ( ! reqHeaders.getNamespaceURI().equals(
Constants.NS_URI_ADDRESSING_2003_03 ) )
{
resHeaders.setAction( new Action( new URI(
Constants.FAULT_ACTION ) ) );
}
1.3 +7 -21 ws-fx/addressing/test/addressing/TestEPR.java
Index: TestEPR.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/test/addressing/TestEPR.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestEPR.java 19 Nov 2004 17:56:45 -0000 1.2
+++ TestEPR.java 14 Feb 2005 23:51:33 -0000 1.3
@@ -14,41 +14,27 @@
* limitations under the License.
*
*/
-
package addressing;
import junit.framework.TestCase;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.axis.message.MessageElement;
-import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.addressing.Address;
+import org.apache.axis.message.addressing.EndpointReference;
+import org.apache.axis.message.addressing.EndpointReferenceType;
import org.apache.axis.message.addressing.PortType;
-import org.apache.axis.message.addressing.ServiceNameType;
import org.apache.axis.message.addressing.ReferencePropertiesType;
-import org.apache.axis.message.addressing.EndpointReferenceType;
-import org.apache.axis.message.addressing.EndpointReference;
-import org.apache.axis.message.addressing.Constants;
-import org.apache.axis.types.URI;
+import org.apache.axis.message.addressing.ServiceNameType;
import org.apache.axis.utils.XMLUtils;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Iterator;
-
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.Name;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
/**
* Class TestSerDeser
1.14 +5 -6 ws-fx/addressing/test/addressing/TestSerDeser.java
Index: TestSerDeser.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/test/addressing/TestSerDeser.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TestSerDeser.java 19 Nov 2004 17:56:45 -0000 1.13
+++ TestSerDeser.java 14 Feb 2005 23:51:33 -0000 1.14
@@ -14,7 +14,6 @@
* limitations under the License.
*
*/
-
package addressing;
import junit.framework.TestCase;
@@ -53,7 +52,7 @@
public class TestSerDeser extends TestCase {
String xml =
"<S:Envelope
xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"\n"; +
- " xmlns:wsa=\"" + Constants.NS_URI_ADDRESSING + "\"\n" +
+ " xmlns:wsa=\"" + Constants.NS_URI_ADDRESSING_DEFAULT + "\"\n" +
" xmlns:f123=\"http://www.fabrikam123.com/svc53\"; \n" +
">\n" +
" <S:Header>\n" +
@@ -79,7 +78,7 @@
String xml2 =
"<S:Envelope
xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"\n"; +
- " xmlns:wsa=\"" + Constants.NS_URI_ADDRESSING + "\"\n" +
+ " xmlns:wsa=\"" + Constants.NS_URI_ADDRESSING_DEFAULT + "\"\n" +
" xmlns:f123=\"http://www.fabrikam123.com/svc53\"; \n" +
">\n" +
" <S:Header>\n" +
@@ -114,7 +113,7 @@
String xml3 =
"<S:Envelope
xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"\n"; +
- " xmlns:wsa=\"" + Constants.NS_URI_ADDRESSING + "\"\n" +
+ " xmlns:wsa=\"" + Constants.NS_URI_ADDRESSING_DEFAULT + "\"\n" +
" xmlns:f123=\"http://www.fabrikam123.com/svc53\"; \n" +
">\n" +
" <S:Header>\n" +
@@ -278,7 +277,7 @@
private void checkForRepeatedHeaderElements(SOAPEnvelope env)
throws Exception {
Enumeration headers = env.getHeadersByName(
- Constants.NS_URI_ADDRESSING, "Action", true);
+ Constants.NS_URI_ADDRESSING_DEFAULT, "Action", true);
int count = 0;
while (headers.hasMoreElements())
{
@@ -289,7 +288,7 @@
assertEquals(count, 1);
headers = env.getHeadersByName(
- Constants.NS_URI_ADDRESSING, "To", true);
+ Constants.NS_URI_ADDRESSING_DEFAULT, "To", true);
count = 0;
while (headers.hasMoreElements())
{
1.4 +24 -8
ws-fx/addressing/test/org/apache/ws/addressing/handler/AbstractAddressingHandlerTestCase.java
Index: AbstractAddressingHandlerTestCase.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/test/org/apache/ws/addressing/handler/AbstractAddressingHandlerTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractAddressingHandlerTestCase.java 20 Aug 2004 01:40:47 -0000
1.3
+++ AbstractAddressingHandlerTestCase.java 14 Feb 2005 23:51:33 -0000
1.4
@@ -60,14 +60,30 @@
protected static final String ACTOR_NEXT =
"http://schemas.xmlsoap.org/soap/actor/next";;
private static final QName[] EXPECTED_UNDERSTOOD_HEADERS = new QName[]{
- new QName(Constants.NS_URI_ADDRESSING, Constants.ACTION),
- new QName(Constants.NS_URI_ADDRESSING, Constants.FAULT_TO),
- new QName(Constants.NS_URI_ADDRESSING, Constants.FROM),
- new QName(Constants.NS_URI_ADDRESSING, Constants.MESSAGE_ID),
- new QName(Constants.NS_URI_ADDRESSING, Constants.RECIPIENT),
- new QName(Constants.NS_URI_ADDRESSING, Constants.RELATES_TO),
- new QName(Constants.NS_URI_ADDRESSING, Constants.REPLY_TO),
- new QName(Constants.NS_URI_ADDRESSING, Constants.TO),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.ACTION),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.FAULT_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.FROM),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.MESSAGE_ID),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.RECIPIENT),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.RELATES_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.REPLY_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2003_03, Constants.TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.ACTION),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.FAULT_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.FROM),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.MESSAGE_ID),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.RECIPIENT),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.RELATES_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.REPLY_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_03, Constants.TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.ACTION),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.FAULT_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.FROM),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.MESSAGE_ID),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.RECIPIENT),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.RELATES_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.REPLY_TO),
+ new QName(Constants.NS_URI_ADDRESSING_2004_08, Constants.TO)
};
/**
1.5 +0 -1
ws-fx/addressing/test/org/apache/ws/addressing/handler/ClientSideAddressingHandlerTestCase.java
Index: ClientSideAddressingHandlerTestCase.java
===================================================================
RCS file:
/home/cvs/ws-fx/addressing/test/org/apache/ws/addressing/handler/ClientSideAddressingHandlerTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClientSideAddressingHandlerTestCase.java 20 Aug 2004 01:40:47 -0000
1.4
+++ ClientSideAddressingHandlerTestCase.java 14 Feb 2005 23:51:33 -0000
1.5
@@ -25,7 +25,6 @@
import org.apache.axis.message.addressing.Recipient;
import org.apache.axis.message.addressing.ReferencePropertiesType;
import org.apache.axis.message.addressing.RelatesTo;
-import org.apache.axis.message.addressing.To;
import org.apache.axis.types.URI;
import javax.xml.namespace.QName;
