Author: heiko.braun(a)jboss.com Date: 2008-03-14 07:20:13 -0400 (Fri, 14 Mar 2008) New Revision: 5978 Added: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/EmbeddableWSFRuntime.java Removed: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/StandaloneContainer.java stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/container/ Modified: stack/native/branches/hbraun/ant-import-tests/build-testsuite.xml stack/native/branches/hbraun/ant-import/build-thirdparty.xml stack/native/branches/hbraun/native-standalone.iml stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/EmbeddedBootstrap.java stack/native/branches/hbraun/src/test/resources/test-excludes-jboss500.txt stack/native/branches/hbraun/version.properties Log: Renamed from Container to WSFRuntime Modified: stack/native/branches/hbraun/ant-import/build-thirdparty.xml =================================================================== --- stack/native/branches/hbraun/ant-import/build-thirdparty.xml 2008-03-14 11:14:56 UTC (rev 5977) +++ stack/native/branches/hbraun/ant-import/build-thirdparty.xml 2008-03-14 11:20:13 UTC (rev 5978) @@ -93,6 +93,10 @@ <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jaxbintros/${jboss-jaxbintros}/lib/jboss-jaxb-intros.jar" dest="${thirdparty.dir}/jboss-jaxb-intros.jar" usetimestamp="true" verbose="true"/> + + <get src="${jboss.repository}/jetty/${jetty}/lib/jetty.jar" dest="${thirdparty.dir}/jetty.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jetty/${jetty}/lib/jetty-util.jar" dest="${thirdparty.dir}/jetty-util.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.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-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> Modified: stack/native/branches/hbraun/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/branches/hbraun/ant-import-tests/build-testsuite.xml 2008-03-14 11:14:56 UTC (rev 5977) +++ stack/native/branches/hbraun/ant-import-tests/build-testsuite.xml 2008-03-14 11:20:13 UTC (rev 5978) @@ -10,215 +10,226 @@ <project> - <property name="tests.output.dir" value="${core.dir}/output/tests"/> - - <import file="${core.dir}/src/test-framework/ant-import/build-testsuite.xml"/> + <property name="tests.output.dir" value="${core.dir}/output/tests"/> - <!-- Define excluded tests --> - <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/> - <property name="excludesfile" value="${core.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> - - <property name="tests.dir" value="${core.dir}/src/test"/> - <property name="tests.java.dir" value="${tests.dir}/java"/> - <property name="tests.resources.dir" value="${tests.dir}/resources"/> + <import file="${core.dir}/src/test-framework/ant-import/build-testsuite.xml"/> - <!-- - Init the various classpaths - --> - <target name="tests-init" depends="thirdparty-classpath,tests-classpath"> + <!-- Define excluded tests --> + <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/> + <property name="excludesfile" value="${core.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> - <path id="ws.stack.classpath"> - <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxws-ext.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> - <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> - <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> - </path> + <property name="tests.dir" value="${core.dir}/src/test"/> + <property name="tests.java.dir" value="${tests.dir}/java"/> + <property name="tests.resources.dir" value="${tests.dir}/resources"/> - <path id="tests.extra.classpath"> - <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> - <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${core.dir}/thirdparty/policy.jar"/> - <pathelement location="${core.dir}/thirdparty/qdox.jar"/> - <pathelement location="${core.dir}/thirdparty/stax-api.jar"/> - <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${core.dir}/thirdparty/wstx.jar"/> - <pathelement location="${core.dir}/thirdparty/jboss-jaxb-intros.jar"/> - </path> + <!-- + Init the various classpaths + --> + <target name="tests-init" depends="thirdparty-classpath,tests-classpath"> - <!-- The jBPM BPEL classpath --> - <path id="jbpm.bpel.classpath"> - <path refid="ws.stack.classpath"/> - <pathelement location="${core.dir}/thirdparty/jbpm-bpel"/> <!-- jbpm.cfg.xml --> - <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-bpel.jar" /> - <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-jpdl.jar" /> - <pathelement location="${core.dir}/thirdparty/jbpm-bpel/commons-lang.jar" /> - <pathelement location="${core.dir}/thirdparty/commons-collections.jar"/> - <pathelement location="${core.dir}/thirdparty/commons-logging.jar"/> - <pathelement location="${core.dir}/thirdparty/dom4j.jar"/> - <pathelement location="${core.dir}/thirdparty/jaxen.jar"/> - <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${core.dir}/thirdparty/jboss-logging-log4j.jar"/> - </path> + <path id="ws.stack.classpath"> + <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws-ext.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> + </path> - </target> + <path id="tests.extra.classpath"> + <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> - <!-- ================================================================== --> - <!-- Generating sources --> - <!-- ================================================================== --> + <!-- embedded tests --> + <pathelement location="${core.dir}/thirdparty/jboss-microcontainer.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-dependency.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-container.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-common-core.jar"/> + <pathelement location="${core.dir}/thirdparty/servlet-api.jar"/> + <pathelement location="${core.dir}/thirdparty/jetty.jar"/> + <pathelement location="${core.dir}/thirdparty/jetty-util.jar"/> + <!-- / embedded tests --> - <target name="wsconsume" depends="tests-init" unless="noconsume" description="Consume JAX-WS contracts"> + <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${core.dir}/thirdparty/policy.jar"/> + <pathelement location="${core.dir}/thirdparty/qdox.jar"/> + <pathelement location="${core.dir}/thirdparty/stax-api.jar"/> + <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> + <pathelement location="${core.dir}/thirdparty/wstx.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-jaxb-intros.jar"/> + </path> - <!-- Define the JAX-WS wsconsume task --> - <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> - <classpath refid="tests.client.classpath"/> - </taskdef> + <!-- The jBPM BPEL classpath --> + <path id="jbpm.bpel.classpath"> + <path refid="ws.stack.classpath"/> + <pathelement location="${core.dir}/thirdparty/jbpm-bpel"/> <!-- jbpm.cfg.xml --> + <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-bpel.jar" /> + <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-jpdl.jar" /> + <pathelement location="${core.dir}/thirdparty/jbpm-bpel/commons-lang.jar" /> + <pathelement location="${core.dir}/thirdparty/commons-collections.jar"/> + <pathelement location="${core.dir}/thirdparty/commons-logging.jar"/> + <pathelement location="${core.dir}/thirdparty/dom4j.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxen.jar"/> + <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-logging-log4j.jar"/> + </path> - <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="true" fork="false"/> - <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - </target> + </target> - <!-- - Generate BPEL sources - --> - <target name="servicegen" depends="tests-compile" description="Generate the BPEL resources."> - <!-- create jbpm process archives --> - <mkdir dir="${tests.output.dir}/libs"/> - <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" /> - </zip> - <!-- Copy the BPEL sar --> - <copy file="${core.dir}/thirdparty/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> + <!-- ================================================================== --> + <!-- Generating sources --> + <!-- ================================================================== --> - <!-- generate wsdl binding and service definitions for bpel processes --> - <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> - <classpath refid="jbpm.bpel.classpath"/> - </taskdef> - <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" - outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" - bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> - </target> + <target name="wsconsume" depends="tests-init" unless="noconsume" description="Consume JAX-WS contracts"> - <!-- - Generate JAX-RPC sources - --> - <target name="wstools" depends="tests-compile" description="Generate the JAX-RPC artifacts."> + <!-- Define the JAX-WS wsconsume task --> + <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> + <classpath refid="tests.client.classpath"/> + </taskdef> - <!-- Define the JAX-RPC tools task --> - <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> - <classpath refid="ws.stack.classpath"/> - <classpath refid="thirdparty.classpath"/> - <classpath location="${core.dir}/thirdparty/concurrent.jar"/> - <classpath location="${tests.output.dir}/classes"/> - <classpath location="${tests.output.dir}"/> - </taskdef> + <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="true" fork="false"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + </target> - <!-- Generate JAX-RPC artifacts --> - <mkdir dir="${tests.output.dir}/wstools/java"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> - <move todir="${tests.output.dir}/wstools/java"> - <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> - </move> - <move todir="${tests.output.dir}/wstools/java"> - <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" includes="org/**"/> - </move> - <move todir="${tests.output.dir}/wstools/java"> - <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/> - </move> + <!-- + Generate BPEL sources + --> + <target name="servicegen" depends="tests-compile" description="Generate the BPEL resources."> + <!-- create jbpm process archives --> + <mkdir dir="${tests.output.dir}/libs"/> + <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" /> + </zip> + <!-- Copy the BPEL sar --> + <copy file="${core.dir}/thirdparty/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> - <!-- Copy generated resources --> - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.output.dir}/wstools/resources"> - <include name="**/*.wsdl"/> - <include name="**/*.xml"/> - </fileset> - </copy> - <!-- Copy resources that cannot (yet) be generated --> - <copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/> - <filterset> - <filter token="jboss.bind.address" value="${node0}"/> - </filterset> - </copy> - </target> + <!-- generate wsdl binding and service definitions for bpel processes --> + <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> + <classpath refid="jbpm.bpel.classpath"/> + </taskdef> + <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" + outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" + bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> + </target> - <!-- - Generate JAX-WS sources - --> - <target name="wsprovide" depends="tests-compile" description="Provide the JAX-WS contracts."> + <!-- + Generate JAX-RPC sources + --> + <target name="wstools" depends="tests-compile" description="Generate the JAX-RPC artifacts."> - <!-- Define the JAX-WS wsprovide task --> - <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> - <classpath refid="tests.client.classpath"/> - <classpath location="${tests.output.dir}/classes"/> - <classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/> - </taskdef> + <!-- Define the JAX-RPC tools task --> + <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> + <classpath refid="ws.stack.classpath"/> + <classpath refid="thirdparty.classpath"/> + <classpath location="${core.dir}/thirdparty/concurrent.jar"/> + <classpath location="${tests.output.dir}/classes"/> + <classpath location="${tests.output.dir}"/> + </taskdef> - <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean" verbose="true"/> - <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/> - </target> + <!-- Generate JAX-RPC artifacts --> + <mkdir dir="${tests.output.dir}/wstools/java"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> + <move todir="${tests.output.dir}/wstools/java"> + <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> + </move> + <move todir="${tests.output.dir}/wstools/java"> + <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" includes="org/**"/> + </move> + <move todir="${tests.output.dir}/wstools/java"> + <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/> + </move> - <target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide"> - <macro-compile-classes srcdir="${tests.output.dir}/wstools/java" excludesfile="${excludesfile}"/> - </target> + <!-- Copy generated resources --> + <copy todir="${tests.output.dir}/resources"> + <fileset dir="${tests.output.dir}/wstools/resources"> + <include name="**/*.wsdl"/> + <include name="**/*.xml"/> + </fileset> + </copy> + <!-- Copy resources that cannot (yet) be generated --> + <copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true"> + <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/> + <filterset> + <filter token="jboss.bind.address" value="${node0}"/> + </filterset> + </copy> + </target> - <!-- ================================================================== --> - <!-- Compiling --> - <!-- ================================================================== --> + <!-- + Generate JAX-WS sources + --> + <target name="wsprovide" depends="tests-compile" description="Provide the JAX-WS contracts."> - <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="${core.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${core.dir}/src/test/java" excludesfile="${excludesfile}"/> - </target> + <!-- Define the JAX-WS wsprovide task --> + <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> + <classpath refid="tests.client.classpath"/> + <classpath location="${tests.output.dir}/classes"/> + <classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/> + </taskdef> - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> + <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean" verbose="true"/> + <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/> + </target> - <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${core.dir}/src/test-framework"/> - <macro-copy-resources srcdir="${core.dir}/src/test"/> - </target> + <target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide"> + <macro-compile-classes srcdir="${tests.output.dir}/wstools/java" excludesfile="${excludesfile}"/> + </target> - <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments."> - <ant antfile="${core.dir}/ant-import-tests/build-jars-interop.xml" target="build-jars-interop"/> - <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> - <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="${core.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> - </target> + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> + <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="${core.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${core.dir}/src/test/java" excludesfile="${excludesfile}"/> + </target> + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <!-- Copy resources --> + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <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."> + <ant antfile="${core.dir}/ant-import-tests/build-jars-interop.xml" target="build-jars-interop"/> + <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> + <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="${core.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the deployments."/> + </project> Modified: stack/native/branches/hbraun/native-standalone.iml =================================================================== --- stack/native/branches/hbraun/native-standalone.iml 2008-03-14 11:14:56 UTC (rev 5977) +++ stack/native/branches/hbraun/native-standalone.iml 2008-03-14 11:20:13 UTC (rev 5978) @@ -297,15 +297,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework-scripts.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/concurrent.jar!/" /> </CLASSES> <JAVADOC /> @@ -504,15 +495,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework-src.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-log4j.jar!/" /> </CLASSES> <JAVADOC /> @@ -522,15 +504,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/output/lib/jbossws-standalone.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/output/lib/jboss-jaxws-ext.jar!/" /> </CLASSES> <JAVADOC /> Added: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/EmbeddableWSFRuntime.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/EmbeddableWSFRuntime.java (rev 0) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/EmbeddableWSFRuntime.java 2008-03-14 11:20:13 UTC (rev 5978) @@ -0,0 +1,197 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.stack.jbws.standalone; + +import org.jboss.kernel.Kernel; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.ComposableRuntime; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.WSFRuntime; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspectManager; +import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; +import org.jboss.wsf.spi.invocation.InvocationHandlerFactory; +import org.jboss.wsf.spi.invocation.RequestHandlerFactory; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.transport.TransportManagerFactory; + +import java.net.URL; + +/** + * A WSF runtime that bootstraps through the {@link org.jboss.wsf.spi.SPIProvider}.<br> + * It support JSE endpoints only. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class EmbeddableWSFRuntime implements WSFRuntime, ComposableRuntime +{ + private static final Logger log = Logger.getLogger(EmbeddableWSFRuntime.class); + + private SPIProvider spi; + + private Kernel kernel; + + private DeploymentAspectManager deploymentManager; + + private EndpointRegistry endpointRegistry; + + private RequestHandlerFactory rqhFactory; + + private InvocationHandlerFactory ivhFactory; + + private TransportManagerFactory tmFactory; + + public static URL DEFAULT_CONFIG_URL; + + static + { + ClassLoader cl = org.jboss.wsf.stack.jbws.standalone.EmbeddableWSFRuntime.class.getClassLoader(); + String config = "org/jboss/wsf/stack/jbws/standalone/standalone-config.xml"; + DEFAULT_CONFIG_URL = cl.getResource(config); + if(null== DEFAULT_CONFIG_URL) throw new RuntimeException("Unable to read config: "+config); + + } + + private EmbeddableWSFRuntime(Kernel kernel) + { + this.kernel = kernel; + this.spi = SPIProviderResolver.getInstance().getProvider(); + } + + public static EmbeddableWSFRuntime bootstrap(URL jbosswsBeansXml) throws Exception + { + + log.debug("Bootstrap runtime from microcontainer config"); + + EmbeddedBootstrap bootstrap = new EmbeddedBootstrap(); + bootstrap.run(); + bootstrap.deploy(jbosswsBeansXml); + + Kernel kernel = bootstrap.getKernel(); + EmbeddableWSFRuntime container = new EmbeddableWSFRuntime(kernel); + container.assemble(); + return container; + } + + private void assemble() + { + + log.info("Assembling runtime"); + + // DeploymentAspectManager + setDeploymentAspectManager( + spi.getSPI(DeploymentAspectManagerFactory.class).getDeploymentAspectManager("WSDeploymentAspectManagerJSE") + ); + + // EndpointRegistry + setEndpointRegistry( + spi.getSPI(EndpointRegistryFactory.class).getEndpointRegistry() + ); + + // Transport + setTransportManagerFactory( spi.getSPI(TransportManagerFactory.class) ); + + // Requesthandling + setRequestHandlerFactory( spi.getSPI(RequestHandlerFactory.class)); + + // InvocationHandling + setInvocationHandlerFactory( spi.getSPI(InvocationHandlerFactory.class) ); + } + + // --------------------------------------------------------------------------------- + + public void publish(Deployment deployment) + { + deploymentManager.deploy(deployment, this); + } + + public void remove(Deployment deployment) + { + deploymentManager.undeploy(deployment, this); + } + + // --------------------------------------------------------------------------------- + + + public void setTransportManagerFactory(TransportManagerFactory factory) + { + assert factory!=null; + log.info("Using TransportManagerFactory: " + factory); + this.tmFactory = factory; + } + + public TransportManagerFactory getTransportManagerFactory() + { + return this.tmFactory; + } + + public void setEndpointRegistry(EndpointRegistry endpointRegistry) + { + assert endpointRegistry!=null; + log.info("Using EndpointRegistry: " + endpointRegistry); + this.endpointRegistry = endpointRegistry; + } + + public EndpointRegistry getEndpointRegistry() + { + return this.endpointRegistry; + } + + public void setDeploymentAspectManager(DeploymentAspectManager deploymentManager) + { + assert deploymentManager!=null; + log.info("Using DeploymentAspectManager: " + deploymentManager); + this.deploymentManager = deploymentManager; + } + + public DeploymentAspectManager getDeploymentAspectManager() + { + return this.deploymentManager; + } + + public void setRequestHandlerFactory(RequestHandlerFactory factory) + { + assert factory!=null; + log.info("Using RequestHandlerFactory: "+ factory); + this.rqhFactory = factory; + } + + + public RequestHandlerFactory getRequestHandlerFactory() + { + return this.rqhFactory; + } + + public void setInvocationHandlerFactory(InvocationHandlerFactory factory) + { + assert factory!=null; + log.info("Using InvocationHandlerFactory: "+ factory); + this.ivhFactory = factory; + } + + public InvocationHandlerFactory getInvocationHandlerFactory() + { + return this.ivhFactory; + } +} \ No newline at end of file Property changes on: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/EmbeddableWSFRuntime.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/EmbeddedBootstrap.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/EmbeddedBootstrap.java 2008-03-14 11:14:56 UTC (rev 5977) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/EmbeddedBootstrap.java 2008-03-14 11:20:13 UTC (rev 5978) @@ -23,6 +23,7 @@ import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer; import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; +import org.jboss.logging.Logger; import java.net.URL; @@ -37,6 +38,8 @@ protected BasicXMLDeployer deployer; + private final Logger log = Logger.getLogger(getClass()); + public EmbeddedBootstrap() throws Exception { super(); } @@ -49,6 +52,9 @@ public void deploy(URL url) { try { + + log.info("Deploy MC configuration " + url); + // Workaround the fact that the BasicXMLDeployer does not handle redeployment correctly if (deployer.getDeploymentNames().contains(url.toString())) { System.out.println("Service is already deployed."); @@ -61,6 +67,9 @@ } public void undeploy(URL url) { + + log.info("Undeploy MC config " + url); + if (!deployer.getDeploymentNames().contains(url.toString())) { System.out.println("Service is already undeployed."); return; Deleted: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/StandaloneContainer.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/StandaloneContainer.java 2008-03-14 11:14:56 UTC (rev 5977) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/StandaloneContainer.java 2008-03-14 11:20:13 UTC (rev 5978) @@ -1,89 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.stack.jbws.standalone; - -import org.jboss.kernel.Kernel; -import org.jboss.kernel.spi.dependency.KernelController; -import org.jboss.kernel.spi.registry.KernelBus; -import org.jboss.wsf.spi.Container; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspectManager; -import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; - -import java.net.URL; - -/** - * A JBossWS container that bootstraps through - * the {@link org.jboss.wsf.spi.SPIProvider} - * - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class StandaloneContainer implements Container -{ - private SPIProvider spi; - - private Kernel kernel; - private KernelController controller; - private KernelBus bus; - - private DeploymentAspectManager deploymentManager; - - private StandaloneContainer(Kernel kernel, KernelController controller, KernelBus bus) - { - this.kernel = kernel; - this.controller = controller; - this.bus = bus; - this.spi = SPIProviderResolver.getInstance().getProvider(); - } - - public static StandaloneContainer bootstrap(URL jbosswsBeansXml) throws Exception - { - EmbeddedBootstrap bootstrap = new EmbeddedBootstrap(); - bootstrap.run(); - bootstrap.deploy(jbosswsBeansXml); - - Kernel kernel = bootstrap.getKernel(); - StandaloneContainer container = new StandaloneContainer(kernel, kernel.getController(), kernel.getBus()); - container.assemble(); - return container; - } - - private void assemble() - { - // DeploymentAspectManager - DeploymentAspectManagerFactory daf = spi.getSPI(DeploymentAspectManagerFactory.class); - deploymentManager = daf.getDeploymentAspectManager("WSDeploymentAspectManagerJSE"); - } - - public void publish(Deployment deployment) - { - deploymentManager.deploy(deployment); - } - - public void remove(Deployment deployment) - { - deploymentManager.undeploy(deployment); - } - -} \ No newline at end of file Modified: stack/native/branches/hbraun/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/native/branches/hbraun/src/test/resources/test-excludes-jboss500.txt 2008-03-14 11:14:56 UTC (rev 5977) +++ stack/native/branches/hbraun/src/test/resources/test-excludes-jboss500.txt 2008-03-14 11:20:13 UTC (rev 5978) @@ -21,4 +21,3 @@ # [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.* - Modified: stack/native/branches/hbraun/version.properties =================================================================== --- stack/native/branches/hbraun/version.properties 2008-03-14 11:14:56 UTC (rev 5977) +++ stack/native/branches/hbraun/version.properties 2008-03-14 11:20:13 UTC (rev 5978) @@ -24,9 +24,9 @@ wscommons-policy=1.0 # Dependend integration projects -jbossws-spi=snapshot +jbossws-spi=3.0-snapshot jbossws-common=snapshot -jbossws-framework=snapshot +jbossws-framework=3.0-snapshot jbossws-jboss42=4.2.1.GA # JBossAS-5.0 @@ -59,6 +59,7 @@ jboss-security=4.0.5.GA jboss-vfs=2.0.0.Beta2 jbossas-core-libs=4.2.0.GA +jetty=6.1.8 junit=3.8.1 oswego-concurrent=1.3.4 qdox=1.4