[jbossws-commits] JBossWS SVN: r3683 - in trunk: integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF and 23 other directories.

Author: maeste Date: 2007-06-22 04:30:37 -0400 (Fri, 22 Jun 2007) New Revision: 3683 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java Removed: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/UserException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/UserExceptionBean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java trunk/integration/sunri/.classpath trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/integration/sunri/build.xml trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml trunk/integration/sunri/src/test/resources/test-excludes.txt trunk/integration/sunri/version.properties trunk/integration/xfire/.classpath trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/ant-import/build-thirdparty.xml trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml trunk/testsuite/ant-import/build-jars-jaxws.xml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java trunk/testsuite/src/resources/jaxws/samples/exception/WEB-INF/web.xml Log: svn merge -c 3581 https://svn.jboss.org/repos/jbossws/branches/maeste_palin First implementation of JDKLogRedirector for JBWS-1675 JBWS-1678 svn merge -c 3589 https://svn.jboss.org/repos/jbossws/branches/maeste_palin Added wsdl4j.jar library required for integration tests svn merge -r 3590:3619 https://svn.jboss.org/repos/jbossws/branches/maeste_palin Minor changes on JDKLogRedirector moving JDKLogRedirector. First step, partial commit moving JDKLogRedirect on integration/sunri source directory. Second and final step Bean code is more elegant with start method ;) Removed some unuseful logs 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) FIxed JBWS-1669. Modify exception sample to use a real jaxws client for tests. Fixed JBWS-1670 . Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -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.spi.deployment.EndpointNameDeployer"/> Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -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.spi.deployment.EndpointNameDeployer"/> Modified: trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -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.spi.deployment.EndpointNameDeployer"/> Modified: trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -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.spi.deployment.EndpointNameDeployer"/> Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -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: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/AbstractInvocationHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -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; + } } Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java (from rev 3619, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationExceptionHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -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: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -53,4 +53,5 @@ public void destroy(Endpoint ep) { } + } Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java (from rev 3619, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationExceptionHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -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: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -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); } Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java (from rev 3619, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/UnwrapInvocationExceptionHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -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); + } + +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log (from rev 3581, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log) Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java 2007-06-14 12:50:56 UTC (rev 3581) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,116 +0,0 @@ -/* - * 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.utils.log; - -import java.util.logging.ErrorManager; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.SimpleFormatter; - -import org.jboss.logging.Logger; - -/** - * A Handler (java.util.logging.Handler) class redirecting messages - * to the jboss logging system. - * - * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; - * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; - * @since 14-Jun-2007 - * - */ -public class JBossLogHandler extends Handler -{ - - public JBossLogHandler() - { - super.setFormatter(new SimpleFormatter()); - } - - @Override - public void publish(LogRecord record) - { - if (!isLoggable(record)) - { - return; - } - String msg; - try - { - msg = getFormatter().formatMessage(record); - } - catch (Exception ex) - { - // We don't want to throw an exception here, but we - // report the exception to any registered ErrorManager. - reportError(null, ex, ErrorManager.FORMAT_FAILURE); - return; - } - if (record.getLevel() == Level.INFO) - { - Logger.getLogger(record.getSourceClassName()).info(msg); - } - else if (record.getLevel() == Level.SEVERE) - { - Logger.getLogger(record.getSourceClassName()).error(msg); - } - else if (record.getLevel() == Level.WARNING) - { - Logger.getLogger(record.getSourceClassName()).warn(msg); - } - else if (record.getLevel() == Level.FINE) - { - Logger.getLogger(record.getSourceClassName()).debug(msg); - } - else if (record.getLevel() == Level.FINER || record.getLevel() == Level.FINEST) - { - Logger.getLogger(record.getSourceClassName()).trace(msg); - } - else - { - Logger.getLogger(record.getSourceClassName()).debug(msg); - } - } - - @Override - public boolean isLoggable(LogRecord record) - { - if (record == null) - { - return false; - } - return super.isLoggable(record); - } - - @Override - public void flush() - { - //nothing to do - } - - @Override - public void close() throws SecurityException - { - //nothing to do - } - -} \ No newline at end of file Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java (from rev 3581, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JBossLogHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,116 @@ +/* + * 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.utils.log; + +import java.util.logging.ErrorManager; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.SimpleFormatter; + +import org.jboss.logging.Logger; + +/** + * A Handler (java.util.logging.Handler) class redirecting messages + * to the jboss logging system. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; + * @since 14-Jun-2007 + * + */ +public class JBossLogHandler extends Handler +{ + + public JBossLogHandler() + { + super.setFormatter(new SimpleFormatter()); + } + + @Override + public void publish(LogRecord record) + { + if (!isLoggable(record)) + { + return; + } + String msg; + try + { + msg = getFormatter().formatMessage(record); + } + catch (Exception ex) + { + // We don't want to throw an exception here, but we + // report the exception to any registered ErrorManager. + reportError(null, ex, ErrorManager.FORMAT_FAILURE); + return; + } + if (record.getLevel() == Level.INFO) + { + Logger.getLogger(record.getSourceClassName()).info(msg); + } + else if (record.getLevel() == Level.SEVERE) + { + Logger.getLogger(record.getSourceClassName()).error(msg); + } + else if (record.getLevel() == Level.WARNING) + { + Logger.getLogger(record.getSourceClassName()).warn(msg); + } + else if (record.getLevel() == Level.FINE) + { + Logger.getLogger(record.getSourceClassName()).debug(msg); + } + else if (record.getLevel() == Level.FINER || record.getLevel() == Level.FINEST) + { + Logger.getLogger(record.getSourceClassName()).trace(msg); + } + else + { + Logger.getLogger(record.getSourceClassName()).debug(msg); + } + } + + @Override + public boolean isLoggable(LogRecord record) + { + if (record == null) + { + return false; + } + return super.isLoggable(record); + } + + @Override + public void flush() + { + //nothing to do + } + + @Override + public void close() throws SecurityException + { + //nothing to do + } + +} \ No newline at end of file Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java 2007-06-14 12:50:56 UTC (rev 3581) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,112 +0,0 @@ -/* - * 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.utils.log; - -import java.util.LinkedList; -import java.util.List; -import java.util.logging.Filter; -import java.util.logging.Handler; -import java.util.logging.Level; - -import org.jboss.logging.Logger; - -/** - * Redirects JDK Logger output to the JBoss Logger. - * - * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; - * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; - * @since 14-Jun-2007 - * - */ -public class JDKLogRedirector -{ - private List<String> namespaces = new LinkedList<String>(); - - public JDKLogRedirector() - { - } - - public void changeHandlers() - { - for (String ns : namespaces) - { - changeHandler(ns); - } - } - - /** - * Modifies the jdk root logger in order not to log records coming from - * loggers with the provided namespace; these records are then logged - * through the JBoss Logger. - * - * @param ns - */ - public void changeHandler(String ns) - { - if (ns == null) - ns = ""; - Logger.getLogger(this.getClass()).info("Changing current root logger's log handlers to hide logs with namespace " + ns); - java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger(""); - Handler[] handlers = jdkRootLogger.getHandlers(); - for (int i = 0; i < handlers.length; i++) - { - Handler handler = handlers[i]; - if (!(handler instanceof JBossLogHandler)) - { - StringBuffer sb = new StringBuffer("Disableing handler "); - sb.append(handler).append(" with level ").append(handler.getLevel()); - Logger.getLogger(this.getClass()).debug(sb); - Filter f = handler.getFilter(); - if (f != null && f instanceof NamespaceFilter) - { - ((NamespaceFilter)f).addNamespace(ns); - } - else - { - NamespaceFilter nsFilter = new NamespaceFilter(false); - nsFilter.addNamespace(ns); - handler.setFilter(nsFilter); - } - } - } - Handler jbossLogHandler = new JBossLogHandler(); - jbossLogHandler.setLevel(Level.ALL); - java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler); - } - - public void addNamespace(String ns) - { - namespaces.add(ns); - changeHandler(ns); - } - - public List<String> getNamespaces() - { - return namespaces; - } - - public void setNamespaces(List<String> namespaces) - { - this.namespaces = namespaces; - changeHandlers(); - } -} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java (from rev 3581, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/JDKLogRedirector.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,112 @@ +/* + * 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.utils.log; + +import java.util.LinkedList; +import java.util.List; +import java.util.logging.Filter; +import java.util.logging.Handler; +import java.util.logging.Level; + +import org.jboss.logging.Logger; + +/** + * Redirects JDK Logger output to the JBoss Logger. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; + * @since 14-Jun-2007 + * + */ +public class JDKLogRedirector +{ + private List<String> namespaces = new LinkedList<String>(); + + public JDKLogRedirector() + { + } + + public void changeHandlers() + { + for (String ns : namespaces) + { + changeHandler(ns); + } + } + + /** + * Modifies the jdk root logger in order not to log records coming from + * loggers with the provided namespace; these records are then logged + * through the JBoss Logger. + * + * @param ns + */ + public void changeHandler(String ns) + { + if (ns == null) + ns = ""; + Logger.getLogger(this.getClass()).info("Changing current root logger's log handlers to hide logs with namespace " + ns); + java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger(""); + Handler[] handlers = jdkRootLogger.getHandlers(); + for (int i = 0; i < handlers.length; i++) + { + Handler handler = handlers[i]; + if (!(handler instanceof JBossLogHandler)) + { + StringBuffer sb = new StringBuffer("Disableing handler "); + sb.append(handler).append(" with level ").append(handler.getLevel()); + Logger.getLogger(this.getClass()).debug(sb); + Filter f = handler.getFilter(); + if (f != null && f instanceof NamespaceFilter) + { + ((NamespaceFilter)f).addNamespace(ns); + } + else + { + NamespaceFilter nsFilter = new NamespaceFilter(false); + nsFilter.addNamespace(ns); + handler.setFilter(nsFilter); + } + } + } + Handler jbossLogHandler = new JBossLogHandler(); + jbossLogHandler.setLevel(Level.ALL); + java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler); + } + + public void addNamespace(String ns) + { + namespaces.add(ns); + changeHandler(ns); + } + + public List<String> getNamespaces() + { + return namespaces; + } + + public void setNamespaces(List<String> namespaces) + { + this.namespaces = namespaces; + changeHandlers(); + } +} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java =================================================================== --- branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java 2007-06-14 12:50:56 UTC (rev 3581) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,96 +0,0 @@ -/* - * 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.utils.log; - -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.logging.Filter; -import java.util.logging.LogRecord; - -/** - * A log filter allowing logging of LogRecord depending on the - * namespace of the Logger they have been collected by. - * - * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; - * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; - * @since 14-Jun-2007 - * - */ -public class NamespaceFilter implements Filter -{ - - private Set<String> namespaces; - private boolean show; - - public NamespaceFilter(boolean show) - { - this.show = show; - } - - public boolean isLoggable(LogRecord record) - { - String loggerName = record.getLoggerName(); - if (loggerName == null) - { - return true; - } - else - { - for (String ns : namespaces) - { - if (loggerName.startsWith(ns)) - { - return show; - } - } - return !show; - } - } - - public void addNamespace(String ns) - { - if (namespaces == null) - namespaces = new LinkedHashSet<String>(); - namespaces.add(ns); - } - - public Set<String> getNamespaces() - { - return namespaces; - } - - public void setNamespaces(Set<String> namespaces) - { - this.namespaces = namespaces; - } - - public boolean isShow() - { - return show; - } - - public void setShow(boolean show) - { - this.show = show; - } - -} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java (from rev 3581, branches/maeste_palin/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/log/NamespaceFilter.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,96 @@ +/* + * 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.utils.log; + +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.logging.Filter; +import java.util.logging.LogRecord; + +/** + * A log filter allowing logging of LogRecord depending on the + * namespace of the Logger they have been collected by. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; + * @since 14-Jun-2007 + * + */ +public class NamespaceFilter implements Filter +{ + + private Set<String> namespaces; + private boolean show; + + public NamespaceFilter(boolean show) + { + this.show = show; + } + + public boolean isLoggable(LogRecord record) + { + String loggerName = record.getLoggerName(); + if (loggerName == null) + { + return true; + } + else + { + for (String ns : namespaces) + { + if (loggerName.startsWith(ns)) + { + return show; + } + } + return !show; + } + } + + public void addNamespace(String ns) + { + if (namespaces == null) + namespaces = new LinkedHashSet<String>(); + namespaces.add(ns); + } + + public Set<String> getNamespaces() + { + return namespaces; + } + + public void setNamespaces(Set<String> namespaces) + { + this.namespaces = namespaces; + } + + public boolean isShow() + { + return show; + } + + public void setShow(boolean show) + { + this.show = show; + } + +} Modified: trunk/integration/sunri/.classpath =================================================================== --- trunk/integration/sunri/.classpath 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/.classpath 2007-06-22 08:30:37 UTC (rev 3683) @@ -24,5 +24,6 @@ <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> + <classpathentry kind="lib" path="/dati/jboss-4.2.0.CR2/lib/jboss-common.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -42,6 +42,7 @@ <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/wsdl4j.jar"/> </path> <path id="tests.extra.classpath"> Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -65,7 +65,8 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-ri-src.jar" dest="${thirdparty.dir}/jaxws-ri-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> - + <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> + <checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/> </target> Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/build.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -118,7 +118,8 @@ <exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/> <include name="org/jboss/wsf/stack/sunri50/**"/> <include name="org/jboss/wsf/stack/sunri/metadata/**"/> - <include name="org/jboss/wsf/stack/sunri/*"/> + <include name="org/jboss/wsf/stack/sunri/log/**"/> + <include name="org/jboss/wsf/stack/sunri/*"/> </fileset> </jar> Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -28,6 +28,7 @@ import javax.xml.ws.Provider; import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.EndpointAssociation; @@ -50,6 +51,8 @@ public class InvokerEJB3 extends Invoker { private final InstanceResolver resolver; + + private WSWebServiceContext wsc; public InvokerEJB3(InstanceResolver resolver) { @@ -60,6 +63,7 @@ public void start(@NotNull WSWebServiceContext wsc, @NotNull WSEndpoint endpoint) { resolver.start(wsc, endpoint); + this.wsc = wsc; } @Override @@ -82,6 +86,9 @@ InvocationHandler invHandler = ep.getInvocationHandler(); Invocation inv = invHandler.createInvocation(); + + inv.getInvocationContext().addAttachment(MessageContext.class, wsc.getMessageContext()); + inv.setJavaMethod(m); inv.setArgs(args); Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log (from rev 3619, branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log) Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java =================================================================== --- branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,147 +0,0 @@ -/* - * 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.stack.sunri.log; - -import java.util.Map; -import java.util.logging.ErrorManager; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.SimpleFormatter; - -import org.jboss.logging.Logger; - -/** - * A Handler (java.util.logging.Handler) class redirecting messages - * to the jboss logging system. - * - * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; - * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; - * @since 14-Jun-2007 - * - */ -public class JBossLogHandler extends Handler -{ - private Map<String, String> levelMap; - private String defaultLevel; - - public JBossLogHandler(Map<String, String> levelMap, String defaultLevel) - { - super.setFormatter(new SimpleFormatter()); - this.levelMap = levelMap; - this.defaultLevel = defaultLevel; - } - - @Override - public void publish(LogRecord record) - { - if (!isLoggable(record)) - { - return; - } - String msg; - try - { - msg = getFormatter().formatMessage(record); - } - catch (Exception ex) - { - // We don't want to throw an exception here, but we - // report the exception to any registered ErrorManager. - reportError(null, ex, ErrorManager.FORMAT_FAILURE); - return; - } - - String level = levelMap.get(record.getLevel().getName()); - level = level == null ? levelMap.get(record.getLevel().getName().toUpperCase()): level; - level = level == null ? defaultLevel : level; - if ("info".equalsIgnoreCase(level)) - { - if (Logger.getLogger(record.getSourceClassName()).isInfoEnabled()) - { - Logger.getLogger(record.getSourceClassName()).info(msg); - } - else - { - Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); - } - - } - else if ("error".equalsIgnoreCase(level)) - { - Logger.getLogger(record.getSourceClassName()).error(msg); - } - else if ("warn".equalsIgnoreCase(level)) - { - Logger.getLogger(record.getSourceClassName()).warn(msg); - } - else if ("debug".equalsIgnoreCase(level)) - { - if (Logger.getLogger(record.getSourceClassName()).isDebugEnabled()) - { - Logger.getLogger(record.getSourceClassName()).debug(msg); - } - else - { - Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); - } - } - else if ("trace".equalsIgnoreCase(level)) - { - if (Logger.getLogger(record.getSourceClassName()).isTraceEnabled()) - { - Logger.getLogger(record.getSourceClassName()).trace(msg); - } - else - { - Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); - } - } - else - { - Logger.getLogger(record.getSourceClassName()).warn("[WAS-UNKNOWN]" + msg); - } - } - - @Override - public boolean isLoggable(LogRecord record) - { - if (record == null) - { - return false; - } - return super.isLoggable(record); - } - - @Override - public void flush() - { - //nothing to do - } - - @Override - public void close() throws SecurityException - { - //nothing to do - } - -} \ No newline at end of file Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java (from rev 3619, branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,147 @@ +/* + * 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.stack.sunri.log; + +import java.util.Map; +import java.util.logging.ErrorManager; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.SimpleFormatter; + +import org.jboss.logging.Logger; + +/** + * A Handler (java.util.logging.Handler) class redirecting messages + * to the jboss logging system. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; + * @since 14-Jun-2007 + * + */ +public class JBossLogHandler extends Handler +{ + private Map<String, String> levelMap; + private String defaultLevel; + + public JBossLogHandler(Map<String, String> levelMap, String defaultLevel) + { + super.setFormatter(new SimpleFormatter()); + this.levelMap = levelMap; + this.defaultLevel = defaultLevel; + } + + @Override + public void publish(LogRecord record) + { + if (!isLoggable(record)) + { + return; + } + String msg; + try + { + msg = getFormatter().formatMessage(record); + } + catch (Exception ex) + { + // We don't want to throw an exception here, but we + // report the exception to any registered ErrorManager. + reportError(null, ex, ErrorManager.FORMAT_FAILURE); + return; + } + + String level = levelMap.get(record.getLevel().getName()); + level = level == null ? levelMap.get(record.getLevel().getName().toUpperCase()): level; + level = level == null ? defaultLevel : level; + if ("info".equalsIgnoreCase(level)) + { + if (Logger.getLogger(record.getSourceClassName()).isInfoEnabled()) + { + Logger.getLogger(record.getSourceClassName()).info(msg); + } + else + { + Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); + } + + } + else if ("error".equalsIgnoreCase(level)) + { + Logger.getLogger(record.getSourceClassName()).error(msg); + } + else if ("warn".equalsIgnoreCase(level)) + { + Logger.getLogger(record.getSourceClassName()).warn(msg); + } + else if ("debug".equalsIgnoreCase(level)) + { + if (Logger.getLogger(record.getSourceClassName()).isDebugEnabled()) + { + Logger.getLogger(record.getSourceClassName()).debug(msg); + } + else + { + Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); + } + } + else if ("trace".equalsIgnoreCase(level)) + { + if (Logger.getLogger(record.getSourceClassName()).isTraceEnabled()) + { + Logger.getLogger(record.getSourceClassName()).trace(msg); + } + else + { + Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg); + } + } + else + { + Logger.getLogger(record.getSourceClassName()).warn("[WAS-UNKNOWN]" + msg); + } + } + + @Override + public boolean isLoggable(LogRecord record) + { + if (record == null) + { + return false; + } + return super.isLoggable(record); + } + + @Override + public void flush() + { + //nothing to do + } + + @Override + public void close() throws SecurityException + { + //nothing to do + } + +} \ No newline at end of file Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java =================================================================== --- branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,148 +0,0 @@ -/* - * 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.stack.sunri.log; - -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.logging.Filter; -import java.util.logging.Handler; -import java.util.logging.Level; - -import org.jboss.logging.Logger; - -/** - * Redirects JDK Logger output to the JBoss Logger. - * - * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; - * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; - * @since 14-Jun-2007 - * - */ -public class JDKLogRedirector -{ - private List<String> namespaces = new LinkedList<String>(); - private Map<String, String> levelMapping = new HashMap<String, String>(); - private String defaultLevel; - private static Logger myLogger = Logger.getLogger(JDKLogRedirector.class); - - public JDKLogRedirector() - { - } - - public void changeHandlers() - { - - for (String ns : namespaces) - { - changeHandler(ns); - } - } - - /** - * Modifies the jdk root logger in order not to log records coming from - * loggers with the provided namespace; these records are then logged - * through the JBoss Logger. - * - * @param ns - */ - public void changeHandler(String ns) - { - if (ns == null) - ns = ""; - myLogger.debug("Changing current root logger's log handlers to hide records with namespace " + ns); - java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger(""); - Handler[] handlers = jdkRootLogger.getHandlers(); - for (int i = 0; i < handlers.length; i++) - { - Handler handler = handlers[i]; - if (!(handler instanceof JBossLogHandler)) - { - StringBuffer sb = new StringBuffer("Disableing handler "); - sb.append(handler).append(" with level ").append(handler.getLevel()); - myLogger.debug(sb); - Filter f = handler.getFilter(); - if (f != null && f instanceof NamespaceFilter) - { - ((NamespaceFilter)f).addNamespace(ns); - } - else - { - NamespaceFilter nsFilter = new NamespaceFilter(false); - nsFilter.addNamespace(ns); - handler.setFilter(nsFilter); - } - } - } - myLogger.debug("Adding JBossLogHandler to log records with namespace " + ns); - Handler jbossLogHandler = new JBossLogHandler(levelMapping, defaultLevel); - jbossLogHandler.setLevel(Level.ALL); - java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler); - } - - public void addNamespace(String ns) - { - namespaces.add(ns); - } - - public List<String> getNamespaces() - { - return namespaces; - } - - public void setNamespaces(List<String> namespaces) - { - this.namespaces = namespaces; - } - - public String getDefaultLevel() - { - return defaultLevel; - } - - public void setDefaultLevel(String defaultLevel) - { - this.defaultLevel = defaultLevel; - - } - - public Map<String, String> getLevelMapping() - { - return levelMapping; - } - - public void setLevelMapping(Map<String, String> levelMapping) - { - this.levelMapping = levelMapping; - } - - public String putLevelMappingEntry(String key, String value) - { - return levelMapping.put(key, value); - } - - public void start() - { - changeHandlers(); - } -} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java (from rev 3619, branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,148 @@ +/* + * 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.stack.sunri.log; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.logging.Filter; +import java.util.logging.Handler; +import java.util.logging.Level; + +import org.jboss.logging.Logger; + +/** + * Redirects JDK Logger output to the JBoss Logger. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; + * @since 14-Jun-2007 + * + */ +public class JDKLogRedirector +{ + private List<String> namespaces = new LinkedList<String>(); + private Map<String, String> levelMapping = new HashMap<String, String>(); + private String defaultLevel; + private static Logger myLogger = Logger.getLogger(JDKLogRedirector.class); + + public JDKLogRedirector() + { + } + + public void changeHandlers() + { + + for (String ns : namespaces) + { + changeHandler(ns); + } + } + + /** + * Modifies the jdk root logger in order not to log records coming from + * loggers with the provided namespace; these records are then logged + * through the JBoss Logger. + * + * @param ns + */ + public void changeHandler(String ns) + { + if (ns == null) + ns = ""; + myLogger.debug("Changing current root logger's log handlers to hide records with namespace " + ns); + java.util.logging.Logger jdkRootLogger = java.util.logging.Logger.getLogger(""); + Handler[] handlers = jdkRootLogger.getHandlers(); + for (int i = 0; i < handlers.length; i++) + { + Handler handler = handlers[i]; + if (!(handler instanceof JBossLogHandler)) + { + StringBuffer sb = new StringBuffer("Disableing handler "); + sb.append(handler).append(" with level ").append(handler.getLevel()); + myLogger.debug(sb); + Filter f = handler.getFilter(); + if (f != null && f instanceof NamespaceFilter) + { + ((NamespaceFilter)f).addNamespace(ns); + } + else + { + NamespaceFilter nsFilter = new NamespaceFilter(false); + nsFilter.addNamespace(ns); + handler.setFilter(nsFilter); + } + } + } + myLogger.debug("Adding JBossLogHandler to log records with namespace " + ns); + Handler jbossLogHandler = new JBossLogHandler(levelMapping, defaultLevel); + jbossLogHandler.setLevel(Level.ALL); + java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler); + } + + public void addNamespace(String ns) + { + namespaces.add(ns); + } + + public List<String> getNamespaces() + { + return namespaces; + } + + public void setNamespaces(List<String> namespaces) + { + this.namespaces = namespaces; + } + + public String getDefaultLevel() + { + return defaultLevel; + } + + public void setDefaultLevel(String defaultLevel) + { + this.defaultLevel = defaultLevel; + + } + + public Map<String, String> getLevelMapping() + { + return levelMapping; + } + + public void setLevelMapping(Map<String, String> levelMapping) + { + this.levelMapping = levelMapping; + } + + public String putLevelMappingEntry(String key, String value) + { + return levelMapping.put(key, value); + } + + public void start() + { + changeHandlers(); + } +} Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java =================================================================== --- branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,96 +0,0 @@ -/* - * 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.stack.sunri.log; - -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.logging.Filter; -import java.util.logging.LogRecord; - -/** - * A log filter allowing logging of LogRecord depending on the - * namespace of the Logger they have been collected by. - * - * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; - * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; - * @since 14-Jun-2007 - * - */ -public class NamespaceFilter implements Filter -{ - - private Set<String> namespaces; - private boolean show; - - public NamespaceFilter(boolean show) - { - this.show = show; - } - - public boolean isLoggable(LogRecord record) - { - String loggerName = record.getLoggerName(); - if (loggerName == null) - { - return true; - } - else - { - for (String ns : namespaces) - { - if (loggerName.startsWith(ns)) - { - return show; - } - } - return !show; - } - } - - public void addNamespace(String ns) - { - if (namespaces == null) - namespaces = new LinkedHashSet<String>(); - namespaces.add(ns); - } - - public Set<String> getNamespaces() - { - return namespaces; - } - - public void setNamespaces(Set<String> namespaces) - { - this.namespaces = namespaces; - } - - public boolean isShow() - { - return show; - } - - public void setShow(boolean show) - { - this.show = show; - } - -} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java (from rev 3619, branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/NamespaceFilter.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,96 @@ +/* + * 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.stack.sunri.log; + +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.logging.Filter; +import java.util.logging.LogRecord; + +/** + * A log filter allowing logging of LogRecord depending on the + * namespace of the Logger they have been collected by. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it&gt; + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it&gt; + * @since 14-Jun-2007 + * + */ +public class NamespaceFilter implements Filter +{ + + private Set<String> namespaces; + private boolean show; + + public NamespaceFilter(boolean show) + { + this.show = show; + } + + public boolean isLoggable(LogRecord record) + { + String loggerName = record.getLoggerName(); + if (loggerName == null) + { + return true; + } + else + { + for (String ns : namespaces) + { + if (loggerName.startsWith(ns)) + { + return show; + } + } + return !show; + } + } + + public void addNamespace(String ns) + { + if (namespaces == null) + namespaces = new LinkedHashSet<String>(); + namespaces.add(ns); + } + + public Set<String> getNamespaces() + { + return namespaces; + } + + public void setNamespaces(Set<String> namespaces) + { + this.namespaces = namespaces; + } + + public boolean isShow() + { + return show; + } + + public void setShow(boolean show) + { + this.show = show; + } + +} Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -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"/> @@ -213,5 +214,25 @@ </list> </property> </bean> - + + <bean name="JDKLogRedirector" class="org.jboss.wsf.stack.sunri.log.JDKLogRedirector"> + <property name="namespaces"> + <list class="java.util.LinkedList" elementClass="java.lang.String"> + <value>javax.enterprise.resource.webservices.jaxws</value> + <value>com.sun</value> + </list> + </property> + <property name="levelMapping"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>INFO</key><value>info</value></entry> + <entry><key>SEVERE</key><value>error</value></entry> + <entry><key>WARNING</key><value>warn</value></entry> + <entry><key>FINE</key><value>debug</value></entry> + <entry><key>FINER</key><value>trace</value></entry> + <entry><key>FINEST</key><value>trace</value></entry> + </map> + </property> + <property name="defaultLevel">debug</property> + </bean> + </deployment> \ No newline at end of file Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -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"/> @@ -244,5 +245,25 @@ </uninstall> <depends>WebServiceMainDeployer</depends> </bean> + + <bean name="JDKLogRedirector" class="org.jboss.wsf.stack.sunri.log.JDKLogRedirector"> + <property name="namespaces"> + <list class="java.util.LinkedList" elementClass="java.lang.String"> + <value>javax.enterprise.resource.webservices.jaxws</value> + <value>com.sun</value> + </list> + </property> + <property name="levelMapping"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>INFO</key><value>info</value></entry> + <entry><key>SEVERE</key><value>error</value></entry> + <entry><key>WARNING</key><value>warn</value></entry> + <entry><key>FINE</key><value>debug</value></entry> + <entry><key>FINER</key><value>trace</value></entry> + <entry><key>FINEST</key><value>trace</value></entry> + </map> + </property> + <property name="defaultLevel">debug</property> + </bean> </deployment> Modified: trunk/integration/sunri/src/test/resources/test-excludes.txt =================================================================== --- trunk/integration/sunri/src/test/resources/test-excludes.txt 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/src/test/resources/test-excludes.txt 2007-06-22 08:30:37 UTC (rev 3683) @@ -12,7 +12,7 @@ ################################################################### # [JBWS-1669] Fix WebServiceContext.getMessageContext() -org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java +#org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java # [JBWS-1673] Fix JAXR samples for SunRI org/jboss/test/ws/jaxws/samples/jaxr/** Modified: trunk/integration/sunri/version.properties =================================================================== --- trunk/integration/sunri/version.properties 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/sunri/version.properties 2007-06-22 08:30:37 UTC (rev 3683) @@ -7,4 +7,4 @@ jboss-security-spi=2.0.0.Beta sun-jaxws=2.1.1 sun-servlet=2.5 - +ibm-wsdl4j=1.6.2 Modified: trunk/integration/xfire/.classpath =================================================================== --- trunk/integration/xfire/.classpath 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/xfire/.classpath 2007-06-22 08:30:37 UTC (rev 3683) @@ -17,5 +17,6 @@ <classpathentry kind="lib" path="thirdparty/xbean-spring.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> + <classpathentry kind="lib" path="thirdparty/commons-logging-1.1.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -48,6 +48,7 @@ <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/wsdl4j.jar"/> </path> <path id="xfire.classpath"> Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -61,6 +61,7 @@ <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-all.jar" dest="${thirdparty.dir}/xfire-all.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-distribution-sources.jar" dest="${thirdparty.dir}/xfire-distribution-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/xfire/${xfire}/lib/xfire-jsr181-api.jar" dest="${thirdparty.dir}/xfire-jsr181-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <checksum file="${int.xfire.dir}/version.properties" fileext=".md5"/> </target> Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -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: trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -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"/> Modified: trunk/testsuite/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -82,10 +82,10 @@ <!-- jaxws-samples-exception --> <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/exception/jaxws/**"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/server/UserException.class"/> </classes> </war> Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,34 +0,0 @@ -/* - * 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.samples.exception; - -import javax.jws.WebService; - -@WebService -public interface ExceptionEndpoint -{ - public void throwRuntimeException(); - - public void throwSoapFaultException(); - - public void throwApplicationException() throws UserException; -} \ No newline at end of file Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,60 +0,0 @@ -/* - * 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.samples.exception; - -import javax.jws.WebService; -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import javax.xml.soap.SOAPFault; -import javax.xml.ws.soap.SOAPFaultException; - -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.exception.ExceptionEndpoint") -public class ExceptionEndpointImpl implements ExceptionEndpoint -{ - public void throwRuntimeException() - { - throw new RuntimeException("oh no, a runtime exception occured."); - } - - public void throwSoapFaultException() - { - // This should be thrown as-is - try - { - SOAPFactory factory = SOAPFactory.newInstance(); - SOAPFault fault = factory.createFault("this is a fault string!", new QName("http://foo", "FooCode")); - fault.setFaultActor("mr.actor"); - fault.addDetail().addChildElement("test"); - throw new SOAPFaultException(fault); - } - catch (SOAPException s) - { - throw new RuntimeException(s); - } - } - - public void throwApplicationException() throws UserException - { - throw new UserException("validation", 123, "Some validation error"); - } -} Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -29,6 +29,9 @@ import junit.framework.Test; +import org.jboss.test.ws.jaxws.samples.exception.client.ExceptionEndpoint; +import org.jboss.test.ws.jaxws.samples.exception.client.UserException; +import org.jboss.test.ws.jaxws.samples.exception.client.UserException_Exception; import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.w3c.dom.Element; @@ -41,7 +44,7 @@ */ public class ExceptionTestCase extends JBossWSTest { - private String targetNS = "http://exception.samples.jaxws.ws.test.jboss.org/"; + private String targetNS = "http://server.exception.samples.jaxws.ws.test.jboss.org/"; private ExceptionEndpoint proxy; public static Test suite() @@ -111,22 +114,17 @@ public void testApplicationException() throws Exception { - if (isIntegrationSunRI()) - { - System.out.println("FIXME: [JBWS-1670] SunRI client does not throw UserException"); - return; - } - try { proxy.throwApplicationException(); fail("Expected UserException"); } - catch (UserException e) + catch (UserException_Exception e) { - assertEquals("Some validation error", e.getMessage()); - assertEquals("validation", e.getErrorCategory()); - assertEquals(123, e.getErrorCode()); + UserException ue = e.getFaultInfo(); + assertEquals("Some validation error", ue.getMessage()); + assertEquals("validation", ue.getErrorCategory()); + assertEquals(123, ue.getErrorCode()); } } } \ No newline at end of file Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/UserException.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/UserException.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/UserException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,55 +0,0 @@ -/* - * 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.samples.exception; - -import javax.xml.ws.WebFault; - -/** - * A mach application exception - * - * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> - * @version $Revision$ - */ -(a)WebFault(faultBean=&quot;org.jboss.test.ws.jaxws.samples.exception.jaxws.UserExceptionBean&quot;) -public class UserException extends Exception -{ - private int errorCode; - private String errorCategory; - - public UserException(String errorCategory, int errorCode, String message) - { - super(message); - - this.errorCategory = errorCategory; - this.errorCode = errorCode; - } - - public String getErrorCategory() - { - return errorCategory; - } - - public int getErrorCode() - { - return errorCode; - } -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client) Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,41 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; - - -@WebService(name = "ExceptionEndpoint", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/") -public interface ExceptionEndpoint { - - - /** - * - */ - @WebMethod - @RequestWrapper(localName = "throwRuntimeException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowRuntimeException") - @ResponseWrapper(localName = "throwRuntimeExceptionResponse", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowRuntimeExceptionResponse") - public void throwRuntimeException(); - - /** - * - */ - @WebMethod - @RequestWrapper(localName = "throwSoapFaultException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowSoapFaultException") - @ResponseWrapper(localName = "throwSoapFaultExceptionResponse", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowSoapFaultExceptionResponse") - public void throwSoapFaultException(); - - /** - * - * @throws UserException_Exception - */ - @WebMethod - @RequestWrapper(localName = "throwApplicationException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowApplicationException") - @ResponseWrapper(localName = "throwApplicationExceptionResponse", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowApplicationExceptionResponse") - public void throwApplicationException() - throws UserException_Exception - ; - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ExceptionEndpoint.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,41 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + + +@WebService(name = "ExceptionEndpoint", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/") +public interface ExceptionEndpoint { + + + /** + * + */ + @WebMethod + @RequestWrapper(localName = "throwRuntimeException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowRuntimeException") + @ResponseWrapper(localName = "throwRuntimeExceptionResponse", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowRuntimeExceptionResponse") + public void throwRuntimeException(); + + /** + * + */ + @WebMethod + @RequestWrapper(localName = "throwSoapFaultException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowSoapFaultException") + @ResponseWrapper(localName = "throwSoapFaultExceptionResponse", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowSoapFaultExceptionResponse") + public void throwSoapFaultException(); + + /** + * + * @throws UserException_Exception + */ + @WebMethod + @RequestWrapper(localName = "throwApplicationException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowApplicationException") + @ResponseWrapper(localName = "throwApplicationExceptionResponse", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.samples.exception.client.ThrowApplicationExceptionResponse") + public void throwApplicationException() + throws UserException_Exception + ; + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,32 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for throwApplicationException complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="throwApplicationException"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "throwApplicationException") -public class ThrowApplicationException { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,32 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for throwApplicationException complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="throwApplicationException"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "throwApplicationException") +public class ThrowApplicationException { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,32 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for throwApplicationExceptionResponse complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="throwApplicationExceptionResponse"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "throwApplicationExceptionResponse") -public class ThrowApplicationExceptionResponse { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowApplicationExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,32 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for throwApplicationExceptionResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="throwApplicationExceptionResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "throwApplicationExceptionResponse") +public class ThrowApplicationExceptionResponse { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,32 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for throwRuntimeException complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="throwRuntimeException"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "throwRuntimeException") -public class ThrowRuntimeException { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,32 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for throwRuntimeException complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="throwRuntimeException"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "throwRuntimeException") +public class ThrowRuntimeException { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,32 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for throwRuntimeExceptionResponse complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="throwRuntimeExceptionResponse"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "throwRuntimeExceptionResponse") -public class ThrowRuntimeExceptionResponse { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowRuntimeExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,32 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for throwRuntimeExceptionResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="throwRuntimeExceptionResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "throwRuntimeExceptionResponse") +public class ThrowRuntimeExceptionResponse { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,32 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for throwSoapFaultException complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="throwSoapFaultException"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "throwSoapFaultException") -public class ThrowSoapFaultException { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,32 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for throwSoapFaultException complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="throwSoapFaultException"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "throwSoapFaultException") +public class ThrowSoapFaultException { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,32 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for throwSoapFaultExceptionResponse complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="throwSoapFaultExceptionResponse"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "throwSoapFaultExceptionResponse") -public class ThrowSoapFaultExceptionResponse { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/ThrowSoapFaultExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,32 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for throwSoapFaultExceptionResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="throwSoapFaultExceptionResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "throwSoapFaultExceptionResponse") +public class ThrowSoapFaultExceptionResponse { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,106 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for UserException complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="UserException"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="errorCategory" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * &lt;element name="errorCode" type="{http://www.w3.org/2001/XMLSchema}int"/> - * &lt;element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "UserException", propOrder = { - "errorCategory", - "errorCode", - "message" -}) -public class UserException { - - protected String errorCategory; - protected int errorCode; - protected String message; - - /** - * Gets the value of the errorCategory property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getErrorCategory() { - return errorCategory; - } - - /** - * Sets the value of the errorCategory property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setErrorCategory(String value) { - this.errorCategory = value; - } - - /** - * Gets the value of the errorCode property. - * - */ - public int getErrorCode() { - return errorCode; - } - - /** - * Sets the value of the errorCode property. - * - */ - public void setErrorCode(int value) { - this.errorCode = value; - } - - /** - * Gets the value of the message property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getMessage() { - return message; - } - - /** - * Sets the value of the message property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setMessage(String value) { - this.message = value; - } - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,106 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for UserException complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="UserException"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="errorCategory" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * &lt;element name="errorCode" type="{http://www.w3.org/2001/XMLSchema}int"/> + * &lt;element name="message" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "UserException", propOrder = { + "errorCategory", + "errorCode", + "message" +}) +public class UserException { + + protected String errorCategory; + protected int errorCode; + protected String message; + + /** + * Gets the value of the errorCategory property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getErrorCategory() { + return errorCategory; + } + + /** + * Sets the value of the errorCategory property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setErrorCategory(String value) { + this.errorCategory = value; + } + + /** + * Gets the value of the errorCode property. + * + */ + public int getErrorCode() { + return errorCode; + } + + /** + * Sets the value of the errorCode property. + * + */ + public void setErrorCode(int value) { + this.errorCode = value; + } + + /** + * Gets the value of the message property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * Sets the value of the message property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,48 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.client; - -import javax.xml.ws.WebFault; - - -@WebFault(name = "UserException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/") -public class UserException_Exception - extends Exception -{ - - /** - * Java type that goes as soapenv:Fault detail element. - * - */ - private UserException faultInfo; - - /** - * - * @param faultInfo - * @param message - */ - public UserException_Exception(String message, UserException faultInfo) { - super(message); - this.faultInfo = faultInfo; - } - - /** - * - * @param faultInfo - * @param message - * @param cause - */ - public UserException_Exception(String message, UserException faultInfo, Throwable cause) { - super(message, cause); - this.faultInfo = faultInfo; - } - - /** - * - * @return - * returns fault bean: org.jboss.test.ws.jaxws.samples.exception.client.UserException - */ - public UserException getFaultInfo() { - return faultInfo; - } - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/UserException_Exception.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,48 @@ + +package org.jboss.test.ws.jaxws.samples.exception.client; + +import javax.xml.ws.WebFault; + + +@WebFault(name = "UserException", targetNamespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/") +public class UserException_Exception + extends Exception +{ + + /** + * Java type that goes as soapenv:Fault detail element. + * + */ + private UserException faultInfo; + + /** + * + * @param faultInfo + * @param message + */ + public UserException_Exception(String message, UserException faultInfo) { + super(message); + this.faultInfo = faultInfo; + } + + /** + * + * @param faultInfo + * @param message + * @param cause + */ + public UserException_Exception(String message, UserException faultInfo, Throwable cause) { + super(message, cause); + this.faultInfo = faultInfo; + } + + /** + * + * @return + * returns fault bean: org.jboss.test.ws.jaxws.samples.exception.client.UserException + */ + public UserException getFaultInfo() { + return faultInfo; + } + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,2 +0,0 @@ -(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/") -package org.jboss.test.ws.jaxws.samples.exception.client; Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/client/package-info.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/") +package org.jboss.test.ws.jaxws.samples.exception.client; Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationException.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationException.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowApplicationException { - - -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationExceptionResponse.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationExceptionResponse.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowApplicationExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowApplicationExceptionResponse { - - -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeException.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeException.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowRuntimeException { - - -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeExceptionResponse.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeExceptionResponse.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowRuntimeExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowRuntimeExceptionResponse { - - -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultException.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultException.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowSoapFaultException { - - -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultExceptionResponse.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultExceptionResponse.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/ThrowSoapFaultExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowSoapFaultExceptionResponse { - - -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/UserExceptionBean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/UserExceptionBean.java 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/jaxws/UserExceptionBean.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,50 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "UserException") -@XmlType(namespace = "http://exception.samples.jaxws.ws.test.jboss.org/", name = "UserException", propOrder = { - "errorCategory", - "errorCode", - "message" -}) -(a)XmlAccessorType(XmlAccessType.FIELD) -public class UserExceptionBean { - - @XmlElement(namespace = "", name = "errorCategory") - private String errorCategory; - @XmlElement(namespace = "", name = "errorCode") - private int errorCode; - @XmlElement(namespace = "", name = "message") - private String message; - - public String getErrorCategory() { - return this.errorCategory; - } - - public void setErrorCategory(String errorCategory) { - this.errorCategory = errorCategory; - } - - public int getErrorCode() { - return this.errorCode; - } - - public void setErrorCode(int errorCode) { - this.errorCode = errorCode; - } - - public String getMessage() { - return this.message; - } - - public void setMessage(String message) { - this.message = message; - } - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server) Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,35 +0,0 @@ -/* - * 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.samples.exception.server; - -import javax.jws.WebService; - - -@WebService -public interface ExceptionEndpoint -{ - public void throwRuntimeException(); - - public void throwSoapFaultException(); - - public void throwApplicationException() throws UserException; -} \ No newline at end of file Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -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.test.ws.jaxws.samples.exception.server; + +import javax.jws.WebService; + + +@WebService +public interface ExceptionEndpoint +{ + public void throwRuntimeException(); + + public void throwSoapFaultException(); + + public void throwApplicationException() throws UserException; +} \ No newline at end of file Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,61 +0,0 @@ -/* - * 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.samples.exception.server; - -import javax.jws.WebService; -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import javax.xml.soap.SOAPFault; -import javax.xml.ws.soap.SOAPFaultException; - - -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpoint") -public class ExceptionEndpointImpl implements ExceptionEndpoint -{ - public void throwRuntimeException() - { - throw new RuntimeException("oh no, a runtime exception occured."); - } - - public void throwSoapFaultException() - { - // This should be thrown as-is - try - { - SOAPFactory factory = SOAPFactory.newInstance(); - SOAPFault fault = factory.createFault("this is a fault string!", new QName("http://foo", "FooCode")); - fault.setFaultActor("mr.actor"); - fault.addDetail().addChildElement("test"); - throw new SOAPFaultException(fault); - } - catch (SOAPException s) - { - throw new RuntimeException(s); - } - } - - public void throwApplicationException() throws UserException - { - throw new UserException("validation", 123, "Some validation error"); - } -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,61 @@ +/* + * 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.samples.exception.server; + +import javax.jws.WebService; +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFactory; +import javax.xml.soap.SOAPFault; +import javax.xml.ws.soap.SOAPFaultException; + + +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpoint") +public class ExceptionEndpointImpl implements ExceptionEndpoint +{ + public void throwRuntimeException() + { + throw new RuntimeException("oh no, a runtime exception occured."); + } + + public void throwSoapFaultException() + { + // This should be thrown as-is + try + { + SOAPFactory factory = SOAPFactory.newInstance(); + SOAPFault fault = factory.createFault("this is a fault string!", new QName("http://foo", "FooCode")); + fault.setFaultActor("mr.actor"); + fault.addDetail().addChildElement("test"); + throw new SOAPFaultException(fault); + } + catch (SOAPException s) + { + throw new RuntimeException(s); + } + } + + public void throwApplicationException() throws UserException + { + throw new UserException("validation", 123, "Some validation error"); + } +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,55 +0,0 @@ -/* - * 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.samples.exception.server; - -import javax.xml.ws.WebFault; - -/** - * A mach application exception - * - * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> - * @version $Revision$ - */ -(a)WebFault(faultBean=&quot;org.jboss.test.ws.jaxws.samples.exception.server.jaxws.UserExceptionBean&quot;) -public class UserException extends Exception -{ - private int errorCode; - private String errorCategory; - - public UserException(String errorCategory, int errorCode, String message) - { - super(message); - - this.errorCategory = errorCategory; - this.errorCode = errorCode; - } - - public String getErrorCategory() - { - return errorCategory; - } - - public int getErrorCode() - { - return errorCode; - } -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/UserException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -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.test.ws.jaxws.samples.exception.server; + +import javax.xml.ws.WebFault; + +/** + * A mach application exception + * + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> + * @version $Revision$ + */ +(a)WebFault(faultBean=&quot;org.jboss.test.ws.jaxws.samples.exception.server.jaxws.UserExceptionBean&quot;) +public class UserException extends Exception +{ + private int errorCode; + private String errorCategory; + + public UserException(String errorCategory, int errorCode, String message) + { + super(message); + + this.errorCategory = errorCategory; + this.errorCode = errorCode; + } + + public String getErrorCategory() + { + return errorCategory; + } + + public int getErrorCode() + { + return errorCode; + } +} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws) Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowApplicationException { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,15 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationException") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class ThrowApplicationException { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowApplicationExceptionResponse { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowApplicationExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,15 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwApplicationExceptionResponse") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class ThrowApplicationExceptionResponse { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowRuntimeException { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,15 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeException") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class ThrowRuntimeException { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowRuntimeExceptionResponse { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowRuntimeExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,15 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwRuntimeExceptionResponse") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class ThrowRuntimeExceptionResponse { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowSoapFaultException { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultException.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,15 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultException") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class ThrowSoapFaultException { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,15 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class ThrowSoapFaultExceptionResponse { - - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/ThrowSoapFaultExceptionResponse.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,15 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "throwSoapFaultExceptionResponse") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class ThrowSoapFaultExceptionResponse { + + +} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java =================================================================== --- branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java 2007-06-18 20:36:50 UTC (rev 3619) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -1,50 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "UserException") -@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "UserException", propOrder = { - "errorCategory", - "errorCode", - "message" -}) -(a)XmlAccessorType(XmlAccessType.FIELD) -public class UserExceptionBean { - - @XmlElement(namespace = "", name = "errorCategory") - private String errorCategory; - @XmlElement(namespace = "", name = "errorCode") - private int errorCode; - @XmlElement(namespace = "", name = "message") - private String message; - - public String getErrorCategory() { - return this.errorCategory; - } - - public void setErrorCategory(String errorCategory) { - this.errorCategory = errorCategory; - } - - public int getErrorCode() { - return this.errorCode; - } - - public void setErrorCode(int errorCode) { - this.errorCode = errorCode; - } - - public String getMessage() { - return this.message; - } - - public void setMessage(String message) { - this.message = message; - } - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java (from rev 3619, branches/maeste_palin/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws/UserExceptionBean.java 2007-06-22 08:30:37 UTC (rev 3683) @@ -0,0 +1,50 @@ + +package org.jboss.test.ws.jaxws.samples.exception.server.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "UserException") +@XmlType(namespace = "http://server.exception.samples.jaxws.ws.test.jboss.org/", name = "UserException", propOrder = { + "errorCategory", + "errorCode", + "message" +}) +(a)XmlAccessorType(XmlAccessType.FIELD) +public class UserExceptionBean { + + @XmlElement(namespace = "", name = "errorCategory") + private String errorCategory; + @XmlElement(namespace = "", name = "errorCode") + private int errorCode; + @XmlElement(namespace = "", name = "message") + private String message; + + public String getErrorCategory() { + return this.errorCategory; + } + + public void setErrorCategory(String errorCategory) { + this.errorCategory = errorCategory; + } + + public int getErrorCode() { + return this.errorCode; + } + + public void setErrorCode(int errorCode) { + this.errorCode = errorCode; + } + + public String getMessage() { + return this.message; + } + + public void setMessage(String message) { + this.message = message; + } + +} Modified: trunk/testsuite/src/resources/jaxws/samples/exception/WEB-INF/web.xml =================================================================== --- trunk/testsuite/src/resources/jaxws/samples/exception/WEB-INF/web.xml 2007-06-21 16:24:14 UTC (rev 3682) +++ trunk/testsuite/src/resources/jaxws/samples/exception/WEB-INF/web.xml 2007-06-22 08:30:37 UTC (rev 3683) @@ -7,7 +7,7 @@ <servlet> <servlet-name>ExceptionEndpointService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.exception.ExceptionEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpointImpl</servlet-class> </servlet> <servlet-mapping>