dflorey 2004/07/23 09:14:54
Modified: projector/src/java/org/apache/slide/projector/repository/webdav
WebdavRepository.java
projector/src/java/org/apache/slide/projector/repository
Repository.java
projector/src/java/org/apache/slide/projector/engine
ProcessorManager.java Scheduler.java
projector/src/java/org/apache/slide/projector/application
ApplicationManager.java
projector/src/java/org/apache/slide/projector/i18n
MessageManager.java
projector/src/java/org/apache/slide/projector/expression
EventExpression.java
Removed: projector/src/java/org/apache/slide/projector/repository/webdav
WebdavDispatcher.java
projector/src/java/org/apache/slide/projector/repository
Subscriber.java
Log:
Moved notification listener to clientlib
Revision Changes Path
1.2 +7 -6
jakarta-slide/projector/src/java/org/apache/slide/projector/repository/webdav/WebdavRepository.java
Index: WebdavRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/repository/webdav/WebdavRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebdavRepository.java 22 Jul 2004 12:09:27 -0000 1.1
+++ WebdavRepository.java 23 Jul 2004 16:14:53 -0000 1.2
@@ -27,7 +27,6 @@
import org.apache.slide.projector.repository.Configurable;
import org.apache.slide.projector.repository.Repository;
import org.apache.slide.projector.repository.RoleExistsException;
-import org.apache.slide.projector.repository.Subscriber;
import org.apache.slide.projector.repository.UserExistsException;
import org.apache.slide.projector.value.ArrayValue;
import org.apache.slide.projector.value.ElementValue;
@@ -41,6 +40,8 @@
import org.apache.slide.projector.value.XMLValue;
import org.apache.webdav.lib.Property;
import org.apache.webdav.lib.PropertyName;
+import org.apache.webdav.lib.NotificationListener;
+import org.apache.webdav.lib.Subscriber;
import org.apache.webdav.lib.methods.MkcolMethod;
import org.apache.webdav.lib.methods.PropFindMethod;
import org.apache.webdav.lib.methods.PropPatchMethod;
@@ -61,7 +62,7 @@
private int port, notificationPort, notificationDelay, pollInterval,
subscriptionLifetime;
private static WebdavRepository repository = new WebdavRepository();
- private WebdavDispatcher dispatcher;
+ private NotificationListener dispatcher;
private WebdavRepository() {}
@@ -82,7 +83,7 @@
pollInterval =
Integer.valueOf(notifications.getChildText("poll-interval")).intValue();
subscriptionLifetime =
Integer.valueOf(notifications.getChildText("subscription-lifetime")).intValue();
notificationDelay =
Integer.valueOf(notifications.getChildText("notification-delay")).intValue();
- dispatcher = new WebdavDispatcher(notificationHost, notificationPort,
+ dispatcher = new NotificationListener(notificationHost,
notificationPort,
host, port, protocol, Projector.getCredentials(),
domain, pollInterval, true);
}
@@ -327,15 +328,15 @@
}
public void subscribe(String method, URI uri, int depth, Subscriber listener,
Credentials credentials) {
- dispatcher.subscribe(method, uri, depth, subscriptionLifetime,
notificationDelay, listener, credentials);
+ dispatcher.subscribe(method, uri.toString(), depth, subscriptionLifetime,
notificationDelay, listener, credentials);
}
public void subscribe(String method, URI uri, int depth, int lifetime, int
notificationDelay, Subscriber listener, Credentials credentials) {
- dispatcher.subscribe(method, uri, depth, lifetime, notificationDelay,
listener, credentials);
+ dispatcher.subscribe(method, uri.toString(), depth, lifetime,
notificationDelay, listener, credentials);
}
public void unsubscribe(URI uri, Subscriber listener, Credentials credentials) {
- dispatcher.unsubscribe(uri, listener, credentials);
+ dispatcher.unsubscribe(uri.toString(), listener, credentials);
}
public void fireEvent(Map information, Credentials credentials) throws
IOException {
1.2 +1 -0
jakarta-slide/projector/src/java/org/apache/slide/projector/repository/Repository.java
Index: Repository.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/repository/Repository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Repository.java 22 Jul 2004 12:09:27 -0000 1.1
+++ Repository.java 23 Jul 2004 16:14:53 -0000 1.2
@@ -8,6 +8,7 @@
import org.apache.slide.projector.value.ArrayValue;
import org.apache.slide.projector.value.StreamableValue;
import org.apache.slide.projector.value.Value;
+import org.apache.webdav.lib.Subscriber;
/**
* The Connector interface
1.3 +8 -6
jakarta-slide/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java
Index: ProcessorManager.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/engine/ProcessorManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProcessorManager.java 22 Jul 2004 12:09:27 -0000 1.2
+++ ProcessorManager.java 23 Jul 2004 16:14:53 -0000 1.3
@@ -28,11 +28,11 @@
import org.apache.slide.projector.i18n.ErrorMessage;
import org.apache.slide.projector.processor.SimpleProcessor;
import org.apache.slide.projector.processor.process.Process;
-import org.apache.slide.projector.repository.Subscriber;
import org.apache.slide.projector.util.ProcessorHelper;
import org.apache.slide.projector.value.StreamableValue;
import org.apache.slide.projector.value.URIValue;
import org.apache.slide.projector.value.Value;
+import org.apache.webdav.lib.Subscriber;
import org.xml.sax.InputSource;
import org.xml.sax.helpers.AttributesImpl;
@@ -151,8 +151,9 @@
return processorManager;
}
- public void notify(URI uri, Map information) {
- update((URI)configurationToApplication.get(uri), uri);
+ public void notify(String uri, Map information) {
+ URI configurationUri = new URIValue(uri);
+ update((URI)configurationToApplication.get(configurationUri),
configurationUri);
}
public Processor getProcessor(URI uri) throws ProcessException {
@@ -377,11 +378,12 @@
}
class ConfigurationListener implements Subscriber {
- public void notify(URI uri, Map information) {
- Processor processor = (Processor)configuredProcessors.get(uri);
+ public void notify(String uri, Map information) {
+ URI processorUri = new URIValue(uri);
+ Processor processor =
(Processor)configuredProcessors.get(processorUri);
logger.log(Level.INFO, "Reloading processor with configuration
URI='"+uri+"'");
try {
- StreamableValue config =
(StreamableValue)Projector.getRepository().getResource(uri,
Projector.getCredentials());
+ StreamableValue config =
(StreamableValue)Projector.getRepository().getResource(processorUri,
Projector.getCredentials());
((ConfigurableProcessor)processor).configure(config);
} catch ( IOException e ) {
logger.log(Level.SEVERE, "Configuration resource with
URI='"+uri+"' could not be loaded!", e);
1.3 +3 -3
jakarta-slide/projector/src/java/org/apache/slide/projector/engine/Scheduler.java
Index: Scheduler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/engine/Scheduler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Scheduler.java 22 Jul 2004 12:09:27 -0000 1.2
+++ Scheduler.java 23 Jul 2004 16:14:53 -0000 1.3
@@ -20,12 +20,12 @@
import org.apache.slide.projector.application.ApplicationListener;
import org.apache.slide.projector.processor.process.Process;
import org.apache.slide.projector.processor.process.Step;
-import org.apache.slide.projector.repository.Subscriber;
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.webdav.lib.Subscriber;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.xpath.XPath;
@@ -123,8 +123,8 @@
if ( !restoreRunningJobs ) {
Projector.getRepository().subscribe("Update",
jobsUri, 0,
new Subscriber() {
- public void notify(URI uri, Map
information) {
- update(uri);
+ public void notify(String uri, Map
information) {
+ update(new URIValue(uri));
}
}, Projector.getCredentials());
}
1.3 +6 -5
jakarta-slide/projector/src/java/org/apache/slide/projector/application/ApplicationManager.java
Index: ApplicationManager.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/application/ApplicationManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplicationManager.java 22 Jul 2004 12:09:30 -0000 1.2
+++ ApplicationManager.java 23 Jul 2004 16:14:53 -0000 1.3
@@ -23,11 +23,11 @@
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.repository.Subscriber;
import org.apache.slide.projector.value.ArrayValue;
import org.apache.slide.projector.value.StreamableValue;
import org.apache.slide.projector.value.URIValue;
import org.apache.slide.projector.value.Value;
+import org.apache.webdav.lib.Subscriber;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -53,14 +53,14 @@
logger.log(Level.INFO, "Starting application manager");
Projector.getRepository().subscribe("Update/newmember", new
URIValue(Projector.getApplicationsDir()), 1,
new Subscriber() {
- public void notify(URI uri, Map information) {
+ public void notify(String uri, Map information) {
logger.log(Level.INFO, "Package manager received add event");
applicationManager.installApplications();
}
}, context.getCredentials());
Projector.getRepository().subscribe("Delete", new
URIValue(Projector.getApplicationsDir()), 1,
new Subscriber() {
- public void notify(URI uri, Map information) {
+ public void notify(String uri, Map information) {
logger.log(Level.INFO, "Package manager received delete
event");
applicationManager.installApplications();
}
@@ -109,7 +109,7 @@
Application application = (Application)i.next();
Projector.getRepository().subscribe("Update", application.getUri(), 0,
new Subscriber() {
- public void notify(URI uri, Map information) {
+ public void notify(String uri, Map information) {
applicationManager.updateApplication(uri);
}
}, context.getCredentials());
@@ -213,7 +213,8 @@
return null;
}
- private synchronized void updateApplication(URI applicationUri) {
+ private synchronized void updateApplication(String uri) {
+ URI applicationUri = new URIValue(uri);
logger.log(Level.INFO, "Updating application '"+applicationUri+"'");
// Compare newly parsed application with previously installed and send diffs
Application installedApplication =
(Application)installedApplications.get(applicationUri);
1.3 +6 -4
jakarta-slide/projector/src/java/org/apache/slide/projector/i18n/MessageManager.java
Index: MessageManager.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/i18n/MessageManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MessageManager.java 22 Jul 2004 12:09:30 -0000 1.2
+++ MessageManager.java 23 Jul 2004 16:14:53 -0000 1.3
@@ -14,8 +14,9 @@
import org.apache.slide.projector.URI;
import org.apache.slide.projector.application.Application;
import org.apache.slide.projector.application.ApplicationListener;
-import org.apache.slide.projector.repository.Subscriber;
import org.apache.slide.projector.value.StreamableValue;
+import org.apache.slide.projector.value.URIValue;
+import org.apache.webdav.lib.Subscriber;
import org.xml.sax.InputSource;
import org.xml.sax.helpers.AttributesImpl;
@@ -119,9 +120,10 @@
install(messagesUri);
}
- public void notify(URI uri, Map information) {
- uninstall(uri);
- install(uri);
+ public void notify(String uri, Map information) {
+ URI messageUri = new URIValue(uri);
+ uninstall(messageUri);
+ install(messageUri);
}
private String format(String formatString, Object[] arguments) {
1.3 +5 -6
jakarta-slide/projector/src/java/org/apache/slide/projector/expression/EventExpression.java
Index: EventExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/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 22 Jul 2004 12:09:27 -0000 1.2
+++ EventExpression.java 23 Jul 2004 16:14:54 -0000 1.3
@@ -28,11 +28,10 @@
import java.util.Map;
import org.apache.slide.projector.Projector;
-import org.apache.slide.projector.URI;
import org.apache.slide.projector.engine.Job;
import org.apache.slide.projector.engine.Scheduler;
-import org.apache.slide.projector.repository.Subscriber;
import org.apache.slide.projector.value.URIValue;
+import org.apache.webdav.lib.Subscriber;
import de.zeigermann.xml.XMLStringWriter;
import de.zeigermann.xml.XMLWriter;
@@ -94,7 +93,7 @@
}
}
- public void notify(URI uri, Map information) {
+ public void notify(String uri, Map information) {
eval = true;
Projector.getRepository().unsubscribe(new
URIValue((String)properties.get(URI)), this, Projector.getCredentials());
Scheduler.getInstance().notify(job);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
