dflorey 2004/06/01 09:13:10
Modified: proposals/projector/src/java/org/apache/slide/projector
Constants.java
proposals/projector/src/java/org/apache/slide/projector/connector/webdav
WebdavConnector.java
proposals/projector/src/java/org/apache/slide/projector/application
ApplicationManager.java
Log:
Search method now works both with slide and exchange (although different search
syntax is still needed)
Revision Changes Path
1.9 +7 -5
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Constants.java 1 Jun 2004 07:49:54 -0000 1.8
+++ Constants.java 1 Jun 2004 16:13:10 -0000 1.9
@@ -9,20 +9,22 @@
public interface Constants {
// FIXME should be read from configuration
public final static String CONNECTOR =
"org.apache.slide.projector.connector.webdav.WebdavConnector";
+
public final static String REPOSITORY_DOMAIN = "/slide";
public final static String REPOSITORY_HOST = "localhost";
public final static int REPOSITORY_PORT = 8080;
public final static String REPOSITORY_USER = "root";
public final static String REPOSITORY_PASSWORD = "root";
public final static Protocol REPOSITORY_PROTOCOL = Protocol.getProtocol("http");
+
/*
- public final static String REPOSITORY_DOMAIN = "/exchange/user";
- public final static String REPOSITORY_HOST = "xxx.xxx.xxx.xxx";
+ public final static String REPOSITORY_DOMAIN = "/exchange/dflorey";
+ public final static String REPOSITORY_HOST = "192.168.x.x";
public final static int REPOSITORY_PORT = 443;
// Is certificated?
public final static Protocol REPOSITORY_PROTOCOL = new Protocol("https", new
EasySSLProtocolSocketFactory(), REPOSITORY_PORT);
- public final static String REPOSITORY_USER = "exchangeUser";
- public final static String REPOSITORY_PASSWORD = "exchangePasswd";
+ public final static String REPOSITORY_USER = "dflorey";
+ public final static String REPOSITORY_PASSWORD = "xxx";
*/
public final static Credentials CREDENTIALS = new
UsernamePasswordCredentials(REPOSITORY_USER, REPOSITORY_PASSWORD);
@@ -36,7 +38,7 @@
public final static int OFF = 2;
public final static int NOTIFICATION_METHOD = UDP;
- public final static String NOTIFICATION_HOST = "127.0.0.1";
+ public final static String NOTIFICATION_HOST = "192.168.105.64";
public final static int NOTIFICATION_PORT = 4444;
public final static int POLL_INTERVAL = 60000000; // milliseconds
public final static int SUBSCRIPTION_LIFETIME = 3600;
1.7 +4 -2
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/webdav/WebdavConnector.java
Index: WebdavConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/webdav/WebdavConnector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WebdavConnector.java 1 Jun 2004 14:48:42 -0000 1.6
+++ WebdavConnector.java 1 Jun 2004 16:13:10 -0000 1.7
@@ -145,8 +145,10 @@
List resources = new ArrayList();
for ( Enumeration e = searchMethod.getAllResponseURLs();
e.hasMoreElements(); ) {
String uri = (String)e.nextElement();
-// uri = uri.substring(Constants.REPOSITORY_DOMAIN.length());
- Value resource = getResource(new URIValue(uri), credentials);
+ if ( uri.indexOf(Constants.REPOSITORY_DOMAIN) > 0 ) {
+ uri =
uri.substring(uri.indexOf(Constants.REPOSITORY_DOMAIN));
+ }
+ Value resource = getResource(new URIValue(uri), credentials);
if ( resource != null ) {
resources.add(resource);
}
1.4 +3 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApplicationManager.java 1 Jun 2004 07:49:57 -0000 1.3
+++ ApplicationManager.java 1 Jun 2004 16:13:10 -0000 1.4
@@ -71,8 +71,8 @@
if ( !applicationUri.endsWith("/") ) {
applicationUri = applicationUri + "/";
}
- if ( applicationUri.startsWith(Constants.REPOSITORY_DOMAIN) ) {
- applicationUri =
applicationUri.substring(Constants.REPOSITORY_DOMAIN.length());
+ if ( applicationUri.indexOf(Constants.REPOSITORY_DOMAIN) > 0
) {
+ applicationUri =
applicationUri.substring(applicationUri.indexOf(Constants.REPOSITORY_DOMAIN)+Constants.REPOSITORY_DOMAIN.length());
}
if ( !installedApplications.containsKey(applicationUri) ) {
Application installedApplication =
parseApplication(new URIValue(applicationUri));
@@ -170,7 +170,7 @@
ConnectorFactory.getConnector().subscribe("Update", new
URIValue(Constants.REPOSITORY_DOMAIN+application.getUri().toString()), 0,
Constants.SUBSCRIPTION_LIFETIME, Constants.NOTIFICATION_DELAY,
new Subscriber() {
public void notify(URI uri, Map information) {
- applicationManager.updateApplication(uri);
+ applicationManager.updateApplication(new
URIValue(uri.toString().substring(Constants.REPOSITORY_DOMAIN.length()+1)));
}
}, context.getCredentials());
for ( Iterator i = application.getContent().entrySet().iterator();
i.hasNext(); ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
