[jbossws-commits] JBossWS SVN: r15504 - in spi/trunk/src/main/java/org/jboss/wsf/spi/metadata: j2ee/serviceref and 1 other directory.

Author: ropalka Date: 2012-01-24 07:06:17 -0500 (Tue, 24 Jan 2012) New Revision: 15504 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/AbstractHandlerChainsMetaDataParser.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java Log: [AS7-3216] allow to specify id for handler chains Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/AbstractHandlerChainsMetaDataParser.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/AbstractHandlerChainsMetaDataParser.java 2012-01-23 16:22:39 UTC (rev 15503) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/AbstractHandlerChainsMetaDataParser.java 2012-01-24 12:06:17 UTC (rev 15504) @@ -84,7 +84,7 @@ } case XMLStreamConstants.START_ELEMENT : { if (match(reader, nsUri, HANDLER_CHAIN)) { - handlerChains.addHandlerChain(parseHandlerChain(reader, nsUri, handlerChains)); + handlerChains.addHandlerChain(parseHandlerChain(reader, nsUri)); } else { @@ -96,9 +96,9 @@ throw new IllegalStateException(BundleUtils.getMessage(bundle, "REACHED_END_OF_XML_DOCUMENT_UNEXPECTEDLY")); } - private UnifiedHandlerChainMetaData parseHandlerChain(XMLStreamReader reader, String nsUri, UnifiedHandlerChainsMetaData handlerChains) throws XMLStreamException + private UnifiedHandlerChainMetaData parseHandlerChain(XMLStreamReader reader, String nsUri) throws XMLStreamException { - UnifiedHandlerChainMetaData handlerChain = new UnifiedHandlerChainMetaData(handlerChains); + UnifiedHandlerChainMetaData handlerChain = new UnifiedHandlerChainMetaData(); while (reader.hasNext()) { switch (reader.nextTag()) Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java 2012-01-23 16:22:39 UTC (rev 15503) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java 2012-01-24 12:06:17 UTC (rev 15504) @@ -25,7 +25,6 @@ import java.util.List; import javax.xml.namespace.QName; -import javax.xml.ws.handler.PortInfo; import org.jboss.wsf.spi.serviceref.ServiceRefElement; @@ -35,24 +34,27 @@ */ public class UnifiedHandlerChainMetaData extends ServiceRefElement { - private UnifiedHandlerChainsMetaData handlerChains; - private QName serviceNamePattern; private QName portNamePattern; private String protocolBindings; private List<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(); - private PortInfo portInfo; private boolean excluded; + private String id; - public UnifiedHandlerChainMetaData(UnifiedHandlerChainsMetaData handlerChains) + public UnifiedHandlerChainMetaData() { - this.handlerChains = handlerChains; } - public UnifiedHandlerChainMetaData() + public String getId() { + return id; } + public void setId(final String id) + { + this.id = id; + } + public QName getPortNamePattern() { return portNamePattern;