Author: mmerz Date: Fri Jan 21 13:59:00 2005 New Revision: 125969 URL: http://svn.apache.org/viewcvs?view=rev&rev=125969 Log: Removed the client class, and merged the interfaces and constructors back in the object model classes.
Contributor: Daryoush Mehrtash Removed: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/client/ Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadata.java incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadata.java incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadata.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadata.java?view=diff&rev=125969&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadata.java&r1=125968&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadata.java&r2=125969 ============================================================================== --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadata.java (original) +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadata.java Fri Jan 21 13:59:00 2005 @@ -20,6 +20,8 @@ import java.util.List; +import javax.xml.namespace.QName; + /** * @author Daryoush */ @@ -51,4 +53,7 @@ Class getJavaReturnType(); String getJavaReturnTypeFullName(); + + QName getXmlReturnType(); + void setXmlReturnType(QName xmlType); } Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java?view=diff&rev=125969&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java&r1=125968&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java&r2=125969 ============================================================================== --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java (original) +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java Fri Jan 21 13:59:00 2005 @@ -29,6 +29,7 @@ import javax.jws.WebParam; import javax.jws.WebResult; import javax.jws.security.SecurityRoles; +import javax.xml.namespace.QName; public class Jsr181MethodMetadataImpl implements Jsr181MethodMetadata, java.io.Serializable { @@ -45,10 +46,21 @@ private String javaMethodName; private Class javaReturnType; + private QName mXMLReturnType; + public void validate() throws ValidationException { return; // no validation required } + + public Jsr181MethodMetadataImpl(String operationName, + Class javaType, + QName xmlReturnType) { + this(operationName, javaType); + setXmlReturnType(xmlReturnType); + } + + public Jsr181MethodMetadataImpl(String methodName, Class returnType) { super(); javaMethodName = methodName; @@ -323,4 +335,13 @@ return cls.getName().replace('$', '.'); } } + + public QName getXmlReturnType() { + return mXMLReturnType; + } + + public void setXmlReturnType(QName xmlReturnType) { + mXMLReturnType = xmlReturnType; + } + } Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadata.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadata.java?view=diff&rev=125969&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadata.java&r1=125968&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadata.java&r2=125969 ============================================================================== --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadata.java (original) +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadata.java Fri Jan 21 13:59:00 2005 @@ -19,6 +19,7 @@ */ import javax.jws.WebParam; +import javax.xml.namespace.QName; /** * @author Daryoush @@ -40,4 +41,7 @@ Class getJavaType(); void setJavaType(Class javaType); String getJavaTypeFullName(); // this should be moved to web service elementtype later. + + QName getXmlType(); + void setXmlType(QName xmlType); } Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java?view=diff&rev=125969&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java&r1=125968&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java&r2=125969 ============================================================================== --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java (original) +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java Fri Jan 21 13:59:00 2005 @@ -22,6 +22,7 @@ import java.util.Collection; import javax.jws.WebParam; +import javax.xml.namespace.QName; public class Jsr181ParameterMetadataImpl implements Jsr181ParameterMetadata, java.io.Serializable { private String wpName; @@ -29,6 +30,8 @@ private WebParam.Mode wpMode; private boolean wpHeader; private Class javaType; + private QName mXMLType; + public void validate() throws ValidationException { return; // no validation required @@ -131,5 +134,13 @@ else { return cls.getName().replace('$', '.'); } + } + + public QName getXmlType() { + return mXMLType; + } + + public void setXmlType(QName xmlType) { + mXMLType = xmlType; } } Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java?view=diff&rev=125969&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java&r1=125968&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java&r2=125969 ============================================================================== --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java (original) +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/XmlBeanWSDLProcessor.java Fri Jan 21 13:59:00 2005 @@ -35,10 +35,6 @@ import javax.jws.soap.SOAPBinding; import javax.xml.namespace.QName; -import org.apache.beehive.wsm.jsr181.model.client.ClientMethodMetadata; -import org.apache.beehive.wsm.jsr181.model.client.ClientMethodMetadataImpl; -import org.apache.beehive.wsm.jsr181.model.client.ClientParameterMetadata; -import org.apache.beehive.wsm.jsr181.model.client.ClientParameterMetadataImpl; import org.apache.beehive.wsm.jsr181.util.TypeMappingUtil; import org.apache.beehive.wsm.jsr181.util.XmlBeanTypeMappingUtil; @@ -215,9 +211,9 @@ String opName = op.getName(); TParam outputParam = op.getOutput(); - Map<String,ClientParameterMetadata> outParamMap = null; + Map<String,Jsr181ParameterMetadata> outParamMap = null; - ClientParameterMetadata[] paraMeta = + Jsr181ParameterMetadata[] paraMeta = processParameters(outputParam, types, messageMap, wsm); Class returnType; QName returnXMLType; @@ -235,14 +231,14 @@ returnType=Void.TYPE; returnXMLType = null; if (paraMeta.length > 1) { - outParamMap = new HashMap<String, ClientParameterMetadata>(paraMeta.length); - for (ClientParameterMetadata cpm : paraMeta) { + outParamMap = new HashMap<String, Jsr181ParameterMetadata>(paraMeta.length); + for (Jsr181ParameterMetadata cpm : paraMeta) { outParamMap.put(cpm.getWpName(), cpm); } } } - ClientMethodMetadata wmm = - new ClientMethodMetadataImpl(opName, + Jsr181MethodMetadata wmm = + new Jsr181MethodMetadataImpl(opName, returnType, returnXMLType); @@ -269,16 +265,16 @@ TParam inputParam = op.getInput(); if (inputParam != null) { - ClientParameterMetadata[] params = + Jsr181ParameterMetadata[] params = processParameters(inputParam, types, messageMap, wsm); if (paramOrder != null) { // walk the parameters according to order if they exist. - // note that the ClientMethodMetadata needs correct order of the parameters (simnilar reflection of method). + // note that the Jsr181MethodMetadata needs correct order of the parameters (simnilar reflection of method). // TODO: Paramorder is only used for rpc. This code should be modified so that in/out parameters are all handled in one place. // if there is a paramoder then order the parameters, then all the parameters and look at in/out flag. for (Object ord : paramOrder) { - for (ClientParameterMetadata wpm : params) { + for (Jsr181ParameterMetadata wpm : params) { if (ord.equals(wpm.getWpName())) { wpm.setWpMode(WebParam.Mode.IN); //THIUS MAY BE BUG... WE NEED TO MAKE SURE TO HANDLE THE OUT PARAMTERS ALSO (like the code for below) @@ -289,7 +285,7 @@ } } else if (params.length > 0) { - for (ClientParameterMetadata wpm : params) { + for (Jsr181ParameterMetadata wpm : params) { // FIXME [EMAIL PROTECTED] 2005-Jan-04 -- // Double check DOC/Lit rules if (outParamMap != null && outParamMap.containsKey(wpm.getWpName())) { @@ -306,7 +302,7 @@ // do the pure out parameters. if (outParamMap != null && outParamMap.size() > 0) { - for (ClientParameterMetadata wpm : outParamMap.values()) { + for (Jsr181ParameterMetadata wpm : outParamMap.values()) { wpm.setWpMode(WebParam.Mode.OUT); wmm.addParam(wpm); } @@ -327,7 +323,7 @@ } - private ClientParameterMetadata[] + private Jsr181ParameterMetadata[] processParameters(TParam parameter, TTypes types, Map<String, TPart[]> messageMap, @@ -337,8 +333,8 @@ TPart[] messageParts = messageMap .get(parameter.getMessage().getLocalPart()); - List<ClientParameterMetadata> paramList = - new ArrayList<ClientParameterMetadata>(messageParts.length); + List<Jsr181ParameterMetadata> paramList = + new ArrayList<Jsr181ParameterMetadata>(messageParts.length); int j = 0; for (TPart messagePart : messageParts) { @@ -371,8 +367,8 @@ if (e.isSetType()) { // simple type, element has name and type in same node for complex type it is only // name and type is defined as <complexType> child./ - ClientParameterMetadata wpm = - new ClientParameterMetadataImpl(); + Jsr181ParameterMetadata wpm = + new Jsr181ParameterMetadataImpl(); wpm.setWpName(e.getName()); // FIXME [EMAIL PROTECTED] 2004-Nov-09 -- double check the namespace stuff @@ -404,8 +400,8 @@ for (Element el : g.getElementArray()) { - ClientParameterMetadata wpm = - new ClientParameterMetadataImpl(); + Jsr181ParameterMetadata wpm = + new Jsr181ParameterMetadataImpl(); // FIXME [EMAIL PROTECTED] 2004-Nov-09 // double check the namespace stuff @@ -465,8 +461,8 @@ // NOTE [EMAIL PROTECTED] 2005-Jan-07 -- Doc/Lit Bare wsm.getSoapBinding().setParameterStyle(SOAPBinding.ParameterStyle.BARE); - ClientParameterMetadata wpm = - new ClientParameterMetadataImpl(); + Jsr181ParameterMetadata wpm = + new Jsr181ParameterMetadataImpl(); wpm.setWpTargetNamespace(element.getNamespaceURI()); wpm.setWpName(element.getLocalPart()); @@ -476,8 +472,8 @@ } } else { // this is an rpc and with no element attribute - ClientParameterMetadata wpm = - new ClientParameterMetadataImpl(); + Jsr181ParameterMetadata wpm = + new Jsr181ParameterMetadataImpl(); // FIXME [EMAIL PROTECTED] 2004-Nov-09 -- figure out where RPC parameter namespaces should be specified in the WSDL. wpm.setWpTargetNamespace(wsm.getWsTargetNamespace()); wpm.setWpName(messagePart.getName()); @@ -493,9 +489,9 @@ } } return paramList - .toArray(new ClientParameterMetadata[paramList.size()]); + .toArray(new Jsr181ParameterMetadata[paramList.size()]); } - return new ClientParameterMetadata[0]; + return new Jsr181ParameterMetadata[0]; } private void processTBinding(TBinding tBind,
