JBossWS SVN: r2116 - branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-25 12:29:05 -0500 (Thu, 25 Jan 2007)
New Revision: 2116
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example
Log:
enable tomcat
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-25 17:25:08 UTC (rev 2115)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-25 17:29:05 UTC (rev 2116)
@@ -14,8 +14,8 @@
# Tomcat Home
tomcat.home=/usr/java/tomcat
-#tomcat.manager.username=manager
-#tomcat.manager.password=manager
+tomcat.manager.username=manager
+tomcat.manager.password=manager
# Force thirdparty HTTP get
#force.thirdparty.get=true
17 years, 9 months
JBossWS SVN: r2115 - in branches/jbossws-1.2.0: integration-tomcat and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-25 12:25:08 -0500 (Thu, 25 Jan 2007)
New Revision: 2115
Modified:
branches/jbossws-1.2.0/build/ant-import/build-setup.xml
branches/jbossws-1.2.0/integration-tomcat/build.xml
branches/jbossws-1.2.0/jbossws-tests/build.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
Log:
Fix tomcat classpath
Modified: branches/jbossws-1.2.0/build/ant-import/build-setup.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-01-25 16:20:03 UTC (rev 2114)
+++ branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-01-25 17:25:08 UTC (rev 2115)
@@ -59,6 +59,7 @@
<property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
<property name="tomcat.common.dir" value="${tomcat.home}/common"/>
+ <property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/>
<available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/>
<available property="jboss42.available" file="${jboss42.client}/jboss-client.jar"/>
Modified: branches/jbossws-1.2.0/integration-tomcat/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-01-25 16:20:03 UTC (rev 2114)
+++ branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-01-25 17:25:08 UTC (rev 2115)
@@ -144,12 +144,12 @@
<include name="xercesImpl.jar"/>
</fileset>
</copy>
- <copy todir="${tomcat.common.dir}/lib" overwrite="true">
+ <copy todir="${tomcat.common.lib}" overwrite="true">
<fileset dir="${core.output.lib.dir}">
+ <include name="jbossws-core.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
</fileset>
<fileset dir="${tomcat.output.lib.dir}">
<include name="jbossws-tomcat-integration.jar"/>
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-25 16:20:03 UTC (rev 2114)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-25 17:25:08 UTC (rev 2115)
@@ -151,7 +151,9 @@
<!--
Init the various classpaths
-->
- <target name="init" depends="prepare,thirdparty">
+ <target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/>
+
+ <target name="common-classpath" depends="prepare,thirdparty">
<!-- The combined compile classpath -->
<path id="jbossws.jars.classpath">
@@ -180,7 +182,9 @@
<pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
</path>
-
+ </target>
+
+ <target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss">
<!-- The test client classpath -->
<path id="test.client.classpath">
<path refid="jbossws.jars.classpath"/>
@@ -201,6 +205,16 @@
</path>
</target>
+ <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat">
+ <!-- The test client classpath -->
+ <path id="test.client.classpath">
+ <path refid="jbossws.jars.classpath"/>
+ <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/>
+ <path refid="javac.classpath"/>
+ </path>
+ </target>
+
+
<!-- ================================================================== -->
<!-- Compiling -->
<!-- ================================================================== -->
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-01-25 16:20:03 UTC (rev 2114)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-01-25 17:25:08 UTC (rev 2115)
@@ -23,23 +23,31 @@
// $Id: SysmonTestCase.java 1994 2007-01-18 12:54:34Z heiko.braun(a)jboss.com $
+import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.addressing.AddressingProperties;
+
import junit.framework.Test;
+
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.core.StubExt;
import org.jboss.ws.extensions.addressing.AddressingClientUtil;
import org.jboss.ws.extensions.eventing.EventingConstants;
-import org.jboss.ws.extensions.eventing.jaxws.*;
-import org.jboss.ws.core.StubExt;
+import org.jboss.ws.extensions.eventing.jaxws.DeliveryType;
+import org.jboss.ws.extensions.eventing.jaxws.EventSourceEndpoint;
+import org.jboss.ws.extensions.eventing.jaxws.FilterType;
+import org.jboss.ws.extensions.eventing.jaxws.GetStatus;
+import org.jboss.ws.extensions.eventing.jaxws.Subscribe;
+import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse;
+import org.jboss.ws.extensions.eventing.jaxws.SubscriptionManagerEndpoint;
+import org.jboss.ws.extensions.eventing.jaxws.Unsubscribe;
-import javax.naming.InitialContext;
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-import javax.xml.ws.addressing.AddressingProperties;
-import java.io.File;
-import java.net.URISyntaxException;
-import java.net.URL;
-
/**
* Test the eventing example service.
*
@@ -69,23 +77,15 @@
if (subscriptionPort == null || managementPort == null)
{
- if (isTargetJBoss())
- {
- URL wsdlURL = new File("resources/jaxws/samples/wseventing/WEB-INF/wsdl/sysmon.wsdl").toURL();
- QName defaultServiceName = new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing", "EventingService");
+ URL wsdlURL = new File("resources/jaxws/samples/wseventing/WEB-INF/wsdl/sysmon.wsdl").toURL();
+ QName defaultServiceName = new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing", "EventingService");
- Service service = Service.create(wsdlURL, defaultServiceName);
- subscriptionPort = (EventSourceEndpoint)service.getPort(EventSourceEndpoint.class);
- managementPort = (SubscriptionManagerEndpoint)service.getPort(SubscriptionManagerEndpoint.class);
+ Service service = Service.create(wsdlURL, defaultServiceName);
+ subscriptionPort = (EventSourceEndpoint)service.getPort(EventSourceEndpoint.class);
+ managementPort = (SubscriptionManagerEndpoint)service.getPort(SubscriptionManagerEndpoint.class);
- ((StubExt)subscriptionPort).setConfigName("Standard WSAddressing Client");
- ((StubExt)managementPort).setConfigName("Standard WSAddressing Client");
- }
- else
- {
-
- throw new IllegalArgumentException("JBossAS is the only supported target");
- }
+ ((StubExt)subscriptionPort).setConfigName("Standard WSAddressing Client");
+ ((StubExt)managementPort).setConfigName("Standard WSAddressing Client");
}
}
@@ -103,12 +103,9 @@
*/
public void testUnsubscribe() throws Exception
{
-
SubscribeResponse subscribeResponse = doSubscribe(null);
//SysmonUtil.printSubscriptionDetails(subscribeResponse);
- String subscriptionID = subscribeResponse.getSubscriptionId();
-
// addressing correlation
AddressingProperties unsubscribeProps = SysmonUtil.buildFollowupProperties(subscribeResponse, EventingConstants.UNSUBSCRIBE_ACTION, eventSourceURI);
SysmonUtil.setRequestProperties((BindingProvider)managementPort, unsubscribeProps);
@@ -117,9 +114,12 @@
AddressingProperties getStatusProps = SysmonUtil.buildFollowupProperties(subscribeResponse, EventingConstants.GET_STATUS_ACTION, eventSourceURI);
SysmonUtil.setRequestProperties((BindingProvider)managementPort, getStatusProps);
- try {
+ try
+ {
managementPort.getStatusOp(new GetStatus());
- } catch (Exception e) {
+ }
+ catch (Exception e)
+ {
// Ignore
return;
}
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-25 16:20:03 UTC (rev 2114)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-25 17:25:08 UTC (rev 2115)
@@ -1,12 +1,24 @@
+# Always excludes
+org/jboss/test/ws/interop/**
org/jboss/test/ws/jaxrpc/benchmark/**
+org/jboss/test/ws/jaxws/benchmark/**
+
+# EJB/Injection excludes
org/jboss/test/ws/jaxrpc/jbws1011/**
-org/jboss/test/ws/jaxrpc/samples/dynamichandler/**
-org/jboss/test/ws/jaxrpc/samples/jmstransport/**
-org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**
-org/jboss/test/ws/jaxrpc/samples/secureejb/**
-org/jboss/test/ws/jaxrpc/samples/wsbpel/**
-org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.*
-org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
+org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.*
+org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase.*
org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.*
org/jboss/test/ws/jaxws/samples/jsr181ejb/**
org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/webserviceref/**
+
+# JBoss excludes
+org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.*
+org/jboss/test/ws/jaxrpc/samples/wsbpel/**
+
+# TODO: Why are these excluded
+# [JBWS-1471] - Remove unwanted tomcat excludes
+org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.*
+org/jboss/test/ws/jaxws/samples/wseventing/**
17 years, 9 months
JBossWS SVN: r2114 - in branches/jbossws-1.2.0: build/hudson/hudson-home/jobs/TC-5.5/workspace and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-25 11:20:03 -0500 (Thu, 25 Jan 2007)
New Revision: 2114
Added:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml
branches/jbossws-1.2.0/jbossws-tests/build.xml
Log:
add tomcat-users.xml
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-25 16:04:03 UTC (rev 2113)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-25 16:20:03 UTC (rev 2114)
@@ -7,21 +7,21 @@
# Module settings
#
MODULE=TC-5.5
-HUDSON_HOME=(a)hudson.home@
WORKSPACE=`pwd`
#
# copy tomcat installation
#
-cp -r $HUDSON_HOME/../apache-tomcat $WORKSPACE
+cp -r @hudson.home@/../apache-tomcat $WORKSPACE
rm -rf $WORKSPACE/apache-tomcat/webapps/hudson*
rm -rf $WORKSPACE/apache-tomcat/work
rm -rf $WORKSPACE/apache-tomcat/temp
#
-# copy tomcat server.xml
+# copy tomcat config
#
cp $WORKSPACE/server.xml $WORKSPACE/apache-tomcat/conf
+cp $WORKSPACE/tomcat-users.xml $WORKSPACE/apache-tomcat/conf
</command>
</hudson.tasks.Shell>
</builders>
Added: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml (rev 0)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml 2007-01-25 16:20:03 UTC (rev 2114)
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='utf-8'?>
+<tomcat-users>
+ <role rolename="manager"/>
+ <user username="manager" password="manager" roles="manager"/>
+</tomcat-users>
Property changes on: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-25 16:04:03 UTC (rev 2113)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-25 16:20:03 UTC (rev 2114)
@@ -129,7 +129,10 @@
<!-- Define excluded tests -->
<condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt">
- <available file="${jboss.client}/jboss-ejb3-client.jar"/>
+ <or>
+ <available file="${jboss.client}/jboss-ejb3-client.jar"/>
+ <isset property="integration.target.tomcat"/>
+ </or>
</condition>
<property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/>
<property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/>
17 years, 9 months
JBossWS SVN: r2113 - in branches/jbossws-1.2.0: jbossws-tests and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-25 11:04:03 -0500 (Thu, 25 Jan 2007)
New Revision: 2113
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml
branches/jbossws-1.2.0/jbossws-tests/build.xml
Log:
Fix tomcat exclude file
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-01-25 15:56:27 UTC (rev 2112)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-01-25 16:04:03 UTC (rev 2113)
@@ -39,7 +39,7 @@
# execute tests
#
cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT clean tests-samples 2>&1 | tee $WORKSPACE/tests.out
+ant $ENVIRONMENT clean main tests-samples 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-25 15:56:27 UTC (rev 2112)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-25 16:04:03 UTC (rev 2113)
@@ -128,12 +128,10 @@
</condition>
<!-- Define excluded tests -->
- <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt">
- <not>
- <available file="${jboss.client}/jboss-ejb3-client.jar"/>
- </not>
+ <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt">
+ <available file="${jboss.client}/jboss-ejb3-client.jar"/>
</condition>
- <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/>
+ <property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/>
<property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/>
<echo/>
17 years, 9 months
JBossWS SVN: r2112 - in branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5: workspace and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-25 10:56:27 -0500 (Thu, 25 Jan 2007)
New Revision: 2112
Added:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml
Log:
Add TC-5.5 server.xml
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-25 15:08:19 UTC (rev 2111)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-25 15:56:27 UTC (rev 2112)
@@ -14,9 +14,14 @@
# copy tomcat installation
#
cp -r $HUDSON_HOME/../apache-tomcat $WORKSPACE
-rm -rf $WORKSPACE/apache-tomcat/webapps/hudson.war
+rm -rf $WORKSPACE/apache-tomcat/webapps/hudson*
rm -rf $WORKSPACE/apache-tomcat/work
rm -rf $WORKSPACE/apache-tomcat/temp
+
+#
+# copy tomcat server.xml
+#
+cp $WORKSPACE/server.xml $WORKSPACE/apache-tomcat/conf
</command>
</hudson.tasks.Shell>
</builders>
Added: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml (rev 0)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml 2007-01-25 15:56:27 UTC (rev 2112)
@@ -0,0 +1,52 @@
+
+<Server port="8006" shutdown="SHUTDOWN">
+
+ <!-- Comment these entries out to disable JMX MBeans support used for the
+ administration web application -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener"/>
+ <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/>
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
+ <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
+
+ <!-- Global JNDI resources -->
+ <GlobalNamingResources>
+
+ <!-- Test entry for demonstration purposes -->
+ <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
+
+ <!-- Editable user database that can also be used by
+ UserDatabaseRealm to authenticate users -->
+ <Resource name="UserDatabase" auth="Container" type="org.apache.catalina.UserDatabase" description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory" pathname="conf/tomcat-users.xml"/>
+
+ </GlobalNamingResources>
+
+ <!-- Define the Tomcat Stand-Alone Service -->
+ <Service name="Catalina">
+
+ <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
+ <Connector port="8080" maxHttpHeaderSize="8192" maxThreads="150" minSpareThreads="25" maxSpareThreads="75" enableLookups="false" redirectPort="8443" acceptCount="100"
+ connectionTimeout="20000" disableUploadTimeout="true"/>
+
+
+ <!-- Define the top level container in our container hierarchy -->
+ <Engine name="Catalina" defaultHost="localhost">
+
+ <!-- This Realm uses the UserDatabase configured in the global JNDI
+ resources under the key "UserDatabase". Any edits
+ that are performed against this UserDatabase are immediately
+ available for use by the Realm. -->
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase"/>
+
+ <!-- Define the default virtual host
+ Note: XML Schema validation will not work with Xerces 2.2.
+ -->
+ <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false">
+
+ </Host>
+
+ </Engine>
+
+ </Service>
+
+</Server>
Property changes on: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 9 months
JBossWS SVN: r2111 - branches/jbossws-1.2.0/build.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-25 10:08:19 -0500 (Thu, 25 Jan 2007)
New Revision: 2111
Modified:
branches/jbossws-1.2.0/build/ant.properties.example
Log:
typo
Modified: branches/jbossws-1.2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-1.2.0/build/ant.properties.example 2007-01-25 14:56:11 UTC (rev 2110)
+++ branches/jbossws-1.2.0/build/ant.properties.example 2007-01-25 15:08:19 UTC (rev 2111)
@@ -20,7 +20,7 @@
tomcat.manager.password=manager
# Hudson QA Environment
-hudson.root=/home/tdiesler/workspac
+hudson.root=/home/tdiesler/workspace
hudson.port=8180
hudson.jdk15=/usr/java/jdk1.5
17 years, 9 months
JBossWS SVN: r2110 - branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-25 09:56:11 -0500 (Thu, 25 Jan 2007)
New Revision: 2110
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
Log:
typo
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 14:41:01 UTC (rev 2109)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-01-25 14:56:11 UTC (rev 2110)
@@ -108,7 +108,7 @@
List<Handler> preChain = impl.getHandlerChain(portInfo, HandlerType.PRE);
binding.setHandlerChain(preChain, HandlerType.PRE);
- List<Handler> postChain = impl.getHandlerChain(portInfo, HandlerType.PRE);
+ List<Handler> postChain = impl.getHandlerChain(portInfo, HandlerType.POST);
binding.setHandlerChain(postChain, HandlerType.POST);
}
17 years, 9 months
JBossWS SVN: r2109 - in branches/jbossws-1.2.0: build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0 and 11 other directories.
by jbossws-commits＠lists.jboss.org
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@</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;
+ }
}
17 years, 9 months
JBossWS SVN: r2108 - branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-25 08:57:30 -0500 (Thu, 25 Jan 2007)
New Revision: 2108
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
Log:
Support pre/post handlers
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 12:40:53 UTC (rev 2107)
+++ 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)
@@ -63,7 +63,9 @@
{
private static Logger log = Logger.getLogger(HandlerResolverImpl.class);
- private Map<PortInfo, List<Handler>> handlerMap = new HashMap<PortInfo, List<Handler>>();
+ private Map<PortInfo, List<Handler>> preHandlers = new HashMap<PortInfo, List<Handler>>();
+ private Map<PortInfo, List<Handler>> jaxwsHandlers = new HashMap<PortInfo, List<Handler>>();
+ private Map<PortInfo, List<Handler>> postHandlers = new HashMap<PortInfo, List<Handler>>();
public List<Handler> getHandlerChain(PortInfo info)
{
@@ -77,7 +79,7 @@
if (bindingID != null)
{
- List<Handler> list = handlerMap.get(new PortInfoImpl(null, null, bindingID));
+ List<Handler> list = jaxwsHandlers.get(new PortInfoImpl(null, null, bindingID));
if (list != null)
{
log.debug("add protocol handlers: " + list);
@@ -87,7 +89,7 @@
if (serviceName != null)
{
- List<Handler> list = handlerMap.get(new PortInfoImpl(serviceName, null, null));
+ List<Handler> list = jaxwsHandlers.get(new PortInfoImpl(serviceName, null, null));
if (list != null)
{
log.debug("add service handlers: " + list);
@@ -97,7 +99,7 @@
if (portName != null)
{
- List<Handler> list = handlerMap.get(new PortInfoImpl(null, portName, null));
+ List<Handler> list = jaxwsHandlers.get(new PortInfoImpl(null, portName, null));
if (list != null)
{
log.debug("add port handlers: " + list);
@@ -105,7 +107,7 @@
}
}
- List<Handler> list = handlerMap.get(new PortInfoImpl(null, null, null));
+ List<Handler> list = jaxwsHandlers.get(new PortInfoImpl(null, null, null));
if (list != null)
{
log.debug("add general handlers: " + list);
@@ -133,7 +135,7 @@
log.debug("initHandlerChain: " + type);
// clear all exisisting handler to avoid double registration
- log.debug("Clear handler map: " + handlerMap);
+ log.debug("Clear handler map: " + jaxwsHandlers);
for (HandlerMetaData handlerMetaData : epMetaData.getHandlerMetaData(type))
{
@@ -158,7 +160,7 @@
List<PortInfo> infos = getPortInfos(epMetaData, jaxwsMetaData);
for (PortInfo info : infos)
{
- addHandler(info, handler);
+ addHandler(info, handler, handlerMetaData.getHandlerType());
}
}
catch (RuntimeException rte)
@@ -273,10 +275,18 @@
return infos;
}
- public boolean addHandler(PortInfo info, Handler handler)
+ private boolean addHandler(PortInfo info, Handler handler, HandlerType type)
{
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;
+
List<Handler> handlerList = handlerMap.get(info);
if (handlerList == null)
{
17 years, 9 months
JBossWS SVN: r2107 - branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-25 07:40:53 -0500 (Thu, 25 Jan 2007)
New Revision: 2107
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
Log:
Add all to release matrix
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-01-25 12:40:21 UTC (rev 2106)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-01-25 12:40:53 UTC (rev 2107)
@@ -4,7 +4,7 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- AS-5.0, AS-4.2, AS-4.0, AS-4.0-jdk14
+ AS-5.0, AS-4.2, AS-4.0, AS-4.0-jdk14, TC-5.5
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
17 years, 9 months