Author: palin Date: 2007-06-17 18:46:21 -0400 (Sun, 17 Jun 2007) New Revision: 3604 Added: branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java Modified: branches/maeste_palin/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml branches/maeste_palin/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml branches/maeste_palin/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml branches/maeste_palin/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml Log: Work in progress on JBWS-1670: added invocation exception handler to deal with InvocationException in different ways according to the stack we are using (SunRI requires us not to unwrap InvocationTargetException before passing it back to the InvokerTube) Modified: branches/maeste_palin/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml =================================================================== --- branches/maeste_palin/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-17 21:35:52 UTC (rev 3603) +++ branches/maeste_palin/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-17 22:46:21 UTC (rev 3604) @@ -132,6 +132,7 @@ <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/> Modified: branches/maeste_palin/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/maeste_palin/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-17 21:35:52 UTC (rev 3603) +++ branches/maeste_palin/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-17 22:46:21 UTC (rev 3604) @@ -133,6 +133,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss40.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/> Modified: branches/maeste_palin/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/maeste_palin/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-17 21:35:52 UTC (rev 3603) +++ branches/maeste_palin/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-17 22:46:21 UTC (rev 3604) @@ -137,6 +137,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/> Modified: branches/maeste_palin/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/maeste_palin/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-17 21:35:52 UTC (rev 3603) +++ branches/maeste_palin/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-17 22:46:21 UTC (rev 3604) @@ -148,6 +148,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/> Modified: branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-06-17 21:35:52 UTC (rev 3603) +++ branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-06-17 22:46:21 UTC (rev 3604) @@ -25,6 +25,7 @@ import java.util.Map; +import org.jboss.wsf.spi.invocation.InvocationExceptionHandler; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.RequestHandler; @@ -38,7 +39,8 @@ { private String requestHandler; private String lifecycleHandler; - private Map<String,String> invocationHandler; + private Map<String, String> invocationHandler; + private String invocationExceptionHandler; public void setLifecycleHandler(String handler) { @@ -50,11 +52,16 @@ this.requestHandler = handler; } - public void setInvocationHandler(Map<String,String> handlers) + public void setInvocationHandler(Map<String, String> handlers) { this.invocationHandler = handlers; } + public void setInvocationExceptionHandler(String handler) + { + this.invocationExceptionHandler = handler; + } + @Override public void create(Deployment dep) { @@ -97,11 +104,23 @@ String className = invocationHandler.get(dep.getType().toString()); if (className == null) throw new IllegalStateException("Cannot obtain invocation handler for: " + dep.getType()); - + + InvocationExceptionHandler exceptionHandler; try { + Class<?> handlerClass = dep.getClassLoader().loadClass(invocationExceptionHandler); + exceptionHandler = (InvocationExceptionHandler)handlerClass.newInstance(); + } + catch (Exception e) + { + throw new IllegalStateException("Cannot load invocation exception handler: " + invocationExceptionHandler); + } + try + { Class<?> handlerClass = dep.getClassLoader().loadClass(className); - return (InvocationHandler)handlerClass.newInstance(); + InvocationHandler invocationHandlerInstance = (InvocationHandler)handlerClass.newInstance(); + invocationHandlerInstance.setExceptionHandler(exceptionHandler); + return invocationHandlerInstance; } catch (Exception e) { Modified: branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java 2007-06-17 21:35:52 UTC (rev 3603) +++ branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java 2007-06-17 22:46:21 UTC (rev 3604) @@ -23,12 +23,8 @@ // $Id$ -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.reflect.UndeclaredThrowableException; -import javax.management.MBeanException; - import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.utils.JavaUtils; @@ -43,6 +39,8 @@ { // provide logging private static final Logger log = Logger.getLogger(AbstractInvocationHandler.class); + + protected InvocationExceptionHandler exceptionHandler; protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException { @@ -63,39 +61,12 @@ return implMethod; } - protected void handleInvocationException(Throwable th) throws Exception + protected final void handleInvocationException(Throwable th) throws Exception { - if (th instanceof InvocationTargetException) - { - // unwrap the throwable raised by the service endpoint implementation - Throwable targetEx = ((InvocationTargetException)th).getTargetException(); - handleInvocationThrowable(targetEx); - } - - if (th instanceof MBeanException) - { - throw ((MBeanException)th).getTargetException(); - } - - handleInvocationThrowable(th); + //delegate to invocation exception handler + exceptionHandler.handleInvocationException(th); } - private void handleInvocationThrowable(Throwable th) throws Exception - { - if (th instanceof Exception) - { - throw (Exception)th; - } - else if (th instanceof Error) - { - throw (Error)th; - } - else - { - throw new UndeclaredThrowableException(th); - } - } - public void create(Endpoint ep) { log.debug("Create: " + ep.getName()); @@ -115,4 +86,14 @@ { log.debug("Destroy: " + ep.getName()); } + + public InvocationExceptionHandler getExceptionHandler() + { + return exceptionHandler; + } + + public void setExceptionHandler(InvocationExceptionHandler exceptionHandler) + { + this.exceptionHandler = exceptionHandler; + } } Added: branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java (rev 0) +++ branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java 2007-06-17 22:46:21 UTC (rev 3604) @@ -0,0 +1,64 @@ +/* + * 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.wsf.spi.invocation; + +import java.lang.reflect.UndeclaredThrowableException; + +import javax.management.MBeanException; + +/** + * A basic invocation exception handler that simply rethrows Throwable as Exception + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; + * @since 17-Jun-2007 + * + */ +public class BasicInvocationExceptionHandler implements InvocationExceptionHandler +{ + + public void handleInvocationException(Throwable th) throws Exception + { + if (th instanceof MBeanException) + { + throw ((MBeanException)th).getTargetException(); + } + + handleInvocationThrowable(th); + } + + protected void handleInvocationThrowable(Throwable th) throws Exception + { + if (th instanceof Exception) + { + throw (Exception)th; + } + else if (th instanceof Error) + { + throw (Error)th; + } + else + { + throw new UndeclaredThrowableException(th); + } + } + +} Modified: branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java 2007-06-17 21:35:52 UTC (rev 3603) +++ branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java 2007-06-17 22:46:21 UTC (rev 3604) @@ -53,4 +53,5 @@ public void destroy(Endpoint ep) { } + } Added: branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java (rev 0) +++ branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java 2007-06-17 22:46:21 UTC (rev 3604) @@ -0,0 +1,35 @@ +/* + * 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.wsf.spi.invocation; + +/** + * A general invocation exception handler + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; + * @since 17-Jun-2007 + * + */ +public interface InvocationExceptionHandler +{ + public void handleInvocationException(Throwable th) throws Exception; + +} Modified: branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2007-06-17 21:35:52 UTC (rev 3603) +++ branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2007-06-17 22:46:21 UTC (rev 3604) @@ -50,4 +50,7 @@ /** Destroy the invocation handler */ void destroy(Endpoint ep); + + /** Set the handler to be used to deal with invocation exceptions **/ + void setExceptionHandler(InvocationExceptionHandler exceptionHandler); } Added: branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java (rev 0) +++ branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java 2007-06-17 22:46:21 UTC (rev 3604) @@ -0,0 +1,55 @@ +/* + * 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.wsf.spi.invocation; + +import java.lang.reflect.InvocationTargetException; + +import javax.management.MBeanException; + +/** + * An invocation exception handler that unwraps InvocationExceptions + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; + * @since 17-Jun-2007 + * + */ +public class UnwrapInvocationExceptionHandler extends BasicInvocationExceptionHandler +{ + + public void handleInvocationException(Throwable th) throws Exception + { + if (th instanceof InvocationTargetException) + { + // unwrap the throwable raised by the service endpoint implementation + Throwable targetEx = ((InvocationTargetException)th).getTargetException(); + handleInvocationThrowable(targetEx); + } + + if (th instanceof MBeanException) + { + throw ((MBeanException)th).getTargetException(); + } + + handleInvocationThrowable(th); + } + +} Modified: branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-17 21:35:52 UTC (rev 3603) +++ branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-17 22:46:21 UTC (rev 3604) @@ -122,6 +122,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.BasicInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> Modified: branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-06-17 21:35:52 UTC (rev 3603) +++ branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-06-17 22:46:21 UTC (rev 3604) @@ -133,6 +133,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.BasicInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> Modified: branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-17 21:35:52 UTC (rev 3603) +++ branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-17 22:46:21 UTC (rev 3604) @@ -122,6 +122,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> Modified: branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-06-17 21:35:52 UTC (rev 3603) +++ branches/maeste_palin/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-06-17 22:46:21 UTC (rev 3604) @@ -133,6 +133,7 @@ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> + <property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>