cvs commit: incubator-geronimo/modules/web/src/java/org/apache/geronimo/web AbstractWebContainer.java

[dain]

dain        2003/11/16 16:10:55

  Modified:    modules/web/src/java/org/apache/geronimo/web
                        AbstractWebContainer.java
  Log:
  Added another constructor so web apps can share in this sweet code
  
  Revision  Changes    Path
  1.17      +6 -4      
incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebContainer.java
  
  Index: AbstractWebContainer.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebContainer.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AbstractWebContainer.java 16 Nov 2003 22:36:31 -0000      1.16
  +++ AbstractWebContainer.java 17 Nov 2003 00:10:55 -0000      1.17
  @@ -210,7 +210,7 @@
               throw new DeploymentException("WebContainer " + getObjectName() 
+ " cannot deploy as it is not RUNNING");
   
           URL url = goal.getUrl();
  -        DeploymentHelper deploymentHelper = new DeploymentHelper(url, 
goal.getType(), "WebApplication", ".war", "web.xml", "geronimo-web.xml");
  +        DeploymentHelper deploymentHelper = new DeploymentHelper(url, 
goal.getType(), "WebApplication", "web.xml", "geronimo-web.xml", "WEB-INF");
           URL geronimoURL = deploymentHelper.locateGeronimoDD();
   
           // Is the specific URL deployable?
  @@ -249,7 +249,7 @@
               Document document = LoaderUtil.parseXML(new 
InputStreamReader(geronimoURL.openStream()));
               geronimoWebAppDoc = GeronimoWebAppLoader.load(document);
           } catch (FileNotFoundException e) {
  -            throw new DeploymentException("Deployment descriptor not found", 
e);
  +//            throw new DeploymentException("Deployment descriptor not 
found", e);
           } catch (SAXException e) {
               throw new DeploymentException("geronimo-web.xml malformed", e);
           } catch (IOException e) {
  @@ -293,7 +293,9 @@
           webapp.setParentClassLoader(getClass().getClassLoader());
   
           // Set up the ENC etc
  -        
webapp.setComponentContext(this.getComponentContext(geronimoWebAppDoc, null));
  +        if(geronimoWebAppDoc != null) {
  +            
webapp.setComponentContext(this.getComponentContext(geronimoWebAppDoc, null));
  +        }
   
           // Add a task to start the webapp which will finish configuring it
           webappPlan.addTask(new StartMBeanInstance(server, webappMetadata));