Author: thomas.diesler(a)jboss.com Date: 2007-01-05 16:52:57 -0500 (Fri, 05 Jan 2007) New Revision: 1835 Modified: trunk/integration-tomcat/build.xml trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java Log: Fix tomcat integration Add config name/file access on StubExt Modified: trunk/integration-tomcat/build.xml =================================================================== --- trunk/integration-tomcat/build.xml 2007-01-05 21:52:51 UTC (rev 1834) +++ trunk/integration-tomcat/build.xml 2007-01-05 21:52:57 UTC (rev 1835) @@ -109,11 +109,14 @@ <target name="tomcat-thirdparty-jar" unless="jbossws.thirdparty.available"> <!-- Build jbossws-thirdparty.jar --> <mkdir dir="${tomcat.output.lib.dir}/build"/> + <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/> + <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jaxb-impl.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-common-core.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-j2ee.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/> + <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-logging-log4j.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-logging-spi.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-microcontainer.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/jboss-remoting.jar"/> Modified: trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java =================================================================== --- trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2007-01-05 21:52:51 UTC (rev 1834) +++ trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2007-01-05 21:52:57 UTC (rev 1835) @@ -65,11 +65,11 @@ // ignore } - String shortName = getContextRoot(warURL); - shortName = shortName.substring(1) + ".war"; - - udi.simpleName = shortName; - //udi.url = warURL; + String contextRoot = getContextRoot(warURL); + + udi.name = contextRoot; + udi.simpleName = contextRoot.substring(1) + ".war"; + udi.url = warURL; udi.metaData = buildWebMetaData(udi, ctx); udi.classLoader = loader; @@ -83,7 +83,7 @@ UnifiedWebMetaData wmd = new UnifiedWebMetaData(); wmd.setServletMappings(getServetMappings(webXML)); wmd.setServletClassNames(getServetClassMap(webXML)); - //wmd.setContextRoot(getContextRoot(udi.url)); + wmd.setContextRoot(getContextRoot(udi.url)); wmd.setConfigName(ctx.getInitParameter("jbossws-config-name")); wmd.setConfigFile(ctx.getInitParameter("jbossws-config-file")); wmd.setSecurityMetaData(getSecurityMetaData(webXML));