cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment AbstractWebAppLoader.java

[ammulder]

ammulder    2003/09/29 05:38:13

  Modified:    modules/core/src/java/org/apache/geronimo/xml/deployment
                        AbstractWebAppLoader.java
  Log:
  loadDisplayable already calls loadDescribable
  
  Revision  Changes    Path
  1.4       +1 -6      
incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/AbstractWebAppLoader.java
  
  Index: AbstractWebAppLoader.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/AbstractWebAppLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractWebAppLoader.java 27 Sep 2003 16:17:12 -0000      1.3
  +++ AbstractWebAppLoader.java 29 Sep 2003 12:38:13 -0000      1.4
  @@ -93,7 +93,6 @@
       protected void loadCommonElements(AbstractWebApp webApp, Element root) {
           webApp.setVersion(LoaderUtil.getAttribute(root, "version"));
   
  -        J2EELoader.loadDescribable(root, webApp);
           J2EELoader.loadDisplayable(root, webApp);
           webApp.setDistributable(LoaderUtil.getBoolean(root, 
"distributable"));
           loadContextParams(webApp, root);
  @@ -138,7 +137,6 @@
               final Filter filter = new Filter();
   
               J2EELoader.loadDisplayable(e, filter);
  -            J2EELoader.loadDescribable(e, filter);
               filter.setFilterName(LoaderUtil.getChildContent(e, 
"filter-name"));
               filter.setFilterClass(LoaderUtil.getChildContent(e, 
"filter-class"));
               filter.setInitParam(J2EELoader.loadInitParams(e));
  @@ -187,7 +185,6 @@
               Listener listener = new Listener();
   
               J2EELoader.loadDisplayable(e, listener);
  -            J2EELoader.loadDescribable(e, listener);
               listener.setListenerClass(LoaderUtil.getChildContent(e, 
"listener-class"));
   
               listeners[i] = listener;
  @@ -205,7 +202,6 @@
               final Servlet servlet = new Servlet();
   
               J2EELoader.loadDisplayable(e, servlet);
  -            J2EELoader.loadDescribable(e, servlet);
               servlet.setServletName(LoaderUtil.getChildContent(e, 
"servlet-name"));
               servlet.setServletClass(LoaderUtil.getChildContent(e, 
"servlet-class"));
               servlet.setJspFile(LoaderUtil.getChildContent(e, "jsp-file"));
  @@ -355,7 +351,6 @@
               JSPPropertyGroup jspPropertyGroup = new JSPPropertyGroup();
   
               J2EELoader.loadDisplayable(e, jspPropertyGroup);
  -            J2EELoader.loadDescribable(e, jspPropertyGroup);
               loadUrlPatterns(jspPropertyGroup, e);
               String value = LoaderUtil.getChildContent(e, "el-ignored");
               if (value != null) {