portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/profiler ProfileLocator.java Profiler.java
Date Thu, 23 Sep 2004 22:30:03 GMT
taylor      2004/09/23 15:30:03

  Modified:    jetspeed-api/src/java/org/apache/jetspeed/profiler/rules
                        ProfilingRule.java
               jetspeed-api/src/java/org/apache/jetspeed/profiler
                        ProfileLocator.java Profiler.java
  Log:
  dropping desktop concept
  
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.2       +1 -3      jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/profiler/rules/ProfilingRule.java
  
  Index: ProfilingRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/profiler/rules/ProfilingRule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProfilingRule.java	28 May 2004 18:51:56 -0000	1.1
  +++ ProfilingRule.java	23 Sep 2004 22:30:03 -0000	1.2
  @@ -69,8 +69,6 @@
       public final static String STANDARD_COUNTRY = "country";
       public final static String STANDARD_LANGUAGE = "language";
       public final static String STANDARD_ROLE_FALLBACK = "roles";
  -    // additional desktop concept
  -    public final static String STANDARD_DESKTOP = "desktop";    
   
       /**
        * Given a criterion name, look up a value resolver
  
  
  
  1.3       +5 -5      jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfileLocator.java
  
  Index: ProfileLocator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfileLocator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProfileLocator.java	17 Sep 2004 20:06:53 -0000	1.2
  +++ ProfileLocator.java	23 Sep 2004 22:30:03 -0000	1.3
  @@ -31,8 +31,8 @@
    * The format of the path is name/value pairs of all property, separated by a <i>path
separator</i>.
    * An example locator path:</p>
    * 
  - *      <pre>desktop:default-desktop.psml:page:default.psml:artist:al-stewart:song:on-the-border</pre>
  - *      <pre>desktop:default-desktop.psml:path:/sports/football/nfl/chiefs:language:en</pre>
  + *      <pre>page:default.psml:artist:al-stewart:song:on-the-border</pre>
  + *      <pre>path:/sports/football/nfl/chiefs:language:en</pre>
    * 
    *
    * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
  @@ -109,7 +109,7 @@
        * Note: all locator property elements are assumed to be control properties.
        * An example locator path:</p>
        * 
  -     *      <pre>:desktop:default-desktop.psml:page:default.psml:artist:air:song:all-i-need</pre>
  +     *      <pre>:page:default.psml:artist:air:song:all-i-need</pre>
        * 
        * @param path The normalized path as shown above from which the locator is created.
        */
  @@ -120,7 +120,7 @@
        * The format of the path is name/value pairs of all property, separated by a <i>path
separator</i>.
        * An example locator path:</p>
        * 
  -     *      <pre>:desktop:default-desktop.psml:page:default.psml:artist:joni-mitchell:song:cary</pre>
  +     *      <pre>:page:default.psml:artist:joni-mitchell:song:cary</pre>
        * 
        * @return The normalized path as shown above.
        */
  
  
  
  1.6       +5 -5      jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java
  
  Index: Profiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/profiler/Profiler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Profiler.java	20 Sep 2004 17:16:42 -0000	1.5
  +++ Profiler.java	23 Sep 2004 22:30:03 -0000	1.6
  @@ -29,11 +29,11 @@
    * It requires that the request context is already populated with the portal request and
response,
    * and capability and user information. The request context parameters, properties and
attributes
    * make up the profile criterion which the profiler uses to locate portal resources:
  - *   1. desktop
  - *   2. page
  - *   3. fragment
  + *   1. page
  + *   2. navigations
  + *   3. document lists
    * 
  - * In all cases (desktop, page, fragment), a fallback algorithm should be applied to fallback
  + * In all cases, a fallback algorithm should be applied to fallback
    * to default portal resources.
    *
    * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
  
  
  

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