Author: richard.opalka(a)jboss.com Date: 2008-04-10 02:52:09 -0400 (Thu, 10 Apr 2008) New Revision: 6312 Added: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml Removed: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java Log: [JBWS-2097] refactoring - now all WS-RM endpoints are only JAX-WS based services - there is no dependency on jboss proprietary classes since now Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-10 06:28:20 UTC (rev 6311) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-10 06:52:09 UTC (rev 6312) @@ -455,6 +455,9 @@ <zipfileset dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl" prefix="WEB-INF/wsdl"/> + <zipfileset + file="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml" + prefix="META-INF"/> </war> <war warfile="${tests.output.dir}/libs/jaxws-secured-wsrm.war" @@ -478,6 +481,9 @@ <zipfileset dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/secure/wsdl" prefix="WEB-INF/wsdl"/> + <zipfileset + file="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml" + prefix="META-INF"/> </war> <war warfile="${tests.output.dir}/libs/jaxws-wsrm-one-way-emulator.war" Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java 2008-04-10 06:28:20 UTC (rev 6311) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java 2008-04-10 06:52:09 UTC (rev 6312) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxws.wsrm.services; import javax.jws.Oneway; Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java 2008-04-10 06:28:20 UTC (rev 6311) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java 2008-04-10 06:52:09 UTC (rev 6312) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxws.wsrm.services; import javax.jws.Oneway; @@ -2,6 +23,2 @@ import javax.jws.WebService; - -import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; - import java.util.Arrays; @@ -16,30 +33,23 @@ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.OneWayServiceIface" ) -@EndpointConfig -( - configName = "Standard WSRM Endpoint", - configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml" -) public class OneWayServiceImpl implements OneWayServiceIface { - private Logger log = Logger.getLogger(OneWayServiceImpl.class); - @Oneway public void method1() { - log.info("method1()"); + System.out.println("method1()"); } @Oneway public void method2(String s) { - log.info("method2(" + s + ")"); + System.out.println("method2(" + s + ")"); } @Oneway public void method3(String[] sa) { - log.info("method3(" + Arrays.asList(sa) + ")"); + System.out.println("method3(" + Arrays.asList(sa) + ")"); } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java 2008-04-10 06:28:20 UTC (rev 6311) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java 2008-04-10 06:52:09 UTC (rev 6312) @@ -1,10 +1,29 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxws.wsrm.services; import java.util.concurrent.Future; - import javax.jws.WebMethod; import javax.jws.WebService; - import javax.xml.ws.AsyncHandler; import javax.xml.ws.Response; Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java 2008-04-10 06:28:20 UTC (rev 6311) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java 2008-04-10 06:52:09 UTC (rev 6312) @@ -1,3 +1,24 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxws.wsrm.services; import javax.jws.WebMethod; @@ -3,7 +24,4 @@ import javax.jws.WebService; -import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; - @WebService ( @@ -14,19 +32,12 @@ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.ReqResServiceIface" ) -@EndpointConfig -( - configName = "Standard WSRM Endpoint", - configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml" -) public class ReqResServiceImpl { - private static Logger log = Logger.getLogger(ReqResServiceImpl.class); - @WebMethod public String echo(String s) { - log.info("echo(" + s + ")"); + System.out.println("echo(" + s + ")"); return s; } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java 2008-04-10 06:28:20 UTC (rev 6311) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java 2008-04-10 06:52:09 UTC (rev 6312) @@ -22,13 +22,9 @@ package org.jboss.test.ws.jaxws.wsrm.services; import java.util.Arrays; - import javax.jws.Oneway; import javax.jws.WebService; -import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; - @WebService ( name = "SecuredOneWay", @@ -37,30 +33,23 @@ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.SecuredOneWayServiceIface" ) -@EndpointConfig -( - configName = "Secured WSRM Endpoint", - configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml" -) public class SecuredOneWayServiceImpl implements SecuredOneWayServiceIface { - private Logger log = Logger.getLogger(SecuredOneWayServiceImpl.class); - @Oneway public void method1() { - log.info("method1()"); + System.out.println("method1()"); } @Oneway public void method2(String s) { - log.info("method2(" + s + ")"); + System.out.println("method2(" + s + ")"); } @Oneway public void method3(String[] sa) { - log.info("method3(" + Arrays.asList(sa) + ")"); + System.out.println("method3(" + Arrays.asList(sa) + ")"); } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java 2008-04-10 06:28:20 UTC (rev 6311) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java 2008-04-10 06:52:09 UTC (rev 6312) @@ -22,7 +22,6 @@ package org.jboss.test.ws.jaxws.wsrm.services; import java.util.concurrent.Future; - import javax.jws.WebMethod; import javax.jws.WebService; import javax.xml.ws.AsyncHandler; Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java 2008-04-10 06:28:20 UTC (rev 6311) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java 2008-04-10 06:52:09 UTC (rev 6312) @@ -24,9 +24,6 @@ import javax.jws.WebMethod; import javax.jws.WebService; -import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; - @WebService ( name = "SecuredReqRes", @@ -35,19 +32,12 @@ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.SecuredReqResServiceIface" ) -@EndpointConfig -( - configName = "Secured WSRM Endpoint", - configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml" -) public class SecuredReqResServiceImpl { - private static Logger log = Logger.getLogger(SecuredReqResServiceImpl.class); - @WebMethod public String echo(String s) { - log.info("echo(" + s + ")"); + System.out.println("echo(" + s + ")"); return s; } } Added: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml 2008-04-10 06:52:09 UTC (rev 6312) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config + xmlns="urn:jboss:jaxws-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>WSRM Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMServerHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>WSSecurity Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + +</jaxws-config> Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml 2008-04-10 06:52:09 UTC (rev 6312) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config + xmlns="urn:jboss:jaxws-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>WSRM Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + +</jaxws-config> Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml 2008-04-10 06:28:20 UTC (rev 6311) +++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml 2008-04-10 06:52:09 UTC (rev 6312) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxws-config - xmlns="urn:jboss:jaxws-config:2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard WSRM Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> - </javaee:handler> - <javaee:handler> - <javaee:handler-name>WSRM Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - - <endpoint-config> - <config-name>Secured WSRM Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> - </javaee:handler> - <javaee:handler> - <javaee:handler-name>WSRM Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMServerHandler</javaee:handler-class> - </javaee:handler> - <javaee:handler> - <javaee:handler-name>WSSecurity Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - -</jaxws-config>