gdaniels 02/04/11 09:23:47
Modified: java/src/org/apache/axis/deployment/wsdd WSDDService.java
java/src/org/apache/axis/description ServiceDesc.java
Log:
Clean up imports, allow style attribute on <service> in WSDD to default the
provider, so you don't need to specify provider="" in most cases.
Revision Changes Path
1.55 +18 -18
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java
Index: WSDDService.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- WSDDService.java 8 Apr 2002 22:37:56 -0000 1.54
+++ WSDDService.java 11 Apr 2002 16:23:46 -0000 1.55
@@ -54,32 +54,24 @@
*/
package org.apache.axis.deployment.wsdd;
-import org.apache.axis.utils.XMLUtils;
-import org.apache.axis.utils.JavaUtils;
-import org.apache.axis.handlers.soap.SOAPService;
-import org.apache.axis.encoding.ser.BaseSerializerFactory;
-import org.apache.axis.encoding.ser.BaseDeserializerFactory;
-import org.apache.axis.encoding.*;
import org.apache.axis.*;
-import org.apache.axis.description.ServiceDesc;
import org.apache.axis.description.OperationDesc;
-import org.apache.axis.deployment.DeploymentRegistry;
-import org.apache.axis.deployment.DeploymentException;
-import org.w3c.dom.Document;
+import org.apache.axis.description.ServiceDesc;
+import org.apache.axis.encoding.*;
+import org.apache.axis.encoding.ser.BaseDeserializerFactory;
+import org.apache.axis.encoding.ser.BaseSerializerFactory;
+import org.apache.axis.handlers.soap.SOAPService;
+import org.apache.axis.utils.JavaUtils;
+import org.apache.axis.utils.XMLUtils;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.xml.sax.helpers.AttributesImpl;
import javax.xml.rpc.namespace.QName;
-import java.util.Vector;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.Iterator;
+import java.io.IOException;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.StringTokenizer;
-import java.io.IOException;
-import java.beans.IntrospectionException;
+import java.util.Vector;
/**
*
@@ -138,6 +130,14 @@
if (modeStr != null && !modeStr.equals("")) {
style = MessageContext.getStyleFromString(modeStr);
desc.setStyle(style);
+ switch (style) {
+ case ServiceDesc.STYLE_MESSAGE:
+ providerQName = WSDDConstants.JAVAMSG_PROVIDER;
+ break;
+ default:
+ providerQName = WSDDConstants.JAVARPC_PROVIDER;
+ break;
+ }
}
Element [] operationElements = getChildElements(e, "operation");
1.15 +1 -1 xml-axis/java/src/org/apache/axis/description/ServiceDesc.java
Index: ServiceDesc.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/description/ServiceDesc.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ServiceDesc.java 5 Apr 2002 21:24:33 -0000 1.14
+++ ServiceDesc.java 11 Apr 2002 16:23:47 -0000 1.15
@@ -57,7 +57,6 @@
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.bytecode.ExtractorFactory;
import org.apache.axis.encoding.TypeMapping;
-import org.apache.axis.encoding.TypeMappingRegistry;
import org.apache.axis.wsdl.Skeleton;
import javax.xml.rpc.namespace.QName;
@@ -471,6 +470,7 @@
// avoids future string compares.
completedNames = null;
}
+
/**
* Fill in a service description by introspecting the implementation
* class.
