Author: thomas.diesler(a)jboss.com Date: 2007-03-29 04:29:46 -0400 (Thu, 29 Mar 2007) New Revision: 2709 Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ServerMimeHandler.java trunk/jbossws-tests/src/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml Log: Fix jaxws cookie regression Enable automated hudson builds Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-03-28 20:47:08 UTC (rev 2708) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-03-29 08:29:46 UTC (rev 2709) @@ -52,11 +52,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults&gt;@svn.basename(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; </hudson.tasks.junit.JUnitResultArchiver> - <!--hudson.tasks.Mailer> + <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - <hudson.tasks.Mailer--> + <sendToIndividuals>true</sendToIndividuals> + <hudson.tasks.Mailer> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> @@ -66,7 +66,12 @@ <canRoam>true</canRoam> <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> + <triggers class="vector"> + <hudson.triggers.SCMTrigger> + <spec># Every 10 minutes&#x0D; +*/10 * * * *</spec> + </hudson.triggers.SCMTrigger> + </triggers> <description>Build and test jbossws-(a)version.id@ against AS-5.0</description> <keepDependencies>false</keepDependencies> <properties/> Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-03-28 20:47:08 UTC (rev 2708) +++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-03-29 08:29:46 UTC (rev 2709) @@ -11,7 +11,11 @@ <canRoam>true</canRoam> <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> + <triggers class="vector"> + <hudson.triggers.TimerTrigger> + <spec>0 6 * * *</spec> + </hudson.triggers.TimerTrigger> + </triggers> <description>Build the relase matrix target containers.</description> <keepDependencies>false</keepDependencies> <properties/> Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ServerMimeHandler.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ServerMimeHandler.java 2007-03-28 20:47:08 UTC (rev 2708) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ServerMimeHandler.java 2007-03-29 08:29:46 UTC (rev 2709) @@ -39,6 +39,8 @@ { // Provide logging private static Logger log = Logger.getLogger(ServerMimeHandler.class); + + private boolean setCookieOnResponse; protected boolean handleInbound(MessageContext msgContext) { @@ -47,8 +49,8 @@ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); String[] cookies = mimeHeaders.getHeader("Cookie"); - if (cookies == null || cookies.length != 1 || !cookies[0].equals("client-cookie=true")) - throw new IllegalStateException("Unexpected cookie list: " + mimeHeaders); + if (cookies != null && cookies.length == 1 && cookies[0].equals("client-cookie=true")) + setCookieOnResponse = true; return true; } @@ -58,9 +60,13 @@ { log.info("handleOutbound"); - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); - mimeHeaders.setHeader("Set-Cookie", "server-cookie=true"); + if (setCookieOnResponse) + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); + mimeHeaders.setHeader("Set-Cookie", "server-cookie=true"); + setCookieOnResponse = false; + } return true; } Modified: trunk/jbossws-tests/src/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml 2007-03-28 20:47:08 UTC (rev 2708) +++ trunk/jbossws-tests/src/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml 2007-03-29 08:29:46 UTC (rev 2709) @@ -17,7 +17,7 @@ <service-ref> <service-ref-name>Service3</service-ref-name> - <handler-chain>jaxws-handlers.xml</handler-chain> + <handler-chain>jaxws-handlers-client.xml</handler-chain> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-handlerchain/TestService?wsdl</wsdl-override> </service-ref>