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, 04 Mar 2004 21:23:58 GMT
weaver      2004/03/04 13:23:58

  Modified:    portal/src/webapp/WEB-INF/conf/test jetspeed.properties
               portal/src/webapp/WEB-INF/conf jetspeed.properties
               portal/src/webapp/WEB-INF/assembly jetspeed.groovy
  Log:
  reverting to ojb-Rc4 and PB
  
  commented out autodeploy for now
  
  Revision  Changes    Path
  1.16      +14 -1     jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/test/jetspeed.properties
  
  Index: jetspeed.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/test/jetspeed.properties,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- jetspeed.properties	27 Feb 2004 17:57:30 -0000	1.15
  +++ jetspeed.properties	4 Mar 2004 21:23:58 -0000	1.16
  @@ -69,4 +69,17 @@
   # services.GroupManager.persistence.plugin.name=jetspeed-test
   # services.PermissionManager.persistence.plugin.name=jetspeed-test
   
  +#---------------------------------------------------------------------------------
  +# Run Auto-Deployment set up
  +#---------------------------------------------------------------------------------
  +services.autodeployment.classname=org.apache.jetspeed.deployment.impl.CatalinaAutoDeploymentServiceImpl
  +services.autodeployment.server=localhost
  +services.autodeployment.port=8080
  +services.autodeployment.user=scott
  +services.autodeployment.password=scott
  +services.autodeployment.staging.dir=WEB-INF/deploy
  +services.autodeployment.target.dir=../
  +services.autodeployment.delay=10000
  +services.autodeployment.earlyInit = true
  +
   
  
  
  
  1.42      +10 -18    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties
  
  Index: jetspeed.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- jetspeed.properties	29 Feb 2004 05:10:03 -0000	1.41
  +++ jetspeed.properties	4 Mar 2004 21:23:58 -0000	1.42
  @@ -119,14 +119,6 @@
   services.PortletRenderer.classname=org.apache.jetspeed.aggregator.impl.PortletRendererImpl
   services.PortletAggregator.classname=org.apache.jetspeed.aggregator.PortletAggregator
   
  -# --------------------------------------------------------------------------
  -# JNDI Support Service (Only needed if the current container does not support JNDI)
  -#---------------------------------------------------------------------------
  -# this is turned off in the deployment configuration since the default target container,
tomcat,
  -# supports JNDI.
  -# services.JNDIService.classname=org.apache.jetspeed.cps.jndi.TyrexJNDIService
  -# services.JNDIService.earlyInit = true
  -
   #--------------------------------------------------------------------
   # P O R T L E T  D E P L O Y M E N T  D E S C R I P T O R
   #--------------------------------------------------------------------
  @@ -149,15 +141,15 @@
   #---------------------------------------------------------------------------------
   # Run Auto-Deployment set up
   #---------------------------------------------------------------------------------
  -services.autodeployment.classname=org.apache.jetspeed.deployment.impl.CatalinaAutoDeploymentServiceImpl
  -services.autodeployment.server=localhost
  -services.autodeployment.port=8080
  -services.autodeployment.user=scott
  -services.autodeployment.password=scott
  -services.autodeployment.staging.dir=WEB-INF/deploy
  -services.autodeployment.target.dir=../
  -services.autodeployment.delay=10000
  -services.autodeployment.earlyInit = true
  +#services.autodeployment.classname=org.apache.jetspeed.deployment.impl.CatalinaAutoDeploymentServiceImpl
  +#services.autodeployment.server=localhost
  +#services.autodeployment.port=8080
  +#services.autodeployment.user=scott
  +#services.autodeployment.password=scott
  +#services.autodeployment.staging.dir=WEB-INF/deploy
  +#services.autodeployment.target.dir=../
  +#services.autodeployment.delay=10000
  +#services.autodeployment.earlyInit = true
   
   
   #--------------------------------------------------------------------
  
  
  
  1.17      +5 -3      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- jetspeed.groovy	29 Feb 2004 05:10:03 -0000	1.16
  +++ jetspeed.groovy	4 Mar 2004 21:23:58 -0000	1.17
  @@ -17,7 +17,8 @@
   import org.apache.jetspeed.components.datasource.DatasourceComponent
   import org.apache.commons.pool.impl.GenericObjectPool
   import org.apache.jetspeed.components.persistence.store.ojb.OJBTypeIntializer
  -import org.apache.jetspeed.components.persistence.store.ojb.otm.OTMStoreImpl
  +// import org.apache.jetspeed.components.persistence.store.ojb.otm.OTMStoreImpl
  +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.util.system.FSSystemResourceUtilImpl
  @@ -106,8 +107,9 @@
   
   // pContainer.registerComponentInstance(ojbBootstrap)
   
  -Class OTMStoreClass = Class.forName("org.apache.jetspeed.components.persistence.store.ojb.otm.OTMStoreImpl")
  -ComponentAdapter ca = new ConstructorComponentAdapter("jetspeed", OTMStoreClass, new Parameter[]
{new ConstantParameter("jetspeed")})
  +
  +// ComponentAdapter ca = new ConstructorComponentAdapter("jetspeed", OTMStoreClass, new
Parameter[] {new ConstantParameter("jetspeed")})
  +ComponentAdapter ca = new ConstructorComponentAdapter("jetspeed", PBStore, new Parameter[]
{new ConstantParameter("jetspeed")})
   
   pContainer.registerComponent(ca)
   
  
  
  

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