[jbossws-commits] JBossWS SVN: r2195 - in trunk/jbossws-tests: src/main/java/org/jboss/test/ws/interop/soapwsdl and 1 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-01-30 11:52:13 -0500 (Tue, 30 Jan 2007) New Revision: 2195 Modified: trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/BaseDataTypesProxy.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java Log: Finished migrating doclitw test to JAX-WS Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-30 16:51:30 UTC (rev 2194) +++ trunk/jbossws-tests/build.xml 2007-01-30 16:52:13 UTC (rev 2195) @@ -452,6 +452,7 @@ <mkdir dir="${tests.output.dir}/reports"/> <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}"> <jvmarg value="-Djava.security.manager"/> + <jvmarg value="-ea"/> <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> <sysproperty key="client.scenario" value="${client.scenario}"/> <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> @@ -491,6 +492,7 @@ <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}"> <jvmarg line="${remote.debug.line}"/> <jvmarg value="-Djava.security.manager"/> + <jvmarg value="-ea"/> <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> <sysproperty key="client.scenario" value="${client.scenario}"/> <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/BaseDataTypesProxy.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/BaseDataTypesProxy.java 2007-01-30 16:51:30 UTC (rev 2194) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/BaseDataTypesProxy.java 2007-01-30 16:52:13 UTC (rev 2195) @@ -52,10 +52,17 @@ public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { - Object result; + Object result = null; try { - Method targetMethod = obj.getClass().getMethod(m.getName(), m.getParameterTypes()); - result = targetMethod.invoke(obj, args); + for(Method target : obj.getClass().getMethods()) + { + if(target.getName().equals(m.getName())) + { + // it's dirty, but hey... + result = target.invoke(obj, args); + } + } + } catch (InvocationTargetException e) { throw e.getTargetException(); } catch (Exception e) { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-01-30 16:51:30 UTC (rev 2194) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-01-30 16:52:13 UTC (rev 2195) @@ -47,16 +47,16 @@ return JBossWSTestSetup.newTestSetup(BaseDataTypesDocLitWTestCase.class, "jbossws-interop-BaseDataTypesDocLitW.war"); } - protected void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); - if (org.jboss.test.ws.interop.soapwsdl.basedoclitw.BaseDataTypesDocLitWTestCase.targetPort == null) + if (targetPort == null) { URL wsdlLocation = new File("resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl").toURL(); Service service = Service.create(wsdlLocation, new QName("", "BaseDataTypesDocLitWService") ); BaseDataTypesDocLitWTestCase.targetPort = service.getPort(IBaseDataTypesDocLitW.class); - ((BindingProvider)BaseDataTypesDocLitWTestCase.targetPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/basedoclitb/endpoint"); + ((BindingProvider)BaseDataTypesDocLitWTestCase.targetPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/basedoclitw/endpoint"); BaseDataTypesDocLitWTestCase.proxy = (BaseDataTypesSEI) BaseDataTypesProxy.newInstance(BaseDataTypesDocLitWTestCase.targetPort); } } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java 2007-01-30 16:51:30 UTC (rev 2194) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java 2007-01-30 16:52:13 UTC (rev 2195) @@ -24,6 +24,7 @@ import javax.jws.WebMethod; import javax.jws.WebResult; import javax.jws.WebParam; +import javax.jws.WebService; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; import javax.xml.datatype.XMLGregorianCalendar; @@ -37,6 +38,9 @@ * @version $Id:$ * @since 29.01.2007 */ +@WebService( + endpointInterface = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.IBaseDataTypesDocLitW" +) public class ServiceImpl implements IBaseDataTypesDocLitW { @WebMethod(operationName = "RetBool", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetBool") @WebResult(name = "RetBoolResult", targetNamespace = "http://tempuri.org/")