[jbossws-commits] JBossWS SVN: r16748 - in stack/cxf/branches/ropalka_JBWS-3550: modules/dist and 6 other directories.

Author: richard.opalka(a)jboss.com Date: 2012-09-20 05:38:09 -0400 (Thu, 20 Sep 2012) New Revision: 16748 Removed: stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextFactoryImpl.java stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/test/java/org/jboss/wsf/stack/cxf/JBossWSInvokerTest.java Modified: stack/cxf/branches/ropalka_JBWS-3550/modules/dist/pom.xml stack/cxf/branches/ropalka_JBWS-3550/modules/dist/src/main/distro/build-deploy.xml stack/cxf/branches/ropalka_JBWS-3550/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java stack/cxf/branches/ropalka_JBWS-3550/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml stack/cxf/branches/ropalka_JBWS-3550/pom.xml Log: [JBWS-3550] switch to new JAXWS POJO invocation process Modified: stack/cxf/branches/ropalka_JBWS-3550/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/ropalka_JBWS-3550/modules/dist/pom.xml 2012-09-20 09:02:57 UTC (rev 16747) +++ stack/cxf/branches/ropalka_JBWS-3550/modules/dist/pom.xml 2012-09-20 09:38:09 UTC (rev 16748) @@ -146,6 +146,10 @@ <artifactId>jbossws-jboss712-server-integration</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jandex</artifactId> + </dependency> <!--junit--> <dependency> <groupId>junit</groupId> Modified: stack/cxf/branches/ropalka_JBWS-3550/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/ropalka_JBWS-3550/modules/dist/src/main/distro/build-deploy.xml 2012-09-20 09:02:57 UTC (rev 16747) +++ stack/cxf/branches/ropalka_JBWS-3550/modules/dist/src/main/distro/build-deploy.xml 2012-09-20 09:38:09 UTC (rev 16748) @@ -31,13 +31,20 @@ <target name="deploy-structure-jboss71x" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <path id="jbossws-common.path"> + <path id="jboss.ant.tasks.classpath"> <fileset dir="${deploy.artifacts.dir}"> <include name="**/jbossws-common-tools.jar"/> + <include name="**/jandex.jar"/> </fileset> </path> - <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> + <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jboss.ant.tasks.classpath"/> + <taskdef name="jandex" classname="org.jboss.jandex.JandexAntTask" classpathref="jboss.ant.tasks.classpath"/> + <jandex run="true" verbose="false" newJar="true"> + <fileset dir="${deploy.artifacts.dir}/lib"> + <include name="cxf*security.jar"/> + </fileset> + </jandex> <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> @@ -140,13 +147,20 @@ <target name="deploy-structure-jboss72x" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <path id="jbossws-common.path"> + <path id="jboss.ant.tasks.classpath"> <fileset dir="${deploy.artifacts.dir}"> <include name="**/jbossws-common-tools.jar"/> + <include name="**/jandex.jar"/> </fileset> </path> - <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> + <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jboss.ant.tasks.classpath"/> + <taskdef name="jandex" classname="org.jboss.jandex.JandexAntTask" classpathref="jboss.ant.tasks.classpath"/> + <jandex run="true" verbose="false" newJar="true"> + <fileset dir="${deploy.artifacts.dir}/lib"> + <include name="cxf*security.jar"/> + </fileset> + </jandex> <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> Modified: stack/cxf/branches/ropalka_JBWS-3550/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/ropalka_JBWS-3550/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-09-20 09:02:57 UTC (rev 16747) +++ stack/cxf/branches/ropalka_JBWS-3550/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-09-20 09:38:09 UTC (rev 16748) @@ -42,6 +42,7 @@ <include>org.apache.cxf.xjcplugins:cxf-*</include> <include>com.sun.xml.bind:jaxb-impl:jar</include> <include>com.sun.xml.bind:jaxb-xjc:jar</include> + <include>org.jboss:jandex:jar</include> <include>org.jboss.ws:jbossws-api:jar</include> <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> Modified: stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java =================================================================== --- stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2012-09-20 09:02:57 UTC (rev 16747) +++ stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2012-09-20 09:38:09 UTC (rev 16748) @@ -91,12 +91,6 @@ } @Override - public void destroy() - { - ServletHelper.callPreDestroy(endpoint); - } - - @Override public void doHead(HttpServletRequest request, HttpServletResponse response, ServletContext context) throws ServletException, IOException { Modified: stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java =================================================================== --- stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2012-09-20 09:02:57 UTC (rev 16747) +++ stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2012-09-20 09:38:09 UTC (rev 16748) @@ -43,12 +43,12 @@ import java.util.List; import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.jaxws.JAXWSMethodInvoker; +import org.apache.cxf.jaxws.context.WebServiceContextImpl; import org.apache.cxf.message.Exchange; import org.apache.cxf.message.MessageContentsList; import org.apache.cxf.service.Service; @@ -57,15 +57,12 @@ import org.apache.cxf.service.invoker.MethodDispatcher; 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; import org.jboss.wsf.spi.deployment.Endpoint; 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; /** * A JBossWS extension of the Apache CXF JAXWSMethodInvoker invoker. @@ -101,7 +98,6 @@ public class JBossWSInvoker extends JAXWSMethodInvoker implements Invoker { private Object targetBean; - private WebServiceContextFactory contextFactory; private NamespaceContextSelectorWrapperFactory nsCtxSelectorFactory; public JBossWSInvoker() { @@ -155,9 +151,6 @@ } finally { //make sure the right bus is restored after coming back from the endpoint method BusFactory.setThreadDefaultBus(threadBus); - if (ep.getAttachment(Object.class) == null) { //JBWS-2486 - ep.addAttachment(Object.class, inv.getInvocationContext().getTargetBean()); - } clearNamespaceContextSelector(exchange); } } @@ -165,20 +158,14 @@ private Invocation createInvocation(InvocationHandler invHandler, Endpoint ep, Method m, Object[] paramArray) { Invocation inv = invHandler.createInvocation(); InvocationContext invContext = inv.getInvocationContext(); - WebServiceContext wsCtx = getWebServiceContext(null); + WebServiceContext wsCtx = new WebServiceContextImpl(null); invContext.addAttachment(WebServiceContext.class, wsCtx); - invContext.addAttachment(MessageContext.class, wsCtx.getMessageContext()); - invContext.setTargetBean(targetBean != null ? targetBean : ep.getAttachment(Object.class)); //JBWS-2486 - JBWS-3002 + invContext.setTargetBean(targetBean); inv.setJavaMethod(m); inv.setArgs(paramArray); return inv; } - protected WebServiceContext getWebServiceContext(MessageContext msgCtx) - { - return getWebServiceContextFactory().newWebServiceContext(msgCtx); - } - protected void setNamespaceContextSelector(Exchange exchange) { if (exchange.isOneWay() && nsCtxSelectorFactory != null) @@ -194,15 +181,4 @@ nsCtxSelectorFactory.getWrapper().clearCurrentThreadSelector(exchange); } } - - protected synchronized WebServiceContextFactory getWebServiceContextFactory() - { - if (contextFactory == null) - { - ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(); - SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider(); - contextFactory = spiProvider.getSPI(WebServiceContextFactory.class, cl); - } - return contextFactory; - } } Deleted: stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextFactoryImpl.java =================================================================== --- stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextFactoryImpl.java 2012-09-20 09:02:57 UTC (rev 16747) +++ stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextFactoryImpl.java 2012-09-20 09:38:09 UTC (rev 16748) @@ -1,44 +0,0 @@ -/* - * 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; - -import javax.xml.ws.handler.MessageContext; - -import org.apache.cxf.jaxws.context.WebServiceContextImpl; -import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; -import org.jboss.wsf.spi.invocation.WebServiceContextDelegate; -import org.jboss.wsf.spi.invocation.WebServiceContextFactory; - -/** - * WebServiceContext factory for CXF integration. - * - * @author alessio.soldano(a)jboss.com - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public class WebServiceContextFactoryImpl extends WebServiceContextFactory -{ - @Override - public ExtensibleWebServiceContext newWebServiceContext(MessageContext messageContext) - { - return new WebServiceContextDelegate(new WebServiceContextImpl(messageContext)); - } -} Modified: stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java =================================================================== --- stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2012-09-20 09:02:57 UTC (rev 16747) +++ stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2012-09-20 09:38:09 UTC (rev 16748) @@ -21,8 +21,6 @@ */ package org.jboss.wsf.stack.cxf.transport; -import static org.jboss.ws.common.integration.WSHelper.isJaxwsJseEndpoint; - import java.io.IOException; import java.util.List; import java.util.ResourceBundle; @@ -47,7 +45,6 @@ import org.apache.cxf.management.interceptor.ResponseTimeMessageOutInterceptor; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.ObjectNameFactory; -import org.jboss.ws.common.injection.InjectionHelper; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.classloading.ClassLoaderProvider; @@ -118,8 +115,6 @@ private static void injectServiceAndHandlerResources(Endpoint endpoint) { ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class); - // ping endpoint to force injection - endpoint.getInstanceProvider().getInstance(endpoint.getTargetBeanName()); if (factory != null) { List<Handler> chain = ((JaxWsEndpointImpl) factory.getServer().getEndpoint()).getJaxwsBinding() @@ -129,30 +124,11 @@ for (Handler handler : chain) { final Reference handlerReference = endpoint.getInstanceProvider().getInstance(handler.getClass().getName()); - if (!handlerReference.isInitialized()) { - final Object handlerInstance = handlerReference.getValue(); - InjectionHelper.callPostConstructMethod(handlerInstance); - handlerReference.setInitialized(); - } } } } } - public static void callPreDestroy(Endpoint endpoint) - { - ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class); - if (factory != null) - { - if (isJaxwsJseEndpoint(endpoint) && factory.getServiceBean() != null) - { - final Reference epReference = endpoint.getInstanceProvider().getInstance(factory.getServiceBean().getClass().getName()); - final Object epInstance = epReference.getValue(); - InjectionHelper.callPreDestroyMethod(epInstance); - } - } - } - public static void callRequestHandler(HttpServletRequest req, HttpServletResponse res, ServletContext ctx, Bus bus, Endpoint endpoint) throws ServletException { Deleted: stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/test/java/org/jboss/wsf/stack/cxf/JBossWSInvokerTest.java =================================================================== --- stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/test/java/org/jboss/wsf/stack/cxf/JBossWSInvokerTest.java 2012-09-20 09:02:57 UTC (rev 16747) +++ stack/cxf/branches/ropalka_JBWS-3550/modules/server/src/test/java/org/jboss/wsf/stack/cxf/JBossWSInvokerTest.java 2012-09-20 09:38:09 UTC (rev 16748) @@ -1,105 +0,0 @@ -/* - * 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; - -import java.lang.reflect.Method; -import java.util.List; - -import javax.xml.ws.WebServiceContext; - -import junit.framework.TestCase; - -import org.apache.cxf.endpoint.Endpoint; -import org.apache.cxf.message.Exchange; -import org.apache.cxf.message.ExchangeImpl; -import org.apache.cxf.message.Message; -import org.apache.cxf.message.MessageImpl; -import org.apache.cxf.service.Service; -import org.apache.cxf.service.ServiceImpl; -import org.apache.cxf.service.invoker.MethodDispatcher; -import org.apache.cxf.service.model.BindingOperationInfo; -import org.apache.cxf.service.model.OperationInfo; - - -/** - * A test case for CXF Invoker integration - * - * @author alessio.soldano(a)jboss.com - * @since 20-Jun-2012 - * - */ -public class JBossWSInvokerTest extends TestCase -{ - /** - * The JBossWSInvoker internals rely on the Apache CXF side of the Invoker abstraction to properly - * set the generated WrappedMessageContext into the WebServiceContextImpl's threadlocal. As a consequence, - * the JBossWSInvoker::performInvocation method can build up the JBoss integration WebServiceContext without - * needing to pass in a MessageContext, as the properly created one is automatically retrieved internally - * using the Apache CXF thread local. This all however assumes the Invoker inheritance tree is not erroneously - * changed or the integration is not inadvertently broken in some way. - * This test hence verifies the MessageContext instance is available inside the performInvocation method. - */ - public void testMessageContextThreadLocal() - { - TestInvoker invoker = new TestInvoker(); - Exchange exchange = getTestExchange(); - Object obj = invoker.invoke(exchange, null); - String res = obj instanceof List<?> ? ((List<?>)obj).get(0).toString() : obj.toString(); - assertEquals("OK", res); - } - - private static class TestInvoker extends JBossWSInvoker - { - @Override - protected Object performInvocation(Exchange exchange, final Object serviceObject, Method m, Object[] paramArray) - throws Exception - { - WebServiceContext wsCtx = getWebServiceContext(null); - return wsCtx.getMessageContext() != null ? "OK" : "FAIL"; - } - } - - //build up a fake exchange instance, the minimum required to let the flow proceed till the JBossWSInvoker - private Exchange getTestExchange() { - Exchange exchange = new ExchangeImpl(); - Message message = new MessageImpl(); - message.setExchange(exchange); - exchange.setInMessage(message); - Service service = new ServiceImpl(); - MethodDispatcher md = new MethodDispatcher() { - @Override - public Method getMethod(BindingOperationInfo op) { - return this.getClass().getMethods()[0]; - } - @Override - public BindingOperationInfo getBindingOperation(Method m, Endpoint endpoint) { - return null; - } - @Override - public void bind(OperationInfo o, Method... methods) { - } - }; - service.put(MethodDispatcher.class.getName(), md); - exchange.put(Service.class, service); - return exchange; - } -} Modified: stack/cxf/branches/ropalka_JBWS-3550/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/branches/ropalka_JBWS-3550/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-09-20 09:02:57 UTC (rev 16747) +++ stack/cxf/branches/ropalka_JBWS-3550/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-09-20 09:38:09 UTC (rev 16748) @@ -394,7 +394,7 @@ <include name="stsKeystore.properties" /> </zipfileset> <manifest> - <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf.impl"/> <!-- cxf impl required to extend STS impl --> + <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf.impl annotations"/> <!-- cxf impl required to extend STS impl --> </manifest> </war> Modified: stack/cxf/branches/ropalka_JBWS-3550/pom.xml =================================================================== --- stack/cxf/branches/ropalka_JBWS-3550/pom.xml 2012-09-20 09:02:57 UTC (rev 16747) +++ stack/cxf/branches/ropalka_JBWS-3550/pom.xml 2012-09-20 09:38:09 UTC (rev 16748) @@ -67,7 +67,7 @@ <jbossws.jboss710.version>4.1.0-SNAPSHOT</jbossws.jboss710.version> <jbossws.jboss711.version>4.1.0-SNAPSHOT</jbossws.jboss711.version> <jbossws.jboss712.version>4.1.0-SNAPSHOT</jbossws.jboss712.version> - <jbossws.native.version>4.1.0.Beta2</jbossws.native.version> + <jbossws.native.version>4.1.0-SNAPSHOT</jbossws.native.version> <jboss710.version>7.1.0.Final</jboss710.version> <jboss711.version>7.1.1.Final</jboss711.version> <jboss712.version>7.1.2.Final</jboss712.version> @@ -78,6 +78,7 @@ <cxf.xjcplugins.version>2.6.0</cxf.xjcplugins.version> <fastinfoset.api.version>1.2.9</fastinfoset.api.version> <jboss.common.core.version>2.2.17.GA</jboss.common.core.version> + <jboss.jandex.version>1.0.3.Final</jboss.jandex.version> <jboss.logging.version>3.1.0.GA</jboss.logging.version> <jboss.xb.version>2.0.3.GA</jboss.xb.version> <picketbox.version>4.0.9.Final</picketbox.version> @@ -1217,6 +1218,11 @@ <version>${commons.logging.version}</version> </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jandex</artifactId> + <version>${jboss.jandex.version}</version> + </dependency> + <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> <version>${jboss.logging.version}</version>