dflorey 2004/05/17 08:22:04
Modified: proposals/projector/src/java/org/apache/slide/projector/engine
ProcessServlet.java ApplicationListener.java
ProcessorManager.java ApplicationManager.java
ProcessorClassLoader.java
proposals/projector/src/java/org/apache/slide/projector/processor
URL.java CachedContent.java
proposals/projector/src/java/org/apache/slide/projector/connector/webdav
WebdavDispatcher.java
proposals/projector/src/java/org/apache/slide/projector/processor/form
FormGenerator.java
proposals/projector/src/java/org/apache/slide/projector
Constants.java
proposals/projector/src/java/org/apache/slide/projector/i18n
MessageManager.java
Added: proposals/projector/src/java/org/apache/slide/projector/processor/form
TextTrigger.java ImageTrigger.java
Removed: proposals/projector/src/java/org/apache/slide/projector/processor/form
Textbutton.java
Log:
Refactoring and code cleanup
Revision Changes Path
1.5 +2 -2
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProcessServlet.java
Index: ProcessServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProcessServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProcessServlet.java 12 May 2004 17:20:20 -0000 1.4
+++ ProcessServlet.java 17 May 2004 15:22:03 -0000 1.5
@@ -24,14 +24,14 @@
public class ProcessServlet extends HttpServlet {
private static Logger logger = Logger.getLogger(ProcessServlet.class.getName());
- public final static URIResource DEFAULT_EXCEPTION_PROCESSOR = new
URIResource("/defaultException");
+ public final static URIResource DEFAULT_EXCEPTION_PROCESSOR = new
URIResource("exception.html");
private final static Random random = new Random(System.currentTimeMillis());
private final static String allowedChars =
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
public void service(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
ApplicationManager.getInstance();
Context context = new HttpContext(request, response);
- URI uri = new
URIResource(request.getRequestURI().substring(request.getContextPath().length()+request.getServletPath().length()));
+ URI uri = new
URIResource(request.getRequestURI().substring(request.getContextPath().length()+request.getServletPath().length()+1));
try {
Result result;
Processor processor;
1.3 +3 -3
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ApplicationListener.java
Index: ApplicationListener.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ApplicationListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplicationListener.java 13 May 2004 13:30:52 -0000 1.2
+++ ApplicationListener.java 17 May 2004 15:22:03 -0000 1.3
@@ -3,9 +3,9 @@
import org.apache.slide.projector.URI;
public interface ApplicationListener {
- public void install(String type, URI configuration);
+ public void install(String type, URI application, URI configuration);
- public void uninstall(String type, URI configuration);
+ public void uninstall(String type, URI application, URI configuration);
- public void update(String type, URI configuration);
+ public void update(String type, URI application, URI configuration);
}
1.8 +22 -14
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProcessorManager.java 15 May 2004 09:37:20 -0000 1.7
+++ ProcessorManager.java 17 May 2004 15:22:03 -0000 1.8
@@ -43,6 +43,7 @@
private static ProcessorManager processorManager = new ProcessorManager();
+ private Map configurationToApplication = new HashMap(); // URI -> URI
private Map installedProcessors = new HashMap();
private Map processorMap = new HashMap(256); // URI -> Processor
private Map configuredProcessors = new HashMap(128);
@@ -53,32 +54,34 @@
private ProcessorManager() {
}
- public void install(String type, URI configurationUri) {
+ public void install(String type, URI applicationUri, URI configurationUri) {
if ( type == Application.PROCESSORS ) {
- install(configurationUri);
+ install(applicationUri, configurationUri);
+ configurationToApplication.put(configurationUri, applicationUri);
}
}
- public void uninstall(String type, URI configurationUri) {
+ public void uninstall(String type, URI applicationUri, URI configurationUri) {
if ( type == Application.PROCESSORS ) {
- uninstall(configurationUri);
+ uninstall(applicationUri, configurationUri);
+ configurationToApplication.remove(configurationUri);
}
}
- public void update(String type, URI configurationUri) {
+ public void update(String type, URI applcationUri, URI configurationUri) {
if ( type == Application.PROCESSORS ) {
- update(configurationUri);
+ update(applcationUri, configurationUri);
}
}
- private void install(final URI configurationUri) {
+ private void install(URI applicationUri, URI configurationUri) {
logger.log(Level.INFO, "Installing processors '"+configurationUri+"'");
try {
- InputStream configuration =
((StreamableResource)ConnectorFactory.getConnector().getResource(configurationUri,
Constants.CREDENTIALS)).getInputStream();
+ InputStream configuration =
((StreamableResource)ConnectorFactory.getConnector().getResource(new
URIResource(Constants.REPOSITORY_DOMAIN+configurationUri),
Constants.CREDENTIALS)).getInputStream();
SimpleImporter importer = new SimpleImporter();
List alreadyInstalledProcessors =
(List)installedProcessors.get(configurationUri);
if ( alreadyInstalledProcessors == null ) alreadyInstalledProcessors =
new ArrayList();
- ConfigurationHandler handler = new
ConfigurationHandler(alreadyInstalledProcessors);
+ ConfigurationHandler handler = new
ConfigurationHandler(applicationUri, alreadyInstalledProcessors);
importer.addSimpleImportHandler(handler);
importer.parse(new InputSource(configuration));
List removedProcessors = new ArrayList();
@@ -95,7 +98,7 @@
}
}
- public void uninstall(URI configurationUri) {
+ public void uninstall(URI applicationUri, URI configurationUri) {
logger.log(Level.INFO, "Uninstalling processors '"+configurationUri+"'");
List processors = (List)installedProcessors.get(configurationUri);
for ( Iterator j = processors.iterator(); j.hasNext(); ) {
@@ -120,9 +123,9 @@
logger.log(Level.INFO, "Removing processor: "+processorUri);
}
- private void update(final URI configurationUri) {
+ private void update(URI applicationUri, URI configurationUri) {
ConnectorFactory.getConnector().unsubscribe(configurationUri, this,
Constants.CREDENTIALS);
- install(configurationUri);
+ install(applicationUri, configurationUri);
}
public static ProcessorManager getInstance() {
@@ -130,7 +133,7 @@
}
public void notify(URI uri, Map information) {
- update(uri);
+ update((URI)configurationToApplication.get(uri), uri);
}
public Processor getProcessor(URI uri) throws ProcessException {
@@ -243,10 +246,12 @@
}
public class ConfigurationHandler extends DefaultSimpleImportHandler {
+ URI applicationUri;
List addedProcessors = new ArrayList();
List removedProcessors = new ArrayList();
- public ConfigurationHandler(List installedProcessors) {
+ public ConfigurationHandler(URI applicationUri, List installedProcessors) {
+ this.applicationUri = applicationUri;
removedProcessors.addAll(installedProcessors);
}
@@ -311,6 +316,9 @@
}
}
if ( processor instanceof ConfigurableProcessor && configURI
!= null ) {
+ if ( !configURI.startsWith("/") ) {
+ configURI = applicationUri.toString() +
configURI;
+ }
URI configurationUri = new
URIResource(Constants.REPOSITORY_DOMAIN+configURI);
if ( processorDescriptor.getConfiguration() == null ||
!processorDescriptor.getConfiguration().equals(configurationUri) ) {
logger.log(Level.INFO, "Configuring processor
with config-URI=" + configURI);
1.4 +15 -8
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ApplicationManager.java
Index: ApplicationManager.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ApplicationManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApplicationManager.java 13 May 2004 16:34:15 -0000 1.3
+++ ApplicationManager.java 17 May 2004 15:22:03 -0000 1.4
@@ -61,9 +61,15 @@
removedApplications.addAll(installedApplications.keySet());
applicationUris =
((ArrayResource)ConnectorFactory.getConnector().getChildren(new
URIResource(Constants.APPLICATIONS_DIR), context.getCredentials())).getArray();
for ( int i = 0; i < applicationUris.length; i++ ) {
- URI applicationUri = new URIResource(applicationUris[i]+"/");
+ String applicationUri = applicationUris[i].toString();
+ if ( !applicationUri.endsWith("/") ) {
+ applicationUri = applicationUri + "/";
+ }
+ if ( applicationUri.startsWith(Constants.REPOSITORY_DOMAIN) ) {
+ applicationUri =
applicationUri.substring(Constants.REPOSITORY_DOMAIN.length());
+ }
if ( !installedApplications.containsKey(applicationUri) ) {
- Application installedApplication =
parseApplication(applicationUri);
+ Application installedApplication =
parseApplication(new URIResource(applicationUri));
if ( installedApplication != null )
install(installedApplication);
} else {
logger.log(Level.INFO, "Application
'"+applicationUri+"' already installed");
@@ -90,7 +96,7 @@
try {
SimpleImporter importer = new SimpleImporter();
URI applicationDefinition = new
URIResource(applicationUri.toString()+APPLICATION_CONFIG);
- StreamableResource applicationDefinitionResouce =
((StreamableResource)ConnectorFactory.getConnector().getResource(applicationDefinition,
context.getCredentials()));
+ StreamableResource applicationDefinitionResouce =
((StreamableResource)ConnectorFactory.getConnector().getResource(new
URIResource(Constants.REPOSITORY_DOMAIN+applicationDefinition),
context.getCredentials()));
if ( applicationDefinitionResouce != null ) {
InputStream configuration =
applicationDefinitionResouce.getInputStream();
ConfigurationHandler handler = new
ConfigurationHandler(applicationUri);
@@ -133,7 +139,7 @@
}
for ( Iterator j = removed.iterator(); j.hasNext(); ) {
for ( Iterator k = applicationListeners.iterator();
k.hasNext(); ) {
-
((ApplicationListener)k.next()).uninstall((String)entry.getKey(), (URI)j.next());
+
((ApplicationListener)k.next()).uninstall((String)entry.getKey(),
updatedApplication.getUri(), (URI)j.next());
}
}
}
@@ -147,7 +153,7 @@
}
for ( Iterator j = added.iterator(); j.hasNext(); ) {
for ( Iterator k = applicationListeners.iterator();
k.hasNext(); ) {
-
((ApplicationListener)k.next()).install((String)entry.getKey(), (URI)j.next());
+
((ApplicationListener)k.next()).install((String)entry.getKey(),
updatedApplication.getUri(), (URI)j.next());
}
}
}
@@ -155,7 +161,7 @@
private void install(Application application) {
logger.log(Level.INFO, "Installing application '"+application.getUri()+"'");
- ConnectorFactory.getConnector().subscribe("Update", application.getUri(), 0,
Constants.SUBSCRIPTION_LIFETIME, Constants.NOTIFICATION_DELAY,
+ ConnectorFactory.getConnector().subscribe("Update", new
URIResource(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);
@@ -166,7 +172,7 @@
for ( Iterator j = ((List)entry.getValue()).iterator();
j.hasNext(); ) {
URI uri = (URI)j.next();
for ( Iterator k = applicationListeners.iterator();
k.hasNext(); ) {
-
((ApplicationListener)k.next()).install((String)entry.getKey(), uri);
+
((ApplicationListener)k.next()).install((String)entry.getKey(), application.getUri(),
uri);
}
}
}
@@ -180,10 +186,11 @@
for ( Iterator j = ((List)entry.getValue()).iterator();
j.hasNext(); ) {
URI uri = (URI)j.next();
for ( Iterator k = applicationListeners.iterator();
k.hasNext(); ) {
-
((ApplicationListener)k.next()).uninstall((String)entry.getKey(), uri);
+
((ApplicationListener)k.next()).uninstall((String)entry.getKey(),
application.getUri(), uri);
}
}
}
+ // FIXME: Remove subscriber
installedApplications.remove(application.getUri());
}
1.2 +5 -2
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProcessorClassLoader.java
Index: ProcessorClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/engine/ProcessorClassLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProcessorClassLoader.java 3 May 2004 14:20:20 -0000 1.1
+++ ProcessorClassLoader.java 17 May 2004 15:22:03 -0000 1.2
@@ -24,13 +24,16 @@
Context context = new SystemContext();
try {
URI rendererUri = new
URIResource(Constants.REPOSITORY_DOMAIN+uri.toString() + name.replace('.', '/') +
".class");
- InputStream inputStream =
((StreamableResource)ConnectorFactory.getConnector().getResource(rendererUri,
context.getCredentials())).getInputStream();
+ StreamableResource resource =
((StreamableResource)ConnectorFactory.getConnector().getResource(rendererUri,
context.getCredentials()));
+ if ( resource == null ) {
+ throw new ClassNotFoundException("Class " + name + " at URI
'"+rendererUri+"' not found in collection '" + uri + "'!");
+ }
+ InputStream inputStream = resource.getInputStream();
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(1024);
StreamHelper.copy(inputStream, outputStream);
byte[] b = outputStream.toByteArray();
return defineClass(name, b, 0, b.length);
} catch (IOException e) {
- e.printStackTrace();
throw new ClassNotFoundException("Class " + name + " not found in
collection " + uri + "!", e);
}
}
1.2 +1 -1
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/URL.java
Index: URL.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/URL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- URL.java 3 May 2004 14:20:24 -0000 1.1
+++ URL.java 17 May 2004 15:22:03 -0000 1.2
@@ -17,7 +17,7 @@
public Resource process(Resource input, Context context) throws Exception {
Resource output;
if ( context instanceof HttpContext ) {
- output = new StringResource(((HttpContext)context).getContextPath() +
((StringResource)input).toString());
+ output = new StringResource(((HttpContext)context).getContextPath() +
"/" + ((StringResource)input).toString());
} else {
throw new ProcessException(new ErrorMessage("httpContextRequired"));
}
1.2 +2 -65
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CachedContent.java 3 May 2004 14:20:24 -0000 1.1
+++ CachedContent.java 17 May 2004 15:22:03 -0000 1.2
@@ -1,66 +1,3 @@
-/*
- * $Header$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Slide", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact [EMAIL PROTECTED]
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * [Additional notices, if required by prior licensing conditions]
- *
- */
-
package org.apache.slide.projector.processor;
import org.apache.slide.projector.*;
@@ -109,7 +46,7 @@
Map jobParameter = new HashMap();
jobParameter.put(Dispose.STORE, Store.stores[Store.CACHE]);
jobParameter.put(Dispose.KEY, uri.toString());
- Scheduler.getInstance().addJob(new EventExpression("content:store",
Subscriber.URI, uri.toString()), new URIResource("/dispose"), jobParameter, false,
false);
+ Scheduler.getInstance().addJob(new EventExpression("Update",
Subscriber.URI, uri.toString()), new URIResource("/dispose"), jobParameter, false,
false);
}
resultEntries.put(SimpleProcessor.OUTPUT, output);
// build url to activate this processor on top level
1.4 +4 -4
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/webdav/WebdavDispatcher.java
Index: WebdavDispatcher.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/connector/webdav/WebdavDispatcher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebdavDispatcher.java 13 May 2004 16:34:15 -0000 1.3
+++ WebdavDispatcher.java 17 May 2004 15:22:03 -0000 1.4
@@ -145,7 +145,7 @@
subscribersAsString = subscribersAsString + ",
"+String.valueOf(id);
}
} else {
- logger.log(Level.SEVERE, "Subscription failed. State: "+state);
+ logger.log(Level.SEVERE, "Subscription for uri='"+uri+"' failed.
State: "+state);
}
} catch (IOException e) {
logger.log(Level.SEVERE, "Subscription of listener '"+listener+"'
failed!", e);
1.7 +12 -12
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/FormGenerator.java
Index: FormGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/FormGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FormGenerator.java 15 May 2004 09:37:20 -0000 1.6
+++ FormGenerator.java 17 May 2004 15:22:03 -0000 1.7
@@ -22,17 +22,17 @@
public final static String TARGET_STEP = "targetStep";
protected final static String TRIGGER_IMAGE = "image";
- protected final static URI TEXTFIELD = new URIResource("/textfield");
- protected final static URI TEXTAREA = new URIResource("/textarea");
- protected final static URI LISTBOX = new URIResource("/listbox");
- protected final static URI COMBOBOX = new URIResource("/combobox");
- protected final static URI CHECKBOX = new URIResource("/checkbox");
- protected final static URI ERRORS_TABLE = new URIResource("/errors");
- protected final static URI TRIGGER_URI = new URIResource("/textbutton");
+ protected final static URI TEXTFIELD = new URIResource("textfield");
+ protected final static URI TEXTAREA = new URIResource("textarea");
+ protected final static URI LISTBOX = new URIResource("listbox");
+ protected final static URI COMBOBOX = new URIResource("combobox");
+ protected final static URI CHECKBOX = new URIResource("checkbox");
+ protected final static URI ERRORS_TABLE = new URIResource("errors");
+ protected final static URI TRIGGER_URI = new URIResource("textbutton");
protected final static URI DEFAULT_TRIGGER_IMAGE = new
URIResource("/files/contelligent/images/ok.gif");
- protected final static URI DEFAULT_CONTROL_CONTAINER = new
URIResource("/bigControl");
- protected final static URI DEFAULT_TRIGGER_CONTAINER = new
URIResource("/triggerContainer");
- protected final static URI DEFAULT_ERROR_RENDERER = new URIResource("/errors");
+ protected final static URI DEFAULT_CONTROL_CONTAINER = new
URIResource("bigControl");
+ protected final static URI DEFAULT_TRIGGER_CONTAINER = new
URIResource("triggerContainer");
+ protected final static URI DEFAULT_ERROR_RENDERER = new URIResource("errors");
protected final static String PROCESSOR_NAME = "processor-name";
protected final static String PROCESSOR_TITLE = "processor-title";
@@ -41,7 +41,7 @@
protected final static String PROCESSOR_LARGE_ICON = "processor-large-icon";
protected final static String STYLE = "style";
- protected final static String ORANGE_STYLE = "/orangeStyle";
+ protected final static String ORANGE_STYLE = "style.html";
protected final static String LAUNCH_PROCESSOR = "trigger:launch";
private ParameterDescriptor[] parameterDescriptors;
1.1
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/TextTrigger.java
Index: TextTrigger.java
===================================================================
package org.apache.slide.projector.processor.form;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Florey</a>
* @version $Revision: 1.1 $
*/
public class TextTrigger extends Trigger {
private final static String FRAGMENT = "text trigger";
public TextTrigger() {
super();
}
protected String getName() {
return FRAGMENT;
}
}
1.1
jakarta-slide/proposals/projector/src/java/org/apache/slide/projector/processor/form/ImageTrigger.java
Index: ImageTrigger.java
===================================================================
package org.apache.slide.projector.processor.form;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Florey</a>
* @version $Revision: 1.1 $
*/
public class ImageTrigger extends Trigger {
private final static String FRAGMENT = "image trigger";
public ImageTrigger() {
super();
}
protected String getName() {
return FRAGMENT;
}
}
1.7 +1 -1
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Constants.java 15 May 2004 09:37:20 -0000 1.6
+++ Constants.java 17 May 2004 15:22:04 -0000 1.7
@@ -55,5 +55,5 @@
public static final String PROCESS_STORAGE_PREFIX = SYSTEM_HOME+"jobs/";
- public static final URI DEFAULT_FORM_HANDLER = new URIResource("/formHandler");
+ public static final URI DEFAULT_FORM_HANDLER = new URIResource("formHandler");
}
1.4 +6 -5
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MessageManager.java 13 May 2004 13:30:52 -0000 1.3
+++ MessageManager.java 17 May 2004 15:22:04 -0000 1.4
@@ -10,6 +10,7 @@
import org.apache.slide.projector.engine.Application;
import org.apache.slide.projector.engine.ApplicationListener;
import org.apache.slide.projector.resource.StreamableResource;
+import org.apache.slide.projector.resource.URIResource;
import org.xml.sax.InputSource;
import org.xml.sax.helpers.AttributesImpl;
@@ -59,19 +60,19 @@
return message.getEntries();
}
- public void install(String type, URI configurationUri) {
+ public void install(String type, URI applicationUri, URI configurationUri) {
if ( type == Application.MESSAGES ) {
install(configurationUri);
}
}
- public void uninstall(String type, URI configurationUri) {
+ public void uninstall(String type, URI applicationUri, URI configurationUri) {
if ( type == Application.MESSAGES ) {
uninstall(configurationUri);
}
}
- public void update(String type, URI configurationUri) {
+ public void update(String type, URI applicationUri, URI configurationUri) {
if ( type == Application.MESSAGES ) {
update(configurationUri);
}
@@ -81,7 +82,7 @@
logger.log(Level.INFO, "Installing messages '"+messagesUri+"'");
try {
Map applicationMessages = new HashMap();
- StreamableResource messagesResource =
(StreamableResource)ConnectorFactory.getConnector().getResource(messagesUri,
Constants.CREDENTIALS);
+ StreamableResource messagesResource =
(StreamableResource)ConnectorFactory.getConnector().getResource(new
URIResource(Constants.REPOSITORY_DOMAIN+messagesUri), Constants.CREDENTIALS);
if ( messagesResource != null ) {
InputStream inputStream = messagesResource.getInputStream();
SimpleImporter importer = new SimpleImporter();
@@ -91,7 +92,7 @@
importer.parse(new InputSource(inputStream));
Map parsedMessages = handler.getMessages();
applicationMessages.putAll(parsedMessages);
- ConnectorFactory.getConnector().subscribe("Update",
messagesUri, 0, Constants.SUBSCRIPTION_LIFETIME, Constants.NOTIFICATION_DELAY, this,
Constants.CREDENTIALS);
+ ConnectorFactory.getConnector().subscribe("Update", new
URIResource(Constants.REPOSITORY_DOMAIN+messagesUri), 0,
Constants.SUBSCRIPTION_LIFETIME, Constants.NOTIFICATION_DELAY, this,
Constants.CREDENTIALS);
} else {
logger.log(Level.INFO, "Configured messages resource
'"+messagesUri+"' not found!");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
