Author: alessio.soldano(a)jboss.com Date: 2008-11-18 03:17:25 -0500 (Tue, 18 Nov 2008) New Revision: 8739 Modified: container/jboss42/branches/asoldano/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java Log: Using different endpoint servlet for jaxrpc and jaxws Modified: container/jboss42/branches/asoldano/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java =================================================================== --- container/jboss42/branches/asoldano/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java 2008-11-18 08:15:07 UTC (rev 8738) +++ container/jboss42/branches/asoldano/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java 2008-11-18 08:17:25 UTC (rev 8739) @@ -23,6 +23,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.logging.Logger; import org.dom4j.Document; import org.dom4j.Element; @@ -52,6 +53,17 @@ Element root = webXml.getRootElement(); String propKey = "org.jboss.ws.webapp.ServletClass"; + + DeploymentType dt = dep.getType(); + if (DeploymentType.JAXWS_JSE.equals(dt) || DeploymentType.JAXWS_EJB3.equals(dt)) + { + propKey = "org.jboss.ws.webapp.jaxws.ServletClass"; + } + else + { + propKey = "org.jboss.ws.webapp.jaxrpc.ServletClass"; + } + String servletClass = (String)dep.getProperty(propKey); if (servletClass == null) throw new IllegalStateException("Cannot obtain context property: " + propKey);