Author: alessio.soldano(a)jboss.com
Date: 2010-11-29 06:32:42 -0500 (Mon, 29 Nov 2010)
New Revision: 13358
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaDataParser.java
spi/trunk/src/test/java/org/jboss/test/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlersChainsMDParserTestCase.java
spi/trunk/src/test/resources/metadata/j2ee/serviceref/test-handlers.xml
Log:
[JBWS-3169] Adding missing soap-role and soap-header parsing
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaDataParser.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaDataParser.java 2010-11-29
11:09:19 UTC (rev 13357)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaDataParser.java 2010-11-29
11:32:42 UTC (rev 13358)
@@ -52,6 +52,8 @@
private static final QName QNAME_HANDLER = new QName(JAVAEE_NS, "handler");
private static final QName QNAME_HANDLER_NAME = new QName(JAVAEE_NS,
"handler-name");
private static final QName QNAME_HANDLER_CLASS = new QName(JAVAEE_NS,
"handler-class");
+ private static final QName QNAME_HANDLER_SOAP_ROLE = new QName(JAVAEE_NS,
"soap-role");
+ private static final QName QNAME_HANDLER_SOAP_HEADER = new QName(JAVAEE_NS,
"soap-header");
private static final QName QNAME_HANDLER_PARAM = new QName(JAVAEE_NS,
"init-param");
private static final QName QNAME_HANDLER_PARAM_NAME = new QName(JAVAEE_NS,
"param-name");
private static final QName QNAME_HANDLER_PARAM_VALUE = new QName(JAVAEE_NS,
"param-value");
@@ -207,6 +209,12 @@
else if (match(reader, QNAME_HANDLER_PARAM)) {
handler.addInitParam(parseInitParam(reader));
}
+ else if (match(reader, QNAME_HANDLER_SOAP_ROLE)) {
+ handler.addSoapRole(elementAsString(reader));
+ }
+ else if (match(reader, QNAME_HANDLER_SOAP_HEADER)) {
+ handler.addSoapHeader(elementAsQName(reader));
+ }
else
{
throw new IllegalStateException("Unexpected element: " +
reader.getLocalName());
Modified:
spi/trunk/src/test/java/org/jboss/test/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlersChainsMDParserTestCase.java
===================================================================
---
spi/trunk/src/test/java/org/jboss/test/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlersChainsMDParserTestCase.java 2010-11-29
11:09:19 UTC (rev 13357)
+++
spi/trunk/src/test/java/org/jboss/test/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlersChainsMDParserTestCase.java 2010-11-29
11:32:42 UTC (rev 13358)
@@ -73,8 +73,11 @@
assertEquals("bar", params.get(1).getParamName());
assertEquals("2", params.get(1).getParamValue());
assertEquals(0, handler.getPortNames().size());
- assertEquals(0, handler.getSoapHeaders().size());
- assertEquals(0, handler.getSoapRoles().size());
+ assertEquals(2, handler.getSoapHeaders().size());
+ assertTrue(handler.getSoapHeaders().contains(new
QName("http://org.jboss.ws/jaxws/samples/logicalhandler",
"firstHeader")));
+ assertTrue(handler.getSoapHeaders().contains(new
QName("http://java.sun.com/xml/ns/javaee", "secondHeader")));
+ assertEquals(1, handler.getSoapRoles().size());
+ assertEquals("MyRole", handler.getSoapRoles().iterator().next());
}
private void testHandlerChain2(UnifiedHandlerChainMetaData chain)
Modified: spi/trunk/src/test/resources/metadata/j2ee/serviceref/test-handlers.xml
===================================================================
--- spi/trunk/src/test/resources/metadata/j2ee/serviceref/test-handlers.xml 2010-11-29
11:09:19 UTC (rev 13357)
+++ spi/trunk/src/test/resources/metadata/j2ee/serviceref/test-handlers.xml 2010-11-29
11:32:42 UTC (rev 13358)
@@ -19,6 +19,9 @@
<param-name>bar</param-name>
<param-value>2</param-value>
</init-param>
+ <soap-role>MyRole</soap-role>
+ <soap-header>ns1:firstHeader</soap-header>
+ <soap-header>secondHeader</soap-header>
</handler>
</handler-chain>