You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2001/05/07 17:38:28 UTC

cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/util/template JetspeedTool.java

taylor      01/05/07 08:38:28

  Modified:    src/java/org/apache/jetspeed/util PSMLManager.java
               src/java/org/apache/jetspeed/util/template JetspeedTool.java
  Log:
  updated PSMLManager.java to new naming conventions for Profiler service
  
  Revision  Changes    Path
  1.6       +7 -7      jakarta-jetspeed/src/java/org/apache/jetspeed/util/PSMLManager.java
  
  Index: PSMLManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/PSMLManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PSMLManager.java	2001/04/25 00:06:44	1.5
  +++ PSMLManager.java	2001/05/07 15:38:14	1.6
  @@ -72,7 +72,7 @@
   import org.apache.jetspeed.xml.api.portletmarkup.*;
   import org.apache.turbine.util.*;
   import org.apache.jetspeed.services.resources.JetspeedResources;
  -import org.apache.jetspeed.services.profiler.ProfileManager;
  +import org.apache.jetspeed.services.Profiler;
   import org.apache.jetspeed.om.profile.*;
   
   import java.io.*;
  @@ -119,9 +119,9 @@
           String url = null;
           try
           {
  -            if (JetspeedResources.getBoolean("services.ProfileManager.enable", false))
  +            if (JetspeedResources.getBoolean("services.Profiler.enable", false))
               {
  -                Profile profile = ProfileManager.getProfile( data, mimetype );
  +                Profile profile = Profiler.getProfile( data, mimetype );
                   url = profile.getURL();
               }
               else
  @@ -138,11 +138,11 @@
           catch (Exception e)
           {
               Log.note("Profiled URL doesn't exist, using default");
  -            if (JetspeedResources.getBoolean("services.ProfileManager.enable", false))
  +            if (JetspeedResources.getBoolean("services.Profiler.enable", false))
               {
                   try
                   {
  -                    Profile profile = ProfileManager.getProfile( null, mimetype );
  +                    Profile profile = Profiler.getProfile( null, mimetype );
                       url = profile.getURL();
                   }
                   catch (ProfileException ex)
  @@ -216,9 +216,9 @@
           String url ;
           try
           {
  -             if (JetspeedResources.getBoolean("services.ProfileManager.enable", false))
  +             if (JetspeedResources.getBoolean("services.Profiler.enable", false))
                {
  -                Profile profile = ProfileManager.getProfile( data, mimetype );
  +                Profile profile = Profiler.getProfile( data, mimetype );
                   url = profile.getURL();
                }
                else
  
  
  
  1.5       +3 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java
  
  Index: JetspeedTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JetspeedTool.java	2001/04/25 00:07:56	1.4
  +++ JetspeedTool.java	2001/05/07 15:38:23	1.5
  @@ -59,7 +59,7 @@
   import org.apache.turbine.util.RunData;
   import org.apache.turbine.util.Log;
   import org.apache.turbine.services.pull.ApplicationTool;
  -import org.apache.jetspeed.services.profiler.ProfileManager;
  +import org.apache.jetspeed.services.Profiler;
   import org.apache.jetspeed.services.resources.JetspeedResources;
   import org.apache.jetspeed.om.profile.*;
   import org.apache.jetspeed.capability.*;
  @@ -75,7 +75,7 @@
    * shared between threads and/or requests</strong>
    *
    * @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
  - * @version $Id: JetspeedTool.java,v 1.4 2001/04/25 00:07:56 taylor Exp $
  + * @version $Id: JetspeedTool.java,v 1.5 2001/05/07 15:38:23 taylor Exp $
    */
   public class JetspeedTool implements ApplicationTool
   {
  @@ -137,7 +137,7 @@
               CapabilityMap cm = CapabilityMapFactory.getCapabilityMap(rundata);
               try
               {
  -                Profile profile = ProfileManager.getProfile(rundata,cm);
  +                Profile profile = Profiler.getProfile(rundata,cm);
                   result = profile.getRootSet(rundata).getContent(rundata);
               }
               catch (ProfileException e)
  
  
  

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