portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry CastorRegistryService.java
Date Fri, 23 Nov 2001 22:57:00 GMT
nacho       01/11/23 14:57:00

  Modified:    webapp/WEB-INF web.xml
               webapp/WEB-INF/conf TurbineResources.velocity
                        TurbineResources.properties
                        JetspeedResources.properties
               modules/CocoonPortlet/conf JetspeedResources.properties
               src/java/org/apache/jetspeed/services/registry
                        CastorRegistryService.java
  Added:       lib      turbine-2.2b1-20011124.jar
  Removed:     lib      turbine-2.2-dev-20010912.jar
  Log:
  Upgraded to Turbine 2.2 from cvs..
  Web.xml doesnt need to configure a private resouce manager  as initparam
  Changed ocurrences of webapp.dir to the new Turbine resouces syntax.
  Installed a request tool for localization in TR.p
  
  Revision  Changes    Path
  1.6       +0 -6      jakarta-jetspeed/webapp/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/web.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- web.xml	2001/02/13 00:40:41	1.5
  +++ web.xml	2001/11/23 22:56:58	1.6
  @@ -19,12 +19,6 @@
                 WEB-INF/conf/TurbineResources.properties
               </param-value>            
           </init-param>
  -        <init-param>
  -          <param-name>resources</param-name>
  -          <param-value>
  -            org.apache.jetspeed.services.resources.VariableResourcesService
  -          </param-value>
  -        </init-param>
           <load-on-startup>1</load-on-startup>
       </servlet>
   
  
  
  
  1.5       +918 -918  jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.velocity
  
  Index: TurbineResources.velocity
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.velocity,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  Binary files /tmp/cvsrDzhck6iEC and /tmp/cvsNJvnvecl7D differ
  
  
  
  1.39      +4 -2      jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties
  
  Index: TurbineResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- TurbineResources.properties	2001/08/16 15:09:31	1.38
  +++ TurbineResources.properties	2001/11/23 22:56:58	1.39
  @@ -1,5 +1,5 @@
   # -------------------------------------------------------------------
  -# $Id: TurbineResources.properties,v 1.38 2001/08/16 15:09:31 raphael Exp $
  +# $Id: TurbineResources.properties,v 1.39 2001/11/23 22:56:58 nacho Exp $
   #
   # This is the configuration file for Turbine.
   #
  @@ -158,7 +158,7 @@
   # -------------------------------------------------------------------
   
   database.default.driver=org.hsql.jdbcDriver
  -database.default.url=jdbc:HypersonicSQL:${webapp.dir}/WEB-INF/db/jetspeed
  +database.default.url=jdbc:HypersonicSQL:${webappRoot}/WEB-INF/db/jetspeed
   database.default.username=sa
   database.default.password=
   
  @@ -562,6 +562,8 @@
   tool.request.clink=org.apache.jetspeed.util.template.ContentTemplateLink
   tool.request.jlink=org.apache.jetspeed.util.template.JetspeedTemplateLink
   tool.request.jetspeed=org.apache.jetspeed.util.template.JetspeedTool
  +tool.request.l10n=org.apache.turbine.services.localization.LocalizationTool
  +
   
   #tool.global.ui=org.apache.turbine.util.pull.UIManager
   tool.global.config=org.apache.jetspeed.services.resources.JetspeedResources
  
  
  
  1.49      +5 -5      jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties
  
  Index: JetspeedResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- JetspeedResources.properties	2001/11/20 05:29:34	1.48
  +++ JetspeedResources.properties	2001/11/23 22:56:58	1.49
  @@ -1,7 +1,7 @@
   ################################################################################
   # Jetspeed Configuration                             
   # Author: Kevin A. Burton (burton@apache.org)
  -# $Id: JetspeedResources.properties,v 1.48 2001/11/20 05:29:34 taylor Exp $
  +# $Id: JetspeedResources.properties,v 1.49 2001/11/23 22:56:58 nacho Exp $
   ################################################################################
   # This is the main file you will need to configuration Jetspeed.  If there are 
   # any secondary files they will be pointed to from this file.
  @@ -48,7 +48,7 @@
   
   #for Win32 systems specify your directory as:  cache.directory=/d:/temp/JetspeedDocumentCache
   #Default: /tmp/JetspeedDocumentCache
  -cache.directory=${webapp.dir}/WEB-INF/cache
  +cache.directory=${webappRoot}/WEB-INF/cache
   
   #Specify whether Jetspeed should fetch items that aren't in the DiskCache in 
   #real time.  If true Jetspeed will throw a ContentNotAvailableException when it
  @@ -68,7 +68,7 @@
   # JDK 1.1.x
   
   #Default: /tmp
  -temp.directory=${webapp.dir}/WEB-INF/tmp
  +temp.directory=${webappRoot}/WEB-INF/tmp
   
   ###############################################################################
   #  THE FOLLOWING ARE "OPTIONAL" PROPERTIES THAT ENABLE A CUSTOMIZED INSTALL    #
  @@ -304,8 +304,8 @@
   # Registry Service                      #
   #########################################
   services.Registry.classname=org.apache.jetspeed.services.registry.CastorRegistryService
  -services.Registry.directory=${webapp.dir}/WEB-INF/conf/
  -services.Registry.mapping=${webapp.dir}/WEB-INF/conf/registry.xml
  +services.Registry.directory=${webappRoot}/WEB-INF/conf/
  +services.Registry.mapping=${webappRoot}/WEB-INF/conf/registry.xml
   services.Registry.default.Portlet=local-portlets
   services.Registry.default.PortletControl=local-managers
   services.Registry.default.PortletController=local-managers
  
  
  
  1.1                  jakarta-jetspeed/lib/turbine-2.2b1-20011124.jar
  
  	<<Binary file>>
  
  
  1.3       +3 -3      jakarta-jetspeed/modules/CocoonPortlet/conf/JetspeedResources.properties
  
  Index: JetspeedResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/conf/JetspeedResources.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JetspeedResources.properties	2000/12/22 13:25:43	1.2
  +++ JetspeedResources.properties	2001/11/23 22:57:00	1.3
  @@ -1,7 +1,7 @@
   ################################################################################
   # Jetspeed Configuration                             
   # Author: Kevin A. Burton (burton@apache.org)
  -# $Id: JetspeedResources.properties,v 1.2 2000/12/22 13:25:43 luta Exp $
  +# $Id: JetspeedResources.properties,v 1.3 2001/11/23 22:57:00 nacho Exp $
   ################################################################################
   
   #########################################
  @@ -10,7 +10,7 @@
   #Jetspeed attempts to initialize it's own Cocoon Engine.
   
   services.Cocoon.classname=org.apache.jetspeed.services.cocoon.JetspeedCocoonService
  -services.Cocoon.properties=${webapp.dir}/WEB-INF/conf/cocoon.properties
  +services.Cocoon.properties=${webappRoot}/WEB-INF/conf/cocoon.properties
   
   #NOTE:  You should also set "processor.xsp.repository" within cocoon.properties
   
  @@ -18,4 +18,4 @@
   # Cocoon PortletController configuration   #
   ############################################
   cocoonportletcontroller.width=700
  -cocoonportletcontroller.stylesheet=${webapp.dir}/WEB-INF/xsl/defaultstyle.xsl
  +cocoonportletcontroller.stylesheet=${webappRoot}/WEB-INF/xsl/defaultstyle.xsl
  
  
  
  1.10      +2 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/CastorRegistryService.java
  
  Index: CastorRegistryService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/CastorRegistryService.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CastorRegistryService.java	2001/09/13 13:53:02	1.9
  +++ CastorRegistryService.java	2001/11/23 22:57:00	1.10
  @@ -101,7 +101,7 @@
    * </p>
    *
    * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
  - * @version $Id: CastorRegistryService.java,v 1.9 2001/09/13 13:53:02 sgala Exp $
  + * @version $Id: CastorRegistryService.java,v 1.10 2001/11/23 22:57:00 nacho Exp $
    */
   public class CastorRegistryService
       extends TurbineBaseService
  @@ -109,7 +109,7 @@
                
       public static final int DEFAULT_REFRESH = 300;
       public static final String DEFAULT_EXTENSION = ".xreg";
  -    public static final String DEFAULT_MAPPING = "${webapp.dir}/WEB-INF/conf/mapping.xml";
  +    public static final String DEFAULT_MAPPING = "${webappRoot}/WEB-INF/conf/mapping.xml";
   
       /** regsitry type keyed list of entries */
       private Hashtable registries = new Hashtable();
  
  
  

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


Mime
View raw message