Author: thomas.diesler(a)jboss.com
Date: 2007-01-25 09:41:01 -0500 (Thu, 25 Jan 2007)
New Revision: 2109
Removed:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0-jdk14/
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
Log:
Support pre/post handler cahins in HandlerResolver
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-25
14:41:01 UTC (rev 2109)
@@ -50,8 +50,9 @@
#
# copy the test reports
#
-rm -f $WORKSPACE/test-reports/*
-cp ./output/reports/*.xml $WORKSPACE/test-reports
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r ./output/reports/*.xml $WORKSPACE/test-reports
#
# stop jbossas
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-25
14:41:01 UTC (rev 2109)
@@ -52,8 +52,9 @@
#
# copy the test reports
#
-rm -f $WORKSPACE/test-reports/*
-cp ./output/reports/*.xml $WORKSPACE/test-reports
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r ./output/reports/*.xml $WORKSPACE/test-reports
#
# stop jbossas
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-25
14:41:01 UTC (rev 2109)
@@ -50,8 +50,9 @@
#
# copy the test reports
#
-rm -f $WORKSPACE/test-reports/*
-cp ./output/reports/*.xml $WORKSPACE/test-reports
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r ./output/reports/*.xml $WORKSPACE/test-reports
#
# stop jbossas
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-25
14:41:01 UTC (rev 2109)
@@ -50,8 +50,9 @@
#
# copy the test reports
#
-rm -f $WORKSPACE/test-reports/*
-cp ./output/reports/*.xml $WORKSPACE/test-reports
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r ./output/reports/*.xml $WORKSPACE/test-reports
#
# stop jbossas
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-01-25
14:41:01 UTC (rev 2109)
@@ -31,7 +31,7 @@
#
# build jbossws samples
#
-ant $ENVIRONMENT clean build-samples
+ant $ENVIRONMENT clean deploy-jboss40 build-samples
#
# start jbossas
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-01-25
14:41:01 UTC (rev 2109)
@@ -31,7 +31,7 @@
#
# build jbossws samples
#
-ant $ENVIRONMENT clean build-samples
+ant $ENVIRONMENT clean deploy-jboss42 build-samples
#
# start jbossas
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-01-25
14:41:01 UTC (rev 2109)
@@ -31,7 +31,7 @@
#
# build jbossws samples
#
-ant $ENVIRONMENT clean build-samples
+ant $ENVIRONMENT clean deploy-jboss50 build-samples
#
# start jbossas
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-01-25
14:41:01 UTC (rev 2109)
@@ -9,8 +9,11 @@
MODULE=JBWS-Samples-TC-5.5
WORKSPACE=`pwd`
SVNBASEDIR=$WORKSPACE/(a)svn.basename@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat
-ENVIRONMENT="-Djbossws.integration.target=tomcat
-Dtomcat.home=$TOMCAT_INSTANCE"
+ENVIRONMENT="-Djbossws.integration.target=tomcat
-Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE
-Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE"
#
# copy ant.properties
@@ -24,21 +27,22 @@
$TOMCAT_INSTANCE/bin/catalina.sh stop
#
-# deploy to jboss
+# build jbossws samples
#
-ant $ENVIRONMENT clean deploy-tomcat
+ant $ENVIRONMENT clean deploy-tomcat build-samples
#
-# start jbossas
+# start tomcat
#
$TOMCAT_INSTANCE/bin/catalina.sh start
-sleep 10
-
+
#
-# execute tests
+# execute samples
#
-cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT tests-samples
+cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
# stop tomcat
@@ -49,7 +53,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
-
<testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+
<testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients(a)</recipients>
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
---
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-01-25
14:41:01 UTC (rev 2109)
@@ -6,7 +6,7 @@
<childProjects>
JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14,
JBWS-Tests-TC-5.5,
JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0,
JBAS-Tests-AS-4.0-jdk14,
- JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0,
JBWS-Samples-AS-4.0-jdk14, JBWS-Samples-TC-5.5
+ JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0,
JBWS-Samples-TC-5.5
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingExt.java 2007-01-25
14:41:01 UTC (rev 2109)
@@ -38,5 +38,7 @@
*/
public interface BindingExt extends Binding
{
- public List<Handler> getHandlerChain(HandlerType handlerType);
+ List<Handler> getHandlerChain(HandlerType handlerType);
+
+ void setHandlerChain(List<Handler> handlerChain, HandlerType handlerType);
}
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-01-25
14:41:01 UTC (rev 2109)
@@ -64,16 +64,40 @@
return Collections.unmodifiableList(handlerChain);
}
+ public void setHandlerChain(List<Handler> handlerChain, HandlerType
handlerType)
+ {
+ if (handlerType == HandlerType.PRE || handlerType == HandlerType.ALL)
+ {
+ preHandlerChain.clear();
+ preHandlerChain.addAll(handlerChain);
+ }
+
+ if (handlerType == HandlerType.ENDPOINT || handlerType == HandlerType.ALL)
+ {
+ jaxwsHandlerChain.clear();
+ jaxwsHandlerChain.addAll(handlerChain);
+ }
+
+ if (handlerType == HandlerType.POST || handlerType == HandlerType.ALL)
+ {
+ postHandlerChain.clear();
+ postHandlerChain.addAll(handlerChain);
+ }
+ }
+
public List<Handler> getHandlerChain()
{
log.debug("getHandlerChain: " + jaxwsHandlerChain);
- return jaxwsHandlerChain;
+ List<Handler> handlerChain = new ArrayList<Handler>();
+ handlerChain.addAll(jaxwsHandlerChain);
+ return handlerChain;
}
public void setHandlerChain(List<Handler> handlerChain)
{
log.debug("setHandlerChain: " + handlerChain);
- this.jaxwsHandlerChain = handlerChain;
+ jaxwsHandlerChain.clear();
+ jaxwsHandlerChain.addAll(handlerChain);
}
public String getBindingID()
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2007-01-25
14:41:01 UTC (rev 2109)
@@ -89,6 +89,11 @@
delegate.setHandlerChain(handlerChain);
}
+ public void setHandlerChain(List<Handler> handlerChain, HandlerType
handlerType)
+ {
+ delegate.setHandlerChain(handlerChain, handlerType);
+ }
+
public String getBindingID()
{
throw new NotImplementedException();
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-01-25
14:41:01 UTC (rev 2109)
@@ -152,6 +152,11 @@
delegate.setHandlerChain(handlerChain);
}
+ public void setHandlerChain(List<Handler> handlerChain, HandlerType
handlerType)
+ {
+ delegate.setHandlerChain(handlerChain, handlerType);
+ }
+
private void handleException(Exception ex) throws BindingException
{
if (ex instanceof RuntimeException)
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-01-25
14:41:01 UTC (rev 2109)
@@ -167,6 +167,11 @@
delegate.setHandlerChain(handlerChain);
}
+ public void setHandlerChain(List<Handler> handlerChain, HandlerType
handlerType)
+ {
+ delegate.setHandlerChain(handlerChain, handlerType);
+ }
+
private void handleException(Exception ex) throws BindingException
{
if (ex instanceof RuntimeException)
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2007-01-25
14:41:01 UTC (rev 2109)
@@ -96,6 +96,11 @@
delegate.setHandlerChain(handlerChain);
}
+ public void setHandlerChain(List<Handler> handlerChain, HandlerType
handlerType)
+ {
+ delegate.setHandlerChain(handlerChain, handlerType);
+ }
+
public SOAPMessage createFaultMessageFromException(Exception ex)
{
return SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex);
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2007-01-25
14:41:01 UTC (rev 2109)
@@ -105,6 +105,11 @@
delegate.setHandlerChain(handlerChain);
}
+ public void setHandlerChain(List<Handler> handlerChain, HandlerType
handlerType)
+ {
+ delegate.setHandlerChain(handlerChain, handlerType);
+ }
+
public SOAPMessage createFaultMessageFromException(Exception ex)
{
return SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex);
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-01-25
14:41:01 UTC (rev 2109)
@@ -23,20 +23,11 @@
// $Id$
-import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
-import org.jboss.ws.core.CommonBindingProvider;
-import org.jboss.ws.core.CommonClient;
-import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.jaxws.binding.BindingExt;
-import org.jboss.ws.core.jaxws.binding.BindingProviderImpl;
-import org.jboss.ws.core.jaxws.handler.*;
-import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.metadata.config.Configurable;
-import org.jboss.ws.metadata.config.ConfigurationProvider;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
-import org.jboss.ws.metadata.umdm.OperationMetaData;
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Observable;
import javax.xml.namespace.QName;
import javax.xml.ws.Binding;
@@ -50,11 +41,26 @@
import javax.xml.ws.http.HTTPException;
import javax.xml.ws.soap.SOAPBinding;
import javax.xml.ws.soap.SOAPFaultException;
-import java.rmi.RemoteException;
-import java.util.List;
-import java.util.Map;
-import java.util.Observable;
+import org.jboss.logging.Logger;
+import org.jboss.util.NotImplementedException;
+import org.jboss.ws.core.CommonBindingProvider;
+import org.jboss.ws.core.CommonClient;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.jaxws.binding.BindingExt;
+import org.jboss.ws.core.jaxws.binding.BindingProviderImpl;
+import org.jboss.ws.core.jaxws.handler.HandlerChainExecutor;
+import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl;
+import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS;
+import org.jboss.ws.core.jaxws.handler.PortInfoImpl;
+import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
+import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.metadata.config.Configurable;
+import org.jboss.ws.metadata.config.ConfigurationProvider;
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.metadata.umdm.OperationMetaData;
+import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
+
/**
* Provides support for the dynamic invocation of a service endpoint.
*
@@ -90,24 +96,26 @@
*/
private void resetCreateBindingHandlerChain()
{
+ BindingExt binding = (BindingExt)getBindingProvider().getBinding();
+ PortInfoImpl portInfo = new PortInfoImpl(epMetaData);
+
if (handlerResolver instanceof HandlerResolverImpl)
{
HandlerResolverImpl impl = (HandlerResolverImpl)handlerResolver;
impl.initHandlerChain(epMetaData, HandlerType.PRE);
impl.initHandlerChain(epMetaData, HandlerType.ENDPOINT);
impl.initHandlerChain(epMetaData, HandlerType.POST);
+
+ List<Handler> preChain = impl.getHandlerChain(portInfo, HandlerType.PRE);
+ binding.setHandlerChain(preChain, HandlerType.PRE);
+ List<Handler> postChain = impl.getHandlerChain(portInfo,
HandlerType.PRE);
+ binding.setHandlerChain(postChain, HandlerType.POST);
}
- Binding binding = getBindingProvider().getBinding();
if (handlerResolver != null)
{
- PortInfoImpl portInfo = new PortInfoImpl(epMetaData);
- List<Handler> handlerChain = binding.getHandlerChain();
- handlerChain.clear();
- for (Handler handler : handlerResolver.getHandlerChain(portInfo))
- {
- handlerChain.add(handler);
- }
+ List<Handler> epChain = handlerResolver.getHandlerChain(portInfo);
+ binding.setHandlerChain(epChain);
}
}
@@ -116,8 +124,9 @@
* @param observable
* @param object
*/
- public void update(Observable observable, Object object) {
- log.debug("Configuration change event received. Reconfigure handler chain:
"+object);
+ public void update(Observable observable, Object object)
+ {
+ log.debug("Configuration change event received. Reconfigure handler chain:
" + object);
// reconfigure endpoint meta data handler information from config
((ConfigurationProvider)epMetaData).configure(epMetaData);
@@ -198,7 +207,8 @@
}
}
- protected CommonMessageContext processPivot(CommonMessageContext requestContext) {
+ protected CommonMessageContext processPivot(CommonMessageContext requestContext)
+ {
log.debug("Begin response processing");
// remove existing context
@@ -316,6 +326,6 @@
public void setConfigName(String configName)
{
ConfigurationProvider configProvider =
(ConfigurationProvider)getEndpointMetaData();
- configProvider.setConfigName(configName);
+ configProvider.setConfigName(configName);
}
}
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-01-25
13:57:30 UTC (rev 2108)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-01-25
14:41:01 UTC (rev 2109)
@@ -69,17 +69,24 @@
public List<Handler> getHandlerChain(PortInfo info)
{
- log.debug("getHandlerChain: " + info);
+ return getHandlerChain(info, HandlerType.ENDPOINT);
+ }
+
+ public List<Handler> getHandlerChain(PortInfo info, HandlerType type)
+ {
+ log.debug("getHandlerChain: [type=" + type + ",info=" + info +
"]");
List<Handler> unsortedChain = new ArrayList<Handler>();
String bindingID = info.getBindingID();
QName serviceName = info.getServiceName();
QName portName = info.getPortName();
+
+ Map<PortInfo, List<Handler>> handlerMap = getHandlerMap(type);
if (bindingID != null)
{
- List<Handler> list = jaxwsHandlers.get(new PortInfoImpl(null, null,
bindingID));
+ List<Handler> list = handlerMap.get(new PortInfoImpl(null, null,
bindingID));
if (list != null)
{
log.debug("add protocol handlers: " + list);
@@ -89,7 +96,7 @@
if (serviceName != null)
{
- List<Handler> list = jaxwsHandlers.get(new PortInfoImpl(serviceName, null,
null));
+ List<Handler> list = handlerMap.get(new PortInfoImpl(serviceName, null,
null));
if (list != null)
{
log.debug("add service handlers: " + list);
@@ -99,7 +106,7 @@
if (portName != null)
{
- List<Handler> list = jaxwsHandlers.get(new PortInfoImpl(null, portName,
null));
+ List<Handler> list = handlerMap.get(new PortInfoImpl(null, portName,
null));
if (list != null)
{
log.debug("add port handlers: " + list);
@@ -107,7 +114,7 @@
}
}
- List<Handler> list = jaxwsHandlers.get(new PortInfoImpl(null, null, null));
+ List<Handler> list = handlerMap.get(new PortInfoImpl(null, null, null));
if (list != null)
{
log.debug("add general handlers: " + list);
@@ -136,6 +143,8 @@
// clear all exisisting handler to avoid double registration
log.debug("Clear handler map: " + jaxwsHandlers);
+ Map<PortInfo, List<Handler>> handlerMap = getHandlerMap(type);
+ handlerMap.clear();
for (HandlerMetaData handlerMetaData : epMetaData.getHandlerMetaData(type))
{
@@ -160,7 +169,7 @@
List<PortInfo> infos = getPortInfos(epMetaData, jaxwsMetaData);
for (PortInfo info : infos)
{
- addHandler(info, handler, handlerMetaData.getHandlerType());
+ addHandler(info, handler, type);
}
}
catch (RuntimeException rte)
@@ -279,14 +288,7 @@
{
log.debug("addHandler: " + info + ":" + handler);
- Map<PortInfo, List<Handler>> handlerMap = null;
- if (type == HandlerType.PRE)
- handlerMap = preHandlers;
- else if (type == HandlerType.ENDPOINT)
- handlerMap = jaxwsHandlers;
- else if (type == HandlerType.POST)
- handlerMap = postHandlers;
-
+ Map<PortInfo, List<Handler>> handlerMap = getHandlerMap(type);
List<Handler> handlerList = handlerMap.get(info);
if (handlerList == null)
{
@@ -296,4 +298,16 @@
return true;
}
+
+ private Map<PortInfo, List<Handler>> getHandlerMap(HandlerType type)
+ {
+ Map<PortInfo, List<Handler>> handlerMap = null;
+ if (type == HandlerType.PRE)
+ handlerMap = preHandlers;
+ else if (type == HandlerType.ENDPOINT)
+ handlerMap = jaxwsHandlers;
+ else if (type == HandlerType.POST)
+ handlerMap = postHandlers;
+ return handlerMap;
+ }
}