cvs commit: jahia/core/src/java/org/jahia/ajax/monitors PDisplayAction.java

[Dominique Pillot]

dpillot     2005/12/21 15:38:58 CET

  Modified files:
    core/src/java/org/jahia/ajax/monitors PDisplayAction.java 
  Log:
  commented unused methods and put the trace in debug
  
  Revision  Changes    Path
  1.6       +14 -11    
jahia/core/src/java/org/jahia/ajax/monitors/PDisplayAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/ajax/monitors/PDisplayAction.java.diff?r1=1.5&r2=1.6&f=h
  
  
  
  Index: PDisplayAction.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/ajax/monitors/PDisplayAction.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PDisplayAction.java       14 Dec 2005 16:05:59 -0000      1.5
  +++ PDisplayAction.java       21 Dec 2005 14:38:58 -0000      1.6
  @@ -28,12 +28,12 @@
    * (the better approximation we have for now of the "working charge" of 
process server).
    *
    * @author joepi
  - * @version $Id: PDisplayAction.java,v 1.5 2005/12/14 16:05:59 dpillot Exp $
  + * @version $Id: PDisplayAction.java,v 1.6 2005/12/21 14:38:58 dpillot Exp $
    */
   public class PDisplayAction extends AjaxAction {
   
       private static final Logger logger =
  -            org.apache.log4j.Logger.getLogger(PDisplayAction.class);
  +            Logger.getLogger(PDisplayAction.class);
   
   
       /**
  @@ -57,9 +57,8 @@
               final JahiaSite site = (JahiaSite) 
request.getSession().getAttribute("org.jahia.services.sites.jahiasite");
   
               if (currentUser == null || site == null /*|| 
!currentUser.isRoot() || !currentUser.isAdminMember(site.getID())*/) {
  -                logger.warn("Unauthorized attempt to use AJAX Struts Action 
- Process display");
  -                response.sendError(HttpServletResponse.SC_FORBIDDEN,
  -                        "Error: Must be logged in and have 'Admin' access");
  +                logger.debug("Unauthorized attempt to use AJAX Struts Action 
- Process display");
  +                response.sendError(HttpServletResponse.SC_FORBIDDEN, "Error: 
Must be logged in and have 'Admin' access");
                   return null;
               }
               //logger.debug("user:"+currentUser.getUsername()+" 
(isroot:"+currentUser.isRoot()+") 
(isAdmin:"+currentUser.isAdminMember(site.getID())+")");
  @@ -107,6 +106,7 @@
        * @return a list of jobdetails
        * @throws JahiaException
        */
  +    /*
       private List getAllProcess() throws JahiaException {
           String[] process = service.getJobNames(Scheduler.DEFAULT_GROUP);
   
  @@ -117,7 +117,7 @@
               list.add(jd);
           }
           return list;
  -    }
  +    }*/
   
       /**
        * to get only Site Process
  @@ -125,7 +125,7 @@
        * @param sitekey
        * @return a list containing only jobdetails on the site
        */
  -    private List getSiteProcessList(String sitekey) {
  +    /*private List getSiteProcessList(String sitekey) {
           List all;
           List list = new Vector();
           try {
  @@ -145,7 +145,7 @@
               }
           }
           return list;
  -    }
  +    }*/
   
       /**
        * to get only User process
  @@ -153,7 +153,7 @@
        * @param user
        * @return a list containing only jobdetails for current user
        */
  -    private List getUserProcessList(JahiaUser user) {
  +    /*private List getUserProcessList(JahiaUser user) {
           List all;
           List list = new Vector();
           try {
  @@ -172,12 +172,15 @@
               }
           }
           return list;
  -    }
  +    }*/
   
       private SchedulerService service = 
ServicesRegistry.getInstance().getSchedulerService();
   }
   /**
    * $Log: PDisplayAction.java,v $
  + * Revision 1.6  2005/12/21 14:38:58  dpillot
  + * commented unused methods and put the trace in debug
  + *
    * Revision 1.5  2005/12/14 16:05:59  dpillot
    * fix xml syntax and move method to schedulerservice
    *