portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Glenn Golden <ggol...@umich.edu>
Subject RE: cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/ser vices/resources VariableResourcesService.java
Date Tue, 19 Mar 2002 17:37:52 GMT
If I wanted to to a cvs checkout of the turbine code to match this, what cvs
command (tag? Date? Would I issue?  The previous turbines used in jetspeed I
checked out with:

checkout -D 2002-03-01 jakarta-turbine-2

- Glenn

> -----Original Message-----
> From: kimptoc@apache.org [mailto:kimptoc@apache.org] 
> Sent: Tuesday, March 19, 2002 11:18 AM
> To: jakarta-jetspeed-cvs@apache.org
> Subject: cvs commit: 
> jakarta-jetspeed/src/java/org/apache/jetspeed/services/resourc
> es VariableResourcesService.java
> 
> 
> kimptoc     02/03/19 08:18:14
> 
>   Modified:    build/torque build.xml
>                lib      commons-collections.jar
>                src/java/org/apache/jetspeed/services/registry
>                         CastorRegistryService.java
>                src/java/org/apache/jetspeed/services/resources
>                         VariableResourcesService.java
>   Added:       lib      fulcrum-3.0-b1.jar stratum-1.0-b1.jar
>                         turbine-2.2-b1.jar
>   Removed:     lib      stratum-0.1-dev.jar turbine-2.2b1-20020301.jar
>   Log:
>   upgraded turbine to the latest version - the 2.2 beta1 
> release no less.
>   
>   Revision  Changes    Path
>   1.8       +2 -1      jakarta-jetspeed/build/torque/build.xml
>   
>   Index: build.xml
>   ===================================================================
>   RCS file: /home/cvs/jakarta-jetspeed/build/torque/build.xml,v
>   retrieving revision 1.7
>   retrieving revision 1.8
>   diff -u -r1.7 -r1.8
>   --- build.xml	3 Mar 2002 20:40:56 -0000	1.7
>   +++ build.xml	19 Mar 2002 16:18:13 -0000	1.8
>   @@ -12,7 +12,8 @@
>      <path id="classpath">
>        <pathelement location="./lib/torque.jar"/>
>        <pathelement location="../../lib/commons-collections.jar"/>
>   -    <pathelement location="../../lib/turbine-2.2b1-20020301.jar"/>
>   +    <pathelement location="../../lib/turbine-2.2-b1.jar"/>
>   +    <pathelement location="../../lib/stratum-1.0-b1.jar"/>
>        <pathelement location="../../lib/log4j-1.1.jar"/>
>        <pathelement location="../../lib/velocity-1.3-dev.jar"/>
>        <pathelement location="../../lib/village-1.5.3-dev.jar"/>
>   
>   
>   
>   1.2       +300 -248  jakarta-jetspeed/lib/commons-collections.jar
>   
>   	<<Binary file>>
>   
>   
>   1.1                  jakarta-jetspeed/lib/fulcrum-3.0-b1.jar
>   
>   	<<Binary file>>
>   
>   
>   1.1                  jakarta-jetspeed/lib/stratum-1.0-b1.jar
>   
>   	<<Binary file>>
>   
>   
>   1.1                  jakarta-jetspeed/lib/turbine-2.2-b1.jar
>   
>   	<<Binary file>>
>   
>   
>   1.13      +6 -1      
> jakarta-jetspeed/src/java/org/apache/jetspeed/services/registr
> y/CastorRegistryService.java
>   
>   Index: CastorRegistryService.java
>   ===================================================================
>   RCS file: 
> /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/servic
> es/registry/CastorRegistryService.java,v
>   retrieving revision 1.12
>   retrieving revision 1.13
>   diff -u -r1.12 -r1.13
>   --- CastorRegistryService.java	16 Jan 2002 13:37:21 
> -0000	1.12
>   +++ CastorRegistryService.java	19 Mar 2002 16:18:14 
> -0000	1.13
>   @@ -60,6 +60,7 @@
>    //turbine stuff
>    import org.apache.turbine.util.Log;
>    import org.apache.turbine.services.*;
>   +import org.apache.turbine.services.servlet.TurbineServlet;
>    import org.apache.turbine.services.resources.ResourceService;
>    
>    // castor marshalling
>   @@ -101,7 +102,7 @@
>     * </p>
>     *
>     * @author <a href="mailto:raphael@apache.org">Raphaël Luta</a>
>   - * @version $Id: CastorRegistryService.java,v 1.12 
> 2002/01/16 13:37:21 kimptoc Exp $
>   + * @version $Id: CastorRegistryService.java,v 1.13 
> 2002/03/19 16:18:14 kimptoc Exp $
>     */
>    public class CastorRegistryService
>        extends TurbineBaseService
>   @@ -287,6 +288,10 @@
>                mapFile = 
> serviceConf.getString("mapping",DEFAULT_MAPPING);
>                extension = 
> serviceConf.getString("extension",DEFAULT_EXTENSION);
>                refreshRate = 
> serviceConf.getInt("refreshRate",DEFAULT_REFRESH);
>   +
>   +            mapFile = TurbineServlet.getRealPath( mapFile );
>   +            directory = TurbineServlet.getRealPath( directory );
>   +
>            }
>            catch ( Throwable t )
>            {
>   
>   
>   
>   1.10      +2 -2      
> jakarta-jetspeed/src/java/org/apache/jetspeed/services/resourc
> es/VariableResourcesService.java
>   
>   Index: VariableResourcesService.java
>   ===================================================================
>   RCS file: 
> /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/servic
> es/resources/VariableResourcesService.java,v
>   retrieving revision 1.9
>   retrieving revision 1.10
>   diff -u -r1.9 -r1.10
>   --- VariableResourcesService.java	17 Dec 2001 15:32:28 
> -0000	1.9
>   +++ VariableResourcesService.java	19 Mar 2002 16:18:14 
> -0000	1.10
>   @@ -62,7 +62,7 @@
>    import javax.servlet.ServletContext;
>    
>    // Turbine stuff.
>   -import org.apache.velocity.runtime.configuration.Configuration;
>   +import org.apache.stratum.configuration.Configuration;
>    import org.apache.turbine.services.resources.ResourceService;
>    import 
> org.apache.turbine.services.resources.TurbineResourceService;
>    import org.apache.turbine.services.TurbineServices;
>   @@ -97,7 +97,7 @@
>     *  </p>
>     *
>     * @author <a href="mailto:raphael@apache.org">Raphaël Luta</a>
>   - * @version $Id: VariableResourcesService.java,v 1.9 
> 2001/12/17 15:32:28 sgala Exp $
>   + * @version $Id: VariableResourcesService.java,v 1.10 
> 2002/03/19 16:18:14 kimptoc Exp $
>     */
>    public class VariableResourcesService extends 
> TurbineResourceService
>    {
>   
>   
>   
> 
> --
> To unsubscribe, e-mail:   
> <mailto:jetspeed-dev-> unsubscribe@jakarta.apache.org>
> For 
> additional commands, 
> e-mail: <mailto:jetspeed-dev-help@jakarta.apache.org>
> 

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