[jboss-cvs] jboss-seam/src/main/org/jboss/seam/servlet ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/11/08 21:44:39

  Modified:    src/main/org/jboss/seam/servlet  SeamResourceServlet.java
  Log:
  only create resource providers if required
  
  Revision  Changes    Path
  1.3       +18 -12    jboss-seam/src/main/org/jboss/seam/servlet/SeamResourceServlet.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamResourceServlet.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/servlet/SeamResourceServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- SeamResourceServlet.java	4 Jul 2007 03:26:15 -0000	1.2
  +++ SeamResourceServlet.java	9 Nov 2007 02:44:39 -0000	1.3
  @@ -11,8 +11,8 @@
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   
  -import org.jboss.seam.contexts.ApplicationContext;
  -import org.jboss.seam.contexts.Context;
  +import org.jboss.seam.Component;
  +import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.web.AbstractResource;
   
  @@ -37,12 +37,13 @@
   
      protected void loadResourceProviders()
      {
  -      Context tempApplicationContext = new ApplicationContext( new ServletApplicationMap(context) );
  +      try
  +      {
  +         Lifecycle.mockApplication();
   
  -      Init init = (Init) tempApplicationContext.get(Init.class);
  -      for (String name : init.getResourceProviders())
  +         for (String name : Init.instance().getResourceProviders())
         {
  -         AbstractResource provider = (AbstractResource) tempApplicationContext.get(name);
  +            AbstractResource provider = (AbstractResource) Component.getInstance(name, true);
            if (provider != null)
            {
               provider.setServletContext(context);
  @@ -50,6 +51,11 @@
            }
         }
      }
  +      finally
  +      {
  +         Lifecycle.unmockApplication();
  +      }
  +   }
   
      @Override
      public void doGet(HttpServletRequest request, HttpServletResponse response)