JBossWS SVN: r9521 - spi/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-09 06:37:55 -0400 (Mon, 09 Mar 2009)
New Revision: 9521
Modified:
spi/trunk/pom.xml
Log:
[JBWS-2566] Adding maven release plugin
Modified: spi/trunk/pom.xml
===================================================================
--- spi/trunk/pom.xml 2009-03-09 10:10:01 UTC (rev 9520)
+++ spi/trunk/pom.xml 2009-03-09 10:37:55 UTC (rev 9521)
@@ -149,6 +149,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-8</version>
+ </plugin>
</plugins>
</build>
17 years, 1 month
JBossWS SVN: r9520 - spi/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-09 06:10:01 -0400 (Mon, 09 Mar 2009)
New Revision: 9520
Modified:
spi/trunk/
Log:
svn:ignore on .settings
Property changes on: spi/trunk
___________________________________________________________________
Name: svn:ignore
- ant.properties
target
profiles.xml
+ target
.settings
17 years, 1 month
JBossWS SVN: r9519 - framework/trunk/hudson/jboss/bin.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-09 03:50:20 -0400 (Mon, 09 Mar 2009)
New Revision: 9519
Modified:
framework/trunk/hudson/jboss/bin/jbossws-qa.sh
Log:
fix source distribution tests regression
Modified: framework/trunk/hudson/jboss/bin/jbossws-qa.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2009-03-06 17:27:07 UTC (rev 9518)
+++ framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2009-03-09 07:50:20 UTC (rev 9519)
@@ -77,6 +77,7 @@
rm -rf jbossws-$STACK_ID-src-dist
unzip jbossws-$STACK_ID-src-dist.zip
cd jbossws-$STACK_ID-src-dist
+ cp profiles.xml.example profiles.xml
ant $ENVIRONMENT deploy-$JBOSS_TARGET
}
17 years, 1 month
JBossWS SVN: r9518 - in framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test: java/org/jboss/test/ws/jaxws/samples/exception and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-06 12:27:07 -0500 (Fri, 06 Mar 2009)
New Revision: 9518
Added:
framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java
framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml
Modified:
framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/ant-import/build-jars-jaxws.xml
framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java
Log:
[JBPAPP-1747] Fault handler chain is not called when user application exceptions are thrown.
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/ant-import/build-jars-jaxws.xml 2009-03-06 17:26:51 UTC (rev 9517)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/ant-import/build-jars-jaxws.xml 2009-03-06 17:27:07 UTC (rev 9518)
@@ -90,6 +90,8 @@
<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"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml"/>
</classes>
</war>
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2009-03-06 17:26:51 UTC (rev 9517)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2009-03-06 17:27:07 UTC (rev 9518)
@@ -91,7 +91,7 @@
catch (SOAPFaultException e)
{
String faultString = e.getFault().getFaultString();
- assertTrue(faultString.indexOf("oh no, a runtime exception occured.") >= 0);
+ assertTrue(faultString.indexOf("OH NO, A RUNTIME EXCEPTION OCCURED.") >= 0);
}
}
@@ -104,7 +104,7 @@
}
catch (SOAPFaultException e)
{
- assertEquals("this is a fault string!", e.getFault().getFaultString());
+ assertEquals("THIS IS A FAULT STRING!", e.getFault().getFaultString());
assertEquals("mr.actor", e.getFault().getFaultActor());
assertEquals("FooCode", e.getFault().getFaultCodeAsName().getLocalName());
assertEquals("http://foo", e.getFault().getFaultCodeAsName().getURI());
@@ -128,7 +128,7 @@
catch (UserException_Exception e)
{
UserException ue = e.getFaultInfo();
- assertEquals("Some validation error", ue.getMessage());
+ assertEquals("SOME VALIDATION ERROR", ue.getMessage());
assertEquals("validation", ue.getErrorCategory());
assertEquals(123, ue.getErrorCode());
}
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2009-03-06 17:26:51 UTC (rev 9517)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2009-03-06 17:27:07 UTC (rev 9518)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxws.samples.exception.server;
+import javax.jws.HandlerChain;
import javax.jws.WebService;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPException;
@@ -30,6 +31,7 @@
@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpoint")
+@HandlerChain(file = "jaxws-handlers-server.xml")
public class ExceptionEndpointImpl implements ExceptionEndpoint
{
public void throwRuntimeException()
Copied: framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java (from rev 9515, framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java)
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java (rev 0)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java 2009-03-06 17:27:07 UTC (rev 9518)
@@ -0,0 +1,72 @@
+/*
+ * 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 java.util.Iterator;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPBodyElement;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.wsf.test.GenericSOAPHandler;
+
+/**
+ * A simple server side handler applying uppercase function to the error message strings.
+ *
+ * @author alessio.soldano(a)jboss.org
+ * @since 12-Feb-2008
+ */
+public class TestHandler extends GenericSOAPHandler
+{
+ @SuppressWarnings("unchecked")
+ public boolean handleFault(MessageContext msgContext)
+ {
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ SOAPBody soapBody = soapMessage.getSOAPBody();
+ SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next();
+ SOAPElement faultStringElement = (SOAPElement)soapBodyElement.getChildElements(new QName("faultstring")).next();
+ faultStringElement.setValue(faultStringElement.getValue().toUpperCase());
+ Iterator<SOAPElement> itDetail = soapBodyElement.getChildElements(new QName("detail"));
+ if (itDetail.hasNext())
+ {
+ Iterator<SOAPElement> itException = itDetail.next().getChildElements(new QName("http://server.exception.samples.jaxws.ws.test.jboss.org/","UserException"));
+ if (itException.hasNext())
+ {
+ SOAPElement messageElement = (SOAPElement)itException.next().getChildElements(new QName("message")).next();
+ messageElement.setValue(messageElement.getValue().toUpperCase());
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ throw new WebServiceException(e);
+ }
+ return true;
+ }
+}
Copied: framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml (from rev 9515, framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml)
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml (rev 0)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml 2009-03-06 17:27:07 UTC (rev 9518)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+ <handler-chain>
+ <protocol-bindings>##SOAP11_HTTP</protocol-bindings>
+ <handler>
+ <handler-name>TestHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxws.samples.exception.server.TestHandler</handler-class>
+ </handler>
+ </handler-chain>
+</handler-chains>
\ No newline at end of file
17 years, 1 month
JBossWS SVN: r9517 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/src: main/java/org/jboss/wsf/stack/jbws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-06 12:26:51 -0500 (Fri, 06 Mar 2009)
New Revision: 9517
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.java
Log:
[JBPAPP-1747] Fault handler chain is not called when user application exceptions are thrown.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2009-03-06 16:53:23 UTC (rev 9516)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2009-03-06 17:26:51 UTC (rev 9517)
@@ -221,8 +221,8 @@
}
catch (InvocationTargetException th)
{
- // Unwrap the throwable raised by the service endpoint implementation
- Throwable targetEx = ((InvocationTargetException)th).getTargetException();
+ //Unwrap the throwable raised by the service endpoint implementation
+ Throwable targetEx = th.getTargetException();
throw (targetEx instanceof Exception ? (Exception)targetEx : new UndeclaredThrowableException(targetEx));
}
@@ -266,14 +266,14 @@
faultType[0] = null;
}
}
- catch (RuntimeException ex)
+ catch (Exception ex)
{
// Reverse the message direction
processPivotInternal(msgContext, direction);
-
+
+ CommonBinding binding = bindingProvider.getCommonBinding();
try
{
- CommonBinding binding = bindingProvider.getCommonBinding();
binding.bindFaultMessage(ex);
// call the fault handler chain
@@ -288,6 +288,7 @@
catch (RuntimeException subEx)
{
log.warn("Exception while processing handleFault: ", ex);
+ binding.bindFaultMessage(subEx);
ex = subEx;
}
throw ex;
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-03-06 16:53:23 UTC (rev 9516)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-03-06 17:26:51 UTC (rev 9517)
@@ -433,7 +433,7 @@
}
catch (Exception ex)
{
- MessageAbstraction resMessage = msgContext.getMessageAbstraction();
+ MessageAbstraction resMessage = MessageContextAssociation.peekMessageContext().getMessageAbstraction();
// In case we have an exception before the invoker is called
// we create the fault message here.
@@ -453,7 +453,7 @@
{
try
{
- MessageAbstraction resMessage = msgContext.getMessageAbstraction();
+ MessageAbstraction resMessage = MessageContextAssociation.peekMessageContext().getMessageAbstraction();
if (resMessage != null)
{
if (resMessage.isFaultMessage())
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.java 2009-03-06 16:53:23 UTC (rev 9516)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.java 2009-03-06 17:26:51 UTC (rev 9517)
@@ -48,7 +48,7 @@
SOAPFault soapFault = soapMessage.getSOAPBody().getFault();
String faultString = soapFault.getFaultString();
- if (!faultString.equals("Don't worry it's just a test") && !faultString.equals("org.jboss.test.ws.jaxrpc.exception.UserException"))
+ if (!faultString.equals("Don't worry it's just a test") && !faultString.equals("org.jboss.test.ws.jaxrpc.samples.exception.UserException"))
throw new JAXRPCException("Unexpected fault string: " + faultString);
return true;
17 years, 1 month
JBossWS SVN: r9515 - in framework/branches/jbossws-framework-2.0.1.GA_CP/src/test: java/org/jboss/test/ws/jaxws/samples/exception and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-06 11:40:49 -0500 (Fri, 06 Mar 2009)
New Revision: 9515
Added:
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml
Modified:
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/ant-import/build-jars-jaxws.xml
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java
Log:
[JBPAPP-1752] Fault handler chain is not called when user application exceptions are thrown.
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/ant-import/build-jars-jaxws.xml 2009-03-06 16:40:13 UTC (rev 9514)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/ant-import/build-jars-jaxws.xml 2009-03-06 16:40:49 UTC (rev 9515)
@@ -90,6 +90,8 @@
<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"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml"/>
</classes>
</war>
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2009-03-06 16:40:13 UTC (rev 9514)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2009-03-06 16:40:49 UTC (rev 9515)
@@ -91,7 +91,7 @@
catch (SOAPFaultException e)
{
String faultString = e.getFault().getFaultString();
- assertTrue(faultString.indexOf("oh no, a runtime exception occured.") >= 0);
+ assertTrue(faultString.indexOf("OH NO, A RUNTIME EXCEPTION OCCURED.") >= 0);
}
}
@@ -104,7 +104,7 @@
}
catch (SOAPFaultException e)
{
- assertEquals("this is a fault string!", e.getFault().getFaultString());
+ assertEquals("THIS IS A FAULT STRING!", e.getFault().getFaultString());
assertEquals("mr.actor", e.getFault().getFaultActor());
assertEquals("FooCode", e.getFault().getFaultCodeAsName().getLocalName());
assertEquals("http://foo", e.getFault().getFaultCodeAsName().getURI());
@@ -128,7 +128,7 @@
catch (UserException_Exception e)
{
UserException ue = e.getFaultInfo();
- assertEquals("Some validation error", ue.getMessage());
+ assertEquals("SOME VALIDATION ERROR", ue.getMessage());
assertEquals("validation", ue.getErrorCategory());
assertEquals(123, ue.getErrorCode());
}
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2009-03-06 16:40:13 UTC (rev 9514)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2009-03-06 16:40:49 UTC (rev 9515)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxws.samples.exception.server;
+import javax.jws.HandlerChain;
import javax.jws.WebService;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPException;
@@ -30,6 +31,7 @@
@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpoint")
+@HandlerChain(file = "jaxws-handlers-server.xml")
public class ExceptionEndpointImpl implements ExceptionEndpoint
{
public void throwRuntimeException()
Copied: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java (from rev 5658, framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java)
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java (rev 0)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java 2009-03-06 16:40:49 UTC (rev 9515)
@@ -0,0 +1,72 @@
+/*
+ * 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 java.util.Iterator;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPBodyElement;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.wsf.test.GenericSOAPHandler;
+
+/**
+ * A simple server side handler applying uppercase function to the error message strings.
+ *
+ * @author alessio.soldano(a)jboss.org
+ * @since 12-Feb-2008
+ */
+public class TestHandler extends GenericSOAPHandler
+{
+ @SuppressWarnings("unchecked")
+ public boolean handleFault(MessageContext msgContext)
+ {
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ SOAPBody soapBody = soapMessage.getSOAPBody();
+ SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next();
+ SOAPElement faultStringElement = (SOAPElement)soapBodyElement.getChildElements(new QName("faultstring")).next();
+ faultStringElement.setValue(faultStringElement.getValue().toUpperCase());
+ Iterator<SOAPElement> itDetail = soapBodyElement.getChildElements(new QName("detail"));
+ if (itDetail.hasNext())
+ {
+ Iterator<SOAPElement> itException = itDetail.next().getChildElements(new QName("http://server.exception.samples.jaxws.ws.test.jboss.org/","UserException"));
+ if (itException.hasNext())
+ {
+ SOAPElement messageElement = (SOAPElement)itException.next().getChildElements(new QName("message")).next();
+ messageElement.setValue(messageElement.getValue().toUpperCase());
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ throw new WebServiceException(e);
+ }
+ return true;
+ }
+}
Copied: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml (from rev 5658, framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml)
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml (rev 0)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml 2009-03-06 16:40:49 UTC (rev 9515)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+ <handler-chain>
+ <protocol-bindings>##SOAP11_HTTP</protocol-bindings>
+ <handler>
+ <handler-name>TestHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxws.samples.exception.server.TestHandler</handler-class>
+ </handler>
+ </handler-chain>
+</handler-chains>
\ No newline at end of file
17 years, 1 month
JBossWS SVN: r9514 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src: main/java/org/jboss/wsf/stack/jbws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-06 11:40:13 -0500 (Fri, 06 Mar 2009)
New Revision: 9514
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.java
Log:
[JBPAPP-1752] Fault handler chain is not called when user application exceptions are thrown.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2009-03-06 16:26:11 UTC (rev 9513)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2009-03-06 16:40:13 UTC (rev 9514)
@@ -221,8 +221,8 @@
}
catch (InvocationTargetException th)
{
- // Unwrap the throwable raised by the service endpoint implementation
- Throwable targetEx = ((InvocationTargetException)th).getTargetException();
+ //Unwrap the throwable raised by the service endpoint implementation
+ Throwable targetEx = th.getTargetException();
throw (targetEx instanceof Exception ? (Exception)targetEx : new UndeclaredThrowableException(targetEx));
}
@@ -266,14 +266,14 @@
faultType[0] = null;
}
}
- catch (RuntimeException ex)
+ catch (Exception ex)
{
// Reverse the message direction
processPivotInternal(msgContext, direction);
-
+
+ CommonBinding binding = bindingProvider.getCommonBinding();
try
{
- CommonBinding binding = bindingProvider.getCommonBinding();
binding.bindFaultMessage(ex);
// call the fault handler chain
@@ -288,6 +288,7 @@
catch (RuntimeException subEx)
{
log.warn("Exception while processing handleFault: ", ex);
+ binding.bindFaultMessage(subEx);
ex = subEx;
}
throw ex;
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-03-06 16:26:11 UTC (rev 9513)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-03-06 16:40:13 UTC (rev 9514)
@@ -432,7 +432,7 @@
}
catch (Exception ex)
{
- MessageAbstraction resMessage = msgContext.getMessageAbstraction();
+ MessageAbstraction resMessage = MessageContextAssociation.peekMessageContext().getMessageAbstraction();
// In case we have an exception before the invoker is called
// we create the fault message here.
@@ -452,7 +452,7 @@
{
try
{
- MessageAbstraction resMessage = msgContext.getMessageAbstraction();
+ MessageAbstraction resMessage = MessageContextAssociation.peekMessageContext().getMessageAbstraction();
if (resMessage != null)
{
if (resMessage.isFaultMessage())
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.java 2009-03-06 16:26:11 UTC (rev 9513)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.java 2009-03-06 16:40:13 UTC (rev 9514)
@@ -48,7 +48,7 @@
SOAPFault soapFault = soapMessage.getSOAPBody().getFault();
String faultString = soapFault.getFaultString();
- if (!faultString.equals("Don't worry it's just a test") && !faultString.equals("org.jboss.test.ws.jaxrpc.exception.UserException"))
+ if (!faultString.equals("Don't worry it's just a test") && !faultString.equals("org.jboss.test.ws.jaxrpc.samples.exception.UserException"))
throw new JAXRPCException("Unexpected fault string: " + faultString);
return true;
17 years, 1 month
JBossWS SVN: r9513 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-06 11:26:11 -0500 (Fri, 06 Mar 2009)
New Revision: 9513
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java
Log:
Removing commented out code
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2009-03-06 16:01:26 UTC (rev 9512)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2009-03-06 16:26:11 UTC (rev 9513)
@@ -36,11 +36,6 @@
{
private static ITranHistory port;
-// public static Test suite() throws Exception
-// {
-// return new JBossWSTestSetup(JBWS751TestCase.class, "jaxrpc-jbws751.war, jaxrpc-jbws751-client.jar");
-// }
-
public void setUp() throws Exception
{
if (true)
17 years, 1 month
JBossWS SVN: r9512 - framework/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-06 11:01:26 -0500 (Fri, 06 Mar 2009)
New Revision: 9512
Added:
framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747/
Log:
[JBPAPP-1747] Branch framework.
Copied: framework/branches/jbossws-framework-2.0.1.GA_CP03_JBPAPP-1747 (from rev 9511, framework/tags/jbossws-framework-2.0.1.GA_CP03)
17 years, 1 month