JBossWS SVN: r11923 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-01 11:42:48 -0400 (Thu, 01 Apr 2010)
New Revision: 11923
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java
Log:
[JBWS-2975]:Minor change,correct the lines to call DOMUtils
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java 2010-04-01 15:40:56 UTC (rev 11922)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java 2010-04-01 15:42:48 UTC (rev 11923)
@@ -79,7 +79,7 @@
List<Element> elements = DOMUtils.getChildElementsAsList(element, "return");
for (Element ele : elements)
{
- String typeValue = DOMUtil.getAttrValueNS(ele, "http://www.w3.org/2001/XMLSchema-instance", "type");
+ String typeValue = DOMUtils.getAttributeValue(ele, new QName("http://www.w3.org/2001/XMLSchema-instance", "type"));
assertEquals("The namespace prefix is not serialized", true ,typeValue.indexOf(":") > 0);
}
//cleanup the mock object
14 years, 6 months
JBossWS SVN: r11922 - stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-01 11:40:56 -0400 (Thu, 01 Apr 2010)
New Revision: 11922
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java
Log:
Minor fix : correct the DomUtils invocation
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java 2010-04-01 14:20:47 UTC (rev 11921)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java 2010-04-01 15:40:56 UTC (rev 11922)
@@ -79,8 +79,8 @@
Element element = DOMUtils.parse(result.toString());
List<Element> elements = DOMUtils.getChildElementsAsList(element, "return");
for (Element ele : elements)
- {
- String typeValue = DOMUtil.getAttrValueNS(ele, "http://www.w3.org/2001/XMLSchema-instance", "type");
+ {
+ String typeValue = DOMUtils.getAttributeValue(ele, new QName("http://www.w3.org/2001/XMLSchema-instance", "type"));
assertEquals("The namespace prefix is not serialized", true ,typeValue.indexOf(":") > 0);
}
//cleanup the mock object
14 years, 6 months
JBossWS SVN: r11921 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws: core/jaxws/handler and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-04-01 10:20:47 -0400 (Thu, 01 Apr 2010)
New Revision: 11921
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java
Log:
[JBWS-2985] fixing addressing Action header to follow JAX-WS 2.2 specification
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2010-04-01 10:11:01 UTC (rev 11920)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2010-04-01 14:20:47 UTC (rev 11921)
@@ -70,6 +70,7 @@
protected Scope currentScope = Scope.APPLICATION;
private boolean isModified;
+ private Throwable currentException;
public CommonMessageContext()
{
@@ -85,6 +86,16 @@
this.scopedProps = new HashMap<String, ScopedProperty>(msgContext.scopedProps);
this.currentScope = msgContext.currentScope;
}
+
+ public Throwable getCurrentException()
+ {
+ return currentException;
+ }
+
+ public void setCurrentException(Throwable t)
+ {
+ this.currentException = t;
+ }
public Scope getCurrentScope()
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2010-04-01 10:11:01 UTC (rev 11920)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2010-04-01 14:20:47 UTC (rev 11921)
@@ -132,6 +132,7 @@
log.debug("callFaultHandlerChain: " + type);
HandlerChainExecutor executor = getExecutor(type);
MessageContext msgContext = (MessageContext)MessageContextAssociation.peekMessageContext();
+ ((CommonMessageContext)msgContext).setCurrentException(ex);
boolean status = (executor != null ? executor.handleFault(msgContext, ex) : true);
MessageAbstraction msg = ((CommonMessageContext)msgContext).getMessageAbstraction();
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2010-04-01 10:11:01 UTC (rev 11920)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2010-04-01 14:20:47 UTC (rev 11921)
@@ -24,6 +24,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.extensions.addressing.AddressingClientUtil;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
+import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt;
import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -114,7 +115,13 @@
}
else
{
- addrProps.setAction(ADDR_BUILDER.newURI(opMetaData.getJavaName()));
+ AddressingOpMetaExt addressingMD = (AddressingOpMetaExt)opMetaData.getExtension(ADDR_CONSTANTS.getNamespaceURI());
+ if (addressingMD == null)
+ throw new IllegalStateException("Addressing Meta Data not available");
+
+ String action = addressingMD.getInboundAction();
+ if (action == null) action = opMetaData.getJavaName();
+ addrProps.setAction(ADDR_BUILDER.newURI(action));
}
}
catch (URISyntaxException ex)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2010-04-01 10:11:01 UTC (rev 11920)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2010-04-01 14:20:47 UTC (rev 11921)
@@ -26,6 +26,7 @@
import org.jboss.ws.core.soap.SOAPFaultImpl;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt;
+import org.jboss.ws.metadata.umdm.FaultMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.wsf.common.handler.GenericSOAPHandler;
@@ -36,8 +37,6 @@
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.FaultAction;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.addressing.AddressingBuilder;
import javax.xml.ws.addressing.JAXWSAConstants;
@@ -198,26 +197,24 @@
try
{
// supply the response action
+ CommonMessageContext commonCtx = (CommonMessageContext)msgContext;
+ OperationMetaData operationMD = commonCtx.getOperationMetaData();
+
+ AddressingOpMetaExt addressingMD = (AddressingOpMetaExt)operationMD.getExtension(ADDR_CONSTANTS.getNamespaceURI());
+
+ if (addressingMD == null)
+ throw new IllegalStateException("Addressing meta data not available");
- OperationMetaData opMetaData = ((CommonMessageContext)msgContext).getOperationMetaData();
-
- if (!isFault && !opMetaData.isOneWay())
+ if (!isFault && !operationMD.isOneWay())
{
-
- AddressingOpMetaExt addrExt = (AddressingOpMetaExt)opMetaData.getExtension(ADDR_CONSTANTS.getNamespaceURI());
- if (addrExt != null)
- {
- outProps.setAction(ADDR_BUILDER.newURI(addrExt.getOutboundAction()));
- }
- else
- {
- log.warn("Unable to resolve replyAction for " + opMetaData.getQName());
- }
-
+ outProps.setAction(ADDR_BUILDER.newURI(addressingMD.getOutboundAction()));
}
else if (isFault)
{
- outProps.setAction(ADDR_BUILDER.newURI(ADDR_CONSTANTS.getDefaultFaultAction()));
+ Throwable exception = commonCtx.getCurrentException();
+ String faultAction = getFaultAction(operationMD, addressingMD, exception);
+
+ outProps.setAction(ADDR_BUILDER.newURI(faultAction));
}
}
@@ -229,7 +226,20 @@
outProps.writeHeaders(soapMessage);
}
- /* check wsa formal constraints */
+ private String getFaultAction(final OperationMetaData operationMD, final AddressingOpMetaExt addressingMD, final Throwable exception)
+ {
+ final FaultMetaData faultMD = operationMD.getFaultMetaData(exception.getClass());
+
+ if (faultMD != null)
+ {
+ final String beanName = faultMD.getFaultBeanName();
+ return addressingMD.getFaultAction(beanName);
+ }
+
+ return ADDR_CONSTANTS.getDefaultFaultAction();
+ }
+
+ /* check wsa formal constraints */
private void validateRequest(SOAPAddressingProperties addrProps)
{
// If wsa:ReplyTo is supplied and the message lacks a [message id] property, the processor MUST fault.
14 years, 6 months
JBossWS SVN: r11920 - framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2976.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-01 06:11:01 -0400 (Thu, 01 Apr 2010)
New Revision: 11920
Modified:
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2976/JAXWS2976TestCase.java
Log:
[JBPAPP-4025]:removed the unnecessary check
Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2976/JAXWS2976TestCase.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2976/JAXWS2976TestCase.java 2010-04-01 10:07:39 UTC (rev 11919)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2976/JAXWS2976TestCase.java 2010-04-01 10:11:01 UTC (rev 11920)
@@ -48,8 +48,7 @@
}
catch (WebServiceException e)
{
- assertEquals("The adding handler incompatibale WebServiceExceptoin is not thrown ", true, e.getMessage()
- .indexOf("The adding handler in HTTPBinding is incompatiable") > -1);
+ //expected and do nothing
}
}
14 years, 6 months
JBossWS SVN: r11919 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-01 06:07:39 -0400 (Thu, 01 Apr 2010)
New Revision: 11919
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java
Log:
Minor change : removed the unused import
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java 2010-04-01 10:01:03 UTC (rev 11918)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java 2010-04-01 10:07:39 UTC (rev 11919)
@@ -36,8 +36,6 @@
import org.jboss.wsf.common.DOMUtils;
import org.w3c.dom.Element;
-import com.sun.org.apache.xerces.internal.util.DOMUtil;
-
/**
* A JAXBSerializerTestCase.
*
14 years, 6 months
JBossWS SVN: r11918 - stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-01 06:01:03 -0400 (Thu, 01 Apr 2010)
New Revision: 11918
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java
Log:
minor change:removed unused import
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java 2010-04-01 09:33:04 UTC (rev 11917)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2975/JAXBSerializerTestCase.java 2010-04-01 10:01:03 UTC (rev 11918)
@@ -36,7 +36,6 @@
import org.jboss.wsf.common.DOMUtils;
import org.w3c.dom.Element;
-import com.sun.org.apache.xerces.internal.util.DOMUtil;
/**
* A JAXBSerializerTestCase.
14 years, 6 months
JBossWS SVN: r11917 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2976.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-01 05:33:04 -0400 (Thu, 01 Apr 2010)
New Revision: 11917
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2976/JAXWS2976TestCase.java
Log:
[JBWS-2976]:Removed the check
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2976/JAXWS2976TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2976/JAXWS2976TestCase.java 2010-04-01 06:50:50 UTC (rev 11916)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2976/JAXWS2976TestCase.java 2010-04-01 09:33:04 UTC (rev 11917)
@@ -48,8 +48,7 @@
}
catch (WebServiceException e)
{
- assertEquals("The adding handler incompatibale WebServiceExceptoin is not thrown ", true, e.getMessage()
- .indexOf("The adding handler in HTTPBinding is incompatiable") > -1);
+ //expected and do nothing
}
}
14 years, 6 months
JBossWS SVN: r11916 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-01 02:50:50 -0400 (Thu, 01 Apr 2010)
New Revision: 11916
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-2983] Excluding tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-04-01 05:33:00 UTC (rev 11915)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-04-01 06:50:50 UTC (rev 11916)
@@ -54,3 +54,6 @@
# TODO investigate failures
org/jboss/test/ws/jaxws/jbws2960/*TestCase.*
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
+
+# [JBWS-2983] Fix regressions due to HornetQ update
+org/jboss/test/ws/jaxws/samples/jmstransport/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-04-01 05:33:00 UTC (rev 11915)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-04-01 06:50:50 UTC (rev 11916)
@@ -54,3 +54,6 @@
# TODO investigate failures
org/jboss/test/ws/jaxws/jbws2960/*TestCase.*
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
+
+# [JBWS-2983] Fix regressions due to HornetQ update
+org/jboss/test/ws/jaxws/samples/jmstransport/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-01 05:33:00 UTC (rev 11915)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-01 06:50:50 UTC (rev 11916)
@@ -54,3 +54,6 @@
# TODO investigate failures
org/jboss/test/ws/jaxws/jbws2960/*TestCase.*
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
+
+# [JBWS-2983] Fix regressions due to HornetQ update
+org/jboss/test/ws/jaxws/samples/jmstransport/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-04-01 05:33:00 UTC (rev 11915)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-04-01 06:50:50 UTC (rev 11916)
@@ -50,3 +50,6 @@
# TODO investigate failures
org/jboss/test/ws/jaxws/jbws2960/*TestCase.*
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
+
+# [JBWS-2983] Fix regressions due to HornetQ update
+org/jboss/test/ws/jaxws/samples/jmstransport/**
14 years, 6 months
JBossWS SVN: r11915 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-04-01 01:33:00 -0400 (Thu, 01 Apr 2010)
New Revision: 11915
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
synch with AS trunk
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2010-03-31 17:26:32 UTC (rev 11914)
+++ stack/native/trunk/modules/testsuite/pom.xml 2010-04-01 05:33:00 UTC (rev 11915)
@@ -26,7 +26,7 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
- <hornetq.version>2.1.0.r9008</hornetq.version>
+ <hornetq.version>2.1.0.r9031</hornetq.version>
</properties>
<!-- Modules -->
14 years, 6 months