cvs commit: incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment WARConfigBuilder.java

[jboynes]

jboynes     2004/02/20 13:05:01

  Modified:    modules/jetty/src/java/org/apache/geronimo/jetty/deployment
                        WARConfigBuilder.java
  Log:
  Add war content first so we can add it to the classpath
  
  Revision  Changes    Path
  1.5       +6 -5      
incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigBuilder.java
  
  Index: WARConfigBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WARConfigBuilder.java     20 Feb 2004 20:30:22 -0000      1.4
  +++ WARConfigBuilder.java     20 Feb 2004 21:05:01 -0000      1.5
  @@ -186,6 +186,11 @@
                   throw new DeploymentException(e);
               }
   
  +            // add the warfile's content to the configuration
  +            URI warRoot = URI.create("war/");
  +            context.addArchive(warRoot, module);
  +            context.addToClassPath(warRoot);
  +
               // todo do we need to support include and dependency or can we 
rely on the parent?
               // add low-level GBean definitions to the config
   //            addIncludes(context, configType);
  @@ -193,10 +198,6 @@
               ClassLoader cl = context.getClassLoader(repository);
               addGBeans(context, jettyWebApp.getGbeanArray(), cl);
   
  -            // add the warfile's content to the configuration
  -            URI warRoot = URI.create("war/");
  -            context.addArchive(warRoot, module);
  -            context.addToClassPath(warRoot);
   
               // add the GBean for the web application
               addWebAppGBean(context, jettyWebApp, warRoot);