Author: richard.opalka(a)jboss.com Date: 2009-07-29 16:47:10 -0400 (Wed, 29 Jul 2009) New Revision: 10423 Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsdd/WEB-INF/webservices.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt Log: [JBWS-2332] svn merge -r 10166:10411 https://svn.jboss.org/repos/jbossws/stack/native/branches/ropalka Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/core/pom.xml 2009-07-29 20:47:10 UTC (rev 10423) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBoss Web Services - Stack Native Core</name> + <name>JBoss Web Services - Native Server</name> <artifactId>jbossws-native-core</artifactId> <packaging>jar</packaging> Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2009-07-29 20:47:10 UTC (rev 10423) @@ -60,7 +60,7 @@ } @Override - public final void destroy(Deployment dep) + public final void stop(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2009-07-29 20:47:10 UTC (rev 10423) @@ -70,7 +70,7 @@ } @Override - public void destroy(Deployment dep) + public void stop(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-07-29 20:47:10 UTC (rev 10423) @@ -414,7 +414,6 @@ throw new IllegalStateException("Cannot obtain endpoint meta data"); long beginProcessing = 0; - ClassLoader ctxClassLoader = SecurityActions.getContextClassLoader(); try { EndpointState state = ep.getState(); @@ -460,10 +459,6 @@ // debug the incomming message MessageTrace.traceMessage("Incoming Request Message", reqMessage); - // Set the thread context class loader - ClassLoader classLoader = sepMetaData.getClassLoader(); - SecurityActions.setContextClassLoader(classLoader); - // Get the Invoker ServiceEndpointInvoker epInvoker = ep.getAttachment(ServiceEndpointInvoker.class); if (epInvoker == null) @@ -522,8 +517,6 @@ log.error("Cannot process metrics", ex); } - // Reset the thread context class loader - SecurityActions.setContextClassLoader(ctxClassLoader); log.debug("END handleRequest: " + ep.getName()); } } Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml 2009-07-29 20:47:10 UTC (rev 10423) @@ -1,3 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + <!-- 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> @@ -2,8 +6,8 @@ </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> - + <!-- Installed Record Processors--> @@ -15,135 +19,76 @@ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder"> <property name="recording">false</property> </bean> - - <!-- - The stack specific deployment aspects - --> + + <!-- The stack specific deployment aspects --> <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>stack.transport.class</key> + <value>org.jboss.wsf.stack.jbws.EndpointServlet</value> + </entry> </map> </property> + <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround --> </bean> - + <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> <property name="requires">UnifiedMetaDataModel</property> <property name="provides">InitializedMetaDataModel</property> + <property name="relativeOrder">25</property> <!-- [JBDEPLOY-201] workaround --> </bean> - + <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerEndpointHandler, ContainerMetaData</property> - <property name="provides">StackEndpointHandler</property> + <property name="requires">ContainerMetaData</property> + <property name="provides">StackEndpointHandler</property> + <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround --> </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="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"/> </list> </property> + <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround --> </bean> - + <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> <property name="requires">UnifiedMetaDataModel</property> + <property name="relativeOrder">26</property> <!-- [JBDEPLOY-201] workaround --> </bean> - + <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> <property name="requires">UnifiedMetaDataModel, JAXBIntros</property> <property name="provides">PublishedContract</property> + <property name="relativeOrder">24</property> <!-- [JBDEPLOY-201] workaround --> </bean> - + <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> <property name="requires">UnifiedMetaDataModel</property> + <property name="relativeOrder">23</property> <!-- [JBDEPLOY-201] workaround --> </bean> - + <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect"> <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property> + <property name="relativeOrder">27</property> <!-- [JBDEPLOY-201] workaround --> </bean> - + <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> - <property name="requires">RuntimeLoader, ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property> + <property name="requires">ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property> <property name="provides">UnifiedMetaDataModel</property> + <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround --> </bean> - <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect"> + <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect"> <property name="provides">JAXBIntros</property> + <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround --> </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"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSNativeContextPropertiesDeploymentAspect"/> - </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> - - <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"/> - </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"> - <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"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerEndpointAPI</depends> - </bean> +</deployment> Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-07-29 20:47:10 UTC (rev 10423) @@ -11,72 +11,36 @@ <project default="main"> - <property name="project.resources.directory" value="${basedir}/src/main/resources"/> - <property name="project.build.directory" value="${basedir}/target"/> - <property name="project.build.resources.directory" value="${project.build.directory}/resources"/> + <property name="src.dir" value="${basedir}/src/main/resources"/> + <property name="dest.dir" value="${basedir}/target/resources"/> - <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/> + <target name="main"> - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> + <copy + file="${src.dir}/jbossws-native-config.xml" + tofile="${dest.dir}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> - <target name="init"> - </target> + <copy + file="${src.dir}/jbossws-native-config.xml" + tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> - <!-- Compile resource files --> - <target name="main" depends="init"> + <copy + file="${src.dir}/jbossws-native-config.xml" + tofile="${dest.dir}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> - <!-- Concat jbossws-jboss500/jbossws.beans --> - <echo message="Concat jbossws-jboss500/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> - <fileset file="${project.resources.directory}/jbossws-native-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> + <copy + file="${src.dir}/jbossws-native-config.xml" + tofile="${dest.dir}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> - <!-- Concat jbossws-jboss501/jbossws.beans --> - <echo message="Concat jbossws-jboss501/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> - <fileset file="${project.resources.directory}/jbossws-native-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> + <copy + file="${src.dir}/jbossws-native-config.xml" + tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> - <!-- Concat jbossws-jboss510/jbossws.beans --> - <echo message="Concat jbossws-jboss510/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> - <fileset file="${project.resources.directory}/jbossws-native-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - - <!-- Concat jbossws-jboss520/jbossws.beans --> - <echo message="Concat jbossws-jboss520/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss520/jbossws.beans/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> - <fileset file="${project.resources.directory}/jbossws-native-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - - <!-- Concat jbossws-jboss600/jbossws.beans --> - <echo message="Concat jbossws-jboss600/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> - <fileset file="${project.resources.directory}/jbossws-native-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - </target> </project> Modified: stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-29 20:47:10 UTC (rev 10423) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/l! ib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/l! ib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/! deployers/jbossws.deployer/META-INF/standard-*-config.xml lib/! endorsed /jbossws-native-* lib/endorsed/jaxb-api.jar Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-29 20:47:10 UTC (rev 10423) @@ -439,7 +439,7 @@ </copy> <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> - <include name="**/jbossws-deployer-jboss-beans.xml"/> + <include name="**/stack-agnostic-jboss-beans.xml"/> </fileset> </copy> </sequential> @@ -476,7 +476,7 @@ </copy> <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> - <include name="**/jbossws-deployer-jboss-beans.xml"/> + <include name="**/stack-agnostic-jboss-beans.xml"/> </fileset> </copy> </sequential> @@ -521,7 +521,7 @@ <!-- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> - <include name="**/jbossws-deployer-jboss-beans.xml"/> + <include name="**/stack-agnostic-jboss-beans.xml"/> </fileset> </copy> --> @@ -568,7 +568,7 @@ <!-- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> - <include name="**/jbossws-deployer-jboss-beans.xml"/> + <include name="**/stack-agnostic-jboss-beans.xml"/> </fileset> </copy> --> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml 2009-07-29 20:47:10 UTC (rev 10423) @@ -8,11 +8,7 @@ <!-- Test that we can deploy an already modified web.xml --> <servlet> <servlet-name>Hello</servlet-name> - <servlet-class&gt;@endpoint.servlet(a)&lt;/servlet-class&gt; - <init-param> - <param-name>jboss.ws.endpoint</param-name> - <param-value>org.jboss.test.ws.jaxrpc.jbws124.HelloJavaBean</param-value> - </init-param> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws124.HelloJavaBean</servlet-class> </servlet> <servlet-mapping> <servlet-name>Hello</servlet-name> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/webservices.xml 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/webservices.xml 2009-07-29 20:47:10 UTC (rev 10423) @@ -1,6 +1,6 @@ <webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.webservice/jbws165' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> <webservice-description> - <webservice-description-name>HelloServicePcURI</webservice-description-name> + <webservice-description-name>HelloServicePcURI1</webservice-description-name> <wsdl-file>META-INF/wsdl/HelloServicePcURI.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component> @@ -13,7 +13,7 @@ </port-component> </webservice-description> <webservice-description> - <webservice-description-name>HelloServicePcURI</webservice-description-name> + <webservice-description-name>HelloServicePcURI2</webservice-description-name> <wsdl-file>META-INF/wsdl/HelloServicePcURI.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1762/WEB-INF/web.xml 2009-07-29 20:47:10 UTC (rev 10423) @@ -4,11 +4,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> <servlet> <servlet-name>POJOBean</servlet-name> - <servlet-class&gt;@endpoint.servlet(a)&lt;/servlet-class&gt; - <init-param> - <param-name>jboss.ws.endpoint</param-name> - <param-value>org.jboss.test.ws.jaxrpc.jbws1762.services.POJOBean</param-value> - </init-param> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1762.services.POJOBean</servlet-class> </servlet> <servlet-mapping> <servlet-name>POJOBean</servlet-name> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2009-07-29 20:47:10 UTC (rev 10423) @@ -14,13 +14,13 @@ <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestService</servlet-link> + </service-impl-bean> <handler> <handler-name>XOPInlineHandler</handler-name> <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> </handler> - <service-impl-bean> - <servlet-link>TestService</servlet-link> - </service-impl-bean> </port-component> </webservice-description> </webservices> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2009-07-29 20:47:10 UTC (rev 10423) @@ -14,13 +14,13 @@ <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestService</servlet-link> + </service-impl-bean> <handler> <handler-name>XOPInlineHandler</handler-name> <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class> </handler> - <service-impl-bean> - <servlet-link>TestService</servlet-link> - </service-impl-bean> </port-component> </webservice-description> </webservices> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsdd/WEB-INF/webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsdd/WEB-INF/webservices.xml 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsdd/WEB-INF/webservices.xml 2009-07-29 20:47:10 UTC (rev 10423) @@ -10,10 +10,10 @@ <wsdl-service>wsdl:WSDDEndpointImplService</wsdl-service> <wsdl-port>wsdl:WSDDEndpointImplPort</wsdl-port> <!--service-endpoint-interface>com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefHCWithDDsTest.Hello</service-endpoint-interface--> + <enable-mtom>true</enable-mtom> <service-impl-bean> <servlet-link>Endpoint</servlet-link> </service-impl-bean> - <enable-mtom>true</enable-mtom> <handler-chains> <handler-chain> <handler> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/testsuite/pom.xml 2009-07-29 20:47:10 UTC (rev 10423) @@ -23,7 +23,6 @@ <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <hibernate.version>3.2.4.sp1</hibernate.version> - <endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet> <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> </properties> @@ -181,6 +180,10 @@ <value>${jbossws.integration.target}</value> </property> <property> + <name>test.disable.deployment</name> + <value>false</value> + </property> + <property> <name>log4j.output.dir</name> <value>${project.build.directory}</value> </property> Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-07-29 20:47:10 UTC (rev 10423) @@ -12,3 +12,6 @@ # [JBWS-2634] Implement support for @EJB annotations in WS components (fixed in AS 501 and above) org/jboss/test/ws/jaxws/jbws2634/** + +# [JBWS-2674] Implement javax.xml.ws.Endpoint +org/jboss/test/ws/jaxws/endpoint/*TestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-07-29 20:47:10 UTC (rev 10423) @@ -6,3 +6,6 @@ # [JBWS-2217] Fix BPEL jaxrpc samples org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* + +# [JBWS-2674] Implement javax.xml.ws.Endpoint +org/jboss/test/ws/jaxws/endpoint/*TestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-07-29 20:47:10 UTC (rev 10423) @@ -6,3 +6,6 @@ # [JBWS-2217] Fix BPEL jaxrpc samples org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* + +# [JBWS-2674] Implement javax.xml.ws.Endpoint +org/jboss/test/ws/jaxws/endpoint/*TestCase.* \ No newline at end of file Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-07-29 20:47:10 UTC (rev 10423) @@ -6,3 +6,6 @@ # [JBWS-2217] Fix BPEL jaxrpc samples org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* + +# [JBWS-2674] Implement javax.xml.ws.Endpoint +org/jboss/test/ws/jaxws/endpoint/*TestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-07-29 20:33:38 UTC (rev 10422) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-07-29 20:47:10 UTC (rev 10423) @@ -6,3 +6,6 @@ # [JBWS-2217] Fix BPEL jaxrpc samples org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* + +# [JBWS-2674] Implement javax.xml.ws.Endpoint +org/jboss/test/ws/jaxws/endpoint/*TestCase.*