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/08/28 11:59:03 UTC
cvs commit: jakarta-slide/projector/src/java/org/apache/slide/projector/processor/tree TreeLocalizer.java
dflorey 2004/08/28 02:59:03
Modified: projector/src/java/org/apache/slide/projector/processor/process
ResultConfiguration.java Process.java
projector/src/java/org/apache/slide/projector/processor/core
CachedContent.java Dispose.java DateFormatter.java
projector/src/java/org/apache/slide/projector/store
CookieStore.java RequestParameterStore.java
Cache.java RequestAttributeStore.java
FormStore.java RequestHeaderStore.java
RepositoryStore.java ProcessStore.java
SessionStore.java AbstractStore.java
projector/src/java/org/apache/slide/projector/util
StoreHelper.java
projector/src/java/org/apache/slide/projector/processor
Message.java
projector/src/java/org/apache/slide/projector/processor/form
FormHandler.java Form.java Test.java ClearForm.java
ControlComposer.java
projector/src/java/org/apache/slide/projector Store.java
SystemContext.java HttpContext.java
projector/src/java/org/apache/slide/projector/processor/access
Remove.java Put.java
projector/src/java/org/apache/slide/projector/value
AnyValue.java
projector/src/java/org/apache/slide/projector/processor/table
TableGenerator.java TableHandler.java
TableMapRenderer.java TablePager.java
projector/src/java/org/apache/slide/projector/processor/tree
TreeLocalizer.java
Log:
Adding credentials to the store interface and refactoring methods to match
Revision Changes Path
1.5 +3 -3 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/process/ResultConfiguration.java
Index: ResultConfiguration.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/process/ResultConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResultConfiguration.java 9 Aug 2004 16:32:00 -0000 1.4
+++ ResultConfiguration.java 28 Aug 2004 09:59:02 -0000 1.5
@@ -106,7 +106,7 @@
if ( evaluatedKey != null ) {
if ( domain != null ) {
Map map;
- MapValue mapResource = (MapValue)resultStore.get(domain);
+ MapValue mapResource = (MapValue)resultStore.get(domain, context.getCredentials());
if ( mapResource == null ) {
map = new HashMap();
mapResource = new MapValue(map);
@@ -118,9 +118,9 @@
value = mapResource;
}
if ( timeout != -1 ) {
- resultStore.put(evaluatedKey, value, timeout);
+ resultStore.put(evaluatedKey, value, timeout, context.getCredentials());
} else {
- resultStore.put(evaluatedKey, value);
+ resultStore.put(evaluatedKey, value, context.getCredentials());
}
}
} catch ( IOException e ) {
1.7 +9 -8 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/process/Process.java
Index: Process.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/process/Process.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Process.java 27 Aug 2004 17:04:38 -0000 1.6
+++ Process.java 28 Aug 2004 09:59:02 -0000 1.7
@@ -9,6 +9,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.commons.httpclient.Credentials;
import org.apache.slide.projector.ConfigurableProcessor;
import org.apache.slide.projector.ConfigurationException;
import org.apache.slide.projector.Context;
@@ -216,7 +217,7 @@
static String getStep(String firstStep, Context context) {
Store sessionStore = context.getStore(Store.SESSION);
if ( sessionStore != null ) {
- Value stepParameter = (Value)StoreHelper.get(sessionStore, context.getProcess().toString(), STEP);
+ Value stepParameter = (Value)StoreHelper.get(sessionStore, context.getProcess().toString(), STEP, context.getCredentials());
if (stepParameter != null && stepParameter instanceof StringValue ) {
return stepParameter.toString();
}
@@ -247,19 +248,19 @@
RequiredEnvironmentDescriptor[] requirementDescriptor = processor.getRequiredEnvironmentDescriptors();
for ( int i = 0; i < requirementDescriptor.length; i++ ) {
Store store = context.getStore(requirementDescriptor[i].getStore());
- Object value = store.get(requirementDescriptor[i].getName());
+ Object value = store.get(requirementDescriptor[i].getName(), context.getCredentials());
if ( value == null ) {
if ( requirementDescriptor[i].isRequired() ) {
throw new ContextException(new ErrorMessage("requiredContextMissing", new Object[] { requirementDescriptor[i].getName(), Store.stores[requirementDescriptor[i].getStore()] }));
} else {
value = requirementDescriptor[i].getDefaultValue();
- store.put(requirementDescriptor[i].getName(), value);
+ store.put(requirementDescriptor[i].getName(), value, context.getCredentials());
}
}
Value castedValue = requirementDescriptor[i].getValueDescriptor().valueOf(value, context);
requirementDescriptor[i].getValueDescriptor().validate(castedValue, context);
if ( castedValue != value ) {
- store.put(requirementDescriptor[i].getName(), castedValue);
+ store.put(requirementDescriptor[i].getName(), castedValue, context.getCredentials());
}
}
}
@@ -276,7 +277,7 @@
String evaluatedKey = null;
if ( keyStore != null ) {
try {
- Object dynamicKey = keyStore.get(keyToken);
+ Object dynamicKey = keyStore.get(keyToken, context.getCredentials());
evaluatedKey = StringValueDescriptor.ANY.valueOf(dynamicKey, context).toString();
} catch ( Exception e ) {
logger.log(Level.SEVERE, "Dynamic key '"+keyToken+"' could not be loaded from store '"+storeToken+"'", e);
@@ -379,15 +380,15 @@
public class ProcessStore extends AbstractStore {
protected Map map = new HashMap();
- public void put(String key, Object value) throws IOException {
+ public void put(String key, Object value, Credentials credentials) throws IOException {
map.put(key, value);
}
- public Object get(String key) throws IOException {
+ public Object get(String key, Credentials credentials) throws IOException {
return map.get(key);
}
- public void dispose(String key) throws IOException {
+ public void dispose(String key, Credentials credentials) throws IOException {
map.remove(key);
}
}
1.6 +3 -3 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/core/CachedContent.java
Index: CachedContent.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/core/CachedContent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CachedContent.java 27 Aug 2004 17:04:38 -0000 1.5
+++ CachedContent.java 28 Aug 2004 09:59:02 -0000 1.6
@@ -60,14 +60,14 @@
}
// check for cached result
Map resultEntries = new HashMap();
- Value output = (Value)context.getStore(Store.CACHE).get(uri.toString());
+ Value output = (Value)context.getStore(Store.CACHE).get(uri.toString(), context.getCredentials());
if ( output == null ) {
output = Projector.getRepository().getResource(uri, context.getCredentials());
if ( output instanceof InputStreamValue ) {
output = new MultipleStreamableValue((StreamableValue)output);
}
// cache result...
- context.getStore(Store.CACHE).put(uri.toString(), output);
+ context.getStore(Store.CACHE).put(uri.toString(), output, context.getCredentials());
// ...and add dispose condition
Map jobParameter = new HashMap();
jobParameter.put(Dispose.STORE, new StringValue(Store.stores[Store.CACHE]));
1.3 +1 -1 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/core/Dispose.java
Index: Dispose.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/core/Dispose.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Dispose.java 22 Jul 2004 12:09:24 -0000 1.2
+++ Dispose.java 28 Aug 2004 09:59:02 -0000 1.3
@@ -37,7 +37,7 @@
if ( store == null ) {
throw new ProcessException(new ErrorMessage("storeNotAvailable", new String[] {name}));
}
- store.dispose(key);
+ store.dispose(key, context.getCredentials());
return new Result( StateDescriptor.OK );
}
1.2 +1 -1 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/core/DateFormatter.java
Index: DateFormatter.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/core/DateFormatter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DateFormatter.java 19 Jul 2004 12:09:16 -0000 1.1
+++ DateFormatter.java 28 Aug 2004 09:59:02 -0000 1.2
@@ -58,7 +58,7 @@
DateValue date = (DateValue)parameters.get(DATE);
String dateFormat = parameters.get(DATE_FORMAT).toString();
String timeFormat = parameters.get(TIME_FORMAT).toString();
- Locale locale = ((LocaleValue)context.getStore(Store.SESSION).get(LOCALE)).getLocale();
+ Locale locale = ((LocaleValue)context.getStore(Store.SESSION).get(LOCALE, context.getCredentials())).getLocale();
String formattedDate = getDateFormatter(dateFormat, timeFormat, locale).format(date.getDate());
return new Result(StateDescriptor.OK, SimpleProcessor.OUTPUT, new StringValue(formattedDate));
}
1.3 +5 -4 jakarta-slide/projector/src/java/org/apache/slide/projector/store/CookieStore.java
Index: CookieStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/store/CookieStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CookieStore.java 27 Aug 2004 17:04:38 -0000 1.2
+++ CookieStore.java 28 Aug 2004 09:59:02 -0000 1.3
@@ -23,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.httpclient.Credentials;
import org.apache.slide.projector.Store;
import org.apache.slide.projector.value.PrintableValue;
@@ -35,7 +36,7 @@
this.response = response;
}
- public void put(String key, Object value, long timeout) {
+ public void put(String key, Object value, long timeout, Credentials credentials) {
Cookie cookie = generateCookie(key, value);
if ( cookie != null ) {
cookie.setMaxAge((int) (timeout/1000));
@@ -43,7 +44,7 @@
}
}
- public void put(String key, Object value) {
+ public void put(String key, Object value, Credentials credentials) {
Cookie cookie = generateCookie(key, value);
if ( cookie != null ) {
response.addCookie(cookie);
@@ -61,7 +62,7 @@
return cookie;
}
- public Object get(String key) {
+ public Object get(String key, Credentials credentials) {
Cookie[] cookies = request.getCookies();
if ( cookies != null ) {
for ( int i = 0; i < cookies.length; i++ ) {
@@ -73,7 +74,7 @@
return null;
}
- public void dispose(String key) {
+ public void dispose(String key, Credentials credentials) {
request.removeAttribute(key);
}
}
1.2 +5 -4 jakarta-slide/projector/src/java/org/apache/slide/projector/store/RequestParameterStore.java
Index: RequestParameterStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/store/RequestParameterStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestParameterStore.java 19 Jul 2004 12:09:19 -0000 1.1
+++ RequestParameterStore.java 28 Aug 2004 09:59:02 -0000 1.2
@@ -23,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.httpclient.Credentials;
import org.apache.slide.projector.Store;
public class RequestParameterStore implements Store {
@@ -32,19 +33,19 @@
this.request = request;
}
- public void put(String key, Object value, long timeout) throws IOException {
+ public void put(String key, Object value, long timeout, Credentials credentials) throws IOException {
throw new IOException("Put operation is not supported by request-parameter store!");
}
- public void put(String key, Object value) throws IOException {
+ public void put(String key, Object value, Credentials credentials) throws IOException {
throw new IOException("Put operation is not supported by request-parameter store!");
}
- public Object get(String key) {
+ public Object get(String key, Credentials credentials) {
return request.getParameterValues(key);
}
- public void dispose(String key) throws IOException {
+ public void dispose(String key, Credentials credentials) throws IOException {
throw new IOException("Dispose operation is not supported by request-parameter store!");
}
}
1.3 +5 -3 jakarta-slide/projector/src/java/org/apache/slide/projector/store/Cache.java
Index: Cache.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/store/Cache.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cache.java 3 Aug 2004 14:29:58 -0000 1.2
+++ Cache.java 28 Aug 2004 09:59:02 -0000 1.3
@@ -4,6 +4,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.httpclient.Credentials;
+
public class Cache extends AbstractStore {
private static Cache cache = new Cache();
private Map map;
@@ -24,15 +26,15 @@
return map;
}
- public void put(String key, Object value) throws IOException {
+ public void put(String key, Object value, Credentials credentials) throws IOException {
map.put(key, value);
}
- public Object get(String key) throws IOException {
+ public Object get(String key, Credentials credentials) throws IOException {
return map.get(key);
}
- public void dispose(String key) throws IOException {
+ public void dispose(String key, Credentials credentials) throws IOException {
map.remove(key);
}
}
1.2 +5 -3 jakarta-slide/projector/src/java/org/apache/slide/projector/store/RequestAttributeStore.java
Index: RequestAttributeStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/store/RequestAttributeStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestAttributeStore.java 19 Jul 2004 12:09:19 -0000 1.1
+++ RequestAttributeStore.java 28 Aug 2004 09:59:02 -0000 1.2
@@ -21,6 +21,8 @@
import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.httpclient.Credentials;
+
public class RequestAttributeStore extends AbstractStore {
protected HttpServletRequest request;
@@ -28,15 +30,15 @@
this.request = request;
}
- public void put(String key, Object value) {
+ public void put(String key, Object value, Credentials credentials) {
request.setAttribute(key, value);
}
- public Object get(String key) {
+ public Object get(String key, Credentials credentials) {
return request.getAttribute(key);
}
- public void dispose(String key) {
+ public void dispose(String key, Credentials credentials) {
request.removeAttribute(key);
}
}
1.2 +8 -7 jakarta-slide/projector/src/java/org/apache/slide/projector/store/FormStore.java
Index: FormStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/store/FormStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FormStore.java 19 Jul 2004 12:09:19 -0000 1.1
+++ FormStore.java 28 Aug 2004 09:59:02 -0000 1.2
@@ -21,6 +21,7 @@
import java.io.IOException;
+import org.apache.commons.httpclient.Credentials;
import org.apache.slide.projector.Context;
import org.apache.slide.projector.Store;
import org.apache.slide.projector.value.MapValue;
@@ -34,30 +35,30 @@
this.store = store;
}
- public void put(String key, Object value) throws IOException {
+ public void put(String key, Object value, Credentials credentials) throws IOException {
MapValue domain = getDomain();
domain.getMap().put(key, value);
}
- public Object get(String key) throws IOException {
+ public Object get(String key, Credentials credentials) throws IOException {
return getDomain().getMap().get(key);
}
- public void dispose(String key) throws IOException {
+ public void dispose(String key, Credentials credentials) throws IOException {
getDomain().getMap().remove(key);
}
- public void clear() throws IOException {
+ public void clear(Credentials credentials) throws IOException {
String domain = context.getProcess().toString();
- store.dispose(domain);
+ store.dispose(domain, credentials);
}
public MapValue getDomain() throws IOException {
String domain = context.getProcess().toString();
- MapValue mapResource = (MapValue)store.get(domain);
+ MapValue mapResource = (MapValue)store.get(domain, context.getCredentials());
if ( mapResource == null ) {
mapResource = new MapValue();
- store.put(domain, mapResource);
+ store.put(domain, mapResource, context.getCredentials());
return mapResource;
} else {
return mapResource;
1.2 +5 -4 jakarta-slide/projector/src/java/org/apache/slide/projector/store/RequestHeaderStore.java
Index: RequestHeaderStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/store/RequestHeaderStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestHeaderStore.java 19 Jul 2004 12:09:19 -0000 1.1
+++ RequestHeaderStore.java 28 Aug 2004 09:59:02 -0000 1.2
@@ -23,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.httpclient.Credentials;
import org.apache.slide.projector.Store;
public class RequestHeaderStore implements Store {
@@ -32,19 +33,19 @@
this.request = request;
}
- public void put(String key, Object value, long timeout) throws IOException {
+ public void put(String key, Object value, long timeout, Credentials credentials) throws IOException {
throw new IOException("Put operation is not supported by request-header store!");
}
- public void put(String key, Object value) throws IOException {
+ public void put(String key, Object value, Credentials credentials) throws IOException {
throw new IOException("Put operation is not supported by request-header store!");
}
- public Object get(String key) {
+ public Object get(String key, Credentials credentials) {
return request.getHeader(key);
}
- public void dispose(String key) throws IOException {
+ public void dispose(String key, Credentials credentials) throws IOException {
throw new IOException("Dispose operation is not supported by request-header store!");
}
}
1.5 +8 -7 jakarta-slide/projector/src/java/org/apache/slide/projector/store/RepositoryStore.java
Index: RepositoryStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/store/RepositoryStore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RepositoryStore.java 4 Aug 2004 15:22:51 -0000 1.4
+++ RepositoryStore.java 28 Aug 2004 09:59:02 -0000 1.5
@@ -21,6 +21,7 @@
import java.io.IOException;
+import org.apache.commons.httpclient.Credentials;
import org.apache.slide.projector.Context;
import org.apache.slide.projector.Projector;
import org.apache.slide.projector.descriptor.ValueFactoryManager;
@@ -38,24 +39,24 @@
this.context = context;
}
- public void put(String key, Object value) throws IOException {
+ public void put(String key, Object value, Credentials credentials) throws IOException {
if ( value instanceof StreamableValue) {
- Projector.getRepository().setResource(new URIValue(key), (StreamableValue)value, context.getCredentials());
+ Projector.getRepository().setResource(new URIValue(key), (StreamableValue)value, credentials);
} else if ( value instanceof Value ) {
XMLStringWriter writer = XMLStringWriter.create();
writer.writeXMLDeclaration();
ValueFactoryManager.getInstance().saveValue((Value)value, writer);
- Projector.getRepository().setResource(new URIValue(key), new StringValue(writer.toString()), context.getCredentials());
+ Projector.getRepository().setResource(new URIValue(key), new StringValue(writer.toString()), credentials);
} else {
throw new IOException("Could not write value to repository! Given value is '"+value+"'");
}
}
- public Object get(String key) throws IOException {
- return Projector.getRepository().getResource(new URIValue(key), context.getCredentials());
+ public Object get(String key, Credentials credentials) throws IOException {
+ return Projector.getRepository().getResource(new URIValue(key), credentials);
}
- public void dispose(String key) throws IOException {
- Projector.getRepository().removeResource(new URIValue(key), context.getCredentials());
+ public void dispose(String key, Credentials credentials) throws IOException {
+ Projector.getRepository().removeResource(new URIValue(key), credentials);
}
}
1.3 +11 -10 jakarta-slide/projector/src/java/org/apache/slide/projector/store/ProcessStore.java
Index: ProcessStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/store/ProcessStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProcessStore.java 22 Jul 2004 12:09:27 -0000 1.2
+++ ProcessStore.java 28 Aug 2004 09:59:02 -0000 1.3
@@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.httpclient.Credentials;
import org.apache.slide.projector.Projector;
import org.apache.slide.projector.Store;
import org.apache.slide.projector.value.MapValue;
@@ -48,23 +49,23 @@
this.storageKey = Projector.getWorkDir()+STORAGE_PREFIX+processId;
}
- public void put(String key, Object value) throws IOException {
- getMap().put(key, value);
- store.put(storageKey, mapResource);
+ public void put(String key, Object value, Credentials credentials) throws IOException {
+ getMap(credentials).put(key, value);
+ store.put(storageKey, mapResource, credentials);
}
- public Object get(String key) throws IOException {
- return getMap().get(key);
+ public Object get(String key, Credentials credentials) throws IOException {
+ return getMap(credentials).get(key);
}
- public void dispose(String key) throws IOException {
- getMap().remove(key);
- store.put(storageKey, mapResource);
+ public void dispose(String key, Credentials credentials) throws IOException {
+ getMap(credentials).remove(key);
+ store.put(storageKey, mapResource, credentials);
}
- private Map getMap() throws IOException {
+ private Map getMap(Credentials credentials) throws IOException {
if ( mapResource != null ) return mapResource.getMap();
- mapResource = (MapValue)store.get(storageKey);
+ mapResource = (MapValue)store.get(storageKey, credentials);
if ( mapResource == null ) {
map = new HashMap();
mapResource = new MapValue(map);
1.3 +5 -3 jakarta-slide/projector/src/java/org/apache/slide/projector/store/SessionStore.java
Index: SessionStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/store/SessionStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionStore.java 27 Aug 2004 17:04:38 -0000 1.2
+++ SessionStore.java 28 Aug 2004 09:59:02 -0000 1.3
@@ -22,6 +22,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.apache.commons.httpclient.Credentials;
+
public class SessionStore extends AbstractStore {
protected HttpServletRequest request;
@@ -29,19 +31,19 @@
this.request = request;
}
- public void put(String key, Object value) {
+ public void put(String key, Object value, Credentials credentials) {
HttpSession session = request.getSession();
if ( session == null ) return;
session.setAttribute(key, value);
}
- public Object get(String key) {
+ public Object get(String key, Credentials credentials) {
HttpSession session = request.getSession();
if ( session == null ) return null;
return session.getAttribute(key);
}
- public void dispose(String key) {
+ public void dispose(String key, Credentials credentials) {
HttpSession session = request.getSession();
if ( session == null ) return;
session.removeAttribute(key);
1.2 +4 -3 jakarta-slide/projector/src/java/org/apache/slide/projector/store/AbstractStore.java
Index: AbstractStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/store/AbstractStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractStore.java 19 Jul 2004 12:09:19 -0000 1.1
+++ AbstractStore.java 28 Aug 2004 09:59:02 -0000 1.2
@@ -5,18 +5,19 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.commons.httpclient.Credentials;
import org.apache.slide.projector.Store;
import org.apache.slide.projector.engine.Scheduler;
public abstract class AbstractStore implements Store {
private final static Logger logger = Logger.getLogger(AbstractStore.class.getName());
- public void put(final String key, Object value, long timeout) throws IOException {
- put(key, value);
+ public void put(final String key, Object value, long timeout, final Credentials credentials) throws IOException {
+ put(key, value, credentials);
Scheduler.getTimer().schedule(new TimerTask() {
public void run() {
try {
- dispose(key);
+ dispose(key, credentials);
} catch ( IOException exception ) {
logger.log(Level.SEVERE, "Could not dispose object with key="+key, exception);
}
1.3 +6 -5 jakarta-slide/projector/src/java/org/apache/slide/projector/util/StoreHelper.java
Index: StoreHelper.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/util/StoreHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StoreHelper.java 22 Jul 2004 12:09:24 -0000 1.2
+++ StoreHelper.java 28 Aug 2004 09:59:02 -0000 1.3
@@ -5,6 +5,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.commons.httpclient.Credentials;
import org.apache.slide.projector.Store;
import org.apache.slide.projector.value.MapValue;
import org.apache.slide.projector.value.Value;
@@ -12,9 +13,9 @@
public class StoreHelper {
private static Logger logger = Logger.getLogger(StoreHelper.class.getName());
- public static Object get(Store store, String domain, String key) {
+ public static Object get(Store store, String domain, String key, Credentials credentials) {
try {
- MapValue mapResource = (MapValue)store.get(domain);
+ MapValue mapResource = (MapValue)store.get(domain, credentials);
if ( mapResource != null ) {
Map map = mapResource.getMap();
return (Value)map.get(key);
@@ -25,15 +26,15 @@
return null;
}
- public static void put(Store store, String domain, String key, Value value) {
+ public static void put(Store store, String domain, String key, Value value, Credentials credentials) {
try {
- MapValue mapResource = (MapValue)store.get(domain);
+ MapValue mapResource = (MapValue)store.get(domain, credentials);
if ( mapResource != null ) {
Map map = mapResource.getMap();
map.put(key, value);
} else {
mapResource = new MapValue(key, value);
- store.put(domain, mapResource);
+ store.put(domain, mapResource, credentials);
}
} catch ( IOException exception ) {
logger.log(Level.SEVERE, "Error while accessing store", exception);
1.2 +1 -1 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/Message.java
Index: Message.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/Message.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Message.java 19 Jul 2004 12:09:22 -0000 1.1
+++ Message.java 28 Aug 2004 09:59:02 -0000 1.2
@@ -54,7 +54,7 @@
String id = parameter.get(ID).toString();
String key = parameter.get(KEY).toString();
Value[] arguments = ((ArrayValue)parameter.get(ARGUMENTS)).getArray();
- Locale locale = ((LocaleValue)context.getStore(Store.SESSION).get(LOCALE)).getLocale();
+ Locale locale = ((LocaleValue)context.getStore(Store.SESSION).get(LOCALE, context.getCredentials())).getLocale();
return new Result(StateDescriptor.OK, SimpleProcessor.OUTPUT, new StringValue(MessageManager.getText(id, key, arguments, locale, id)));
}
1.5 +3 -3 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/FormHandler.java
Index: FormHandler.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/FormHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FormHandler.java 3 Aug 2004 14:29:56 -0000 1.4
+++ FormHandler.java 28 Aug 2004 09:59:03 -0000 1.5
@@ -77,11 +77,11 @@
Store store = context.getStore(Store.SESSION);
// 1. Store all (request) parameters into requested domain
Map map;
- MapValue mapResource = (MapValue)store.get(domain);
+ MapValue mapResource = (MapValue)store.get(domain, context.getCredentials());
if ( mapResource == null ) {
map = new HashMap();
mapResource = new MapValue(map);
- store.put(domain, mapResource);
+ store.put(domain, mapResource, context.getCredentials());
} else {
map = mapResource.getMap();
}
1.6 +5 -5 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/Form.java
Index: Form.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/Form.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Form.java 11 Aug 2004 13:19:30 -0000 1.5
+++ Form.java 28 Aug 2004 09:59:03 -0000 1.6
@@ -79,13 +79,13 @@
});
public Result process(Map parameter, Context context) throws Exception {
- Object formResult = context.getStore(Store.FORM).get(FormHandler.RESULT);
+ Object formResult = context.getStore(Store.FORM).get(FormHandler.RESULT, context.getCredentials());
if ( formResult instanceof Result ) {
return (Result)formResult;
}
Object a = parameter.get(ACTION);
URI actionUri = (URI)a;
- Locale locale = ((LocaleValue)context.getStore(Store.SESSION).get(LOCALE)).getLocale();
+ Locale locale = ((LocaleValue)context.getStore(Store.SESSION).get(LOCALE, context.getCredentials())).getLocale();
List informations = context.getInformations();
parameter.put(HANDLER, ProcessorManager.getInstance().process(ProcessorManager.URL, parameter.get(HANDLER), context));
List controlDescriptions = new ArrayList();
1.3 +7 -7 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/Test.java
Index: Test.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/Test.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Test.java 3 Aug 2004 14:29:56 -0000 1.2
+++ Test.java 28 Aug 2004 09:59:03 -0000 1.3
@@ -45,14 +45,14 @@
context.setBookmark(processorUri);
Value uri = (Value)parameter.get(PROCESSOR);
if ( uri == null || uri == NullValue.NULL ) {
- uri = (URI)context.getStore(Store.SESSION).get(PROCESSOR);
+ uri = (URI)context.getStore(Store.SESSION).get(PROCESSOR, context.getCredentials());
}
if ( uri == null ) {
throw new ProcessException(new ErrorMessage("test/noProcessorSpecified"));
}
context.setProcess((URI)uri);
- context.getStore(Store.SESSION).put(PROCESSOR, uri);
- Value stepResource = (Value)context.getStore(Store.FORM).get(Process.STEP);
+ context.getStore(Store.SESSION).put(PROCESSOR, uri, context.getCredentials());
+ Value stepResource = (Value)context.getStore(Store.FORM).get(Process.STEP, context.getCredentials());
String step;
if ( stepResource == null ) {
step = FORM_STEP;
@@ -64,7 +64,7 @@
Processor resultRenderer = ProcessorManager.getInstance().getProcessor(RESULT_RENDERER);
Processor processor = ProcessorManager.getInstance().getProcessor((URI)uri);
parameter.put(Control.ACTION, uri);
- parameter.put(ControlComposer.LOCALE, ProcessorManager.getInstance().process(ProcessorManager.LOCALE_RESOLVER, context.getStore(Store.REQUEST_HEADER).get("accept-language"), context));
+ parameter.put(ControlComposer.LOCALE, ProcessorManager.getInstance().process(ProcessorManager.LOCALE_RESOLVER, context.getStore(Store.REQUEST_HEADER).get("accept-language", context.getCredentials()), context));
parameter.put(FormGenerator.TARGET_STEP, PROCESS_STEP);
Result result = null;
if ( step.equals(FORM_STEP) ) {
@@ -74,16 +74,16 @@
Result processorResult = ProcessorManager.process(processor, parameter, context);
if ( hasErrors(context.getInformations()) ) {
context.setStep(FORM_STEP);
- ((FormStore)context.getStore(Store.FORM)).put(ControlComposer.VALIDATE, BooleanValue.TRUE);
+ ((FormStore)context.getStore(Store.FORM)).put(ControlComposer.VALIDATE, BooleanValue.TRUE, context.getCredentials());
result = formProcessor.process(parameter, context);
} else {
Map resultParameters = new HashMap();
resultParameters.put("state", new StringValue(processorResult.getState()));
result = ProcessorManager.process(resultRenderer, resultParameters, context);
- ((FormStore)context.getStore(Store.FORM)).clear();
+ ((FormStore)context.getStore(Store.FORM)).clear(context.getCredentials());
}
} else {
- ((FormStore)context.getStore(Store.FORM)).clear();
+ ((FormStore)context.getStore(Store.FORM)).clear(context.getCredentials());
return Result.OK;
}
return result;
1.2 +1 -1 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/ClearForm.java
Index: ClearForm.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/ClearForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClearForm.java 19 Jul 2004 12:09:22 -0000 1.1
+++ ClearForm.java 28 Aug 2004 09:59:03 -0000 1.2
@@ -15,7 +15,7 @@
public Result process(Map parameter, Context context) throws Exception {
Store formStore = context.getStore(Store.FORM);
if ( formStore != null ) {
- ((FormStore)formStore).clear();
+ ((FormStore)formStore).clear(context.getCredentials());
}
return new Result(StateDescriptor.OK);
}
1.6 +1 -1 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/ControlComposer.java
Index: ControlComposer.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/form/ControlComposer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ControlComposer.java 11 Aug 2004 13:19:30 -0000 1.5
+++ ControlComposer.java 28 Aug 2004 09:59:03 -0000 1.6
@@ -173,7 +173,7 @@
Value[] triggerDescriptions = ((ArrayValue)parameter.get(TRIGGER_DESCRIPTIONS)).getArray();
URI actionUri = (URIValue)parameter.get(ACTION);
Value errorsProcessorUri = (Value)parameter.get(ERRORS_PROCESSOR);
- Locale locale = ((LocaleValue)context.getStore(Store.SESSION).get(LOCALE)).getLocale();
+ Locale locale = ((LocaleValue)context.getStore(Store.SESSION).get(LOCALE, context.getCredentials())).getLocale();
String state = DEFAULT_STATE;
List informations = context.getInformations();
MapValue mapResource = (MapValue)((FormStore)context.getStore(Store.FORM)).getDomain();
1.3 +6 -4 jakarta-slide/projector/src/java/org/apache/slide/projector/Store.java
Index: Store.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/Store.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Store.java 3 Aug 2004 14:29:58 -0000 1.2
+++ Store.java 28 Aug 2004 09:59:03 -0000 1.3
@@ -2,6 +2,8 @@
import java.io.IOException;
+import org.apache.commons.httpclient.Credentials;
+
public interface Store {
public final static int NONE = -1;
public final static int REQUEST_PARAMETER = 0; // Reqeust parameter (can only be of type String or String[])
@@ -21,11 +23,11 @@
public final static String[] stores = { "request-parameter", "request-attribute", "request-header", "session", "cookie", "context", "cache", "repository", "input", "output", "process", "persistent-process", "form", "step" };
- void put(String key, Object value, long timeout) throws IOException;
+ void put(String key, Object value, long timeout, Credentials credentials) throws IOException;
- void put(String key, Object value) throws IOException;
+ void put(String key, Object value, Credentials credentials) throws IOException;
- Object get(String key) throws IOException;
+ Object get(String key, Credentials credentials) throws IOException;
- void dispose(String key) throws IOException;
+ void dispose(String key, Credentials credentials) throws IOException;
}
1.4 +2 -2 jakarta-slide/projector/src/java/org/apache/slide/projector/SystemContext.java
Index: SystemContext.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/SystemContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SystemContext.java 3 Aug 2004 14:29:58 -0000 1.3
+++ SystemContext.java 28 Aug 2004 09:59:03 -0000 1.4
@@ -64,11 +64,11 @@
}
public void setBookmark(URI processor) throws IOException {
- transientProcessStore.put(BOOKMARK, processor);
+ transientProcessStore.put(BOOKMARK, processor, getCredentials());
}
public URI getBookmark() throws IOException {
- return (URI)transientProcessStore.get(BOOKMARK);
+ return (URI)transientProcessStore.get(BOOKMARK, getCredentials());
}
public void setStepStore(Store store) {
1.3 +4 -4 jakarta-slide/projector/src/java/org/apache/slide/projector/HttpContext.java
Index: HttpContext.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/HttpContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HttpContext.java 22 Jul 2004 12:09:27 -0000 1.2
+++ HttpContext.java 28 Aug 2004 09:59:03 -0000 1.3
@@ -38,11 +38,11 @@
}
public void setCredentials(Credentials credentials) {
- sessionStore.put(CREDENTIALS, credentials);
+ sessionStore.put(CREDENTIALS, credentials, Projector.getCredentials());
}
public Credentials getCredentials() {
- Credentials credentials = (Credentials)sessionStore.get(CREDENTIALS);
+ Credentials credentials = (Credentials)sessionStore.get(CREDENTIALS, Projector.getCredentials());
if ( credentials == null ) {
credentials = Projector.getCredentials();
}
@@ -89,10 +89,10 @@
}
public void setBookmark(URI processor) throws IOException {
- sessionStore.put(BOOKMARK, processor);
+ sessionStore.put(BOOKMARK, processor, Projector.getCredentials());
}
public URI getBookmark() throws IOException {
- return (URI)sessionStore.get(BOOKMARK);
+ return (URI)sessionStore.get(BOOKMARK, Projector.getCredentials());
}
}
1.4 +4 -4 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/access/Remove.java
Index: Remove.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/access/Remove.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Remove.java 28 Jul 2004 09:48:17 -0000 1.3
+++ Remove.java 28 Aug 2004 09:59:03 -0000 1.4
@@ -55,7 +55,7 @@
String storeName = parameter.get(STORE).toString();
String key = parameter.get(KEY).toString();
Store store = context.getStore(StoreHelper.getStoreByName(storeName));
- store.dispose(key);
+ store.dispose(key, context.getCredentials());
return Result.OK;
}
1.5 +5 -5 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/access/Put.java
Index: Put.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/access/Put.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Put.java 3 Aug 2004 14:30:02 -0000 1.4
+++ Put.java 28 Aug 2004 09:59:03 -0000 1.5
@@ -66,10 +66,10 @@
Value timeoutValue = (Value)parameter.get(TIMEOUT);
Store store = context.getStore(StoreHelper.getStoreByName(storeName));
if ( timeoutValue == NullValue.NULL ) {
- store.put(key, value);
+ store.put(key, value, context.getCredentials());
} else {
long timeout = ((NumberValue)timeoutValue).getNumber().longValue();
- store.put(key, value, timeout);
+ store.put(key, value, timeout, context.getCredentials());
}
return Result.OK;
}
1.3 +2 -2 jakarta-slide/projector/src/java/org/apache/slide/projector/value/AnyValue.java
Index: AnyValue.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/value/AnyValue.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnyValue.java 4 Aug 2004 15:22:50 -0000 1.2
+++ AnyValue.java 28 Aug 2004 09:59:03 -0000 1.3
@@ -68,12 +68,12 @@
Store store = context.getStore(storeId);
if ( store != null ) {
if ( domain != null ) {
- MapValue mapResource = (MapValue)store.get(domain);
+ MapValue mapResource = (MapValue)store.get(domain, context.getCredentials());
if ( mapResource != null ) {
value = mapResource.getMap().get(evaluatedKey);
}
} else {
- value = store.get(evaluatedKey);
+ value = store.get(evaluatedKey, context.getCredentials());
}
}
}
1.5 +3 -3 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/table/TableGenerator.java
Index: TableGenerator.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/table/TableGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TableGenerator.java 3 Aug 2004 14:29:59 -0000 1.4
+++ TableGenerator.java 28 Aug 2004 09:59:03 -0000 1.5
@@ -121,13 +121,13 @@
String storeName = parameter.get(TableHandler.STORE).toString();
Store store = context.getStore(StoreHelper.getStoreByName(storeName));
Map tableMap;
- MapValue idResource = (MapValue)store.get(id);
+ MapValue idResource = (MapValue)store.get(id, context.getCredentials());
String sortedBy = null, order = null;
Map size = null;
if ( idResource == null) {
tableMap = new HashMap();
MapValue tableState = new MapValue(tableMap);
- store.put(id, tableState);
+ store.put(id, tableState, context.getCredentials());
} else {
tableMap = idResource.getMap();
Value sortedByValue = (Value)idResource.getMap().get(TableHandler.SORTED_BY);
1.5 +3 -3 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/table/TableHandler.java
Index: TableHandler.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/table/TableHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TableHandler.java 3 Aug 2004 14:29:59 -0000 1.4
+++ TableHandler.java 28 Aug 2004 09:59:03 -0000 1.5
@@ -57,7 +57,7 @@
public Result process(Map parameter, Context context) throws Exception {
String id = parameter.get(ID).toString();
Store store = context.getStore(StoreHelper.getStoreByName(parameter.get(STORE).toString()));
- MapValue idResource = (MapValue)store.get(id);
+ MapValue idResource = (MapValue)store.get(id, context.getCredentials());
Value targetPosition = (Value)parameter.get(TARGET_POSITION);
Value sortedBy = (Value)parameter.get(SORTED_BY);
Value order = (Value)parameter.get(ORDER);
@@ -67,7 +67,7 @@
if ( idResource == null) {
tableMap = new HashMap();
idResource = new MapValue(tableMap);
- store.put(id, idResource);
+ store.put(id, idResource, context.getCredentials());
} else {
tableMap = idResource.getMap();
}
1.4 +2 -2 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/table/TableMapRenderer.java
Index: TableMapRenderer.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/table/TableMapRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TableMapRenderer.java 3 Aug 2004 14:29:59 -0000 1.3
+++ TableMapRenderer.java 28 Aug 2004 09:59:03 -0000 1.4
@@ -119,12 +119,12 @@
if ( orderParameter != NullValue.NULL ) order = orderParameter.toString();
String id = parameter.get(TableHandler.ID).toString();
Store store = context.getStore(StoreHelper.getStoreByName(parameter.get(TableHandler.STORE).toString()));
- MapValue idResource = (MapValue)store.get(id);
+ MapValue idResource = (MapValue)store.get(id, context.getCredentials());
Map tableMap;
if ( idResource == null) {
tableMap = new HashMap();
MapValue tableState = new MapValue(tableMap);
- store.put(id, tableState);
+ store.put(id, tableState, context.getCredentials());
} else {
tableMap = idResource.getMap();
NumberValue offset = (NumberValue)idResource.getMap().get(TableHandler.CURRENT_POSITION);
1.6 +2 -2 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/table/TablePager.java
Index: TablePager.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/table/TablePager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TablePager.java 4 Aug 2004 15:22:51 -0000 1.5
+++ TablePager.java 28 Aug 2004 09:59:03 -0000 1.6
@@ -82,7 +82,7 @@
String id = parameters.get(TableHandler.ID).toString();
String storeName = parameters.get(TableHandler.STORE).toString();
Store store = context.getStore(StoreHelper.getStoreByName(storeName));
- MapValue idResource = (MapValue)store.get(id);
+ MapValue idResource = (MapValue)store.get(id, context.getCredentials());
if ( idResource == null ) return new Result(FAILED);
Map state = idResource.getMap();
int itemsPerPage = ((NumberValue)state.get(TableMapRenderer.ITEMS_PER_PAGE)).getNumber().intValue();
1.5 +4 -4 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/tree/TreeLocalizer.java
Index: TreeLocalizer.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/tree/TreeLocalizer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TreeLocalizer.java 3 Aug 2004 14:30:02 -0000 1.4
+++ TreeLocalizer.java 28 Aug 2004 09:59:03 -0000 1.5
@@ -84,7 +84,7 @@
public Result process(Map parameter, Context context) throws Exception {
Value []resources = ((ArrayValue)parameter.get(SimpleProcessor.INPUT)).getArray();
- Locale locale = ((LocaleValue)context.getStore(Store.SESSION).get(LOCALE)).getLocale();
+ Locale locale = ((LocaleValue)context.getStore(Store.SESSION).get(LOCALE, context.getCredentials())).getLocale();
return new Result(StateDescriptor.OK, SimpleProcessor.OUTPUT, localize(resources, locale, context));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org