gdaniels 2002/10/04 06:06:07
Modified: java/src/org/apache/axis/deployment/wsdd Tag: interop4
WSDDConstants.java WSDDDeployableItem.java
WSDDHandler.java WSDDOperation.java
java/src/org/apache/axis/wsdl/toJava Tag: interop4
JavaDefinitionWriter.java JavaDeployWriter.java
Added: java/test/wsdl/interop4/groupH/complexRPCenc Tag: interop4
complex-rpc-encoded.wsdl
Log:
Rough in code for supporting fault descriptions in WSDD. Will work with
Tom to revamp the JavaDefinitionWriter code to partition fault information
by operation, instead of lumping it all together.
Revision Changes Path
No revision
No revision
1.23.2.1 +2 -0
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDConstants.java
Index: WSDDConstants.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDConstants.java,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- WSDDConstants.java 4 Sep 2002 13:25:03 -0000 1.23
+++ WSDDConstants.java 4 Oct 2002 13:06:06 -0000 1.23.2.1
@@ -132,6 +132,7 @@
public static final String ELEM_WSDD_JAXRPC_CHAIN = "handlerInfoChain";
public static final String ELEM_WSDD_JAXRPC_ROLE = "role";
public static final String ELEM_WSDD_JAXRPC_HEADER = "header";
+ public static final String ELEM_WSDD_FAULT = "fault";
public static final QName QNAME_PARAM = new QName(URI_WSDD, ELEM_WSDD_PARAM);
public static final QName QNAME_DOC = new QName(URI_WSDD, ELEM_WSDD_DOC);
@@ -156,6 +157,7 @@
public static final QName QNAME_JAXRPC_HANDLERINFOCHAIN = new QName(URI_WSDD,
ELEM_WSDD_JAXRPC_CHAIN);
public static final QName QNAME_JAXRPC_HEADER = new QName(URI_WSDD,
ELEM_WSDD_JAXRPC_HEADER);
public static final QName QNAME_JAXRPC_ROLE = new
QName(URI_WSDD,ELEM_WSDD_JAXRPC_ROLE);
+ public static final QName QNAME_FAULT = new QName(URI_WSDD, ELEM_WSDD_FAULT);
public static final String ATTR_LANG_SPEC_TYPE = "languageSpecificType";
public static final String ATTR_QNAME = "qname";
1.47.2.1 +1 -0
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java
Index: WSDDDeployableItem.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java,v
retrieving revision 1.47
retrieving revision 1.47.2.1
diff -u -r1.47 -r1.47.2.1
--- WSDDDeployableItem.java 30 Sep 2002 21:38:49 -0000 1.47
+++ WSDDDeployableItem.java 4 Oct 2002 13:06:06 -0000 1.47.2.1
@@ -76,6 +76,7 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import java.util.Date;
/**
1.22.2.1 +0 -1
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDHandler.java
Index: WSDDHandler.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDHandler.java,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -r1.22 -r1.22.2.1
--- WSDDHandler.java 18 Sep 2002 16:10:39 -0000 1.22
+++ WSDDHandler.java 4 Oct 2002 13:06:06 -0000 1.22.2.1
@@ -55,7 +55,6 @@
package org.apache.axis.deployment.wsdd;
import org.apache.axis.encoding.SerializationContext;
-import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Messages;
import org.w3c.dom.Element;
import org.xml.sax.helpers.AttributesImpl;
1.21.8.1 +7 -0
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDOperation.java
Index: WSDDOperation.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDOperation.java,v
retrieving revision 1.21
retrieving revision 1.21.8.1
diff -u -r1.21 -r1.21.8.1
--- WSDDOperation.java 26 Jun 2002 18:19:07 -0000 1.21
+++ WSDDOperation.java 4 Oct 2002 13:06:06 -0000 1.21.8.1
@@ -122,6 +122,13 @@
WSDDParameter parameter = new WSDDParameter(paramEl, desc);
desc.addParameter(parameter.getParameter());
}
+
+ Element [] faultElems = getChildElements(e, ELEM_WSDD_FAULT);
+ for (int i = 0; i < faultElems.length; i++) {
+ Element faultElem = faultElems[i];
+ WSDDFault fault = new WSDDFault(faultElem);
+ desc.addFault(fault.getFaultDesc());
+ }
}
/**
No revision
No revision
1.10.4.3 +0 -2
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java
Index: JavaDefinitionWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java,v
retrieving revision 1.10.4.2
retrieving revision 1.10.4.3
diff -u -r1.10.4.2 -r1.10.4.3
--- JavaDefinitionWriter.java 3 Oct 2002 15:00:55 -0000 1.10.4.2
+++ JavaDefinitionWriter.java 4 Oct 2002 13:06:07 -0000 1.10.4.3
@@ -71,14 +71,12 @@
import javax.wsdl.BindingFault;
import javax.wsdl.Binding;
import javax.wsdl.BindingOperation;
-import javax.xml.namespace.QName;
import org.apache.axis.wsdl.gen.Generator;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import org.apache.axis.wsdl.symbolTable.MessageEntry;
import org.apache.axis.utils.Messages;
-import org.apache.axis.Message;
/**
* This is Wsdl2java's Definition Writer.
1.65.2.1 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
Index: JavaDeployWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDeployWriter.java,v
retrieving revision 1.65
retrieving revision 1.65.2.1
diff -u -r1.65 -r1.65.2.1
--- JavaDeployWriter.java 26 Sep 2002 17:04:02 -0000 1.65
+++ JavaDeployWriter.java 4 Oct 2002 13:06:07 -0000 1.65.2.1
@@ -87,7 +87,7 @@
import org.apache.axis.wsdl.symbolTable.TypeEntry;
/**
-* This is Wsdl2java's deploy Writer. It writes the deploy.java file.
+* This is Wsdl2java's deploy Writer. It writes the deploy.wsdd file.
*/
public class JavaDeployWriter extends JavaWriter {
protected Definition definition;
No revision
No revision
1.1.2.1 +301 -0
xml-axis/java/test/wsdl/interop4/groupH/complexRPCenc/Attic/complex-rpc-encoded.wsdl
