August 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r4147 - in trunk: jbossws-core/ant-import-tests and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 06:08:11 -0400 (Fri, 03 Aug 2007) New Revision: 4147 Modified: trunk/build/ant-import/build-setup.xml trunk/jbossws-core/ant-import-tests/build-testsuite.xml Log: Move common testsuite to framework Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-08-03 10:00:33 UTC (rev 4146) +++ trunk/build/ant-import/build-setup.xml 2007-08-03 10:08:11 UTC (rev 4147) @@ -19,7 +19,6 @@ <property name="build.dir" value="${basedir}/build"/> <property name="core.dir" value="${basedir}/jbossws-core"/> - <property name="testsuite.dir" value="${basedir}/testsuite"/> <property name="int.sunri.dir" value="${basedir}/integration/sunri"/> <property name="int.xfire.dir" value="${basedir}/integration/xfire"/> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 10:00:33 UTC (rev 4146) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 10:08:11 UTC (rev 4147) @@ -189,7 +189,7 @@ <target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources"> <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${testsuite.dir}/src/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${core.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> <macro-compile-classes srcdir="${core.dir}/src/test/java" excludesfile="${excludesfile}"/> </target> @@ -199,8 +199,8 @@  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${testsuite.dir}/src"/> - <macro-copy-resources srcdir="${tests.dir}"/> + <macro-copy-resources srcdir="${core.dir}/src/test-framework"/> + <macro-copy-resources srcdir="${core.dir}/src/test"/> </target> <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments."> @@ -208,7 +208,7 @@ <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> - <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${core.dir}/src/test-framework/etc/build-jars-jaxws.xml" target="build-jars-jaxws"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/>

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4146 - framework/trunk/src/test/etc.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 06:00:33 -0400 (Fri, 03 Aug 2007) New Revision: 4146 Added: framework/trunk/src/test/etc/build-jars-jaxws.xml Log: Add build-jars-jaxws Added: framework/trunk/src/test/etc/build-jars-jaxws.xml =================================================================== --- framework/trunk/src/test/etc/build-jars-jaxws.xml (rev 0) +++ framework/trunk/src/test/etc/build-jars-jaxws.xml 2007-08-03 10:00:33 UTC (rev 4146) @@ -0,0 +1,419 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <description>JBossWS test archive builder</description> + +  +  +  + + <target name="build-jars-jaxws" description="Build the deployments."> + + <mkdir dir="${tests.output.dir}/libs"/> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/context/META-INF"> + <include name="jboss.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.ear"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-samples-eardeployment.jar"/> + <include name="jaxws-samples-eardeployment.war"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> + <include name="jboss-app.xml"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment42.ear"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-samples-eardeployment.jar"/> + <include name="jaxws-samples-eardeployment.war"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> + <include name="application.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/server/UserException.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-server.xml"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <include name="wsdl/HttpBinding.wsdl"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <include name="wsdl/HttpBinding.wsdl"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war" + webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml"/> + </classes> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war" + webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> + <include name="wsdl/Provider.wsdl"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> + <include name="wsdl/Provider.wsdl"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> + <include name="wsdl/Provider.wsdl"/> + </webinf> + </war> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> + <include name="wsdl/*"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> + </classes> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/ApplicationClient.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <war destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-ejb-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBRemote.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/**"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/> + </classes> + </war> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-swaref.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/swaref/jaxws/**"/> + <include name="org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/swaref/DocumentPayload*.class"/> + </fileset> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> + </classes> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02"> + <include name="wsdl/**"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> + </classes> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02"> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> + </fileset> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> + </classes> + </war> + + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/> + </manifest> + </jar> + + <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" + webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client"> + <include name="jboss-web.xml"/> + </webinf> + </war> + + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="jboss.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws/**"/> + <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws-handlers-server.xml"/> + <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/> + </classes> + </war> + +  + + </target> + +</project>

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4145 - in trunk: integration/xfire/src and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 05:51:08 -0400 (Fri, 03 Aug 2007) New Revision: 4145 Removed: trunk/testsuite/src/etc/ trunk/testsuite/src/java/ trunk/testsuite/src/resources/ Modified: trunk/integration/sunri/src/ trunk/integration/xfire/src/ trunk/jbossws-core/src/ Log: Define externals Property changes on: trunk/integration/sunri/src ___________________________________________________________________ Name: svn:externals + test-framework https://svn.jboss.org/repos/jbossws/framework/trunk/src/test Property changes on: trunk/integration/xfire/src ___________________________________________________________________ Name: svn:externals + test-framework https://svn.jboss.org/repos/jbossws/framework/trunk/src/test Property changes on: trunk/jbossws-core/src ___________________________________________________________________ Name: svn:externals + test-framework https://svn.jboss.org/repos/jbossws/framework/trunk/src/test

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4144 - in branches/jbossws-1.2.0.GA_JBWS-1610: jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1653 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-08-03 05:49:36 -0400 (Fri, 03 Aug 2007) New Revision: 4144 Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java Log: Post-handler-chain not invoked for 'Standard Client' configuration with DII client. Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-08-03 09:42:22 UTC (rev 4143) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-08-03 09:49:36 UTC (rev 4144) @@ -418,6 +418,8 @@ private void initCallProperties(CallImpl call, String seiName) { + setupHandlerChain(call.getEndpointMetaData()); + // nothing to do if (usrMetaData == null) return; Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2007-08-03 09:42:22 UTC (rev 4143) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2007-08-03 09:49:36 UTC (rev 4144) @@ -27,14 +27,16 @@ import java.net.URLClassLoader; import javax.naming.InitialContext; +import javax.xml.namespace.QName; +import javax.xml.rpc.Call; import javax.xml.rpc.Service; import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; - /** * [JBWS-1653] Post-handler-chain not invoked for "Standard Client" configuration * @@ -64,14 +66,92 @@ assertNull(ClientHandler.message); } + public void testStandardConfigConfiguredDII() throws Exception + { + ServiceFactoryImpl factory = new ServiceFactoryImpl(); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws1653/TestEndpoint?wsdl"); + QName qname = new QName("http://org.jboss.test.ws/jbws1653", "TestService"); + Service service = factory.createService(wsdlURL, qname); + + Call call = service.createCall(); + call.setOperationName(new QName("http://org.jboss.test.ws/jbws1653", "echoString")); + + call.setTargetEndpointAddress("http://" + getServerHost() + ":8080/jaxrpc-jbws1653/TestEndpoint"); + + String hello = "Hello"; + Object retObj = call.invoke(new Object[] { hello }); + assertEquals(hello, retObj); + + assertNull(ClientHandler.message); + } + + public void testStandardConfigFullyConfiguredDII() throws Exception + { + ServiceFactoryImpl factory = new ServiceFactoryImpl(); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws1653/TestEndpoint?wsdl"); + URL mappingURL = new File("resources/jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.test.ws/jbws1653", "TestService"); + Service service = factory.createService(wsdlURL, qname, mappingURL); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String retStr = port.echoString("kermit"); + assertEquals("kermit", retStr); + assertNull(ClientHandler.message); + } + public void testCustomConfig() throws Exception { ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); - URLClassLoader urlLoader = new URLClassLoader(new URL[] {}, ctxLoader) + URLClassLoader urlLoader = new URLClassLoader(new URL[] {}, ctxLoader) { + public URL getResource(String resName) + { + URL resURL = super.getResource(resName); + try + { + if (resName.endsWith("META-INF/standard-jaxrpc-client-config.xml")) + resURL = new File("resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml").toURL(); + } + catch (MalformedURLException ex) + { + // ignore + } + return resURL; + } + }; + Thread.currentThread().setContextClassLoader(urlLoader); + + URL configURL = urlLoader.getResource("META-INF/standard-jaxrpc-client-config.xml"); + assertTrue("Invalid config url: " + configURL, configURL.toExternalForm().indexOf("jbws1653") > 0); + + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + try { - public URL findResource(String resName) + String retStr = port.echoString("kermit"); + assertEquals("kermit", retStr); + assertEquals("kermit", ClientHandler.message); + } + finally + { + Thread.currentThread().setContextClassLoader(ctxLoader); + } + } + + public void testCustomConfigConfiguredDII() throws Exception + { + if (false) + { + System.out.println("FIXME: [JBWS-1771] Post-handler-chain not invoked for \"Standard Client\" configuration with DII client"); + return; + } + + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + URLClassLoader urlLoader = new URLClassLoader(new URL[] {}, ctxLoader) { + public URL getResource(String resName) { - URL resURL = super.findResource(resName); + URL resURL = super.getResource(resName); try { if (resName.endsWith("META-INF/standard-jaxrpc-client-config.xml")) @@ -83,7 +163,37 @@ } return resURL; } - + }; + Thread.currentThread().setContextClassLoader(urlLoader); + + ServiceFactoryImpl factory = new ServiceFactoryImpl(); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws1653/TestEndpoint?wsdl"); + QName qname = new QName("http://org.jboss.test.ws/jbws1653", "TestService"); + Service service = factory.createService(wsdlURL, qname); + + Call call = service.createCall(); + call.setOperationName(new QName("http://org.jboss.test.ws/jbws1653", "echoString")); + + call.setTargetEndpointAddress("http://" + getServerHost() + ":8080/jaxrpc-jbws1653/TestEndpoint"); + + String hello = "Hello"; + + try + { + Object retObj = call.invoke(new Object[] { hello }); + assertEquals(hello, retObj); + assertEquals(hello, ClientHandler.message); + } + finally + { + Thread.currentThread().setContextClassLoader(ctxLoader); + } + } + + public void testCustomConfigFullyConfiguredDII() throws Exception + { + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + URLClassLoader urlLoader = new URLClassLoader(new URL[] {}, ctxLoader) { public URL getResource(String resName) { URL resURL = super.getResource(resName); @@ -101,18 +211,18 @@ }; Thread.currentThread().setContextClassLoader(urlLoader); - URL configURL = urlLoader.findResource("META-INF/standard-jaxrpc-client-config.xml"); - assertTrue("Invalid config url: " + configURL, configURL.toExternalForm().indexOf("jbws1653") > 0); - - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + ServiceFactoryImpl factory = new ServiceFactoryImpl(); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws1653/TestEndpoint?wsdl"); + URL mappingURL = new File("resources/jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.test.ws/jbws1653", "TestService"); + Service service = factory.createService(wsdlURL, qname, mappingURL); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); try { - String retStr = port.echoString("kermit"); - assertEquals("kermit", retStr); - assertEquals("kermit", ClientHandler.message); + String retStr = port.echoString("thefrog"); + assertEquals("thefrog", retStr); + assertEquals("thefrog", ClientHandler.message); } finally {

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4143 - in framework/trunk/src: test and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 05:42:22 -0400 (Fri, 03 Aug 2007) New Revision: 4143 Added: framework/trunk/src/test/ framework/trunk/src/test/etc/ framework/trunk/src/test/java/ framework/trunk/src/test/resources/ Log: Add common testsuite Copied: framework/trunk/src/test/etc (from rev 4137, trunk/testsuite/src/etc) Copied: framework/trunk/src/test/java (from rev 4137, trunk/testsuite/src/java) Copied: framework/trunk/src/test/resources (from rev 4137, trunk/testsuite/src/resources)

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4142 - in trunk/build: hudson/hudson-home/jobs/Integration-Native-AS-4.0 and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 05:32:46 -0400 (Fri, 03 Aug 2007) New Revision: 4142 Modified: trunk/build/ant-import/build-testsuite.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml Log: Add tests-integration target Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-08-03 09:24:35 UTC (rev 4141) +++ trunk/build/ant-import/build-testsuite.xml 2007-08-03 09:32:46 UTC (rev 4142) @@ -375,8 +375,8 @@ <antcall target="tests-report"/> </target> -  - <target name="tests-smoke" depends="tests-init" description="Run samples unit tests"> +  + <target name="tests-smoke" depends="tests-init" description="Run smoke unit tests"> <antcall target="tests-run-internal"> <param name="include.wildcard" value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class"/> <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> @@ -397,6 +397,16 @@ </antcall> </target> +  + <target name="tests-integration" depends="tests-jars" description="Run integration unit tests"> + <antcall target="tests-run-internal"> + <param name="include.wildcard" value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class"/> + <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> + <param name="haltonfailure" value="false"/> + </antcall> + <antcall target="tests-report"/> + </target> + <!-- Run a collection of unit tests. ant -Dtest=jaxws/samples/provider test Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-03 09:24:35 UTC (rev 4141) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-03 09:32:46 UTC (rev 4142) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-03 09:24:35 UTC (rev 4141) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-03 09:32:46 UTC (rev 4142) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-03 09:24:35 UTC (rev 4141) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-03 09:32:46 UTC (rev 4142) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-03 09:24:35 UTC (rev 4141) +++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-03 09:32:46 UTC (rev 4142) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-03 09:24:35 UTC (rev 4141) +++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-03 09:32:46 UTC (rev 4142) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-03 09:24:35 UTC (rev 4141) +++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-03 09:32:46 UTC (rev 4142) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-03 09:24:35 UTC (rev 4141) +++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-03 09:32:46 UTC (rev 4142) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u #

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4141 - container/jboss40/trunk and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 05:24:35 -0400 (Fri, 03 Aug 2007) New Revision: 4141 Removed: framework/trunk/src/main/java/org/jboss/wsf/framework/transport/jms/JMSTransportSupport.java Modified: common/trunk/.classpath container/jboss40/trunk/.classpath container/jboss40/trunk/ant-import/build-thirdparty.xml container/jboss40/trunk/version.properties container/jboss42/trunk/.classpath container/jboss42/trunk/ant-import/build-thirdparty.xml container/jboss42/trunk/version.properties container/jboss50/trunk/.classpath container/jboss50/trunk/ant-import/build-thirdparty.xml container/jboss50/trunk/version.properties trunk/jbossws-core/.classpath trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java trunk/jbossws-core/version.properties trunk/testsuite/.classpath Log: Fix eclipse classpath Modified: common/trunk/.classpath =================================================================== --- common/trunk/.classpath 2007-08-03 09:18:27 UTC (rev 4140) +++ common/trunk/.classpath 2007-08-03 09:24:35 UTC (rev 4141) @@ -12,5 +12,7 @@ <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> + <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> + <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: container/jboss40/trunk/.classpath =================================================================== --- container/jboss40/trunk/.classpath 2007-08-03 09:18:27 UTC (rev 4140) +++ container/jboss40/trunk/.classpath 2007-08-03 09:24:35 UTC (rev 4141) @@ -13,5 +13,6 @@ <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/> <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="thirdparty/dom4j.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: container/jboss40/trunk/ant-import/build-thirdparty.xml =================================================================== --- container/jboss40/trunk/ant-import/build-thirdparty.xml 2007-08-03 09:18:27 UTC (rev 4140) +++ container/jboss40/trunk/ant-import/build-thirdparty.xml 2007-08-03 09:24:35 UTC (rev 4141) @@ -38,6 +38,8 @@ <mkdir dir="${thirdparty.dir}"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + + <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> Modified: container/jboss40/trunk/version.properties =================================================================== --- container/jboss40/trunk/version.properties 2007-08-03 09:18:27 UTC (rev 4140) +++ container/jboss40/trunk/version.properties 2007-08-03 09:24:35 UTC (rev 4141) @@ -16,5 +16,7 @@ # Thirdparty library versions jbossws-common=2.0.1.CR1 jbossws-spi=2.0.1.CR1 + +dom4j=1.6.1 sun-jaxrpc=1.1 sun-jaxws=2.1.1 \ No newline at end of file Modified: container/jboss42/trunk/.classpath =================================================================== --- container/jboss42/trunk/.classpath 2007-08-03 09:18:27 UTC (rev 4140) +++ container/jboss42/trunk/.classpath 2007-08-03 09:24:35 UTC (rev 4141) @@ -11,5 +11,6 @@ <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/> <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="thirdparty/dom4j.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: container/jboss42/trunk/ant-import/build-thirdparty.xml =================================================================== --- container/jboss42/trunk/ant-import/build-thirdparty.xml 2007-08-03 09:18:27 UTC (rev 4140) +++ container/jboss42/trunk/ant-import/build-thirdparty.xml 2007-08-03 09:24:35 UTC (rev 4141) @@ -38,6 +38,8 @@ <mkdir dir="${thirdparty.dir}"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + + <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> Modified: container/jboss42/trunk/version.properties =================================================================== --- container/jboss42/trunk/version.properties 2007-08-03 09:18:27 UTC (rev 4140) +++ container/jboss42/trunk/version.properties 2007-08-03 09:24:35 UTC (rev 4141) @@ -16,5 +16,7 @@ # Thirdparty library versions jbossws-common=2.0.1.CR1 jbossws-spi=2.0.1.CR1 + +dom4j=1.6.1 sun-jaxrpc=1.1 sun-jaxws=2.1.1 \ No newline at end of file Modified: container/jboss50/trunk/.classpath =================================================================== --- container/jboss50/trunk/.classpath 2007-08-03 09:18:27 UTC (rev 4140) +++ container/jboss50/trunk/.classpath 2007-08-03 09:24:35 UTC (rev 4141) @@ -11,5 +11,6 @@ <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/> <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="thirdparty/dom4j.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: container/jboss50/trunk/ant-import/build-thirdparty.xml =================================================================== --- container/jboss50/trunk/ant-import/build-thirdparty.xml 2007-08-03 09:18:27 UTC (rev 4140) +++ container/jboss50/trunk/ant-import/build-thirdparty.xml 2007-08-03 09:24:35 UTC (rev 4141) @@ -38,6 +38,8 @@ <mkdir dir="${thirdparty.dir}"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + + <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> Modified: container/jboss50/trunk/version.properties =================================================================== --- container/jboss50/trunk/version.properties 2007-08-03 09:18:27 UTC (rev 4140) +++ container/jboss50/trunk/version.properties 2007-08-03 09:24:35 UTC (rev 4141) @@ -16,5 +16,7 @@ # Thirdparty library versions jbossws-common=2.0.1.CR1 jbossws-spi=2.0.1.CR1 + +dom4j=1.6.1 sun-jaxrpc=1.1 sun-jaxws=2.1.1 \ No newline at end of file Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/transport/jms/JMSTransportSupport.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/transport/jms/JMSTransportSupport.java 2007-08-03 09:18:27 UTC (rev 4140) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/transport/jms/JMSTransportSupport.java 2007-08-03 09:24:35 UTC (rev 4141) @@ -1,268 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.framework.transport.jms; - -// $Id:JMSTransportSupport.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ - -import org.jboss.logging.Logger; -import org.jboss.util.NestedRuntimeException; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.InvocationContext; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; - -import javax.ejb.EJBException; -import javax.ejb.MessageDrivenBean; -import javax.ejb.MessageDrivenContext; -import javax.jms.*; -import javax.management.ObjectName; -import javax.naming.InitialContext; -import javax.xml.soap.SOAPException; -import java.io.*; -import java.lang.IllegalStateException; -import java.rmi.RemoteException; - -/** - * The abstract base class for MDBs that want to act as web service endpoints. - * A subclass should only need to implement the service endpoint interface. - * - * @author Thomas.Diesler(a)jboss.org - */ -public abstract class JMSTransportSupport implements MessageDrivenBean, MessageListener -{ - // logging support - protected Logger log = Logger.getLogger(JMSTransportSupport.class); - - //private MessageDrivenContext mdbCtx; - private QueueConnectionFactory queueFactory; - - /** - * All messages come in here, if it is a BytesMessage we pass it on for further processing. - */ - public void onMessage(Message message) - { - try - { - String msgStr = null; - if (message instanceof BytesMessage) - { - msgStr = getMessageStr((BytesMessage)message); - } - else if (message instanceof TextMessage) - { - msgStr = ((TextMessage)message).getText(); - } - else - { - log.warn("Invalid message type: " + message); - return; - } - - log.debug("Incomming SOAP message: " + msgStr); - - String fromName = null; - Destination destination = message.getJMSDestination(); - if (destination instanceof Queue) - fromName = "queue/" + ((Queue)destination).getQueueName(); - if (destination instanceof Topic) - fromName = "topic/" + ((Topic)destination).getTopicName(); - - InputStream inputStream = new ByteArrayInputStream(msgStr.getBytes()); - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(1024); - processSOAPMessage(fromName, inputStream, outputStream); - - msgStr = new String(outputStream.toByteArray()); - log.debug("Outgoing SOAP message: " + msgStr); - - if (msgStr.length() > 0) - { - Queue replyQueue = getReplyQueue(message); - if (replyQueue != null) - { - sendResponse(replyQueue, msgStr); - } - else - { - log.warn("No reply queue, ignore response message"); - } - } - else - { - log.debug("SOAP response message is null"); - } - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception e) - { - throw new EJBException(e); - } - } - - protected void processSOAPMessage(String fromName, InputStream inputStream, OutputStream outStream) throws SOAPException, IOException, RemoteException - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - EndpointRegistry epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - - Endpoint endpoint = getEndpointForDestination(epRegistry, fromName); - - if (endpoint == null) - throw new IllegalStateException("Cannot find endpoint for: " + fromName); - - log.debug("dipatchMessage: " + endpoint.getName()); - - RequestHandler reqHandler = endpoint.getRequestHandler(); - - try - { - InvocationContext invContext = new InvocationContext(); - invContext.setTargetBean(this); - - reqHandler.handleRequest(endpoint, inputStream, outStream, invContext); - } - catch (Exception ex) - { - throw new RemoteException("Cannot process SOAP request", ex); - } - } - - // The destination jndiName is encoded in the service object name under key 'jms' - private Endpoint getEndpointForDestination(EndpointRegistry epRegistry, String fromName) - { - Endpoint endpoint = null; - for (ObjectName oname : epRegistry.getEndpoints()) - { - Endpoint aux = epRegistry.getEndpoint(oname); - String jmsProp = aux.getName().getKeyProperty("jms"); - if (jmsProp != null && jmsProp.equals(fromName)) - { - endpoint = aux; - break; - } - } - return endpoint; - } - - private String getMessageStr(BytesMessage message) throws Exception - { - byte[] buffer = new byte[8 * 1024]; - ByteArrayOutputStream out = new ByteArrayOutputStream(buffer.length); - int read = message.readBytes(buffer); - while (read != -1) - { - out.write(buffer, 0, read); - read = message.readBytes(buffer); - } - - byte[] msgBytes = out.toByteArray(); - return new String(msgBytes); - } - - /** - * Get the reply queue. - */ - protected Queue getReplyQueue(Message message) throws JMSException - { - Queue replyQueue = (Queue)message.getJMSReplyTo(); - return replyQueue; - } - - /** - * Respond to the call by sending a message to the reply queue - */ - protected void sendResponse(Queue replyQueue, String msgStr) throws SOAPException, IOException, JMSException - { - QueueConnection qc = queueFactory.createQueueConnection(); - QueueSession session = qc.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); - QueueSender sender = null; - try - { - sender = session.createSender(replyQueue); - TextMessage responseMessage = session.createTextMessage(msgStr); - sender.send(responseMessage); - log.info("Sent response"); - } - finally - { - try - { - sender.close(); - } - catch (JMSException ignored) - { - } - try - { - session.close(); - } - catch (JMSException ignored) - { - } - try - { - qc.close(); - } - catch (JMSException ignored) - { - } - } - } - - // MDB lifecycle methods ******************************************************************************************** - - public void ejbCreate() - { - try - { - InitialContext ctx = new InitialContext(); - queueFactory = (QueueConnectionFactory)ctx.lookup("java:/ConnectionFactory"); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception e) - { - throw new NestedRuntimeException(e); - } - } - - /** - * A container invokes this method before it ends the life of the message-driven object. - */ - public void ejbRemove() throws EJBException - { - } - - /** - * Set the associated message-driven context. - */ - public void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException - { - //this.mdbCtx = ctx; - } -} Modified: trunk/jbossws-core/.classpath =================================================================== --- trunk/jbossws-core/.classpath 2007-08-03 09:18:27 UTC (rev 4140) +++ trunk/jbossws-core/.classpath 2007-08-03 09:24:35 UTC (rev 4141) @@ -37,5 +37,6 @@ <classpathentry kind="lib" path="thirdparty/concurrent.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> + <classpathentry kind="lib" path="thirdparty/junit.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-03 09:18:27 UTC (rev 4140) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-03 09:24:35 UTC (rev 4141) @@ -94,6 +94,7 @@ <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> + <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java 2007-08-03 09:18:27 UTC (rev 4140) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java 2007-08-03 09:24:35 UTC (rev 4141) @@ -11,7 +11,7 @@ import java.rmi.RemoteException; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.transport.jms.JMSTransportSupport; +import org.jboss.wsf.common.transport.jms.JMSTransportSupport; /** * An example of a MDB acting as a web service endpoint. Modified: trunk/jbossws-core/version.properties =================================================================== --- trunk/jbossws-core/version.properties 2007-08-03 09:18:27 UTC (rev 4140) +++ trunk/jbossws-core/version.properties 2007-08-03 09:24:35 UTC (rev 4141) @@ -30,6 +30,7 @@ jboss-security=4.0.5.GA jboss-vfs=2.0.0.Beta2 jbossas-core-libs=4.2.0.GA +junit=3.8.1 oswego-concurrent=1.3.4 qdox=1.4 sun-hudson=1.93 Modified: trunk/testsuite/.classpath =================================================================== --- trunk/testsuite/.classpath 2007-08-03 09:18:27 UTC (rev 4140) +++ trunk/testsuite/.classpath 2007-08-03 09:24:35 UTC (rev 4141) @@ -3,7 +3,6 @@ <classpathentry excluding="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java" kind="src" path="src/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/activation.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxb-api.jar"/> @@ -14,5 +13,6 @@ <classpathentry kind="lib" path="/integration-framework/thirdparty/wsdl4j.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/junit.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> + <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry kind="output" path="output/eclipse"/> </classpath>

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4140 - in common/trunk: ant-import and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 05:18:27 -0400 (Fri, 03 Aug 2007) New Revision: 4140 Added: common/trunk/src/main/java/org/jboss/wsf/common/transport/ common/trunk/src/main/java/org/jboss/wsf/common/transport/jms/ common/trunk/src/main/java/org/jboss/wsf/common/transport/jms/JMSTransportSupport.java Modified: common/trunk/ant-import/build-thirdparty.xml common/trunk/version.properties Log: Add JMSTransportSupport Modified: common/trunk/ant-import/build-thirdparty.xml =================================================================== --- common/trunk/ant-import/build-thirdparty.xml 2007-08-03 08:58:16 UTC (rev 4139) +++ common/trunk/ant-import/build-thirdparty.xml 2007-08-03 09:18:27 UTC (rev 4140) @@ -38,18 +38,21 @@ <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/> <checksum file="${common.dir}/version.properties" fileext=".md5"/> </target> @@ -58,16 +61,19 @@  <path id="common.thirdparty.classpath"> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/activation.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-javaee.jar"/> <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/junit.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> </path> </target> Copied: common/trunk/src/main/java/org/jboss/wsf/common/transport/jms/JMSTransportSupport.java (from rev 4136, framework/trunk/src/main/java/org/jboss/wsf/framework/transport/jms/JMSTransportSupport.java) =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/transport/jms/JMSTransportSupport.java (rev 0) +++ common/trunk/src/main/java/org/jboss/wsf/common/transport/jms/JMSTransportSupport.java 2007-08-03 09:18:27 UTC (rev 4140) @@ -0,0 +1,284 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.common.transport.jms; + +// $Id:JMSTransportSupport.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.rmi.RemoteException; + +import javax.ejb.EJBException; +import javax.ejb.MessageDrivenBean; +import javax.ejb.MessageDrivenContext; +import javax.jms.BytesMessage; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.Queue; +import javax.jms.QueueConnection; +import javax.jms.QueueConnectionFactory; +import javax.jms.QueueSender; +import javax.jms.QueueSession; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.Topic; +import javax.management.ObjectName; +import javax.naming.InitialContext; +import javax.xml.soap.SOAPException; + +import org.jboss.logging.Logger; +import org.jboss.util.NestedRuntimeException; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; + +/** + * The abstract base class for MDBs that want to act as web service endpoints. + * A subclass should only need to implement the service endpoint interface. + * + * @author Thomas.Diesler(a)jboss.org + */ +public abstract class JMSTransportSupport implements MessageDrivenBean, MessageListener +{ + // logging support + protected Logger log = Logger.getLogger(JMSTransportSupport.class); + + //private MessageDrivenContext mdbCtx; + private QueueConnectionFactory queueFactory; + + /** + * All messages come in here, if it is a BytesMessage we pass it on for further processing. + */ + public void onMessage(Message message) + { + try + { + String msgStr = null; + if (message instanceof BytesMessage) + { + msgStr = getMessageStr((BytesMessage)message); + } + else if (message instanceof TextMessage) + { + msgStr = ((TextMessage)message).getText(); + } + else + { + log.warn("Invalid message type: " + message); + return; + } + + log.debug("Incomming SOAP message: " + msgStr); + + String fromName = null; + Destination destination = message.getJMSDestination(); + if (destination instanceof Queue) + fromName = "queue/" + ((Queue)destination).getQueueName(); + if (destination instanceof Topic) + fromName = "topic/" + ((Topic)destination).getTopicName(); + + InputStream inputStream = new ByteArrayInputStream(msgStr.getBytes()); + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(1024); + processSOAPMessage(fromName, inputStream, outputStream); + + msgStr = new String(outputStream.toByteArray()); + log.debug("Outgoing SOAP message: " + msgStr); + + if (msgStr.length() > 0) + { + Queue replyQueue = getReplyQueue(message); + if (replyQueue != null) + { + sendResponse(replyQueue, msgStr); + } + else + { + log.warn("No reply queue, ignore response message"); + } + } + else + { + log.debug("SOAP response message is null"); + } + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception e) + { + throw new EJBException(e); + } + } + + protected void processSOAPMessage(String fromName, InputStream inputStream, OutputStream outStream) throws SOAPException, IOException, RemoteException + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + EndpointRegistry epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); + + Endpoint endpoint = getEndpointForDestination(epRegistry, fromName); + + if (endpoint == null) + throw new IllegalStateException("Cannot find endpoint for: " + fromName); + + log.debug("dipatchMessage: " + endpoint.getName()); + + RequestHandler reqHandler = endpoint.getRequestHandler(); + + try + { + InvocationContext invContext = new InvocationContext(); + invContext.setTargetBean(this); + + reqHandler.handleRequest(endpoint, inputStream, outStream, invContext); + } + catch (Exception ex) + { + throw new RemoteException("Cannot process SOAP request", ex); + } + } + + // The destination jndiName is encoded in the service object name under key 'jms' + private Endpoint getEndpointForDestination(EndpointRegistry epRegistry, String fromName) + { + Endpoint endpoint = null; + for (ObjectName oname : epRegistry.getEndpoints()) + { + Endpoint aux = epRegistry.getEndpoint(oname); + String jmsProp = aux.getName().getKeyProperty("jms"); + if (jmsProp != null && jmsProp.equals(fromName)) + { + endpoint = aux; + break; + } + } + return endpoint; + } + + private String getMessageStr(BytesMessage message) throws Exception + { + byte[] buffer = new byte[8 * 1024]; + ByteArrayOutputStream out = new ByteArrayOutputStream(buffer.length); + int read = message.readBytes(buffer); + while (read != -1) + { + out.write(buffer, 0, read); + read = message.readBytes(buffer); + } + + byte[] msgBytes = out.toByteArray(); + return new String(msgBytes); + } + + /** + * Get the reply queue. + */ + protected Queue getReplyQueue(Message message) throws JMSException + { + Queue replyQueue = (Queue)message.getJMSReplyTo(); + return replyQueue; + } + + /** + * Respond to the call by sending a message to the reply queue + */ + protected void sendResponse(Queue replyQueue, String msgStr) throws SOAPException, IOException, JMSException + { + QueueConnection qc = queueFactory.createQueueConnection(); + QueueSession session = qc.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); + QueueSender sender = null; + try + { + sender = session.createSender(replyQueue); + TextMessage responseMessage = session.createTextMessage(msgStr); + sender.send(responseMessage); + log.info("Sent response"); + } + finally + { + try + { + sender.close(); + } + catch (JMSException ignored) + { + } + try + { + session.close(); + } + catch (JMSException ignored) + { + } + try + { + qc.close(); + } + catch (JMSException ignored) + { + } + } + } + + // MDB lifecycle methods ******************************************************************************************** + + public void ejbCreate() + { + try + { + InitialContext ctx = new InitialContext(); + queueFactory = (QueueConnectionFactory)ctx.lookup("java:/ConnectionFactory"); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception e) + { + throw new NestedRuntimeException(e); + } + } + + /** + * A container invokes this method before it ends the life of the message-driven object. + */ + public void ejbRemove() throws EJBException + { + } + + /** + * Set the associated message-driven context. + */ + public void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException + { + //this.mdbCtx = ctx; + } +} Modified: common/trunk/version.properties =================================================================== --- common/trunk/version.properties 2007-08-03 08:58:16 UTC (rev 4139) +++ common/trunk/version.properties 2007-08-03 09:18:27 UTC (rev 4140) @@ -18,9 +18,10 @@ jboss-common-core=2.0.2.GA jboss-common-logging-spi=2.0.2.GA +jboss-javaee=5.0.0-SNAPSHOT jboss-microcontainer=2.0.0.Beta3 +junit=3.8.1 sun-jaf=1.1 sun-jaxb=2.1.4 sun-jaxrpc=1.1 sun-jaxws=2.1.1 -junit=3.8.1

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4139 - in spi/trunk: src/test/java/org/jboss/test/wsf/spi/tools and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-03 04:58:16 -0400 (Fri, 03 Aug 2007) New Revision: 4139 Added: spi/trunk/spi.iml spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CalculatorBean.java spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTestCase.java spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTracker.java spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTrackerFactory.java spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CommandlineTestBase.java Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTestCase.java spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java Log: Added WSProvide test case Added: spi/trunk/spi.iml =================================================================== --- spi/trunk/spi.iml (rev 0) +++ spi/trunk/spi.iml 2007-08-03 08:58:16 UTC (rev 4139) @@ -0,0 +1,198 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/output/classes" /> + <exclude-output /> + <output-test url="file://$MODULE_DIR$/output/test/classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core-sources.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-javaee.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding-sources.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/dom4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/getopt.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-log4j.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/servlet-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/junit.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxb-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxws-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxrpc-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/ant.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/activation.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module" module-name="common" /> + <orderEntryProperties /> + </component> +</module> + Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CalculatorBean.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CalculatorBean.java (rev 0) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CalculatorBean.java 2007-08-03 08:58:16 UTC (rev 4139) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.wsf.spi.tools; + +// We just need to load it, therefore we skip the JSR 181 annotations here +public class CalculatorBean +{ + public int add(int a, int b) + { + return a+b; + } + + public int subtract(int a, int b) + { + return a-b; + } +} Property changes on: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CalculatorBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTestCase.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTestCase.java 2007-08-03 08:57:11 UTC (rev 4138) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTestCase.java 2007-08-03 08:58:16 UTC (rev 4139) @@ -33,60 +33,16 @@ * @author Heiko.Braun(a)jboss.com * @version $Revision$ */ -public class CmdConsumeTestCase extends TestCase +public class CmdConsumeTestCase extends CommandlineTestBase { - SecurityManager systemDefault = System.getSecurityManager(); - SecurityManager interceptor = new InterceptedSecurity(); - - class InterceptedSecurity extends SecurityManager - { - private final SecurityManager parent = systemDefault; - - public void checkPermission(Permission perm) - { - if (parent != null) - { - parent.checkPermission(perm); - } - } - - public void checkExit(int status) - { - String msg = (status == 0) ? "WSConsume did exit without errors" : "WSConsume did exit with an error"; - throw new InterceptedExit(msg, status); - } - } - - class InterceptedExit extends SecurityException - { - private int exitCode; - - public InterceptedExit(String s, int code) - { - super(s); - this.exitCode = code; - } - - - public int getExitCode() - { - return exitCode; - } - } - - private void swapSecurityManager() - { - if(System.getSecurityManager() instanceof InterceptedSecurity) - System.setSecurityManager(systemDefault); - else - System.setSecurityManager(interceptor); - } - protected void setUp() throws Exception { super.setUp(); + // cleanup events + CmdConsumeTracker.LAST_EVENT = ""; + // enforce loading of the tracker implemenation System.setProperty( "org.jboss.wsf.spi.tools.ConsumerFactoryImpl", @@ -94,22 +50,6 @@ ); } - /* - new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'), - new LongOpt("catalog", LongOpt.REQUIRED_ARGUMENT, null, 'c'), - new LongOpt("package", LongOpt.REQUIRED_ARGUMENT, null, 'p'), - new LongOpt("wsdlLocation", LongOpt.REQUIRED_ARGUMENT, null, 'w'), - new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), - new LongOpt("source", LongOpt.REQUIRED_ARGUMENT, null, 's'), - new LongOpt("target", LongOpt.REQUIRED_ARGUMENT, null, 't'), - new LongOpt("keep", LongOpt.NO_ARGUMENT, null, 'k'), - new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), - new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'), - new LongOpt("verbose", LongOpt.NO_ARGUMENT, null, 'v'), - new LongOpt("load-consumer", LongOpt.NO_ARGUMENT, null, 'l'), - - */ - public void testInvalidBindingOption() throws Exception { executeCmd("-b", true); @@ -118,50 +58,19 @@ public void testValidBindingOption() throws Exception { executeCmd("-b binding-file.xml Service.wsdl", false); - assertEquals(CmdConsumeTracker.LAST_EVENT, "setBindingFiles"); + assertTrue("setBindingFiles() not invoked", CmdConsumeTracker.LAST_EVENT.indexOf("setBindingFiles")!=-1); } public void testMissingOptions() throws Exception { - executeCmd("", false); // strange, shouldn't this exit(1) ? + executeCmd(null, true); } // TODO: add arbitrary combinations on a case by case basis - /** - * Pass a number of arguments to WSConsume and specify if - * you expect this to cause an exception. - * - * @param arguments - * @param expectedException - * @throws Exception - */ - private void executeCmd(String arguments, boolean expectedException) throws Exception - { - swapSecurityManager(); - String[] args = arguments.split("\\s"); - try - { - WSConsume.main(args); - if(expectedException) - fail("Did expect exception on args: " +args); - } - catch (InterceptedExit e) - { - boolean positivStatus = (e.getExitCode() == 0); - if( (expectedException && positivStatus) - || (!expectedException && !positivStatus) ) - { - String s = expectedException ? "Did expect an exception, but " : "Did not expect an exception, but "; - String s2 = positivStatus ? "status was positiv" : "status was negativ"; - throw new Exception(s+s2); - } - - } - finally - { - swapSecurityManager(); - } + void runDelegate(String[] args) throws Exception + { + WSConsume.main(args); } } Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java 2007-08-03 08:57:11 UTC (rev 4138) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java 2007-08-03 08:58:16 UTC (rev 4139) @@ -38,52 +38,52 @@ public void setBindingFiles(List<File> bindingFiles) { - CmdConsumeTracker.LAST_EVENT = "setBindingFiles"; + LAST_EVENT += "setBindingFiles"; } public void setCatalog(File catalog) { - CmdConsumeTracker.LAST_EVENT = "setCatalog"; + LAST_EVENT += "setCatalog"; } public void setOutputDirectory(File directory) { - CmdConsumeTracker.LAST_EVENT = "setOutputDirectory"; + LAST_EVENT += "setOutputDirectory"; } public void setSourceDirectory(File directory) { - CmdConsumeTracker.LAST_EVENT = "setSourceDirectory"; + LAST_EVENT += "setSourceDirectory"; } public void setGenerateSource(boolean generateSource) { - CmdConsumeTracker.LAST_EVENT = "setGenerateSource"; + LAST_EVENT += "setGenerateSource"; } public void setTargetPackage(String targetPackage) { - CmdConsumeTracker.LAST_EVENT = "setTargetPackage"; + LAST_EVENT += "setTargetPackage"; } public void setWsdlLocation(String wsdlLocation) { - CmdConsumeTracker.LAST_EVENT = "setWsdlLocation"; + LAST_EVENT += "setWsdlLocation"; } public void setMessageStream(PrintStream messageStream) { - CmdConsumeTracker.LAST_EVENT = "setMessageStream"; + LAST_EVENT += "setMessageStream"; } public void setAdditionalCompilerClassPath(List<String> classPath) { - CmdConsumeTracker.LAST_EVENT = "setAdditionalCompilerClassPath"; + LAST_EVENT += "setAdditionalCompilerClassPath"; } public void setTarget(String target) { - CmdConsumeTracker.LAST_EVENT = "setTarget"; + LAST_EVENT += "setTarget"; } public void consume(URL wsdl) Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTestCase.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTestCase.java (rev 0) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTestCase.java 2007-08-03 08:58:16 UTC (rev 4139) @@ -0,0 +1,78 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.wsf.spi.tools; + +import org.jboss.wsf.spi.tools.cmd.WSProvide; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class CmdProvideTestCase extends CommandlineTestBase +{ + + protected void setUp() throws Exception + { + super.setUp(); + + // clear events + CmdProvideTracker.LAST_EVENT = ""; + + // enforce loading of the tracker implemenation + System.setProperty( + "org.jboss.wsf.spi.tools.ProviderFactoryImpl", + "org.jboss.test.wsf.spi.tools.CmdProvideTrackerFactory" + ); + } + + /** <pre> + * usage: WSProvideTask [options] <endpoint class name> + * options: + * -h, --help Show this help message + * -k, --keep Keep/Generate Java source + * -w, --wsdl Enable WSDL file generation + * -c, --classpath=<path< The classpath that contains the endpoint + * -o, --output=<directory> The directory to put generated artifacts + * -r, --resource=<directory> The directory to put resource artifacts + * -s, --source=<directory> The directory to put Java source + * -q, --quiet Be somewhat more quiet + * -t, --show-traces Show full exception stack traces + * -l, --load-provider Load the provider and exit (debug utility) + * </pre> + * */ + + public void testMissingOptions() throws Exception + { + executeCmd(null, true); + } + + public void testValidOutputDir() throws Exception + { + executeCmd("-o outputDir org.jboss.test.wsf.spi.tools.CalculatorBean", false); + assertTrue("setOutputDirectory() not invoked", CmdProvideTracker.LAST_EVENT.indexOf("setOutputDirectory")!=-1); + } + + void runDelegate(String[] args) throws Exception + { + WSProvide.main(args); + } +} Property changes on: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTracker.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTracker.java (rev 0) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTracker.java 2007-08-03 08:58:16 UTC (rev 4139) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.wsf.spi.tools; + +import org.jboss.wsf.spi.tools.WSContractProvider; + +import java.io.File; +import java.io.PrintStream; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class CmdProvideTracker extends WSContractProvider +{ + + public static String LAST_EVENT = ""; + + public void setGenerateWsdl(boolean generateWsdl) + { + LAST_EVENT += "setGenerateWsdl"; + } + + public void setGenerateSource(boolean generateSource) + { + LAST_EVENT += "setGenerateSource"; + } + + public void setOutputDirectory(File directory) + { + LAST_EVENT += "setOutputDirectory"; + } + + public void setResourceDirectory(File directory) + { + LAST_EVENT += "setResourceDirectory"; + } + + public void setSourceDirectory(File directory) + { + LAST_EVENT += "setSourceDirectory"; + } + + public void setClassLoader(ClassLoader loader) + { + LAST_EVENT += "setClassLoader"; + } + + public void provide(String endpointClass) + { + + } + + public void provide(Class<?> endpointClass) + { + + } + + public void setMessageStream(PrintStream messageStream) + { + LAST_EVENT += "setMessageStream"; + } +} Property changes on: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTracker.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTrackerFactory.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTrackerFactory.java (rev 0) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTrackerFactory.java 2007-08-03 08:58:16 UTC (rev 4139) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.wsf.spi.tools; + +import org.jboss.wsf.spi.tools.WSContractProviderFactory; +import org.jboss.wsf.spi.tools.WSContractProvider; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class CmdProvideTrackerFactory implements WSContractProviderFactory +{ + + public WSContractProvider createProvider(ClassLoader loader) + { + return new CmdProvideTracker(); + } +} Property changes on: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTrackerFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CommandlineTestBase.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CommandlineTestBase.java (rev 0) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CommandlineTestBase.java 2007-08-03 08:58:16 UTC (rev 4139) @@ -0,0 +1,113 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.wsf.spi.tools; + +import junit.framework.TestCase; + +import java.security.Permission; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public abstract class CommandlineTestBase extends TestCase +{ + SecurityManager systemDefault = System.getSecurityManager(); + SecurityManager interceptor = new InterceptedSecurity(); + + protected void swapSecurityManager() + { + if(System.getSecurityManager() instanceof InterceptedSecurity) + System.setSecurityManager(systemDefault); + else + System.setSecurityManager(interceptor); + } + + class InterceptedSecurity extends SecurityManager + { + private final SecurityManager parent = systemDefault; + + public void checkPermission(Permission perm) + { + if (parent != null) + { + parent.checkPermission(perm); + } + } + + public void checkExit(int status) + { + String msg = (status == 0) ? "Delegate did exit without errors" : "Delegate did exit with an error"; + throw new InterceptedExit(msg, status); + } + } + + protected class InterceptedExit extends SecurityException + { + private int exitCode; + + public InterceptedExit(String s, int code) + { + super(s); + this.exitCode = code; + } + + + public int getExitCode() + { + return exitCode; + } + } + + protected void executeCmd(String arguments, boolean expectedException) throws Exception + { + swapSecurityManager(); + + String[] args = arguments!=null ? arguments.split("\\s"): new String[0]; + try + { + runDelegate(args); + if(expectedException) + fail("Did expect exception on args: " +args); + } + catch (CommandlineTestBase.InterceptedExit e) + { + boolean positivStatus = (e.getExitCode() == 0); + if( (expectedException && positivStatus) + || (!expectedException && !positivStatus) ) + { + String s = expectedException ? "Did expect an exception, but " : "Did not expect an exception, but "; + String s2 = positivStatus ? "status was positiv" : "status was negativ"; + throw new Exception(s+s2); + } + + } + finally + { + swapSecurityManager(); + } + } + + // the actual tools execution + abstract void runDelegate(String[] args) throws Exception; + +} Property changes on: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CommandlineTestBase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4138 - in trunk: integration/xfire/ant-import and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 04:57:11 -0400 (Fri, 03 Aug 2007) New Revision: 4138 Modified: trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/xfire/ant-import/build-testsuite.xml trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java Log: test client needs framework.jar Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-03 08:46:08 UTC (rev 4137) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-03 08:57:11 UTC (rev 4138) @@ -48,6 +48,7 @@ </path> <path id="tests.extra.classpath"> + <pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/> </path> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-03 08:46:08 UTC (rev 4137) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-03 08:57:11 UTC (rev 4138) @@ -45,6 +45,7 @@ </path> <path id="tests.extra.classpath"> + <pathelement location="${int.xfire.dir}/thirdparty/jbossws-framework.jar"/> </path> </target> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 08:46:08 UTC (rev 4137) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 08:57:11 UTC (rev 4138) @@ -41,6 +41,7 @@ </path> <path id="tests.extra.classpath"> + <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${core.dir}/thirdparty/qdox.jar"/> <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/> </path> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java 2007-08-03 08:46:08 UTC (rev 4137) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java 2007-08-03 08:57:11 UTC (rev 4138) @@ -24,12 +24,14 @@ import java.net.URL; import javax.management.Attribute; +import javax.management.ObjectName; import javax.xml.namespace.QName; import javax.xml.rpc.Call; import javax.xml.rpc.Service; import javax.xml.rpc.ServiceFactory; -import org.jboss.wsf.framework.management.DefaultServerConfigMBean; +import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.common.management.DefaultServerConfigMBean; import org.jboss.wsf.test.JBossWSTest; /** @@ -40,6 +42,8 @@ */ public class AddressRewriteTestCase extends JBossWSTest { + private static final ObjectName SERVER_CONFIG_OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); + private static String NAMESPACE = "http://test.jboss.org/addressrewrite"; private String wsdlLocation; private String wsdlLocationSec; @@ -51,14 +55,14 @@ { wsdlLocation = "http://" + getServerHost() + ":8080/jaxrpc-addressrewrite/ValidURL?wsdl"; wsdlLocationSec = "http://" + getServerHost() + ":8080/jaxrpc-addressrewrite-sec/ValidURL?wsdl"; - modifySOAPAddress = (Boolean)getServer().getAttribute(DefaultServerConfigMBean.OBJECT_NAME, "ModifySOAPAddress"); - webServiceHost = (String)getServer().getAttribute(DefaultServerConfigMBean.OBJECT_NAME, "WebServiceHost"); + modifySOAPAddress = (Boolean)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "ModifySOAPAddress"); + webServiceHost = (String)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "WebServiceHost"); } public void tearDown() throws Exception { Attribute attr = new Attribute("ModifySOAPAddress", modifySOAPAddress); - getServer().setAttribute(DefaultServerConfigMBean.OBJECT_NAME, attr); + getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr); } public void testRewrite() throws Exception @@ -158,6 +162,6 @@ private void setModifySOAPAddress(Boolean value) throws Exception { Attribute attr = new Attribute("ModifySOAPAddress", value); - getServer().setAttribute(DefaultServerConfigMBean.OBJECT_NAME, attr); + getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr); } } \ No newline at end of file

18 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits August 2007