You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/10/19 18:06:33 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon ProcessorWrapper.java Cocoon.java Processor.java
cziegeler 2003/10/19 09:06:33
Modified: src/java/org/apache/cocoon/components/treeprocessor
TreeProcessor.java
src/java/org/apache/cocoon ProcessorWrapper.java Cocoon.java
Processor.java
Log:
Readding overwritten changes in Cocoon.java
Extending Processor interface to get the current sitemap source resolver
Revision Changes Path
1.16 +9 -1 cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Index: TreeProcessor.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TreeProcessor.java 15 Oct 2003 18:03:52 -0000 1.15
+++ TreeProcessor.java 19 Oct 2003 16:06:32 -0000 1.16
@@ -587,4 +587,12 @@
}
}
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.Processor#getSourceResolver()
+ */
+ public org.apache.cocoon.environment.SourceResolver getSourceResolver() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
1.5 +9 -1 cocoon-2.2/src/java/org/apache/cocoon/ProcessorWrapper.java
Index: ProcessorWrapper.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/ProcessorWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProcessorWrapper.java 16 Aug 2003 13:30:04 -0000 1.4
+++ ProcessorWrapper.java 19 Oct 2003 16:06:32 -0000 1.5
@@ -57,6 +57,7 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.SourceResolver;
/**
* This class is a wrapper around the real processor (the <code>Cocoon</code> class).
@@ -109,6 +110,13 @@
*/
public Processor getRootProcessor() {
return this.processor.getRootProcessor();
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.Processor#getSourceResolver()
+ */
+ public SourceResolver getSourceResolver() {
+ return this.processor.getSourceResolver();
}
}
1.21 +14 -7 cocoon-2.2/src/java/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Cocoon.java 17 Oct 2003 22:03:42 -0000 1.20
+++ Cocoon.java 19 Oct 2003 16:06:32 -0000 1.21
@@ -60,7 +60,6 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.components.ComponentContext;
-import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.language.generator.ProgramGenerator;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.components.source.impl.DelayedRefreshSourceWrapper;
@@ -458,8 +457,8 @@
}
programGenerator = (ProgramGenerator) this.serviceManager.lookup(ProgramGenerator.ROLE);
-/* source = environment.resolveURI(fileName);
- CompiledComponent xsp = programGenerator.load(this.serviceManager,
+ source = this.sourceResolver.resolveURI(fileName);
+ /* CompiledComponent xsp = programGenerator.load(this.serviceManager,
source,
markupLanguage, programmingLanguage, environment);
if (getLogger().isDebugEnabled()) {
@@ -467,7 +466,7 @@
}
*/
} finally {
- //environment.release(source);
+ this.sourceResolver.release(source);
this.serviceManager.release(programGenerator);
}
}
@@ -479,9 +478,17 @@
return activeRequestCount;
}
- public ServiceManager getServiceManager()
- {
+ public ServiceManager getServiceManager() {
return serviceManager;
}
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.Processor#getSourceResolver()
+ */
+ public org.apache.cocoon.environment.SourceResolver getSourceResolver() {
+ // TODO (CZ) Implement me
+ return null;
+ }
+
}
1.7 +9 -1 cocoon-2.2/src/java/org/apache/cocoon/Processor.java
Index: Processor.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/Processor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Processor.java 22 Aug 2003 23:42:53 -0000 1.6
+++ Processor.java 19 Oct 2003 16:06:32 -0000 1.7
@@ -55,6 +55,7 @@
import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.SourceResolver;
/**
*
@@ -100,4 +101,11 @@
* @since 2.1.1
*/
Processor getRootProcessor();
+
+ /**
+ * Get the Source Resolver for this processor
+ * EXPERIMENTAL
+ * @since 2.2
+ */
+ SourceResolver getSourceResolver();
}