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/webapp/WEB-INF/assembly jetspeed.groovy
Date Thu, 27 May 2004 19:58:40 GMT
weaver      2004/05/27 12:58:40

  Modified:    portal/src/webapp/WEB-INF/assembly jetspeed.groovy
  Log:
  see JS2-40: <http://nagoya.apache.org/jira/browse/JS2-40>
  
  Revision  Changes    Path
  1.38      +12 -12    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy
  
  Index: jetspeed.groovy
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- jetspeed.groovy	26 May 2004 17:24:18 -0000	1.37
  +++ jetspeed.groovy	27 May 2004 19:58:40 -0000	1.38
  @@ -68,6 +68,7 @@
   import org.apache.jetspeed.components.persistence.store.ojb.pb.PBStore
   import org.apache.jetspeed.components.persistence.store.impl.DefaultPersistenceStoreContainer
   import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer
  +import org.apache.jetspeed.components.persistence.store.PersistenceStore
   
   // Portlet Registry and Entity
   import org.apache.jetspeed.components.portletregistry.PortletRegistryComponentImpl
  @@ -231,7 +232,7 @@
    * (will replace PersistenceStoreContainer above)                            *
    * ******************************************************** */
   
  -container.registerComponent(makeThreadLocalAdapter("jetspeed", PBStore.class,  new Parameter[]{new
ConstantParameter("jetspeed")}))
  +container.registerComponent(makeThreadLocalAdapter(PersistenceStore, PBStore,  new Parameter[]{new
ConstantParameter("jetspeed")}))
   
   
   /* **********************************************************
  @@ -240,7 +241,7 @@
    container.registerComponentImplementation(
                               PortletRegistryComponent, 
                               PortletRegistryComponentImpl, 
  -                            doParams([cmpParam(PersistenceStoreContainer), cstParam("jetspeed")])
  +                            doParams([cmpParam(PersistenceStore)])
   )
   
   /* **********************************************************
  @@ -249,7 +250,7 @@
   container.registerComponentImplementation(
                              PortletEntityAccessComponent, 
                              PortletEntityAccessComponentImpl,
  -                           doParams([cmpParam(PersistenceStoreContainer),  cstParam("jetspeed")])
  +                           doParams([cmpParam(PersistenceStore)])
   )
   
   /* **********************************************************
  @@ -258,7 +259,7 @@
   container.registerComponentImplementation(
                          Profiler, 
                          JetspeedProfiler, 
  -                       doParams([cmpParam(PersistenceStoreContainer), cmpParam(PageManager)])
  +                       doParams([cmpParam(PersistenceStore), cmpParam(PageManager)])
   )
   
   /* **********************************************************
  @@ -276,14 +277,13 @@
   container.registerComponentImplementation(
   	                      PropertyManager, 
   	                      PropertyManagerImpl, 
  -	                      doParams([cmpParam(PersistenceStoreContainer), cstParam("jetspeed")])
  +	                      doParams([cmpParam(PersistenceStore)])
   )
   	
   container.registerComponentImplementation(
                          PreferencesProvider, 
                          PreferencesProviderImpl, 
  -                       doParams([cmpParam(PersistenceStoreContainer),
  -                                        cstParam("jetspeed"), 
  +                       doParams([cmpParam(PersistenceStore), 
                                           cstParam("org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl")]
                                          )
   )	
  @@ -295,25 +295,25 @@
   container.registerComponentImplementation(
                        UserManager, 
                        UserManagerImpl, 
  -                     doParams([cmpParam(PersistenceStoreContainer), cstParam("jetspeed")])
  +                     doParams([cmpParam(PersistenceStore)])
   )
   
   container.registerComponentImplementation(
                       GroupManager, 
                       GroupManagerImpl, 
  -                    doParams([cmpParam(PersistenceStoreContainer), cstParam("jetspeed")])
  +                    doParams([cmpParam(PersistenceStore)])
   )
   
   container.registerComponentImplementation(
                         RoleManager, 
                         RoleManagerImpl,
  -                      doParams([cmpParam(PersistenceStoreContainer), cstParam("jetspeed")])
  +                      doParams([cmpParam(PersistenceStore)])
   )
   
   container.registerComponentImplementation(
                         PermissionManager, 
                         PermissionManagerImpl, 
  -                      doParams([cmpParam(PersistenceStoreContainer), cstParam("jetspeed")])
  +                      doParams([cmpParam(PersistenceStore)])
   )
   
   container.registerComponentImplementation(
  @@ -349,7 +349,7 @@
    * ******************************************************** */
   // navigationKeys: prefix, action, mode, state, renderparam, pid, prev_mode, prev_state,
key_delim
   // navigationKeys = "_,ac,md,st,rp,pid,pm,ps,:"
  -navigationKeys = "_,a,m,s,r,i,pm,ps,:"
  +// navigationKeys = "_,a,m,s,r,i,pm,ps,:"
   
   container.registerComponentInstance("navigationKeys", "_,a,m,s,r,i,pm,ps,:")
   
  
  
  

---------------------------------------------------------------------
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