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 di...@apache.org on 2004/05/13 14:52:21 UTC
cvs commit: ws-fx/addressing/test/addressing/tools WS-Addressing.xsd client-config.wsdd ping_service.wsdl server-config.wsdd
dims 2004/05/13 05:52:21
Modified: addressing maven.xml
addressing/src/org/apache/axis/message/addressing
Action.java AttributedQName.java AttributedURI.java
Constants.java EndpointReference.java
EndpointReferenceType.java FaultTo.java From.java
MessageID.java Recipient.java
ReferencePropertiesType.java RelatesTo.java
Relationship.java ReplyTo.java ServiceNameType.java
To.java
addressing/test/addressing TestSerDeser.java
addressing/test/addressing/tools WS-Addressing.xsd
client-config.wsdd ping_service.wsdl
server-config.wsdd
Added: addressing/src/org/apache/axis/message/addressing
FaultSubcodeValues.java
Log:
Update to latest WS-Addressing specification (change namespace, add FaultSubcodeValues)
Revision Changes Path
1.5 +3 -3 ws-fx/addressing/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/ws-fx/addressing/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 12 Apr 2004 23:40:32 -0000 1.4
+++ maven.xml 13 May 2004 12:52:20 -0000 1.5
@@ -30,11 +30,11 @@
</classpath>
<arg value="-o"/>
<arg value="${maven.build.dir}/stubs/src"/>
- <arg value="-Nhttp://schemas.xmlsoap.org/ws/2003/03/addressing=org.apache.axis.message.addressing"/>
+ <arg value="-Nhttp://schemas.xmlsoap.org/ws/2004/03/addressing=org.apache.axis.message.addressing"/>
<!-- Don't generate classes for ws-addressing types as we already
have them -->
<arg value="-x"/>
- <arg value="http://schemas.xmlsoap.org/ws/2003/03/addressing"/>
+ <arg value="http://schemas.xmlsoap.org/ws/2004/03/addressing"/>
<arg value="test/addressing/tools/ping_service.wsdl"/>
</java>
<javac srcdir="${maven.build.dir}/stubs/src"
1.5 +2 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Action.java 8 Mar 2004 22:04:10 -0000 1.4
+++ Action.java 13 May 2004 12:52:20 -0000 1.5
@@ -26,10 +26,10 @@
/**
* 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/2003/03/addressing/ line 79)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 79)
* <p>
* <pre>
- * <element name="Action" type="{http://schemas.xmlsoap.org/ws/2003/03/addressing}AttributedURI"/>
+ * <element name="Action" type="{http://schemas.xmlsoap.org/ws/2004/03/addressing}AttributedURI"/>
* </pre>
*
* @author Davanum Srinivas (dims@yahoo.com)
1.6 +1 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AttributedQName.java 7 Apr 2004 19:35:05 -0000 1.5
+++ AttributedQName.java 13 May 2004 12:52:20 -0000 1.6
@@ -21,7 +21,7 @@
/**
* Java content class for AttributedQName complex type.
- * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2003/03/addressing/ line 98)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 98)
* <p>
* <pre>
* <complexType name="AttributedQName">
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AttributedURI.java 2 Apr 2004 13:37:10 -0000 1.6
+++ AttributedURI.java 13 May 2004 12:52:20 -0000 1.7
@@ -32,7 +32,7 @@
/**
* Java content class for AttributedURI complex type.
- * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2003/03/addressing/ line 105)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 105)
* <p>
* <pre>
* <complexType name="AttributedURI">
1.3 +1 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Constants.java 26 Mar 2004 16:15:05 -0000 1.2
+++ Constants.java 13 May 2004 12:52:20 -0000 1.3
@@ -35,7 +35,7 @@
* Field NS_URI_ADDRESSING
*/
public static final String NS_URI_ADDRESSING =
- "http://schemas.xmlsoap.org/ws/2003/03/addressing";
+ "http://schemas.xmlsoap.org/ws/2004/03/addressing";
/**
* Field NS_URI_ANONYMOUS
1.9 +2 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- EndpointReference.java 20 Apr 2004 14:47:58 -0000 1.8
+++ EndpointReference.java 13 May 2004 12:52:20 -0000 1.9
@@ -33,10 +33,10 @@
/**
* Java content class for EndpointReference element declaration.
- * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2003/03/addressing/ line 45)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 45)
* <p>
* <pre>
- * <element name="EndpointReference" type="{http://schemas.xmlsoap.org/ws/2003/03/addressing}EndpointReferenceType"/>
+ * <element name="EndpointReference" type="{http://schemas.xmlsoap.org/ws/2004/03/addressing}EndpointReferenceType"/>
* </pre>
*
* @author Davanum Srinivas (dims@yahoo.com)
1.10 +14 -14 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- EndpointReferenceType.java 3 May 2004 22:06:45 -0000 1.9
+++ EndpointReferenceType.java 13 May 2004 12:52:20 -0000 1.10
@@ -22,17 +22,17 @@
/**
* Java content class for EndpointReferenceType complex type.
- * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2003/03/addressing/ line 46)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 46)
* <p>
* <pre>
* <complexType name="EndpointReferenceType">
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="Address" type="{http://schemas.xmlsoap.org/ws/2003/03/addressing}AttributedURI"/>
- * <element name="ReferenceProperties" type="{http://schemas.xmlsoap.org/ws/2003/03/addressing}ReferencePropertiesType" minOccurs="0"/>
- * <element name="PortType" type="{http://schemas.xmlsoap.org/ws/2003/03/addressing}AttributedQName" minOccurs="0"/>
- * <element name="ServiceName" type="{http://schemas.xmlsoap.org/ws/2003/03/addressing}ServiceNameType" minOccurs="0"/>
+ * <element name="Address" type="{http://schemas.xmlsoap.org/ws/2004/03/addressing}AttributedURI"/>
+ * <element name="ReferenceProperties" type="{http://schemas.xmlsoap.org/ws/2004/03/addressing}ReferencePropertiesType" minOccurs="0"/>
+ * <element name="PortType" type="{http://schemas.xmlsoap.org/ws/2004/03/addressing}AttributedQName" minOccurs="0"/>
+ * <element name="ServiceName" type="{http://schemas.xmlsoap.org/ws/2004/03/addressing}ServiceNameType" minOccurs="0"/>
* <any/>
* </sequence>
* </restriction>
@@ -209,30 +209,30 @@
new org.apache.axis.description.TypeDesc(EndpointReferenceType.class, true);
static {
- typeDesc.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2003/03/addressing", "EndpointReferenceType"));
+ typeDesc.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2004/03/addressing", "EndpointReferenceType"));
org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
elemField.setFieldName("address");
- elemField.setXmlName(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2003/03/addressing", "Address"));
- elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2003/03/addressing", "Address"));
+ elemField.setXmlName(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2004/03/addressing", "Address"));
+ elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2004/03/addressing", "Address"));
//"http://www.w3.org/2001/XMLSchema", "anyURI"));
typeDesc.addFieldDesc(elemField);
elemField = new org.apache.axis.description.ElementDesc();
elemField.setFieldName("properties");
- elemField.setXmlName(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2003/03/addressing", "ReferenceProperties"));
- elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2003/03/addressing", "ReferencePropertiesType"));
+ elemField.setXmlName(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2004/03/addressing", "ReferenceProperties"));
+ elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2004/03/addressing", "ReferencePropertiesType"));
elemField.setMinOccurs(0);
typeDesc.addFieldDesc(elemField);
elemField = new org.apache.axis.description.ElementDesc();
elemField.setFieldName("portType");
- elemField.setXmlName(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2003/03/addressing", "PortType"));
- elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2003/03/addressing", "PortType"));
+ elemField.setXmlName(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2004/03/addressing", "PortType"));
+ elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2004/03/addressing", "PortType"));
//"http://www.w3.org/2001/XMLSchema", "QName"));
elemField.setMinOccurs(0);
typeDesc.addFieldDesc(elemField);
elemField = new org.apache.axis.description.ElementDesc();
elemField.setFieldName("serviceName");
- elemField.setXmlName(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2003/03/addressing", "ServiceName"));
- elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2003/03/addressing", "ServiceNameType"));
+ elemField.setXmlName(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2004/03/addressing", "ServiceName"));
+ elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2004/03/addressing", "ServiceNameType"));
elemField.setMinOccurs(0);
typeDesc.addFieldDesc(elemField);
}
1.5 +2 -2 ws-fx/addressing/src/org/apache/axis/message/addressing/FaultTo.java
Index: FaultTo.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/FaultTo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FaultTo.java 8 Mar 2004 22:04:10 -0000 1.4
+++ FaultTo.java 13 May 2004 12:52:20 -0000 1.5
@@ -27,10 +27,10 @@
/**
* Java content class for FaultTo element declaration.
- * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2003/03/addressing/ line 82)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 82)
* <p>
* <pre>
- * <element name="FaultTo" type="{http://schemas.xmlsoap.org/ws/2003/03/addressing}EndpointReferenceType"/>
+ * <element name="FaultTo" type="{http://schemas.xmlsoap.org/ws/2004/03/addressing}EndpointReferenceType"/>
* </pre>
*
* @author Davanum Srinivas (dims@yahoo.com)
1.5 +2 -2 ws-fx/addressing/src/org/apache/axis/message/addressing/From.java
Index: From.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/From.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- From.java 8 Mar 2004 22:04:10 -0000 1.4
+++ From.java 13 May 2004 12:52:20 -0000 1.5
@@ -27,10 +27,10 @@
/**
* Java content class for From element declaration.
- * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2003/03/addressing/ line 80)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 80)
* <p>
* <pre>
- * <element name="From" type="{http://schemas.xmlsoap.org/ws/2003/03/addressing}EndpointReferenceType"/>
+ * <element name="From" type="{http://schemas.xmlsoap.org/ws/2004/03/addressing}EndpointReferenceType"/>
* </pre>
*
* @author Davanum Srinivas (dims@yahoo.com)
1.6 +2 -2 ws-fx/addressing/src/org/apache/axis/message/addressing/MessageID.java
Index: MessageID.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/MessageID.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MessageID.java 18 Apr 2004 14:05:39 -0000 1.5
+++ MessageID.java 13 May 2004 12:52:20 -0000 1.6
@@ -24,10 +24,10 @@
/**
* Java content class for MessageID element declaration.
- * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2003/03/addressing/ line 76)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 76)
* <p>
* <pre>
- * <element name="MessageID" type="{http://schemas.xmlsoap.org/ws/2003/03/addressing}AttributedURI"/>
+ * <element name="MessageID" type="{http://schemas.xmlsoap.org/ws/2004/03/addressing}AttributedURI"/>
* </pre>
*
* @author Davanum Srinivas (dims@yahoo.com)
1.5 +2 -2 ws-fx/addressing/src/org/apache/axis/message/addressing/Recipient.java
Index: Recipient.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/Recipient.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Recipient.java 8 Mar 2004 22:04:10 -0000 1.4
+++ Recipient.java 13 May 2004 12:52:20 -0000 1.5
@@ -27,10 +27,10 @@
/**
* Java content class for Recipient element declaration.
- * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2003/03/addressing/ line 83)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 83)
* <p>
* <pre>
- * <element name="Recipient" type="{http://schemas.xmlsoap.org/ws/2003/03/addressing}EndpointReferenceType"/>
+ * <element name="Recipient" type="{http://schemas.xmlsoap.org/ws/2004/03/addressing}EndpointReferenceType"/>
* </pre>
*
* @author Davanum Srinivas (dims@yahoo.com)
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ReferencePropertiesType.java 3 May 2004 22:06:45 -0000 1.6
+++ ReferencePropertiesType.java 13 May 2004 12:52:20 -0000 1.7
@@ -34,7 +34,7 @@
/**
* Java content class for ReferencePropertiesType complex type.
- * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2003/03/addressing/ line 62)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 62)
* <p>
* <pre>
* <complexType name="ReferencePropertiesType">
@@ -180,7 +180,7 @@
new org.apache.axis.description.TypeDesc(ReferencePropertiesType.class, true);
static {
- typeDesc.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2003/03/addressing", "ReferencePropertiesType"));
+ typeDesc.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2004/03/addressing", "ReferencePropertiesType"));
}
/**
1.7 +2 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RelatesTo.java 18 Apr 2004 14:05:39 -0000 1.6
+++ RelatesTo.java 13 May 2004 12:52:20 -0000 1.7
@@ -29,10 +29,10 @@
/**
* Java content class for RelatesTo element declaration.
- * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2003/03/addressing/ line 77)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 77)
* <p>
* <pre>
- * <element name="RelatesTo" type="{http://schemas.xmlsoap.org/ws/2003/03/addressing}Relationship"/>
+ * <element name="RelatesTo" type="{http://schemas.xmlsoap.org/ws/2004/03/addressing}Relationship"/>
* </pre>
*
* @author Davanum Srinivas (dims@yahoo.com)
1.3 +1 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Relationship.java 8 Mar 2004 22:04:10 -0000 1.2
+++ Relationship.java 13 May 2004 12:52:20 -0000 1.3
@@ -23,7 +23,7 @@
/**
* Java content class for Relationship complex type.
- * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2003/03/addressing/ line 84)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 84)
* <p>
* <pre>
* <complexType name="Relationship">
1.5 +2 -2 ws-fx/addressing/src/org/apache/axis/message/addressing/ReplyTo.java
Index: ReplyTo.java
===================================================================
RCS file: /home/cvs/ws-fx/addressing/src/org/apache/axis/message/addressing/ReplyTo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ReplyTo.java 8 Mar 2004 22:04:10 -0000 1.4
+++ ReplyTo.java 13 May 2004 12:52:20 -0000 1.5
@@ -27,10 +27,10 @@
/**
* Java content class for ReplyTo element declaration.
- * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2003/03/addressing/ line 81)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 81)
* <p>
* <pre>
- * <element name="ReplyTo" type="{http://schemas.xmlsoap.org/ws/2003/03/addressing}EndpointReferenceType"/>
+ * <element name="ReplyTo" type="{http://schemas.xmlsoap.org/ws/2004/03/addressing}EndpointReferenceType"/>
* </pre>
*
* @author Davanum Srinivas (dims@yahoo.com)
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServiceNameType.java 3 May 2004 22:06:45 -0000 1.4
+++ ServiceNameType.java 13 May 2004 12:52:20 -0000 1.5
@@ -27,7 +27,7 @@
/**
* Java content class for ServiceNameType complex type.
- * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2003/03/addressing/ line 67)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 67)
* <p>
* <pre>
* <complexType name="ServiceNameType">
@@ -118,7 +118,7 @@
new org.apache.axis.description.TypeDesc(ServiceNameType.class, true);
static {
- typeDesc.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2003/03/addressing", "ServiceNameType"));
+ typeDesc.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2004/03/addressing", "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.5 +2 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- To.java 8 Mar 2004 22:04:10 -0000 1.4
+++ To.java 13 May 2004 12:52:20 -0000 1.5
@@ -25,10 +25,10 @@
/**
* 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/2003/03/addressing/ line 78)
+ * <p>The following schema fragment specifies the expected content contained within this java content object. (defined at http://schemas.xmlsoap.org/ws/2004/03/addressing line 78)
* <p>
* <pre>
- * <element name="To" type="{http://schemas.xmlsoap.org/ws/2003/03/addressing}AttributedURI"/>
+ * <element name="To" type="{http://schemas.xmlsoap.org/ws/2004/03/addressing}AttributedURI"/>
* </pre>
*
* @author Davanum Srinivas (dims@yahoo.com)
1.1 ws-fx/addressing/src/org/apache/axis/message/addressing/FaultSubcodeValues.java
Index: FaultSubcodeValues.java
===================================================================
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.axis.message.addressing;
/**
* 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/03/addressing line 110)
* <p>
* <pre>
* <xs:simpleType name="FaultSubcodeValues">
* <xs:restriction base="xs:QName">
* <xs:enumeration value="wsa:InvalidMessageInformationHeader"/>
* <xs:enumeration value="wsa:MessageInformationHeaderRequired"/>
* <xs:enumeration value="wsa:DestinationUnreachable"/>
* <xs:enumeration value="wsa:ActionNotSupported"/>
* <xs:enumeration value="wsa:EndpointUnavailable"/>
* </xs:restriction>
* </xs:simpleType>
* </pre>
*
* @author Davanum Srinivas (dims@yahoo.com)
*/
public class FaultSubcodeValues implements java.io.Serializable {
private javax.xml.namespace.QName _value_;
private static java.util.HashMap _table_ = new java.util.HashMap();
// Constructor
protected FaultSubcodeValues(javax.xml.namespace.QName value) {
_value_ = value;
_table_.put(_value_,this);
}
public static final javax.xml.namespace.QName _value1 = javax.xml.namespace.QName.valueOf("{http://schemas.xmlsoap.org/ws/2004/03/addressing}InvalidMessageInformationHeader");
public static final javax.xml.namespace.QName _value2 = javax.xml.namespace.QName.valueOf("{http://schemas.xmlsoap.org/ws/2004/03/addressing}MessageInformationHeaderRequired");
public static final javax.xml.namespace.QName _value3 = javax.xml.namespace.QName.valueOf("{http://schemas.xmlsoap.org/ws/2004/03/addressing}DestinationUnreachable");
public static final javax.xml.namespace.QName _value4 = javax.xml.namespace.QName.valueOf("{http://schemas.xmlsoap.org/ws/2004/03/addressing}ActionNotSupported");
public static final javax.xml.namespace.QName _value5 = javax.xml.namespace.QName.valueOf("{http://schemas.xmlsoap.org/ws/2004/03/addressing}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);
public static final FaultSubcodeValues value4 = new FaultSubcodeValues(_value4);
public static final FaultSubcodeValues value5 = new FaultSubcodeValues(_value5);
public javax.xml.namespace.QName getValue() { return _value_;}
public static FaultSubcodeValues fromValue(javax.xml.namespace.QName value)
throws java.lang.IllegalArgumentException {
FaultSubcodeValues enumeration = (FaultSubcodeValues)
_table_.get(value);
if (enumeration==null) throw new java.lang.IllegalArgumentException();
return enumeration;
}
public static FaultSubcodeValues fromString(java.lang.String value)
throws java.lang.IllegalArgumentException {
try {
return fromValue(javax.xml.namespace.QName.valueOf(value));
} catch (Exception e) {
throw new java.lang.IllegalArgumentException();
}
}
public boolean equals(java.lang.Object obj) {return (obj == this);}
public int hashCode() { return toString().hashCode();}
public java.lang.String toString() { return _value_.toString();}
public java.lang.Object readResolve() throws java.io.ObjectStreamException { return fromValue(_value_);}
public static org.apache.axis.encoding.Serializer getSerializer(
java.lang.String mechType,
java.lang.Class _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.EnumSerializer(
_javaType, _xmlType);
}
public static org.apache.axis.encoding.Deserializer getDeserializer(
java.lang.String mechType,
java.lang.Class _javaType,
javax.xml.namespace.QName _xmlType) {
return
new org.apache.axis.encoding.ser.EnumDeserializer(
_javaType, _xmlType);
}
// Type metadata
private static org.apache.axis.description.TypeDesc typeDesc =
new org.apache.axis.description.TypeDesc(FaultSubcodeValues.class);
static {
typeDesc.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/ws/2004/03/addressing", "FaultSubcodeValues"));
}
/**
* Return type metadata object
*/
public static org.apache.axis.description.TypeDesc getTypeDesc() {
return typeDesc;
}
}
1.9 +2 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestSerDeser.java 18 Apr 2004 14:05:39 -0000 1.8
+++ TestSerDeser.java 13 May 2004 12:52:21 -0000 1.9
@@ -50,7 +50,7 @@
public class TestSerDeser extends TestCase {
String xml =
"<S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"\n" +
- " xmlns:wsa=\"http://schemas.xmlsoap.org/ws/2003/03/addressing\"\n" +
+ " xmlns:wsa=\"http://schemas.xmlsoap.org/ws/2004/03/addressing\"\n" +
" xmlns:f123=\"http://www.fabrikam123.com/svc53\" \n" +
">\n" +
" <S:Header>\n" +
@@ -76,7 +76,7 @@
String xml2 =
"<S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"\n" +
- " xmlns:wsa=\"http://schemas.xmlsoap.org/ws/2003/03/addressing\"\n" +
+ " xmlns:wsa=\"http://schemas.xmlsoap.org/ws/2004/03/addressing\"\n" +
" xmlns:f123=\"http://www.fabrikam123.com/svc53\" \n" +
">\n" +
" <S:Header>\n" +
1.2 +94 -69 ws-fx/addressing/test/addressing/tools/WS-Addressing.xsd
Index: WS-Addressing.xsd
===================================================================
RCS file: /home/cvs/ws-fx/addressing/test/addressing/tools/WS-Addressing.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WS-Addressing.xsd 7 Apr 2004 20:38:05 -0000 1.1
+++ WS-Addressing.xsd 13 May 2004 12:52:21 -0000 1.2
@@ -35,78 +35,103 @@
Copyright Notice
-Copyright 2003 BEA Systems Inc. and IBM Corporation and Microsoft Corporation. All rights reserved.
+Copyright 2003,2004 BEA Systems Inc. and IBM Corporation and Microsoft Corporation. All rights reserved.
-->
-<xs:schema targetNamespace="http://schemas.xmlsoap.org/ws/2003/03/addressing" xmlns:wsa="http://schemas.xmlsoap.org/ws/2003/03/addressing" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" blockDefault="#all">
+<xs:schema targetNamespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" elementFormDefault="qualified" blockDefault="#all">
+ <!-- //////////////////// WS-Addressing //////////////////// -->
+ <!-- Endpoint reference -->
+ <xs:element name="EndpointReference" type="wsa:EndpointReferenceType"/>
+ <xs:complexType name="EndpointReferenceType">
+ <xs:sequence>
+ <xs:element name="Address" type="wsa:AttributedURI"/>
+ <xs:element name="ReferenceProperties" type="wsa:ReferencePropertiesType" minOccurs="0"/>
- <!-- //////////////////// WS-Addressing //////////////////// -->
- <!-- Endpoint reference -->
- <xs:element name="EndpointReference" type="wsa:EndpointReferenceType"/>
- <xs:complexType name="EndpointReferenceType">
- <xs:sequence>
- <xs:element name="Address" type="wsa:AttributedURI"/>
- <xs:element name="ReferenceProperties" type="wsa:ReferencePropertiesType" minOccurs="0"/>
- <xs:element name="PortType" type="wsa:AttributedQName" minOccurs="0"/>
- <xs:element name="ServiceName" type="wsa:ServiceNameType" minOccurs="0"/>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>
+ <xs:element name="PortType" type="wsa:AttributedQName" minOccurs="0"/>
+ <xs:element name="ServiceName" type="wsa:ServiceNameType" minOccurs="0"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
If "Policy" elements from namespace "http://schemas.xmlsoap.org/ws/2002/12/policy#policy" are used, they must appear first (before any extensibility elements).
</xs:documentation>
- </xs:annotation>
- </xs:any>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
- <xs:complexType name="ReferencePropertiesType">
- <xs:sequence>
- <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="ServiceNameType">
- <xs:simpleContent>
- <xs:extension base="xs:QName">
- <xs:attribute name="PortName" type="xs:NCName"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <!-- Message information header blocks -->
- <xs:element name="MessageID" type="wsa:AttributedURI"/>
- <xs:element name="RelatesTo" type="wsa:Relationship"/>
- <xs:element name="To" type="wsa:AttributedURI"/>
- <xs:element name="Action" type="wsa:AttributedURI"/>
- <xs:element name="From" type="wsa:EndpointReferenceType"/>
- <xs:element name="ReplyTo" type="wsa:EndpointReferenceType"/>
- <xs:element name="FaultTo" type="wsa:EndpointReferenceType"/>
- <xs:element name="Recipient" type="wsa:EndpointReferenceType"/>
- <xs:complexType name="Relationship">
- <xs:simpleContent>
- <xs:extension base="xs:anyURI">
- <xs:attribute name="RelationshipType" type="xs:QName" use="optional"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:simpleType name="RelationshipTypeValues">
- <xs:restriction base="xs:QName">
- <xs:enumeration value="wsa:Response"/>
- </xs:restriction>
- </xs:simpleType>
- <!-- Common declarations and definitions -->
- <xs:complexType name="AttributedQName">
- <xs:simpleContent>
- <xs:extension base="xs:QName">
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="AttributedURI">
- <xs:simpleContent>
- <xs:extension base="xs:anyURI">
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
+ </xs:annotation>
+ </xs:any>
+
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ <xs:complexType name="ReferencePropertiesType">
+ <xs:sequence>
+ <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ServiceNameType">
+
+ <xs:simpleContent>
+ <xs:extension base="xs:QName">
+ <xs:attribute name="PortName" type="xs:NCName"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <!-- Message information header blocks -->
+ <xs:element name="MessageID" type="wsa:AttributedURI"/>
+
+ <xs:element name="RelatesTo" type="wsa:Relationship"/>
+ <xs:element name="To" type="wsa:AttributedURI"/>
+ <xs:element name="Action" type="wsa:AttributedURI"/>
+ <xs:element name="From" type="wsa:EndpointReferenceType"/>
+ <xs:element name="ReplyTo" type="wsa:EndpointReferenceType"/>
+ <xs:element name="FaultTo" type="wsa:EndpointReferenceType"/>
+ <xs:complexType name="Relationship">
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+
+ <xs:attribute name="RelationshipType" type="xs:QName" use="optional"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:simpleType name="RelationshipTypeValues">
+ <xs:restriction base="xs:QName">
+ <xs:enumeration value="wsa:Reply"/>
+ </xs:restriction>
+
+ </xs:simpleType>
+ <xs:element name="ReplyAfter"/>
+ <xs:complexType name="ReplyAfterType">
+ <xs:simpleContent>
+ <xs:extension base="xs:nonNegativeInteger">
+ <xs:anyAttribute namespace="##other"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:simpleType name="FaultSubcodeValues">
+ <xs:restriction base="xs:QName">
+ <xs:enumeration value="wsa:InvalidMessageInformationHeader"/>
+ <xs:enumeration value="wsa:MessageInformationHeaderRequired"/>
+ <xs:enumeration value="wsa:DestinationUnreachable"/>
+ <xs:enumeration value="wsa:ActionNotSupported"/>
+ <xs:enumeration value="wsa:EndpointUnavailable"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:attribute name="Action" type="xs:anyURI"/>
+ <!-- Common declarations and definitions -->
+ <xs:complexType name="AttributedQName">
+ <xs:simpleContent>
+ <xs:extension base="xs:QName">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:complexType name="AttributedURI">
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
</xs:schema>
1.3 +1 -1 ws-fx/addressing/test/addressing/tools/client-config.wsdd
Index: client-config.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/addressing/test/addressing/tools/client-config.wsdd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- client-config.wsdd 7 Apr 2004 19:35:05 -0000 1.2
+++ client-config.wsdd 13 May 2004 12:52:21 -0000 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment name="defaultClientConfig"
xmlns="http://xml.apache.org/axis/wsdd/"
- xmlns:wsa="http://schemas.xmlsoap.org/ws/2003/03/addressing"
+ xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing"
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
<globalConfiguration>
1.3 +2 -2 ws-fx/addressing/test/addressing/tools/ping_service.wsdl
Index: ping_service.wsdl
===================================================================
RCS file: /home/cvs/ws-fx/addressing/test/addressing/tools/ping_service.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ping_service.wsdl 7 Apr 2004 19:35:05 -0000 1.2
+++ ping_service.wsdl 13 May 2004 12:52:21 -0000 1.3
@@ -5,7 +5,7 @@
xmlns:ping="http://addressing/tools/ping"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:tns="http://addressing/tools/ping"
- xmlns:wsa="http://schemas.xmlsoap.org/ws/2003/03/addressing"
+ xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<types>
@@ -17,7 +17,7 @@
<xsd:import
namespace=
- "http://schemas.xmlsoap.org/ws/2003/03/addressing"
+ "http://schemas.xmlsoap.org/ws/2004/03/addressing"
schemaLocation="WS-Addressing.xsd"
/>
1.3 +1 -1 ws-fx/addressing/test/addressing/tools/server-config.wsdd
Index: server-config.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/addressing/test/addressing/tools/server-config.wsdd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- server-config.wsdd 7 Apr 2004 19:35:05 -0000 1.2
+++ server-config.wsdd 13 May 2004 12:52:21 -0000 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment name="defaultServerConfig" xmlns="http://xml.apache.org/axis/wsdd/"
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"
- xmlns:wsa="http://schemas.xmlsoap.org/ws/2003/03/addressing"
+ xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<globalConfiguration>
Re: cvs commit: ws-fx/addressing/test/addressing/tools WS-Addressing.xsd client-config.wsdd ping_service.wsdl server-config.wsdd
Posted by Davanum Srinivas <da...@gmail.com>.
Can we please make it configurable? see wss4j's Constants for example.
-- dims
On Wed, 19 May 2004 01:09:43 -0400, Jarek Gawor <ga...@mcs.anl.gov> wrote:
>
> Dims,
>
> Some of us are stuck with the '03 version of the spec :). For now, for easy
> access, I tagged the 2004-05-12 checkout as 'ws-addressing-03'.
>
> Jarek
>
> > -----Original Message-----
> > From: dims@apache.org [mailto:dims@apache.org]
> > Sent: Thursday, May 13, 2004 8:52 AM
> > To: ws-fx-cvs@apache.org
> > Subject: cvs commit: ws-fx/addressing/test/addressing/tools
> > WS-Addressing.xsd client-config.wsdd ping_service.wsdl
> > server-config.wsdd
> >
> >
> > dims 2004/05/13 05:52:21
> >
> > Modified: addressing maven.xml
> > addressing/src/org/apache/axis/message/addressing
> > Action.java AttributedQName.java
> > AttributedURI.java
> > Constants.java EndpointReference.java
> > EndpointReferenceType.java
> > FaultTo.java From.java
> > MessageID.java Recipient.java
> > ReferencePropertiesType.java RelatesTo.java
> > Relationship.java ReplyTo.java
> > ServiceNameType.java
> > To.java
> > addressing/test/addressing TestSerDeser.java
> > addressing/test/addressing/tools WS-Addressing.xsd
> > client-config.wsdd ping_service.wsdl
> > server-config.wsdd
> > Added: addressing/src/org/apache/axis/message/addressing
> > FaultSubcodeValues.java
> > Log:
> > Update to latest WS-Addressing specification (change
> > namespace, add FaultSubcodeValues)
> >
> > Revision Changes Path
> > 1.5 +3 -3 ws-fx/addressing/maven.xml
> >
>
>
RE: cvs commit: ws-fx/addressing/test/addressing/tools WS-Addressing.xsd client-config.wsdd ping_service.wsdl server-config.wsdd
Posted by Jarek Gawor <ga...@mcs.anl.gov>.
Dims,
Some of us are stuck with the '03 version of the spec :). For now, for easy
access, I tagged the 2004-05-12 checkout as 'ws-addressing-03'.
Jarek
> -----Original Message-----
> From: dims@apache.org [mailto:dims@apache.org]
> Sent: Thursday, May 13, 2004 8:52 AM
> To: ws-fx-cvs@apache.org
> Subject: cvs commit: ws-fx/addressing/test/addressing/tools
> WS-Addressing.xsd client-config.wsdd ping_service.wsdl
> server-config.wsdd
>
>
> dims 2004/05/13 05:52:21
>
> Modified: addressing maven.xml
> addressing/src/org/apache/axis/message/addressing
> Action.java AttributedQName.java
> AttributedURI.java
> Constants.java EndpointReference.java
> EndpointReferenceType.java
> FaultTo.java From.java
> MessageID.java Recipient.java
> ReferencePropertiesType.java RelatesTo.java
> Relationship.java ReplyTo.java
> ServiceNameType.java
> To.java
> addressing/test/addressing TestSerDeser.java
> addressing/test/addressing/tools WS-Addressing.xsd
> client-config.wsdd ping_service.wsdl
> server-config.wsdd
> Added: addressing/src/org/apache/axis/message/addressing
> FaultSubcodeValues.java
> Log:
> Update to latest WS-Addressing specification (change
> namespace, add FaultSubcodeValues)
>
> Revision Changes Path
> 1.5 +3 -3 ws-fx/addressing/maven.xml
>