Author: thomas.diesler(a)jboss.com Date: 2007-01-03 11:18:52 -0500 (Wed, 03 Jan 2007) New Revision: 1776 Added: branches/tdiesler/trunk/integration-jboss42/src/main/resources/jbossws.war/ branches/tdiesler/trunk/integration-jboss42/src/main/resources/jbossws.war/WEB-INF/ branches/tdiesler/trunk/integration-jboss42/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml branches/tdiesler/trunk/integration-jboss42/src/main/resources/jbossws.war/WEB-INF/web.xml branches/tdiesler/trunk/integration-jboss50/src/main/resources/jbossws.war/ branches/tdiesler/trunk/integration-jboss50/src/main/resources/jbossws.war/WEB-INF/ branches/tdiesler/trunk/integration-jboss50/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml branches/tdiesler/trunk/integration-jboss50/src/main/resources/jbossws.war/WEB-INF/web.xml branches/tdiesler/trunk/integration-tomcat/src/main/resources/ branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/ branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/ branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/ branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/web.xml Removed: branches/tdiesler/trunk/jbossws-core/src/main/resources/jbossws.war/JBoss/ branches/tdiesler/trunk/jbossws-core/src/main/resources/jbossws.war/Tomcat/ Modified: branches/tdiesler/trunk/build/build.xml branches/tdiesler/trunk/integration-jboss42/build.xml branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB.java branches/tdiesler/trunk/integration-jboss50/build.xml branches/tdiesler/trunk/integration-tomcat/build.xml branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossTestDeployer.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean03.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean03.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceBase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jbws860/WEB-INF/jboss-web.xml branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/WEB-INF01/jboss-web.xml branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/WEB-INF02/jboss-web.xml branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/WEB-INF03/jboss-web.xml Log: fix testsuite for 4.2 Modified: branches/tdiesler/trunk/build/build.xml =================================================================== --- branches/tdiesler/trunk/build/build.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/build/build.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -44,6 +44,7 @@ <ant antfile="${integration.jboss42.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${integration.jboss50.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${integration.tomcat.dir}/build.xml" target="clean" inheritall="false"/> + <ant antfile="${tests.dir}/build.xml" target="clean" inheritall="false"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> Modified: branches/tdiesler/trunk/integration-jboss42/build.xml =================================================================== --- branches/tdiesler/trunk/integration-jboss42/build.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/integration-jboss42/build.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -83,6 +83,17 @@ <metainf dir="${jboss42.resources.dir}/jbossws-jboss42-integration.jar/META-INF"/> </jar> + <!-- Build jbossws-context.war --> + <war warfile="${jboss42.output.lib.dir}/jbossws-context.war" webxml="${jboss42.resources.dir}/jbossws.war/WEB-INF/web.xml"> + <fileset dir="${core.resources.dir}/jbossws.war"> + <include name="index.html"/> + <include name="styles.css"/> + </fileset> + <webinf dir="${jboss42.resources.dir}/jbossws.war/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <!-- Build jbossws42.sar --> <jar jarfile="${jboss42.output.lib.dir}/jbossws42.sar" manifest="${output.etc.dir}/default.mf"> <fileset dir="${jboss42.output.lib.dir}"> Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java =================================================================== --- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -70,9 +70,7 @@ */ protected final Object create(Invocation invocation, DeploymentInfo di) throws Throwable { - log.debug("create: " + di.url); Object retn = invokeNext(invocation); - if (isWebserviceDeployment(di)) { try @@ -85,7 +83,6 @@ DeploymentException.rethrowAsDeploymentException("Cannot create service endpoint", ex); } } - return retn; } @@ -93,9 +90,7 @@ */ protected final Object start(Invocation invocation, DeploymentInfo di) throws Throwable { - log.debug("start: " + di.url); Object retn = invokeNext(invocation); - try { startServiceEndpoint(di); @@ -105,7 +100,6 @@ destroyServiceEndpoint(di); DeploymentException.rethrowAsDeploymentException("Cannot start service endpoint", ex); } - return retn; } @@ -113,10 +107,7 @@ */ protected final Object stop(Invocation invocation, DeploymentInfo di) throws Throwable { - log.debug("stop: " + di.url); - stopServiceEndpoint(di); - return invokeNext(invocation); } @@ -124,15 +115,13 @@ */ protected final Object destroy(Invocation invocation, DeploymentInfo di) throws Throwable { - log.debug("destroy: " + di.url); - destroyServiceEndpoint(di); - return invokeNext(invocation); } protected void createServiceEndpoint(DeploymentInfo di) throws Exception { + log.debug("create: " + di.url); UnifiedDeploymentInfo udi = createUnifiedDeploymentInfo(di); di.context.put(UnifiedDeploymentInfo.class.getName(), udi); getServiceEndpointDeployer().create(udi); @@ -143,6 +132,8 @@ UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(di); if (udi != null) { + log.debug("start: " + di.url); + // late initialization of the web context loader if (di.metaData instanceof WebMetaData) { @@ -159,6 +150,7 @@ UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(di); if (udi != null) { + log.debug("stop: " + di.url); getServiceEndpointDeployer().stop(udi); } } @@ -168,6 +160,7 @@ UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(di); if (udi != null) { + log.debug("destroy: " + di.url); getServiceEndpointDeployer().destroy(udi); } } Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB.java =================================================================== --- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -57,6 +57,8 @@ protected void destroyServiceEndpoint(DeploymentInfo di) throws Exception { + super.destroyServiceEndpoint(di); + UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(di); if (udi != null) { Added: branches/tdiesler/trunk/integration-jboss42/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml =================================================================== --- branches/tdiesler/trunk/integration-jboss42/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/integration-jboss42/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!DOCTYPE jboss-web + PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd"> + +<jboss-web> + + <!-- + <security-domain>java:/jaas/jbossws</security-domain> + --> + <context-root>jbossws</context-root> + +</jboss-web> Property changes on: branches/tdiesler/trunk/integration-jboss42/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/integration-jboss42/src/main/resources/jbossws.war/WEB-INF/web.xml =================================================================== --- branches/tdiesler/trunk/integration-jboss42/src/main/resources/jbossws.war/WEB-INF/web.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/integration-jboss42/src/main/resources/jbossws.war/WEB-INF/web.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- + A web application that installs the JBossWS servlets + + $Id$ +--> + +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <display-name>JBossWS</display-name> + + <servlet> + <servlet-name>ContextServlet</servlet-name> + <servlet-class>org.jboss.ws.integration.jboss42.JBossContextServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>PortComponentLinkServlet</servlet-name> + <servlet-class>org.jboss.ws.integration.jboss42.PortComponentLinkServlet</servlet-class> + </servlet> + + <!-- now the mappings --> + + <servlet-mapping> + <servlet-name>ContextServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>PortComponentLinkServlet</servlet-name> + <url-pattern>/pclink</url-pattern> + </servlet-mapping> + + <!-- + currently the W3C haven't settled on a media type for WSDL; + http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft + for now we go with the basic 'it's XML' response + --> + <mime-mapping> + <extension>wsdl</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <mime-mapping> + <extension>xsd</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <welcome-file-list id="WelcomeFileList"> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + +</web-app> Property changes on: branches/tdiesler/trunk/integration-jboss42/src/main/resources/jbossws.war/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/integration-jboss50/build.xml =================================================================== --- branches/tdiesler/trunk/integration-jboss50/build.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/integration-jboss50/build.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -84,12 +84,12 @@ </jar> <!-- Build jbossws-context.war --> - <war warfile="${jboss50.output.lib.dir}/jbossws-context.war" webxml="${core.resources.dir}/jbossws.war/JBoss/WEB-INF/web.xml"> + <war warfile="${jboss50.output.lib.dir}/jbossws-context.war" webxml="${jboss50.resources.dir}/jbossws.war/WEB-INF/web.xml"> <fileset dir="${core.resources.dir}/jbossws.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${core.resources.dir}/jbossws.war/JBoss/WEB-INF"> + <webinf dir="${jboss50.resources.dir}/jbossws.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> Added: branches/tdiesler/trunk/integration-jboss50/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/integration-jboss50/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!DOCTYPE jboss-web + PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd"> + +<jboss-web> + + <!-- + <security-domain>java:/jaas/jbossws</security-domain> + --> + <context-root>jbossws</context-root> + +</jboss-web> Property changes on: branches/tdiesler/trunk/integration-jboss50/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/integration-jboss50/src/main/resources/jbossws.war/WEB-INF/web.xml =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/main/resources/jbossws.war/WEB-INF/web.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/integration-jboss50/src/main/resources/jbossws.war/WEB-INF/web.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- + A web application that installs the JBossWS servlets + + $Id$ +--> + +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <display-name>JBossWS</display-name> + + <servlet> + <servlet-name>ContextServlet</servlet-name> + <servlet-class>org.jboss.ws.integration.jboss50.JBossContextServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>PortComponentLinkServlet</servlet-name> + <servlet-class>org.jboss.ws.integration.jboss50.PortComponentLinkServlet</servlet-class> + </servlet> + + <!-- now the mappings --> + + <servlet-mapping> + <servlet-name>ContextServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>PortComponentLinkServlet</servlet-name> + <url-pattern>/pclink</url-pattern> + </servlet-mapping> + + <!-- + currently the W3C haven't settled on a media type for WSDL; + http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft + for now we go with the basic 'it's XML' response + --> + <mime-mapping> + <extension>wsdl</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <mime-mapping> + <extension>xsd</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <welcome-file-list id="WelcomeFileList"> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + +</web-app> Property changes on: branches/tdiesler/trunk/integration-jboss50/src/main/resources/jbossws.war/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/integration-tomcat/build.xml =================================================================== --- branches/tdiesler/trunk/integration-tomcat/build.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/integration-tomcat/build.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -82,12 +82,12 @@ </jar> <!-- Build jbossws.war --> - <war warfile="${tomcat.output.lib.dir}/jbossws.war" webxml="${core.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml"> + <war warfile="${tomcat.output.lib.dir}/jbossws.war" webxml="${tomcat.resources.dir}/jbossws.war/WEB-INF/web.xml"> <fileset dir="${core.resources.dir}/jbossws.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <fileset dir="${core.resources.dir}/jbossws.war/Tomcat"> + <fileset dir="${tomcat.resources.dir}/jbossws.war"> <include name="META-INF/jboss-beans.xml"/> </fileset> <fileset dir="${core.resources.dir}/jbossws.sar"> @@ -96,7 +96,7 @@ <include name="META-INF/standard-jaxws-client-config.xml"/> <include name="META-INF/standard-jaxws-endpoint-config.xml"/> </fileset> - <classes dir="${core.resources.dir}/jbossws.war/Tomcat/WEB-INF"> + <classes dir="${tomcat.resources.dir}/jbossws.war/WEB-INF"> <include name="log4j.xml"/> </classes> </war> Added: branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml =================================================================== --- branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"> + + <bean name="ServiceEndpointManager" class="org.jboss.ws.core.server.ServiceEndpointManager"> + <!-- + The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> + element which points to the location of the endpoint. JBossWS supports rewriting of that SOAP address. + + If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless AlwaysModifySOAPAddress is true. + If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. + --> + <property name="alwaysModifySOAPAddress">true</property> + <property name="webServiceHost">localhost</property> + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> + <property name="serviceEndpointInvokerJSE">org.jboss.ws.core.server.ServiceEndpointInvokerJSE</property> + </bean> + + <bean name="ServiceEndpointDeployer" class="org.jboss.ws.core.server.ServiceEndpointDeployer"> + <property name="serviceEndpointManager"><inject bean="ServiceEndpointManager"/></property> + </bean> + + <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.tomcat.TomcatServiceEndpointPublisher"> + <property name="serviceEndpointServlet">org.jboss.ws.integration.tomcat.TomcatServiceEndpointServlet</property> + <property name="deployDir">${catalina.home}/jbossws-deploy</property> + <property name="targetDir">${catalina.home}/webapps</property> + <property name="interval">500</property> + </bean> + + <!-- + A subscription manager for WS-Eventing + --> + <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> + + <bean name="ServerConfig" class="org.jboss.ws.integration.tomcat.ServerConfigImpl"/> + + <bean name="KernelLocator" class="org.jboss.ws.core.server.KernelLocator"/> + +</deployment> Property changes on: branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Added: branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml =================================================================== --- branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<!-- ===================================================================== --> +<!-- --> +<!-- Log4j Configuration --> +<!-- --> +<!-- ===================================================================== --> + +<!-- $Id:log4j.xml 1492 2006-11-21 19:49:34Z thomas.diesler(a)jboss.com $ --> + +<!-- +| For more configuration infromation and examples see the Jakarta Log4j +| owebsite: http://jakarta.apache.org/log4j +--> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <!-- ================================= --> + <!-- Preserve messages in a local file --> + <!-- ================================= --> + + <!-- A time/date based rolling appender --> + <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> + <param name="File" value="../logs/jbossws.log"/> + <param name="Append" value="false"/> + + <!-- Rollover at midnight each day --> + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/> + </layout> + </appender> + + <!-- ============================== --> + <!-- Append messages to the console --> + <!-- ============================== --> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Threshold" value="INFO"/> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + + <!-- ================ --> + <!-- Limit categories --> + <!-- ================ --> + + <category name="org.jboss.ws"> + <priority value="DEBUG"/> + </category> + + <category name="org.jboss.remoting"> + <priority value="INFO"/> + </category> + + <category name="jbossws.SOAPMessage"> + <priority value="TRACE" class="org.jboss.logging.XLevel"/> + </category> + + <!-- + <category name="org.jboss.xb"> + <priority value="TRACE" class="org.jboss.logging.XLevel"/> + </category> + --> + + <!-- ======================= --> + <!-- Setup the Root category --> + <!-- ======================= --> + + <root> +<!-- + <appender-ref ref="CONSOLE"/> +--> + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration> Property changes on: branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/log4j.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/web.xml =================================================================== --- branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/web.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/web.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!-- + A web application that installs the JBossWS servlets + + $Id$ +--> + +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <display-name>JBossWS</display-name> + + <servlet> + <servlet-name>ContextServlet</servlet-name> + <servlet-class>org.jboss.ws.integration.tomcat.TomcatContextServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <!-- now the mappings --> + + <servlet-mapping> + <servlet-name>ContextServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> + + <!-- + currently the W3C haven't settled on a media type for WSDL; + http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft + for now we go with the basic 'it's XML' response + --> + <mime-mapping> + <extension>wsdl</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <mime-mapping> + <extension>xsd</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <welcome-file-list id="WelcomeFileList"> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + +</web-app> Property changes on: branches/tdiesler/trunk/integration-tomcat/src/main/resources/jbossws.war/WEB-INF/web.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -186,7 +186,7 @@ private void handleRemoteException(OperationMetaData opMetaData, Exception ex) { String bindingId = opMetaData.getEndpointMetaData().getBindingId(); - if (SOAPBinding.SOAP11HTTP_BINDING.equals(bindingId) || SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) + if (bindingId.startsWith(SOAPBinding.SOAP11HTTP_BINDING) || bindingId.startsWith(SOAPBinding.SOAP12HTTP_BINDING)) { if (ex instanceof SOAPFaultException) { @@ -204,7 +204,7 @@ } else { - throw new WebServiceException("Unsuported binding: " + bindingId); + throw new WebServiceException("Unsuported binding: " + bindingId, ex); } } Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -30,6 +30,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; +import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB21; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB3; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderJSE; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -89,6 +90,11 @@ JAXWSMetaDataBuilderJSE builder = new JAXWSMetaDataBuilderJSE(); wsMetaData = builder.buildMetaData(udi); } + else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JAXWS_EJB21) + { + JAXWSMetaDataBuilderEJB21 builder = new JAXWSMetaDataBuilderEJB21(); + wsMetaData = builder.buildMetaData(udi); + } else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JAXWS_EJB3) { JAXWSMetaDataBuilderEJB3 builder = new JAXWSMetaDataBuilderEJB3(); Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -42,8 +42,7 @@ import org.jboss.logging.Logger; import org.jboss.remoting.Client; import org.jboss.remoting.InvokerLocator; -import org.jboss.remoting.security.SSLSocketBuilder; -import org.jboss.remoting.transport.http.HTTPMetadataConstants; +import org.jboss.remoting.marshal.MarshalFactory; import org.jboss.ws.core.jaxrpc.StubExt; import org.jboss.ws.extensions.xop.XOPContext; @@ -81,7 +80,7 @@ //configMap.put(StubExt.PROPERTY_TRUST_STORE, SSLSocketBuilder.REMOTING_TRUST_STORE_FILE_PATH); //configMap.put(StubExt.PROPERTY_TRUST_STORE_PASSWORD, SSLSocketBuilder.REMOTING_TRUST_STORE_PASSWORD); //configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE, SSLSocketBuilder.REMOTING_TRUST_STORE_TYPE); - + configMap.put(StubExt.PROPERTY_KEY_STORE, "org.jboss.remoting.keyStore"); configMap.put(StubExt.PROPERTY_KEY_STORE_PASSWORD, "org.jboss.remoting.keyStorePassword"); configMap.put(StubExt.PROPERTY_KEY_STORE_TYPE, "org.jboss.remoting.keyStoreType"); @@ -94,9 +93,9 @@ public SOAPConnectionImpl() { - // HTTPClientInvoker conect sends gratuitous POST - // http://jira.jboss.com/jira/browse/JBWS-711 - config.put(Client.ENABLE_LEASE, false); + // HTTPClientInvoker conect sends gratuitous POST + // http://jira.jboss.com/jira/browse/JBWS-711 + config.put(Client.ENABLE_LEASE, false); } /** @@ -128,8 +127,6 @@ if (closed) throw new SOAPException("SOAPConnection is already closed"); - InvokerLocator locator; - Client remotingClient; String targetAddress; Map callProps; @@ -142,8 +139,7 @@ if (callProps.containsKey(StubExt.PROPERTY_CLIENT_TIMEOUT)) { Object timeout = callProps.get(StubExt.PROPERTY_CLIENT_TIMEOUT); - int qmIndex = targetAddress.indexOf("?"); - targetAddress += (qmIndex < 0 ? "?" : "&") + "timeout=" + timeout; + targetAddress = addURLParameter(targetAddress, "timeout", timeout.toString()); } } else if (endpoint instanceof EndpointReference) @@ -158,47 +154,22 @@ callProps = null; } - // enforce xop transitions + // enforce xop transitions // TODO: there should be a clear transition to an immutable object model XOPContext.eagerlyCreateAttachments(); // save object model changes - if (reqMessage.saveRequired()) reqMessage.saveChanges(); + if (reqMessage.saveRequired()) + reqMessage.saveChanges(); - try - { - // Get the invoker from Remoting for a given endpoint address - log.debug("Get locator for: " + endpoint); - locator = new InvokerLocator(targetAddress); - } - catch (MalformedURLException e) - { - throw new SOAPException("Malformed endpoint address", e); - } + // setup remoting client + Map metadata = createRemotingMetaData(reqMessage, callProps); + Client client = createRemotingClient(endpoint, targetAddress, oneway); - Map metadata = getRemotingMetaData(reqMessage, targetAddress, callProps); - try { - remotingClient = new Client(locator, "saaj", config); - remotingClient.connect(); - remotingClient.setMarshaller(new SOAPMessageMarshaller()); - if (oneway == false) - remotingClient.setUnMarshaller(new SOAPMessageUnMarshaller()); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception e) - { - throw new SOAPException("Could not setup remoting client", e); - } - - try - { // debug the outgoing message - if(msgLog.isTraceEnabled()) + if (msgLog.isTraceEnabled()) { SOAPEnvelope soapReqEnv = reqMessage.getSOAPPart().getEnvelope(); String envStr = SOAPElementWriter.writeElement((SOAPElementImpl)soapReqEnv, true); @@ -209,15 +180,15 @@ SOAPMessage resMessage = null; if (oneway == true) { - remotingClient.invokeOneway(reqMessage, metadata, false); + client.invokeOneway(reqMessage, metadata, false); } else { - resMessage = (SOAPMessage)remotingClient.invoke(reqMessage, metadata); + resMessage = (SOAPMessage)client.invoke(reqMessage, metadata); } - // disconnect the rmoting client - remotingClient.disconnect(); + // Disconnect the remoting client + client.disconnect(); // debug the incomming response message if (resMessage != null && msgLog.isTraceEnabled()) @@ -231,6 +202,7 @@ } catch (RuntimeException rte) { + rte.printStackTrace(); throw rte; } catch (Throwable t) @@ -239,6 +211,13 @@ } } + private String addURLParameter(String url, String key, String value) + { + int qmIndex = url.indexOf("?"); + url += (qmIndex < 0 ? "?" : "&") + key + "=" + value; + return url; + } + /** Closes this SOAPConnection */ public void close() throws SOAPException @@ -249,8 +228,45 @@ closed = true; } - private Map getRemotingMetaData(SOAPMessage reqMessage, String targetAddress, Map callProps) throws SOAPException + private Client createRemotingClient(Object endpoint, String targetAddress, boolean oneway) throws SOAPException { + Client client; + try + { + // Get the invoker from Remoting for a given endpoint address + log.debug("Get locator for: " + endpoint); + targetAddress = addURLParameter(targetAddress, InvokerLocator.DATATYPE, "SOAPMessage"); + InvokerLocator locator = new InvokerLocator(targetAddress); + + /* An HTTPClientInvoker may disconnect from the server and recreated by the remoting layer. + * In that case the new invoker does not inherit the marshaller/unmarshaller from the disconnected invoker. + * We therefore explicitly specify the invoker locator datatype and register the SOAP marshaller/unmarshaller + * with the MarshalFactory. + * + * This applies to remoting-1.4.5 + */ + SOAPMessageMarshaller marshaller = new SOAPMessageMarshaller(); + SOAPMessageUnMarshaller unmarshaller = new SOAPMessageUnMarshaller(); + MarshalFactory.addMarshaller("SOAPMessage", marshaller, unmarshaller); + + client = new Client(locator, "saaj", config); + client.setMarshaller(marshaller); + client.setUnMarshaller(oneway == false ? unmarshaller : null); + client.connect(); + } + catch (MalformedURLException e) + { + throw new SOAPException("Malformed endpoint address", e); + } + catch (Exception e) + { + throw new SOAPException("Could not setup remoting client", e); + } + return client; + } + + private Map createRemotingMetaData(SOAPMessage reqMessage, Map callProps) throws SOAPException + { // R2744 A HTTP request MESSAGE MUST contain a SOAPAction HTTP header field // with a quoted value equal to the value of the soapAction attribute of // soapbind:operation, if present in the corresponding WSDL description. Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -24,6 +24,9 @@ import java.util.Iterator; +import javax.jws.WebService; + +import org.jboss.annotation.security.SecurityDomain; import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.server.UnifiedDeploymentInfo; @@ -64,10 +67,25 @@ { UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)it.next(); - String ejbName = beanMetaData.getEjbName(); String ejbClassName = beanMetaData.getEjbClass(); Class beanClass = udi.classLoader.loadClass(ejbClassName); - setupEndpoint(wsMetaData, udi, beanClass, ejbName); + if (beanClass.isAnnotationPresent(WebService.class)) + { + String ejbLink = beanMetaData.getEjbName(); + setupEndpoint(wsMetaData, udi, beanClass, ejbLink); + + // setup the security domain + if (beanClass.isAnnotationPresent(SecurityDomain.class)) + { + SecurityDomain anSecurityDomain = (SecurityDomain)beanClass.getAnnotation(SecurityDomain.class); + String lastDomain = wsMetaData.getSecurityDomain(); + String securityDomain = anSecurityDomain.value(); + if (lastDomain != null && lastDomain.equals(securityDomain) == false) + throw new IllegalStateException("Multiple security domains not supported: " + securityDomain); + + wsMetaData.setSecurityDomain(securityDomain); + } + } } log.debug("END buildMetaData: " + wsMetaData); Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -23,11 +23,10 @@ // $Id$ -import java.io.IOException; - import javax.jws.WebService; import javax.xml.ws.WebServiceProvider; +import org.jboss.ws.WSException; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.umdm.UnifiedMetaData; @@ -38,24 +37,22 @@ */ public abstract class JAXWSServerMetaDataBuilder extends JAXWSMetaDataBuilder { - public abstract UnifiedMetaData buildMetaData(UnifiedDeploymentInfo udi); - protected JAXWSEndpointMetaDataBuilder getEndpointBuilder(Class<?> bean) { + JAXWSEndpointMetaDataBuilder builder = null; + if (bean.isAnnotationPresent(WebServiceProvider.class)) - return new JAXWSProviderMetaDataBuilder(); + builder = new JAXWSProviderMetaDataBuilder(); + else if (bean.isAnnotationPresent(WebService.class)) + builder = new JAXWSWebServiceMetaDataBuilder(); + else throw new WSException("Cannot find @WebService, @WebServiceProvider on: " + bean.getName()); - if (bean.isAnnotationPresent(WebService.class)) - return new JAXWSWebServiceMetaDataBuilder(); - - return null; + return builder; } - protected void setupEndpoint(UnifiedMetaData umd, UnifiedDeploymentInfo udi, Class<?> beanClass, String beanName) - throws SecurityException, ClassNotFoundException, NoSuchMethodException, IOException + protected void setupEndpoint(UnifiedMetaData umd, UnifiedDeploymentInfo udi, Class<?> beanClass, String beanName) throws Exception { JAXWSEndpointMetaDataBuilder builder = getEndpointBuilder(beanClass); - if (builder != null) - builder.buildEndpointMetaData(umd, udi, beanClass, beanName); + builder.buildEndpointMetaData(umd, udi, beanClass, beanName); } } Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -669,10 +669,8 @@ if (anWebService.portName().length() > 0 || anWebService.serviceName().length() > 0 || anWebService.endpointInterface().length() > 0) throw new WSException("@WebService[portName,serviceName,endpointInterface] MUST NOT be defined on: " + seiName); - name = anWebService.name(); - if (name.length() == 0) - name = WSDLUtils.getJustClassName(seiClass); - + // @WebService[name] is allowed, but what should we do with it? + interfaceNS = anWebService.targetNamespace(); if (interfaceNS.length() == 0) interfaceNS = wsdlUtils.getTypeNamespace(seiClass); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossTestDeployer.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossTestDeployer.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossTestDeployer.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -25,8 +25,6 @@ import javax.management.MBeanServerConnection; import javax.management.ObjectName; -import javax.naming.InitialContext; -import javax.naming.NamingException; /** * A JBossWS test helper that deals with test deployment/undeployment, etc. @@ -37,23 +35,21 @@ public class JBossTestDeployer implements JBossWSTestDeployer { private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer"; + + private MBeanServerConnection server; + public JBossTestDeployer(MBeanServerConnection server) + { + this.server = server; + } + public void deploy(URL url) throws Exception { - MBeanServerConnection server = getServer(); server.invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" }); } public void undeploy(URL url) throws Exception { - MBeanServerConnection server = getServer(); server.invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" }); } - - private MBeanServerConnection getServer() throws NamingException - { - InitialContext iniCtx = new InitialContext(); - MBeanServerConnection server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor"); - return server; - } } Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -109,12 +109,19 @@ return jbossVersion != null && jbossVersion.startsWith("4.0"); } - public static MBeanServerConnection getServer() throws NamingException + public static MBeanServerConnection getServer() { if (server == null) { - InitialContext iniCtx = new InitialContext(); - server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor"); + try + { + InitialContext iniCtx = new InitialContext(); + server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor"); + } + catch (NamingException ex) + { + throw new RuntimeException("Cannot obtain MBeanServerConnection", ex); + } } return server; } @@ -123,7 +130,7 @@ { if (isTargetServerJBoss()) { - return new JBossTestDeployer(); + return new JBossTestDeployer(getServer()); } else if (isTargetServerTomcat()) { Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -159,9 +159,9 @@ public void testEchoInOut() throws Exception { - StringHolder varString = new StringHolder("Frerrari"); + StringHolder varString = new StringHolder("Ferrari"); port.echoInOut(varString); - assertEquals("Frerrari", varString.value); + assertEquals("Ferrari", varString.value); } public void testEchoMix() throws Exception Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -44,23 +44,24 @@ return JBossWSTestSetup.newTestSetup(EnvEntryEJBTestCase.class, "jaxrpc-enventry.jar, jaxrpc-enventry-client.jar"); } - /* protected void setUp() throws Exception { super.setUp(); - if (port == null) + if (port == null && isJBoss50() == false) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); port = (EnvEntryTestService)service.getPort(EnvEntryTestService.class); } } - */ public void testHandlers() throws Exception { - System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + return; + } String res = port.helloEnvEntry("InitalMessage"); assertEquals("InitalMessage:ClientSideHandler:appclient:8:ServerSideHandler:ejb:8:endpoint:ejb:8:ServerSideHandler:ejb:8:ClientSideHandler:appclient:8", res); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -57,8 +57,11 @@ public void testHandlers() throws Exception { - System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + return; + } String res = port.helloEnvEntry("InitalMessage"); assertEquals("InitalMessage:ClientSideHandler:appclient:8:ServerSideHandler:web:8:endpoint:web:8:ServerSideHandler:web:8:ClientSideHandler:appclient:8", res); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -42,7 +42,6 @@ private static TestEndpoint port; - /* public static Test suite() throws Exception { return JBossWSTestSetup.newTestSetup(JBWS1011TestCase.class, "jaxrpc-jbws1011.jar, jaxrpc-jbws1011-client.jar"); @@ -58,12 +57,14 @@ port = (TestEndpoint)service.getPort(TestEndpoint.class); } } - */ public void testCall() throws Exception { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } String response = port.echoString("Hello"); assertEquals("Hello", response); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -57,8 +57,11 @@ public void testEndpoint() throws Exception { - System.out.println("[JBAS-3824] Fix ENC for EJB2.1 and Servlets"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + return; + } port.performTest(); } Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -21,7 +21,13 @@ */ package org.jboss.test.ws.jaxrpc.samples.jsr109ejb; +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; /** * Test EJB endpoint for a document style service. @@ -33,7 +39,6 @@ { private static JaxRpcTestService endpoint; - /* public static Test suite() { return JBossWSTestSetup.newTestSetup(DocEJBTestCase.class, "jaxrpc-samples-jsr109ejb-doc.jar, jaxrpc-samples-jsr109ejb-doc-client.jar"); @@ -50,12 +55,14 @@ endpoint = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); } } - */ public void testEchoString() throws Exception { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } String hello = "Hello"; String world = "world!"; @@ -65,8 +72,11 @@ public void testEchoSimpleUserType() throws Exception { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -49,7 +49,6 @@ private static Call call; - /* public static Test suite() { return JBossWSTestSetup.newTestSetup(RpcDIIConfiguredCallTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar"); @@ -71,12 +70,14 @@ call = service.createCall(); } } - */ public void testEchoString() throws Exception { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } QName operationName = new QName(TARGET_NAMESPACE, "echoString"); call.setOperationName(operationName); @@ -96,8 +97,11 @@ public void testEchoSimpleUserType() throws Exception { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } QName operationName = new QName(TARGET_NAMESPACE, "echoSimpleUserType"); call.setOperationName(operationName); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -47,12 +47,10 @@ private final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-jsr109ejb-rpc"; private static final String TARGET_NAMESPACE = "http://org.jboss.ws/samples/jsr109ejb"; - /* public static Test suite() { return JBossWSTestSetup.newTestSetup(RpcDIIUnconfiguredCallTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar"); } - */ public void testEchoString() throws Exception { @@ -67,8 +65,11 @@ call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS); - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } String hello = "Hello"; String world = "world!"; @@ -95,8 +96,11 @@ call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS); - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -39,7 +39,6 @@ { private static JaxRpcTestService endpoint; - /* public static Test suite() { return JBossWSTestSetup.newTestSetup(RpcEJBTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar, jaxrpc-samples-jsr109ejb-rpc-client.jar"); @@ -56,15 +55,17 @@ endpoint = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); } } - */ public void testEchoString() throws Exception { String hello = "Hello"; String world = "world!"; - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } Object retObj = endpoint.echoString(hello, world); assertEquals(hello + world, retObj); @@ -75,8 +76,11 @@ String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } Object retObj = endpoint.echoSimpleUserType(hello, userType); assertEquals(userType, retObj); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -46,7 +46,6 @@ private static JaxRpcTestService endpoint; - /* public static Test suite() { return JBossWSTestSetup.newTestSetup(RpcProxyTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar"); @@ -68,15 +67,17 @@ endpoint = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); } } - */ public void testEchoString() throws Exception { String hello = "Hello"; String world = "world!"; - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } Object retObj = endpoint.echoString(hello, world); assertEquals(hello + world, retObj); @@ -87,8 +88,11 @@ String hello = "Hello"; SimpleUserType userType = new SimpleUserType(1, 2); - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } Object retObj = endpoint.echoSimpleUserType(hello, userType); assertEquals(userType, retObj); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -47,7 +47,6 @@ public static final String USERNAME = "kermit"; public static final String PASSWORD = "thefrog"; - /* public static Test suite() throws Exception { return JBossWSTestSetup.newTestSetup(SecureEJBTestCase.class, "jaxrpc-samples-secureejb.jar, jaxrpc-samples-secureejb-client.jar"); @@ -59,16 +58,17 @@ SecurityAssociation.setPrincipal(null); SecurityAssociation.setCredential(null); } - */ /** Test required principal/credential for this bean */ public void testRoleSecuredSLSB() throws Exception { + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; - InitialContext iniCtx = getInitialContext(); OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/RoleSecuredSLSB"); @@ -94,10 +94,12 @@ */ public void testBasicSecuredSLSB() throws Exception { + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; - InitialContext iniCtx = getInitialContext(); OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/BasicSecuredSLSB"); @@ -108,10 +110,12 @@ public void testBasicSecuredServiceAccess() throws Exception { + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; - InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured"); QName portName = new QName("http://org.jboss.ws/samples/secureejb", "BasicSecuredPort"); @@ -137,10 +141,12 @@ public void testRoleSecuredServiceAccess() throws Exception { + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; - InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured"); QName portName = new QName("http://org.jboss.ws/samples/secureejb", "RoleSecuredPort"); @@ -166,10 +172,12 @@ public void testConfidentialServiceAccess() throws Exception { + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; - InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/ConfidentialSecured"); QName portName = new QName("http://org.jboss.ws/samples/secureejb", "ConfidentialPort"); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefEJBTestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -47,7 +47,6 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-webserviceref"; - /* public static Test suite() { return JBossWSTestSetup.newTestSetup(WebServiceRefEJBTestCase.class, "jaxrpc-webserviceref.war, jaxrpc-webserviceref-ejb-client.jar"); @@ -60,14 +59,15 @@ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); assertNotNull(wsdlDefinitions); } - */ public void testDynamicProxy() throws Exception { + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; - URL wsdlURL = new File("resources/jaxrpc/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); URL mappingURL = new File("resources/jaxrpc/webserviceref/META-INF/jaxrpc-mapping.xml").toURL(); QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); @@ -81,10 +81,12 @@ public void testEJBClient() throws Exception { + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; - InitialContext iniCtx = getInitialContext(); EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/ejb/EJBClient"); EJBRemote ejbRemote = ejbHome.create(); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -76,8 +76,11 @@ public void testServletClient() throws Exception { - System.out.println("[JBAS-3824] Fix ENC for EJB2.1 and Servlets"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + return; + } URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -48,8 +48,11 @@ */ public void testWebClient() throws Exception { - System.out.println("[JBAS-3824] Fix ENC for EJB2.1 and Servlets"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + return; + } URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsse-rpc/RpcTestClientServlet?input=Hello"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean03.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean03.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean03.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -33,7 +33,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-Apr-2005 */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jsr181.webservice.EndpointInterface03") +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jsr181.webservice.EndpointInterface03", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") public class EJB21Bean03 implements SessionBean { private SessionContext sessionContext; Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean03.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean03.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean03.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -33,7 +33,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-Apr-2005 */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jsr181.webservice.EndpointInterface03") +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jsr181.webservice.EndpointInterface03", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") @Remote(EJB3RemoteInterface.class) @RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface") @Stateless Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -35,7 +35,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-Apr-2005 */ -@WebService(name = "EndpointInterface", targetNamespace = "http://foo") +@WebService(targetNamespace = "http://foo") @PortComponent(contextRoot="/jsr181", urlPattern="/*") @SOAPBinding(style = SOAPBinding.Style.RPC) public interface EndpointInterface03 extends Remote Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceBase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceBase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceBase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -54,7 +54,7 @@ private EndpointInterface03 getPort03() throws MalformedURLException { - QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld";, "TestService"); + QName serviceName = new QName("http://foo", "TestService"); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jsr181?wsdl"); Service service = Service.create(wsdlURL, serviceName); Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -44,9 +44,11 @@ deploy("jaxws-jsr181-webservice01-ejb21.jar"); try { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; - + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } webServiceTest(); } finally @@ -60,9 +62,11 @@ deploy("jaxws-jsr181-webservice02-ejb21.jar"); try { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; - + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } webServiceWsdlLocationTest(); } finally @@ -76,9 +80,11 @@ deploy("jaxws-jsr181-webservice03-ejb21.jar"); try { - System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); - if (true) return; - + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments"); + return; + } webServiceEndpointInterfaceTest(); } finally Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -75,17 +75,13 @@ public void testWebService() throws Exception { - assertWSDLAccess(); - + if (isJBoss50() == false) + { + System.out.println("FIXME: [JBWS-1438] Implement @WebServiceRef injection for JBossAS-4.2"); + return; + } + OrderStatus result = orderMgmtWS.prepareOrder(ORDER); assertEquals("Prepared", result.getStatus()); } - - private void assertWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } } Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebServiceRefEJB3TestCase.class, "jaxws-webserviceref.war, jaxws-webserviceref-ejb3-client.jar"); + return JBossWSTestSetup.newTestSetup(WebServiceRefEJB3TestCase.class, "jaxws-webserviceref.war"); } public void testWSDLAccess() throws MalformedURLException @@ -73,12 +73,25 @@ public void testEJB3Client() throws Exception { - InitialContext iniCtx = getInitialContext(); - EJB3Remote ejb3Remote = (EJB3Remote)iniCtx.lookup("/ejb3/EJB3Client"); + if (isJBoss50() == false) + { + System.out.println("FIXME: [JBWS-1438] Implement @WebServiceRef injection for JBossAS-4.2"); + return; + } + + deploy("jaxws-webserviceref-ejb3-client.jar"); + try + { + InitialContext iniCtx = getInitialContext(); + EJB3Remote ejb3Remote = (EJB3Remote)iniCtx.lookup("/ejb3/EJB3Client"); - String helloWorld = "Hello World!"; - Object retObj = ejb3Remote.echo(helloWorld); - assertEquals(helloWorld, retObj); - + String helloWorld = "Hello World!"; + Object retObj = ejb3Remote.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + finally + { + undeploy("jaxws-webserviceref-ejb3-client.jar"); + } } } Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.java 2007-01-03 16:18:52 UTC (rev 1776) @@ -27,6 +27,7 @@ import java.net.MalformedURLException; import java.net.URL; +import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -49,7 +50,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebServiceRefServletTestCase.class, "jaxws-webserviceref.war, jaxws-webserviceref-servlet-client.war"); + return JBossWSTestSetup.newTestSetup(WebServiceRefServletTestCase.class, "jaxws-webserviceref.war"); } public void testWSDLAccess() throws MalformedURLException @@ -74,12 +75,29 @@ public void testServletClient() throws Exception { - System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); - if (true) return; + if (isJBoss50()) + { + System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets"); + return; + } - URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String retStr = br.readLine(); - assertEquals("HelloWorld", retStr); + if (isJBoss50() == false) + { + System.out.println("FIXME: [JBWS-1438] Implement @WebServiceRef injection for JBossAS-4.2"); + return; + } + + deploy("jaxws-webserviceref-servlet-client.jar"); + try + { + URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + String retStr = br.readLine(); + assertEquals("HelloWorld", retStr); + } + finally + { + undeploy("jaxws-webserviceref-servlet-client.jar"); + } } } Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jbws860/WEB-INF/jboss-web.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jbws860/WEB-INF/jboss-web.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jbws860/WEB-INF/jboss-web.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"> - <jboss-web> <context-root>/test</context-root> </jboss-web> \ No newline at end of file Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/WEB-INF01/jboss-web.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/WEB-INF01/jboss-web.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/WEB-INF01/jboss-web.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"> - <jboss-web> <context-root>/jsr181</context-root> </jboss-web> Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/WEB-INF02/jboss-web.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/WEB-INF02/jboss-web.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/WEB-INF02/jboss-web.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"> - <jboss-web> <context-root>/jsr181</context-root> </jboss-web> Modified: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/WEB-INF03/jboss-web.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/WEB-INF03/jboss-web.xml 2007-01-02 19:15:19 UTC (rev 1775) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxws/jsr181/webservice/WEB-INF03/jboss-web.xml 2007-01-03 16:18:52 UTC (rev 1776) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"> - <jboss-web> <context-root>/jsr181</context-root> </jboss-web>