cziegeler 2004/02/22 09:53:36
Modified: src/java/org/apache/cocoon/components/source/impl
SitemapSource.java SitemapSourceFactory.java
Log:
Make internal pipeline calls work (finally)
Revision Changes Path
1.30 +9 -7
cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- SitemapSource.java 22 Feb 2004 17:36:34 -0000 1.29
+++ SitemapSource.java 22 Feb 2004 17:53:36 -0000 1.30
@@ -96,22 +96,22 @@
private SourceValidity sourceValidity;
/** The system id */
- private String systemId;
+ private final String systemId;
/** The system id used for caching */
private String systemIdForCaching;
/** The current ServiceManager */
- private ServiceManager manager;
+ private final ServiceManager manager;
/** The processor */
- private Processor processor;
+ private final Processor processor;
/** The pipeline description */
private Processor.InternalPipelineDescription pipelineDescription;
/** The environment */
- private MutableEnvironmentFacade environment;
+ private final MutableEnvironmentFacade environment;
/** The redirect <code>Source</code> */
private Source redirectSource;
@@ -129,7 +129,7 @@
private boolean processed;
/** The used protocol */
- private String protocol;
+ private final String protocol;
/** SourceResolver (for the redirect source) */
private SourceResolver sourceResolver;
@@ -165,7 +165,7 @@
// create environment...
EnvironmentWrapper wrapper = new EnvironmentWrapper(env,
info.requestURI,
info.queryString, logger,
manager, info.rawMode, info.view);
- wrapper.setURI(info.prefix, uri);
+ wrapper.setURI(info.prefix, info.uri);
// The environment is a facade whose delegate can be changed in case
of internal redirects
this.environment = new MutableEnvironmentFacade(wrapper);
@@ -176,6 +176,8 @@
} else {
this.environment.getObjectModel().remove(ObjectModelHelper.PARENT_CONTEXT);
}
+
+ this.systemId = info.systemId;
// initialize
this.init();
1.7 +2 -3
cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java
Index: SitemapSourceFactory.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SitemapSourceFactory.java 6 Jan 2004 12:49:26 -0000 1.6
+++ SitemapSourceFactory.java 22 Feb 2004 17:53:36 -0000 1.7
@@ -58,7 +58,6 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceFactory;
import org.apache.excalibur.source.SourceUtil;
@@ -79,7 +78,7 @@
*/
public final class SitemapSourceFactory
extends AbstractLogEnabled
- implements SourceFactory, ThreadSafe, Serviceable, URIAbsolutizer
+ implements SourceFactory, Serviceable, URIAbsolutizer
{
/** The <code>ServiceManager</code> */
private ServiceManager manager;
