svn commit: r227218 - /cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/SpringComponentLocator.java

[cz...@apache.org]

Author: cziegeler
Date: Wed Aug  3 06:21:41 2005
New Revision: 227218

URL: http://svn.apache.org/viewcvs?rev=227218&view=rev
Log:
Don't expose cache but service manager :)

Modified:
    cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/SpringComponentLocator.java

Modified: cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/SpringComponentLocator.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/SpringComponentLocator.java?rev=227218&r1=227217&r2=227218&view=diff
==============================================================================
--- cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/SpringComponentLocator.java (original)
+++ cocoon/blocks/spring-app/trunk/java/org/apache/cocoon/spring/SpringComponentLocator.java Wed Aug  3 06:21:41 2005
@@ -34,7 +34,6 @@
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.cocoon.Constants;
 import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.caching.Cache;
 import org.apache.cocoon.core.Core;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
@@ -80,7 +79,6 @@
     protected ServiceManager manager;
     protected SourceResolver resolver;
     protected Core cocoon;
-    protected Cache cache;
     protected Context context;
 
     protected CocoonApplicationContext wac;
@@ -107,7 +105,6 @@
         this.manager = aManager;
         this.resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
         this.cocoon = (Core)this.manager.lookup(Core.ROLE);
-        this.cache = (Cache)this.manager.lookup(Cache.ROLE);
     }
 
     /**
@@ -171,8 +168,6 @@
             this.resolver = null;
             this.manager.release(this.cocoon);
             this.cocoon = null;
-            this.manager.release(this.cache);
-            this.cache = null;
             this.manager = null;
         }
     }
@@ -256,7 +251,7 @@
      */
     protected void registerDefaults(ConfigurableListableBeanFactory factory) {
         factory.registerSingleton("cocoon-core", this.cocoon);
-        factory.registerSingleton("cocoon-cache", this.cache);
+        factory.registerSingleton("cocoon-service-manager", this.manager);
         factory.registerSingleton("cocoon-context", this.context);
     }