[jbossws-commits] JBossWS SVN: r6094 - in stack/native/branches/hbraun: ant-import and 14 other directories.

Author: heiko.braun(a)jboss.com Date: 2008-03-25 08:21:50 -0400 (Tue, 25 Mar 2008) New Revision: 6094 Added: stack/native/branches/hbraun/native-3.0.iml stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/JSEInvocationHandlerFactory.java stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/ stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/ stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services/ stack/native/branches/hbraun/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.invocation.InvocationHandlerFactory stack/native/branches/hbraun/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.management.ServerConfigFactory Removed: stack/native/branches/hbraun/native-standalone.iml stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/ stack/native/branches/hbraun/src/main/resources/jbossws-standalone.jar/ Modified: stack/native/branches/hbraun/ant-import-tests/build-testsuite.xml stack/native/branches/hbraun/ant-import/build-thirdparty.xml stack/native/branches/hbraun/build.xml stack/native/branches/hbraun/src/main/java/javax/xml/ws/RespectBinding.java stack/native/branches/hbraun/src/main/java/javax/xml/ws/RespectBindingFeature.java stack/native/branches/hbraun/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java stack/native/branches/hbraun/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java stack/native/branches/hbraun/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java stack/native/branches/hbraun/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java stack/native/branches/hbraun/src/main/resources/jbossws-native-config.xml stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java stack/native/branches/hbraun/version.properties Log: DAM lifecycle. Pull thirdparty deps. Rename to embdedded package Modified: stack/native/branches/hbraun/ant-import/build-thirdparty.xml =================================================================== --- stack/native/branches/hbraun/ant-import/build-thirdparty.xml 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/ant-import/build-thirdparty.xml 2008-03-25 12:21:50 UTC (rev 6094) @@ -49,7 +49,7 @@ Currently only jboss-xml-binding is deployed. Remoting should be downloaded in the version of the oldest supported target container. 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. + in which case it is random which version is used by the start targets. --> <mkdir dir="${thirdparty.dir}"/> @@ -94,16 +94,17 @@ <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jaxbintros/${jboss-jaxbintros}/lib/jboss-jaxb-intros.jar" dest="${thirdparty.dir}/jboss-jaxb-intros.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jetty/${jetty}/lib/jetty.jar" dest="${thirdparty.dir}/jetty.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jetty/${jetty}/lib/jetty-util.jar" dest="${thirdparty.dir}/jetty-util.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jetty/${jetty}/lib/jetty.jar" dest="${thirdparty.dir}/jetty.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jetty/${jetty}/lib/jetty-util.jar" dest="${thirdparty.dir}/jetty-util.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> - <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/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/remoting/${jboss-remoting-jboss42}/lib/jboss-remoting-src.jar" dest="${thirdparty.dir}/jboss-remoting-src.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"/> @@ -158,7 +159,7 @@ <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> <pathelement location="${thirdparty.dir}/jboss-javaee.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/branches/hbraun/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/branches/hbraun/ant-import-tests/build-testsuite.xml 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/ant-import-tests/build-testsuite.xml 2008-03-25 12:21:50 UTC (rev 6094) @@ -36,28 +36,33 @@ <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"/> + + <!-- embedded tests --> + <pathelement location="${core.dir}/output/lib/jbossws-embedded.jar"/> </path> <path id="tests.extra.classpath"> <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> <!-- embedded tests --> - <pathelement location="${core.dir}/thirdparty/jboss-microcontainer.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-kernel.jar"/> <pathelement location="${core.dir}/thirdparty/jboss-dependency.jar"/> - <pathelement location="${core.dir}/thirdparty/jboss-container.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/jetty.jar"/> <pathelement location="${core.dir}/thirdparty/jetty-util.jar"/> <!-- / embedded tests --> + <pathelement location="${core.dir}/thirdparty/jboss-jaxb-intros.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> <pathelement location="${core.dir}/thirdparty/policy.jar"/> <pathelement location="${core.dir}/thirdparty/qdox.jar"/> <pathelement location="${core.dir}/thirdparty/stax-api.jar"/> <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> <pathelement location="${core.dir}/thirdparty/wstx.jar"/> - <pathelement location="${core.dir}/thirdparty/jboss-jaxb-intros.jar"/> </path> <!-- The jBPM BPEL classpath --> Modified: stack/native/branches/hbraun/build.xml =================================================================== --- stack/native/branches/hbraun/build.xml 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/build.xml 2008-03-25 12:21:50 UTC (rev 6094) @@ -265,6 +265,7 @@ <include name="org/jboss/annotation/**"/> <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/**"/> @@ -273,13 +274,13 @@ <metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/> </jar> - <!-- Build jbossws-standalone.jar --> + <!-- Build jbossws-embedded.jar --> <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jbossws-standalone.jar" manifest="${core.output.etc.dir}/default.mf"> + <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/standalone/**"/> + <include name="org/jboss/wsf/stack/jbws/embedded/**"/> </fileset> - <metainf dir="${core.resources.dir}/jbossws-standalone.jar/META-INF"/> + <metainf dir="${core.resources.dir}/jbossws-embedded.jar/META-INF"/> </jar> @@ -288,6 +289,8 @@ <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/branches/hbraun/native-3.0.iml (from rev 5978, stack/native/branches/hbraun/native-standalone.iml) =================================================================== --- stack/native/branches/hbraun/native-3.0.iml (rev 0) +++ stack/native/branches/hbraun/native-3.0.iml 2008-03-25 12:21:50 UTC (rev 6094) @@ -0,0 +1,534 @@ +<?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/jbossws-jboss421.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> + <orderEntryProperties /> + </component> +</module> + Deleted: stack/native/branches/hbraun/native-standalone.iml =================================================================== --- stack/native/branches/hbraun/native-standalone.iml 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/native-standalone.iml 2008-03-25 12:21:50 UTC (rev 6094) @@ -1,561 +0,0 @@ -<?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/jbossws-jboss421.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/getopt.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-deployers.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/jboss-deployers-src.zip!/" /> - </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/jboss-microcontainer-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/jboss-microcontainer.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/jboss-dependency-src.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-container.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> - <orderEntryProperties /> - </component> -</module> - Modified: stack/native/branches/hbraun/src/main/java/javax/xml/ws/RespectBinding.java =================================================================== --- stack/native/branches/hbraun/src/main/java/javax/xml/ws/RespectBinding.java 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/main/java/javax/xml/ws/RespectBinding.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -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/branches/hbraun/src/main/java/javax/xml/ws/RespectBindingFeature.java =================================================================== --- stack/native/branches/hbraun/src/main/java/javax/xml/ws/RespectBindingFeature.java 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/main/java/javax/xml/ws/RespectBindingFeature.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -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/branches/hbraun/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -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/branches/hbraun/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -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/branches/hbraun/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -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/branches/hbraun/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -40,7 +40,7 @@ { @Override - public final void create(Deployment dep) + public final void start(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -36,7 +36,7 @@ public class EagerInitializeDeploymentAspect extends DeploymentAspect { @Override - public void create(Deployment dep) + public void start(Deployment dep) { UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -43,7 +43,7 @@ public class EventingDeploymentAspect extends DeploymentAspect { @Override - public void create(Deployment dep) + public void start(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -43,7 +43,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) { // assert ArchiveDeployment Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -40,7 +40,7 @@ public class PublishContractDeploymentAspect extends DeploymentAspect { @Override - public void create(Deployment dep) + public void start(Deployment dep) { UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -39,7 +39,7 @@ public class ServiceEndpointInvokerDeploymentAspect extends DeploymentAspect { @Override - public void create(Deployment dep) + public void start(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -45,7 +45,7 @@ public class UnifiedMetaDataDeploymentAspect extends DeploymentAspect { @Override - public void create(Deployment dep) + public void start(Deployment dep) { UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) Copied: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java (from rev 6019, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/EmbeddableWSFRuntime.java) =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java (rev 0) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -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 Property changes on: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddableWSFRuntime.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java (from rev 6019, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/EmbeddedBootstrap.java) =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java (rev 0) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -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 Property changes on: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/EmbeddedBootstrap.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java (from rev 6019, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/HttpEndpointPublishAspect.java) =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java (rev 0) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -0,0 +1,80 @@ +/* + * 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.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) + { + 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) + { + 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); + } + + } +} Property changes on: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java (from rev 6019, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/InvocationHandlerJSE.java) =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java (rev 0) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -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 Property changes on: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/InvocationHandlerJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/JSEInvocationHandlerFactory.java (from rev 6019, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/JSEInvocationHandlerFactory.java) =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/JSEInvocationHandlerFactory.java (rev 0) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/JSEInvocationHandlerFactory.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -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; + } + +} + Copied: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java (from rev 6019, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/NoopWebServiceContextFactory.java) =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java (rev 0) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -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"); + } + } +} Property changes on: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/NoopWebServiceContextFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java (from rev 6019, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/StandaloneServerConfig.java) =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java (rev 0) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -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) + { + + } +} Property changes on: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml (from rev 6019, stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/standalone/standalone-config.xml) =================================================================== --- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml (rev 0) +++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml 2008-03-25 12:21:50 UTC (rev 6094) @@ -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 Property changes on: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/hbraun/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 (rev 0) +++ stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2008-03-25 12:21:50 UTC (rev 6094) @@ -0,0 +1 @@ +org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory \ No newline at end of file Added: stack/native/branches/hbraun/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 (rev 0) +++ stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2008-03-25 12:21:50 UTC (rev 6094) @@ -0,0 +1 @@ +org.jboss.wsf.stack.jbws.embedded.JSEInvocationHandlerFactory \ No newline at end of file Added: stack/native/branches/hbraun/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 (rev 0) +++ stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2008-03-25 12:21:50 UTC (rev 6094) @@ -0,0 +1 @@ +org.jboss.wsf.stack.jbws.embedded.NoopWebServiceContextFactory \ No newline at end of file Added: stack/native/branches/hbraun/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 (rev 0) +++ stack/native/branches/hbraun/src/main/resources/jbossws-embedded.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2008-03-25 12:21:50 UTC (rev 6094) @@ -0,0 +1 @@ +org.jboss.wsf.framework.management.ServerConfigFactoryImpl \ No newline at end of file Modified: stack/native/branches/hbraun/src/main/resources/jbossws-native-config.xml =================================================================== --- stack/native/branches/hbraun/src/main/resources/jbossws-native-config.xml 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/main/resources/jbossws-native-config.xml 2008-03-25 12:21:50 UTC (rev 6094) @@ -1,176 +1,163 @@ - <!-- 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> + <!-- 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> +<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 --> - <!-- 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="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> Modified: stack/native/branches/hbraun/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-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/BootstrapTestCase.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -21,7 +21,8 @@ */ package org.jboss.test.ws.embedded; -import org.jboss.wsf.stack.jbws.standalone.EmbeddedBootstrap; +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; @@ -39,8 +40,8 @@ protected void setUp() throws Exception { - ClassLoader cl = org.jboss.wsf.stack.jbws.standalone.EmbeddableWSFRuntime.class.getClassLoader(); - String config = "org/jboss/wsf/stack/jbws/standalone/standalone-config.xml"; + 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); @@ -52,7 +53,7 @@ */ public void testBootStrap() throws Exception { - EmbeddedBootstrap bootstrap = new EmbeddedBootstrap(); + EmbeddedBootstrap bootstrap = new EmbeddedBootstrap(); bootstrap.run(); bootstrap.deploy(standaloneConfig); Modified: stack/native/branches/hbraun/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-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -29,7 +29,7 @@ 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.standalone.EmbeddableWSFRuntime; +import org.jboss.wsf.stack.jbws.embedded.EmbeddableWSFRuntime; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -79,7 +79,8 @@ // Publish EmbeddableWSFRuntime container = EmbeddableWSFRuntime.bootstrap( EmbeddableWSFRuntime.DEFAULT_CONFIG_URL); - container.publish(dep); + container.create(dep); + container.start(dep); // Invoke it String wsdl = GETRequest("/hello/endpoint?wsdl"); @@ -95,7 +96,8 @@ assertEquals("Hello StandaloneContainer", response); // Remove - container.remove(dep); + container.stop(dep); + container.destroy(dep); try { wsdl = GETRequest("/hello/endpoint?wsdl"); Modified: stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java =================================================================== --- stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2008-03-25 12:21:50 UTC (rev 6094) @@ -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/branches/hbraun/version.properties =================================================================== --- stack/native/branches/hbraun/version.properties 2008-03-25 12:20:48 UTC (rev 6093) +++ stack/native/branches/hbraun/version.properties 2008-03-25 12:21:50 UTC (rev 6094) @@ -55,7 +55,11 @@ jboss-javaee=5.0.0.Beta3 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