gdaniels 2002/09/29 20:36:06 Modified: java/src/org/apache/axis/encoding TypeMappingRegistryImpl.java java/src/org/apache/axis/wsdl Java2WSDL.java java/src/org/apache/axis/wsdl/fromJava Emitter.java java/samples/message deploy.wsdd Log: Cleanup, make deploy.wsdd match docs to demonstrate style arg. Revision Changes Path 1.17 +2 -8 xml-axis/java/src/org/apache/axis/encoding/TypeMappingRegistryImpl.java Index: TypeMappingRegistryImpl.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/TypeMappingRegistryImpl.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- TypeMappingRegistryImpl.java 18 Sep 2002 16:10:37 -0000 1.16 +++ TypeMappingRegistryImpl.java 30 Sep 2002 03:36:06 -0000 1.17 @@ -56,16 +56,10 @@ package org.apache.axis.encoding; import org.apache.axis.Constants; -import org.apache.axis.deployment.wsdd.WSDDConstants; -import org.apache.axis.utils.JavaUtils; import org.apache.axis.utils.Messages; -import javax.xml.namespace.QName; import javax.xml.rpc.JAXRPCException; -import java.beans.IntrospectionException; -import java.io.IOException; -import java.io.PrintStream; import java.util.HashMap; /** @@ -340,11 +334,11 @@ /** * Removes the TypeMapping for the namespace. * - * @param typeMapping- The type mapping to remove + * @param mapping The type mapping to remove * @return true if found and removed */ public boolean removeTypeMapping( - javax.xml.rpc.encoding.TypeMapping mapping) { + javax.xml.rpc.encoding.TypeMapping mapping) { String[] ns = getRegisteredEncodingStyleURIs(); boolean rc = false; for (int i=0; i < ns.length; i++) { 1.29 +0 -1 xml-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java Index: Java2WSDL.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- Java2WSDL.java 26 Sep 2002 20:59:58 -0000 1.28 +++ Java2WSDL.java 30 Sep 2002 03:36:06 -0000 1.29 @@ -58,7 +58,6 @@ import org.apache.axis.utils.CLOption; import org.apache.axis.utils.CLOptionDescriptor; import org.apache.axis.utils.CLUtil; -import org.apache.axis.utils.JavaUtils; import org.apache.axis.utils.Messages; import org.apache.axis.wsdl.fromJava.Emitter; 1.68 +1 -2 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.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- Emitter.java 27 Sep 2002 16:35:45 -0000 1.67 +++ Emitter.java 30 Sep 2002 03:36:06 -0000 1.68 @@ -1088,8 +1088,7 @@ QName typeQName = types.writeTypeForPart(javaType, param.getTypeQName()); - QName elemQName = types.writeElementForPart(javaType, - param.getTypeQName()); + types.writeElementForPart(javaType, param.getTypeQName()); if (typeQName != null) { part.setName(param.getName()); part.setTypeName(typeQName); 1.3 +2 -1 xml-axis/java/samples/message/deploy.wsdd Index: deploy.wsdd =================================================================== RCS file: /home/cvs/xml-axis/java/samples/message/deploy.wsdd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- deploy.wsdd 15 Jan 2002 17:57:02 -0000 1.2 +++ deploy.wsdd 30 Sep 2002 03:36:06 -0000 1.3 @@ -1,7 +1,8 @@ <deployment name="test" xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java" xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance"> - <service name="MessageService" provider="java:MSG"> + <!-- note that either style="message" OR provider="java:MSG" both work --> + <service name="MessageService" style="message"> <parameter name="className" value="samples.message.MessageService" /> <parameter name="allowedMethods" value="echoElements" /> </service>