portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Paul Spencer <pau...@apache.org>
Subject Re: cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler JetspeedProfilerService.java
Date Sat, 25 May 2002 11:37:55 GMT
Patch cause BasicSanity test (org.apache.jetspeed.test.TestBasicSanity) 
to fail!

Due to time constraints, I will patch.

Paul Spencer

ggolden@apache.org wrote:

> ggolden     02/05/20 06:05:05
> 
>   Modified:    src/java/org/apache/jetspeed/services/profiler
>                         JetspeedProfilerService.java
>   Log:
>   makeDynamicURI(): two parts are added to identify this profile's page: a user/group/
or role designation, and a page name.  The first part was missing the "user" part.
>   
>   Revision  Changes    Path
>   1.29      +27 -8     jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
>   
>   Index: JetspeedProfilerService.java
>   ===================================================================
>   RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
>   retrieving revision 1.28
>   retrieving revision 1.29
>   diff -u -r1.28 -r1.29
>   --- JetspeedProfilerService.java	16 May 2002 20:00:43 -0000	1.28
>   +++ JetspeedProfilerService.java	20 May 2002 13:05:05 -0000	1.29
>   @@ -134,7 +134,7 @@
>     *
>     * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
>     * @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
>   - * @version $Id: JetspeedProfilerService.java,v 1.28 2002/05/16 20:00:43 taylor Exp
$
>   + * @version $Id: JetspeedProfilerService.java,v 1.29 2002/05/20 13:05:05 ggolden Exp
$
>     */
>    
>    public class JetspeedProfilerService  extends TurbineBaseService
>   @@ -731,17 +731,36 @@
>            throws ProfileException
>        {
>            DynamicURI uri = new DynamicURI( data );
>   -        Group group = locator.getGroup();
>   -        if (null != group)
>   -            uri.addPathInfo(Profiler.PARAM_GROUP, group.getName());
>   -        else {
>   -            Role role = locator.getRole();
>   -            if (null != role)
>   -                uri.addPathInfo(Profiler.PARAM_ROLE, role.getName());
>   +
>   +        // check User, Group or Role to add to the uri
>   +        User user = locator.getUser();
>   +        if (null != user)
>   +        {
>   +            uri.addPathInfo(Profiler.PARAM_USER, user.getUserName());
>            }
>   +        else
>   +        {
>   +            Group group = locator.getGroup();
>   +            if (null != group)
>   +            {
>   +                uri.addPathInfo(Profiler.PARAM_GROUP, group.getName());
>   +            }
>   +            else
>   +            {
>   +                Role role = locator.getRole();
>   +                if (null != role)
>   +                {
>   +                    uri.addPathInfo(Profiler.PARAM_ROLE, role.getName());
>   +                }
>   +            }
>   +        }
>   +
>   +        // check Page to add to the uri
>            String page = locator.getName();
>            if (null != page)
>   +        {
>                uri.addPathInfo(Profiler.PARAM_PAGE, page);
>   +        }
>    
>            return uri;
>        }
>   
>   
>   
> 
> --
> 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