owenb 2002/06/24 06:11:20
Modified: java/src/org/apache/wsif WSIFClientProxy.java
WSIFRequest.java WSIFResponse.java WSIFService.java
java/src/org/apache/wsif/wsdl/extensions/java
JavaOperation.java JavaBinding.java
JavaAddress.java JavaBindingConstants.java
JavaBindingSerializer.java
java/src/org/apache/wsif/providers
WSIFDynamicTypeMapping.java WSIFDynamicTypeMap.java
java/src/org/apache/wsif/compiler/util TypeMapping.java
Utils.java
java/src/org/apache/wsif/compiler/schema/tools
SchemaSimpleType.java SchemaAttributeGroup.java
SchemaComplexType.java SchemaAttribute.java
SchemaElement.java Schema2JROM.java
SchemaGroup.java Schema2Java.java
java/src/org/apache/wsif/wsdl/extensions/jms
JMSInputSerializer.java JMSBinding.java
JMSInput.java JMSOutputSerializer.java
JMSProperty.java JMSAddress.java JMSConstants.java
JMSAddressSerializer.java
JMSPropertyValueSerializer.java JMSOperation.java
JMSPropertySerializer.java
JMSOperationSerializer.java
JMSBindingSerializer.java JMSOutput.java
JMSPropertyValue.java
java/src/org/apache/wsif/providers/soap/soaprmi
WSIFOperation_SoapRMI.java
java/src/org/apache/wsif/providers/java
WSIFOperation_Java.java
java/src/org/apache/wsif/providers/soap/apachesoap
SOAPEncSerializerWrapper.java PartSerializer.java
JROMSerializer.java WSIFOperation_ApacheSOAP.java
java/src/org/apache/wsif/wsdl/extensions/format TypeMap.java
TypeMapping.java FormatBindingSerializer.java
FormatBindingConstants.java
java/samples/clients DynamicInvoker.java
java/samples/clients/zipcode LiteralSerializer.java
ShortZipCodeFormatHandler.java
PartFormatHandler.java
ShortZipCodeResponseFormatHandler.java
ZIPCodeProxy.java
java/src/org/apache/wsif/wsdl/extensions/ejb
EJBBindingConstants.java EJBOperation.java
EJBBindingSerializer.java EJBBinding.java
EJBAddress.java
java/test/jrom JROMTests.java
java/src/org/apache/wsif/providers/jms JMSMessage.java
WSIFOperation_Jms.java JMSFormatter.java
java/src/org/apache/wsif/wsdl/extensions/instance
InstanceEstablishmentSerializer.java
InstanceEstablishment.java InstanceConstants.java
java/test/soapinterop InteropTestServiceProxy.java
java/src/org/apache/wsif/util WSIFUtils.java
java/src/org/apache/wsif/base WSIFDefaultOperation.java
WSIFServiceImpl.java
java/test/async AsyncTests.java
java/src/org/apache/wsif/providers/soap/apacheaxis
WSIFOperation_ApacheAxis.java
java/src/org/apache/wsif/providers/ejb
WSIFOperation_EJB.java
java/test/addressbook AddressBookTest.java
java/test/jms JmsTest.java
java/test/wsdl QNameTest.java
java/test/inout InoutTest.java
java/src/org/apache/wsif/compiler MessageCompiler.java
Log:
Changed from using the old javax.wsdl.QName to the new javax.xml.namespace.QName
Revision Changes Path
1.6 +2 -1 xml-axis-wsif/java/src/org/apache/wsif/WSIFClientProxy.java
Index: WSIFClientProxy.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/WSIFClientProxy.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WSIFClientProxy.java 14 Jun 2002 12:17:37 -0000 1.5
+++ WSIFClientProxy.java 24 Jun 2002 13:11:17 -0000 1.6
@@ -71,7 +71,8 @@
import javax.wsdl.Output;
import javax.wsdl.Part;
import javax.wsdl.PortType;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import org.apache.soap.Constants;
import org.apache.wsif.compiler.schema.tools.Schema2Java;
import org.apache.wsif.compiler.util.TypeMapping;
1.2 +1 -1 xml-axis-wsif/java/src/org/apache/wsif/WSIFRequest.java
Index: WSIFRequest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/WSIFRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WSIFRequest.java 6 Jun 2002 08:28:48 -0000 1.1
+++ WSIFRequest.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -59,7 +59,7 @@
import java.io.Serializable;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* This class represents a service request coming into WSIF. It
1.2 +1 -1 xml-axis-wsif/java/src/org/apache/wsif/WSIFResponse.java
Index: WSIFResponse.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/WSIFResponse.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WSIFResponse.java 6 Jun 2002 08:28:48 -0000 1.1
+++ WSIFResponse.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -59,7 +59,7 @@
import java.io.Serializable;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* This class represents a service response coming out of WSIF. It
1.2 +1 -1 xml-axis-wsif/java/src/org/apache/wsif/WSIFService.java
Index: WSIFService.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/WSIFService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WSIFService.java 6 Jun 2002 08:28:48 -0000 1.1
+++ WSIFService.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -60,7 +60,7 @@
import java.util.Iterator;
import javax.wsdl.Definition;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* A WSIFService is a factory via which WSIFPorts
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/java/JavaOperation.java
Index: JavaOperation.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/java/JavaOperation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaOperation.java 6 Jun 2002 08:28:53 -0000 1.1
+++ JavaOperation.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -59,8 +59,8 @@
import java.util.List;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
import com.ibm.wsdl.util.StringUtils;
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/java/JavaBinding.java
Index: JavaBinding.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/java/JavaBinding.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaBinding.java 6 Jun 2002 08:28:53 -0000 1.1
+++ JavaBinding.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -57,8 +57,8 @@
package org.apache.wsif.wsdl.extensions.java;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* @author Gerhard Pfau <[EMAIL PROTECTED]>
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/java/JavaAddress.java
Index: JavaAddress.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/java/JavaAddress.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaAddress.java 6 Jun 2002 08:28:53 -0000 1.1
+++ JavaAddress.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -57,8 +57,8 @@
package org.apache.wsif.wsdl.extensions.java;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* @author Gerhard Pfau <[EMAIL PROTECTED]>
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/java/JavaBindingConstants.java
Index: JavaBindingConstants.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/java/JavaBindingConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaBindingConstants.java 6 Jun 2002 08:28:53 -0000 1.1
+++ JavaBindingConstants.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -57,7 +57,7 @@
package org.apache.wsif.wsdl.extensions.java;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import com.ibm.wsdl.Constants;
1.2 +3 -2
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/java/JavaBindingSerializer.java
Index: JavaBindingSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/java/JavaBindingSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaBindingSerializer.java 6 Jun 2002 08:28:53 -0000 1.1
+++ JavaBindingSerializer.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -59,10 +59,11 @@
import java.io.Serializable;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensionDeserializer;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.extensions.ExtensionSerializer;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.logging.Tr;
import com.ibm.wsdl.Constants;
@@ -223,7 +224,7 @@
public javax.wsdl.extensions.ExtensibilityElement unmarshall(
Class parentType,
- javax.wsdl.QName elementType,
+ javax.xml.namespace.QName elementType,
org.w3c.dom.Element el,
javax.wsdl.Definition def,
javax.wsdl.extensions.ExtensionRegistry extReg)
1.2 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/providers/WSIFDynamicTypeMapping.java
Index: WSIFDynamicTypeMapping.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/WSIFDynamicTypeMapping.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WSIFDynamicTypeMapping.java 6 Jun 2002 08:28:50 -0000 1.1
+++ WSIFDynamicTypeMapping.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -59,7 +59,8 @@
import java.io.Serializable;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.logging.Tr;
/**
1.3 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/providers/WSIFDynamicTypeMap.java
Index: WSIFDynamicTypeMap.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/WSIFDynamicTypeMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WSIFDynamicTypeMap.java 11 Jun 2002 15:14:51 -0000 1.2
+++ WSIFDynamicTypeMap.java 24 Jun 2002 13:11:17 -0000 1.3
@@ -62,7 +62,8 @@
import java.util.Iterator;
import java.util.Vector;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.logging.Tr;
import org.apache.wsif.util.WSIFUtils;
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/compiler/util/TypeMapping.java
Index: TypeMapping.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/util/TypeMapping.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeMapping.java 6 Jun 2002 08:28:50 -0000 1.1
+++ TypeMapping.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -59,7 +59,7 @@
import java.io.Serializable;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* This class keeps all the info about a type mapping: the encoding style,
1.2 +2 -1 xml-axis-wsif/java/src/org/apache/wsif/compiler/util/Utils.java
Index: Utils.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/util/Utils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Utils.java 6 Jun 2002 08:28:50 -0000 1.1
+++ Utils.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -69,9 +69,10 @@
import javax.wsdl.Definition;
import javax.wsdl.Import;
-import javax.wsdl.QName;
import javax.wsdl.Types;
import javax.wsdl.extensions.UnknownExtensibilityElement;
+import javax.xml.namespace.QName;
+
import org.apache.soap.Constants;
import org.apache.wsif.WSIFException;
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/SchemaSimpleType.java
Index: SchemaSimpleType.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/SchemaSimpleType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaSimpleType.java 6 Jun 2002 08:28:49 -0000 1.1
+++ SchemaSimpleType.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -57,7 +57,7 @@
package org.apache.wsif.compiler.schema.tools;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* Insert the type's description here.
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/SchemaAttributeGroup.java
Index: SchemaAttributeGroup.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/SchemaAttributeGroup.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaAttributeGroup.java 6 Jun 2002 08:28:49 -0000 1.1
+++ SchemaAttributeGroup.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -59,7 +59,7 @@
import java.util.Vector;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* Processed information of a XML Schema attribute group
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/SchemaComplexType.java
Index: SchemaComplexType.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/SchemaComplexType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaComplexType.java 6 Jun 2002 08:28:49 -0000 1.1
+++ SchemaComplexType.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -59,7 +59,7 @@
import java.util.Vector;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* Processed information of a XML Schema complexType
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/SchemaAttribute.java
Index: SchemaAttribute.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/SchemaAttribute.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaAttribute.java 6 Jun 2002 08:28:49 -0000 1.1
+++ SchemaAttribute.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -57,7 +57,7 @@
package org.apache.wsif.compiler.schema.tools;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* Insert the type's description here.
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/SchemaElement.java
Index: SchemaElement.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/SchemaElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaElement.java 6 Jun 2002 08:28:49 -0000 1.1
+++ SchemaElement.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -57,7 +57,7 @@
package org.apache.wsif.compiler.schema.tools;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* Insert the type's description here.
1.3 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/Schema2JROM.java
Index: Schema2JROM.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/Schema2JROM.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Schema2JROM.java 14 Jun 2002 12:17:36 -0000 1.2
+++ Schema2JROM.java 24 Jun 2002 13:11:17 -0000 1.3
@@ -63,7 +63,8 @@
import java.util.Map;
import java.util.Vector;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import org.apache.soap.Constants;
import org.apache.soap.util.xml.DOMUtils;
import org.apache.wsif.compiler.schema.SchemaException;
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/SchemaGroup.java
Index: SchemaGroup.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/SchemaGroup.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaGroup.java 6 Jun 2002 08:28:49 -0000 1.1
+++ SchemaGroup.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -59,7 +59,7 @@
import java.util.Vector;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* Processed information of a XML Schema group
1.3 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/Schema2Java.java
Index: Schema2Java.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/Schema2Java.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Schema2Java.java 14 Jun 2002 12:17:36 -0000 1.2
+++ Schema2Java.java 24 Jun 2002 13:11:17 -0000 1.3
@@ -68,7 +68,7 @@
import java.util.Map;
import java.util.Vector;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import org.apache.soap.Constants;
import org.apache.soap.util.xml.DOMUtils;
1.2 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSInputSerializer.java
Index: JMSInputSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSInputSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSInputSerializer.java 6 Jun 2002 08:28:54 -0000 1.1
+++ JMSInputSerializer.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -60,12 +60,13 @@
import java.io.Serializable;
import javax.wsdl.Definition;
-import javax.wsdl.QName;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.ExtensionDeserializer;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.extensions.ExtensionSerializer;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.logging.Tr;
import org.w3c.dom.Element;
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSBinding.java
Index: JMSBinding.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSBinding.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSBinding.java 6 Jun 2002 08:28:54 -0000 1.1
+++ JMSBinding.java 24 Jun 2002 13:11:17 -0000 1.2
@@ -59,8 +59,8 @@
import java.io.Serializable;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* WSDL Jms binding extension
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSInput.java
Index: JMSInput.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSInput.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSInput.java 6 Jun 2002 08:28:54 -0000 1.1
+++ JMSInput.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -60,8 +60,8 @@
import java.io.Serializable;
import java.util.List;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* WSDL Jms service-port extension
1.2 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSOutputSerializer.java
Index: JMSOutputSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSOutputSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSOutputSerializer.java 6 Jun 2002 08:28:54 -0000 1.1
+++ JMSOutputSerializer.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -60,12 +60,13 @@
import java.io.Serializable;
import javax.wsdl.Definition;
-import javax.wsdl.QName;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.ExtensionDeserializer;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.extensions.ExtensionSerializer;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.logging.Tr;
import org.w3c.dom.Element;
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSProperty.java
Index: JMSProperty.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSProperty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSProperty.java 6 Jun 2002 08:28:54 -0000 1.1
+++ JMSProperty.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -59,8 +59,8 @@
import java.io.Serializable;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* WSDL Jms service-port extension
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSAddress.java
Index: JMSAddress.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSAddress.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSAddress.java 6 Jun 2002 08:28:54 -0000 1.1
+++ JMSAddress.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -59,8 +59,8 @@
import java.io.Serializable;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* WSDL Jms service-port extension
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSConstants.java
Index: JMSConstants.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSConstants.java 6 Jun 2002 08:28:54 -0000 1.1
+++ JMSConstants.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -57,7 +57,7 @@
package org.apache.wsif.wsdl.extensions.jms;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import com.ibm.wsdl.Constants;
1.3 +12 -5
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSAddressSerializer.java
Index: JMSAddressSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSAddressSerializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMSAddressSerializer.java 14 Jun 2002 13:44:42 -0000 1.2
+++ JMSAddressSerializer.java 24 Jun 2002 13:11:18 -0000 1.3
@@ -60,17 +60,19 @@
import java.io.Serializable;
import javax.wsdl.Definition;
-import javax.wsdl.QName;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.ExtensionDeserializer;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.extensions.ExtensionSerializer;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.logging.Tr;
import org.w3c.dom.Element;
import com.ibm.wsdl.Constants;
import com.ibm.wsdl.util.xml.DOMUtils;
+import com.ibm.wsdl.util.xml.QNameUtils;
/**
* WSDL Jms extension
@@ -262,13 +264,16 @@
jmsAddress.setJndiProvURL(jndiProvURL);
}
- String destStyle = DOMUtils.getAttribute(el,
JMSConstants.ELEM_JMS_DEST_STYLE);
+ String destStyle =
+ DOMUtils.getAttribute(el, JMSConstants.ELEM_JMS_DEST_STYLE);
if (destStyle != null) {
jmsAddress.setDestStyle(destStyle);
}
String jndiConnFactName =
- DOMUtils.getAttribute(el, JMSConstants.ELEM_JMS_JNDI_CONN_FACT_NAME);
+ DOMUtils.getAttribute(
+ el,
+ JMSConstants.ELEM_JMS_JNDI_CONN_FACT_NAME);
if (jndiConnFactName != null) {
jmsAddress.setJndiConnFactName(jndiConnFactName);
}
@@ -289,9 +294,11 @@
Element tempEl = DOMUtils.getFirstChildElement(el);
while (tempEl != null) {
- if (JMSConstants.Q_ELEM_JMS_PROPERTY_VALUE.matches(tempEl)) {
+ if (QNameUtils
+ .matches(JMSConstants.Q_ELEM_JMS_PROPERTY_VALUE, tempEl)) {
jmsAddress.addJMSPropertyValue(
- (JMSPropertyValue) getJMSPropertyValueSerializer().unmarshall(
+ (JMSPropertyValue) getJMSPropertyValueSerializer()
+ .unmarshall(
JMSAddress.class,
JMSConstants.Q_ELEM_JMS_PROPERTY_VALUE,
tempEl,
1.3 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSPropertyValueSerializer.java
Index: JMSPropertyValueSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSPropertyValueSerializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMSPropertyValueSerializer.java 10 Jun 2002 17:03:53 -0000 1.2
+++ JMSPropertyValueSerializer.java 24 Jun 2002 13:11:18 -0000 1.3
@@ -60,12 +60,13 @@
import java.io.Serializable;
import javax.wsdl.Definition;
-import javax.wsdl.QName;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.ExtensionDeserializer;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.extensions.ExtensionSerializer;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.logging.Tr;
import org.w3c.dom.Element;
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSOperation.java
Index: JMSOperation.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSOperation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSOperation.java 6 Jun 2002 08:28:54 -0000 1.1
+++ JMSOperation.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -59,8 +59,8 @@
import java.io.Serializable;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* WSDL Jms extension
1.2 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSPropertySerializer.java
Index: JMSPropertySerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSPropertySerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSPropertySerializer.java 6 Jun 2002 08:28:54 -0000 1.1
+++ JMSPropertySerializer.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -60,12 +60,13 @@
import java.io.Serializable;
import javax.wsdl.Definition;
-import javax.wsdl.QName;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.ExtensionDeserializer;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.extensions.ExtensionSerializer;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.logging.Tr;
import org.w3c.dom.Element;
1.2 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSOperationSerializer.java
Index: JMSOperationSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSOperationSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSOperationSerializer.java 6 Jun 2002 08:28:54 -0000 1.1
+++ JMSOperationSerializer.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -60,12 +60,13 @@
import java.io.Serializable;
import javax.wsdl.Definition;
-import javax.wsdl.QName;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.ExtensionDeserializer;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.extensions.ExtensionSerializer;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.logging.Tr;
import org.w3c.dom.Element;
1.2 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSBindingSerializer.java
Index: JMSBindingSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSBindingSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSBindingSerializer.java 6 Jun 2002 08:28:54 -0000 1.1
+++ JMSBindingSerializer.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -60,12 +60,13 @@
import java.io.Serializable;
import javax.wsdl.Definition;
-import javax.wsdl.QName;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.ExtensionDeserializer;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.extensions.ExtensionSerializer;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.logging.Tr;
import org.w3c.dom.Element;
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSOutput.java
Index: JMSOutput.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSOutput.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSOutput.java 6 Jun 2002 08:28:54 -0000 1.1
+++ JMSOutput.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -60,8 +60,8 @@
import java.io.Serializable;
import java.util.List;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* WSDL Jms service-port extension
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSPropertyValue.java
Index: JMSPropertyValue.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/jms/JMSPropertyValue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSPropertyValue.java 6 Jun 2002 08:28:54 -0000 1.1
+++ JMSPropertyValue.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -59,8 +59,8 @@
import java.io.Serializable;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* WSDL Jms Binding extension.
1.3 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/soaprmi/WSIFOperation_SoapRMI.java
Index: WSIFOperation_SoapRMI.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/soaprmi/WSIFOperation_SoapRMI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WSIFOperation_SoapRMI.java 12 Jun 2002 10:27:24 -0000 1.2
+++ WSIFOperation_SoapRMI.java 24 Jun 2002 13:11:18 -0000 1.3
@@ -74,7 +74,8 @@
import javax.wsdl.Operation;
import javax.wsdl.Output;
import javax.wsdl.Part;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.WSIFException;
import org.apache.wsif.WSIFMessage;
import org.apache.wsif.WSIFOperation;
1.4 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/providers/java/WSIFOperation_Java.java
Index: WSIFOperation_Java.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/java/WSIFOperation_Java.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSIFOperation_Java.java 21 Jun 2002 08:18:14 -0000 1.3
+++ WSIFOperation_Java.java 24 Jun 2002 13:11:18 -0000 1.4
@@ -77,7 +77,8 @@
import javax.wsdl.OperationType;
import javax.wsdl.Part;
import javax.wsdl.Port;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.WSIFConstants;
import org.apache.wsif.WSIFException;
import org.apache.wsif.WSIFMessage;
1.2 +2 -2
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/SOAPEncSerializerWrapper.java
Index: SOAPEncSerializerWrapper.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/SOAPEncSerializerWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SOAPEncSerializerWrapper.java 6 Jun 2002 08:28:51 -0000 1.1
+++ SOAPEncSerializerWrapper.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -100,14 +100,14 @@
/**
* @see PartSerializer#getPartQName()
*/
- public javax.wsdl.QName getPartQName() {
+ public javax.xml.namespace.QName getPartQName() {
return null;
}
/**
* @see PartSerializer#setPartQName(QName)
*/
- public void setPartQName(javax.wsdl.QName qName) {
+ public void setPartQName(javax.xml.namespace.QName qName) {
}
/**
1.2 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/PartSerializer.java
Index: PartSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/PartSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PartSerializer.java 6 Jun 2002 08:28:51 -0000 1.1
+++ PartSerializer.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -57,7 +57,8 @@
package org.apache.wsif.providers.soap.apachesoap;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import org.apache.soap.util.xml.Deserializer;
import org.apache.soap.util.xml.Serializer;
1.2 +5 -5
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/JROMSerializer.java
Index: JROMSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/JROMSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JROMSerializer.java 6 Jun 2002 08:28:51 -0000 1.1
+++ JROMSerializer.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -181,7 +181,7 @@
//special case coz jrom uses javax.wsdl.QName and
//soap uses org.apache.soap.QName
if (jromEl.getJROMType() == JROMType.JROM_QNAME_VALUE)
- jromVal = toSoapQName((javax.wsdl.QName) jromVal);
+ jromVal = toSoapQName((javax.xml.namespace.QName) jromVal);
Parameter p = new Parameter(elName, jromVal.getClass(), jromVal, null);
xjmr.marshall(inScopeEncStyle, Parameter.class, p, null, sink, nsStack,
ctx);
@@ -336,7 +336,7 @@
//special case for QName
if (paramClass.equals(org.apache.soap.util.xml.QName.class)) {
jromValueType = JROMType.JROM_QNAME_VALUE;
- javax.wsdl.QName qname = toWsdlQName((QName) param.getValue());
+ javax.xml.namespace.QName qname = toWsdlQName((QName)
param.getValue());
jromVal = factory.newJROMQNameValue();
jromVal.setNameNamespace(elementNameNamespace);
jromVal.setNameLocalPart(elementNameLocalPart);
@@ -461,11 +461,11 @@
sink.write('>');
}
- private QName toSoapQName(javax.wsdl.QName name) {
+ private QName toSoapQName(javax.xml.namespace.QName name) {
return new QName(name.getNamespaceURI(), name.getLocalPart());
}
- private javax.wsdl.QName toWsdlQName(QName name) {
- return new javax.wsdl.QName(name.getNamespaceURI(), name.getLocalPart());
+ private javax.xml.namespace.QName toWsdlQName(QName name) {
+ return new javax.xml.namespace.QName(name.getNamespaceURI(),
name.getLocalPart());
}
}
1.10 +3 -3
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/WSIFOperation_ApacheSOAP.java
Index: WSIFOperation_ApacheSOAP.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/WSIFOperation_ApacheSOAP.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WSIFOperation_ApacheSOAP.java 21 Jun 2002 08:18:14 -0000 1.9
+++ WSIFOperation_ApacheSOAP.java 24 Jun 2002 13:11:18 -0000 1.10
@@ -70,7 +70,7 @@
import javax.wsdl.Operation;
import javax.wsdl.Output;
import javax.wsdl.Part;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import org.apache.soap.Body;
import org.apache.soap.Constants;
@@ -633,7 +633,7 @@
}
partSerializer.setPart(part);
Part modelPart =
operation.getInput().getMessage().getPart(partName);
- javax.wsdl.QName partType = modelPart.getTypeName();
+ javax.xml.namespace.QName partType = modelPart.getTypeName();
if (partType == null)
partType = modelPart.getElementName();
partSerializer.setPartQName(partType);
@@ -695,7 +695,7 @@
Element element = (Element) v.get(index++);
String partName = (String) iterator.next();
Part modelPart = operation.getInput().getMessage().getPart(partName);
- javax.wsdl.QName partType = modelPart.getTypeName();
+ javax.xml.namespace.QName partType = modelPart.getTypeName();
if (partType == null)
partType = modelPart.getElementName();
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/format/TypeMap.java
Index: TypeMap.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/format/TypeMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeMap.java 6 Jun 2002 08:28:53 -0000 1.1
+++ TypeMap.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -57,8 +57,8 @@
package org.apache.wsif.wsdl.extensions.format;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* @author Ant Elder <[EMAIL PROTECTED]>
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/format/TypeMapping.java
Index: TypeMapping.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/format/TypeMapping.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeMapping.java 6 Jun 2002 08:28:53 -0000 1.1
+++ TypeMapping.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -57,8 +57,8 @@
package org.apache.wsif.wsdl.extensions.format;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* @author Ant Elder <[EMAIL PROTECTED]>
1.3 +42 -18
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/format/FormatBindingSerializer.java
Index: FormatBindingSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/format/FormatBindingSerializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FormatBindingSerializer.java 11 Jun 2002 15:09:23 -0000 1.2
+++ FormatBindingSerializer.java 24 Jun 2002 13:11:18 -0000 1.3
@@ -61,15 +61,17 @@
import java.util.Iterator;
import java.util.List;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.logging.Tr;
import org.w3c.dom.Element;
import com.ibm.wsdl.Constants;
import com.ibm.wsdl.util.xml.DOMUtils;
+import com.ibm.wsdl.util.xml.QNameUtils;
/**
* @author Owen Burroughs <[EMAIL PROTECTED]>
@@ -78,10 +80,10 @@
* @author Mark Whitlock <[EMAIL PROTECTED]>
*/
public class FormatBindingSerializer
- implements
- javax.wsdl.extensions.ExtensionDeserializer,
- javax.wsdl.extensions.ExtensionSerializer,
- Serializable {
+ implements
+ javax.wsdl.extensions.ExtensionDeserializer,
+ javax.wsdl.extensions.ExtensionSerializer,
+ Serializable {
/**
* ConnectorBindingSerializer constructor comment.
*/
@@ -90,7 +92,7 @@
Tr.entry(this);
Tr.exit();
}
-
+
/**
*
*/
@@ -130,7 +132,8 @@
// Need definition to resolve namespace to prefix to do it properly
QName elementName = typeMap.getElementName();
if (elementName != null) {
- String prefix = def.getPrefix(elementName.getNamespaceURI());
+ String prefix =
+ def.getPrefix(elementName.getNamespaceURI());
DOMUtils.printAttribute(
"elementName",
prefix + ":" + elementName.getLocalPart(),
@@ -139,7 +142,10 @@
QName typeName = typeMap.getTypeName();
if (typeName != null) {
String prefix = def.getPrefix(typeName.getNamespaceURI());
- DOMUtils.printAttribute("typeName", prefix + ":" +
typeName.getLocalPart(), pw);
+ DOMUtils.printAttribute(
+ "typeName",
+ prefix + ":" + typeName.getLocalPart(),
+ pw);
}
String formatType = typeMap.getFormatType();
if (formatType != null)
@@ -161,7 +167,7 @@
}
Tr.exit();
}
-
+
/**
* Registers the serializer.
*/
@@ -180,13 +186,13 @@
this);
Tr.exit();
}
-
+
/**
* unmarshall method comment.
*/
public javax.wsdl.extensions.ExtensibilityElement unmarshall(
Class parentPart,
- javax.wsdl.QName elementPart,
+ javax.xml.namespace.QName elementPart,
org.w3c.dom.Element el,
javax.wsdl.Definition def,
javax.wsdl.extensions.ExtensionRegistry extReg)
@@ -201,7 +207,10 @@
String style = DOMUtils.getAttribute(el, "style");
String encoding = DOMUtils.getAttribute(el, "encoding");
String requiredStr =
- DOMUtils.getAttributeNS(el, Constants.NS_URI_WSDL,
Constants.ATTR_REQUIRED);
+ DOMUtils.getAttributeNS(
+ el,
+ Constants.NS_URI_WSDL,
+ Constants.ATTR_REQUIRED);
if (style != null) {
typeMapping.setStyle(style);
@@ -212,15 +221,21 @@
Element tempEl = DOMUtils.getFirstChildElement(el);
while (tempEl != null) {
- if
(FormatBindingConstants.Q_ELEM_FORMAT_BINDING_MAP.matches(tempEl)) {
+ if (QNameUtils
+ .matches(
+ FormatBindingConstants.Q_ELEM_FORMAT_BINDING_MAP,
+ tempEl)) {
TypeMap typeMap = new TypeMap();
QName qElementName;
QName qTypeName;
WSDLFactory factory =
-
WSDLFactory.newInstance("org.apache.wsif.wsdl.WSIFWSDLFactoryImpl");
+ WSDLFactory.newInstance(
+ "org.apache.wsif.wsdl.WSIFWSDLFactoryImpl");
WSDLReader wsdlReader = factory.newWSDLReader();
- if
(wsdlReader.getFeature(Constants.FEATURE_TOLERATE_UNQUALIFIED_QNAMES)) {
+ if (wsdlReader
+ .getFeature(
+ Constants.FEATURE_TOLERATE_UNQUALIFIED_QNAMES)) {
qElementName =
DOMUtils.getQualifiedAttributeValue(
tempEl,
@@ -237,12 +252,21 @@
false);
} else {
qElementName =
- DOMUtils.getQualifiedAttributeValue(tempEl,
"elementName", "typeMap", false);
+ DOMUtils.getQualifiedAttributeValue(
+ tempEl,
+ "elementName",
+ "typeMap",
+ false);
qTypeName =
- DOMUtils.getQualifiedAttributeValue(tempEl, "typeName",
"typeMap", false);
+ DOMUtils.getQualifiedAttributeValue(
+ tempEl,
+ "typeName",
+ "typeMap",
+ false);
}
- String formatType = DOMUtils.getAttribute(tempEl, "formatType");
+ String formatType =
+ DOMUtils.getAttribute(tempEl, "formatType");
if (qElementName != null) {
typeMap.setElementName(qElementName);
}
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/format/FormatBindingConstants.java
Index: FormatBindingConstants.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/format/FormatBindingConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FormatBindingConstants.java 6 Jun 2002 08:28:53 -0000 1.1
+++ FormatBindingConstants.java 24 Jun 2002 13:11:18 -0000 1.2
@@ -57,7 +57,7 @@
package org.apache.wsif.wsdl.extensions.format;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* @author Ant Elder <[EMAIL PROTECTED]>
1.4 +2 -1 xml-axis-wsif/java/samples/clients/DynamicInvoker.java
Index: DynamicInvoker.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/samples/clients/DynamicInvoker.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DynamicInvoker.java 12 Jun 2002 10:27:25 -0000 1.3
+++ DynamicInvoker.java 24 Jun 2002 13:11:19 -0000 1.4
@@ -68,8 +68,9 @@
import javax.wsdl.Output;
import javax.wsdl.Part;
import javax.wsdl.PortType;
-import javax.wsdl.QName;
import javax.wsdl.Service;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.WSIFMessage;
import org.apache.wsif.WSIFOperation;
import org.apache.wsif.WSIFPort;
1.2 +3 -3
xml-axis-wsif/java/samples/clients/zipcode/LiteralSerializer.java
Index: LiteralSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/samples/clients/zipcode/LiteralSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LiteralSerializer.java 6 Jun 2002 08:28:46 -0000 1.1
+++ LiteralSerializer.java 24 Jun 2002 13:11:19 -0000 1.2
@@ -77,7 +77,7 @@
public class LiteralSerializer implements PartSerializer {
private Object customBean;
- private javax.wsdl.QName customBeanQName;
+ private javax.xml.namespace.QName customBeanQName;
/*
* @see PartSerializer#setCustomBean(Object)
@@ -148,7 +148,7 @@
* Gets the customBeanQName.
* @return Returns a QName
*/
- public javax.wsdl.QName getPartQName() {
+ public javax.xml.namespace.QName getPartQName() {
return customBeanQName;
}
@@ -156,7 +156,7 @@
* Sets the customBeanQName.
* @param customBeanQName The customBeanQName to set
*/
- public void setPartQName(javax.wsdl.QName customBeanQName) {
+ public void setPartQName(javax.xml.namespace.QName customBeanQName) {
this.customBeanQName = customBeanQName;
}
1.2 +4 -3
xml-axis-wsif/java/samples/clients/zipcode/ShortZipCodeFormatHandler.java
Index: ShortZipCodeFormatHandler.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/samples/clients/zipcode/ShortZipCodeFormatHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ShortZipCodeFormatHandler.java 6 Jun 2002 08:28:46 -0000 1.1
+++ ShortZipCodeFormatHandler.java 24 Jun 2002 13:11:19 -0000 1.2
@@ -57,7 +57,8 @@
package clients.zipcode;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import org.w3c.dom.Element;
/**
@@ -71,7 +72,7 @@
private ShortZipCode_ElementContentType nativeFormat = new
ShortZipCode_ElementContentType();
private QName dataBeanQName;
- public void setCustomBeanQName(javax.wsdl.QName qName){
+ public void setCustomBeanQName(javax.xml.namespace.QName qName){
this.dataBeanQName = qName;
if(nativeFormat != null){
nativeFormat.changeLocalName(dataBeanQName.getLocalPart());
@@ -79,7 +80,7 @@
}
}
- public javax.wsdl.QName getCustomBeanQName(){
+ public javax.xml.namespace.QName getCustomBeanQName(){
return this.dataBeanQName;
}
1.2 +2 -2
xml-axis-wsif/java/samples/clients/zipcode/PartFormatHandler.java
Index: PartFormatHandler.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/samples/clients/zipcode/PartFormatHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PartFormatHandler.java 6 Jun 2002 08:28:46 -0000 1.1
+++ PartFormatHandler.java 24 Jun 2002 13:11:19 -0000 1.2
@@ -69,7 +69,7 @@
public Object getCustomBean();
public void setElement(org.w3c.dom.Element element);
public org.w3c.dom.Element getElement();
- public void setCustomBeanQName(javax.wsdl.QName qName);
- public javax.wsdl.QName getCustomBeanQName();
+ public void setCustomBeanQName(javax.xml.namespace.QName qName);
+ public javax.xml.namespace.QName getCustomBeanQName();
}
1.2 +4 -3
xml-axis-wsif/java/samples/clients/zipcode/ShortZipCodeResponseFormatHandler.java
Index: ShortZipCodeResponseFormatHandler.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/samples/clients/zipcode/ShortZipCodeResponseFormatHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ShortZipCodeResponseFormatHandler.java 6 Jun 2002 08:28:46 -0000 1.1
+++ ShortZipCodeResponseFormatHandler.java 24 Jun 2002 13:11:19 -0000 1.2
@@ -57,7 +57,8 @@
package clients.zipcode;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import org.w3c.dom.Element;
/**
@@ -70,7 +71,7 @@
private ShortZipCodeResponse_ElementContentType nativeFormat = new
ShortZipCodeResponse_ElementContentType();
private QName dataBeanQName;
- public void setCustomBeanQName(javax.wsdl.QName qName){
+ public void setCustomBeanQName(javax.xml.namespace.QName qName){
this.dataBeanQName = qName;
if(nativeFormat != null){
nativeFormat.changeLocalName(dataBeanQName.getLocalPart());
@@ -78,7 +79,7 @@
}
}
- public javax.wsdl.QName getCustomBeanQName(){
+ public javax.xml.namespace.QName getCustomBeanQName(){
return this.dataBeanQName;
}
1.3 +2 -1 xml-axis-wsif/java/samples/clients/zipcode/ZIPCodeProxy.java
Index: ZIPCodeProxy.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/samples/clients/zipcode/ZIPCodeProxy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ZIPCodeProxy.java 12 Jun 2002 10:27:24 -0000 1.2
+++ ZIPCodeProxy.java 24 Jun 2002 13:11:19 -0000 1.3
@@ -114,7 +114,8 @@
package clients.zipcode;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.WSIFMessage;
import org.apache.wsif.WSIFOperation;
import org.apache.wsif.WSIFPort;
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/ejb/EJBBindingConstants.java
Index: EJBBindingConstants.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/ejb/EJBBindingConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBBindingConstants.java 6 Jun 2002 08:28:53 -0000 1.1
+++ EJBBindingConstants.java 24 Jun 2002 13:11:19 -0000 1.2
@@ -57,7 +57,7 @@
package org.apache.wsif.wsdl.extensions.ejb;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import com.ibm.wsdl.Constants;
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/ejb/EJBOperation.java
Index: EJBOperation.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/ejb/EJBOperation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBOperation.java 6 Jun 2002 08:28:53 -0000 1.1
+++ EJBOperation.java 24 Jun 2002 13:11:19 -0000 1.2
@@ -59,8 +59,8 @@
import java.util.List;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
import com.ibm.wsdl.util.StringUtils;
1.2 +3 -2
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/ejb/EJBBindingSerializer.java
Index: EJBBindingSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/ejb/EJBBindingSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBBindingSerializer.java 6 Jun 2002 08:28:53 -0000 1.1
+++ EJBBindingSerializer.java 24 Jun 2002 13:11:19 -0000 1.2
@@ -59,10 +59,11 @@
import java.io.Serializable;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensionDeserializer;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.extensions.ExtensionSerializer;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.logging.Tr;
import com.ibm.wsdl.Constants;
@@ -235,7 +236,7 @@
public javax.wsdl.extensions.ExtensibilityElement unmarshall(
Class parentType,
- javax.wsdl.QName elementType,
+ javax.xml.namespace.QName elementType,
org.w3c.dom.Element el,
javax.wsdl.Definition def,
javax.wsdl.extensions.ExtensionRegistry extReg)
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/ejb/EJBBinding.java
Index: EJBBinding.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/ejb/EJBBinding.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBBinding.java 6 Jun 2002 08:28:53 -0000 1.1
+++ EJBBinding.java 24 Jun 2002 13:11:19 -0000 1.2
@@ -59,8 +59,8 @@
import java.io.Serializable;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* @author Gerhard Pfau <[EMAIL PROTECTED]>
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/ejb/EJBAddress.java
Index: EJBAddress.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/ejb/EJBAddress.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBAddress.java 6 Jun 2002 08:28:53 -0000 1.1
+++ EJBAddress.java 24 Jun 2002 13:11:19 -0000 1.2
@@ -59,8 +59,8 @@
import java.io.Serializable;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* @author Gerhard Pfau <[EMAIL PROTECTED]>
1.8 +4 -4 xml-axis-wsif/java/test/jrom/JROMTests.java
Index: JROMTests.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/jrom/JROMTests.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JROMTests.java 21 Jun 2002 17:05:24 -0000 1.7
+++ JROMTests.java 24 Jun 2002 13:11:19 -0000 1.8
@@ -142,11 +142,11 @@
"AddressBook");
service.mapType(
- new javax.wsdl.QName("http://wsiftypes.addressbook/";, "address"),
+ new javax.xml.namespace.QName("http://wsiftypes.addressbook/";,
"address"),
Class.forName("addressbook.wsiftypes.Address"));
service.mapType(
- new javax.wsdl.QName("http://wsiftypes.addressbook/";, "phone"),
+ new javax.xml.namespace.QName("http://wsiftypes.addressbook/";,
"phone"),
Class.forName("addressbook.wsiftypes.Phone"));
WSIFPort port = service.getPort(portName);
@@ -293,11 +293,11 @@
"AddressBook");
service.mapType(
- new javax.wsdl.QName("http://wsiftypes.addressbook/";, "address"),
+ new javax.xml.namespace.QName("http://wsiftypes.addressbook/";,
"address"),
Class.forName("addressbook.wsiftypes.Address"));
service.mapType(
- new javax.wsdl.QName("http://wsiftypes.addressbook/";, "phone"),
+ new javax.xml.namespace.QName("http://wsiftypes.addressbook/";,
"phone"),
Class.forName("addressbook.wsiftypes.Phone"));
WSIFPort port = service.getPort(portName);
1.6 +6 -6
xml-axis-wsif/java/src/org/apache/wsif/providers/jms/JMSMessage.java
Index: JMSMessage.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/jms/JMSMessage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JMSMessage.java 24 Jun 2002 11:11:23 -0000 1.5
+++ JMSMessage.java 24 Jun 2002 13:11:19 -0000 1.6
@@ -77,8 +77,8 @@
import javax.wsdl.Definition;
import javax.wsdl.Message;
import javax.wsdl.Part;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.wsif.WSIFException;
@@ -246,8 +246,8 @@
new org.xml.sax.helpers.AttributesImpl());
javax.wsdl.Part partModel = fieldMessageModel.getPart(partName);
- javax.wsdl.QName partQName =
- new javax.wsdl.QName(
+ javax.xml.namespace.QName partQName =
+ new javax.xml.namespace.QName(
fieldMessageModel.getQName().getNamespaceURI(),
partModel.getName());
@@ -320,8 +320,8 @@
javax.wsdl.Part partModel = fieldMessageModel.getPart(partName);
- javax.wsdl.QName partQName =
- new javax.wsdl.QName(
+ javax.xml.namespace.QName partQName =
+ new javax.xml.namespace.QName(
fieldMessageModel.getQName().getNamespaceURI(),
partModel.getName());
@@ -624,7 +624,7 @@
javax.wsdl.Part partModel = fieldMessageModel.getPart(partName);
org.apache.wsif.format.jms.JMSFormatHandler fh = null;
- javax.wsdl.QName partType = partModel.getTypeName();
+ javax.xml.namespace.QName partType = partModel.getTypeName();
if(partType == null)
partType = partModel.getElementName();
1.7 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/providers/jms/WSIFOperation_Jms.java
Index: WSIFOperation_Jms.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/jms/WSIFOperation_Jms.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WSIFOperation_Jms.java 20 Jun 2002 11:08:51 -0000 1.6
+++ WSIFOperation_Jms.java 24 Jun 2002 13:11:19 -0000 1.7
@@ -65,9 +65,10 @@
import javax.wsdl.BindingOperation;
import javax.wsdl.Operation;
import javax.wsdl.Port;
-import javax.wsdl.QName;
import javax.wsdl.Service;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.WSIFConstants;
import org.apache.wsif.WSIFCorrelationId;
import org.apache.wsif.WSIFException;
1.3 +8 -7
xml-axis-wsif/java/src/org/apache/wsif/providers/jms/JMSFormatter.java
Index: JMSFormatter.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/jms/JMSFormatter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMSFormatter.java 18 Jun 2002 12:16:05 -0000 1.2
+++ JMSFormatter.java 24 Jun 2002 13:11:19 -0000 1.3
@@ -71,9 +71,10 @@
import javax.wsdl.Operation;
import javax.wsdl.Port;
import javax.wsdl.PortType;
-import javax.wsdl.QName;
import javax.wsdl.Service;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.WSIFException;
import org.apache.wsif.WSIFMessage;
import org.apache.wsif.WSIFRequest;
@@ -202,7 +203,7 @@
protected WSIFRequest createRequest(javax.jms.Message msg)
throws WSIFException {
Tr.entry(this, msg);
- javax.wsdl.QName serviceName = null;
+ javax.xml.namespace.QName serviceName = null;
String operationName = null;
String portName = null;
@@ -222,7 +223,7 @@
portType_ns = getPortTypeNS();
portType_local = getPortTypeLocal();
- javax.wsdl.QName portTypeName = new
javax.wsdl.QName(portType_ns, portType_local);
+ javax.xml.namespace.QName portTypeName = new
javax.xml.namespace.QName(portType_ns, portType_local);
//Locate Binding
javax.wsdl.Binding binding = null;
@@ -333,7 +334,7 @@
protected WSIFResponse createResponse(javax.jms.Message msg)
throws WSIFException {
Tr.entry(this, msg);
- javax.wsdl.QName serviceName = null;
+ javax.xml.namespace.QName serviceName = null;
String operationName = null;
String portName = null;
@@ -350,7 +351,7 @@
String portType_ns = getPortTypeNS();
String portType_local = getPortTypeLocal();
- javax.wsdl.QName portTypeName = new
javax.wsdl.QName(portType_ns, portType_local);
+ javax.xml.namespace.QName portTypeName = new
javax.xml.namespace.QName(portType_ns, portType_local);
//Locate Binding
javax.wsdl.Binding binding = null;
@@ -518,7 +519,7 @@
}
private javax.wsdl.Binding getBinding(
- javax.wsdl.QName serviceName,
+ javax.xml.namespace.QName serviceName,
String portName) {
javax.wsdl.Binding bindingModel =
fieldDefinition.getService(serviceName).getPort(portName).getBinding();
@@ -572,7 +573,7 @@
return null;
}
- private boolean hasExtensibilityElementType(java.util.List ee,
javax.wsdl.QName type) {
+ private boolean hasExtensibilityElementType(java.util.List ee,
javax.xml.namespace.QName type) {
Object[] list = ee.toArray();
1.2 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/instance/InstanceEstablishmentSerializer.java
Index: InstanceEstablishmentSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/instance/InstanceEstablishmentSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstanceEstablishmentSerializer.java 6 Jun 2002 08:28:53 -0000 1.1
+++ InstanceEstablishmentSerializer.java 24 Jun 2002 13:11:19 -0000 1.2
@@ -61,12 +61,13 @@
import java.io.Serializable;
import javax.wsdl.Definition;
-import javax.wsdl.QName;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.ExtensionDeserializer;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.extensions.ExtensionSerializer;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.logging.Tr;
import org.w3c.dom.Element;
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/instance/InstanceEstablishment.java
Index: InstanceEstablishment.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/instance/InstanceEstablishment.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstanceEstablishment.java 6 Jun 2002 08:28:53 -0000 1.1
+++ InstanceEstablishment.java 24 Jun 2002 13:11:19 -0000 1.2
@@ -57,8 +57,8 @@
package org.apache.wsif.wsdl.extensions.instance;
-import javax.wsdl.QName;
import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
/**
* @author Aleksander Slominski
1.2 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/instance/InstanceConstants.java
Index: InstanceConstants.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/extensions/instance/InstanceConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstanceConstants.java 6 Jun 2002 08:28:53 -0000 1.1
+++ InstanceConstants.java 24 Jun 2002 13:11:19 -0000 1.2
@@ -57,7 +57,7 @@
package org.apache.wsif.wsdl.extensions.instance;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
/**
* @author Aleksander Slominski
1.3 +2 -1 xml-axis-wsif/java/test/soapinterop/InteropTestServiceProxy.java
Index: InteropTestServiceProxy.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/test/soapinterop/InteropTestServiceProxy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InteropTestServiceProxy.java 12 Jun 2002 10:27:24 -0000 1.2
+++ InteropTestServiceProxy.java 24 Jun 2002 13:11:20 -0000 1.3
@@ -60,7 +60,8 @@
import java.math.BigDecimal;
import java.sql.Date;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.WSIFException;
import org.apache.wsif.WSIFMessage;
import org.apache.wsif.WSIFOperation;
1.6 +3 -3 xml-axis-wsif/java/src/org/apache/wsif/util/WSIFUtils.java
Index: WSIFUtils.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/util/WSIFUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WSIFUtils.java 14 Jun 2002 12:27:46 -0000 1.5
+++ WSIFUtils.java 24 Jun 2002 13:11:20 -0000 1.6
@@ -81,13 +81,13 @@
import javax.wsdl.Operation;
import javax.wsdl.Part;
import javax.wsdl.PortType;
-import javax.wsdl.QName;
import javax.wsdl.Service;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
import javax.wsdl.xml.WSDLWriter;
+import javax.xml.namespace.QName;
import org.apache.wsif.WSIFConstants;
import org.apache.wsif.WSIFException;
@@ -814,7 +814,7 @@
java.lang.ClassNotFoundException {
Tr.entry(null, part, definition, binding);
WSIFFormatHandler formatHandler = null;
- javax.wsdl.QName partTypeQName = part.getTypeName();
+ javax.xml.namespace.QName partTypeQName = part.getTypeName();
if (partTypeQName == null)
partTypeQName = part.getElementName();
if (partTypeQName == null)
@@ -1071,7 +1071,7 @@
java.lang.ClassNotFoundException {
Tr.entry(null, part, definition, binding);
- javax.wsdl.QName partTypeQName = part.getTypeName();
+ javax.xml.namespace.QName partTypeQName = part.getTypeName();
if (partTypeQName == null)
partTypeQName = part.getElementName();
if (partTypeQName == null)
1.6 +1 -1
xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultOperation.java
Index: WSIFDefaultOperation.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultOperation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WSIFDefaultOperation.java 21 Jun 2002 17:05:24 -0000 1.5
+++ WSIFDefaultOperation.java 24 Jun 2002 13:11:20 -0000 1.6
@@ -62,7 +62,7 @@
import java.util.List;
import java.util.Map;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
import org.apache.wsif.WSIFCorrelationId;
import org.apache.wsif.WSIFException;
1.4 +8 -6 xml-axis-wsif/java/src/org/apache/wsif/base/WSIFServiceImpl.java
Index: WSIFServiceImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/base/WSIFServiceImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSIFServiceImpl.java 14 Jun 2002 12:17:37 -0000 1.3
+++ WSIFServiceImpl.java 24 Jun 2002 13:11:20 -0000 1.4
@@ -77,7 +77,6 @@
import javax.wsdl.Output;
import javax.wsdl.Port;
import javax.wsdl.PortType;
-import javax.wsdl.QName;
import javax.wsdl.Service;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
@@ -87,6 +86,8 @@
import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.wsdl.extensions.UnknownExtensionDeserializer;
import javax.wsdl.extensions.UnknownExtensionSerializer;
+import javax.xml.namespace.QName;
+
import org.apache.soap.Constants;
import org.apache.wsif.WSIFClientProxy;
import org.apache.wsif.WSIFConstants;
@@ -110,6 +111,7 @@
import com.ibm.wsdl.extensions.PopulatedExtensionRegistry;
import com.ibm.wsdl.util.StringUtils;
+import com.ibm.wsdl.util.xml.QNameUtils;
/**
* An entry point to dynamic WSDL invocations.
@@ -1075,13 +1077,13 @@
(UnknownExtensibilityElement) typesElIterator.next();
Element schemaEl = unknExEl.getElement();
try {
- if (qElemSchema1999.matches(schemaEl)
- || qElemSchema2000.matches(schemaEl)
- || qElemSchema2001.matches(schemaEl)) {
+ if (QNameUtils.matches(qElemSchema1999, schemaEl)
+ || QNameUtils.matches(qElemSchema2000, schemaEl)
+ || QNameUtils.matches(qElemSchema2001, schemaEl)) {
//Hashtable typeReg = new Hashtable();
- if (qElemSchema1999.matches(schemaEl))
+ if (QNameUtils.matches(qElemSchema1999, schemaEl))
s2j1999.createJavaMapping(schemaEl, typeReg);
- else if (qElemSchema2000.matches(schemaEl))
+ else if (QNameUtils.matches(qElemSchema2000, schemaEl))
s2j2000.createJavaMapping(schemaEl, typeReg);
else
s2j2001.createJavaMapping(schemaEl, typeReg);
1.5 +4 -4 xml-axis-wsif/java/test/async/AsyncTests.java
Index: AsyncTests.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/async/AsyncTests.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AsyncTests.java 21 Jun 2002 17:05:24 -0000 1.4
+++ AsyncTests.java 24 Jun 2002 13:11:20 -0000 1.5
@@ -272,11 +272,11 @@
portType); // portTypeName
service.mapType(
- new javax.wsdl.QName("http://wsiftypes.addressbook/";, "address"),
+ new javax.xml.namespace.QName("http://wsiftypes.addressbook/";, "address"),
Class.forName("addressbook.wsiftypes.Address"));
service.mapType(
- new javax.wsdl.QName("http://wsiftypes.addressbook/";, "phone"),
+ new javax.xml.namespace.QName("http://wsiftypes.addressbook/";, "phone"),
Class.forName("addressbook.wsiftypes.Phone"));
WSIFPort port = service.getPort(portName);
@@ -331,11 +331,11 @@
portType); // portTypeName
service.mapType(
- new javax.wsdl.QName("http://wsiftypes.addressbook/";, "address"),
+ new javax.xml.namespace.QName("http://wsiftypes.addressbook/";, "address"),
Class.forName("addressbook.wsiftypes.Address"));
service.mapType(
- new javax.wsdl.QName("http://wsiftypes.addressbook/";, "phone"),
+ new javax.xml.namespace.QName("http://wsiftypes.addressbook/";, "phone"),
Class.forName("addressbook.wsiftypes.Phone"));
WSIFPort port = service.getPort(portName);
1.10 +2 -2
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java
Index: WSIFOperation_ApacheAxis.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WSIFOperation_ApacheAxis.java 21 Jun 2002 08:18:13 -0000 1.9
+++ WSIFOperation_ApacheAxis.java 24 Jun 2002 13:11:20 -0000 1.10
@@ -647,7 +647,7 @@
for (int j = 0; j < i; j++) {
Part part2 = (Part) ((List) (obj)).get(j);
names[j] = part2.getName();
- javax.wsdl.QName qname1 = part2.getTypeName();
+ javax.xml.namespace.QName qname1 = part2.getTypeName();
if (qname1 == null)
throw new WSIFException("part " + names[j] + " must have type
name declared");
@@ -682,7 +682,7 @@
}
}
if (part != null) {
- javax.wsdl.QName qname = part.getTypeName();
+ javax.xml.namespace.QName qname = part.getTypeName();
javax.xml.rpc.encoding.TypeMapping tm =
registry.getTypeMapping("http://schemas.xmlsoap.org/soap/encoding/";);
if (tm instanceof org.apache.axis.encoding.TypeMapping) {
1.4 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/providers/ejb/WSIFOperation_EJB.java
Index: WSIFOperation_EJB.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/ejb/WSIFOperation_EJB.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSIFOperation_EJB.java 21 Jun 2002 08:18:14 -0000 1.3
+++ WSIFOperation_EJB.java 24 Jun 2002 13:11:20 -0000 1.4
@@ -78,7 +78,8 @@
import javax.wsdl.OperationType;
import javax.wsdl.Part;
import javax.wsdl.Port;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import org.apache.wsif.WSIFConstants;
import org.apache.wsif.WSIFException;
import org.apache.wsif.WSIFMessage;
1.8 +2 -2 xml-axis-wsif/java/test/addressbook/AddressBookTest.java
Index: AddressBookTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/addressbook/AddressBookTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AddressBookTest.java 21 Jun 2002 17:05:24 -0000 1.7
+++ AddressBookTest.java 24 Jun 2002 13:11:20 -0000 1.8
@@ -205,13 +205,13 @@
"AddressBook"); // portTypeName
service.mapType(
- new javax.wsdl.QName(
+ new javax.xml.namespace.QName(
"http://wsiftypes.addressbook/";,
"address"),
Class.forName("addressbook.wsiftypes.Address"));
service.mapType(
- new javax.wsdl.QName(
+ new javax.xml.namespace.QName(
"http://wsiftypes.addressbook/";,
"phone"),
Class.forName("addressbook.wsiftypes.Phone"));
1.6 +2 -1 xml-axis-wsif/java/test/jms/JmsTest.java
Index: JmsTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/jms/JmsTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JmsTest.java 21 Jun 2002 11:12:10 -0000 1.5
+++ JmsTest.java 24 Jun 2002 13:11:20 -0000 1.6
@@ -60,7 +60,8 @@
import java.rmi.RemoteException;
import javax.jms.DeliveryMode;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
1.2 +2 -1 xml-axis-wsif/java/test/wsdl/QNameTest.java
Index: QNameTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/wsdl/QNameTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- QNameTest.java 6 Jun 2002 08:29:01 -0000 1.1
+++ QNameTest.java 24 Jun 2002 13:11:20 -0000 1.2
@@ -57,7 +57,8 @@
package wsdl;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import junit.framework.*;
public class QNameTest extends TestCase {
1.6 +2 -1 xml-axis-wsif/java/test/inout/InoutTest.java
Index: InoutTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/inout/InoutTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InoutTest.java 21 Jun 2002 11:12:09 -0000 1.5
+++ InoutTest.java 24 Jun 2002 13:11:20 -0000 1.6
@@ -60,7 +60,8 @@
import java.text.DateFormat;
import java.util.Date;
-import javax.wsdl.QName;
+import javax.xml.namespace.QName;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
1.3 +2 -1
xml-axis-wsif/java/src/org/apache/wsif/compiler/MessageCompiler.java
Index: MessageCompiler.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/MessageCompiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MessageCompiler.java 11 Jun 2002 15:09:23 -0000 1.2
+++ MessageCompiler.java 24 Jun 2002 13:11:20 -0000 1.3
@@ -73,8 +73,9 @@
import javax.wsdl.Definition;
import javax.wsdl.Message;
import javax.wsdl.Part;
-import javax.wsdl.QName;
import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+
import org.apache.soap.Constants;
import org.apache.wsif.WSIFException;
import org.apache.wsif.wsdl.WSIFWSDLFactoryImpl;
