weaver      2004/04/22 14:13:25

  Modified:    components/profiler/src/java/META-INF Tag:
                        NANOCONTAINER_DEPLOYER nanocontainer.groovy
  Log:
  - Uses ChildAwareContainer

  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.3   +5 -11     
jakarta-jetspeed-2/components/profiler/src/java/META-INF/Attic/nanocontainer.groovy
  
  Index: nanocontainer.groovy
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/profiler/src/java/META-INF/Attic/nanocontainer.groovy,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- nanocontainer.groovy      20 Apr 2004 19:44:59 -0000      1.1.2.2
  +++ nanocontainer.groovy      22 Apr 2004 21:13:25 -0000      1.1.2.3
  @@ -14,30 +14,25 @@
    * limitations under the License.

    */

   

  -import org.picocontainer.defaults.DefaultPicoContainer

  +import org.apache.jetspeed.components.ChildAwareContainer

   import org.picocontainer.ComponentAdapter

   import org.picocontainer.Parameter

   import org.picocontainer.defaults.ConstantParameter

   import org.picocontainer.defaults.ComponentParameter

   import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer

   import org.apache.jetspeed.page.PageManager

  -import org.apache.jetspeed.page.impl.CastorXmlPageManager

  -import org.apache.jetspeed.cache.file.FileCache

   import org.apache.jetspeed.profiler.Profiler

   import org.apache.jetspeed.profiler.impl.JetspeedProfiler

  -import org.apache.jetspeed.components.ComponentAssemblyTestCase

  +

   

   import java.io.File

   import java.util.Properties

   

   applicationRoot = System.getProperty("org.apache.jetspeed.application_root", "./")

   

  -// create the root container

  -container = new DefaultPicoContainer()

  +container = new ChildAwareContainer(parent)

  +

   

  -//

  -// Profiler

  -//

   props = new Properties()

   props.put("persistenceStore", "jetspeed")

   props.put("defaultRule", "j1")

  @@ -46,7 +41,6 @@
   props.put("principalRule.impl", 
"org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl")

   props.put("profilingRule.impl", 
"org.apache.jetspeed.profiler.rules.impl.AbstractProfilingRule")

   

  -// container.registerComponentInstance(Profiler, new 
JetspeedProfiler(container.get, pageManager, props))

  -container.registerComponentImplementation(Profiler, JetspeedProfiler, new 
Parameter[] {new ComponentParameter(PersistenceStoreContainer), new 
ConstantParameter(pageManager), new ConstantParameter(props)} )

  +container.registerComponentImplementation(Profiler, JetspeedProfiler, new 
Parameter[] {new ComponentParameter(PersistenceStoreContainer), new 
ComponentParameter(PageManager), new ConstantParameter(props)} )

   

   return container
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to