rubys 2002/06/20 13:35:48
Modified: java/lib wsdl4j.jar
java/src/org/apache/axis/client Call.java Service.java
java/src/org/apache/axis/encoding/ser BeanSerializer.java
MapSerializer.java SimpleSerializer.java
VectorSerializer.java
java/src/org/apache/axis/wsdl/fromJava Emitter.java
Types.java
java/src/org/apache/axis/wsdl/gen NoopFactory.java
java/src/org/apache/axis/wsdl/symbolTable BaseType.java
BaseTypeMapping.java CollectionType.java
DefinedElement.java DefinedType.java Element.java
Parameter.java SchemaUtils.java SymTabEntry.java
SymbolTable.java Type.java TypeEntry.java
UndefinedElement.java UndefinedType.java Utils.java
java/src/org/apache/axis/wsdl/toJava Emitter.java
JavaBindingWriter.java JavaClassWriter.java
JavaDefinitionWriter.java JavaDeployWriter.java
JavaFaultWriter.java JavaGeneratorFactory.java
JavaHolderWriter.java JavaImplWriter.java
JavaSkelWriter.java JavaStubWriter.java
JavaTypeWriter.java JavaUndeployWriter.java
Utils.java
java/test/wsdl/interop3/groupE/client
InteropTestListServiceTestClient.java
Log:
Bye bye getWSDLQName, getAxisQName, and java.wsdl.QName!
Revision Changes Path
1.11 +419 -554 xml-axis/java/lib/wsdl4j.jar
<<Binary file>>
1.143 +5 -5 xml-axis/java/src/org/apache/axis/client/Call.java
Index: Call.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Call.java,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- Call.java 19 Jun 2002 16:13:16 -0000 1.142
+++ Call.java 20 Jun 2002 20:35:46 -0000 1.143
@@ -1018,13 +1018,13 @@
Part part = (Part) parts.get(i);
if ( part == null ) continue ;
- String name = part.getName();
- javax.wsdl.QName type = part.getTypeName();
+ String name = part.getName();
+ QName type = part.getTypeName();
if ( type == null ) {
type = part.getElementName();
if ( type != null )
- type = new javax.wsdl.QName("java","org.w3c.dom.Element");
+ type = new QName("java","org.w3c.dom.Element");
else
throw new JAXRPCException(
JavaUtils.getMessage("typeNotSet00", name) );
@@ -1056,11 +1056,11 @@
if (paramOrder != null && paramOrder.contains(part.getName()))
continue ;
- javax.wsdl.QName type = part.getTypeName();
+ QName type = part.getTypeName();
if ( type == null ) {
type = part.getElementName();
if ( type != null )
- type = new javax.wsdl.QName("java","org.w3c.dom.Element");
+ type = new QName("java","org.w3c.dom.Element");
else
throw new JAXRPCException(
JavaUtils.getMessage("typeNotSet00", "<return>") );
1.59 +4 -4 xml-axis/java/src/org/apache/axis/client/Service.java
Index: Service.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Service.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Service.java 20 Jun 2002 16:48:17 -0000 1.58
+++ Service.java 20 Jun 2002 20:35:46 -0000 1.59
@@ -260,9 +260,9 @@
this.wsdlDefinition = def ;
// grrr! Too many flavors of QName
- String ns = serviceName.getNamespaceURI();
- String lp = serviceName.getLocalPart();
- javax.wsdl.QName qn = new javax.wsdl.QName( ns, lp );
+ String ns = serviceName.getNamespaceURI();
+ String lp = serviceName.getLocalPart();
+ QName qn = new QName( ns, lp );
this.wsdlService = def.getService( qn );
if ( this.wsdlService == null )
@@ -550,7 +550,7 @@
*/
public QName getServiceName() {
if ( wsdlService == null ) return( null );
- javax.wsdl.QName qn = wsdlService.getQName();
+ QName qn = wsdlService.getQName();
return( new QName( qn.getNamespaceURI(), qn.getLocalPart() ) );
}
1.36 +2 -4
xml-axis/java/src/org/apache/axis/encoding/ser/BeanSerializer.java
Index: BeanSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BeanSerializer.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- BeanSerializer.java 11 Jun 2002 14:53:55 -0000 1.35
+++ BeanSerializer.java 20 Jun 2002 20:35:46 -0000 1.36
@@ -244,12 +244,10 @@
*/
public boolean writeSchema(Types types) throws Exception {
- javax.wsdl.QName qName = types.getWsdlQName(xmlType);
-
// ComplexType representation of bean class
Element complexType = types.createElement("complexType");
- types.writeSchemaElement(qName, complexType);
- complexType.setAttribute("name", qName.getLocalPart());
+ types.writeSchemaElement(xmlType, complexType);
+ complexType.setAttribute("name", xmlType.getLocalPart());
// See if there is a super class, stop if we hit a stop class
Element e = null;
1.9 +1 -2
xml-axis/java/src/org/apache/axis/encoding/ser/MapSerializer.java
Index: MapSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/MapSerializer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MapSerializer.java 11 Jun 2002 14:53:56 -0000 1.8
+++ MapSerializer.java 20 Jun 2002 20:35:46 -0000 1.9
@@ -144,8 +144,7 @@
public boolean writeSchema(Types types) throws Exception {
Element complexType = types.createElement("complexType");
complexType.setAttribute("name", "Map");
- types.writeSchemaElement(types.getWsdlQName(Constants.SOAP_MAP),
- complexType);
+ types.writeSchemaElement(Constants.SOAP_MAP, complexType);
Element seq = types.createElement("sequence");
complexType.appendChild(seq);
1.19 +2 -5
xml-axis/java/src/org/apache/axis/encoding/ser/SimpleSerializer.java
Index: SimpleSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/SimpleSerializer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SimpleSerializer.java 11 Jun 2002 14:53:56 -0000 1.18
+++ SimpleSerializer.java 20 Jun 2002 20:35:46 -0000 1.19
@@ -236,13 +236,10 @@
if (!SimpleType.class.isAssignableFrom(javaType))
return false;
- // Emit WSDL for simpleContent
- javax.wsdl.QName qName = types.getWsdlQName(xmlType);
-
// ComplexType representation of SimpleType bean class
Element complexType = types.createElement("complexType");
- types.writeSchemaElement(qName, complexType);
- complexType.setAttribute("name", qName.getLocalPart());
+ types.writeSchemaElement(xmlType, complexType);
+ complexType.setAttribute("name", xmlType.getLocalPart());
// Produce simpleContent extending base type.
Element simpleContent = types.createElement("simpleContent");
1.6 +1 -2
xml-axis/java/src/org/apache/axis/encoding/ser/VectorSerializer.java
Index: VectorSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/VectorSerializer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VectorSerializer.java 11 Jun 2002 14:53:56 -0000 1.5
+++ VectorSerializer.java 20 Jun 2002 20:35:46 -0000 1.6
@@ -142,8 +142,7 @@
public boolean writeSchema(Types types) throws Exception {
Element complexType = types.createElement("complexType");
complexType.setAttribute("name", "Vector");
- types.writeSchemaElement(types.getWsdlQName(Constants.SOAP_VECTOR),
- complexType);
+ types.writeSchemaElement(Constants.SOAP_VECTOR, complexType);
Element seq = types.createElement("sequence");
complexType.appendChild(seq);
1.43 +11 -13 xml-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java
Index: Emitter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Emitter.java 20 Jun 2002 16:48:20 -0000 1.42
+++ Emitter.java 20 Jun 2002 20:35:47 -0000 1.43
@@ -519,7 +519,7 @@
Binding binding = def.createBinding();
binding.setUndefined(false);
binding.setQName(
- new javax.wsdl.QName(intfNS, getServicePortName() + "SoapBinding"));
+ new QName(intfNS, getServicePortName() + "SoapBinding"));
SOAPBinding soapBinding = new SOAPBindingImpl();
String modeStr = (mode == MODE_RPC) ? "rpc" : "document";
@@ -544,7 +544,7 @@
Service service = def.createService();
- service.setQName(new javax.wsdl.QName(implNS,
+ service.setQName(new QName(implNS,
getServiceElementName()));
def.addService(service);
@@ -577,7 +577,7 @@
portType.setUndefined(false);
// PortType name is the name of the class being processed
- portType.setQName(new javax.wsdl.QName(intfNS, getPortTypeName()));
+ portType.setQName(new QName(intfNS, getPortTypeName()));
ArrayList operations = serviceDesc.getOperations();
for (Iterator i = operations.iterator(); i.hasNext();) {
@@ -821,8 +821,7 @@
{
Message msg = def.createMessage();
- javax.wsdl.QName qName
- = createMessageName(def, oper.getName(), "Request");
+ QName qName = createMessageName(def, oper.getName(), "Request");
msg.setQName(qName);
msg.setUndefined(false);
@@ -846,8 +845,7 @@
{
Message msg = def.createMessage();
- javax.wsdl.QName qName
- = createMessageName(def, desc.getName(), "Response");
+ QName qName = createMessageName(def, desc.getName(), "Response");
msg.setQName(qName);
msg.setUndefined(false);
@@ -901,7 +899,7 @@
if (msg == null) {
msg = def.createMessage();
- javax.wsdl.QName qName = createMessageName(def, clsName, "");
+ QName qName = createMessageName(def, clsName, "");
msg.setQName(qName);
msg.setUndefined(false);
@@ -954,7 +952,7 @@
QName elemQName = null;
if (mode != MODE_RPC)
elemQName = param.getQName();
- javax.wsdl.QName typeQName = types.writePartType(param.getJavaType(),
+ QName typeQName = types.writePartType(param.getJavaType(),
elemQName);
if (mode == MODE_RPC) {
if (typeQName != null) {
@@ -968,7 +966,7 @@
def.addNamespace(namespaces.getCreatePrefix(namespaceURI),
namespaceURI);
}
- part.setElementName(Utils.getWSDLQName(elemQName));
+ part.setElementName(elemQName);
part.setName(param.getName());
msg.addPart(part);
} else {
@@ -981,11 +979,11 @@
/*
* Return a message QName which has not already been defined in the WSDL
*/
- private javax.wsdl.QName createMessageName(Definition def,
+ private QName createMessageName(Definition def,
String methodName,
String suffix) {
- javax.wsdl.QName qName = new javax.wsdl.QName(intfNS,
+ QName qName = new QName(intfNS,
methodName.concat(suffix));
// Check the make sure there isn't a message with this name already
@@ -994,7 +992,7 @@
StringBuffer namebuf =
new StringBuffer(methodName.concat(suffix));
namebuf.append(messageNumber);
- qName = new javax.wsdl.QName(intfNS, namebuf.toString());
+ qName = new QName(intfNS, namebuf.toString());
messageNumber++;
}
return qName;
1.36 +7 -17 xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java
Index: Types.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Types.java 18 Jun 2002 21:26:38 -0000 1.35
+++ Types.java 20 Jun 2002 20:35:47 -0000 1.36
@@ -75,7 +75,7 @@
import org.w3c.dom.NodeList;
import javax.wsdl.Definition;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@@ -153,16 +153,15 @@
// Still need to write any element declaration...
if (qname != null) {
String elementType = writeType(type);
- Element element = createElementDecl(Utils.getWSDLQName(qname),
- elementType, false);
+ Element element = createElementDecl(qname, elementType, false);
if (element != null)
- writeSchemaElement(Utils.getWSDLQName(qname),element);
+ writeSchemaElement(qname,element);
}
- return getWsdlQName(typeQName);
+ return typeQName;
}else {
if (wsdlTypesElem == null)
writeWsdlTypesElement();
- return writeTypeAsElement(type, Utils.getWSDLQName(qname));
+ return writeTypeAsElement(type, qname);
}
}
@@ -198,7 +197,7 @@
String pref = def.getPrefix(qName.getNamespaceURI());
if (pref == null)
def.addNamespace(namespaces.getCreatePrefix(qName.getNamespaceURI()),
qName.getNamespaceURI());
- return getWsdlQName(qName);
+ return qName;
}
/**
@@ -361,7 +360,7 @@
// Quick return if schema type
if (isSimpleType(type)) {
- QName qName = getWsdlQName(getTypeQName(type));
+ QName qName = getTypeQName(type);
if (Constants.isSchemaXSD(qName.getNamespaceURI())) {
return Constants.NS_PREFIX_SCHEMA_XSD + ":" +
qName.getLocalPart();
@@ -604,15 +603,6 @@
element.setAttribute("nillable", "true");
element.setAttribute("type", elementType);
return element;
- }
-
- /**
- * convert from JAX-RPC QName to WSDL QName
- * @param qName JAX-RPC QName
- * @return WSDL QName
- */
- public QName getWsdlQName (javax.xml.namespace.QName qName) {
- return new QName(qName.getNamespaceURI(), qName.getLocalPart());
}
/**
1.3 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/gen/NoopFactory.java
Index: NoopFactory.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/gen/NoopFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NoopFactory.java 11 Jun 2002 14:54:00 -0000 1.2
+++ NoopFactory.java 20 Jun 2002 20:35:47 -0000 1.3
@@ -58,7 +58,7 @@
import javax.wsdl.Definition;
import javax.wsdl.Message;
import javax.wsdl.PortType;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import javax.wsdl.Service;
import javax.wsdl.WSDLException;
1.2 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/symbolTable/BaseType.java
Index: BaseType.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/BaseType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseType.java 9 May 2002 13:14:27 -0000 1.1
+++ BaseType.java 20 Jun 2002 20:35:47 -0000 1.2
@@ -54,7 +54,7 @@
*/
package org.apache.axis.wsdl.symbolTable;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* This Type is for a QName represents a Base Type (i.e. xsd:string represents a
java.lang.String)
1.2 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/BaseTypeMapping.java
Index: BaseTypeMapping.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/BaseTypeMapping.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseTypeMapping.java 9 May 2002 13:14:27 -0000 1.1
+++ BaseTypeMapping.java 20 Jun 2002 20:35:47 -0000 1.2
@@ -53,7 +53,7 @@
*/
package org.apache.axis.wsdl.symbolTable;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* Get the base language name for a qname
1.2 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/CollectionType.java
Index: CollectionType.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/CollectionType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CollectionType.java 9 May 2002 13:14:27 -0000 1.1
+++ CollectionType.java 20 Jun 2002 20:35:47 -0000 1.2
@@ -57,7 +57,7 @@
import org.w3c.dom.Node;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* This Type is for a QName that is a 'collection'.
* For example,
1.2 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/DefinedElement.java
Index: DefinedElement.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/DefinedElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefinedElement.java 9 May 2002 13:14:27 -0000 1.1
+++ DefinedElement.java 20 Jun 2002 20:35:47 -0000 1.2
@@ -57,7 +57,7 @@
import org.w3c.dom.Node;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* This Type is for a QName that is an element, these types are only emitted if
1.2 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/DefinedType.java
Index: DefinedType.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/DefinedType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefinedType.java 9 May 2002 13:14:27 -0000 1.1
+++ DefinedType.java 20 Jun 2002 20:35:47 -0000 1.2
@@ -56,7 +56,7 @@
import org.w3c.dom.Node;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* This Type is for a QName that is a complex or simple type, these types are
* always emitted.
1.2 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Element.java
Index: Element.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Element.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Element.java 9 May 2002 13:14:27 -0000 1.1
+++ Element.java 20 Jun 2002 20:35:47 -0000 1.2
@@ -57,7 +57,7 @@
import org.w3c.dom.Node;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* This class represents a TypeEntry that is a type (complexType, simpleType, etc.
1.2 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Parameter.java
Index: Parameter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Parameter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Parameter.java 9 May 2002 13:14:27 -0000 1.1
+++ Parameter.java 20 Jun 2002 20:35:47 -0000 1.2
@@ -54,7 +54,7 @@
*/
package org.apache.axis.wsdl.symbolTable;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* This class simply collects
1.8 +4 -7
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
Index: SchemaUtils.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SchemaUtils.java 11 Jun 2002 14:54:01 -0000 1.7
+++ SchemaUtils.java 20 Jun 2002 20:35:47 -0000 1.8
@@ -56,7 +56,7 @@
import java.util.Vector;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import javax.xml.rpc.holders.BooleanHolder;
import javax.xml.rpc.holders.IntHolder;
@@ -261,12 +261,9 @@
// Represent this as an element named any of type any type.
// This will cause it to be serialized with the element
// serializer.
- TypeEntry type =
- symbolTable.getType(
- Utils.getWSDLQName(Constants.XSD_ANY));
+ TypeEntry type = symbolTable.getType(Constants.XSD_ANY);
ElementDecl elem =
- new ElementDecl(type,
- Utils.getAxisQName(new QName("","any")));
+ new ElementDecl(type, new QName("","any"));
elem.setAnyElement(true);
v.add(elem);
} else if (subNodeKind.getLocalPart().equals("element")) {
@@ -380,7 +377,7 @@
TypeEntry type = (TypeEntry)symbolTable.getTypeEntry(nodeType,
forElement.value);
if (type != null) {
- ElementDecl elem = new ElementDecl(type ,Utils.getAxisQName(nodeName));
+ ElementDecl elem = new ElementDecl(type, nodeName);
String minOccurs = Utils.getAttribute(elementNode, "minOccurs");
if (minOccurs != null && minOccurs.equals("0")) {
elem.setMinOccursIs0(true);
1.2 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymTabEntry.java
Index: SymTabEntry.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymTabEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SymTabEntry.java 9 May 2002 13:14:27 -0000 1.1
+++ SymTabEntry.java 20 Jun 2002 20:35:47 -0000 1.2
@@ -59,7 +59,7 @@
import java.util.Iterator;
import java.util.Map;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* SymTabEntry is the base class for all symbol table entries. It contains four
things:
1.7 +6 -7
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java
Index: SymbolTable.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SymbolTable.java 4 Jun 2002 20:35:08 -0000 1.6
+++ SymbolTable.java 20 Jun 2002 20:35:47 -0000 1.7
@@ -83,7 +83,7 @@
import javax.wsdl.Part;
import javax.wsdl.Port;
import javax.wsdl.PortType;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import javax.wsdl.Service;
import javax.wsdl.WSDLException;
@@ -658,7 +658,7 @@
else if (isXSD && localPart.equals("any")) {
// Map xsd:any element to any xsd:any so that
// it gets serialized using the ElementSerializer.
- QName anyQName = Utils.getWSDLQName(Constants.XSD_ANY);
+ QName anyQName = Constants.XSD_ANY;
if (getType(anyQName) == null) {
symbolTablePut(new BaseType(anyQName));
}
@@ -1012,11 +1012,10 @@
Parameter returnParam = (Parameter)outputs.get(0);
parameters.returnType = returnParam.getType();
if (parameters.returnType instanceof DefinedElement) {
- parameters.returnName = Utils.getAxisQName(
- ((DefinedElement)parameters.returnType).getQName());
- } else {
parameters.returnName =
- Utils.getAxisQName(returnParam.getQName());
+ ((DefinedElement)parameters.returnType).getQName();
+ } else {
+ parameters.returnName = returnParam.getQName();
}
++parameters.outputs;
}
@@ -1213,7 +1212,7 @@
for (int j = 0; j < vTypes.size(); j++) {
ElementDecl elem = (ElementDecl) vTypes.elementAt(j);
Parameter p = new Parameter();
- p.setQName(Utils.getWSDLQName(elem.getName()));
+ p.setQName(elem.getName());
p.setType(elem.getType());
v.add(p);
}
1.2 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Type.java
Index: Type.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Type.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Type.java 9 May 2002 13:14:27 -0000 1.1
+++ Type.java 20 Jun 2002 20:35:47 -0000 1.2
@@ -57,7 +57,7 @@
import org.w3c.dom.Node;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* This class represents a TypeEntry that is a type (complexType, simpleType, etc.
1.2 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/TypeEntry.java
Index: TypeEntry.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/TypeEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeEntry.java 9 May 2002 13:14:27 -0000 1.1
+++ TypeEntry.java 20 Jun 2002 20:35:47 -0000 1.2
@@ -56,7 +56,7 @@
import java.io.IOException;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import org.apache.axis.utils.JavaUtils;
1.2 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/UndefinedElement.java
Index: UndefinedElement.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/UndefinedElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UndefinedElement.java 9 May 2002 13:14:27 -0000 1.1
+++ UndefinedElement.java 20 Jun 2002 20:35:47 -0000 1.2
@@ -56,7 +56,7 @@
import java.io.IOException;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* This represents a QName found in a reference but is not defined.
1.2 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/UndefinedType.java
Index: UndefinedType.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/UndefinedType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UndefinedType.java 9 May 2002 13:14:27 -0000 1.1
+++ UndefinedType.java 20 Jun 2002 20:35:47 -0000 1.2
@@ -56,7 +56,7 @@
import java.io.IOException;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* This represents a QName found in a reference but is not defined.
1.14 +7 -32 xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Utils.java
Index: Utils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Utils.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Utils.java 18 Jun 2002 16:53:10 -0000 1.13
+++ Utils.java 20 Jun 2002 20:35:47 -0000 1.14
@@ -59,7 +59,7 @@
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import javax.xml.rpc.holders.BooleanHolder;
import javax.xml.rpc.holders.IntHolder;
import java.util.HashSet;
@@ -86,7 +86,7 @@
* @param QName
*/
public static QName getNillableQName(QName qName) {
- QName rc = new QName(qName.getNamespaceURI(), qName.getLocalPart());
+ QName rc = qName;
if (Constants.isSchemaXSD(rc.getNamespaceURI())) {
String localName = rc.getLocalPart();
if (localName.equals("int") ||
@@ -96,12 +96,12 @@
localName.equals("double") ||
localName.equals("boolean") ||
localName.equals("byte")) {
- rc.setNamespaceURI(Constants.URI_DEFAULT_SOAP_ENC);
+ rc = new QName(Constants.URI_DEFAULT_SOAP_ENC,
+ qName.getLocalPart());
}
else if (localName.equals("base64Binary") ||
localName.equals("hexBinary")) {
- rc.setNamespaceURI(Constants.URI_DEFAULT_SOAP_ENC);
- rc.setLocalPart("base64");
+ rc = new QName(Constants.URI_DEFAULT_SOAP_ENC, "base64");
}
}
return rc;
@@ -301,7 +301,7 @@
// if (namespace != null)
// qName.setNamespaceURI(namespace);
localPart += "[" + maxOccursValue + "]";
- qName.setLocalPart(localPart);
+ qName = new QName(qName.getNamespaceURI(), localPart);
}
}
@@ -354,7 +354,7 @@
Constants.isSchemaXSD(nodeName.getNamespaceURI()) &&
(nodeName.getLocalPart().equals("element") ||
nodeName.getLocalPart().equals("attribute"))) {
- return getWSDLQName(Constants.XSD_ANYTYPE);
+ return Constants.XSD_ANYTYPE;
}
}
}
@@ -546,31 +546,6 @@
}
} // getNestedTypes
- /**
- * Given the WSDL4J QName (javax.wsdl.QName), return the JAX-RPC
- * QName (javax.xml.namespace.QName).
- */
- public static javax.xml.namespace.QName getAxisQName(QName qname)
- {
- if (qname == null) {
- return null;
- }
- return new javax.xml.namespace.QName(qname.getNamespaceURI(),
- qname.getLocalPart());
- }
-
- /**
- * Given the JAX-RPC QName (javax.xml.namespace.QName), return
- * the WSDL4J QName (javax.wsdl.QName).
- */
- public static QName getWSDLQName(javax.xml.namespace.QName qname)
- {
- if (qname == null) {
- return null;
- }
- return new QName(qname.getNamespaceURI(), qname.getLocalPart());
- }
-
/**
* Generate an XML prefixed attribute value with a corresponding xmlns
* declaration for the prefix. If there is no namespace,
1.44 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java
Index: Emitter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Emitter.java 20 Jun 2002 16:48:20 -0000 1.43
+++ Emitter.java 20 Jun 2002 20:35:47 -0000 1.44
@@ -64,7 +64,7 @@
import java.util.Properties;
import javax.wsdl.Definition;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import javax.wsdl.WSDLException;
import org.apache.axis.encoding.DefaultSOAP12TypeMappingImpl;
1.12 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBindingWriter.java
Index: JavaBindingWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBindingWriter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JavaBindingWriter.java 20 May 2002 20:07:28 -0000 1.11
+++ JavaBindingWriter.java 20 Jun 2002 20:35:47 -0000 1.12
@@ -59,7 +59,7 @@
import java.util.HashMap;
import javax.wsdl.Binding;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import org.apache.axis.utils.JavaUtils;
1.2 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaClassWriter.java
Index: JavaClassWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaClassWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaClassWriter.java 7 Jun 2002 12:45:08 -0000 1.1
+++ JavaClassWriter.java 20 Jun 2002 20:35:47 -0000 1.2
@@ -58,7 +58,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import org.apache.axis.utils.JavaUtils;
1.9 +1 -1
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JavaDefinitionWriter.java 14 May 2002 23:46:34 -0000 1.8
+++ JavaDefinitionWriter.java 20 Jun 2002 20:35:47 -0000 1.9
@@ -68,7 +68,7 @@
import javax.wsdl.Import;
import javax.wsdl.Operation;
import javax.wsdl.PortType;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import org.apache.axis.wsdl.gen.Generator;
1.49 +2 -2
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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- JavaDeployWriter.java 11 Jun 2002 13:26:14 -0000 1.48
+++ JavaDeployWriter.java 20 Jun 2002 20:35:47 -0000 1.49
@@ -67,7 +67,7 @@
import javax.wsdl.Operation;
import javax.wsdl.OperationType;
import javax.wsdl.Port;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import javax.wsdl.Service;
import org.apache.axis.Constants;
@@ -335,7 +335,7 @@
// Get the operation's return QName
if (params.returnName != null)
- returnQName = Utils.getWSDLQName(params.returnName);
+ returnQName = params.returnName;
// Write the operation metadata
writeOperation(pw, javaOperName, elementQName, returnQName,
1.10 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaFaultWriter.java
Index: JavaFaultWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaFaultWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JavaFaultWriter.java 7 Jun 2002 12:45:08 -0000 1.9
+++ JavaFaultWriter.java 20 Jun 2002 20:35:47 -0000 1.10
@@ -60,7 +60,7 @@
import java.util.Vector;
import javax.wsdl.Fault;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import org.apache.axis.utils.JavaUtils;
1.10 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
Index: JavaGeneratorFactory.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JavaGeneratorFactory.java 19 Jun 2002 16:13:18 -0000 1.9
+++ JavaGeneratorFactory.java 20 Jun 2002 20:35:47 -0000 1.10
@@ -70,7 +70,7 @@
import javax.wsdl.Operation;
import javax.wsdl.OperationType;
import javax.wsdl.PortType;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import javax.wsdl.Service;
import org.apache.axis.encoding.TypeMapping;
1.11 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaHolderWriter.java
Index: JavaHolderWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaHolderWriter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JavaHolderWriter.java 14 Jun 2002 18:48:39 -0000 1.10
+++ JavaHolderWriter.java 20 Jun 2002 20:35:47 -0000 1.11
@@ -57,7 +57,7 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import org.apache.axis.utils.JavaUtils;
1.26 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaImplWriter.java
Index: JavaImplWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaImplWriter.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- JavaImplWriter.java 14 Jun 2002 16:11:12 -0000 1.25
+++ JavaImplWriter.java 20 Jun 2002 20:35:47 -0000 1.26
@@ -74,7 +74,7 @@
import javax.wsdl.Output;
import javax.wsdl.Part;
import javax.wsdl.PortType;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import javax.wsdl.extensions.soap.SOAPBody;
import javax.wsdl.extensions.soap.SOAPOperation;
1.32 +3 -4
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
Index: JavaSkelWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- JavaSkelWriter.java 19 Jun 2002 16:13:18 -0000 1.31
+++ JavaSkelWriter.java 20 Jun 2002 20:35:47 -0000 1.32
@@ -187,10 +187,10 @@
pw.println(" " +
"new org.apache.axis.description.ParameterDesc(" +
Utils.getNewQName(
- Utils.getAxisQName(p.getQName())) +
+ p.getQName()) +
", " + modeStr + "," +
Utils.getNewQName(
- Utils.getAxisQName(paramType.getQName()))
+ paramType.getQName())
+","+
p.getType().getName() + ".class"
+"),");
@@ -211,8 +211,7 @@
// If we need to know the QName (if we have a namespace or
// the actual method name doesn't match the XML we expect),
// record it in the OperationDesc
- QName elementQName = Utils.getAxisQName(
- Utils.getOperationQName(operation));
+ QName elementQName = Utils.getOperationQName(operation);
if (elementQName != null) {
pw.println(" _oper.setElementQName(" +
Utils.getNewQName(elementQName) + ");");
1.72 +4 -7
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java
Index: JavaStubWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- JavaStubWriter.java 14 Jun 2002 13:27:17 -0000 1.71
+++ JavaStubWriter.java 20 Jun 2002 20:35:48 -0000 1.72
@@ -73,7 +73,7 @@
import javax.wsdl.OperationType;
import javax.wsdl.Part;
import javax.wsdl.PortType;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import javax.wsdl.extensions.soap.SOAPBody;
import javax.wsdl.extensions.soap.SOAPOperation;
@@ -572,8 +572,7 @@
QName q = p.getElementName();
pw.println(" call.setOperationName(new
javax.xml.namespace.QName(\"" + q.getNamespaceURI() + "\", \"" + q.getLocalPart() +
"\"));" );
} else {
- javax.xml.namespace.QName elementQName = Utils.getAxisQName(
- Utils.getOperationQName(operation));
+ QName elementQName = Utils.getOperationQName(operation);
if (elementQName != null) {
pw.println(" call.setOperationName(" +
Utils.getNewQName(elementQName) + ");" );
@@ -629,8 +628,7 @@
p = (Parameter) parms.list.get(++i);
}
String javifiedName = Utils.xmlNameToJava(p.getName());
- String qnameName = Utils.getNewQName(
- Utils.getAxisQName(p.getQName()));
+ String qnameName = Utils.getNewQName(p.getQName());
pw.println(" java.util.Map output;");
pw.println(" output = call.getOutputParams();");
@@ -652,8 +650,7 @@
for (int i = 0; i < parms.list.size (); ++i) {
Parameter p = (Parameter) parms.list.get (i);
String javifiedName = Utils.xmlNameToJava(p.getName());
- String qnameName = Utils.getNewQName(
- Utils.getAxisQName(p.getQName()));
+ String qnameName = Utils.getNewQName(p.getQName());
if (p.getMode() != Parameter.IN) {
writeOutputAssign(pw, javifiedName + ".value =",
p.getType(),
1.13 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
Index: JavaTypeWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTypeWriter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JavaTypeWriter.java 14 May 2002 23:46:34 -0000 1.12
+++ JavaTypeWriter.java 20 Jun 2002 20:35:48 -0000 1.13
@@ -58,7 +58,7 @@
import java.util.Vector;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import org.w3c.dom.Node;
1.8 +1 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java
Index: JavaUndeployWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JavaUndeployWriter.java 7 Jun 2002 12:45:08 -0000 1.7
+++ JavaUndeployWriter.java 20 Jun 2002 20:35:48 -0000 1.8
@@ -63,7 +63,7 @@
import javax.wsdl.Binding;
import javax.wsdl.Definition;
import javax.wsdl.Port;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import javax.wsdl.Service;
import org.apache.axis.deployment.wsdd.WSDDConstants;
1.39 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java
Index: Utils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Utils.java 14 Jun 2002 18:48:39 -0000 1.38
+++ Utils.java 20 Jun 2002 20:35:48 -0000 1.39
@@ -69,7 +69,7 @@
import javax.wsdl.Message;
import javax.wsdl.Operation;
import javax.wsdl.Part;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.soap.SOAPBody;
import java.io.File;
1.4 +2 -2
xml-axis/java/test/wsdl/interop3/groupE/client/InteropTestListServiceTestClient.java
Index: InteropTestListServiceTestClient.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/interop3/groupE/client/InteropTestListServiceTestClient.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InteropTestListServiceTestClient.java 11 Jun 2002 14:54:03 -0000 1.3
+++ InteropTestListServiceTestClient.java 20 Jun 2002 20:35:48 -0000 1.4
@@ -99,7 +99,7 @@
private String soapAction = "http://soapinterop.org/";;
private org.apache.axis.client.Call call = null;
private Definition wsdl = null;
- private javax.wsdl.QName serviceQN = null;
+ private QName serviceQN = null;
/**
* Determine if two objects are equal. Handles nulls and recursively
@@ -203,7 +203,7 @@
* The WSDL must define one service.
*/
private QName getServiceQName() {
- serviceQN = (javax.wsdl.QName)wsdl.getServices().
+ serviceQN = (QName)wsdl.getServices().
keySet().iterator().next();
return new QName(serviceQN.getNamespaceURI(),
serviceQN.getLocalPart());
