dflorey     2004/06/08 07:43:16

  Modified:    proposals/projector/src/java/org/apache/slide/projector/engine
                        Scheduler.java Job.java ProcessorManager.java
                        JobDefinition.java
               proposals/projector/src/java/org/apache/slide/projector
                        Constants.java
               proposals/projector/src/java/org/apache/slide/projector/i18n
                        MessageManager.java
               proposals/projector/src/java/org/apache/slide/projector/expression
                        EventExpression.java
               
proposals/projector/src/java/org/apache/slide/projector/processor/process
                        ParameterConfiguration.java Process.java
               proposals/projector/src/java/org/apache/slide/projector/application
                        ApplicationManager.java
  Log:
  Persistent processes that listen for multiple events currently broken.
  Prepared to fix them.
  
  Revision  Changes    Path
  1.9       +49 -45    
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Scheduler.java
  
  Index: Scheduler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Scheduler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Scheduler.java    8 Jun 2004 09:48:24 -0000       1.8
  +++ Scheduler.java    8 Jun 2004 14:43:15 -0000       1.9
  @@ -3,16 +3,16 @@
   import de.zeigermann.xml.XMLStringWriter;
   import de.zeigermann.xml.XMLWriter;
   import org.apache.slide.projector.*;
  +import org.apache.slide.projector.processor.process.Process;
   import org.apache.slide.projector.application.*;
   import org.apache.slide.projector.connector.ConnectorFactory;
   import org.apache.slide.projector.connector.Subscriber;
  -import org.apache.slide.projector.expression.Expression;
  +import org.apache.slide.projector.processor.process.Step;
   import org.apache.slide.projector.util.ProcessorHelper;
   import org.apache.slide.projector.value.DocumentValue;
   import org.apache.slide.projector.value.StreamableValue;
   import org.apache.slide.projector.value.StringValue;
   import org.apache.slide.projector.value.URIValue;
  -import org.apache.slide.projector.value.Value;
   import org.jdom.Document;
   import org.jdom.Element;
   import org.jdom.xpath.XPath; 
  @@ -25,9 +25,10 @@
   public class Scheduler {
       private final static Logger logger = 
Logger.getLogger(Scheduler.class.getName());
   
  -    private final static String SCHEDULER_CONFIG = "scheduler.xml";
  -    private final static String JOBS = "jobs.xml";
  -     private final Context context = new SystemContext();
  +    public final static String JOBS = "jobs.xml";
  +    public final static String JOB_DEFINITIONS = "jobDefinitions.xml";
  +
  +    private final Context context = new SystemContext();
   
       private static Scheduler scheduler = new Scheduler();
       private static ThreadLocal threadContext = new ThreadLocal();
  @@ -46,26 +47,25 @@
       }
   
       public void install(String type, URI configurationUri) {
  -     if ( type == Application.MESSAGES ) {
  -             install(configurationUri);
  +     if ( type == Application.JOBS ) {
  +             install(configurationUri, true);
        }
       }
       
       public void uninstall(String type, URI configurationUri) {
  -     if ( type == Application.MESSAGES ) {
  +     if ( type == Application.JOBS ) {
                uninstall(configurationUri);
        }
       }
       
       public void update(String type, URI configurationUri) {
  -     if ( type == Application.MESSAGES ) {
  +     if ( type == Application.JOBS ) {
                update(configurationUri);
        }
       }
       
  -    public void install(URI jobsUri) {
  +    public void install(URI jobsUri, boolean listen) {
        logger.log(Level.INFO, "Installing scheduled jobs of application 
'"+jobsUri+"'");
  -     /*
        try {
                Map applicationJobs = new HashMap();
                StreamableValue jobsResource = 
(StreamableValue)ConnectorFactory.getConnector().getResource(jobsUri, 
Constants.CREDENTIALS);
  @@ -81,15 +81,17 @@
                                Processor processor = 
ProcessorManager.getInstance().getProcessor(job.getProcessorURI());
                                Map processorParameters = Process.loadParameters(job, 
processor, new HashMap(), null, context);
                                
ProcessorHelper.validate(processor.getParameterDescriptors(), processorParameters, 
context);
  -                             activateJob(new Job(job.getExpression(), 
job.getProcessorURI(), processorParameters, job.repeat(), job.isPersistent()));
  +                             processor.process(processorParameters, context);
  +                     }
  +                     if ( listen ) {
  +                             ConnectorFactory.getConnector().subscribe("Update", 
jobsUri,
  +                                             0, Constants.SUBSCRIPTION_LIFETIME, 
Constants.NOTIFICATION_DELAY,
  +                                                     new Subscriber() {
  +                                     public void notify(URI uri, Map information) {
  +                                             update(uri);
  +                                     }
  +                             }, Constants.CREDENTIALS);
                        }
  -                     ConnectorFactory.getConnector().subscribe("Update", jobsUri,
  -                                     0, Constants.SUBSCRIPTION_LIFETIME, 
Constants.NOTIFICATION_DELAY,
  -                                             new Subscriber() {
  -                             public void notify(URI uri, Map information) {
  -                                     update(uri);
  -                             }
  -                     }, Constants.CREDENTIALS);
                } else {
                        logger.log(Level.INFO, "Configured jobs resource '"+jobsUri+"' 
not found!");
                }
  @@ -98,7 +100,6 @@
           } catch (Exception exception) {
               logger.log(Level.SEVERE, "Error while parsing messages", exception);
           }
  -        */
        }
        
        public void uninstall(URI jobsUri) {
  @@ -114,7 +115,7 @@
   
        public void update(URI jobsUri) {
                uninstall(jobsUri);
  -             install(jobsUri);
  +             install(jobsUri, true);
        }       
        
       /**
  @@ -129,7 +130,7 @@
                        job.launch();
                        jobs.remove(job);
                        if ( job.repeat() ) {
  -             activateJob(job.getDefinition());
  +             activateJob(new Job(job.getDefinition()));
               }
                }
           if ( job.isPersistent() ) {
  @@ -142,12 +143,11 @@
                        jobDefinitions.add(jobDefinition);
                        saveJobDefinitions();
                }
  -             activateJob(jobDefinition);
  +             activateJob(new Job(jobDefinition));
        }
        
  -    public void activateJob(JobDefinition jobDefinition) {
  -     Job job = new Job(jobDefinition); 
  -        synchronized ( jobs ) {
  +    public void activateJob(Job job) {
  +     synchronized ( jobs ) {
               jobs.add(job);
           }
        if ( job.isPersistent() ) {
  @@ -166,37 +166,41 @@
           return (Context)threadContext.get();
       }
   
  -    public void saveJobDefinitions() {
  -    }
  -     
        public void saveJobs() {
           XMLStringWriter writer = XMLStringWriter.create();
           writer.writeXMLDeclaration();
           writer.writeStartTag(XMLWriter.createStartTag("jobs"));
           synchronized ( jobs ) {
  -            for ( Iterator i = jobs.iterator(); i.hasNext(); ) {
  +             for ( Iterator i = jobs.iterator(); i.hasNext(); ) {
                   Job job = (Job)i.next();
                   if (job.isPersistent()) {
  -                    writer.writeStartTag(XMLWriter.createStartTag("job", new 
String[] {"processor", "repeat", "persistent"}, new String[] { 
job.getProcessorUri().toString(), Boolean.toString(job.repeat()), 
Boolean.toString(job.isPersistent()) }));
  -                    Expression expression = job.getExpression();
  -                    if ( expression != null ) {
  -                        writer.writeStartTag(XMLWriter.createStartTag("if"));
  -                        expression.save(writer);
  -                        writer.writeEndTag(XMLWriter.createStartTag("if"));
  -                    }
  -                    for ( Iterator j = job.getParameter().entrySet().iterator(); 
j.hasNext(); ) {
  -                        Map.Entry entry = (Map.Entry)j.next();
  -                        writer.writeStartTag(XMLWriter.createStartTag("load", new 
String[][] { {"parameter", (String)entry.getKey() } }));
  -                        ((Value)entry.getValue()).save(writer);
  -                        writer.writeEndTag(XMLWriter.createEndTag("load"));
  -                    }
  -                    writer.writeEndTag(XMLWriter.createStartTag("job"));
  +                     job.save(writer);
                   }
               }
           }
           writer.writeEndTag(XMLWriter.createEndTag("jobs"));
           try {
  -            ConnectorFactory.getConnector().setResource(new 
URIValue(Constants.CONFIG_DIR + JOBS), new StringValue(writer.toString()), 
Constants.CREDENTIALS);
  +            ConnectorFactory.getConnector().setResource(new 
URIValue(Constants.WORK_DIR + JOBS), new StringValue(writer.toString()), 
Constants.CREDENTIALS);
  +        } catch (IOException exception) {
  +            logger.log(Level.SEVERE, "Exception occured while writing jobs to 
repository", exception);
  +        }
  +    }
  +     
  +     public void saveJobDefinitions() {
  +        XMLStringWriter writer = XMLStringWriter.create();
  +        writer.writeXMLDeclaration();
  +        writer.writeStartTag(XMLWriter.createStartTag("job-definitions"));
  +        synchronized ( jobs ) {
  +             for ( Iterator i = jobDefinitions.iterator(); i.hasNext(); ) {
  +                JobDefinition jobDefinition = (JobDefinition)i.next();
  +                if (jobDefinition.isPersistent()) {
  +                     jobDefinition.save(writer);
  +                }
  +            }
  +        }
  +        writer.writeEndTag(XMLWriter.createEndTag("job-definitions"));
  +        try {
  +            ConnectorFactory.getConnector().setResource(new 
URIValue(Constants.WORK_DIR + JOB_DEFINITIONS), new StringValue(writer.toString()), 
Constants.CREDENTIALS);
           } catch (IOException exception) {
               logger.log(Level.SEVERE, "Exception occured while writing jobs to 
repository", exception);
           }
  
  
  
  1.3       +4 -34     
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Job.java
  
  Index: Job.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Job.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Job.java  8 Jun 2004 09:48:24 -0000       1.2
  +++ Job.java  8 Jun 2004 14:43:15 -0000       1.3
  @@ -20,55 +20,25 @@
   package org.apache.slide.projector.engine;
   
   import java.util.HashMap;
  -import java.util.Map;
   import java.util.logging.Level;
   import java.util.logging.Logger;
   
   import org.apache.slide.projector.Context;
   import org.apache.slide.projector.Processor;
   import org.apache.slide.projector.SystemContext;
  -import org.apache.slide.projector.URI;
  -import org.apache.slide.projector.expression.Expression;
   
  -public class Job implements Runnable {
  +public class Job extends JobDefinition implements Runnable {
       private final static Logger logger = Logger.getLogger(Job.class.getName());
   
  -    private Expression expression;
  -    private URI processorUri;
  -    private Map parameter;
  -    private boolean repeat, persistent;
       private JobDefinition definition;
       
       public Job(JobDefinition definition) {
  +     super(definition.getExpression(), definition.getProcessorUri(), new HashMap(), 
definition.repeat(), definition.isPersistent());
        this.definition = definition;
  -        this.expression = definition.getExpression().activate(this);
  -        this.processorUri = definition.getProcessorUri();
  -             this.parameter = new HashMap();
  -             this.parameter.putAll(definition.getParameter());
  -        this.repeat = definition.repeat();
  -        this.persistent = definition.isPersistent();
  +     this.expression = getExpression().activate(this); 
  +             this.parameter.putAll(definition.getParameter());
       }
   
  -    public Expression getExpression() {
  -        return expression;
  -    }
  -
  -    public URI getProcessorUri() {
  -        return processorUri;
  -    }
  -
  -    public Map getParameter() {
  -        return parameter;
  -    }
  -
  -    public boolean repeat() {
  -        return repeat;
  -    }
  -
  -    public boolean isPersistent() {
  -        return persistent;
  -    }
  -    
       public JobDefinition getDefinition() {
        return definition;
       }
  
  
  
  1.16      +4 -0      
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java
  
  Index: ProcessorManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ProcessorManager.java     8 Jun 2004 09:04:05 -0000       1.15
  +++ ProcessorManager.java     8 Jun 2004 14:43:15 -0000       1.16
  @@ -10,10 +10,13 @@
   import org.apache.slide.projector.descriptor.ParameterDescriptor;
   import org.apache.slide.projector.descriptor.ProcessorDescriptor;
   import org.apache.slide.projector.descriptor.ResultDescriptor;
  +import org.apache.slide.projector.descriptor.ValidationException;
   import org.apache.slide.projector.i18n.DefaultMessage;
   import org.apache.slide.projector.i18n.ErrorMessage;
   import org.apache.slide.projector.processor.SimpleProcessor;
  +import org.apache.slide.projector.processor.process.ParameterConfiguration;
   import org.apache.slide.projector.processor.process.Process;
  +import org.apache.slide.projector.processor.process.Step;
   import org.apache.slide.projector.util.ProcessorHelper;
   import org.apache.slide.projector.value.StreamableValue;
   import org.apache.slide.projector.value.URIValue;
  @@ -38,6 +41,7 @@
       public final static URI BINARY = new URIValue("image");
       public final static URI LOCALE_RESOLVER = new URIValue("localeResolver");
       public final static URI URL = new URIValue("url");
  +    public final static URI THREAD = new URIValue("thread");
   
       private final static Logger logger = 
Logger.getLogger(ProcessorManager.class.getName());
       private final static String PROCESSOR_CONFIG = "processors.xml";
  
  
  
  1.2       +51 -2     
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/JobDefinition.java
  
  Index: JobDefinition.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/JobDefinition.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JobDefinition.java        8 Jun 2004 09:48:24 -0000       1.1
  +++ JobDefinition.java        8 Jun 2004 14:43:15 -0000       1.2
  @@ -19,18 +19,24 @@
    */
   package org.apache.slide.projector.engine;
   
  +import java.io.IOException;
  +import java.util.Iterator;
   import java.util.Map;
   import java.util.logging.Logger;
   
   import org.apache.slide.projector.URI;
   import org.apache.slide.projector.expression.Expression;
  +import org.apache.slide.projector.value.Value;
  +
  +import de.zeigermann.xml.XMLStringWriter;
  +import de.zeigermann.xml.XMLWriter;
   
   public class JobDefinition {
       private final static Logger logger = 
Logger.getLogger(JobDefinition.class.getName());
   
  -    private Expression expression;
  +    protected Expression expression;
  +    protected Map parameter;
       private URI processorUri;
  -    private Map parameter;
       private boolean repeat, persistent;
       
       public JobDefinition(Expression expression, URI processorUri, Map parameter, 
boolean repeat, boolean persistent) {
  @@ -59,5 +65,48 @@
   
       public boolean isPersistent() {
           return persistent;
  +    }
  +    
  +    public void save(XMLStringWriter writer) {
  +     writer.writeStartTag(XMLWriter.createStartTag("job", new String[] { "id", 
"processor" }, new String[] { "job-definition", ProcessorManager.THREAD.toString() }));
  +        Expression expression = getExpression();
  +             writer.writeStartTag(XMLWriter.createStartTag("load", "parameter", 
"parameters"));
  +             writer.writeStartTag(XMLWriter.createStartTag("map"));
  +        for ( Iterator i = getParameter().entrySet().iterator(); i.hasNext(); ) {
  +            Map.Entry entry = (Map.Entry)i.next();
  +            String key = (String)entry.getKey(); 
  +            writer.writeStartTag(XMLWriter.createStartTag("entry", new String[][] { 
{"key", key } }));
  +             ((Value)entry.getValue()).save(writer);
  +            writer.writeEndTag(XMLWriter.createEndTag("entry"));
  +        }
  +             writer.writeEndTag(XMLWriter.createEndTag("map"));
  +        writer.writeEndTag(XMLWriter.createEndTag("load"));
  +             writer.writeStartTag(XMLWriter.createStartTag("load", "parameter", 
"condition"));
  +        writer.writeStartTag(XMLWriter.createStartTag("value"));
  +        try {
  +             writer.write("<![CDATA[");
  +             expression.save(writer);
  +             writer.write("]]>");
  +        } catch ( IOException exception ) {
  +             // ignore
  +        }
  +        writer.writeEndTag(XMLWriter.createEndTag("value"));
  +        writer.writeEndTag(XMLWriter.createEndTag("load"));
  +             writer.writeStartTag(XMLWriter.createStartTag("load", "parameter", 
"repeat"));
  +        writer.writeStartTag(XMLWriter.createStartTag("value"));
  +             writer.writeCData(String.valueOf(repeat));
  +        writer.writeEndTag(XMLWriter.createEndTag("value"));
  +        writer.writeEndTag(XMLWriter.createEndTag("load"));
  +             writer.writeStartTag(XMLWriter.createStartTag("load", "parameter", 
"persistent"));
  +        writer.writeStartTag(XMLWriter.createStartTag("value"));
  +             writer.writeCData(String.valueOf(persistent));
  +        writer.writeEndTag(XMLWriter.createEndTag("value"));
  +        writer.writeEndTag(XMLWriter.createEndTag("load"));
  +             writer.writeStartTag(XMLWriter.createStartTag("load", "parameter", 
"processor"));
  +        writer.writeStartTag(XMLWriter.createStartTag("value"));
  +             writer.writeCData(getProcessorUri().toString());
  +        writer.writeEndTag(XMLWriter.createEndTag("value"));
  +        writer.writeEndTag(XMLWriter.createEndTag("load"));
  +        writer.writeEndTag(XMLWriter.createEndTag("job"));
       }
   }
  
  
  
  1.11      +5 -8      
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/Constants.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Constants.java    2 Jun 2004 15:35:39 -0000       1.10
  +++ Constants.java    8 Jun 2004 14:43:15 -0000       1.11
  @@ -45,16 +45,13 @@
       public final static int NOTIFICATION_DELAY = 0;
   
       public final static String DOMAIN = REPOSITORY_DOMAIN+"/files/";
  -    public final static String SYSTEM_HOME = DOMAIN + "contelligent/";
  -
  +    
       public final static String PROJECTOR_DIR = DOMAIN + "projector/";
       public final static String APPLICATIONS_DIR = PROJECTOR_DIR + "applications/";
  -    public final static String CONFIG_DIR = SYSTEM_HOME + "config/";
  -    public final static String CONTENT_DIR = SYSTEM_HOME + "content/";
  -    public final static String TEMPLATES_DIR = SYSTEM_HOME + "templates/";
  -    public final static String CLASSES_DIR = SYSTEM_HOME + "classes/";
  -
  -    public static final String PROCESS_STORAGE_PREFIX = SYSTEM_HOME+"jobs/";
  +    public final static String WORK_DIR = PROJECTOR_DIR + "work/";
  +     // FIXME: Use Classpath from applications
  +    public final static String CLASSES_DIR = PROJECTOR_DIR + "classes/";
  +    public final static String PROCESS_STORAGE_PREFIX = WORK_DIR + "process/";
   
       public static final URI DEFAULT_FORM_HANDLER = new URIValue("formHandler");
   }
  
  
  
  1.7       +2 -1      
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/i18n/MessageManager.java
  
  Index: MessageManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/i18n/MessageManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- MessageManager.java       1 Jun 2004 07:49:58 -0000       1.6
  +++ MessageManager.java       8 Jun 2004 14:43:16 -0000       1.7
  @@ -112,7 +112,7 @@
               logger.log(Level.INFO, "Removing message with key '"+messageKey+"'");
                }
                installedMessages.remove(messageUri);
  -             ConnectorFactory.getConnector().unsubscribe(messageUri, this, 
Constants.CREDENTIALS);
  +             ConnectorFactory.getConnector().unsubscribe(new 
URIValue(Constants.REPOSITORY_DOMAIN+messageUri), this, Constants.CREDENTIALS);
        }
       
       public void update(URI messagesUri) {
  @@ -121,6 +121,7 @@
       }
        
        public void notify(URI uri, Map information) {
  +             uri = new 
URIValue(uri.toString().substring(Constants.REPOSITORY_DOMAIN.length())); 
                uninstall(uri);
                install(uri);
        }
  
  
  
  1.3       +11 -6     
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/expression/EventExpression.java
  
  Index: EventExpression.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/expression/EventExpression.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EventExpression.java      7 Jun 2004 17:21:53 -0000       1.2
  +++ EventExpression.java      8 Jun 2004 14:43:16 -0000       1.3
  @@ -61,17 +61,22 @@
       }
       
       public Expression activate(Job job) {
  -     this.job = job;
        EventExpression activatedExpression = new EventExpression(method);
  +     activatedExpression.setJob(job);
  +     activatedExpression.properties.putAll(properties);
        String uri = (String)properties.get(URI);
        int depth = 0;
        String depthProperty = (String)properties.get(DEPTH);
        if ( depthProperty != null ) {
                depth = Integer.valueOf(depthProperty).intValue(); 
        }
  -     ConnectorFactory.getConnector().subscribe(method, new 
URIValue(Constants.REPOSITORY_DOMAIN+uri), depth, Constants.SUBSCRIPTION_LIFETIME, 
Constants.NOTIFICATION_DELAY, this, Constants.CREDENTIALS);
  +     ConnectorFactory.getConnector().subscribe(method, new 
URIValue(Constants.REPOSITORY_DOMAIN+uri), depth, Constants.SUBSCRIPTION_LIFETIME, 
Constants.NOTIFICATION_DELAY, activatedExpression, Constants.CREDENTIALS);
        return activatedExpression;
       }
  +
  +    public void setJob(Job job) {
  +     this.job = job;
  +    }
       
       public boolean evaluate() {
           return eval;
  @@ -84,7 +89,7 @@
               writer.writeStartTag(XMLWriter.createStartTag("event"));
               for ( Iterator i = properties.entrySet().iterator(); i.hasNext(); ) {
                Map.Entry entry = (Map.Entry)i.next();
  -             writer.writeEmptyElement(XMLWriter.createEmptyTag("property", 
(String)entry.getKey(), (String)entry.getValue()));
  +             writer.writeEmptyElement(XMLWriter.createEmptyTag("property", new 
String[] { "key", "value" }, new String[] { (String)entry.getKey(), 
(String)entry.getValue() }));
               }
               writer.writeEndTag(XMLWriter.createEndTag("event"));
           }
  
  
  
  1.2       +1 -1      
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/process/ParameterConfiguration.java
  
  Index: ParameterConfiguration.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/process/ParameterConfiguration.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ParameterConfiguration.java       8 Jun 2004 09:04:05 -0000       1.1
  +++ ParameterConfiguration.java       8 Jun 2004 14:43:16 -0000       1.2
  @@ -13,7 +13,7 @@
   import java.util.*;
   import java.util.logging.Logger;
   
  -class ParameterConfiguration {
  +public class ParameterConfiguration {
       private static Logger logger = 
Logger.getLogger(ParameterConfiguration.class.getName());
   
       private String name;
  
  
  
  1.2       +3 -3      
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/process/Process.java
  
  Index: Process.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/process/Process.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Process.java      8 Jun 2004 09:04:05 -0000       1.1
  +++ Process.java      8 Jun 2004 14:43:16 -0000       1.2
  @@ -243,7 +243,7 @@
                return key;
        }
        
  -     static Map loadParameters(Step step, Processor processor, Map parameter, Store 
stepStore, Context context) throws Exception {
  +     public static Map loadParameters(Step step, Processor processor, Map 
parameter, Store stepStore, Context context) throws Exception {
                // Collect parameters for this processor
                Map parameters = new HashMap();
                ParameterDescriptor[] parameterDescriptors = 
processor.getParameterDescriptors();
  @@ -269,8 +269,8 @@
                }
                return parameters;
        }
  -     
  -     private static void saveResults(Step step, Result stepResult, Store stepStore, 
Result result, ResultEntryDescriptor[] resultEntryDescriptors, Context context) {
  +
  +     public static void saveResults(Step step, Result stepResult, Store stepStore, 
Result result, ResultEntryDescriptor[] resultEntryDescriptors, Context context) {
                // save results by using result configuration
                for (Iterator i = 
step.getResultConfigurations().entrySet().iterator(); i.hasNext();) {
                        Map.Entry entry = (Map.Entry)i.next();
  
  
  
  1.7       +2 -0      
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/application/ApplicationManager.java
  
  Index: ApplicationManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/application/ApplicationManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApplicationManager.java   3 Jun 2004 14:53:14 -0000       1.6
  +++ ApplicationManager.java   8 Jun 2004 14:43:16 -0000       1.7
  @@ -11,6 +11,7 @@
   import org.apache.slide.projector.descriptor.ValueDescriptorManager;
   import org.apache.slide.projector.engine.ProcessorManager;
   import org.apache.slide.projector.engine.ProjectorClassLoader;
  +import org.apache.slide.projector.engine.Scheduler;
   import org.apache.slide.projector.i18n.MessageManager;
   import org.apache.slide.projector.value.ArrayValue;
   import org.apache.slide.projector.value.StreamableValue;
  @@ -58,6 +59,7 @@
        applicationListeners.add(ProcessorManager.getInstance());
        applicationListeners.add(MessageManager.getInstance());
        installApplications();
  +     Scheduler.getInstance().install(new URIValue(Constants.WORK_DIR + 
Scheduler.JOBS), false);
       }
   
       private synchronized void installApplications() {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to