You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/09/21 23:56:35 UTC
svn commit: r448707 -
/geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
Author: djencks
Date: Thu Sep 21 14:56:34 2006
New Revision: 448707
URL: http://svn.apache.org/viewvc?view=rev&rev=448707
Log:
GERONIMO-2291 port web service builder changes from 1.1 branch: ws builder gets to determine if there is something to deploy
Modified:
geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java?view=diff&rev=448707&r1=448706&r2=448707
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java Thu Sep 21 14:56:34 2006
@@ -245,15 +245,7 @@
Map servletNameToPathMap = buildServletNameToPathMap(webApp, contextRoot);
- //look for a webservices dd
- Map portMap = Collections.EMPTY_MAP;
- try {
- URL wsDDUrl = DeploymentUtil.createJarURL(moduleFile, "WEB-INF/webservices.xml");
- portMap = getWebServiceBuilder().parseWebServiceDescriptor(wsDDUrl, moduleFile, false, servletNameToPathMap);
- } catch (MalformedURLException e) {
- //no descriptor
- }
- AbstractName moduleName;
+ Map portMap = getWebServiceBuilder().findWebServices(moduleFile, false, servletNameToPathMap); AbstractName moduleName;
if (earName == null) {
earName = naming.createRootName(environment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
moduleName = naming.createChildName(earName, environment.getConfigId().toString(), NameFactory.WEB_MODULE);