portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raph...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/xml .cvsignore
Date Tue, 17 Apr 2001 20:36:47 GMT
raphael     01/04/17 13:36:46

  Modified:    src/java/org/apache/jetspeed/cache/disk DiskCacheUtils.java
               src/java/org/apache/jetspeed/portal PortletConfig.java
               src/java/org/apache/jetspeed/services/profiler
                        JetspeedProfileManagerService.java
               src/java/org/apache/jetspeed/xml .cvsignore
  Removed:     src/java/org/apache/jetspeed/services/enginecontext
                        EngineContext.java EngineContextService.java
                        ServletEngineContextService.java
  Log:
  remove EngineContext and replace it by Turbine TurbineServletService
  
  Revision  Changes    Path
  1.16      +5 -5      jakarta-jetspeed/src/java/org/apache/jetspeed/cache/disk/DiskCacheUtils.java
  
  Index: DiskCacheUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/cache/disk/DiskCacheUtils.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DiskCacheUtils.java	2001/03/07 06:42:31	1.15
  +++ DiskCacheUtils.java	2001/04/17 20:36:18	1.16
  @@ -64,8 +64,8 @@
   
   //turbine
   import org.apache.turbine.util.*;
  -import org.apache.jetspeed.services.enginecontext.EngineContext;
  -import org.apache.turbine.services.resources.TurbineResources;
  +import org.apache.turbine.services.servlet.TurbineServlet;
  +import org.apache.jetspeed.services.resources.JetspeedResources;
   
   /**
      <p>
  @@ -92,7 +92,7 @@
      
      @see DiskCache
      @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
  -   @version $Id: DiskCacheUtils.java,v 1.15 2001/03/07 06:42:31 taylor Exp $
  +   @version $Id: DiskCacheUtils.java,v 1.16 2001/04/17 20:36:18 raphael Exp $
   */
   public class DiskCacheUtils {
   
  @@ -106,7 +106,7 @@
       /**
       Stores the protocols which sould be recognized as local
       */
  -    private static Vector localprotocols = TurbineResources.getVector("diskcache.localprotocols");
  +    private static Vector localprotocols = JetspeedResources.getVector("diskcache.localprotocols");
   
       private static String hostName = "localhost";
       static {
  @@ -161,7 +161,7 @@
               throw new IllegalArgumentException( "The URL specifies is not a virtual URL:
" + virtual );
           }
                   
  -        String url = EngineContext.getResource( virtual ).toString();
  +        String url = TurbineServlet.getResource( virtual ).toString();
           
           return url;
       }
  
  
  
  1.41      +3 -4      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletConfig.java
  
  Index: PortletConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletConfig.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- PortletConfig.java	2001/03/07 06:45:33	1.40
  +++ PortletConfig.java	2001/04/17 20:36:25	1.41
  @@ -60,11 +60,10 @@
   
   //turbine support
   import org.apache.turbine.util.*;
  +import org.apache.turbine.services.servlet.TurbineServlet;
   
  -
   //jetspeed support
   import org.apache.jetspeed.util.*;
  -import org.apache.jetspeed.services.enginecontext.EngineContext;
   import org.apache.jetspeed.profiler.*;
   import org.apache.jetspeed.capability.*;
   
  @@ -73,7 +72,7 @@
   about the running environment of a given Portlet.
   
   @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
  -@version $Id: PortletConfig.java,v 1.40 2001/03/07 06:45:33 taylor Exp $
  +@version $Id: PortletConfig.java,v 1.41 2001/04/17 20:36:25 raphael Exp $
   */
   
   public class PortletConfig extends Config {
  @@ -202,7 +201,7 @@
           //if the given URL doesn not include a protocol... ie http:// or ftp://
           //then resolve it relative to the current URL context
           if ( url.indexOf("://") < 0 ) {
  -            this.url = EngineContext.getResource( url ).toString();
  +            this.url = TurbineServlet.getResource( url ).toString();
           } else {
               this.url = url;
           }
  
  
  
  1.13      +7 -7      jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfileManagerService.java
  
  Index: JetspeedProfileManagerService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfileManagerService.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JetspeedProfileManagerService.java	2001/03/09 12:34:40	1.12
  +++ JetspeedProfileManagerService.java	2001/04/17 20:36:39	1.13
  @@ -60,7 +60,7 @@
   import org.apache.jetspeed.services.registrymanager.*;
   import org.apache.jetspeed.capability.CapabilityMap;
   import org.apache.jetspeed.capability.CapabilityMapFactory;
  -import org.apache.jetspeed.services.enginecontext.EngineContext;
  +import org.apache.jetspeed.services.resources.JetspeedResources;
   import org.apache.jetspeed.util.MimeType;
   import org.apache.jetspeed.om.registry.Registry;
   import org.apache.jetspeed.om.registry.RegistryException;
  @@ -72,10 +72,10 @@
   //turbine stuff
   import org.apache.turbine.util.Log;
   import org.apache.turbine.services.*;
  -import org.apache.jetspeed.services.resources.JetspeedResources;
   import org.apache.turbine.util.RunData;
   import org.apache.turbine.util.DynamicURI;
   import org.apache.turbine.om.security.User;
  +import org.apache.turbine.services.servlet.TurbineServlet;
   
   //java stuff
   import java.util.*;
  @@ -104,7 +104,7 @@
    *
    * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
    * @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
  - * @version $Id: JetspeedProfileManagerService.java,v 1.12 2001/03/09 12:34:40 sgala Exp
$
  + * @version $Id: JetspeedProfileManagerService.java,v 1.13 2001/04/17 20:36:39 raphael
Exp $
    */
   
   public class JetspeedProfileManagerService  extends TurbineBaseService
  @@ -381,14 +381,14 @@
               if (finalPath.length() == 0)
               {
                   finalPath = root + original;
  -                String url = EngineContext.getResource( finalPath ).toString();
  +                String url = TurbineServlet.getResource( finalPath ).toString();
                   profile.setURL(url);
                   return profile;
               }
           }
           // TODO: ACL security
   
  -        String url = EngineContext.getResource( finalPath ).toString();
  +        String url = TurbineServlet.getResource( finalPath ).toString();
           profile.setURL(url);
           return profile;
       }
  @@ -525,7 +525,7 @@
           if (!path.endsWith(PATH_SEPARATOR))
               fullPath.append(PATH_SEPARATOR);
           fullPath.append(resource);
  -        String realPath = EngineContext.getRealPath( fullPath.toString() );
  +        String realPath = TurbineServlet.getRealPath( fullPath.toString() );
   
           if (resourceMap.containsKey(realPath))
               return fullPath.toString();  // found as is
  @@ -666,7 +666,7 @@
           resourceMap = new HashMap();
   
           // traverse starting from the root directory and add resources
  -        String realRootPath = EngineContext.getRealPath( root );
  +        String realRootPath = TurbineServlet.getRealPath( root );
           traverseResources( realRootPath, "" );
   
       }
  
  
  
  1.2       +1 -1      jakarta-jetspeed/src/java/org/apache/jetspeed/xml/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/xml/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cvsignore	2001/02/08 16:45:39	1.1
  +++ .cvsignore	2001/04/17 20:36:44	1.2
  @@ -1 +1 @@
  -./api
  +api
  
  
  

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