Author: palin Date: 2007-05-23 10:52:07 -0400 (Wed, 23 May 2007) New Revision: 3218 Modified: trunk/integration/jbws/build.xml trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java Log: Merging ws-policy impl from JBWS-856 branch (forgotten files) Modified: trunk/integration/jbws/build.xml =================================================================== --- trunk/integration/jbws/build.xml 2007-05-23 14:51:22 UTC (rev 3217) +++ trunk/integration/jbws/build.xml 2007-05-23 14:52:07 UTC (rev 3218) @@ -124,6 +124,7 @@ <include name="policy.jar"/> <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> + <include name="wstx.jar"/> </fileset> <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> @@ -170,6 +171,7 @@ <include name="stax-api.jar"/> <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> + <include name="wstx.jar"/> </fileset> <fileset dir="${jbws.resources.dir}/jbossws-jbws42.sar"> <include name="jbossws.beans/**"/> Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-05-23 14:51:22 UTC (rev 3217) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-05-23 14:52:07 UTC (rev 3218) @@ -105,7 +105,10 @@ if (deploymentPath.startsWith("jar:") && deploymentPath.endsWith("!/") == false) deploymentPath += "!/"; - + + if (deploymentPath.startsWith("war:") && deploymentPath.endsWith("!/") == false) + deploymentPath += "!/"; + if (deploymentPath.endsWith("/") == false) deploymentPath += "/";