[jbossws-commits] JBossWS SVN: r6451 - in stack/native/trunk: ant-import and 16 other directories.

Author: heiko.braun(a)jboss.com Date: 2008-04-16 05:57:40 -0400 (Wed, 16 Apr 2008) New Revision: 6451 Added: stack/native/trunk/native-3.0.iml stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/JSEInvocationHandlerFactory.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml stack/native/trunk/src/main/resources/jbossws-embedded.jar/ stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/ stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/ stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/ stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldEndpoint.java stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldSEI.java Removed: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/JSEInvocationHandlerFactory.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/ stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/ stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldEndpoint.java stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldSEI.java Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml stack/native/trunk/ant-import/build-prepare-deploy.xml stack/native/trunk/ant-import/build-setup.xml stack/native/trunk/ant-import/build-thirdparty.xml stack/native/trunk/ant-import/jbossws-deploy-macros.xml stack/native/trunk/build.xml stack/native/trunk/src/main/java/javax/xml/ws/RespectBinding.java stack/native/trunk/src/main/java/javax/xml/ws/RespectBindingFeature.java stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java stack/native/trunk/src/main/resources/jbossws-native-config.xml stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java stack/native/trunk/src/test/resources/test-excludes-jboss500.txt stack/native/trunk/version.properties Log: Merge https://svn.jboss.org/repos/jbossws/stack/native/branches/hbraun -r6417 Modified: stack/native/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-prepare-deploy.xml 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/ant-import/build-prepare-deploy.xml 2008-04-16 09:57:40 UTC (rev 6451) @@ -32,6 +32,9 @@ <patternset refid="jbossws.service.lib.patternset"/> <include name="jboss-xml-binding.jar"/> <include name="jbossws-jboss421.jar"/> + <include name="jbossws-jboss42.jar"/> + <include name="jbossws-jboss50.jar"/> + <include name="jbossws-jboss50-container.jar"/> <include name="juddi-service.sar"/> </fileset> <fileset dir="${core.output.lib.dir}"> @@ -49,6 +52,7 @@ <include name="jbossws-native42-beans.xml"/> <include name="jbossws-native50-beans.xml"/> <include name="jbossws-jboss42.sar/**"/> + <include name="jbossws-deployer-beans.xml"/> </fileset> </copy> </target> Modified: stack/native/trunk/ant-import/build-setup.xml =================================================================== --- stack/native/trunk/ant-import/build-setup.xml 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/ant-import/build-setup.xml 2008-04-16 09:57:40 UTC (rev 6451) @@ -12,94 +12,114 @@ <!-- $Id: build-setup.xml 4147 2007-08-03 10:08:11Z thomas.diesler(a)jboss.com $ --> <project> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <!-- Check if ant.properties is available --> - <available property="ant.properties.available" file="${basedir}/ant.properties"/> - <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> - - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.properties"/> - - <property name="jboss421.lib" value="${jboss421.home}/lib"/> - <property name="jboss421.client" value="${jboss421.home}/client"/> - <property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/> - <property name="jboss421.server.lib" value="${jboss421.server}/lib"/> - <property name="jboss421.server.deploy" value="${jboss421.server}/deploy"/> - <property name="jboss422.lib" value="${jboss422.home}/lib"/> - <property name="jboss422.client" value="${jboss422.home}/client"/> - <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> - <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> - <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> - <property name="jboss423.lib" value="${jboss423.home}/lib"/> - <property name="jboss423.client" value="${jboss423.home}/client"/> - <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> - <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> - <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> + <!-- Check if ant.properties is available --> + <available property="ant.properties.available" file="${basedir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> - <property name="jboss500.lib" value="${jboss500.home}/lib"/> - <property name="jboss500.client" value="${jboss500.home}/client"/> - <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> - <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> - <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> - <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - - <property name="jboss501.lib" value="${jboss501.home}/lib"/> - <property name="jboss501.client" value="${jboss501.home}/client"/> - <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> - <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> - <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> - <property name="jboss.server.instance.${jboss.server.instance}" value="true"/> - - <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/> - <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> - <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> - <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> - - <available property="jboss421.available" file="${jboss421.available.file}"/> - <available property="jboss422.available" file="${jboss422.available.file}"/> - <available property="jboss423.available" file="${jboss423.available.file}"/> - <available property="jboss500.available" file="${jboss500.available.file}"/> - <available property="jboss501.available" file="${jboss501.available.file}"/> - - <condition property="jbossws.integration.jboss42" value="true"> - <or> + <property name="jboss421.lib" value="${jboss421.home}/lib"/> + <property name="jboss421.client" value="${jboss421.home}/client"/> + <property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/> + <property name="jboss421.server.lib" value="${jboss421.server}/lib"/> + <property name="jboss421.server.deploy" value="${jboss421.server}/deploy"/> + + <property name="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> + <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> + <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> + + <property name="jboss423.lib" value="${jboss423.home}/lib"/> + <property name="jboss423.client" value="${jboss423.home}/client"/> + <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> + <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> + <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> + + <property name="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + + <property name="jboss501.lib" value="${jboss501.home}/lib"/> + <property name="jboss501.client" value="${jboss501.home}/client"/> + <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> + <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> + <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> + + <property name="jboss.server.instance.${jboss.server.instance}" value="true"/> + + <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/> + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> + <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> + + <available property="jboss421.available" file="${jboss421.available.file}"/> + <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss423.available" file="${jboss423.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss501.available" file="${jboss501.available.file}"/> + + <condition property="jbossws.integration.jboss421" value="true"> <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> + </condition> + + <condition property="jbossws.integration.jboss422" value="true"> <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + </condition> + + <condition property="jbossws.integration.jboss423" value="true"> <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </or> - </condition> - <condition property="jbossws.integration.jboss50" value="true"> - <or> + </condition> + + <condition property="jbossws.integration.jboss500" value="true"> <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + </condition> + + <condition property="jbossws.integration.jboss501" value="true"> <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> + </condition> - <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> - - <!-- JDK Detection --> - <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - - <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="prepare"> - <tstamp> - <format property="build.id" pattern="yyyyMMddHHmm"/> - </tstamp> - </target> - + <condition property="jbossws.integration.jboss42" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + </or> + </condition> + <condition property="jbossws.integration.jboss50" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </or> + </condition> + + <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> + + <!-- JDK Detection --> + <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="prepare"> + <tstamp> + <format property="build.id" pattern="yyyyMMddHHmm"/> + </tstamp> + </target> + </project> Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-16 09:57:40 UTC (rev 6451) @@ -47,7 +47,30 @@ <!-- thirdpartry-get --> - <target name="thirdparty-get" depends="thirdparty-delete" if="force.thirdparty" + + <target name="get422-jars" if="jbossws.integration.jboss422"> + <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> + </target> + + <target name="get423-jars" if="jbossws.integration.jboss423"> + <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> + </target> + + <target name="get501-jars" if="jbossws.integration.jboss501"> + <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-src.zip" dest="${thirdparty.dir}/jbossws-jboss50-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-container.jar" dest="${thirdparty.dir}/jbossws-jboss50-container.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-deployer-resources.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" usetimestamp="true" verbose="true"/> + </target> + + <target name="thirdparty-get" depends="thirdparty-delete, get422-jars, get423-jars, get501-jars" if="force.thirdparty" description="Gets the thirdparty libraries"> <!-- @@ -57,20 +80,16 @@ It is a mistake to switch the download version dependent on the target container, in which case it is random which version is used by the deploy targets. --> - + <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-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.zip" dest="${thirdparty.dir}/jbossws-common-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.zip" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.jar" dest="${thirdparty.dir}/jbossws-framework-src.zip" 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/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss421.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss421-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> - + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.jar" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> @@ -101,14 +120,14 @@ <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}/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"/> - <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-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" 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}/jboss/remoting/${jboss-remoting-jboss42}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-kernel.jar" dest="${thirdparty.dir}/jboss-kernel.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-aop-mc-int.jar" dest="${thirdparty.dir}/jboss-aop-mc-int.jar" usetimestamp="true" verbose="true"/> + + <get src="${jboss.repository}/jboss/jboss-reflect/${jboss-reflect}/lib/jboss-reflect.jar" dest="${thirdparty.dir}/jboss-reflect.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jboss-mdr/${jboss-mdr}/lib/jboss-mdr.jar" dest="${thirdparty.dir}/jboss-mdr.jar" usetimestamp="true" verbose="true"/> + + <get src="${jboss.repository}/jboss/remoting/${jboss-remoting-jboss42}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx.jar" dest="${thirdparty.dir}/jbosssx.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/> @@ -130,6 +149,7 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/tjws/${tjws}/lib/webserver.jar" dest="${thirdparty.dir}/webserver.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> @@ -167,7 +187,7 @@ <pathelement location="${thirdparty.dir}/jboss-javaee.jar"/> <pathelement location="${thirdparty.dir}/jboss-jaxb-intros.jar"/> <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> - <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> + <pathelement location="${thirdparty.dir}/jboss-kernel.jar"/> <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> <pathelement location="${thirdparty.dir}/jbosssx.jar"/> Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-16 09:57:40 UTC (rev 6451) @@ -113,7 +113,7 @@ <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.patternset"/> + <patternset refid="jbossws.lib.patternset"/> </fileset> </copy> </sequential> @@ -135,8 +135,49 @@ </copy> </sequential> </macrodef> - - <!-- ================================================================== --> + + <!-- ================================================================== --> + <!-- Deploy Deployers --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deployers50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-jboss50.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-deployer-beans.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Deploy --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deploy50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-jboss50-container.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> <!-- Deploy Lib Endorsed --> <!-- ================================================================== --> @@ -169,6 +210,19 @@ </copy> </sequential> </macrodef> + + <macrodef name="macro-deploy-jbossws-client42"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-jboss42.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> <!-- ================================================================== --> <!-- Deploy Server Lib --> @@ -186,6 +240,19 @@ </copy> </sequential> </macrodef> + + <macrodef name="macro-deploy-jbossws-server-lib42"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-jboss42.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> <!-- ================================================================== --> <!-- Deploy JBossWS Service --> @@ -265,13 +332,17 @@ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/> </target> <target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-native50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/> Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-04-16 09:57:40 UTC (rev 6451) @@ -32,26 +32,38 @@ <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}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-embedded.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> <path id="tests.extra.classpath"> - <pathelement location="${core.dir}/thirdparty/FastInfoset.jar"/> + + <!-- embedded tests --> + <pathelement location="${core.dir}/thirdparty/jboss-kernel.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-dependency.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-reflect.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-mdr.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-common-core.jar"/> + <pathelement location="${core.dir}/thirdparty/servlet-api.jar"/> + <pathelement location="${core.dir}/thirdparty/webserver.jar"/> + <!-- / embedded tests --> + + <pathelement location="${core.dir}/thirdparty/FastInfoset.jar"/> <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${core.dir}/thirdparty/jettison.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/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"/> + <pathelement location="${core.dir}/thirdparty/wstx.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-jaxb-intros.jar"/> </path> <!-- The jBPM BPEL classpath --> Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/build.xml 2008-04-16 09:57:40 UTC (rev 6451) @@ -117,7 +117,7 @@ <property name="deploy.artifacts.dir" value="${core.output.deploy.dir}-artifacts"/> <property name="deploy.structure.jboss42" value="${core.output.deploy.dir}-jboss42"/> <property name="deploy.structure.jboss50" value="${core.output.deploy.dir}-jboss50"/> - <property name="jbossws.default.deploy.conf" value="${core.dir}/ant-import/jbossws-default-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${core.dir}/ant-import/jbossws-default-deploy.conf"/> <target name="init" depends="prepare,thirdparty"> </target> @@ -162,6 +162,12 @@ <classpath path="${core.output.classes14.dir}"/> <classpath refid="thirdparty.classpath"/> </javac> + + <copy todir="${core.output.classes.dir}"> + <fileset dir="${core.java.dir}"> + <include name="**/*.xml"/> + </fileset> + </copy> </target> <!-- Compile etc files (manifests and such) --> @@ -179,39 +185,62 @@ </copy> </target> - <!-- Compile resource files --> - <target name="compile-resources" depends="init"> - - <!-- Concat jbossws-native50-beans.xml --> - <mkdir dir="${core.output.resources.dir}"/> - <concat destfile="${core.output.resources.dir}/jbossws-native50-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; - </header> - <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> - </concat> - - <!-- Concat jboss-beans.xml --> - <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> - <concat destfile="${core.output.resources.dir}/jbossws-native42-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; - </header> - <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> - <fileset file="${core.output.resources.dir}/jbossws-jboss42-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> - </concat> - - <copy todir="${core.output.resources.dir}"> - <fileset dir="${core.resources.dir}/standard-config"> - <include name="standard-*-config.xml"/> - </fileset> - </copy> + <!--target name="clean-42x-resources"> + <delete dir="${core.output.dir}/resources"/> + <mkdir dir="${core.output.dir}/resources"/> + </target> + + <target name="unzip-jboss422-resources" depends="clean-42x-resources" if="jbossws.integration.jboss422"> + <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss422-resources.zip" overwrite="true"/> + </target> + + <target name="unzip-jboss423-resources" depends="clean-42x-resources" if="jbossws.integration.jboss423"> + <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss422-resources.zip" overwrite="true"/> + </target--> + + <!-- Compile resource files --> + <target name="compile42-resources" if="jbossws.integration.jboss42"> + <mkdir dir="${core.output.resources.dir}"/> + <!-- Concat jboss-beans.xml --> + <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> + <concat destfile="${core.output.resources.dir}/jbossws-native42-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; + </header> + <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> + <fileset file="${core.output.resources.dir}/jbossws-jboss42-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; + </footer> + </concat> + + </target> + + + <target name="compile50-resources" if="jbossws.integration.jboss50"> + <mkdir dir="${core.output.resources.dir}"/> + <unzip src="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" dest="${core.output.resources.dir}"/> + + <!-- Concat jbossws-native50-beans.xml --> + <concat destfile="${core.output.resources.dir}/jbossws-native50-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; + </header> + <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; + </footer> + </concat> + </target> + + <target name="compile-resources" depends="init, compile42-resources, compile50-resources"> + <mkdir dir="${core.output.resources.dir}"/> + <copy todir="${core.output.resources.dir}"> + <fileset dir="${core.resources.dir}/standard-config"> + <include name="standard-*-config.xml"/> + </fileset> + </copy> + </target> <!-- ================================================================== --> @@ -294,8 +323,9 @@ <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/annotation/**"/> - <include name="org/jboss/wsf/stack/jbws/**"/> + <include name="org/jboss/wsf/stack/jbws/*"/> <include name="org/jboss/ws/**"/> + <exclude name="org/jboss/wsf/stack/jbws/embedded/**"/> </fileset> <fileset dir="${core.resources.dir}"> <include name="schema/**"/> @@ -304,11 +334,23 @@ <metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/> </jar> - <!-- Build jbossws-client.jar --> + <!-- Build jbossws-embedded.jar --> + <mkdir dir="${core.output.lib.dir}"/> + <jar jarfile="${core.output.lib.dir}/jbossws-embedded.jar" manifest="${core.output.etc.dir}/default.mf"> + <fileset dir="${core.output.classes.dir}"> + <include name="org/jboss/wsf/stack/jbws/embedded/**"/> + </fileset> + <metainf dir="${core.resources.dir}/jbossws-embedded.jar/META-INF"/> + </jar> + + + <!-- Build jbossws-client.jar --> <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/wsf/**"/> <include name="org/jboss/ws/**"/> + <exclude name="org/jboss/wsf/stack/jbws/embedded/**"/> + <!-- JAX-WS 2.1 extensions --> <include name="javax/xml/ws/**/*21.class"/> <include name="javax/xml/ws/Action.class"/> Copied: stack/native/trunk/native-3.0.iml (from rev 6417, stack/native/branches/hbraun/native-3.0.iml) =================================================================== --- stack/native/trunk/native-3.0.iml (rev 0) +++ stack/native/trunk/native-3.0.iml 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1,543 @@ +<?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-framework/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources/tools" isTestSource="false" packagePrefix="org.jboss.test.ws" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="framework-3.0" /> + <orderEntry type="module" module-name="spi-3.0" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbosssx-client.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/jboss-xml-binding-sources.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/xalan.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-jboss42-resources.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.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/xmlsec.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/xercesImpl.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/commons-logging.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <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/resolver.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-jaxb-intros.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/xml-apis.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/junit.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-vfs.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-j2ee.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxen.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/qdox.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-logging-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/hibernate3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-remoting.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jaxb-impl.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/serializer.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/mail.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/concurrent.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbosssx-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/streambuffer.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/servlet-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/policy.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/stax-api.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-remoting-src.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/log4j.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/jbossws-common-src.zip!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-vfs-sources.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/wsdl4j.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/commons-collections.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/javassist.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbosssx.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$/output/lib/jboss-jaxws-ext.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/output/lib/jboss-saaj.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/output/lib/jboss-jaxrpc.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/output/lib/jbossws-core.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/output/lib/jboss-jaxws.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/output/lib/jbossws-client.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-kernel.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-reflect.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jboss-mdr.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../jbossas/trunk/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../jbossas/trunk/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-structure-spi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Modified: stack/native/trunk/src/main/java/javax/xml/ws/RespectBinding.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/RespectBinding.java 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/main/java/javax/xml/ws/RespectBinding.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -81,7 +81,7 @@ * <code>WebServiceException</code> no sooner than when one of the methods * above is invoked but no later than the first invocation of an endpoint * operation. - * <li>throw a WebServiceException and the endpoint MUST fail to deploy + * <li>throw a WebServiceException and the endpoint MUST fail to start * </ul> * <li> DISABLED: In this Mode, an implementation may choose whether * to inspect the <code>wsdl:binding<code> or not and to what degree Modified: stack/native/trunk/src/main/java/javax/xml/ws/RespectBindingFeature.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/RespectBindingFeature.java 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/main/java/javax/xml/ws/RespectBindingFeature.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -76,7 +76,7 @@ * <code>WebServiceException</code> no sooner than when one of the methods * above is invoked but no later than the first invocation of an endpoint * operation. - * <li>throw a WebServiceException and the endpoint MUST fail to deploy + * <li>throw a WebServiceException and the endpoint MUST fail to start * </ul> * <li> DISABLED: In this Mode, an implementation may choose whether * to inspect the <code>wsdl:binding<code> or not and to what degree Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -96,7 +96,7 @@ throw new IllegalArgumentException("multipart/related content type did not contain a boundary"); try - { + { // [JBWS-1393] - Problem interpreting messages with attachment when confronted with no <start> header if (start == null) boundary = ("--" + boundaryParameter).getBytes("US-ASCII"); @@ -148,6 +148,15 @@ // The root part is either the one pointed to by the start parameter, or // the first occuring part if start is not defined. + + /* + if ( start != null && part.getContentId().startsWith("<")) { + if ( !(start.charAt(0)=='<')) { + start = "<"+start+">"; + } + } + */ + if (rootPart == null && (start == null || start.equals(part.getContentId()))) { if (isValidRootType(part.getContentType()) == false) Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -27,7 +27,7 @@ /** * This assertion deployer actually does nothing when asked to - * deploy a policy assertion. It is used as a placeholder by + * start a policy assertion. It is used as a placeholder by * PolicyDeployer in case no modification to umdm or anything * else is actually required (for example when running the * WSProvideTask tool). Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -50,7 +50,7 @@ /** * A meta data builder for policies; handles checks for policy support - * and their eventual deploy on both server side and client side. + * and their eventual start on both server side and client side. * * @author Alessio Soldano, <mailto:alessio.soldano@javalinux.it> * Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -28,6 +28,7 @@ import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.WSFRuntime; /** * Registers RMInvocationHandler if WS-RM is detected @@ -40,7 +41,7 @@ { @Override - public final void create(Deployment dep) + public final void start(Deployment dep, WSFRuntime runtime) { for (Endpoint ep : dep.getService().getEndpoints()) { @@ -60,7 +61,7 @@ } @Override - public final void destroy(Deployment dep) + public final void destroy(Deployment dep, WSFRuntime runtime) { for (Endpoint ep : dep.getService().getEndpoints()) { Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -26,6 +26,7 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.WSFRuntime; /** * A deployer that initializes the UMDM @@ -36,7 +37,7 @@ public class EagerInitializeDeploymentAspect extends DeploymentAspect { @Override - public void create(Deployment dep) + public void start(Deployment dep, WSFRuntime runtime) { UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -32,6 +32,7 @@ import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.WSFRuntime; /** * A deployer that creates event sources and register them with the @@ -43,7 +44,7 @@ public class EventingDeploymentAspect extends DeploymentAspect { @Override - public void create(Deployment dep) + public void start(Deployment dep, WSFRuntime runtime) { for (Endpoint ep : dep.getService().getEndpoints()) { @@ -72,7 +73,7 @@ } @Override - public void destroy(Deployment dep) + public void destroy(Deployment dep, WSFRuntime runtime) { for (Endpoint ep : dep.getService().getEndpoints()) { Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -29,6 +29,7 @@ import org.jboss.ws.core.jaxws.JAXBBindingCustomization; import org.jboss.wsf.spi.binding.BindingCustomization; import org.jboss.wsf.spi.deployment.*; +import org.jboss.wsf.spi.WSFRuntime; import java.io.IOException; import java.io.InputStream; @@ -43,7 +44,7 @@ private static final String META_INF_JAXB_INTROS_XML = "META-INF/jaxb-intros.xml"; private static final String WEB_INF_JAXB_INTROS_XML = "WEB-INF/jaxb-intros.xml"; - public void create(Deployment deployment) + public void start(Deployment deployment, WSFRuntime runtime) { // assert ArchiveDeployment Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -30,6 +30,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import org.jboss.wsf.spi.WSFRuntime; /** * A deployer that publishes the wsdl @@ -40,7 +41,7 @@ public class PublishContractDeploymentAspect extends DeploymentAspect { @Override - public void create(Deployment dep) + public void start(Deployment dep, WSFRuntime runtime) { UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -29,6 +29,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.WSFRuntime; /** * A deployer that associates the ServiceEndpointInvoker with the endpoint @@ -39,7 +40,7 @@ public class ServiceEndpointInvokerDeploymentAspect extends DeploymentAspect { @Override - public void create(Deployment dep) + public void start(Deployment dep, WSFRuntime runtime) { for (Endpoint ep : dep.getService().getEndpoints()) { Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -35,6 +35,7 @@ import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.WSFRuntime; /** * A deployer that builds the UnifiedDeploymentInfo @@ -45,7 +46,7 @@ public class UnifiedMetaDataDeploymentAspect extends DeploymentAspect { @Override - public void create(Deployment dep) + public void start(Deployment dep, WSFRuntime runtime) { UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) @@ -72,7 +73,7 @@ } else { - throw new IllegalStateException("Invalid type: " + dep.getType()); + throw new IllegalStateException("Invalid deployment type: " + dep.getType()); } dep.addAttachment(UnifiedMetaData.class, umd); Copied: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded (from rev 6417, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded) Deleted: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -1,207 +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.embedded; - -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 = EmbeddableWSFRuntime.class.getClassLoader(); - String config = "org/jboss/wsf/stack/jbws/embedded/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 create(Deployment deployment) - { - deploymentManager.create(deployment, this); - } - - public void start(Deployment deployment) - { - deploymentManager.start(deployment, this); - } - - public void stop(Deployment deployment) - { - deploymentManager.stop(deployment, this); - } - - public void destroy(Deployment deployment) - { - deploymentManager.destroy(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 Copied: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java (from rev 6417, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1,207 @@ +/* + * 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.embedded; + +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 = EmbeddableWSFRuntime.class.getClassLoader(); + String config = "org/jboss/wsf/stack/jbws/embedded/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 create(Deployment deployment) + { + deploymentManager.create(deployment, this); + } + + public void start(Deployment deployment) + { + deploymentManager.start(deployment, this); + } + + public void stop(Deployment deployment) + { + deploymentManager.stop(deployment, this); + } + + public void destroy(Deployment deployment) + { + deploymentManager.destroy(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 Deleted: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -1,90 +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.embedded; - -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; - -/** - * Add a BasicXMLDeployer to the BasicBootstrap so that we can parse - * XML descriptors for the beans (*-beans.xml). - * - * @author <a href="mailto:mark.newton@jboss.org">Mark Newton</a> - */ -public class EmbeddedBootstrap extends BasicBootstrap -{ - - protected BasicXMLDeployer deployer; - - private final Logger log = Logger.getLogger(getClass()); - - public EmbeddedBootstrap() throws Exception { - super(); - } - - public void bootstrap() throws Throwable { - super.bootstrap(); - deployer = new BasicXMLDeployer(getKernel()); - Runtime.getRuntime().addShutdownHook(new Shutdown()); - } - - 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."); - return; - } - deployer.deploy(url); - } catch (Throwable t) { - throw new RuntimeException("Error during deployment: " + url, t); - } - } - - 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; - } - try { - deployer.undeploy(url); - } catch (Throwable t) { - throw new RuntimeException("Error during undeployment: " + url, t); - } - } - - protected class Shutdown extends Thread { - public void run() { - log.info("Shutting down"); - deployer.shutdown(); - } - } -} \ No newline at end of file Copied: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java (from rev 6417, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1,90 @@ +/* + * 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.embedded; + +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; + +/** + * Add a BasicXMLDeployer to the BasicBootstrap so that we can parse + * XML descriptors for the beans (*-beans.xml). + * + * @author <a href="mailto:mark.newton@jboss.org">Mark Newton</a> + */ +public class EmbeddedBootstrap extends BasicBootstrap +{ + + protected BasicXMLDeployer deployer; + + private final Logger log = Logger.getLogger(getClass()); + + public EmbeddedBootstrap() throws Exception { + super(); + } + + public void bootstrap() throws Throwable { + super.bootstrap(); + deployer = new BasicXMLDeployer(getKernel()); + Runtime.getRuntime().addShutdownHook(new Shutdown()); + } + + 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."); + return; + } + deployer.deploy(url); + } catch (Throwable t) { + throw new RuntimeException("Error during deployment: " + url, t); + } + } + + 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; + } + try { + deployer.undeploy(url); + } catch (Throwable t) { + throw new RuntimeException("Error during undeployment: " + url, t); + } + } + + protected class Shutdown extends Thread { + public void run() { + log.info("Shutting down"); + deployer.shutdown(); + } + } +} \ No newline at end of file Deleted: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -1,81 +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.embedded; - -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.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.transport.*; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class HttpEndpointPublishAspect extends DeploymentAspect -{ - - private SPIProvider spi; - private TransportManagerFactory tmf; - private TransportManager<HttpSpec> http; - - public HttpEndpointPublishAspect() - { - spi = SPIProviderResolver.getInstance().getProvider(); - tmf = spi.getSPI(TransportManagerFactory.class); - http = tmf.createTransportManager(Protocol.HTTP); - } - - public void start(Deployment dep, WSFRuntime runtime) - { - String webcontext = dep.getService().getContextRoot(); - assert webcontext!=null; - assert dep.getService().getEndpoints().size()>0; - - for(Endpoint endpoint : dep.getService().getEndpoints()) - { - String urlPattern = endpoint.getURLPattern(); - - HttpSpec spec = new HttpSpec(webcontext, urlPattern); - ListenerRef ref = this.http.createListener(endpoint, spec); - - // Update endpoint address - endpoint.setAddress(ref.getAddress().toString()); - endpoint.addAttachment(ListenerRef.class, ref); - } - } - - public void stop(Deployment dep, WSFRuntime runtime) - { - assert dep.getService().getEndpoints().size()>0; - - for(Endpoint endpoint : dep.getService().getEndpoints()) - { - ListenerRef ref = endpoint.getAttachment(ListenerRef.class); - assert ref!=null; - - this.http.destroyListener(ref); - } - - } -} Copied: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java (from rev 6417, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1,81 @@ +/* + * 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.embedded; + +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.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.transport.*; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class HttpEndpointPublishAspect extends DeploymentAspect +{ + + private SPIProvider spi; + private TransportManagerFactory tmf; + private TransportManager<HttpSpec> http; + + public HttpEndpointPublishAspect() + { + spi = SPIProviderResolver.getInstance().getProvider(); + tmf = spi.getSPI(TransportManagerFactory.class); + http = tmf.createTransportManager(Protocol.HTTP); + } + + public void start(Deployment dep, WSFRuntime runtime) + { + String webcontext = dep.getService().getContextRoot(); + assert webcontext!=null; + assert dep.getService().getEndpoints().size()>0; + + for(Endpoint endpoint : dep.getService().getEndpoints()) + { + String urlPattern = endpoint.getURLPattern(); + + HttpSpec spec = new HttpSpec(webcontext, urlPattern); + ListenerRef ref = this.http.createListener(endpoint, spec); + + // Update endpoint address + endpoint.setAddress(ref.getAddress().toString()); + endpoint.addAttachment(ListenerRef.class, ref); + } + } + + public void stop(Deployment dep, WSFRuntime runtime) + { + assert dep.getService().getEndpoints().size()>0; + + for(Endpoint endpoint : dep.getService().getEndpoints()) + { + ListenerRef ref = endpoint.getAttachment(ListenerRef.class); + assert ref!=null; + + this.http.destroyListener(ref); + } + + } +} Deleted: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -1,112 +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.embedded; - -import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.InvocationContext; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.common.JavaUtils; - -import javax.xml.ws.WebServiceContext; -import java.lang.reflect.Method; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class InvocationHandlerJSE extends InvocationHandler -{ - public InvocationHandlerJSE() - { - } - - public Invocation createInvocation() - { - return new Invocation(); - } - - public void init(Endpoint ep) - { - } - - protected Object getTargetBean(Endpoint ep, Invocation epInv) - { - InvocationContext invCtx = epInv.getInvocationContext(); - Object targetBean = invCtx.getTargetBean(); - if (targetBean == null) - { - try - { - Class epImpl = ep.getTargetBeanClass(); - targetBean = epImpl.newInstance(); - invCtx.setTargetBean(targetBean); - } - catch (Exception ex) - { - throw new IllegalStateException("Cannot get target bean instance", ex); - } - } - return targetBean; - } - - public void invoke(Endpoint ep, Invocation epInv) throws Exception - { - try - { - Object targetBean = getTargetBean(ep, epInv); - - InvocationContext invContext = epInv.getInvocationContext(); - WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class); - if (wsContext != null) - { - // TODO: ResourceInjection not supported - } - - Method method = getImplMethod(targetBean.getClass(), epInv.getJavaMethod()); - Object retObj = method.invoke(targetBean, epInv.getArgs()); - epInv.setReturnValue(retObj); - } - catch (Exception e) - { - handleInvocationException(e); - } - } - - protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException - { - String methodName = seiMethod.getName(); - Class[] paramTypes = seiMethod.getParameterTypes(); - for (int i = 0; i < paramTypes.length; i++) - { - Class paramType = paramTypes[i]; - if (JavaUtils.isPrimitive(paramType) == false) - { - String paramTypeName = paramType.getName(); - paramType = JavaUtils.loadJavaType(paramTypeName); - paramTypes[i] = paramType; - } - } - - Method implMethod = implClass.getMethod(methodName, paramTypes); - return implMethod; - } -} \ No newline at end of file Copied: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java (from rev 6417, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1,112 @@ +/* + * 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.embedded; + +import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.Invocation; +import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.common.JavaUtils; + +import javax.xml.ws.WebServiceContext; +import java.lang.reflect.Method; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class InvocationHandlerJSE extends InvocationHandler +{ + public InvocationHandlerJSE() + { + } + + public Invocation createInvocation() + { + return new Invocation(); + } + + public void init(Endpoint ep) + { + } + + protected Object getTargetBean(Endpoint ep, Invocation epInv) + { + InvocationContext invCtx = epInv.getInvocationContext(); + Object targetBean = invCtx.getTargetBean(); + if (targetBean == null) + { + try + { + Class epImpl = ep.getTargetBeanClass(); + targetBean = epImpl.newInstance(); + invCtx.setTargetBean(targetBean); + } + catch (Exception ex) + { + throw new IllegalStateException("Cannot get target bean instance", ex); + } + } + return targetBean; + } + + public void invoke(Endpoint ep, Invocation epInv) throws Exception + { + try + { + Object targetBean = getTargetBean(ep, epInv); + + InvocationContext invContext = epInv.getInvocationContext(); + WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class); + if (wsContext != null) + { + // TODO: ResourceInjection not supported + } + + Method method = getImplMethod(targetBean.getClass(), epInv.getJavaMethod()); + Object retObj = method.invoke(targetBean, epInv.getArgs()); + epInv.setReturnValue(retObj); + } + catch (Exception e) + { + handleInvocationException(e); + } + } + + protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException + { + String methodName = seiMethod.getName(); + Class[] paramTypes = seiMethod.getParameterTypes(); + for (int i = 0; i < paramTypes.length; i++) + { + Class paramType = paramTypes[i]; + if (JavaUtils.isPrimitive(paramType) == false) + { + String paramTypeName = paramType.getName(); + paramType = JavaUtils.loadJavaType(paramTypeName); + paramTypes[i] = paramType; + } + } + + Method implMethod = implClass.getMethod(methodName, paramTypes); + return implMethod; + } +} \ No newline at end of file Deleted: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/JSEInvocationHandlerFactory.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/JSEInvocationHandlerFactory.java 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/JSEInvocationHandlerFactory.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -1,51 +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.embedded; - -import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.spi.invocation.InvocationHandlerFactory; -import org.jboss.wsf.spi.invocation.InvocationType; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class JSEInvocationHandlerFactory extends InvocationHandlerFactory -{ - public InvocationHandler newInvocationHandler(InvocationType type) - { - InvocationHandler handler = null; - - switch(type) - { - case JAXWS_JSE: - handler = new InvocationHandlerJSE(); - break; - } - - if(null == handler) - throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); - - return handler; - } - -} - Copied: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/JSEInvocationHandlerFactory.java (from rev 6417, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/JSEInvocationHandlerFactory.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/JSEInvocationHandlerFactory.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/JSEInvocationHandlerFactory.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1,51 @@ +/* + * 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.embedded; + +import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.InvocationHandlerFactory; +import org.jboss.wsf.spi.invocation.InvocationType; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class JSEInvocationHandlerFactory extends InvocationHandlerFactory +{ + public InvocationHandler newInvocationHandler(InvocationType type) + { + InvocationHandler handler = null; + + switch(type) + { + case JAXWS_JSE: + handler = new InvocationHandlerJSE(); + break; + } + + if(null == handler) + throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type); + + return handler; + } + +} + Deleted: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -1,61 +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.embedded; - -import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; -import org.jboss.wsf.spi.invocation.InvocationType; -import org.jboss.wsf.spi.invocation.WebServiceContextFactory; - -import javax.xml.ws.handler.MessageContext; -import java.security.Principal; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class NoopWebServiceContextFactory extends WebServiceContextFactory -{ - final static ExtensibleWebServiceContext NOOP_CONTEXT = new NoopWebServiceContext(null); - - public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext) - { - return NOOP_CONTEXT; - } - - static class NoopWebServiceContext extends ExtensibleWebServiceContext - { - - public NoopWebServiceContext(MessageContext messageContext) - { - super(messageContext); - } - - public Principal getUserPrincipal() - { - throw new RuntimeException("Noop"); - } - - public boolean isUserInRole(String role) - { - throw new RuntimeException("Noop"); - } - } -} Copied: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java (from rev 6417, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1,61 @@ +/* + * 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.embedded; + +import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; +import org.jboss.wsf.spi.invocation.InvocationType; +import org.jboss.wsf.spi.invocation.WebServiceContextFactory; + +import javax.xml.ws.handler.MessageContext; +import java.security.Principal; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class NoopWebServiceContextFactory extends WebServiceContextFactory +{ + final static ExtensibleWebServiceContext NOOP_CONTEXT = new NoopWebServiceContext(null); + + public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext) + { + return NOOP_CONTEXT; + } + + static class NoopWebServiceContext extends ExtensibleWebServiceContext + { + + public NoopWebServiceContext(MessageContext messageContext) + { + super(messageContext); + } + + public Principal getUserPrincipal() + { + throw new RuntimeException("Noop"); + } + + public boolean isUserInRole(String role) + { + throw new RuntimeException("Noop"); + } + } +} Deleted: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -1,94 +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.embedded; - -import org.jboss.wsf.spi.management.ServerConfig; - -import java.io.File; -import java.net.UnknownHostException; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class StandaloneServerConfig implements ServerConfig -{ - - public String getImplementationTitle() - { - return "JBossWS Standalone"; - } - - public String getImplementationVersion() - { - return "3.0.0"; - } - - public File getServerTempDir() - { - return new File("/tmp"); // TODO: change to default - } - - public File getServerDataDir() - { - return new File("/tmp"); //To change body of implemented methods use File | Settings | File Templates. - } - - public String getWebServiceHost() - { - return "localhost"; //To change body of implemented methods use File | Settings | File Templates. - } - - public void setWebServiceHost(String host) throws UnknownHostException - { - //To change body of implemented methods use File | Settings | File Templates. - } - - public int getWebServicePort() - { - return 20000; // introduce constant - } - - public void setWebServicePort(int port) - { - //To change body of implemented methods use File | Settings | File Templates. - } - - public int getWebServiceSecurePort() - { - return 20001; // TODO: constant - } - - public void setWebServiceSecurePort(int port) - { - //To change body of implemented methods use File | Settings | File Templates. - } - - public boolean isModifySOAPAddress() - { - return true; - } - - public void setModifySOAPAddress(boolean flag) - { - - } -} Copied: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java (from rev 6417, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1,94 @@ +/* + * 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.embedded; + +import org.jboss.wsf.spi.management.ServerConfig; + +import java.io.File; +import java.net.UnknownHostException; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class StandaloneServerConfig implements ServerConfig +{ + + public String getImplementationTitle() + { + return "JBossWS Standalone"; + } + + public String getImplementationVersion() + { + return "3.0.0"; + } + + public File getServerTempDir() + { + return new File("/tmp"); // TODO: change to default + } + + public File getServerDataDir() + { + return new File("/tmp"); //To change body of implemented methods use File | Settings | File Templates. + } + + public String getWebServiceHost() + { + return "localhost"; //To change body of implemented methods use File | Settings | File Templates. + } + + public void setWebServiceHost(String host) throws UnknownHostException + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public int getWebServicePort() + { + return 20000; // introduce constant + } + + public void setWebServicePort(int port) + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public int getWebServiceSecurePort() + { + return 20001; // TODO: constant + } + + public void setWebServiceSecurePort(int port) + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public boolean isModifySOAPAddress() + { + return true; + } + + public void setModifySOAPAddress(boolean flag) + { + + } +} Deleted: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml 2008-04-16 09:57:40 UTC (rev 6451) @@ -1,132 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" - xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- - ====================================================================== - SPI Implementations - ====================================================================== - --> - - <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> - </bean> - - <bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.embedded.StandaloneServerConfig"> - <property name="webServiceHost">localhost</property> - <property name="modifySOAPAddress">true</property> - </bean> - - <!-- The registry for web service endpoints --> - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.DefaultEndpointRegistry"/> - - <!-- - ====================================================================== - Standalone DeploymentAspectManager - ====================================================================== - --> - - <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSDeploymentAspectManagerJSE</property> - </bean> - - <!-- - ====================================================================== - Container deployment aspects - ====================================================================== - --> - - <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> - <property name="requires">LAST_DEPLOYMENT_ASPECT</property> - </bean> - - <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> - <property name="provides">RegisteredEndpoint</property> - </bean> - - <bean name="WSHttpTransportDeploymentAspect" class="org.jboss.wsf.stack.jbws.embedded.HttpEndpointPublishAspect"> - <property name="requires">RegisteredEndpoint</property> - <property name="provides">HttpTransport</property> - </bean> - - <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> - <property name="sortAspectsOnCreate">false</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSEndpointLifecycleDeploymentAspect"/> - </set> - </property> - </bean> - - <!-- - ============================================================================== - Stack deployment aspects - ============================================================================== - --> - - <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - <property name="provides">InitializedMetaDataModel</property> - </bean> - - <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <!--property name="requires">ContainerEndpointHandler, ContainerMetaData</property--> - <property name="provides">StackEndpointHandler</property> - </bean> - - <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - <property name="provides">PublishedContract</property> - </bean> - - <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect"> - <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> - <property name="provides">UnifiedMetaDataModel</property> - </bean> - - <!-- Deployment aspect installer --> - - <bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> - <inject bean="WSNativeEventingDeploymentAspect"/> - <inject bean="WSNativePublishContractDeploymentAspect"/> - <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> - <inject bean="WSNativeRMDeploymentAspect"/> - <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> - <inject bean="WSNativeEagerInitializeDeploymentAspect"/> - <inject bean="WSHttpTransportDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectManagerJSE</depends> - </bean> - - <!-- - ============================================================================== - Stack specific beans (not SPI) - ============================================================================== - --> - - <!-- A subscription manager for WS-Eventing --> - <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"> - <property name="bindAddress">localhost</property> - </bean> - -</deployment> \ No newline at end of file Copied: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml (from rev 6417, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1,132 @@ +<?xml version="1.0" encoding="UTF-8"?> +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" + xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + ====================================================================== + SPI Implementations + ====================================================================== + --> + + <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + + <bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.embedded.StandaloneServerConfig"> + <property name="webServiceHost">localhost</property> + <property name="modifySOAPAddress">true</property> + </bean> + + <!-- The registry for web service endpoints --> + <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.DefaultEndpointRegistry"/> + + <!-- + ====================================================================== + Standalone DeploymentAspectManager + ====================================================================== + --> + + <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerJSE</property> + </bean> + + <!-- + ====================================================================== + Container deployment aspects + ====================================================================== + --> + + <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> + <property name="requires">LAST_DEPLOYMENT_ASPECT</property> + </bean> + + <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> + <property name="provides">RegisteredEndpoint</property> + </bean> + + <bean name="WSHttpTransportDeploymentAspect" class="org.jboss.wsf.stack.jbws.embedded.HttpEndpointPublishAspect"> + <property name="requires">RegisteredEndpoint</property> + <property name="provides">HttpTransport</property> + </bean> + + <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + </set> + </property> + </bean> + + <!-- + ============================================================================== + Stack deployment aspects + ============================================================================== + --> + + <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + <property name="provides">InitializedMetaDataModel</property> + </bean> + + <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <!--property name="requires">ContainerEndpointHandler, ContainerMetaData</property--> + <property name="provides">StackEndpointHandler</property> + </bean> + + <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + </bean> + + <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + <property name="provides">PublishedContract</property> + </bean> + + <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + </bean> + + <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect"> + <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property> + </bean> + + <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> + <property name="provides">UnifiedMetaDataModel</property> + </bean> + + <!-- Deployment aspect installer --> + + <bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> + <inject bean="WSNativeEventingDeploymentAspect"/> + <inject bean="WSNativePublishContractDeploymentAspect"/> + <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeRMDeploymentAspect"/> + <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + <inject bean="WSNativeEagerInitializeDeploymentAspect"/> + <inject bean="WSHttpTransportDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectManagerJSE</depends> + </bean> + + <!-- + ============================================================================== + Stack specific beans (not SPI) + ============================================================================== + --> + + <!-- A subscription manager for WS-Eventing --> + <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"> + <property name="bindAddress">localhost</property> + </bean> + +</deployment> \ No newline at end of file Copied: stack/native/trunk/src/main/resources/jbossws-embedded.jar (from rev 6417, stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar) Copied: stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF (from rev 6417, stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF) Copied: stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services (from rev 6417, stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services) Deleted: stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory =================================================================== --- stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2008-04-16 09:57:40 UTC (rev 6451) @@ -1 +0,0 @@ -org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory \ No newline at end of file Copied: stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (from rev 6417, stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory) =================================================================== --- stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1 @@ +org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory \ No newline at end of file Deleted: stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory =================================================================== --- stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2008-04-16 09:57:40 UTC (rev 6451) @@ -1 +0,0 @@ -org.jboss.wsf.stack.jbws.embedded.JSEInvocationHandlerFactory \ No newline at end of file Copied: stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (from rev 6417, stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory) =================================================================== --- stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1 @@ +org.jboss.wsf.stack.jbws.embedded.JSEInvocationHandlerFactory \ No newline at end of file Deleted: stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory =================================================================== --- stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2008-04-16 09:57:40 UTC (rev 6451) @@ -1 +0,0 @@ -org.jboss.wsf.stack.jbws.embedded.NoopWebServiceContextFactory \ No newline at end of file Copied: stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (from rev 6417, stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory) =================================================================== --- stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1 @@ +org.jboss.wsf.stack.jbws.embedded.NoopWebServiceContextFactory \ No newline at end of file Deleted: stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory =================================================================== --- stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2008-04-16 09:57:40 UTC (rev 6451) @@ -1 +0,0 @@ -org.jboss.wsf.framework.management.ServerConfigFactoryImpl \ No newline at end of file Copied: stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (from rev 6417, stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory) =================================================================== --- stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1 @@ +org.jboss.wsf.framework.management.ServerConfigFactoryImpl \ No newline at end of file Modified: stack/native/trunk/src/main/resources/jbossws-native-config.xml =================================================================== --- stack/native/trunk/src/main/resources/jbossws-native-config.xml 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/main/resources/jbossws-native-config.xml 2008-04-16 09:57:40 UTC (rev 6451) @@ -1,176 +1,171 @@ - <!-- An abstraction of server configuration aspects. --> - <bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.NativeServerConfig"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - - <!-- - The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> - element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. - - If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true. - If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. - - If 'webServiceHost' is not set, JBossWS uses requesters protocol host when rewriting the <soap:address>. - --> - <property name="webServiceHost">${jboss.bind.address}</property> - <property name="modifySOAPAddress">true</property> - - <!-- - Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. - Otherwise the ports will be identified by querying the list of installed connectors. - If multiple connectors are found the port of the first connector is used. - <property name="webServiceSecurePort">8443</property> - <property name="webServicePort">8080</property> - --> - </bean> +<!-- An abstraction of server configuration aspects. --> +<bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.NativeServerConfig"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - <!-- The registry for web service endpoints --> - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> - + <!-- + The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> + element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. + + If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true. + If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. + + If 'webServiceHost' is not set, JBossWS uses requesters protocol host when rewriting the <soap:address>. + --> + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="modifySOAPAddress">true</property> + + <!-- + Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. + Otherwise the ports will be identified by querying the list of installed connectors. + If multiple connectors are found the port of the first connector is used. + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> + --> +</bean> + <!-- A subscription manager for WS-Eventing --> - <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"> - <property name="bindAddress">${jboss.bind.address}</property> - </bean> - +<bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"> + <property name="bindAddress">${jboss.bind.address}</property> +</bean> + <!-- Installed Record Processors--> - <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder"> - <property name="recording">false</property> - </bean> - <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder"> - <property name="recording">false</property> - </bean> - - <!-- +<bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder"> + <property name="recording">false</property> +</bean> + +<bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder"> + <property name="recording">false</property> +</bean> + + <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl"/> + + <!-- + ********************************************************************************************************************* The stack specific deployment aspects - --> - <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties, StackDescriptor</property> - <property name="contextProperties"> + --> +<bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> + <property name="provides">ContextProperties, StackDescriptor</property> + <property name="contextProperties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry> + <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry> </map> - </property> - </bean> - - <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - <property name="provides">InitializedMetaDataModel</property> - </bean> - - <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerEndpointHandler, ContainerMetaData</property> - <property name="provides">StackEndpointHandler</property> - </bean> - - <bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - <property name="requires">RegisteredEndpoint</property> - <property name="provides">EndpointRecordProcessors</property> - <property name="processors"> + </property> +</bean> + +<bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + <property name="provides">InitializedMetaDataModel</property> +</bean> + +<bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerEndpointHandler, ContainerMetaData</property> + <property name="provides">StackEndpointHandler</property> +</bean> + +<bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + <property name="requires">RegisteredEndpoint</property> + <property name="provides">EndpointRecordProcessors</property> + <property name="processors"> <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor"> - <inject bean="WSMemoryBufferRecorder"/> - <inject bean="WSLogRecorder"/> + <inject bean="WSMemoryBufferRecorder"/> + <inject bean="WSLogRecorder"/> </list> - </property> - </bean> - - <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel, JAXBIntros</property> - <property name="provides">PublishedContract</property> - </bean> - - <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect"> - <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> - <property name="requires">RuntimeLoader, ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property> - <property name="provides">UnifiedMetaDataModel</property> - </bean> + </property> +</bean> - <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect"> - <property name="provides">JAXBIntros</property> - </bean> +<bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> +</bean> - <!-- Deployment aspect installers --> - <!-- Phase 1 --> - <bean name="WSNativeDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> +<bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel, JAXBIntros</property> + <property name="provides">PublishedContract</property> +</bean> + +<bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> +</bean> + +<bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect"> + <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property> +</bean> + +<bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> + <property name="requires">RuntimeLoader, ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property> + <property name="provides">UnifiedMetaDataModel</property> +</bean> + +<bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect"> + <property name="provides">JAXBIntros</property> +</bean> + + <!-- + ********************************************************************************************************************* + Deployment aspect installers + --> + +<bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSNativeContextPropertiesDeploymentAspect"/> + <!-- phase 1--> + <inject bean="WSNativeContextPropertiesDeploymentAspect"/> + + <!-- phase 2 --> + <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> + <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> + <inject bean="WSNativeEventingDeploymentAspect"/> + <inject bean="WSNativePublishContractDeploymentAspect"/> + <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeRMDeploymentAspect"/> + <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + <inject bean="WSNativeEagerInitializeDeploymentAspect"/> + <inject bean="WSJAXBIntroDeploymentAspect"/> </set> - </property> - <depends>WSDeploymentAspectInstallerPreJSE</depends> - </bean> - <!-- Phase 2 --> - <bean name="WSNativeDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> - <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSNativeEventingDeploymentAspect"/> - <inject bean="WSNativePublishContractDeploymentAspect"/> - <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> - <inject bean="WSNativeRMDeploymentAspect"/> - <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> - <inject bean="WSNativeEagerInitializeDeploymentAspect"/> - <inject bean="WSJAXBIntroDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerPostJSE</depends> - </bean> + </property> + <depends>WSDeploymentAspectInstallerJSE</depends> +</bean> - <bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> +<bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSNativeContextPropertiesDeploymentAspect"/> - <inject bean="WSNativeEagerInitializeDeploymentAspect"/> - <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> - <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSNativeEventingDeploymentAspect"/> - <inject bean="WSNativePublishContractDeploymentAspect"/> - <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> - <inject bean="WSNativeRMDeploymentAspect"/> - <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> - <inject bean="WSJAXBIntroDeploymentAspect"/> + <inject bean="WSNativeContextPropertiesDeploymentAspect"/> + <inject bean="WSNativeEagerInitializeDeploymentAspect"/> + <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> + <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> + <inject bean="WSNativeEventingDeploymentAspect"/> + <inject bean="WSNativePublishContractDeploymentAspect"/> + <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeRMDeploymentAspect"/> + <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + <inject bean="WSJAXBIntroDeploymentAspect"/> </set> - </property> - <depends>WSDeploymentAspectInstallerEJB</depends> - </bean> - - <bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> + </property> + <depends>WSDeploymentAspectInstallerEJB</depends> +</bean> + +<bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSNativeContextPropertiesDeploymentAspect"/> - <inject bean="WSNativeEagerInitializeDeploymentAspect"/> - <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> - <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSNativeEventingDeploymentAspect"/> - <inject bean="WSNativePublishContractDeploymentAspect"/> - <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> - <inject bean="WSNativeRMDeploymentAspect"/> - <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> - <inject bean="WSJAXBIntroDeploymentAspect"/> + <inject bean="WSNativeContextPropertiesDeploymentAspect"/> + <inject bean="WSNativeEagerInitializeDeploymentAspect"/> + <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> + <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> + <inject bean="WSNativeEventingDeploymentAspect"/> + <inject bean="WSNativePublishContractDeploymentAspect"/> + <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeRMDeploymentAspect"/> + <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + <inject bean="WSJAXBIntroDeploymentAspect"/> </set> - </property> - <depends>WSDeploymentAspectInstallerEndpointAPI</depends> - </bean> + </property> + <depends>WSDeploymentAspectInstallerEndpointAPI</depends> +</bean> Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/embedded (from rev 6417, stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded) Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java =================================================================== --- stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -1,70 +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.test.ws.embedded; - -import org.jboss.wsf.stack.jbws.embedded.EmbeddedBootstrap; -import org.jboss.wsf.stack.jbws.embedded.EmbeddableWSFRuntime; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.spi.dependency.KernelController; -import org.jboss.dependency.spi.ControllerContext; - -import java.net.URL; - -import junit.framework.TestCase; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class BootstrapTestCase extends TestCase -{ - private URL standaloneConfig; - - protected void setUp() throws Exception - { - /*ClassLoader cl = EmbeddableWSFRuntime.class.getClassLoader(); - String config = "org/jboss/wsf/stack/jbws/embedded/standalone-config.xml"; - standaloneConfig = cl.getResource(config); - if(null==standaloneConfig) - throw new RuntimeException("Unable to read config: "+config); - */ - } - - /** - * Check if the bootstrap in setup() works correctly - * @throws Exception - */ - public void testBootStrap() throws Exception - { - EmbeddedBootstrap bootstrap = new EmbeddedBootstrap(); - bootstrap.run(); - bootstrap.deploy(EmbeddableWSFRuntime.DEFAULT_CONFIG_URL); - - Kernel kernel = bootstrap.getKernel(); - KernelController controller = kernel.getController(); - - String beanName = "WSNativeDeploymentAspectInstallerJSE"; - ControllerContext context = controller.getInstalledContext(beanName); - assertNotNull("Unable to retrieve "+beanName, context); - - System.out.println("WSDeploymentAspectManagerJSE: " + context.getTarget()); - } -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java (from rev 6417, stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1,70 @@ +/* + * 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.test.ws.embedded; + +import org.jboss.wsf.stack.jbws.embedded.EmbeddedBootstrap; +import org.jboss.wsf.stack.jbws.embedded.EmbeddableWSFRuntime; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.spi.dependency.KernelController; +import org.jboss.dependency.spi.ControllerContext; + +import java.net.URL; + +import junit.framework.TestCase; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class BootstrapTestCase extends TestCase +{ + private URL standaloneConfig; + + protected void setUp() throws Exception + { + /*ClassLoader cl = EmbeddableWSFRuntime.class.getClassLoader(); + String config = "org/jboss/wsf/stack/jbws/embedded/standalone-config.xml"; + standaloneConfig = cl.getResource(config); + if(null==standaloneConfig) + throw new RuntimeException("Unable to read config: "+config); + */ + } + + /** + * Check if the bootstrap in setup() works correctly + * @throws Exception + */ + public void testBootStrap() throws Exception + { + EmbeddedBootstrap bootstrap = new EmbeddedBootstrap(); + bootstrap.run(); + bootstrap.deploy(EmbeddableWSFRuntime.DEFAULT_CONFIG_URL); + + Kernel kernel = bootstrap.getKernel(); + KernelController controller = kernel.getController(); + + String beanName = "WSNativeDeploymentAspectInstallerJSE"; + ControllerContext context = controller.getInstalledContext(beanName); + assertNotNull("Unable to retrieve "+beanName, context); + + System.out.println("WSDeploymentAspectManagerJSE: " + context.getTarget()); + } +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java =================================================================== --- stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -1,135 +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.test.ws.embedded; - -import junit.framework.TestCase; -import org.jboss.wsf.common.ResourceLoaderAdapter; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentModelFactory; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.stack.jbws.embedded.EmbeddableWSFRuntime; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public class EmbeddedTestCase extends TestCase -{ - - /** - * During instantation the the standalone container - * goes through the SPIProvider to get all required {@link org.jboss.wsf.spi.SPIView}'s - * to properly staff itself. - * However this requires a successfully bootstrapped container. - * @throws Exception - */ - public void testEmbeddedContainer() throws Exception - { - SPIProvider spi = SPIProviderResolver.getInstance().getProvider(); - DeploymentModelFactory modelFactory = spi.getSPI(DeploymentModelFactory.class); - - // Deployment - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - Deployment dep = modelFactory.newDeployment("HelloWorldDeployment", contextClassLoader); - dep.setRuntimeClassLoader(contextClassLoader); - - // TODO: Hack, should this become another DeploymentAspect? - ((ArchiveDeployment)dep).setRootFile(new ResourceLoaderAdapter()); - - dep.setType(Deployment.DeploymentType.JAXWS_JSE); - dep.setService(modelFactory.newService()); - - // Service - dep.getService().setContextRoot("/hello"); - - // Endpoint - Endpoint endpoint = modelFactory.newEndpoint("org.jboss.test.ws.embedded.HelloWorldEndpoint"); - endpoint.setShortName("hello"); - endpoint.setURLPattern("/endpoint"); - dep.getService().addEndpoint(endpoint); - - // Publish - EmbeddableWSFRuntime container = EmbeddableWSFRuntime.bootstrap( EmbeddableWSFRuntime.DEFAULT_CONFIG_URL); - container.create(dep); - container.start(dep); - - // Invoke it - String wsdl = GETRequest("/hello/endpoint?wsdl"); - assertNotNull("Unable to retrieve WSDL", wsdl); - - Service service = Service.create( - new URL("http://localhost:20000/hello/endpoint?wsdl"), - new QName("http://embedded.ws.test.jboss.org/";, "HelloWorldEndpointService") - ); - - HelloWorldSEI port = service.getPort(HelloWorldSEI.class); - String response = port.hello("StandaloneContainer"); - assertEquals("Hello StandaloneContainer", response); - - // Remove - container.stop(dep); - container.destroy(dep); - try - { - wsdl = GETRequest("/hello/endpoint?wsdl"); - } catch (IOException e) - { - // - } - - // The root context accepts the request - assertEquals("JBossWS HttpDeamon", wsdl); - } - - public static String GETRequest(String context) - throws IOException - { - if(context.startsWith("/")) - context = context.substring(1); - - URLConnection con = new URL("http://localhost:20000/"+context).openConnection(); - con.connect(); - - BufferedReader in = new BufferedReader( - new InputStreamReader( - con.getInputStream() - ) - ); - - String inputLine; - StringBuffer sb = new StringBuffer(); - while ((inputLine = in.readLine()) != null) - sb.append(inputLine); - in.close(); - return sb.toString(); - } -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java (from rev 6417, stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1,135 @@ +/* + * 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.test.ws.embedded; + +import junit.framework.TestCase; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentModelFactory; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.stack.jbws.embedded.EmbeddableWSFRuntime; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; +import java.net.URLConnection; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class EmbeddedTestCase extends TestCase +{ + + /** + * During instantation the the standalone container + * goes through the SPIProvider to get all required {@link org.jboss.wsf.spi.SPIView}'s + * to properly staff itself. + * However this requires a successfully bootstrapped container. + * @throws Exception + */ + public void testEmbeddedContainer() throws Exception + { + SPIProvider spi = SPIProviderResolver.getInstance().getProvider(); + DeploymentModelFactory modelFactory = spi.getSPI(DeploymentModelFactory.class); + + // Deployment + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + Deployment dep = modelFactory.newDeployment("HelloWorldDeployment", contextClassLoader); + dep.setRuntimeClassLoader(contextClassLoader); + + // TODO: Hack, should this become another DeploymentAspect? + ((ArchiveDeployment)dep).setRootFile(new ResourceLoaderAdapter()); + + dep.setType(Deployment.DeploymentType.JAXWS_JSE); + dep.setService(modelFactory.newService()); + + // Service + dep.getService().setContextRoot("/hello"); + + // Endpoint + Endpoint endpoint = modelFactory.newEndpoint("org.jboss.test.ws.embedded.HelloWorldEndpoint"); + endpoint.setShortName("hello"); + endpoint.setURLPattern("/endpoint"); + dep.getService().addEndpoint(endpoint); + + // Publish + EmbeddableWSFRuntime container = EmbeddableWSFRuntime.bootstrap( EmbeddableWSFRuntime.DEFAULT_CONFIG_URL); + container.create(dep); + container.start(dep); + + // Invoke it + String wsdl = GETRequest("/hello/endpoint?wsdl"); + assertNotNull("Unable to retrieve WSDL", wsdl); + + Service service = Service.create( + new URL("http://localhost:20000/hello/endpoint?wsdl"), + new QName("http://embedded.ws.test.jboss.org/";, "HelloWorldEndpointService") + ); + + HelloWorldSEI port = service.getPort(HelloWorldSEI.class); + String response = port.hello("StandaloneContainer"); + assertEquals("Hello StandaloneContainer", response); + + // Remove + container.stop(dep); + container.destroy(dep); + try + { + wsdl = GETRequest("/hello/endpoint?wsdl"); + } catch (IOException e) + { + // + } + + // The root context accepts the request + assertEquals("JBossWS HttpDeamon", wsdl); + } + + public static String GETRequest(String context) + throws IOException + { + if(context.startsWith("/")) + context = context.substring(1); + + URLConnection con = new URL("http://localhost:20000/"+context).openConnection(); + con.connect(); + + BufferedReader in = new BufferedReader( + new InputStreamReader( + con.getInputStream() + ) + ); + + String inputLine; + StringBuffer sb = new StringBuffer(); + while ((inputLine = in.readLine()) != null) + sb.append(inputLine); + in.close(); + return sb.toString(); + } +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldEndpoint.java =================================================================== --- stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/HelloWorldEndpoint.java 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldEndpoint.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -1,38 +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.test.ws.embedded; - -import javax.jws.WebService; -import javax.jws.WebMethod; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -@WebService -public class HelloWorldEndpoint implements HelloWorldSEI -{ - @WebMethod - public String hello(String name) - { - return "Hello " + name; - } -} \ No newline at end of file Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldEndpoint.java (from rev 6417, stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/HelloWorldEndpoint.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldEndpoint.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldEndpoint.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1,38 @@ +/* + * 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.test.ws.embedded; + +import javax.jws.WebService; +import javax.jws.WebMethod; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +@WebService +public class HelloWorldEndpoint implements HelloWorldSEI +{ + @WebMethod + public String hello(String name) + { + return "Hello " + name; + } +} \ No newline at end of file Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldSEI.java =================================================================== --- stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/HelloWorldSEI.java 2008-04-14 13:04:11 UTC (rev 6417) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldSEI.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -1,33 +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.test.ws.embedded; - -import javax.jws.WebService; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -@WebService -public interface HelloWorldSEI -{ - String hello(String name); -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldSEI.java (from rev 6417, stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/HelloWorldSEI.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldSEI.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/HelloWorldSEI.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -0,0 +1,33 @@ +/* + * 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.test.ws.embedded; + +import javax.jws.WebService; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +@WebService +public interface HelloWorldSEI +{ + String hello(String name); +} Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2008-04-16 09:57:40 UTC (rev 6451) @@ -88,7 +88,7 @@ // create target URL URL targetUrl = new URL("http", JBossWSTestHelper.getServerHost(), getServerHttpPort(), file); - // submit process deploy request + // submit process start request int responseCode = submitRequest(targetUrl); if (responseCode != HttpURLConnection.HTTP_OK) Modified: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-16 09:57:40 UTC (rev 6451) @@ -20,12 +20,3 @@ # [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.* - -# [JBWS-2107] Resolve dependency on @SecurityDomain -org/jboss/test/ws/jaxws/webserviceref/Secure** -org/jboss/test/ws/jaxws/samples/dar/** -org/jboss/test/ws/jaxws/samples/news/** -org/jboss/test/ws/jaxws/jbws1840/** - -# [JBWS-1526] Automated testing and availablity checks of public endpoints (interop) -org/jboss/test/ws/interop/** Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2008-04-16 09:52:14 UTC (rev 6450) +++ stack/native/trunk/version.properties 2008-04-16 09:57:40 UTC (rev 6451) @@ -23,12 +23,15 @@ woodstox=3.1.1 wscommons-policy=1.0 -# Dependend integration projects -jbossws-spi=1.0.2.GA +# Dependend integration projects +jbossws-spi=3.0.0-SNAPSHOT jbossws-common=snapshot -jbossws-framework=snapshot -jbossws-jboss42=4.2.1.GA +jbossws-framework=3.0.2-SNAPSHOT +jbossws-jboss422=4.2.2.DEV +jbossws-jboss423=4.2.3.DEV +jbossws-jboss501=5.0.1.DEV + # JBossAS-5.0 jboss-jbossxb-jboss50=2.0.0.CR7 jboss-remoting-jboss50=2.4.0.CR1 @@ -50,16 +53,21 @@ hibernate=3.2.1.GA javassist=3.6.0.GA jaxen=1.1-beta-10 -jboss-common-core=2.0.2.GA +jboss-common-core=2.2.3.GA jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA jboss-javaee=5.0.0.Beta3Update1 jboss-jaxbintros=1.0.0.beta2 jboss-jaxr=1.2.0.GA -jboss-microcontainer=2.0.0.Beta3 + +jboss-microcontainer=2.0.0.Beta11 +jboss-reflect=2.0.0.Beta12 +jboss-mdr=2.0.0.Beta12 + jboss-security=4.0.5.GA jboss-vfs=2.0.0.Beta2 jbossas-core-libs=4.2.0.GA +tjws=1.33 junit=3.8.1 oswego-concurrent=1.3.4 qdox=1.4