lenya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andr...@apache.org
Subject cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/task Task.java TaskFactory.java TaskManager.java TaskSequence.java
Date Fri, 30 May 2003 21:04:38 GMT
andreas     2003/05/30 14:04:38

  Modified:    src/java/org/apache/lenya/cms/task Task.java
                        TaskFactory.java TaskManager.java TaskSequence.java
  Log:
  corrected some coding style issues
  
  Revision  Changes    Path
  1.11      +6 -6      cocoon-lenya/src/java/org/apache/lenya/cms/task/Task.java
  
  Index: Task.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/task/Task.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Task.java	24 Apr 2003 13:52:59 -0000	1.10
  +++ Task.java	30 May 2003 21:04:38 -0000	1.11
  @@ -59,31 +59,31 @@
        * The path of the servlet
        * context:<br/><code>/home/user_id/build/jakarta-tomcat/webapps/lenyacms</code>
        */
  -    static final String PARAMETER_SERVLET_CONTEXT = "servlet-context";
  +    String PARAMETER_SERVLET_CONTEXT = "servlet-context";
   
       /**
        * The server
        * URI:<br/><code><strong>http://www.yourhost.com</strong>:8080/lenya/publication/index.html</code>
        */
  -    static final String PARAMETER_SERVER_URI = "server-uri";
  +    String PARAMETER_SERVER_URI = "server-uri";
   
       /**
        * The server
        * port:<br/><code>http://www.yourhost.com:<strong>8080</strong>/lenya/publication/index.html</code>
        */
  -    static final String PARAMETER_SERVER_PORT = "server-port";
  +    String PARAMETER_SERVER_PORT = "server-port";
   
       /**
        * The part of the URI that precedes the publication
        * ID:<br/><code>http://www.yourhost.com:8080<strong>/lenya/</strong>publication/index.html</code>
        */
  -    static final String PARAMETER_CONTEXT_PREFIX = "context-prefix";
  +    String PARAMETER_CONTEXT_PREFIX = "context-prefix";
   
       /**
        * The publication
        * ID:<br/><code>http://www.yourhost.com:8080/lenya/<strong>publication</strong>/index.html</code>
        */
  -    static final String PARAMETER_PUBLICATION_ID = "publication-id";
  +    String PARAMETER_PUBLICATION_ID = "publication-id";
   
       /**
        * Execute the task. All parameters must have been set with parameterize().
  
  
  
  1.10      +6 -2      cocoon-lenya/src/java/org/apache/lenya/cms/task/TaskFactory.java
  
  Index: TaskFactory.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/task/TaskFactory.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TaskFactory.java	24 Apr 2003 13:52:59 -0000	1.9
  +++ TaskFactory.java	30 May 2003 21:04:38 -0000	1.10
  @@ -55,8 +55,12 @@
    * @author ah
    */
   public class TaskFactory {
  +	
  +	protected TaskFactory() {
  +	}
  +	
       private static TaskFactory factory;
  -    static Category log = Category.getInstance(TaskFactory.class);
  +    private static Category log = Category.getInstance(TaskFactory.class);
   
       /**
        * DOCUMENT ME!
  
  
  
  1.12      +5 -5      cocoon-lenya/src/java/org/apache/lenya/cms/task/TaskManager.java
  
  Index: TaskManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/task/TaskManager.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TaskManager.java	28 May 2003 14:53:37 -0000	1.11
  +++ TaskManager.java	30 May 2003 21:04:38 -0000	1.12
  @@ -62,10 +62,10 @@
    * @author ah
    */
   public class TaskManager implements Configurable {
  -    static Category log = Category.getInstance(TaskManager.class);
  -    public static String TASK_ELEMENT = "task";
  -    public static String TASK_ID_ATTRIBUTE = "id";
  -    public static String CONFIGURATION_FILE = File.separator + "config" + File.separator
+ "tasks" + File.separator + "tasks.xconf";
  +    private static Category log = Category.getInstance(TaskManager.class);
  +    public static final String TASK_ELEMENT = "task";
  +    public static final String TASK_ID_ATTRIBUTE = "id";
  +    public static final String CONFIGURATION_FILE = File.separator + "config" + File.separator
+ "tasks" + File.separator + "tasks.xconf";
   
       // maps task-ids to tasks
       private Map tasks = new HashMap();
  
  
  
  1.10      +2 -2      cocoon-lenya/src/java/org/apache/lenya/cms/task/TaskSequence.java
  
  Index: TaskSequence.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/task/TaskSequence.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TaskSequence.java	24 Apr 2003 13:52:59 -0000	1.9
  +++ TaskSequence.java	30 May 2003 21:04:38 -0000	1.10
  @@ -62,7 +62,7 @@
   public class TaskSequence
           extends AbstractTask {
       
  -    static Category log = Category.getInstance(TaskSequence.class);
  +    private static Category log = Category.getInstance(TaskSequence.class);
   
       // keeps the task order
       private Task[] tasks;
  
  
  

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


Mime
View raw message