You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/02/25 14:26:35 UTC

cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/scheduler LoadQuartzServlet.java

andreas     2004/02/25 05:26:35

  Modified:    src/java/org/apache/lenya/cms/scheduler
                        LoadQuartzServlet.java
  Log:
  refactoring
  
  Revision  Changes    Path
  1.37      +32 -22    cocoon-lenya/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java
  
  Index: LoadQuartzServlet.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- LoadQuartzServlet.java	2 Feb 2004 02:50:39 -0000	1.36
  +++ LoadQuartzServlet.java	25 Feb 2004 13:26:35 -0000	1.37
  @@ -109,7 +109,7 @@
        * Returns the scheduler wrapper.
        * @return A scheduler wrapper.
        */
  -    protected static SchedulerWrapper getScheduler() {
  +    public static SchedulerWrapper getScheduler() {
           return scheduler;
       }
   
  @@ -251,25 +251,7 @@
           log.debug("----------------------------------------------------------------");
           log.debug("Request parameters:");
   
  -        Map parameterMap = new HashMap();
  -        List keys = new ArrayList();
  -        for (Enumeration e = request.getParameterNames(); e.hasMoreElements();) {
  -            String key = (String) e.nextElement();
  -            keys.add(key);
  -        }
  -        Collections.sort(keys);
  -        for (Iterator i = keys.iterator(); i.hasNext();) {
  -            String key = (String) i.next();
  -            String[] values = request.getParameterValues(key);
  -            log.debug("    [" + key + "] = [" + values[0] + "]");
  -            if (values.length == 1) {
  -                parameterMap.put(key, values[0]);
  -            } else {
  -                parameterMap.put(key, values);
  -            }
  -        }
  -
  -        NamespaceMap schedulerParameters = new NamespaceMap(parameterMap, PREFIX);
  +        NamespaceMap schedulerParameters = getSchedulerParameters(request);
   
           try {
               String publicationId = (String) schedulerParameters.get(PARAMETER_PUBLICATION_ID);
  @@ -319,6 +301,34 @@
               log.error("Can't create job snapshot: ", e);
               throw new IOException(e.getMessage() + " (view log for details)");
           }
  +    }
  +
  +    /**
  +     * Extracts the scheduler parameters from a request.
  +     * @param request The request.
  +     * @return A namespace map.
  +     */
  +    public static NamespaceMap getSchedulerParameters(HttpServletRequest request) {
  +        Map parameterMap = new HashMap();
  +        List keys = new ArrayList();
  +        for (Enumeration e = request.getParameterNames(); e.hasMoreElements();) {
  +            String key = (String) e.nextElement();
  +            keys.add(key);
  +        }
  +        Collections.sort(keys);
  +        for (Iterator i = keys.iterator(); i.hasNext();) {
  +            String key = (String) i.next();
  +            String[] values = request.getParameterValues(key);
  +            log.debug("    [" + key + "] = [" + values[0] + "]");
  +            if (values.length == 1) {
  +                parameterMap.put(key, values[0]);
  +            } else {
  +                parameterMap.put(key, values);
  +            }
  +        }
  +        
  +        NamespaceMap schedulerParameters = new NamespaceMap(parameterMap, PREFIX);
  +        return schedulerParameters;
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org