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 2004/03/23 16:19:22 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon Cocoon.java
cziegeler 2004/03/23 07:19:22
Modified: src/java/org/apache/cocoon Cocoon.java
Log:
SourceResolver is not used here
Revision Changes Path
1.41 +3 -8 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Cocoon.java 10 Mar 2004 17:58:04 -0000 1.40
+++ Cocoon.java 23 Mar 2004 15:19:22 -0000 1.41
@@ -38,9 +38,9 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.environment.internal.EnvironmentHelper;
import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.impl.URLSource;
/**
@@ -89,9 +89,6 @@
private static final String lineSeparator = System.getProperty("line.separator");
- /** The source resolver */
- protected SourceResolver sourceResolver;
-
/** The environment helper */
protected EnvironmentHelper environmentHelper;
@@ -106,12 +103,10 @@
*
* @param manager the parent service manager.
*
- * @avalon.dependency type=SourceResolver
*/
public void service(ServiceManager manager)
throws ServiceException {
this.serviceManager = manager;
- this.sourceResolver = (SourceResolver) this.serviceManager.lookup(SourceResolver.ROLE);
try {
this.environmentHelper = new EnvironmentHelper(
(String) this.context.get(Constants.CONTEXT_ROOT_URL));
@@ -434,7 +429,7 @@
/* (non-Javadoc)
* @see org.apache.cocoon.Processor#getEnvironmentHelper()
*/
- public org.apache.cocoon.environment.SourceResolver getSourceResolver() {
+ public SourceResolver getSourceResolver() {
return this.environmentHelper;
}