[jbossws-commits] JBossWS SVN: r8399 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws: jbws1422 and 5 other directories.

Author: alessio.soldano(a)jboss.com Date: 2008-10-08 12:04:40 -0400 (Wed, 08 Oct 2008) New Revision: 8399 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java Log: Still fixing jaxws annotation usage Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java 2008-10-08 14:30:37 UTC (rev 8398) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java 2008-10-08 16:04:40 UTC (rev 8399) @@ -23,7 +23,7 @@ import javax.jws.WebService; -@WebService(name="JBWS1357", serviceName="JBWS1357Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1357.JBWS1357") +@WebService(serviceName="JBWS1357Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1357.JBWS1357") public class JBWS1357Impl implements JBWS1357 { public String echo(String message) Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java 2008-10-08 14:30:37 UTC (rev 8398) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java 2008-10-08 16:04:40 UTC (rev 8399) @@ -22,7 +22,6 @@ package org.jboss.test.ws.jaxws.jbws1422; import javax.ejb.Stateless; -import javax.jws.WebParam; import javax.jws.WebService; @Stateless @@ -30,7 +29,7 @@ public class IWebsvcImpl implements IWebsvc { - public String cancel(@WebParam(name = "nBarFoo") String myfoobar) + public String cancel(String myfoobar) { return "Cancelled-" + myfoobar; } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2008-10-08 14:30:37 UTC (rev 8398) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2008-10-08 16:04:40 UTC (rev 8399) @@ -25,7 +25,7 @@ // An endpoint implementation that does not define a target namespace // does NOT inherit the namespace from the referrenced SEI -@WebService(name="JBWS1529", serviceName="JBWS1529Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1529.JBWS1529") +@WebService(serviceName="JBWS1529Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1529.JBWS1529") public class JBWS1529Impl implements JBWS1529 { public String echo(String message) throws UserException Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java 2008-10-08 14:30:37 UTC (rev 8398) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java 2008-10-08 16:04:40 UTC (rev 8399) @@ -35,6 +35,7 @@ import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; import javax.xml.ws.Service; +import javax.xml.ws.spi.Provider; import junit.framework.Test; @@ -61,6 +62,14 @@ @Override protected void setUp() throws Exception { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + System.out.println(cl); + + Class clazz = Provider.class; + System.out.println(clazz.getResource('/'+clazz.getName().replace('.','/')+".class")); + + System.setProperty("javax.xml.ws.spi.Provider", "org.jboss.wsf.stack.metro.client.ProviderImpl"); + if (port == null) { QName serviceName = new QName(TARGET_NAMESPACE, "JBWS1797Service"); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java 2008-10-08 14:30:37 UTC (rev 8398) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java 2008-10-08 16:04:40 UTC (rev 8399) @@ -24,11 +24,10 @@ import javax.ejb.EJB; import javax.ejb.Remote; import javax.ejb.Stateless; -import javax.jws.WebMethod; import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import org.jboss.wsf.spi.annotation.WebContext; + import org.jboss.test.ws.jaxws.jbws1822.shared.BeanIface; +import org.jboss.wsf.spi.annotation.WebContext; /** * EJB3 bean published as WebService injecting other EJB3 bean @@ -37,9 +36,8 @@ * * @since 08-Jan-2008 */ -@WebService(name = "EndpointIface", targetNamespace = "http://jbossws.org/JBWS1822", serviceName = "EndpointService", endpointInterface="org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface") +@WebService(targetNamespace = "http://jbossws.org/JBWS1822", serviceName = "EndpointService", endpointInterface="org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface") @WebContext(contextRoot="/jaxws-jbws1822", urlPattern="/*") -@SOAPBinding(style = SOAPBinding.Style.RPC) @Remote(EJB3RemoteIface.class) @Stateless public class EJB3Bean implements EJB3RemoteIface @@ -47,7 +45,6 @@ @EJB private BeanIface testBean; - @WebMethod public String getMessage() { return testBean.printString(); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.java 2008-10-08 14:30:37 UTC (rev 8398) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.java 2008-10-08 16:04:40 UTC (rev 8399) @@ -21,7 +21,9 @@ */ package org.jboss.test.ws.jaxws.jbws1822.webservice; +import javax.jws.WebMethod; import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; /** * An EJB3 remote interface @@ -31,7 +33,9 @@ * @since 08-Jan-2008 */ @WebService +@SOAPBinding(style = SOAPBinding.Style.RPC) public interface EJB3RemoteIface { + @WebMethod String getMessage(); } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java 2008-10-08 14:30:37 UTC (rev 8398) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java 2008-10-08 16:04:40 UTC (rev 8399) @@ -49,7 +49,7 @@ contextRoot="/jaxws-jbws1845", urlPattern="/SpamService" ) -public final class SpamComplaintWS implements SpamComplaintWSIface +public class SpamComplaintWS implements SpamComplaintWSIface { @WebMethod(operationName="processSpamComplaints") @WebResult(name="SpamResult") Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java 2008-10-08 14:30:37 UTC (rev 8398) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java 2008-10-08 16:04:40 UTC (rev 8399) @@ -21,11 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws1872; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.ejb.Stateless; import javax.ejb.Local; import javax.ejb.Remote; +import javax.ejb.Stateless; +import javax.jws.WebService; /** * EJB3 bean implementing both Local and Remote interfaces @@ -36,10 +35,9 @@ @Stateless @Remote(RemoteIface.class) @Local(LocalIface.class) -public final class EJB3Bean1 implements RemoteIface, LocalIface +public class EJB3Bean1 implements RemoteIface, LocalIface { - @WebMethod public String echo(String msg) { return "bean1-" + msg; Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java 2008-10-08 14:30:37 UTC (rev 8398) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java 2008-10-08 16:04:40 UTC (rev 8399) @@ -23,7 +23,6 @@ import javax.ejb.Local; import javax.ejb.Stateless; -import javax.jws.WebMethod; import javax.jws.WebService; /** @@ -34,10 +33,9 @@ @WebService(name = "Bean2", targetNamespace = "http://org.jboss.ws/jbws1872") @Stateless @Local(LocalIface.class) -public final class EJB3Bean2 implements LocalIface +public class EJB3Bean2 implements LocalIface { - @WebMethod public String echo(String msg) { return "bean2-" + msg; Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java 2008-10-08 14:30:37 UTC (rev 8398) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java 2008-10-08 16:04:40 UTC (rev 8399) @@ -23,7 +23,6 @@ import javax.ejb.Remote; import javax.ejb.Stateless; -import javax.jws.WebMethod; import javax.jws.WebService; /** @@ -34,10 +33,9 @@ @WebService(name = "Bean3", targetNamespace = "http://org.jboss.ws/jbws1872") @Stateless @Remote(RemoteIface.class) -public final class EJB3Bean3 implements RemoteIface +public class EJB3Bean3 implements RemoteIface { - @WebMethod public String echo(String msg) { return "bean3-" + msg;