ok, the AbstractComplementar.... really is about the same in both branches.
Here's a patch for that and one to an action that isn't in 2.0 that needs the change.
Index: AbstractComplementaryConfigurableAction.java
===================================================================
RCS file:
/home/cvspublic/xml-cocoon2/src/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java,v
retrieving revision 1.3.2.10
diff -u -r1.3.2.10 AbstractComplementaryConfigurableAction.java
--- AbstractComplementaryConfigurableAction.java 2001/12/02 19:26:56
1.3.2.10
+++ AbstractComplementaryConfigurableAction.java 2001/12/03 00:13:20
@@ -70,7 +70,10 @@
try {
sourceHandler = (SourceHandler)
this.manager.lookup(SourceHandler.ROLE);
- resource = sourceHandler.getSource((Environment)resolver,
descriptor);
+ if (descriptor.startsWith("file:")) {
+ resource =
+sourceHandler.getSource((Environment)resolver,((Environment)resolver).getContext(),
+descriptor.substring(5));
+ } else
+ resource = sourceHandler.getSource(null, descriptor);
if (conf == null || conf.lastModified <
resource.getLastModified()) {
getLogger().debug("(Re)Loading " + descriptor);
Index: DatabaseSelectAction.java
===================================================================
RCS file:
/home/cvspublic/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseSelectAction.java,v
retrieving revision 1.5
diff -u -r1.5 DatabaseSelectAction.java
--- DatabaseSelectAction.java 2001/10/11 07:28:15 1.5
+++ DatabaseSelectAction.java 2001/12/03 00:31:22
@@ -56,6 +56,7 @@
try {
Configuration conf =
this.getConfiguration(param.getParameter("descriptor", (String)
this.settings.get("descriptor")),
+ resolver,
param.getParameterAsBoolean("reloadable",reloadable));
Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
