[jbossws-commits] JBossWS SVN: r2627 - in trunk: jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope and 1 other directory.
Author: thomas.diesler(a)jboss.com
Date: 2007-03-15 20:29:57 -0400 (Thu, 15 Mar 2007)
New Revision: 2627
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainsObjectFactory.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java
Log:
[JBWS-1578] Redefine order of jaxws handlers
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainsObjectFactory.java
===================================================================
---
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainsObjectFactory.java 2007-03-15
23:53:38 UTC (rev 2626)
+++
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/HandlerChainsObjectFactory.java 2007-03-16
00:29:57 UTC (rev 2627)
@@ -23,11 +23,6 @@
// $Id$
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
import org.jboss.xb.binding.ObjectModelFactory;
@@ -81,16 +76,6 @@
public void addChild(UnifiedHandlerChainsMetaData handlerConfig,
UnifiedHandlerChainMetaData handlerChain, UnmarshallingContext navigator, String
namespaceURI,
String localName)
{
- // TODO: remove this CTS hack
- QName portPattern = handlerChain.getPortNamePattern();
- if (new QName("http://dlhandlerservice.org/wsdl";,
"HelloPort").equals(portPattern))
- {
- List<UnifiedHandlerMetaData> orgHandlers = new
ArrayList<UnifiedHandlerMetaData>(handlerChain.getHandlers());
- handlerChain.getHandlers().clear();
- for (int i = 1; i <= orgHandlers.size(); i++)
- handlerChain.addHandler(orgHandlers.get(orgHandlers.size() - i));
- }
-
handlerConfig.addHandlerChain(handlerChain);
}
Modified:
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java
===================================================================
---
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2007-03-15
23:53:38 UTC (rev 2626)
+++
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2007-03-16
00:29:57 UTC (rev 2627)
@@ -63,21 +63,21 @@
expStr.append(":PortClientHandler");
expStr.append(":PortWildcardClientHandler");
expStr.append(":GeneralClientHandler");
+ expStr.append(":GeneralServerHandler");
+ expStr.append(":PortWildcardServerHandler");
+ expStr.append(":PortServerHandler");
+ expStr.append(":ServiceWildcardServerHandler");
+ expStr.append(":ServiceServerHandler");
+ expStr.append(":SOAPServerHandler");
expStr.append(":SOAP12ServerHandler");
+ expStr.append(":endpoint");
+ expStr.append(":SOAP12ServerHandler");
expStr.append(":SOAPServerHandler");
expStr.append(":ServiceServerHandler");
expStr.append(":ServiceWildcardServerHandler");
expStr.append(":PortServerHandler");
expStr.append(":PortWildcardServerHandler");
expStr.append(":GeneralServerHandler");
- expStr.append(":endpoint");
- expStr.append(":GeneralServerHandler");
- expStr.append(":PortWildcardServerHandler");
- expStr.append(":PortServerHandler");
- expStr.append(":ServiceWildcardServerHandler");
- expStr.append(":ServiceServerHandler");
- expStr.append(":SOAPServerHandler");
- expStr.append(":SOAP12ServerHandler");
expStr.append(":GeneralClientHandler");
expStr.append(":PortWildcardClientHandler");
expStr.append(":PortClientHandler");