[jbossws-commits] JBossWS SVN: r2848 - in branches/dlofthouse/JBWS-1093: jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093 and 1 other directory.

Author: darran.lofthouse(a)jboss.com Date: 2007-04-14 12:57:30 -0400 (Sat, 14 Apr 2007) New Revision: 2848 Modified: branches/dlofthouse/JBWS-1093/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java branches/dlofthouse/JBWS-1093/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java Log: Fix test case for JBoss 5.0.x Modified: branches/dlofthouse/JBWS-1093/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java =================================================================== --- branches/dlofthouse/JBWS-1093/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java 2007-04-14 16:56:23 UTC (rev 2847) +++ branches/dlofthouse/JBWS-1093/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java 2007-04-14 16:57:30 UTC (rev 2848) @@ -35,6 +35,7 @@ import org.jboss.metadata.web.Servlet; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher.RewriteResults; +import org.jboss.ws.core.utils.JavaUtils; /** * An abstract deployer for JSE Endpoints @@ -63,7 +64,7 @@ // FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData InputStream stream = unit.getDeploymentContext().getRoot().findChild("WEB-INF/web.xml").openStream(); RewriteResults results = getServiceEndpointPublisher().rewriteWebXml(stream, null, unit.getClassLoader()); - + URL webXML = results.webXML; modifyWebMetaData(unit, webXML); } @@ -88,12 +89,13 @@ continue; // Nothing to do if we have an <init-param> - if (isAlreadyModified(servlet) == false) + if (isAlreadyModified(servlet) == false && isAServlet(servletClassName, unit.getClassLoader()) == false) { servlet.setServletClass(serviceEndpointServlet); NameValuePair initParam = new NameValuePair(AbstractServiceEndpointPublisher.INIT_PARAM_SERVICE_ENDPOINT_IMPL, servletClassName); servlet.addInitParam(initParam); } + } // FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData @@ -101,6 +103,33 @@ webMetaData.setAltDDPath(webXmlPath); } + private boolean isAServlet(String servletClassName, ClassLoader cl) + { + boolean isAServlet = false; + + if (cl != null) + { + try + { + Class servletClass = cl.loadClass(servletClassName); + + isAServlet = JavaUtils.isAssignableFrom(javax.servlet.Servlet.class, servletClass); + + if (isAServlet == true) + { + log.info("Ignore servlet: " + servletClassName); + } + } + catch (ClassNotFoundException e) + { + log.warn("Cannot load servlet class: " + servletClassName); + } + + } + + return isAServlet; + } + private boolean isAlreadyModified(Servlet servlet) { Iterator itParams = servlet.getInitParams().iterator(); Modified: branches/dlofthouse/JBWS-1093/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1093/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-04-14 16:56:23 UTC (rev 2847) +++ branches/dlofthouse/JBWS-1093/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-04-14 16:57:30 UTC (rev 2848) @@ -85,12 +85,6 @@ public void testAccessServlet() throws Exception { - if (true) - { - System.out.println("FIXME: [JBAS-4210] HTTP request dispatched to the wrong servlet"); - return; - } - URL servletURL = new URL("http://" + getServerHost() + ":8080" + "/jaxrpc-jbws1093/ServletTest"); InputStream is = servletURL.openStream();