You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ip...@apache.org on 2005/04/08 17:57:26 UTC
cvs commit: ws-fx/addressing/test/org/apache/ws/addressing/handler ClientSideAddressingHandlerTestCase.java ServerSideAddressingHandlerTestCase.java
ips 2005/04/08 08:57:26
Modified: addressing maven.xml
addressing/src/org/apache/axis/message/addressing
Action.java Address.java AddressingHeaders.java
AttributedQName.java AttributedURI.java
Constants.java EndpointReference.java
EndpointReferenceType.java FaultSubcodeValues.java
PortType.java ReferenceParametersType.java
ReferencePropertiesType.java RelatesTo.java
Relationship.java RelationshipTypeValues.java
ReplyAfterType.java ServiceNameType.java To.java
addressing/src/org/apache/axis/message/addressing/handler
AddressingHandler.java GenericAxisHandler.java
addressing/src/org/apache/axis/message/addressing/tools/wsdl
JavaAddressingGeneratorFactory.java
JavaAddressingServiceIfaceImplWriter.java
JavaAddressingServiceImplWriter.java
JavaAddressingServiceWriter.java
addressing/src/org/apache/axis/message/addressing/util
AddressingUtils.java TextExtractor.java
addressing/src/org/apache/ws/addressing/handler
ClientSideAddressingHandler.java
ServerSideAddressingHandler.java
addressing/test/addressing TestSerDeser.java
addressing/test/org/apache/ws/addressing/handler
ClientSideAddressingHandlerTestCase.java
ServerSideAddressingHandlerTestCase.java
Log:
now simultaneously supports 2003/03, 2004/03, and 2004/08 versions of WSA
Revision Changes Path
1.8 +6 -5 ws-fx/addressing/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/ws-fx/addressing/maven.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven.xml 16 Oct 2004 18:27:46 -0000 1.7
+++ maven.xml 8 Apr 2005 15:57:25 -0000 1.8
@@ -5,8 +5,7 @@
<project default="jar"
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
- xmlns:deploy="deploy"
- xmlns:ant="jelly:ant">
+ xmlns:deploy="deploy">
<goal name="setclasspath">
<path id="test.classpath">
@@ -15,8 +14,10 @@
</goal>
<postGoal name="jar">
- <ant:mkdir dir="${basedir}/target/lib"/>
- <deploy:copy-deps todir="${basedir}/target/lib"/>
+ <property name="lib.dir" location="target/lib"/>
+ <echo>Copying dependency jars to ${lib.dir} ...</echo>
+ <mkdir dir="${lib.dir}"/>
+ <deploy:copy-deps todir="${lib.dir}"/>
</postGoal>
<preGoal name="test:compile">
1.8 +0 -2 ws-fx/addressing/src/org/apache/axis/message/addressing/Action.java
Index: Action.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/Action.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Action.java 16 Oct 2004 18:27:46 -0000 1.7
+++ Action.java 8 Apr 2005 15:57:25 -0000 1.8
@@ -22,8 +22,6 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPHeaderElement;
-import org.w3c.dom.Element;
-
/**
* Java content class for Action 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 79)
1.5 +2 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Address.java 14 Feb 2005 23:51:32 -0000 1.4
+++ Address.java 8 Apr 2005 15:57:25 -0000 1.5
@@ -24,6 +24,7 @@
import org.w3c.dom.Element;
import org.apache.axis.message.addressing.util.TextExtractor;
+import org.apache.axis.message.addressing.util.AddressingUtils;
/**
* Class Address
@@ -57,7 +58,7 @@
* @param parent
*/
public void append(Element parent) {
- Element child = parent.getOwnerDocument().createElementNS(Constants.NS_URI_ADDRESSING_DEFAULT,
+ Element child = parent.getOwnerDocument().createElementNS(AddressingUtils.getAddressingNamespaceURI(),
Constants.ADDRESS);
child.appendChild(parent.getOwnerDocument().createTextNode(toString()));
parent.appendChild(child);
1.17 +8 -17 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AddressingHeaders.java 8 Mar 2005 21:40:21 -0000 1.16
+++ AddressingHeaders.java 8 Apr 2005 15:57:25 -0000 1.17
@@ -20,6 +20,8 @@
import org.apache.axis.message.MessageElement;
import org.apache.axis.types.URI;
+import org.apache.axis.AxisEngine;
+import org.apache.axis.MessageContext;
import org.w3c.dom.Element;
import javax.xml.namespace.QName;
@@ -91,8 +93,6 @@
*/
private boolean setMustUnderstand = false;
- private String nsURI = Constants.NS_URI_ADDRESSING_DEFAULT;
-
/**
* Constructor AddressingHeaders
*/
@@ -193,7 +193,9 @@
messageID = new MessageID(headerElement);
} else if (localName.equals(Constants.TO)) {
to = new To(headerElement);
- nsURI = headerElement.getNamespaceURI();
+ // set the WSA namespace URI in the MessageContext, so we'll know how to serialize types associated with this request
+ MessageContext msgContext = AxisEngine.getCurrentMessageContext();
+ if ( msgContext != null ) { msgContext.setProperty( Constants.ENV_ADDRESSING_NAMESPACE_URI, name.getURI() ); }
} else if (localName.equals(Constants.ACTION)) {
action = new Action(headerElement);
} else if (localName.equals(Constants.FROM)) {
@@ -239,15 +241,6 @@
}
/**
- * 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;
- }
-
- /**
* Method getAction
*
* @return
@@ -352,7 +345,7 @@
if (env.getNamespaceURI(Constants.NS_PREFIX_ADDRESSING) == null) {
env.addNamespaceDeclaration(Constants.NS_PREFIX_ADDRESSING,
- getNamespaceURI());
+ AddressingUtils.getAddressingNamespaceURI());
}
AddressingUtils.removeHeaders(env.getHeader(), actorURI);
@@ -543,7 +536,7 @@
String actorURI)
throws Exception {
// If no referenceProps are available, we are done
- if (referenceProperties == null) return;
+ if (referenceProperties == null) { return; }
SOAPHeaderElement element = null;
// Add each ref property to SOAP Header
@@ -567,9 +560,7 @@
}
SOAPHeader header = env.getHeader();
- if (header == null) {
- header = env.addHeader();
- }
+ if (header == null) { header = env.addHeader(); }
element.setActor(actorURI);
header.addChildElement(element);
}
1.10 +3 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AttributedQName.java 14 Feb 2005 23:51:32 -0000 1.9
+++ AttributedQName.java 8 Apr 2005 15:57:25 -0000 1.10
@@ -18,6 +18,7 @@
package org.apache.axis.message.addressing;
import org.apache.axis.utils.XMLUtils;
+import org.apache.axis.message.addressing.util.AddressingUtils;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
@@ -56,7 +57,7 @@
* Constructor AttributedQName
*
* @param namespace
- * @param localname
+ * @param localPart
*/
public AttributedQName(String namespace,
String localPart) {
@@ -70,7 +71,7 @@
*/
public void append(Element parent, String elementName) {
Document doc = parent.getOwnerDocument();
- Element pt = doc.createElementNS(Constants.NS_URI_ADDRESSING_DEFAULT, elementName);
+ Element pt = doc.createElementNS(AddressingUtils.getAddressingNamespaceURI(), elementName);
String value = XMLUtils.getStringForQName(this, pt);
pt.appendChild(doc.createTextNode(value));
parent.appendChild(pt);
1.15 +9 -16 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AttributedURI.java 14 Feb 2005 23:51:32 -0000 1.14
+++ AttributedURI.java 8 Apr 2005 15:57:25 -0000 1.15
@@ -17,23 +17,16 @@
package org.apache.axis.message.addressing;
+import org.apache.axis.message.addressing.util.AddressingUtils;
import org.apache.axis.message.addressing.util.TextExtractor;
-
import org.apache.axis.types.URI;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import javax.xml.soap.Name;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPHeader;
-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;
-import java.util.ArrayList;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Document;
/**
* Java content class for AttributedURI complex type.
@@ -95,7 +88,7 @@
*/
public void append(Element parent, String elementName) {
Document doc = parent.getOwnerDocument();
- Element child = doc.createElementNS(Constants.NS_URI_ADDRESSING_DEFAULT, elementName);
+ Element child = doc.createElementNS(AddressingUtils.getAddressingNamespaceURI(), elementName);
child.appendChild(doc.createTextNode(toString()));
parent.appendChild(child);
}
@@ -107,16 +100,16 @@
if (name == null) {
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_DEFAULT);
+ Name qname = env.createName(name,
+ Constants.NS_PREFIX_ADDRESSING,
+ AddressingUtils.getAddressingNamespaceURI());
SOAPHeader header = env.getHeader();
if (header == null) {
header = env.addHeader();
}
// add the new header element
- SOAPHeaderElement headerElement = header.addHeaderElement(nm);
+ SOAPHeaderElement headerElement = header.addHeaderElement(qname);
headerElement.setActor(actorURI);
headerElement.addTextNode(toString());
return headerElement;
1.13 +10 -44 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Constants.java 18 Mar 2005 16:40:34 -0000 1.12
+++ Constants.java 8 Apr 2005 15:57:25 -0000 1.13
@@ -16,12 +16,8 @@
*/
package org.apache.axis.message.addressing;
-import javax.xml.namespace.QName;
-import java.util.HashSet;
-import java.util.Set;
-
/**
- * Interface Constants
+ * WS-Addressing constants.
*
* @author Davanum Srinivas (dims@yahoo.com)
*/
@@ -57,29 +53,6 @@
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_DEFAULT +
- "/fault";
-
- /**
- * Field NS_URI_ANONYMOUS
- */
- public static final String NS_URI_ANONYMOUS = NS_URI_ADDRESSING_DEFAULT
- + "/role/anonymous";
-
- /**
* Field ENDPOINT_REFERENCE
*/
public static final String ENDPOINT_REFERENCE = "EndpointReference";
@@ -165,11 +138,6 @@
public static final String RECIPIENT = "Recipient";
/**
- * Field QNAME_RESPONSE
- */
- public static final QName QNAME_RESPONSE;
-
- /**
* Internal property for passing some WSA headers from
* the generated Stub class to the handlers.
*/
@@ -187,7 +155,14 @@
*/
public static final String ENV_ADDRESSING_RESPONSE_HEADERS =
"org.apache.axis.message.addressing.RESPONSE.HEADERS";
-
+
+ /**
+ * SOAP message context prop that contains the namespace URI of the WSA version being used by the current request.
+ * Value is a String.
+ */
+ public static final String ENV_ADDRESSING_NAMESPACE_URI =
+ "addressing.namespace.URI";
+
/**
* Field ENV_ADDRESSING_FROM_URI
*/
@@ -221,17 +196,8 @@
/**
* Field QNAME_ACTION
*/
- public static final QName QNAME_ACTION =
- new QName(NS_URI_ADDRESSING_DEFAULT, ACTION);
+ public static final String WSDL_ATTRIB_ACTION = "Action";
- static {
- if (NS_URI_ADDRESSING_DEFAULT.equals(NS_URI_ADDRESSING_2003_03)) {
- QNAME_RESPONSE = new QName(NS_URI_ADDRESSING_DEFAULT, RESPONSE);
- } else {
- QNAME_RESPONSE = new QName(NS_URI_ADDRESSING_DEFAULT, REPLY);
- }
- }
-
}
1.19 +13 -20 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- EndpointReference.java 14 Feb 2005 23:51:32 -0000 1.18
+++ EndpointReference.java 8 Apr 2005 15:57:25 -0000 1.19
@@ -17,28 +17,23 @@
package org.apache.axis.message.addressing;
-import org.apache.axis.message.addressing.util.TextExtractor;
-
+import org.apache.axis.message.MessageElement;
+import org.apache.axis.message.addressing.util.AddressingUtils;
import org.apache.axis.types.URI;
import org.apache.axis.utils.XMLUtils;
-import org.apache.axis.message.MessageElement;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPHeaderElement;
import javax.xml.soap.SOAPHeader;
-import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.soap.SOAPHeaderElement;
+import java.util.Iterator;
/**
* Java content class for EndpointReference element declaration.
@@ -96,7 +91,7 @@
/**
* Constructor EndpointReference
*
- * @param el
+ * @param element
* @throws Exception
*/
public EndpointReference(SOAPElement element)
@@ -105,9 +100,8 @@
while(iter.hasNext()) {
javax.xml.soap.Node child = (javax.xml.soap.Node)iter.next();
if (child instanceof SOAPElement) {
- if (!Constants.NS_URI_ADDRESSING_DEFAULT.equals(
- child.getNamespaceURI())) {
- // skip now. does not handle extensibiliy elements now
+ if (!AddressingUtils.isAddressingNamespaceURI(child.getNamespaceURI())) {
+ // skip for now - does not currently handle extensibility elements
continue;
}
String localName = child.getLocalName();
@@ -137,17 +131,16 @@
/**
* Constructor EndpointReference
*
- * @param el
+ * @param element
* @throws Exception
*/
- public EndpointReference(final Element element)
+ public EndpointReference(Element element)
throws Exception {
NodeList children = element.getChildNodes();
for (int i=0;i<children.getLength();i++) {
Node child = (Node)children.item(i);
if (child instanceof Element) {
- if (!Constants.NS_URI_ADDRESSING_DEFAULT.equals(
- child.getNamespaceURI())) {
+ if (!AddressingUtils.isAddressingNamespaceURI(child.getNamespaceURI())) {
// skip now. does not handle extensibiliy elements now
continue;
}
@@ -188,7 +181,7 @@
* Method toDOM.
*
* @param doc
- * @param name
+ * @param elementName
*/
public Element toDOM(Document doc, String elementName) {
if (doc == null) {
@@ -199,7 +192,7 @@
}
}
- Element parent = doc.createElementNS(Constants.NS_URI_ADDRESSING_DEFAULT,
+ Element parent = doc.createElementNS(AddressingUtils.getAddressingNamespaceURI(),
elementName);
if (doc.getDocumentElement() == null) {
doc.appendChild(parent);
1.18 +46 -44 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- EndpointReferenceType.java 14 Feb 2005 23:51:32 -0000 1.17
+++ EndpointReferenceType.java 8 Apr 2005 15:57:25 -0000 1.18
@@ -19,9 +19,11 @@
import org.apache.axis.encoding.AnyContentType;
import org.apache.axis.message.MessageElement;
+import org.apache.axis.message.addressing.util.AddressingUtils;
import org.apache.axis.types.URI;
import org.apache.axis.utils.XMLUtils;
+import javax.xml.namespace.QName;
import java.io.Serializable;
/**
@@ -51,32 +53,32 @@
/**
* Field address
*/
- private AttributedURI address;
+ private AttributedURI m_address;
/**
* Field portType
*/
- private AttributedQName portType;
+ private AttributedQName m_portType;
/**
* Field serviceName
*/
- private ServiceNameType serviceName;
+ private ServiceNameType m_serviceName;
/**
* Field properties
*/
- private ReferencePropertiesType properties = new ReferencePropertiesType();
+ private ReferencePropertiesType m_properties = new ReferencePropertiesType();
/**
* Field parameters
*/
- private ReferenceParametersType parameters = new ReferenceParametersType();
+ private ReferenceParametersType m_parameters = new ReferenceParametersType();
/*
* Field extensibility elements
*/
- private MessageElement [] _any;
+ private MessageElement [] m_any;
/**
* Constructor EndpointReferenceType
@@ -90,7 +92,7 @@
* @param address
*/
public EndpointReferenceType(URI address) {
- this.address = new AttributedURI(address);
+ this.m_address = new AttributedURI(address);
}
/**
@@ -99,7 +101,7 @@
* @param address
*/
public EndpointReferenceType(Address address) {
- this.address = address;
+ this.m_address = address;
}
/**
@@ -192,7 +194,7 @@
* @return
*/
public AttributedURI getAddress() {
- return address;
+ return m_address;
}
/**
@@ -201,7 +203,7 @@
* @param address
*/
public void setAddress(AttributedURI address) {
- this.address = address;
+ this.m_address = address;
}
/**
@@ -210,7 +212,7 @@
* @return
*/
public AttributedQName getPortType() {
- return portType;
+ return m_portType;
}
/**
@@ -219,7 +221,7 @@
* @param portType
*/
public void setPortType(AttributedQName portType) {
- this.portType = portType;
+ this.m_portType = portType;
}
/**
@@ -228,7 +230,7 @@
* @return
*/
public ReferencePropertiesType getProperties() {
- return properties;
+ return m_properties;
}
/**
@@ -237,7 +239,7 @@
* @param properties
*/
public void setProperties(ReferencePropertiesType properties) {
- this.properties = properties;
+ this.m_properties = properties;
}
/**
@@ -246,7 +248,7 @@
* @return
*/
public ReferenceParametersType getParameters() {
- return parameters;
+ return m_parameters;
}
/**
@@ -255,7 +257,7 @@
* @param parameters
*/
public void setParameters(ReferenceParametersType parameters) {
- this.parameters = parameters;
+ this.m_parameters = parameters;
}
/**
@@ -264,7 +266,7 @@
* @return
*/
public ServiceNameType getServiceName() {
- return serviceName;
+ return m_serviceName;
}
/**
@@ -273,7 +275,7 @@
* @param serviceName
*/
public void setServiceName(ServiceNameType serviceName) {
- this.serviceName = serviceName;
+ this.m_serviceName = serviceName;
}
/**
@@ -281,7 +283,7 @@
* @return
*/
public MessageElement[] get_any() {
- return _any;
+ return m_any;
}
/**
@@ -289,35 +291,35 @@
* @param _any
*/
public void set_any(MessageElement[] _any) {
- this._any = _any;
+ this.m_any = _any;
}
public String toString() {
StringBuffer buf = new StringBuffer();
- if (this.address != null) {
- buf.append("Address: " + this.address);
+ if (this.m_address != null) {
+ buf.append("Address: " + this.m_address);
buf.append("\n");
}
- if (this.portType != null) {
- buf.append("Port Type: " + this.portType);
+ if (this.m_portType != null) {
+ buf.append("Port Type: " + this.m_portType);
buf.append("\n");
}
- if (this.serviceName != null) {
- buf.append("Service Name: " + this.serviceName);
+ if (this.m_serviceName != null) {
+ buf.append("Service Name: " + this.m_serviceName);
buf.append("\n");
- if (this.serviceName.getPort() != null) {
- buf.append("Port Name: " + this.serviceName.getPort());
+ if (this.m_serviceName.getPort() != null) {
+ buf.append("Port Name: " + this.m_serviceName.getPort());
buf.append("\n");
}
}
- if (this.properties != null) {
- buf.append(this.properties);
+ if (this.m_properties != null) {
+ buf.append(this.m_properties);
}
- if (this._any != null) {
- for (int i=0;i<this._any.length;i++) {
+ if (this.m_any != null) {
+ for (int i=0;i<this.m_any.length;i++) {
buf.append("Extensibility Element[" + i + "]:\n");
try {
- buf.append(XMLUtils.ElementToString(this._any[i].getAsDOM()));
+ buf.append(XMLUtils.ElementToString(this.m_any[i].getAsDOM()));
} catch (Exception e) {
buf.append("<error converting: " + e.getMessage() + ">");
}
@@ -334,34 +336,34 @@
new org.apache.axis.description.TypeDesc(EndpointReferenceType.class, true);
static {
- typeDesc.setXmlType(new javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "EndpointReferenceType"));
+ typeDesc.setXmlType(new QName(AddressingUtils.getAddressingNamespaceURI(), "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_DEFAULT, "Address"));
- elemField.setXmlType(new javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "AttributedURI"));
+ elemField.setXmlName(new QName(AddressingUtils.getAddressingNamespaceURI(), "Address"));
+ elemField.setXmlType(new QName(AddressingUtils.getAddressingNamespaceURI(), "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_DEFAULT, "ReferenceProperties"));
- elemField.setXmlType(new javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "ReferencePropertiesType"));
+ elemField.setXmlName(new QName(AddressingUtils.getAddressingNamespaceURI(), "ReferenceProperties"));
+ elemField.setXmlType(new QName(AddressingUtils.getAddressingNamespaceURI(), "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_DEFAULT, "ReferenceParameters"));
- elemField.setXmlType(new javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "ReferenceParametersType"));
+ elemField.setXmlName(new QName(AddressingUtils.getAddressingNamespaceURI(), "ReferenceParameters"));
+ elemField.setXmlType(new QName(AddressingUtils.getAddressingNamespaceURI(), "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_DEFAULT, "PortType"));
- elemField.setXmlType(new javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "AttributedQName"));
+ elemField.setXmlName(new QName(AddressingUtils.getAddressingNamespaceURI(), "PortType"));
+ elemField.setXmlType(new QName(AddressingUtils.getAddressingNamespaceURI(), "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_DEFAULT, "ServiceName"));
- elemField.setXmlType(new javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "ServiceNameType"));
+ elemField.setXmlName(new QName(AddressingUtils.getAddressingNamespaceURI(), "ServiceName"));
+ elemField.setXmlType(new QName(AddressingUtils.getAddressingNamespaceURI(), "ServiceNameType"));
elemField.setMinOccurs(0);
typeDesc.addFieldDesc(elemField);
}
1.4 +10 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FaultSubcodeValues.java 14 Feb 2005 23:51:32 -0000 1.3
+++ FaultSubcodeValues.java 8 Apr 2005 15:57:25 -0000 1.4
@@ -17,6 +17,10 @@
package org.apache.axis.message.addressing;
+import org.apache.axis.message.addressing.util.AddressingUtils;
+
+import javax.xml.namespace.QName;
+
/**
* Java content class for FaultSubcodeValues 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 110)
@@ -45,11 +49,11 @@
_table_.put(_value_,this);
}
- 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 javax.xml.namespace.QName _value1 = javax.xml.namespace.QName.valueOf("{" + AddressingUtils.getAddressingNamespaceURI() + "}InvalidMessageInformationHeader");
+ public static final javax.xml.namespace.QName _value2 = javax.xml.namespace.QName.valueOf("{" + AddressingUtils.getAddressingNamespaceURI() + "}MessageInformationHeaderRequired");
+ public static final javax.xml.namespace.QName _value3 = javax.xml.namespace.QName.valueOf("{" + AddressingUtils.getAddressingNamespaceURI() + "}DestinationUnreachable");
+ public static final javax.xml.namespace.QName _value4 = javax.xml.namespace.QName.valueOf("{" + AddressingUtils.getAddressingNamespaceURI() + "}ActionNotSupported");
+ public static final javax.xml.namespace.QName _value5 = javax.xml.namespace.QName.valueOf("{" + AddressingUtils.getAddressingNamespaceURI() + "}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 +100,7 @@
new org.apache.axis.description.TypeDesc(FaultSubcodeValues.class);
static {
- typeDesc.setXmlType(new javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "FaultSubcodeValues"));
+ typeDesc.setXmlType(new QName(AddressingUtils.getAddressingNamespaceURI(), "FaultSubcodeValues"));
}
/**
* Return type metadata object
1.7 +2 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PortType.java 14 Feb 2005 23:51:32 -0000 1.6
+++ PortType.java 8 Apr 2005 15:57:25 -0000 1.7
@@ -22,6 +22,7 @@
import org.apache.axis.utils.XMLUtils;
import org.apache.axis.message.addressing.util.TextExtractor;
+import org.apache.axis.message.addressing.util.AddressingUtils;
import org.w3c.dom.Element;
@@ -60,7 +61,7 @@
*/
public void append(Element parent) {
Element pt = parent.getOwnerDocument().createElementNS(
- Constants.NS_URI_ADDRESSING_DEFAULT,
+ AddressingUtils.getAddressingNamespaceURI(),
Constants.PORT_TYPE
);
String value = XMLUtils.getStringForQName(this, pt);
1.4 +3 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReferenceParametersType.java 14 Feb 2005 23:51:32 -0000 1.3
+++ ReferenceParametersType.java 8 Apr 2005 15:57:25 -0000 1.4
@@ -19,6 +19,7 @@
import org.apache.axis.encoding.AnyContentType;
import org.apache.axis.message.MessageElement;
+import org.apache.axis.message.addressing.util.AddressingUtils;
import org.apache.axis.utils.XMLUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -156,7 +157,7 @@
*/
public void append(Element parent, String elementName) {
Document doc = parent.getOwnerDocument();
- Element refProp = doc.createElementNS(Constants.NS_URI_ADDRESSING_DEFAULT,
+ Element refProp = doc.createElementNS(AddressingUtils.getAddressingNamespaceURI(),
elementName);
MessageElement [] any = get_any();
if (any != null) {
@@ -212,7 +213,7 @@
new org.apache.axis.description.TypeDesc(ReferenceParametersType.class, true);
static {
- typeDesc.setXmlType(new javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "ReferenceParametersType"));
+ typeDesc.setXmlType(new QName(AddressingUtils.getAddressingNamespaceURI(), "ReferenceParametersType"));
}
/**
1.17 +3 -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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ReferencePropertiesType.java 14 Feb 2005 23:51:32 -0000 1.16
+++ ReferencePropertiesType.java 8 Apr 2005 15:57:25 -0000 1.17
@@ -19,6 +19,7 @@
import org.apache.axis.encoding.AnyContentType;
import org.apache.axis.message.MessageElement;
+import org.apache.axis.message.addressing.util.AddressingUtils;
import org.apache.axis.utils.XMLUtils;
import org.apache.commons.logging.Log;
@@ -164,7 +165,7 @@
*/
public void append(Element parent, String elementName) {
Document doc = parent.getOwnerDocument();
- Element refProp = doc.createElementNS(Constants.NS_URI_ADDRESSING_DEFAULT,
+ Element refProp = doc.createElementNS(AddressingUtils.getAddressingNamespaceURI(),
elementName);
MessageElement [] any = get_any();
if (any != null) {
@@ -260,7 +261,7 @@
new org.apache.axis.description.TypeDesc(ReferencePropertiesType.class, true);
static {
- typeDesc.setXmlType(new javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "ReferencePropertiesType"));
+ typeDesc.setXmlType(new QName(AddressingUtils.getAddressingNamespaceURI(), "ReferencePropertiesType"));
}
/**
1.13 +7 -7 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RelatesTo.java 14 Feb 2005 23:51:32 -0000 1.12
+++ RelatesTo.java 8 Apr 2005 15:57:25 -0000 1.13
@@ -76,25 +76,25 @@
/**
* Constructor RelatesTo
*
- * @param el
+ * @param element
* @throws Exception
*/
- public RelatesTo(SOAPElement el)
+ public RelatesTo(SOAPElement element)
throws Exception {
super();
- setURI(new URI(TextExtractor.getText(el)));
- String value = el.getAttribute(Constants.RELATIONSHIP_TYPE);
+ setURI(new URI(TextExtractor.getText(element)));
+ String value = element.getAttribute(Constants.RELATIONSHIP_TYPE);
if (value != null && value.length() > 0) {
int pos = value.indexOf(':');
if (pos == -1) {
setType(new QName(value));
} else {
String namespace =
- el.getNamespaceURI(value.substring(0, pos));
+ element.getNamespaceURI(value.substring(0, pos));
setType(new QName(namespace, value.substring(pos+1)));
}
} else {
- setType(Constants.QNAME_RESPONSE);
+ setType(AddressingUtils.getResponseRelationshipType());
}
}
@@ -103,7 +103,7 @@
throws Exception {
Name nm = env.createName(Constants.RELATES_TO,
Constants.NS_PREFIX_ADDRESSING,
- Constants.NS_URI_ADDRESSING_DEFAULT);
+ AddressingUtils.getAddressingNamespaceURI());
SOAPHeader header = env.getHeader();
if (header == null) {
header = env.addHeader();
1.5 +8 -11 ws-fx/addressing/src/org/apache/axis/message/addressing/Relationship.java
Index: Relationship.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/Relationship.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Relationship.java 16 Oct 2004 18:27:46 -0000 1.4
+++ Relationship.java 8 Apr 2005 15:57:25 -0000 1.5
@@ -18,6 +18,7 @@
package org.apache.axis.message.addressing;
import org.apache.axis.types.URI;
+import org.apache.axis.message.addressing.util.AddressingUtils;
import javax.xml.namespace.QName;
@@ -49,36 +50,32 @@
private QName type;
/**
- * Constructor RelatesTo
+ * Constructor Relationship
*
* @param uri
- * @param type
+ * @param type
* @throws URI.MalformedURIException
*/
public Relationship(String uri, String type)
throws URI.MalformedURIException {
- this.uri = new URI(uri);
- this.type = (type == null)
- ? Constants.QNAME_RESPONSE
- : new QName(type);
+ this(new URI(uri), new QName(type));
}
/**
- * Constructor RelatesTo
+ * Constructor Relationship
*
* @param uri
* @param type
*/
public Relationship(URI uri, QName type) {
this.uri = uri;
- this.type = (type == null)
- ? Constants.QNAME_RESPONSE
+ this.type = type == null
+ ? AddressingUtils.getResponseRelationshipType()
: type;
}
/**
- * Constructor RelatesTo
- *
+ * Constructor Relationship
*/
public Relationship() {
}
1.2 +3 -1 ws-fx/addressing/src/org/apache/axis/message/addressing/RelationshipTypeValues.java
Index: RelationshipTypeValues.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/RelationshipTypeValues.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RelationshipTypeValues.java 7 Apr 2004 20:38:05 -0000 1.1
+++ RelationshipTypeValues.java 8 Apr 2005 15:57:25 -0000 1.2
@@ -17,6 +17,8 @@
package org.apache.axis.message.addressing;
+import org.apache.axis.message.addressing.util.AddressingUtils;
+
import javax.xml.namespace.QName;
/*
@@ -24,5 +26,5 @@
* EndpointReferenceType will contain a type mapping for this class.
*/
public class RelationshipTypeValues {
- public static final QName RESPONSE = Constants.QNAME_RESPONSE;
+ public static final QName RESPONSE = AddressingUtils.getResponseRelationshipType();
}
1.4 +5 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReplyAfterType.java 14 Feb 2005 23:51:32 -0000 1.3
+++ ReplyAfterType.java 8 Apr 2005 15:57:25 -0000 1.4
@@ -17,6 +17,10 @@
package org.apache.axis.message.addressing;
+import org.apache.axis.message.addressing.util.AddressingUtils;
+
+import javax.xml.namespace.QName;
+
/**
* Class ReplyAfterType
*/
@@ -163,7 +167,7 @@
new org.apache.axis.description.TypeDesc(ReplyAfterType.class, true);
static {
- typeDesc.setXmlType(new javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "ReplyAfterType"));
+ typeDesc.setXmlType(new QName(AddressingUtils.getAddressingNamespaceURI(), "ReplyAfterType"));
org.apache.axis.description.ElementDesc elemField =
new org.apache.axis.description.ElementDesc();
1.12 +7 -10 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ServiceNameType.java 14 Feb 2005 23:51:32 -0000 1.11
+++ ServiceNameType.java 8 Apr 2005 15:57:25 -0000 1.12
@@ -17,17 +17,14 @@
package org.apache.axis.message.addressing;
-import javax.xml.soap.SOAPElement;
-
-import org.apache.axis.utils.XMLUtils;
import org.apache.axis.encoding.SimpleType;
-
+import org.apache.axis.message.addressing.util.AddressingUtils;
import org.apache.axis.message.addressing.util.TextExtractor;
-
-import org.w3c.dom.Attr;
+import org.apache.axis.utils.XMLUtils;
import org.w3c.dom.Element;
import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPElement;
/**
* Java content class for ServiceNameType complex type.
@@ -114,7 +111,7 @@
*/
public void append(Element parent, String elementName) {
Element sn = parent.getOwnerDocument().createElementNS(
- Constants.NS_URI_ADDRESSING_DEFAULT,
+ AddressingUtils.getAddressingNamespaceURI(),
elementName);
String value = XMLUtils.getStringForQName(this, sn);
sn.appendChild(parent.getOwnerDocument().createTextNode(value));
@@ -151,11 +148,11 @@
new org.apache.axis.description.TypeDesc(ServiceNameType.class, true);
static {
- typeDesc.setXmlType(new javax.xml.namespace.QName(Constants.NS_URI_ADDRESSING_DEFAULT, "ServiceNameType"));
+ typeDesc.setXmlType(new QName(AddressingUtils.getAddressingNamespaceURI(), "ServiceNameType"));
org.apache.axis.description.AttributeDesc attrField = new org.apache.axis.description.AttributeDesc();
attrField.setFieldName("port");
- attrField.setXmlName(new javax.xml.namespace.QName("", "PortName"));
- attrField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+ attrField.setXmlName(new QName("", "PortName"));
+ attrField.setXmlType(new QName("http://www.w3.org/2001/XMLSchema", "string"));
typeDesc.addFieldDesc(attrField);
}
1.9 +1 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- To.java 14 Feb 2005 23:51:32 -0000 1.8
+++ To.java 8 Apr 2005 15:57:25 -0000 1.9
@@ -54,7 +54,7 @@
/**
* Copy constructor to
*
- * @param endpoint
+ * @param address
*/
public To(To address) {
super(address);
1.32 +8 -14 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- AddressingHandler.java 8 Mar 2005 21:40:21 -0000 1.31
+++ AddressingHandler.java 8 Apr 2005 15:57:25 -0000 1.32
@@ -159,18 +159,13 @@
}
}
- // set action for fault only with 04 spec. 03 spec unclear on that issue
- if (Constants.NS_URI_ADDRESSING_DEFAULT.equals(Constants.NS_URI_ADDRESSING_2004_03)) {
- resHeaders.setAction(new Action(new URI(Constants.FAULT_ACTION)));
- }
-
- MessageID msgID = null;
+ resHeaders.setAction(new Action(new URI(AddressingUtils.getFaultActionURI())));
// process RelatesTo
- msgID = reqHeaders.getMessageID();
+ MessageID msgID = reqHeaders.getMessageID();
if (msgID != null) {
resHeaders.addRelatesTo(msgID.toString(),
- Constants.QNAME_RESPONSE);
+ AddressingUtils.getResponseRelationshipType());
}
// process MessageID
@@ -257,7 +252,7 @@
headers.setFrom(new EndpointReference(from));
} else {
headers.setFrom(new EndpointReference(
- Constants.NS_URI_ANONYMOUS));
+ AddressingUtils.getAnonymousRoleURI()));
}
}
@@ -468,7 +463,7 @@
if (resHeaders.getFrom() == null && reqHeaders.getFrom() != null) {
resHeaders.setTo(reqHeaders.getFrom().getAddress());
} else {
- resHeaders.setTo(new To(Constants.NS_URI_ANONYMOUS));
+ resHeaders.setTo(new To(AddressingUtils.getAnonymousRoleURI()));
}
MessageID msgID = null;
@@ -477,7 +472,7 @@
msgID = reqHeaders.getMessageID();
if (msgID != null) {
resHeaders.addRelatesTo(msgID.toString(),
- Constants.QNAME_RESPONSE);
+ AddressingUtils.getResponseRelationshipType());
}
// process MessageID
@@ -492,11 +487,10 @@
AttributedURI address = replyTo.getAddress();
if (address != null) {
String uri = address.toString();
- if (uri != null && !uri.equals(Constants.NS_URI_ANONYMOUS)) {
+ if (uri != null && !uri.equals(AddressingUtils.getAnonymousRoleURI())) {
// send the msg to reply to
forwardMessage(replyTo, msg);
- // Somehow make the response empty, or create a new empty
- // response
+ // Somehow make the response empty, or create a new empty response
msgContext.setResponseMessage(null);
}
}
1.3 +1 -1 ws-fx/addressing/src/org/apache/axis/message/addressing/handler/GenericAxisHandler.java
Index: GenericAxisHandler.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/handler/GenericAxisHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GenericAxisHandler.java 12 Aug 2004 05:00:29 -0000 1.2
+++ GenericAxisHandler.java 8 Apr 2005 15:57:25 -0000 1.3
@@ -29,7 +29,7 @@
/**
* Helper class to which the Axis-specific JAX-RPC handlers in this package
* can delegate methods defined in the Axis {@link org.apache.axis.Handler}
- * interface. This is one so that the Axis handler base class
+ * interface. This is done so that the Axis handler base class
* {@link BasicHandler} can be leveraged.
*
* @author Ian P. Springer
1.2 +0 -10 ws-fx/addressing/src/org/apache/axis/message/addressing/tools/wsdl/JavaAddressingGeneratorFactory.java
Index: JavaAddressingGeneratorFactory.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/tools/wsdl/JavaAddressingGeneratorFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaAddressingGeneratorFactory.java 13 Mar 2004 16:47:29 -0000 1.1
+++ JavaAddressingGeneratorFactory.java 8 Apr 2005 15:57:25 -0000 1.2
@@ -18,22 +18,12 @@
package org.apache.axis.message.addressing.tools.wsdl;
import org.apache.axis.wsdl.gen.Generator;
-import org.apache.axis.wsdl.symbolTable.BindingEntry;
-import org.apache.axis.wsdl.symbolTable.PortTypeEntry;
-import org.apache.axis.wsdl.symbolTable.ServiceEntry;
-import org.apache.axis.wsdl.symbolTable.SymTabEntry;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
-import org.apache.axis.wsdl.symbolTable.TypeEntry;
import org.apache.axis.wsdl.toJava.Emitter;
-import org.apache.axis.wsdl.toJava.JavaBindingWriter;
import org.apache.axis.wsdl.toJava.JavaGeneratorFactory;
-import javax.wsdl.Binding;
import javax.wsdl.Service;
-import java.util.Iterator;
-import java.util.Vector;
-
/**
*
* @author Jarek Gawor (gawor@mcs.anl.gov)
1.2 +0 -9 ws-fx/addressing/src/org/apache/axis/message/addressing/tools/wsdl/JavaAddressingServiceIfaceImplWriter.java
Index: JavaAddressingServiceIfaceImplWriter.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/tools/wsdl/JavaAddressingServiceIfaceImplWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaAddressingServiceIfaceImplWriter.java 13 Mar 2004 16:47:29 -0000 1.1
+++ JavaAddressingServiceIfaceImplWriter.java 8 Apr 2005 15:57:25 -0000 1.2
@@ -19,7 +19,6 @@
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Messages;
-import org.apache.axis.utils.WSDLUtils;
import org.apache.axis.wsdl.symbolTable.BindingEntry;
import org.apache.axis.wsdl.symbolTable.PortTypeEntry;
import org.apache.axis.wsdl.symbolTable.ServiceEntry;
@@ -32,16 +31,10 @@
import javax.wsdl.Binding;
import javax.wsdl.Port;
import javax.wsdl.Service;
-
import java.io.IOException;
import java.io.PrintWriter;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
import java.util.Iterator;
import java.util.Map;
-import java.util.Vector;
/**
*
@@ -138,8 +131,6 @@
portName = Utils.xmlNameToJavaClass(portName);
}
- String stubClass = bEntry.getName() + "Stub";
-
String bindingType =
(String) bEntry.getDynamicVar(JavaBindingWriter.INTERFACE_NAME);
1.5 +0 -9 ws-fx/addressing/src/org/apache/axis/message/addressing/tools/wsdl/JavaAddressingServiceImplWriter.java
Index: JavaAddressingServiceImplWriter.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/tools/wsdl/JavaAddressingServiceImplWriter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JavaAddressingServiceImplWriter.java 8 Nov 2004 18:26:21 -0000 1.4
+++ JavaAddressingServiceImplWriter.java 8 Apr 2005 15:57:25 -0000 1.5
@@ -19,7 +19,6 @@
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Messages;
-import org.apache.axis.utils.WSDLUtils;
import org.apache.axis.wsdl.symbolTable.BindingEntry;
import org.apache.axis.wsdl.symbolTable.PortTypeEntry;
import org.apache.axis.wsdl.symbolTable.ServiceEntry;
@@ -32,16 +31,10 @@
import javax.wsdl.Binding;
import javax.wsdl.Port;
import javax.wsdl.Service;
-
import java.io.IOException;
import java.io.PrintWriter;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
import java.util.Iterator;
import java.util.Map;
-import java.util.Vector;
/**
*
@@ -133,8 +126,6 @@
portName = Utils.xmlNameToJavaClass(portName);
}
- String stubClass = bEntry.getName() + "Stub";
-
String bindingType =
(String) bEntry.getDynamicVar(JavaBindingWriter.INTERFACE_NAME);
1.2 +0 -3 ws-fx/addressing/src/org/apache/axis/message/addressing/tools/wsdl/JavaAddressingServiceWriter.java
Index: JavaAddressingServiceWriter.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/tools/wsdl/JavaAddressingServiceWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaAddressingServiceWriter.java 13 Mar 2004 16:47:29 -0000 1.1
+++ JavaAddressingServiceWriter.java 8 Apr 2005 15:57:25 -0000 1.2
@@ -21,12 +21,9 @@
import org.apache.axis.wsdl.symbolTable.ServiceEntry;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import org.apache.axis.wsdl.toJava.Emitter;
-import org.apache.axis.wsdl.toJava.JavaServiceImplWriter;
import org.apache.axis.wsdl.toJava.JavaServiceWriter;
-import org.apache.axis.wsdl.toJava.JavaTestCaseWriter;
import javax.wsdl.Service;
-
import java.io.IOException;
/**
1.6 +57 -4 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AddressingUtils.java 14 Feb 2005 23:51:32 -0000 1.5
+++ AddressingUtils.java 8 Apr 2005 15:57:25 -0000 1.6
@@ -19,10 +19,13 @@
import org.apache.axis.message.addressing.Constants;
import org.apache.axis.message.addressing.AddressingHeaders;
+import org.apache.axis.AxisEngine;
import java.util.Iterator;
import java.util.List;
import java.util.ArrayList;
+import java.util.Set;
+import java.util.HashSet;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPHeader;
@@ -43,9 +46,20 @@
*
* @author Jarek Gawor (gawor@apache.org)
*/
-public class AddressingUtils {
+public abstract class AddressingUtils {
/**
+ * A set that contains the namespace URIs (as Strings) for the various revisions of
+ * Addressing that we support.
+ */
+ private static final Set ADDRESSING_NS_URI_SET = new HashSet();
+ static {
+ ADDRESSING_NS_URI_SET.add( Constants.NS_URI_ADDRESSING_2003_03 );
+ ADDRESSING_NS_URI_SET.add( Constants.NS_URI_ADDRESSING_2004_03 );
+ ADDRESSING_NS_URI_SET.add( Constants.NS_URI_ADDRESSING_2004_08 );
+ }
+
+ /**
* Removes all instances of a given header name in WS-Addressing
* namespace for a given actor.
*/
@@ -72,7 +86,7 @@
}
public static boolean isAddressingNamespaceURI( String nsURI ) {
- return Constants.ADDRESSING_NS_URI_SET.contains( nsURI );
+ return ADDRESSING_NS_URI_SET.contains( nsURI );
}
/**
@@ -173,7 +187,7 @@
Operation operation,
String defaultName) {
Object value =
- inputOutput.getExtensionAttribute(Constants.QNAME_ACTION);
+ inputOutput.getExtensionAttribute(new QName(getAddressingNamespaceURI(), Constants.WSDL_ATTRIB_ACTION));
if (value != null) {
// wsdl4j returns a qname by default?
if (value instanceof QName) {
@@ -199,7 +213,6 @@
* Gets prefix for a given namespace. If the prefix is already defined
* for the namespace given, it is returned. Otherwise, a new prefix is
* automatically registered with the given namespace and returned.
- *
*/
public static String getNamespacePrefix(SOAPElement element,
String namespace)
@@ -228,4 +241,44 @@
return prefix;
}
+
+ /**
+ * Returns the namespace URI of the WSA version being used by the current request.
+ */
+ public static String getAddressingNamespaceURI()
+ {
+ // NOTE: this is currently Axis-specific...
+ String nsURI = null;
+ org.apache.axis.MessageContext msgContext = AxisEngine.getCurrentMessageContext();
+ if ( msgContext != null )
+ {
+ nsURI = (String) msgContext.getProperty( Constants.ENV_ADDRESSING_NAMESPACE_URI );
+ }
+ if ( nsURI == null )
+ {
+ nsURI = Constants.NS_URI_ADDRESSING_DEFAULT;
+ }
+ return nsURI;
+ }
+
+ public static String getFaultActionURI()
+ {
+ return getAddressingNamespaceURI() + "/fault";
+ }
+
+ public static String getAnonymousRoleURI()
+ {
+ return getAddressingNamespaceURI() + "/role/anonymous";
+ }
+
+ public static QName getResponseRelationshipType()
+ {
+ String nsURI = getAddressingNamespaceURI();
+ if (nsURI.equals(Constants.NS_URI_ADDRESSING_2003_03)) {
+ return new QName(Constants.NS_URI_ADDRESSING_DEFAULT, Constants.RESPONSE);
+ } else {
+ return new QName(Constants.NS_URI_ADDRESSING_DEFAULT, Constants.REPLY);
+ }
+ }
+
}
1.7 +1 -3 ws-fx/addressing/src/org/apache/axis/message/addressing/util/TextExtractor.java
Index: TextExtractor.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/util/TextExtractor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TextExtractor.java 19 Nov 2004 17:56:06 -0000 1.6
+++ TextExtractor.java 8 Apr 2005 15:57:25 -0000 1.7
@@ -21,8 +21,6 @@
import javax.xml.namespace.QName;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
@@ -38,7 +36,7 @@
int p = value.indexOf(':');
String prefix = (p == -1) ? "" : value.substring(0, p);
String ns = elem.getNamespaceURI(prefix);
- return new QName(ns, value.substring(p+1));
+ return new QName(ns, value.substring(p+1), prefix);
}
public static String getText(Node node) {
1.4 +2 -1 ws-fx/addressing/src/org/apache/ws/addressing/handler/ClientSideAddressingHandler.java
Index: ClientSideAddressingHandler.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/ws/addressing/handler/ClientSideAddressingHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClientSideAddressingHandler.java 20 Aug 2004 01:40:47 -0000 1.3
+++ ClientSideAddressingHandler.java 8 Apr 2005 15:57:26 -0000 1.4
@@ -21,6 +21,7 @@
import org.apache.axis.message.addressing.Constants;
import org.apache.axis.message.addressing.EndpointReference;
import org.apache.axis.message.addressing.To;
+import org.apache.axis.message.addressing.util.AddressingUtils;
import org.apache.axis.types.URI;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -164,7 +165,7 @@
addrHeaders.setFrom(new EndpointReference((String) msgContext
.getProperty(Constants.ENV_ADDRESSING_FROM_URI)));
} else {
- addrHeaders.setFrom(new EndpointReference(Constants.NS_URI_ANONYMOUS));
+ addrHeaders.setFrom(new EndpointReference(AddressingUtils.getAnonymousRoleURI()));
}
}
}
1.5 +8 -13 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServerSideAddressingHandler.java 8 Mar 2005 21:40:21 -0000 1.4
+++ ServerSideAddressingHandler.java 8 Apr 2005 15:57:26 -0000 1.5
@@ -100,7 +100,7 @@
if (headers.getAction()==null)
{
// should we throw a SOAPFaultException here?
- LOG.debug("WS-A request to endpoint " + headers.getTo() + " is missing the required wsa:Action header.");
+ LOG.debug("WSA request to endpoint " + headers.getTo() + " is missing the required wsa:Action header.");
}
msgContext.setProperty( Constants.ENV_ADDRESSING_REQUEST_HEADERS,
headers );
@@ -170,17 +170,13 @@
(AddressingHeaders) msgContext.getProperty( Constants.ENV_ADDRESSING_REQUEST_HEADERS );
if ( reqHeaders == null )
{
- // not a WS-A fault; let it pass thru w/out doing anything
+ // not a WSA fault; let it pass thru w/out doing anything
return CONTINUE_HANDLER_CHAIN_PROCESSING;
}
AddressingHeaders resHeaders =
AddressingUtils.getResponseHeaders( msgContext );
processFromHeader( reqHeaders, resHeaders );
- // 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 ) ) );
- }
+ resHeaders.setAction( new Action( new URI( AddressingUtils.getFaultActionURI() ) ) );
addRelatesToHeader( reqHeaders, resHeaders );
addMessageIdHeader( resHeaders );
addAddressingHeadersToSOAPEnvelope( soapMsgContext, resHeaders );
@@ -332,7 +328,7 @@
}
else
{
- responseAddrHeaders.setTo( new To( Constants.NS_URI_ANONYMOUS ) );
+ responseAddrHeaders.setTo( new To( AddressingUtils.getAnonymousRoleURI() ) );
}
}
@@ -343,7 +339,7 @@
if ( msgID != null )
{
responseAddrHeaders.addRelatesTo( msgID.toString(),
- Constants.QNAME_RESPONSE );
+ AddressingUtils.getResponseRelationshipType() );
}
}
@@ -363,7 +359,7 @@
if ( address != null )
{
String uri = address.toString();
- if ( uri != null && !uri.equals( Constants.NS_URI_ANONYMOUS ) )
+ if ( uri != null && !uri.equals( AddressingUtils.getAnonymousRoleURI() ) )
{
forwardMessage( soapMsgContext, replyTo );
}
@@ -403,7 +399,7 @@
if ( msgID != null )
{
resHeaders.addRelatesTo( msgID.toString(),
- Constants.QNAME_RESPONSE );
+ AddressingUtils.getResponseRelationshipType() );
}
}
@@ -415,8 +411,7 @@
}
/**
- * Removes all child elements from the specified {@link javax.xml.soap.SOAPElement}.
- * NOTE: w
+ * Removes all child elements from the specified {@link javax.xml.soap.SOAPElement}.
*/
protected static void removeAllChildElements( SOAPElement soapElem )
{
1.15 +2 -1 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TestSerDeser.java 14 Feb 2005 23:51:33 -0000 1.14
+++ TestSerDeser.java 8 Apr 2005 15:57:26 -0000 1.15
@@ -26,6 +26,7 @@
import org.apache.axis.message.addressing.ReferencePropertiesType;
import org.apache.axis.message.addressing.RelatesTo;
import org.apache.axis.message.addressing.Constants;
+import org.apache.axis.message.addressing.util.AddressingUtils;
import org.apache.axis.types.URI;
import org.w3c.dom.Document;
@@ -270,7 +271,7 @@
assertEquals("uuid:1234",
((RelatesTo) headers.getRelatesTo().get(0)).getURI().toString());
- assertEquals(Constants.QNAME_RESPONSE,
+ assertEquals(AddressingUtils.getResponseRelationshipType(),
((RelatesTo) headers.getRelatesTo().get(0)).getType());
}
1.6 +3 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ClientSideAddressingHandlerTestCase.java 14 Feb 2005 23:51:33 -0000 1.5
+++ ClientSideAddressingHandlerTestCase.java 8 Apr 2005 15:57:26 -0000 1.6
@@ -25,6 +25,7 @@
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.util.AddressingUtils;
import org.apache.axis.types.URI;
import javax.xml.namespace.QName;
@@ -74,7 +75,7 @@
checkReplyToHeader(addrHeaders, null);
checkFaultToHeader(addrHeaders, null);
checkToHeader(addrHeaders, null);
- checkFromHeader(addrHeaders, new From(new Address(Constants.NS_URI_ANONYMOUS)));
+ checkFromHeader(addrHeaders, new From(new Address(AddressingUtils.getAnonymousRoleURI())));
checkRecipientHeader(addrHeaders, new Recipient(new Address("http://blah.com:8080/axis/services/tester")));
checkActionHeader(addrHeaders, new Action(new URI("http://foo.com/mail#Put")));
checkReferenceProperties(addrHeaders, new ReferencePropertiesType());
@@ -102,7 +103,7 @@
checkReplyToHeader(addrHeaders, null);
checkFaultToHeader(addrHeaders, null);
checkToHeader(addrHeaders, null);
- checkFromHeader(addrHeaders, new From(new Address(Constants.NS_URI_ANONYMOUS)));
+ checkFromHeader(addrHeaders, new From(new Address(AddressingUtils.getAnonymousRoleURI())));
checkRecipientHeader(addrHeaders, null);
checkActionHeader(addrHeaders, new Action(new URI("http://foo.com/mail#Put")));
ReferencePropertiesType expectedRefPropsType = new ReferencePropertiesType();
1.3 +5 -4 ws-fx/addressing/test/org/apache/ws/addressing/handler/ServerSideAddressingHandlerTestCase.java
Index: ServerSideAddressingHandlerTestCase.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/test/org/apache/ws/addressing/handler/ServerSideAddressingHandlerTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerSideAddressingHandlerTestCase.java 12 Aug 2004 12:52:43 -0000 1.2
+++ ServerSideAddressingHandlerTestCase.java 8 Apr 2005 15:57:26 -0000 1.3
@@ -30,6 +30,7 @@
import org.apache.axis.message.addressing.ReplyTo;
import org.apache.axis.message.addressing.ServiceNameType;
import org.apache.axis.message.addressing.To;
+import org.apache.axis.message.addressing.util.AddressingUtils;
import org.apache.axis.types.URI;
import javax.xml.namespace.QName;
@@ -69,8 +70,8 @@
assertFalse(addrHeaders.isSetMustUnderstand());
checkMessageIdHeader(addrHeaders, "aaaabbbb-cccc-dddd-eeee-ffffffffffff");
checkRelatesToHeader(addrHeaders, new RelatesTo[]{new RelatesTo("uuid:11112222-3333-4444-5555-666666666666", "{urn:testNS}testPart"),
- new RelatesTo("uuid:11112222-3333-4444-5555-999999999999", Constants.QNAME_RESPONSE.toString())});
- ReplyTo expectedReplyTo = new ReplyTo(new Address(Constants.NS_URI_ANONYMOUS));
+ new RelatesTo("uuid:11112222-3333-4444-5555-999999999999", AddressingUtils.getResponseRelationshipType().toString())});
+ ReplyTo expectedReplyTo = new ReplyTo(new Address(AddressingUtils.getAnonymousRoleURI()));
expectedReplyTo.setPortType(new PortType("urn:Foo", "Test"));
expectedReplyTo.setServiceName(new ServiceNameType("urn:Bar", "Test2"));
checkReplyToHeader(addrHeaders, expectedReplyTo);
@@ -101,10 +102,10 @@
AddressingHeaders addrHeaders = (AddressingHeaders) prop;
assertFalse(addrHeaders.isSetMustUnderstand());
checkMessageIdHeader(addrHeaders, null);
- checkRelatesToHeader(addrHeaders, new RelatesTo[]{new RelatesTo("uuid:aaaabbbb-cccc-dddd-eeee-ffffffffffff", Constants.QNAME_RESPONSE.toString())});
+ checkRelatesToHeader(addrHeaders, new RelatesTo[]{new RelatesTo("uuid:aaaabbbb-cccc-dddd-eeee-ffffffffffff", AddressingUtils.getResponseRelationshipType().toString())});
checkReplyToHeader(addrHeaders, null);
checkFaultToHeader(addrHeaders, null);
- checkToHeader(addrHeaders, new To(Constants.NS_URI_ANONYMOUS));
+ checkToHeader(addrHeaders, new To(AddressingUtils.getAnonymousRoleURI()));
checkFromHeader(addrHeaders, new From(new Address("mailto:joe@fabrikam123.com")));
checkRecipientHeader(addrHeaders, null);
checkActionHeader(addrHeaders, new Action(new URI("http://foo.com/mail#GetResponse")));