Author: jason.greene(a)jboss.com Date: 2006-11-17 09:39:40 -0500 (Fri, 17 Nov 2006) New Revision: 1459 Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java trunk/src/test/build.xml Log: Fix JBWS-1357 Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-11-17 11:34:36 UTC (rev 1458) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-11-17 14:39:40 UTC (rev 1459) @@ -69,6 +69,10 @@ while (it.hasNext()) { Servlet servlet = (Servlet)it.next(); + // Skip JSPs + if (servlet.getJspFile() != null && servlet.getJspFile().length() > 0) + continue; + String beanName = servlet.getServletClass(); Class<?> servletClass = anLoader.loadClass(beanName); if (servletClass.isAnnotationPresent(WebService.class)) Modified: trunk/src/test/build.xml =================================================================== --- trunk/src/test/build.xml 2006-11-17 11:34:36 UTC (rev 1458) +++ trunk/src/test/build.xml 2006-11-17 14:39:40 UTC (rev 1459) @@ -151,6 +151,7 @@ <pathelement location="${jboss.client}/jboss-common-core.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> + <pathelement location="${jboss.client}/jboss-logging-log4j.jar"/> <pathelement location="${jboss.client}/${jbossws.client.jar}"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/mail.jar"/>