You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by df...@apache.org on 2004/06/07 19:21:54 UTC
cvs commit: jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor CachedContent.java
dflorey 2004/06/07 10:21:54
Modified: proposals/projector/src/java/org/apache/slide/projector/processor/table
TablePager.java
proposals/projector/src/java/org/apache/slide/projector/expression
TrueExpression.java Expression.java
EventExpression.java ExpressionFactory.java
OrExpression.java AndExpression.java
proposals/projector/src/java/org/apache/slide/projector/engine
Scheduler.java Process.java
proposals/projector/src/java/org/apache/slide/projector/processor
CachedContent.java
Added: proposals/projector/src/java/org/apache/slide/projector/engine
Job.java
Log:
Reanimated asynchronous workflow support based on notifications
Revision Changes Path
1.5 +11 -15 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TablePager.java
Index: TablePager.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/table/TablePager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TablePager.java 7 Jun 2004 10:44:50 -0000 1.4
+++ TablePager.java 7 Jun 2004 17:21:53 -0000 1.5
@@ -92,13 +92,13 @@
}
StringBuffer buffer = new StringBuffer();
if (pre != null) pre.evaluate(buffer, parameters);
- createHandler(0, handlerUrl, storeName, id, parameters);
+ createHandler(0, itemsPerPage, handlerUrl, storeName, id, parameters);
if ( firstSelected != null && !hasPrevious ) {
firstSelected.evaluate(buffer, parameters);
} else if ( first != null) {
first.evaluate(buffer, parameters);
}
- createHandler(Math.max(0, currentPosition - itemsPerPage), handlerUrl, storeName, id, parameters);
+ createHandler(Math.max(0, currentPosition - itemsPerPage), itemsPerPage, handlerUrl, storeName, id, parameters);
if (hasPrevious) {
if ( previous != null) previous.evaluate(buffer, parameters);
} else {
@@ -110,10 +110,11 @@
int itemsInRange = range * step;
int lowerBorder = currentPosition - itemsInRange;
int upperBorder = currentPosition + itemsInRange;
- for (int i = 0; i < length; i += step) {
+ int i = 0;
+ for (; i < length; i += step) {
lastItem = i;
parameters.put(CURRENT_PAGE, new NumberValue(new Integer(i / itemsPerPage + 1)));
- createHandler(i, handlerUrl, storeName, id, parameters);
+ createHandler(i, Math.min(i+itemsPerPage, length), handlerUrl, storeName, id, parameters);
int rangeState = IN;
if (showRange && (i < lowerBorder || i > upperBorder)) rangeState = OUT;
if (showRange && (i == lowerBorder || i == upperBorder)) rangeState = BORDER;
@@ -141,13 +142,13 @@
templateToUse.evaluate(buffer, parameters);
}
}
- createHandler(currentPosition + itemsPerPage, handlerUrl, storeName, id, parameters);
+ createHandler(currentPosition + itemsPerPage, itemsPerPage, handlerUrl, storeName, id, parameters);
if (hasNext) {
if ( next != null) next.evaluate(buffer, parameters);
} else {
if ( nextDisabled != null) nextDisabled.evaluate(buffer, parameters);
}
- createHandler(length - itemsPerPage, handlerUrl, storeName, id, parameters);
+ createHandler(i-itemsPerPage, length, handlerUrl, storeName, id, parameters);
if ( lastSelected != null && !hasNext ) {
lastSelected.evaluate(buffer, parameters);
} else if ( last != null) {
@@ -158,25 +159,20 @@
return result;
}
- protected void createHandler(int i, String handlerUrl, String storeName, String id, Map parameters) {
+ protected void createHandler(int i, int lastItem, String handlerUrl, String storeName, String id, Map parameters) {
parameters.put(TableHandler.TARGET_POSITION, new NumberValue(new Integer(i)));
StringBuffer handlerBuffer = new StringBuffer(128);
handlerBuffer.append(handlerUrl).append('?').append(TableHandler.TARGET_POSITION).append('=').append(i).
append('&').append(TableHandler.STORE).append('=').append(storeName).append('&').append(TableHandler.ID).append('=').append(id);
parameters.put(HANDLER_URL, new StringValue(handlerBuffer.toString()));
+ parameters.put(FIRST_ITEM, new NumberValue(new Integer(i+1)));
+ parameters.put(LAST_ITEM, new NumberValue(new Integer(lastItem)));
}
public void configure(StreamableValue config) throws ConfigurationException {
super.configure(config);
- ParameterDescriptor []parentParameterDescriptors = super.getParameterDescriptors();
// remove fragment parameter
List parameterList = new ArrayList();
- for ( int i = 0; i < parentParameterDescriptors.length; i++ ) {
- ParameterDescriptor descriptor = parentParameterDescriptors[i];
- if ( descriptor.getName() != FRAGMENT && !descriptor.getName().equals(CURRENT_PAGE) && !descriptor.getName().equals(HANDLER_URL) && !descriptor.getName().equals(TableHandler.TARGET_POSITION) ) {
- parameterList.add(parentParameterDescriptors[i]);
- }
- }
parameterList.add(new ParameterDescriptor(SHOW_RANGE, new ParameterMessage("tablePager/showRange"), new BooleanValueDescriptor(), BooleanValue.FALSE));
parameterList.add(new ParameterDescriptor(RANGE, new ParameterMessage("tablePager/range"), new NumberValueDescriptor(), new NumberValue(new Integer(0))));
parameterList.add(new ParameterDescriptor(TableHandler.ID, new ParameterMessage("tableRenderer/id"), new StringValueDescriptor(), new StringValue("table")));
1.2 +9 -5 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/expression/TrueExpression.java
Index: TrueExpression.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/expression/TrueExpression.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TrueExpression.java 3 May 2004 14:20:28 -0000 1.1
+++ TrueExpression.java 7 Jun 2004 17:21:53 -0000 1.2
@@ -26,7 +26,7 @@
import de.zeigermann.xml.XMLStringWriter;
import de.zeigermann.xml.XMLWriter;
-import java.util.Map;
+import org.apache.slide.projector.engine.Job;
/**
* The TrueExpression class
@@ -34,7 +34,11 @@
* @author <a href="mailto:dflorey@c1-fse.de">Daniel Florey</a>
*/
public class TrueExpression implements Expression {
- public boolean evaluate(Map information) {
+ public Expression activate(Job job) {
+ return this;
+ }
+
+ public boolean evaluate() {
return true;
}
1.2 +8 -6 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/expression/Expression.java
Index: Expression.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/expression/Expression.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Expression.java 3 May 2004 14:20:28 -0000 1.1
+++ Expression.java 7 Jun 2004 17:21:53 -0000 1.2
@@ -23,9 +23,9 @@
package org.apache.slide.projector.expression;
-import de.zeigermann.xml.XMLStringWriter;
+import org.apache.slide.projector.engine.Job;
-import java.util.Map;
+import de.zeigermann.xml.XMLStringWriter;
/**
* The Expression interface
@@ -33,7 +33,9 @@
* @author <a href="mailto:dflorey@c1-fse.de">Daniel Florey</a>
*/
public interface Expression {
- public boolean evaluate(Map information);
+ public Expression activate(Job job);
+
+ public boolean evaluate();
public void save(XMLStringWriter writer);
}
1.2 +50 -14 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EventExpression.java 3 May 2004 14:20:28 -0000 1.1
+++ EventExpression.java 7 Jun 2004 17:21:53 -0000 1.2
@@ -25,8 +25,17 @@
import de.zeigermann.xml.XMLStringWriter;
import de.zeigermann.xml.XMLWriter;
+
+import org.apache.slide.projector.Constants;
+import org.apache.slide.projector.URI;
+import org.apache.slide.projector.connector.ConnectorFactory;
+import org.apache.slide.projector.connector.Subscriber;
+import org.apache.slide.projector.engine.Job;
import org.apache.slide.projector.engine.Scheduler;
+import org.apache.slide.projector.value.URIValue;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
/**
@@ -34,21 +43,37 @@
*
* @author <a href="mailto:dflorey@c1-fse.de">Daniel Florey</a>
*/
-public class EventExpression implements Expression {
- private String method, key, value;
+public class EventExpression implements Expression, Subscriber {
+ public final static String URI = "uri";
+ public final static String DEPTH = "depth";
+
+ private String method;
+ private Map properties = new HashMap();
private boolean eval = false;
+ private Job job;
- public EventExpression(String method, String key, String value) {
+ public EventExpression(String method) {
this.method = method;
- this.key = key;
- this.value = value;
}
- public boolean evaluate(Map information) {
- if ( information.containsKey(key) && information.get(key).equals(value)) {
- Scheduler.getInstance().saveJobs();
- eval = true;
- }
+ public void addProperty(String key, String value) {
+ properties.put(key, value);
+ }
+
+ public Expression activate(Job job) {
+ this.job = job;
+ EventExpression activatedExpression = new EventExpression(method);
+ 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);
+ return activatedExpression;
+ }
+
+ public boolean evaluate() {
return eval;
}
@@ -56,7 +81,18 @@
if ( eval ) {
new TrueExpression().save(writer);
} else {
- writer.writeEmptyElement(XMLWriter.createEmptyTag("event", new String[][] {{"method", method},{"key", key}, {"value", value }}));
+ 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.writeEndTag(XMLWriter.createEndTag("event"));
}
+ }
+
+ public void notify(URI uri, Map information) {
+ eval = true;
+ ConnectorFactory.getConnector().unsubscribe(new URIValue(Constants.REPOSITORY_DOMAIN+(String)properties.get(URI)), this, Constants.CREDENTIALS);
+ Scheduler.getInstance().notify(job);
}
}
1.3 +10 -6 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/expression/ExpressionFactory.java
Index: ExpressionFactory.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/expression/ExpressionFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExpressionFactory.java 24 May 2004 12:33:41 -0000 1.2
+++ ExpressionFactory.java 7 Jun 2004 17:21:53 -0000 1.3
@@ -44,9 +44,13 @@
expression = new TrueExpression();
} else if ( name.equals("event") ) {
String method = element.getAttributeValue("method");
- String key = element.getAttributeValue("key");
- String value = element.getAttributeValue("value");
- expression = new EventExpression(method, key, value);
+ expression = new EventExpression(method);
+ for ( Iterator i = element.getChildren().iterator(); i.hasNext(); ) {
+ Element child = (Element)i.next();
+ String key = child.getAttributeValue("key");
+ String value = child.getAttributeValue("value");
+ ((EventExpression)expression).addProperty(key, value);
+ }
}
if ( expression instanceof EnclosingExpression ) {
for ( Iterator i = element.getChildren().iterator(); i.hasNext(); ) {
1.2 +15 -6 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/expression/OrExpression.java
Index: OrExpression.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/expression/OrExpression.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OrExpression.java 3 May 2004 14:20:28 -0000 1.1
+++ OrExpression.java 7 Jun 2004 17:21:53 -0000 1.2
@@ -29,7 +29,8 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
+
+import org.apache.slide.projector.engine.Job;
/**
* The AndExpression class
@@ -39,15 +40,23 @@
public class OrExpression implements EnclosingExpression {
private List nestedExpressions = new ArrayList();
+ public Expression activate(Job job) {
+ OrExpression activatedExpression = new OrExpression();
+ for ( Iterator i = nestedExpressions.iterator(); i.hasNext(); ) {
+ activatedExpression.addExpression(((Expression)i.next()).activate(job));
+ }
+ return activatedExpression;
+ }
+
public void addExpression(Expression expression) {
nestedExpressions.add(expression);
}
- public boolean evaluate(Map information) {
+ public boolean evaluate() {
boolean eval = false;
for ( Iterator i = nestedExpressions.iterator(); i.hasNext(); ) {
Expression expression = (Expression)i.next();
- if ( expression.evaluate(information )) {
+ if ( expression.evaluate()) {
eval = true;
}
}
1.2 +15 -6 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/expression/AndExpression.java
Index: AndExpression.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/expression/AndExpression.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AndExpression.java 3 May 2004 14:20:28 -0000 1.1
+++ AndExpression.java 7 Jun 2004 17:21:53 -0000 1.2
@@ -29,7 +29,8 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
+
+import org.apache.slide.projector.engine.Job;
/**
* The AndExpression class
@@ -39,15 +40,23 @@
public class AndExpression implements EnclosingExpression {
private List nestedExpressions = new ArrayList();
+ public Expression activate(Job job) {
+ AndExpression activatedExpression = new AndExpression();
+ for ( Iterator i = nestedExpressions.iterator(); i.hasNext(); ) {
+ activatedExpression.addExpression(((Expression)i.next()).activate(job));
+ }
+ return activatedExpression;
+ }
+
public void addExpression(Expression expression) {
nestedExpressions.add(expression);
}
- public boolean evaluate(Map information) {
+ public boolean evaluate() {
boolean eval = true;
for ( Iterator i = nestedExpressions.iterator(); i.hasNext(); ) {
Expression expression = (Expression)i.next();
- if ( !expression.evaluate(information )) {
+ if ( !expression.evaluate()) {
eval = false;
}
}
1.6 +14 -78 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Scheduler.java 1 Jun 2004 07:49:54 -0000 1.5
+++ Scheduler.java 7 Jun 2004 17:21:53 -0000 1.6
@@ -22,7 +22,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-public class Scheduler implements Subscriber {
+public class Scheduler {
private final static Logger logger = Logger.getLogger(Scheduler.class.getName());
private final static String SCHEDULER_CONFIG = "scheduler.xml";
@@ -33,11 +33,6 @@
private static ThreadLocal threadContext = new ThreadLocal();
private static Timer timer = new Timer();
- static {
- ConnectorFactory.getConnector().subscribe("Update", new URIValue(Constants.DOMAIN),
- 0, Constants.SUBSCRIPTION_LIFETIME, Constants.NOTIFICATION_DELAY, scheduler, Constants.CREDENTIALS);
- }
-
private List jobs = new ArrayList();
private Map installedJobs = new HashMap();
@@ -83,7 +78,7 @@
Processor processor = ProcessorManager.getInstance().getProcessor(job.getProcessorURI());
Map processorParameters = Process.loadParameters(job, processor, new HashMap(), null, context);
ProcessorHelper.validate(processor.getParameterDescriptors(), processorParameters, context);
- addJob(job.getExpression(), job.getProcessorURI(), processorParameters, job.repeat(), job.isPersistent());
+ activateJob(new Job(job.getExpression(), job.getProcessorURI(), processorParameters, job.repeat(), job.isPersistent()));
}
ConnectorFactory.getConnector().subscribe("Update", jobsUri,
0, Constants.SUBSCRIPTION_LIFETIME, Constants.NOTIFICATION_DELAY,
@@ -125,44 +120,20 @@
return timer;
}
- public void notify(URI uri, Map information) {
- logger.log(Level.INFO, "Scheduler received map='"+information+"'");
- synchronized( jobs) {
- for ( Iterator i = jobs.iterator(); i.hasNext(); ) {
- final Job job = (Job)i.next();
- if ( job.getExpression().evaluate(information) ) {
- if ( !job.repeat() ) {
- i.remove();
- if ( job.isPersistent() ) {
- saveJobs();
- }
- }
- try {
- Thread processThread = new Thread(new Runnable() {
- public void run() {
- try {
- Processor processor = ProcessorManager.getInstance().getProcessor(job.getProcessorUri());
- logger.log(Level.INFO, "Launching scheduled process '"+processor+"'");
- Context context = new SystemContext();
- Scheduler.setContext(context);
- processor.process(job.getParameter(), context);
- } catch ( Exception e ) {
- logger.log(Level.SEVERE, "Scheduled process '"+job.getProcessorUri()+"' failed", e);
- }
- }
- });
- processThread.setDaemon(true);
- processThread.start();
- } catch ( Exception exception ) {
- logger.log(Level.SEVERE, "Exception occured while doing job: "+job, exception);
- }
+ public void notify(final Job job) {
+ if ( job.getExpression().evaluate() ) {
+ if ( !job.repeat() ) {
+ jobs.remove(job);
+ if ( job.isPersistent() ) {
+ saveJobs();
}
}
- }
- }
-
- public void addJob(Expression expression, URI processorUri, Map parameter, boolean repeat, boolean persistent) {
- Job job = new Job(expression, processorUri, parameter, repeat, persistent);
+ job.launch();
+ }
+ }
+
+ public void activateJob(Job job) {
+ job.getExpression().activate(job);
if ( job.isPersistent() ) {
saveJobs();
}
@@ -212,41 +183,6 @@
ConnectorFactory.getConnector().setResource(new URIValue(Constants.CONFIG_DIR + JOBS), new StringValue(writer.toString()), Constants.CREDENTIALS);
} catch (IOException exception) {
logger.log(Level.SEVERE, "Exception occured while writing jobs to repository", exception);
- }
- }
-
- private class Job {
- private Expression expression;
- private URI processorUri;
- private Map parameter;
- private boolean repeat, persistent;
-
- public Job(Expression expression, URI processorUri, Map parameter, boolean repeat, boolean persistent) {
- this.expression = expression;
- this.processorUri = processorUri;
- this.parameter = parameter;
- this.repeat = repeat;
- this.persistent = persistent;
- }
-
- 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;
}
}
}
1.11 +2 -1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Process.java
Index: Process.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Process.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Process.java 3 Jun 2004 14:53:14 -0000 1.10
+++ Process.java 7 Jun 2004 17:21:53 -0000 1.11
@@ -151,7 +151,8 @@
saveResults(step, stepResult, stepStore, result, getResultDescriptor().getResultEntryDescriptors(), context);
} else {
// expression set, so schedule this processor as job
- Scheduler.getInstance().addJob(step.getExpression(), step.getProcessorURI(), processorParameters, step.repeat(), step.isPersistent());
+ Job job = new Job(step.getExpression(), step.getProcessorURI(), processorParameters, step.repeat(), step.isPersistent());
+ Scheduler.getInstance().activateJob(job);
stepResult = new Result(OK);
}
nextStep = routeState(step, stepResult.getState());
1.1 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/Job.java
Index: Job.java
===================================================================
/*
*
* ====================================================================
*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
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 {
private final static Logger logger = Logger.getLogger(Job.class.getName());
private Expression expression;
private URI processorUri;
private Map parameter;
private boolean repeat, persistent;
public Job(Expression expression, URI processorUri, Map parameter, boolean repeat, boolean persistent) {
this.expression = expression;
this.processorUri = processorUri;
this.parameter = new HashMap();
this.parameter.putAll(parameter);
this.repeat = repeat;
this.persistent = persistent;
}
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 void run() {
try {
Processor processor = ProcessorManager.getInstance().getProcessor(getProcessorUri());
logger.log(Level.INFO, "Launching scheduled process '"+getProcessorUri()+"'");
Context context = new SystemContext();
Scheduler.setContext(context);
processor.process(getParameter(), context);
} catch ( Exception e ) {
logger.log(Level.SEVERE, "Scheduled process '"+getProcessorUri()+"' failed", e);
}
}
public void launch() {
try {
Thread processThread = new Thread(this);
processThread.setDaemon(true);
processThread.start();
} catch ( Exception exception ) {
logger.log(Level.SEVERE, "Exception occured while doing job: "+this, exception);
}
}
}
1.5 +6 -2 jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/CachedContent.java
Index: CachedContent.java
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/CachedContent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CachedContent.java 1 Jun 2004 07:49:55 -0000 1.4
+++ CachedContent.java 7 Jun 2004 17:21:54 -0000 1.5
@@ -4,6 +4,7 @@
import org.apache.slide.projector.connector.ConnectorFactory;
import org.apache.slide.projector.connector.Subscriber;
import org.apache.slide.projector.descriptor.*;
+import org.apache.slide.projector.engine.Job;
import org.apache.slide.projector.engine.ProcessorManager;
import org.apache.slide.projector.engine.Scheduler;
import org.apache.slide.projector.expression.EventExpression;
@@ -45,7 +46,10 @@
Map jobParameter = new HashMap();
jobParameter.put(Dispose.STORE, Store.stores[Store.CACHE]);
jobParameter.put(Dispose.KEY, uri.toString());
- Scheduler.getInstance().addJob(new EventExpression("Update", Subscriber.URI, uri.toString()), new URIValue("/dispose"), jobParameter, false, false);
+ EventExpression expression = new EventExpression("Update");
+ expression.addProperty(EventExpression.DEPTH, "0");
+ expression.addProperty(EventExpression.URI, uri.toString());
+ Scheduler.getInstance().activateJob(new Job(expression, new URIValue("dispose"), jobParameter, false, false));
}
resultEntries.put(SimpleProcessor.OUTPUT, output);
// build url to activate this processor on top level
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org