portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine JetspeedEngine.java
Date Wed, 23 Jun 2004 18:42:26 GMT
weaver      2004/06/23 11:42:26

  Modified:    portal/src/java/org/apache/jetspeed/engine
                        JetspeedEngine.java
  Log:
  changed due to refactoring of the component manager
  
  Revision  Changes    Path
  1.28      +11 -7     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
  
  Index: JetspeedEngine.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- JetspeedEngine.java	5 Jun 2004 05:13:09 -0000	1.27
  +++ JetspeedEngine.java	23 Jun 2004 18:42:25 -0000	1.28
  @@ -51,6 +51,8 @@
   import org.apache.pluto.PortletContainer;
   import org.apache.pluto.PortletContainerException;
   import org.apache.pluto.services.information.InformationProviderService;
  +import org.picocontainer.MutablePicoContainer;
  +import org.picocontainer.defaults.DefaultPicoContainer;
   import org.picocontainer.defaults.ObjectReference;
   import org.picocontainer.defaults.SimpleReference;
   
  @@ -76,7 +78,6 @@
       // private final HashMap requestContextPerThread = new HashMap();
   
       private boolean useInternalJNDI;
  -
       /**
        * Initializes the engine with a commons configuration, starting all early
        * initable services.
  @@ -102,6 +103,8 @@
               useInternalJNDI = configuration.getBoolean(JNDI_SUPPORT_FLAG_KEY,
                       true);
               
  +            configuration.setProperty(JetspeedEngineConstants.APPLICATION_ROOT_KEY, applicationRoot);
  +            
               
               System.out.println("JNDI System Property flag "+System.getProperty(JNDI_SUPPORT_FLAG_KEY));
               if(System.getProperty(JNDI_SUPPORT_FLAG_KEY) ==  null)
  @@ -232,7 +235,7 @@
                   container.shutdown();
               }
   
  -            componentManager.killContainer();
  +            componentManager.stop();
           }
           catch (PortletContainerException e)
           {
  @@ -334,10 +337,11 @@
                   "jetspeed.root.assembly", "/WEB-INF/assembly/jetspeed.groovy");
   
           File containerAssembler = new File(applicationRoot + assemblyScript);
  -        componentManager = new ComponentManager(containerAssembler);
  -        ObjectReference rootContainerRef = new SimpleReference();
  -        componentManager.getContainerBuilder().buildContainer(rootContainerRef,
  -                null, "PORTAL_SCOPE");
  +        ObjectReference bootContainerRef = new SimpleReference();
  +        MutablePicoContainer bootContainer = new DefaultPicoContainer();        
  +        bootContainer.registerComponentInstance("portal_configuration", configuration);
  +              
  +        componentManager = new  ComponentManager(containerAssembler, bootContainer, "PORTAL_SCOPE");
   
           try
           {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message