From: <jbo...@li...> - 2006-07-05 11:53:01
|
Author: tho...@jb... Date: 2006-07-05 07:52:43 -0400 (Wed, 05 Jul 2006) New Revision: 563 Removed: trunk/.settings/org.eclipse.core.resources.prefs trunk/src/test/resources/jbws871/META-INF/application-client.xml trunk/src/test/resources/jbws871/META-INF/jaxrpc-mapping.xml trunk/src/test/resources/jbws871/META-INF/jboss-client.xml trunk/src/test/resources/jbws871/wstools-config.xml Modified: trunk/src/main/java/org/jboss/ws/client/CommonClient.java trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java trunk/src/test/ant/build-jars.xml trunk/src/test/java/org/jboss/test/ws/jbws871/JBWS871TestCase.java Log: SOAPConnectionImpl.callOneWay Use jaxws for jbws-871 Deleted: trunk/.settings/org.eclipse.core.resources.prefs =================================================================== --- trunk/.settings/org.eclipse.core.resources.prefs 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/.settings/org.eclipse.core.resources.prefs 2006-07-05 11:52:43 UTC (rev 563) @@ -1,8 +0,0 @@ -#Tue Jul 04 11:35:41 CEST 2006 -eclipse.preferences.version=1 -encoding//src/test/resources/addressing/action/Doc-META-INF/wsdl/ActionDocService.wsdl=UTF-8 -encoding//src/test/resources/addressing/replyto/FaultTo-META-INF/wsdl/FaultToService.wsdl=UTF-8 -encoding//src/test/resources/addressing/replyto/Initial-META-INF/wsdl/InitialService.wsdl=UTF-8 -encoding//src/test/resources/addressing/replyto/ReplyTo-META-INF/wsdl/ReplyToService.wsdl=UTF-8 -encoding//src/test/resources/benchmark/rpclit/META-INF/wsdl/BenchmarkWebService.wsdl=UTF-8 -encoding//src/test/resources/jbws434/WEB-INF/wsdl/TestService.wsdl=UTF-8 Modified: trunk/src/main/java/org/jboss/ws/client/CommonClient.java =================================================================== --- trunk/src/main/java/org/jboss/ws/client/CommonClient.java 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/main/java/org/jboss/ws/client/CommonClient.java 2006-07-05 11:52:43 UTC (rev 563) @@ -280,7 +280,16 @@ syncMessageProperties(callProps, msgContext); EndpointInfo epInfo = new EndpointInfo(epMetaData, targetAddress, callProps); - SOAPMessage resMessage = new SOAPConnectionImpl().call(reqMessage, epInfo, oneway); + + SOAPMessage resMessage; + if (oneway) + { + resMessage = new SOAPConnectionImpl().callOneWay(reqMessage, epInfo); + } + else + { + resMessage = new SOAPConnectionImpl().call(reqMessage, epInfo); + } // Associate current message with message context msgContext.setMessage(resMessage); Modified: trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java 2006-07-05 11:52:43 UTC (rev 563) @@ -205,9 +205,6 @@ QName xmlType = opInput.getXMLType(); String javaTypeName = typeMapping.getJavaTypeName(xmlType); - if (javaTypeName == null) - throw new WSException("Cannot obtain java type mapping for: " + xmlType); - ParameterMetaData inMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, javaTypeName); opMetaData.addParameter(inMetaData); @@ -233,9 +230,6 @@ boolean inHeader = opOutput.getProperty(Constants.WSDL_PROPERTY_APPLICATION_DATA) != null; boolean hasReturnMapping = (inHeader == false); - if (javaTypeName == null) - throw new WSException("Cannot obtain java type mapping for: " + xmlType); - if (hasReturnMapping) { outMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, javaTypeName); Modified: trunk/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java =================================================================== --- trunk/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/main/java/org/jboss/ws/eventing/mgmt/Subscription.java 2006-07-05 11:52:43 UTC (rev 563) @@ -77,7 +77,6 @@ { String eventXML = DOMWriter.printNode(event, false); MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); // notification elements need to declare their namespace locally StringBuilder sb = new StringBuilder(); @@ -96,7 +95,7 @@ SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(sb.toString().getBytes())); URL epURL = notifyTo.getAddress().toURL(); - ((SOAPConnectionImpl)con).call(reqMsg, epURL, true); + new SOAPConnectionImpl().callOneWay(reqMsg, epURL); } catch (Exception e) { @@ -165,10 +164,9 @@ try { MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(sb.toString().getBytes())); URL epURL = endTo.getAddress().toURL(); - ((SOAPConnectionImpl)con).call(reqMsg, epURL, true); + new SOAPConnectionImpl().callOneWay(reqMsg, epURL); } catch (Exception e) { Modified: trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java 2006-07-05 11:52:43 UTC (rev 563) @@ -167,7 +167,7 @@ public String toString() { StringBuilder buffer = new StringBuilder("\nClientEndpointMetaData:"); - buffer.append("\n name=" + getQName()); + buffer.append("\n qname=" + getQName()); buffer.append("\n address=" + getEndpointAddress()); buffer.append("\n seiName=" + getServiceEndpointInterfaceName()); buffer.append("\n configFile=" + getConfigFile()); Modified: trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-07-05 11:52:43 UTC (rev 563) @@ -240,26 +240,27 @@ return isMessageEndpoint; } - private boolean compareMethodParams(Class[] methodTypes, boolean matchByTypeName) + private boolean compareMethodParams(Class[] methodParams, boolean matchByTypeName) { log.trace("Compare method params by type name: " + matchByTypeName); - boolean pass = (parameters.size() == methodTypes.length); + boolean pass = (parameters.size() == methodParams.length); if (pass == false) - log.trace("Unmatched parameter count: " + parameters.size() + "!=" + methodTypes.length); + log.trace("Unmatched parameter count: " + parameters.size() + "!=" + methodParams.length); TypeMappingImpl typeMapping = epMetaData.getServiceMetaData().getTypeMapping(); - for (int i = 0; pass && i < methodTypes.length; i++) + for (int i = 0; pass && i < methodParams.length; i++) { ParameterMetaData paramMetaData = parameters.get(i); QName xmlType = paramMetaData.getXmlType(); - Class methodType = methodTypes[i]; + String javaType = paramMetaData.getJavaTypeName(); + Class methodParam = methodParams[i]; if (paramMetaData.getMode() != ParameterMode.IN) { - if (HolderUtils.isHolderType(methodType)) + if (HolderUtils.isHolderType(methodParam)) { - methodType = HolderUtils.getValueType(methodType); + methodParam = HolderUtils.getValueType(methodParam); } else { @@ -267,28 +268,35 @@ break; } } + + // In case the parameter java type has not been initialized + // This happens when the UMDM is build from WSDL only (i.e. JAXWS Service) + if (javaType == null) + { + javaType = methodParam.getName(); + paramMetaData.setJavaTypeName(javaType); + log.debug("Set parameter java type from method param: " + javaType); + } if (matchByTypeName) { - String javaTypeName = methodType.getName(); - String paramTypeName = paramMetaData.getJavaTypeName(); - pass = javaTypeName.equals(paramTypeName); + pass = methodParam.getName().equals(javaType); } else { - String javaTypeName = methodType.getName(); + String paramTypeName = methodParam.getName(); Class paramType = paramMetaData.getJavaType(); - pass = JavaUtils.isAssignableFrom(methodType, paramType); - if (pass == false && typeMapping.isRegistered(methodType, xmlType)) + pass = JavaUtils.isAssignableFrom(methodParam, paramType); + if (pass == false && typeMapping.isRegistered(methodParam, xmlType)) { - log.debug("Adjust parameter type from " + paramType.getName() + " to " + javaTypeName); - paramMetaData.setJavaTypeName(javaTypeName); + log.debug("Adjust parameter type from " + paramType.getName() + " to " + paramTypeName); + paramMetaData.setJavaTypeName(paramTypeName); pass = true; } } String name = (matchByTypeName) ? paramMetaData.getJavaTypeName() : paramMetaData.getJavaType().getName(); - log.trace((pass ? "Matched" : "Unmatched") + " parameter: " + name + " == " + methodType.getName()); + log.trace((pass ? "Matched" : "Unmatched") + " parameter: " + name + " == " + methodParam.getName()); } return pass; } @@ -493,7 +501,7 @@ public String toString() { StringBuilder buffer = new StringBuilder("\nOperationMetaData:"); - buffer.append("\n xmlName=" + qname); + buffer.append("\n qname=" + qname); buffer.append("\n javaName=" + javaName); buffer.append("\n style=" + getStyle() + "/" + getUse() + (getStyle() == Style.DOCUMENT ? "/" + getParameterStyle() : "")); buffer.append("\n oneWay=" + oneWayOperation); Modified: trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-07-05 11:52:43 UTC (rev 563) @@ -259,7 +259,7 @@ public String toString() { StringBuilder buffer = new StringBuilder("\nServerEndpointMetaData:"); - buffer.append("\n name=" + getQName()); + buffer.append("\n qname=" + getQName()); buffer.append("\n id=" + getServiceEndpointID().getCanonicalName()); buffer.append("\n address=" + getEndpointAddress()); buffer.append("\n linkName=" + getLinkName()); Modified: trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-07-05 11:52:43 UTC (rev 563) @@ -382,7 +382,7 @@ public String toString() { StringBuilder buffer = new StringBuilder("\nServiceMetaData:"); - buffer.append("\n name=" + qname); + buffer.append("\n qname=" + qname); buffer.append("\n wsdName=" + wsdName); buffer.append("\n wsdlFile=" + wsdlFile); buffer.append("\n jaxrpcFile=" + jaxrpcMappingFile); Modified: trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java =================================================================== --- trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-07-05 11:52:43 UTC (rev 563) @@ -401,8 +401,7 @@ if (wsaTo != null) { log.debug("Sending response to addressing destination: " + wsaTo); - SOAPConnectionImpl con = new SOAPConnectionImpl(); - con.call(soapMessage, wsaTo, true); + new SOAPConnectionImpl().callOneWay(soapMessage, wsaTo); } else { Modified: trunk/src/test/ant/build-jars.xml =================================================================== --- trunk/src/test/ant/build-jars.xml 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/test/ant/build-jars.xml 2006-07-05 11:52:43 UTC (rev 563) @@ -585,19 +585,6 @@ <include name="org/jboss/test/ws/jbws871/RpcArrayEndpointImpl.class"/> </classes> </war> - <jar destfile="${build.test.dir}/libs/jbossws-jbws871-rpc-client.jar"> - <fileset dir="${build.test.dir}/classes"> - <include name="org/jboss/test/ws/jbws871/IntegerArray.class"/> - <include name="org/jboss/test/ws/jbws871/RpcArrayEndpoint.class"/> - <include name="org/jboss/test/ws/jbws871/RpcArrayEndpointService.class"/> - </fileset> - <metainf dir="${build.test.dir}/resources/jbws871/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> <!-- jbossws-jbws944 --> <jar jarfile="${build.test.dir}/libs/jbossws-jbws944.ejb3"> Modified: trunk/src/test/java/org/jboss/test/ws/jbws871/JBWS871TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jbws871/JBWS871TestCase.java 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/test/java/org/jboss/test/ws/jbws871/JBWS871TestCase.java 2006-07-05 11:52:43 UTC (rev 563) @@ -21,8 +21,12 @@ */ package org.jboss.test.ws.jbws871; -import javax.naming.InitialContext; +import java.io.File; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; @@ -42,7 +46,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS871TestCase.class, "jbossws-jbws871-rpc.war, jbossws-jbws871-rpc-client.jar"); + return JBossWSTestSetup.newTestSetup(JBWS871TestCase.class, "jbossws-jbws871-rpc.war"); } protected void setUp() throws Exception @@ -51,9 +55,10 @@ if (endpoint == null) { - InitialContext iniCtx = getInitialContext(); - RpcArrayEndpointService service = (RpcArrayEndpointService)iniCtx.lookup("java:comp/env/service/RpcArrayEndpointService"); - endpoint = service.getRpcArrayEndpointPort(); + URL wsdlURL = new File("resources/jbws871/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + QName serviceName = new QName("http://jbws871.ws.test.jboss.org/jaws", "RpcArrayEndpointService"); + Service service = Service.create(wsdlURL, serviceName); + endpoint = (RpcArrayEndpoint)service.getPort(RpcArrayEndpoint.class); } } Deleted: trunk/src/test/resources/jbws871/META-INF/application-client.xml =================================================================== --- trunk/src/test/resources/jbws871/META-INF/application-client.xml 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/test/resources/jbws871/META-INF/application-client.xml 2006-07-05 11:52:43 UTC (rev 563) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>JSR-181 Annotation test</display-name> - - <service-ref> - <service-ref-name>service/RpcArrayEndpointService</service-ref-name> - <service-interface>org.jboss.test.ws.jbws871.RpcArrayEndpointService</service-interface> - <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jbws871.RpcArrayEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Deleted: trunk/src/test/resources/jbws871/META-INF/jaxrpc-mapping.xml =================================================================== --- trunk/src/test/resources/jbws871/META-INF/jaxrpc-mapping.xml 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/test/resources/jbws871/META-INF/jaxrpc-mapping.xml 2006-07-05 11:52:43 UTC (rev 563) @@ -1,46 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jbws871</package-type> - <namespaceURI>http://jbws871.ws.test.jboss.org/jaws</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws871.RpcArrayEndpointService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://jbws871.ws.test.jboss.org/jaws'>serviceNS:RpcArrayEndpointService</wsdl-service-name> - <port-mapping> - <port-name>RpcArrayEndpointPort</port-name> - <java-port-name>RpcArrayEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws871.RpcArrayEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://jbws871.ws.test.jboss.org/jaws'>portTypeNS:RpcArrayEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://jbws871.ws.test.jboss.org/jaws'>bindingNS:RpcArrayEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>intArr</java-method-name> - <wsdl-operation>intArr</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jbws871.ws.test.jboss.org/jaws'>wsdlMsgNS:RpcArrayEndpoint_intArr</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.Integer[]</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jbws871.ws.test.jboss.org/jaws'>wsdlMsgNS:RpcArrayEndpoint_intArr</wsdl-message> - <wsdl-message-part-name>Integer_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.Integer[]</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jbws871.ws.test.jboss.org/jaws'>wsdlMsgNS:RpcArrayEndpoint_intArrResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Deleted: trunk/src/test/resources/jbws871/META-INF/jboss-client.xml =================================================================== --- trunk/src/test/resources/jbws871/META-INF/jboss-client.xml 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/test/resources/jbws871/META-INF/jboss-client.xml 2006-07-05 11:52:43 UTC (rev 563) @@ -1,9 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> -</jboss-client> Deleted: trunk/src/test/resources/jbws871/wstools-config.xml =================================================================== --- trunk/src/test/resources/jbws871/wstools-config.xml 2006-07-05 10:55:12 UTC (rev 562) +++ trunk/src/test/resources/jbws871/wstools-config.xml 2006-07-05 11:52:43 UTC (rev 563) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -dest ./META-INF -config wstools-config.xml ---> - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jbws871" namespace="http://jbws871.ws.test.jboss.org/jaws"/> - </global> - <wsdl-java file="META-INF/wsdl/TestEndpoint.wsdl"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> - -</configuration> - -<!-- - org.jboss.test.ws.jbws871.Integer.Array -> org.jboss.test.ws.jbws871.IntegerArray - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws871.IntegerArray</java-type> - <root-type-qname xmlns:typeNS='http://jbws871.ws.test.jboss.org/jaws'>typeNS:Integer.Array</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>value</java-variable-name> - <xml-element-name>value</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - --> \ No newline at end of file |