February 2012 - jbossws-commits - Jboss List Archives

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-03 09:18:23 -0500 (Fri, 03 Feb 2012) New Revision: 15590 Modified: spi/trunk/pom.xml Log: Preparing for next dev cycle Modified: spi/trunk/pom.xml =================================================================== --- spi/trunk/pom.xml 2012-02-03 14:17:54 UTC (rev 15589) +++ spi/trunk/pom.xml 2012-02-03 14:18:23 UTC (rev 15590) @@ -7,7 +7,7 @@ <packaging>jar</packaging> <description>JBossWS SPI</description> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.3-SNAPSHOT</version>  <parent>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15589 - spi/tags.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-03 09:17:54 -0500 (Fri, 03 Feb 2012) New Revision: 15589 Added: spi/tags/jbossws-spi-2.0.2.GA/ Log: Tagging jbossws-spi-2.0.2.GA

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15588 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: configuration and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-03 06:42:51 -0500 (Fri, 03 Feb 2012) New Revision: 15588 Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/NsCtxSelectorStoreInterceptor.java Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java Log: [AS7-3581] Reverting Richard's changes on SoapTransportFactoryExt and leveraging NamespaceContextSelectorWrapper abstraction Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2012-02-03 11:41:03 UTC (rev 15587) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2012-02-03 11:42:51 UTC (rev 15588) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -73,6 +73,7 @@ import org.apache.cxf.service.Service; import org.apache.cxf.service.invoker.Invoker; import org.apache.cxf.service.model.BindingOperationInfo; +import org.jboss.ws.api.util.ServiceLoader; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.classloading.ClassLoaderProvider; @@ -80,6 +81,7 @@ import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.invocation.InvocationContext; import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.NamespaceContextSelectorWrapperFactory; import org.jboss.wsf.spi.invocation.WebServiceContextFactory; /** @@ -96,7 +98,14 @@ private static final Object[] NO_ARGS = new Object[]{}; private Object targetBean; private WebServiceContextFactory contextFactory; + private NamespaceContextSelectorWrapperFactory nsCtxSelectorFactory; + public JBossWSInvoker() { + ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(); + nsCtxSelectorFactory = (NamespaceContextSelectorWrapperFactory) ServiceLoader.loadService( + NamespaceContextSelectorWrapperFactory.class.getName(), null, cl); + } + public void setTargetBean(Object targetBean) { this.targetBean = targetBean; @@ -110,6 +119,7 @@ Map<String, Object> handlerScopedStuff = removeHandlerProperties(ctx); WebServiceContextImpl.setMessageContext(ctx); + setNamespaceContextSelector(exchange); Object retObj = null; try @@ -125,6 +135,8 @@ { //clear the WebServiceContextImpl's ThreadLocal variable WebServiceContextImpl.clear(); + //also cleanup namespace context selector + clearNamespaceContextSelector(exchange); } return new MessageContentsList(retObj); @@ -336,6 +348,21 @@ } } + protected void setNamespaceContextSelector(Exchange exchange) { + if (exchange.isOneWay() && nsCtxSelectorFactory != null) + { + nsCtxSelectorFactory.getWrapper().setCurrentThreadSelector(exchange); + } + } + + protected void clearNamespaceContextSelector(Exchange exchange) + { + if (exchange.isOneWay() && nsCtxSelectorFactory != null) + { + nsCtxSelectorFactory.getWrapper().clearCurrentThreadSelector(exchange); + } + } + protected synchronized WebServiceContextFactory getWebServiceContextFactory() { if (contextFactory == null) @@ -346,5 +373,5 @@ } return contextFactory; } - + } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-02-03 11:41:03 UTC (rev 15587) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-02-03 11:42:51 UTC (rev 15588) @@ -40,6 +40,7 @@ import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; import org.jboss.wsf.stack.cxf.interceptor.EnableOneWayDecoupledFaultInterceptor; import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor; +import org.jboss.wsf.stack.cxf.interceptor.NsCtxSelectorStoreInterceptor; /** * A wrapper of the Bus for performing most of the configurations required on it by JBossWS @@ -125,6 +126,7 @@ //with the proper spi Endpoint retrieved in CXFServletExt bus.getInInterceptors().add(new EndpointAssociationInterceptor()); bus.getInInterceptors().add(new EnableOneWayDecoupledFaultInterceptor()); + bus.getInInterceptors().add(new NsCtxSelectorStoreInterceptor()); } protected static void setResourceResolver(Bus bus, ResourceResolver resourceResolver) Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/NsCtxSelectorStoreInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/NsCtxSelectorStoreInterceptor.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/NsCtxSelectorStoreInterceptor.java 2012-02-03 11:42:51 UTC (rev 15588) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.cxf.interceptor; + +import org.apache.cxf.interceptor.Fault; +import org.apache.cxf.interceptor.OneWayProcessorInterceptor; +import org.apache.cxf.message.Exchange; +import org.apache.cxf.message.Message; +import org.apache.cxf.phase.AbstractPhaseInterceptor; +import org.apache.cxf.phase.Phase; +import org.jboss.ws.api.util.ServiceLoader; +import org.jboss.wsf.spi.classloading.ClassLoaderProvider; +import org.jboss.wsf.spi.invocation.NamespaceContextSelectorWrapperFactory; + +/** + * An interceptor for storing the NamespaceContextSelector association into the Exchange + * + * @author alessio.soldano(a)jboss.com + * @since 03-Feb-2012 + * + */ +public class NsCtxSelectorStoreInterceptor extends AbstractPhaseInterceptor<Message> +{ + private NamespaceContextSelectorWrapperFactory factory; + + public NsCtxSelectorStoreInterceptor() + { + super(Phase.PRE_LOGICAL); + addBefore(OneWayProcessorInterceptor.class.getName()); + ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(); + factory = (NamespaceContextSelectorWrapperFactory) ServiceLoader.loadService( + NamespaceContextSelectorWrapperFactory.class.getName(), null, cl); + } + + @Override + public void handleMessage(Message message) throws Fault + { + Exchange exchange = message.getExchange(); + if (exchange.isOneWay() && !isRequestor(message) && factory != null) + { + factory.getWrapper().storeCurrentThreadSelector(exchange); + } + } +} Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java 2012-02-03 11:41:03 UTC (rev 15587) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java 2012-02-03 11:42:51 UTC (rev 15588) @@ -27,7 +27,6 @@ import org.apache.cxf.binding.soap.SoapTransportFactory; import org.apache.cxf.binding.soap.jms.interceptor.SoapJMSConstants; import org.apache.cxf.binding.soap.model.SoapBindingInfo; -import org.apache.cxf.interceptor.OneWayProcessorInterceptor; import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.service.model.ServiceInfo; @@ -86,10 +85,6 @@ } } } - // [AS7-3581] make sure @Oneway annotated webservice methods are executed - // in the same thread associated with current servlet to ensure that manual - // JNDI lookups are visible to the @OneWay method body - info.setProperty(OneWayProcessorInterceptor.USE_ORIGINAL_THREAD, Boolean.TRUE); return info; }

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15587 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-03 06:41:03 -0500 (Fri, 03 Feb 2012) New Revision: 15587 Modified: stack/cxf/trunk/pom.xml Log: Using jbossws-spi 2.0.2-SNAPSHOT Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-02-03 11:40:04 UTC (rev 15586) +++ stack/cxf/trunk/pom.xml 2012-02-03 11:41:03 UTC (rev 15587) @@ -60,7 +60,7 @@  <properties> <jbossws.api.version>1.0.1-SNAPSHOT</jbossws.api.version> - <jbossws.spi.version>2.0.1-SNAPSHOT</jbossws.spi.version> + <jbossws.spi.version>2.0.2-SNAPSHOT</jbossws.spi.version> <jbossws.common.version>2.0.1-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.0.1-SNAPSHOT</jbossws.shared.testsuite.version>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15586 - shared-testsuite/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-03 06:40:04 -0500 (Fri, 03 Feb 2012) New Revision: 15586 Modified: shared-testsuite/trunk/pom.xml Log: Moving back to 4.0.1-SNAPSHOT Modified: shared-testsuite/trunk/pom.xml =================================================================== --- shared-testsuite/trunk/pom.xml 2012-02-03 11:38:52 UTC (rev 15585) +++ shared-testsuite/trunk/pom.xml 2012-02-03 11:40:04 UTC (rev 15586) @@ -6,7 +6,7 @@ <artifactId>jbossws-shared-testsuite</artifactId> <description>JBossWS Stack Agnostic Testsuite</description> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.1-SNAPSHOT</version>  <parent>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15585 - spi/trunk/src/main/java/org/jboss/wsf/spi/invocation.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-03 06:38:52 -0500 (Fri, 03 Feb 2012) New Revision: 15585 Added: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/NamespaceContextSelectorWrapper.java spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/NamespaceContextSelectorWrapperFactory.java Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java Log: [AS7-3581] Adding interfaces for allowing setting AS7 NamespaceContextSelector from CXF stack Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java 2012-02-03 08:28:22 UTC (rev 15584) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java 2012-02-03 11:38:52 UTC (rev 15585) @@ -24,7 +24,7 @@ import org.jboss.wsf.spi.deployment.Endpoint; /** - * Associates the endpoint meta data with the current thead. + * Associates the endpoint meta data with the current thread. * * @author Thomas.Diesler(a)jboss.org * @since 10-May-2007 Added: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/NamespaceContextSelectorWrapper.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/NamespaceContextSelectorWrapper.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/NamespaceContextSelectorWrapper.java 2012-02-03 11:38:52 UTC (rev 15585) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.wsf.spi.invocation; + +import java.util.Map; + +/** + * Wraps AS7 NamespaceContextSelector logic to allow carrying its + * contents for invocation served using thread pools. + * + * @author alessio.soldano(a)jboss.org + * @since 03-Feb-2012 + * + */ +public interface NamespaceContextSelectorWrapper +{ + public void storeCurrentThreadSelector(Map<String, Object> map); + + public void setCurrentThreadSelector(Map<String, Object> map); + + public void clearCurrentThreadSelector(Map<String, Object> map); +} Added: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/NamespaceContextSelectorWrapperFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/NamespaceContextSelectorWrapperFactory.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/NamespaceContextSelectorWrapperFactory.java 2012-02-03 11:38:52 UTC (rev 15585) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.wsf.spi.invocation; + + +/** + * Factory for org.jboss.wsf.spi.invocation.NamespaceContextSelectorWrapper + * + * @author alessio.soldano(a)jboss.org + * @since 03-Feb-2012 + * + */ +public interface NamespaceContextSelectorWrapperFactory +{ + public NamespaceContextSelectorWrapper getWrapper(); +}

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15584 - projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2012-02-03 03:28:22 -0500 (Fri, 03 Feb 2012) New Revision: 15584 Modified: projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/AbstractWrappedOutputStream.java Log: [JBWS-3424]:CXF does not return status code 200 when Oneway webservice is invoked via HTTP Modified: projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/AbstractWrappedOutputStream.java =================================================================== --- projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/AbstractWrappedOutputStream.java 2012-02-02 21:10:08 UTC (rev 15583) +++ projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/AbstractWrappedOutputStream.java 2012-02-03 08:28:22 UTC (rev 15584) @@ -96,7 +96,11 @@ @Override public void flush() throws IOException { - if (written && wrappedStream != null) { + if (!written) { + onFirstWrite(); + written = true; + } + if (wrappedStream != null) { wrappedStream.flush(); } }

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15583 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-02 16:10:08 -0500 (Thu, 02 Feb 2012) New Revision: 15583 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: updating excludes Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-02-02 21:06:08 UTC (rev 15582) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-02-02 21:10:08 UTC (rev 15583) @@ -585,6 +585,9 @@  <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude> + </excludes> </configuration> </plugin> @@ -751,6 +754,9 @@  <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude> + </excludes> </configuration> </plugin> @@ -917,6 +923,9 @@  <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude> + </excludes> </configuration> </plugin>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15582 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-02 16:06:08 -0500 (Thu, 02 Feb 2012) New Revision: 15582 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: updating excludes Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-02 20:58:37 UTC (rev 15581) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-02 21:06:08 UTC (rev 15582) @@ -737,6 +737,9 @@  <exclude>org/jboss/test/ws/jaxws/as2961/AS2961TestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude> + </excludes> </configuration> </plugin> @@ -917,6 +920,9 @@  <exclude>org/jboss/test/ws/jaxws/as2961/AS2961TestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude> + </excludes> </configuration> </plugin> @@ -1097,6 +1103,9 @@  <exclude>org/jboss/test/ws/jaxws/as2961/AS2961TestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/as3581/AS3581TestCase*</exclude> + </excludes> </configuration> </plugin>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15581 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-02 15:58:37 -0500 (Thu, 02 Feb 2012) New Revision: 15581 Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/AS3581TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointIface.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointIface2.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointImpl.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointImpl2.java shared-testsuite/trunk/testsuite/src/test/resources/jaxws/as3581/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/as3581/WEB-INF/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/as3581/WEB-INF/web.xml Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml Log: [AS7-3581] providing test case to reproduce the issue Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-02-02 20:08:36 UTC (rev 15580) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-02-02 20:58:37 UTC (rev 15581) @@ -1122,6 +1122,16 @@ </classes> </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-as3581.war" webxml="${tests.output.dir}/test-resources/jaxws/as3581/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/as3581/EndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/as3581/EndpointIface.class"/> + <include name="org/jboss/test/ws/jaxws/as3581/EndpointImpl2.class"/> + <include name="org/jboss/test/ws/jaxws/as3581/EndpointIface2.class"/> + </classes> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3367-usecase1.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3367/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/AS3581TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/AS3581TestCase.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/AS3581TestCase.java 2012-02-02 20:58:37 UTC (rev 15581) @@ -0,0 +1,65 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.as3581; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [AS7-3581] Tests manual JNDI lookup in @Oneway annotated method. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public class AS3581TestCase extends JBossWSTest +{ + + public static Test suite() + { + return new JBossWSTestSetup(AS3581TestCase.class, "jaxws-as3581.war"); + } + + public void testEndpoint() throws Exception + { + // test one-way scenario + final QName serviceName = new QName("org.jboss.test.ws.jaxws.as3581", "SimpleService"); + final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-as3581/SimpleService?wsdl"); + final Service service = Service.create(wsdlURL, serviceName); + final EndpointIface port = service.getPort(EndpointIface.class); + port.doit(); + // test req-resp scenario + final QName serviceName2 = new QName("org.jboss.test.ws.jaxws.as3581", "SimpleService2"); + final URL wsdlURL2 = new URL("http://" + getServerHost() + ":8080/jaxws-as3581/SimpleService2?wsdl"); + final Service service2 = Service.create(wsdlURL2, serviceName2); + final EndpointIface2 port2 = service2.getPort(EndpointIface2.class); + final String oneWayLookupString = port2.getString(); + assertEquals("Ahoj", oneWayLookupString); + } + +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointIface.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointIface.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointIface.java 2012-02-02 20:58:37 UTC (rev 15581) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.as3581; + +import javax.jws.Oneway; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@WebService +@SOAPBinding +public interface EndpointIface +{ + + @Oneway + void doit(); + +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointIface2.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointIface2.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointIface2.java 2012-02-02 20:58:37 UTC (rev 15581) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.as3581; + +import javax.jws.Oneway; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@WebService +@SOAPBinding +public interface EndpointIface2 +{ + + String getString(); + +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointImpl.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointImpl.java 2012-02-02 20:58:37 UTC (rev 15581) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.as3581; + +import javax.jws.Oneway; +import javax.jws.WebService; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +/** + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@WebService( + endpointInterface = "org.jboss.test.ws.jaxws.as3581.EndpointIface", + targetNamespace = "org.jboss.test.ws.jaxws.as3581", + serviceName = "SimpleService" +) +public class EndpointImpl +{ + + static String value; + static RuntimeException ex; + + @Oneway + public void doit() + { + try + { + value = (String)(new InitialContext().lookup("java:comp/env/message")); + if (!"Ahoj".equals(value)) + { + ex = new RuntimeException("JNDI lookup in @Oneway method failed"); + } + } + catch (final NamingException e) + { + ex = new RuntimeException("JNDI lookup in @Oneway method failed", e); + } + } + +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointImpl2.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointImpl2.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as3581/EndpointImpl2.java 2012-02-02 20:58:37 UTC (rev 15581) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.as3581; + +import javax.jws.Oneway; +import javax.jws.WebService; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +/** + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@WebService( + endpointInterface = "org.jboss.test.ws.jaxws.as3581.EndpointIface2", + targetNamespace = "org.jboss.test.ws.jaxws.as3581", + serviceName = "SimpleService2" +) +public class EndpointImpl2 +{ + + public String getString() + { + if (EndpointImpl.ex != null) throw EndpointImpl.ex; + return EndpointImpl.value; + } + +} Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/as3581/WEB-INF/web.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/as3581/WEB-INF/web.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/as3581/WEB-INF/web.xml 2012-02-02 20:58:37 UTC (rev 15581) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="3.0" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + metadata-complete="false"> + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.as3581.EndpointImpl</servlet-class> + </servlet> + <servlet> + <servlet-name>TestService2</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.as3581.EndpointImpl2</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/SimpleService</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>TestService2</servlet-name> + <url-pattern>/SimpleService2</url-pattern> + </servlet-mapping> + <env-entry> + <env-entry-name>message</env-entry-name> + <env-entry-type>java.lang.String</env-entry-type> + <env-entry-value>Ahoj</env-entry-value> + </env-entry> +</web-app> \ No newline at end of file

12 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2012