[jbossws-commits] JBossWS SVN: r10422 - in stack/metro/trunk/modules: server and 5 other directories.

Author: richard.opalka(a)jboss.com Date: 2009-07-29 16:33:38 -0400 (Wed, 29 Jul 2009) New Revision: 10422 Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/metro/trunk/modules/server/pom.xml stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/metro/trunk/modules/testsuite/pom.xml Log: [JBWS-2332] svn merge -r 10167:10412 https://svn.jboss.org/repos/jbossws/stack/metro/branches/ropalka Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-29 20:20:39 UTC (rev 10421) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-29 20:33:38 UTC (rev 10422) @@ -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/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/lib/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/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/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-29 20:20:39 UTC (rev 10421) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-29 20:33:38 UTC (rev 10422) @@ -450,7 +450,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> @@ -482,7 +482,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> @@ -522,7 +522,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> --> @@ -564,7 +564,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/metro/trunk/modules/server/pom.xml =================================================================== --- stack/metro/trunk/modules/server/pom.xml 2009-07-29 20:20:39 UTC (rev 10421) +++ stack/metro/trunk/modules/server/pom.xml 2009-07-29 20:33:38 UTC (rev 10422) @@ -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 Metro Runtime Server</name> + <name>JBoss Web Services - Metro Server</name> <artifactId>jbossws-metro-server</artifactId> <packaging>jar</packaging> Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java =================================================================== --- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2009-07-29 20:20:39 UTC (rev 10421) +++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2009-07-29 20:33:38 UTC (rev 10422) @@ -21,6 +21,7 @@ */ package org.jboss.wsf.stack.metro; +import org.jboss.wsf.common.integration.WSConstants; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; @@ -45,7 +46,7 @@ { @Override @SuppressWarnings("unchecked") - public void create(Deployment dep) + public void start(Deployment dep) { DDEndpoints ddEndpoints = dep.getAttachment(DDEndpoints.class); if (ddEndpoints == null) @@ -78,7 +79,7 @@ } @Override - public void destroy(Deployment dep) + public void stop(Deployment dep) { DDEndpoints dd = dep.getAttachment(DDEndpoints.class); if (dd != null) @@ -88,20 +89,21 @@ } /** - * Puts SUN JAX-WS config file to deployment property <b>org.jboss.ws.webapp.ContextParameterMap</b> map - * @param dep deployment where to put - * @param dd beans to be put + * Puts Metro config file reference to the stack specific context properties. + * + * @param dep webservice deployment + * @param jaxwsConfigURL Metro DD URL + * @see org.jboss.wsf.common.integration.WSConstants.STACK_CONTEXT_PARAMS */ private static void putSunJaxwsConfigToDeployment(Deployment dep, URL jaxwsConfigURL) { // get property map - String propKey = "org.jboss.ws.webapp.ContextParameterMap"; - Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS); if (contextParams == null) { // if there's no associated map with the property create it now contextParams = new HashMap<String, String>(); - dep.setProperty(propKey, contextParams); + dep.setProperty(WSConstants.STACK_CONTEXT_PARAMS, contextParams); } // put sun jaxws config URL to the property map contextParams.put(RuntimeModelDeploymentAspect.PARAM_SUN_JAXWS_URL, jaxwsConfigURL.toExternalForm()); Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java =================================================================== --- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2009-07-29 20:20:39 UTC (rev 10421) +++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2009-07-29 20:33:38 UTC (rev 10422) @@ -33,6 +33,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.common.integration.WSConstants; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; @@ -142,7 +143,7 @@ private URL getDDUrlFromContext(Deployment deployment) throws MalformedURLException { Map<String, String> contextProperties = - (Map<String, String>)deployment.getProperty("org.jboss.ws.webapp.ContextParameterMap"); + (Map<String, String>)deployment.getProperty(WSConstants.STACK_CONTEXT_PARAMS); return new URL(contextProperties.get(PARAM_SUN_JAXWS_URL)); } Modified: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml =================================================================== --- stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml 2009-07-29 20:20:39 UTC (rev 10421) +++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml 2009-07-29 20:33:38 UTC (rev 10422) @@ -1,9 +1,12 @@ +<?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> </bean> - + <!-- Logging redirector --> <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> <property name="namespaces"> @@ -13,7 +16,7 @@ </list> </property> </bean> - + <!-- Installed Record Processors--> <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder"> <property name="recording">false</property> @@ -21,85 +24,50 @@ <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="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> <property name="provides">ContextProperties</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.metro.EndpointServlet</value></entry> + <entry> + <key>stack.transport.class</key> + <value>org.jboss.wsf.stack.metro.EndpointServlet</value> + </entry> </map> </property> + <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerEndpointHandler</property> + <property name="requires">ContainerMetaData</property> <property name="provides">StackEndpointHandler</property> + <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround --> </bean> - + <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" 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="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">StackDescriptor</property> + <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect"> - <property name="requires">RuntimeLoader, StackDescriptor</property> + <property name="requires">StackDescriptor</property> <property name="provides">RuntimeModel</property> + <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround --> </bean> - <!-- Deployment aspect installers --> - <!-- Phase 1 --> - <bean name="WSMetroDeploymentAspectInstallerPreJSE" 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="WSMetroContextPropertiesDeploymentAspect"/> - <inject bean="WSMetroDescriptorDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerPreJSE</depends> - </bean> - - <!-- Phase 2 --> - <bean name="WSMetroDeploymentAspectInstallerPostJSE" 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="WSMetroEndpointHandlerDeploymentAspect"/> - <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSRuntimeModelDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerPostJSE</depends> - </bean> - - <bean name="WSMetroDeploymentAspectInstallerEJB" 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="WSMetroContextPropertiesDeploymentAspect"/> - <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> - <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSMetroDescriptorDeploymentAspect"/> - <inject bean="WSRuntimeModelDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerEJB</depends> - </bean> +</deployment> Modified: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-29 20:20:39 UTC (rev 10421) +++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-29 20:33:38 UTC (rev 10422) @@ -10,73 +10,37 @@ <!-- ====================================================================== --> <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="thirdparty.dir" value="${project.build.directory}/thirdparty"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="init"> + + <property name="src.dir" value="${basedir}/src/main/resources"/> + <property name="dest.dir" value="${basedir}/target/resources"/> + + <target name="main"> + + <copy + file="${src.dir}/jbossws-metro-config.xml" + tofile="${dest.dir}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> + + <copy + file="${src.dir}/jbossws-metro-config.xml" + tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> + + <copy + file="${src.dir}/jbossws-metro-config.xml" + tofile="${dest.dir}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> + + <copy + file="${src.dir}/jbossws-metro-config.xml" + tofile="${dest.dir}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> + + <copy + file="${src.dir}/jbossws-metro-config.xml" + tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> + </target> - - <!-- Compile resource files --> - <target name="main" depends="init"> - - <!-- 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-metro-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - - <!-- 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-metro-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - - <!-- 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-metro-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-metro-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-metro-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - - </target> - + </project> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2009-07-29 20:20:39 UTC (rev 10421) +++ stack/metro/trunk/modules/testsuite/pom.xml 2009-07-29 20:33:38 UTC (rev 10422) @@ -24,7 +24,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.metro.EndpointServlet</endpoint.servlet> <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> </properties> @@ -189,6 +188,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>