gregw       2004/02/07 18:06:13

  Modified:    modules/jetty/src/java/org/apache/geronimo/jetty/deployment
                        JettyModule.java WebAppDConfigBean.java
  Log:
  minor comment and code cleanups
  
  Revision  Changes    Path
  1.9       +6 -5      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModule.java
  
  Index: JettyModule.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModule.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JettyModule.java	6 Feb 2004 08:55:49 -0000	1.8
  +++ JettyModule.java	8 Feb 2004 02:06:13 -0000	1.9
  @@ -90,12 +90,12 @@
           this.zipArchive= new ZipInputStream(moduleArchive);
           closeStream= false;
   
  -        // TODO - why does this not use the WebAppDConfigBean ??
  +        // TODO - This should decode XML directly here.  Should use xmlbeans?
           contextPath= XMLUtil.getChildContent(deploymentPlan.getDocumentElement(), "context-root", null, null);
           if (contextPath == null)
               throw new DeploymentException("No context root specified");
           String t=XMLUtil.getChildContent(deploymentPlan.getDocumentElement(), "context-priority-classloader", null, null);
  -        contextPriorityClassLoader= t != null && t.length() > 0 && t.toLowerCase().charAt(0) == 't';
  +        contextPriorityClassLoader= new Boolean(t).booleanValue();
       }
   
       public JettyModule(URI configID, File archiveFile, Document deploymentPlan) throws DeploymentException {
  @@ -123,9 +123,9 @@
               contextPath = "/" + contextPath;
           }
   
  -        // TODO - why does this not use the WebAppDConfigBean ??
  +        // TODO - This should decode XML directly here.  Should use x mlbeans?
           String t=XMLUtil.getChildContent(deploymentPlan.getDocumentElement(), "context-priority-classloader", null, null);
  -        contextPriorityClassLoader= t != null && t.length() > 0 && t.toLowerCase().charAt(0) == 't';
  +        contextPriorityClassLoader= new Boolean(t).booleanValue();
       }
   
       public JettyModule(URI configID, InputStream moduleArchive, JettyWebAppType webApp) throws DeploymentException {
  @@ -137,6 +137,7 @@
           if (contextPath == null) {
               throw new DeploymentException("No context root specified");
           }
  +        contextPriorityClassLoader=webApp.getContextPriorityClassloader();
       }
   
       public void init() throws DeploymentException {
  
  
  
  1.6       +1 -5      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigBean.java
  
  Index: WebAppDConfigBean.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigBean.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WebAppDConfigBean.java	6 Feb 2004 08:55:49 -0000	1.5
  +++ WebAppDConfigBean.java	8 Feb 2004 02:06:13 -0000	1.6
  @@ -97,8 +97,6 @@
           getWebApp().getContextRoot().setStringValue(contextRoot);
       }
   
  -
  -    /* ------------------------------------------------------------------------------- */
       /** getContextPriorityClassLoader.
        * @return True if this context should give web application class in preference over the containers
        * classes, as per the servlet specification recommendations.
  @@ -107,7 +105,6 @@
           return getWebApp().getContextPriorityClassloader();
       }
   
  -    /* ------------------------------------------------------------------------------- */
       /** setContextPriorityClassLoader.
        * @param contextPriority True if this context should give web application class in preference over the containers
        * classes, as per the servlet specification recommendations.
  @@ -116,7 +113,6 @@
           pcs.firePropertyChange("contextPriorityClassLoader", getContextPriorityClassLoader(), contextPriority);
           getWebApp().setContextPriorityClassloader(contextPriority);
       }
  -
   
       public DConfigBean getDConfigBean(DDBean ddBean) throws ConfigurationException {
           return encHelper.getDConfigBean(ddBean);