giacomo 01/12/02 11:27:20
Modified: src/org/apache/cocoon/acting
AbstractComplementaryConfigurableAction.java
DatabaseAddAction.java
DatabaseAuthenticatorAction.java
DatabaseDeleteAction.java DatabaseUpdateAction.java
FormValidatorAction.java
SessionValidatorAction.java
Log:
applied patch from Tim Myers <[EMAIL PROTECTED]> to fix "file:" url
Revision Changes Path
1.13 +6 -4
xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
Index: AbstractComplementaryConfigurableAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractComplementaryConfigurableAction.java 2001/10/11 07:28:15 1.12
+++ AbstractComplementaryConfigurableAction.java 2001/12/02 19:27:20 1.13
@@ -14,6 +14,8 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.source.SourceHandler;
import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.environment.Environment;
import java.util.HashMap;
import java.util.Map;
@@ -26,7 +28,7 @@
* effective. The name of the root configuration element is irrelevant.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.12 $ $Date: 2001/10/11 07:28:15 $
+ * @version CVS $Revision: 1.13 $ $Date: 2001/12/02 19:27:20 $
*/
public abstract class AbstractComplementaryConfigurableAction extends
ConfigurableComposerAction {
private static Map configurations = new HashMap();
@@ -43,7 +45,7 @@
boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT;
if (this.settings.containsKey("reloadable"))
reloadable = Boolean.getBoolean((String) this.settings.get("reloadable"));
- return this.getConfiguration(descriptor, reloadable);
+ return this.getConfiguration(descriptor, null, reloadable);
}
/**
@@ -52,7 +54,7 @@
* this approach, we can limit the number of config files.
* Also note that the configuration file does not have to be a file.
*/
- protected Configuration getConfiguration(String descriptor, boolean reloadable)
throws ConfigurationException {
+ protected Configuration getConfiguration(String descriptor, SourceResolver
resolver, boolean reloadable) throws ConfigurationException {
ConfigurationHelper conf = null;
if (descriptor == null) {
@@ -68,7 +70,7 @@
try {
sourceHandler = (SourceHandler)
this.manager.lookup(SourceHandler.ROLE);
- resource = sourceHandler.getSource(null, descriptor);
+ resource = sourceHandler.getSource((Environment)resolver,
descriptor);
if (conf == null || conf.lastModified <
resource.getLastModified()) {
getLogger().debug("(Re)Loading " + descriptor);
1.15 +2 -2 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java
Index: DatabaseAddAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DatabaseAddAction.java 2001/10/25 18:00:11 1.14
+++ DatabaseAddAction.java 2001/12/02 19:27:20 1.15
@@ -33,7 +33,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.14 $ $Date: 2001/10/25 18:00:11 $
+ * @version CVS $Revision: 1.15 $ $Date: 2001/12/02 19:27:20 $
*/
public class DatabaseAddAction extends AbstractDatabaseAction implements ThreadSafe
{
protected static final Map addStatements = new HashMap();
@@ -56,7 +56,7 @@
// read local parameter settings
try {
Configuration conf =
- this.getConfiguration(param.getParameter("descriptor", (String)
this.settings.get("descriptor")),
+ this.getConfiguration(param.getParameter("descriptor", (String)
this.settings.get("descriptor")), resolver,
param.getParameterAsBoolean("reloadable",reloadable));
datasource = this.getDataSource(conf);
1.17 +4 -3
xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java
Index: DatabaseAuthenticatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DatabaseAuthenticatorAction.java 2001/10/25 19:32:58 1.16
+++ DatabaseAuthenticatorAction.java 2001/12/02 19:27:20 1.17
@@ -1,4 +1,4 @@
-// $Id: DatabaseAuthenticatorAction.java,v 1.16 2001/10/25 19:32:58 bloritsch Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.17 2001/12/02 19:27:20 giacomo Exp $
package org.apache.cocoon.acting;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
@@ -54,7 +54,7 @@
* not verified.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.16 $ $Date: 2001/10/25 19:32:58 $
+ * @version CVS $Revision: 1.17 $ $Date: 2001/12/02 19:27:20 $
*/
public class DatabaseAuthenticatorAction extends AbstractDatabaseAction implements
ThreadSafe
{
@@ -79,6 +79,7 @@
try {
Configuration conf = this.getConfiguration (
parameters.getParameter ("descriptor", (String)
this.settings.get("descriptor")),
+ resolver,
parameters.getParameterAsBoolean("reloadable",reloadable));
boolean cs = true;
String create_session = parameters.getParameter ("create-session",
@@ -272,5 +273,5 @@
}
}
-// $Id: DatabaseAuthenticatorAction.java,v 1.16 2001/10/25 19:32:58 bloritsch Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.17 2001/12/02 19:27:20 giacomo Exp $
// vim: set et ts=4 sw=4:
1.12 +2 -2
xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java
Index: DatabaseDeleteAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DatabaseDeleteAction.java 2001/10/11 07:28:15 1.11
+++ DatabaseDeleteAction.java 2001/12/02 19:27:20 1.12
@@ -32,7 +32,7 @@
* the keys.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.11 $ $Date: 2001/10/11 07:28:15 $
+ * @version CVS $Revision: 1.12 $ $Date: 2001/12/02 19:27:20 $
*/
public final class DatabaseDeleteAction extends AbstractDatabaseAction implements
ThreadSafe {
private static final Map deleteStatements = new HashMap();
@@ -54,7 +54,7 @@
// read local parameter settings
try {
Configuration conf =
- this.getConfiguration(param.getParameter("descriptor", (String)
this.settings.get("descriptor")),
+ this.getConfiguration(param.getParameter("descriptor", (String)
this.settings.get("descriptor")), resolver,
param.getParameterAsBoolean("reloadable",reloadable));
String query = this.getDeleteQuery(conf);
1.13 +2 -2
xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java
Index: DatabaseUpdateAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DatabaseUpdateAction.java 2001/10/11 07:28:15 1.12
+++ DatabaseUpdateAction.java 2001/12/02 19:27:20 1.13
@@ -29,7 +29,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.12 $ $Date: 2001/10/11 07:28:15 $
+ * @version CVS $Revision: 1.13 $ $Date: 2001/12/02 19:27:20 $
*/
public class DatabaseUpdateAction extends AbstractDatabaseAction implements
ThreadSafe {
private static final Map updateStatements = new HashMap();
@@ -51,7 +51,7 @@
// read local parameter settings
try {
Configuration conf =
- this.getConfiguration(param.getParameter("descriptor", (String)
this.settings.get("descriptor")),
+ this.getConfiguration(param.getParameter("descriptor", (String)
this.settings.get("descriptor")), resolver,
param.getParameterAsBoolean("reloadable",reloadable));
String query = this.getUpdateQuery(conf);
1.13 +4 -4
xml-cocoon2/src/org/apache/cocoon/acting/FormValidatorAction.java
Index: FormValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/FormValidatorAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FormValidatorAction.java 2001/10/11 07:28:15 1.12
+++ FormValidatorAction.java 2001/12/02 19:27:20 1.13
@@ -1,4 +1,4 @@
-// $Id: FormValidatorAction.java,v 1.12 2001/10/11 07:28:15 cziegeler Exp $
+// $Id: FormValidatorAction.java,v 1.13 2001/12/02 19:27:20 giacomo Exp $
package org.apache.cocoon.acting;
import org.apache.avalon.framework.configuration.Configuration;
@@ -55,7 +55,7 @@
*
* @author Martin Man <[EMAIL PROTECTED]>
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Revision: 1.12 $ $Date: 2001/10/11 07:28:15 $
+ * @version CVS $Revision: 1.13 $ $Date: 2001/12/02 19:27:20 $
*/
public class FormValidatorAction extends AbstractValidatorAction implements
ThreadSafe
{
@@ -81,7 +81,7 @@
// read local settings
try {
Configuration conf = this.getConfiguration (
- parameters.getParameter ("descriptor", (String)
this.settings.get("descriptor")),
+ parameters.getParameter ("descriptor", (String)
this.settings.get("descriptor")), resolver,
parameters.getParameterAsBoolean("reloadable", reloadable));
String valstr = parameters.getParameter ("validate", (String)
settings.get("validate",""));
String valsetstr = parameters.getParameter ("validate-set", (String)
settings.get("validate-set",""));
@@ -205,5 +205,5 @@
}
}
-// $Id: FormValidatorAction.java,v 1.12 2001/10/11 07:28:15 cziegeler Exp $
+// $Id: FormValidatorAction.java,v 1.13 2001/12/02 19:27:20 giacomo Exp $
// vim: set et ts=4 sw=4:
1.13 +4 -4
xml-cocoon2/src/org/apache/cocoon/acting/SessionValidatorAction.java
Index: SessionValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionValidatorAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SessionValidatorAction.java 2001/10/11 07:28:16 1.12
+++ SessionValidatorAction.java 2001/12/02 19:27:20 1.13
@@ -1,4 +1,4 @@
-// $Id: SessionValidatorAction.java,v 1.12 2001/10/11 07:28:16 cziegeler Exp $
+// $Id: SessionValidatorAction.java,v 1.13 2001/12/02 19:27:20 giacomo Exp $
package org.apache.cocoon.acting;
import org.apache.avalon.framework.configuration.Configuration;
@@ -52,7 +52,7 @@
* all validated parameters to the sitemap via {name} expression.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.12 $ $Date: 2001/10/11 07:28:16 $
+ * @version CVS $Revision: 1.13 $ $Date: 2001/12/02 19:27:20 $
*/
public class SessionValidatorAction extends AbstractValidatorAction implements
ThreadSafe
{
@@ -83,7 +83,7 @@
try {
Configuration conf = this.getConfiguration (
- parameters.getParameter ("descriptor", (String)
this.settings.get("descriptor")),
+ parameters.getParameter ("descriptor", (String)
this.settings.get("descriptor")), resolver,
parameters.getParameterAsBoolean("reloadable",reloadable));
String valsetstr = parameters.getParameter ( "validate-set", (String)
settings.get("validate-set") );
@@ -197,5 +197,5 @@
}
}
-// $Id: SessionValidatorAction.java,v 1.12 2001/10/11 07:28:16 cziegeler Exp $
+// $Id: SessionValidatorAction.java,v 1.13 2001/12/02 19:27:20 giacomo Exp $
// vim: set et ts=4 sw=4:
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
