You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2006/04/10 17:46:37 UTC
svn commit: r392973 - in /cocoon/trunk/core/cocoon-core/src:
main/java/org/apache/cocoon/
main/java/org/apache/cocoon/components/treeprocessor/
test/java/org/apache/cocoon/
Author: reinhard
Date: Mon Apr 10 08:46:36 2006
New Revision: 392973
URL: http://svn.apache.org/viewcvs?rev=392973&view=rev
Log:
Only use BeanFactory instead of ConfigureableListeableBeanFactory which makes it much more complicated to write the SpringBridge because of the really fat interface; the only place that makes the ConfigureableListeableBeanFactory necessary, gets it by a cast to the BeanFactory --> the monoltitic app still works - within the Blocks-Fw this code should never be reached (DF/RP)
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Cocoon.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Processor.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/MockProcessor.java
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Cocoon.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Cocoon.java?rev=392973&r1=392972&r2=392973&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Cocoon.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Cocoon.java Mon Apr 10 08:46:36 2006
@@ -349,7 +349,7 @@
/**
* @see org.apache.cocoon.Processor#getBeanFactory()
*/
- public ConfigurableListableBeanFactory getBeanFactory() {
+ public BeanFactory getBeanFactory() {
return this.beanFactory;
}
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Processor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Processor.java?rev=392973&r1=392972&r2=392973&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Processor.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Processor.java Mon Apr 10 08:46:36 2006
@@ -22,6 +22,7 @@
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.SourceResolver;
+import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
/**
@@ -127,7 +128,7 @@
Object removeAttribute(String name);
/** FIXME - Remove this and use ProcessingUtil. */
- ConfigurableListableBeanFactory getBeanFactory();
+ BeanFactory getBeanFactory();
Processor getParent();
}
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java?rev=392973&r1=392972&r2=392973&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java Mon Apr 10 08:46:36 2006
@@ -51,7 +51,8 @@
import org.apache.cocoon.sitemap.SitemapExecutor;
import org.apache.cocoon.util.location.Location;
import org.apache.cocoon.util.location.LocationImpl;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
/**
* The concrete implementation of {@link Processor}, containing the evaluation tree and associated
@@ -99,7 +100,7 @@
protected Map processorAttributes = new HashMap();
/** Bean Factory for this sitemap. */
- protected ConfigurableListableBeanFactory beanFactory;
+ protected BeanFactory beanFactory;
/**
* Builds a concrete processig, given the wrapping processor
@@ -114,7 +115,7 @@
}
/** Set the processor data, result of the treebuilder job */
- public void setProcessorData(ConfigurableListableBeanFactory beanFactory,
+ public void setProcessorData(BeanFactory beanFactory,
ProcessingNode rootNode,
List disposableNodes,
List enterSitemapEventListeners,
@@ -432,8 +433,8 @@
// clear listeners
this.enterSitemapEventListeners.clear();
this.leaveSitemapEventListeners.clear();
- if ( this.beanFactory != null ) {
- this.beanFactory.destroySingletons();
+ if ( this.beanFactory != null && this.beanFactory instanceof ConfigurableBeanFactory) {
+ ((ConfigurableBeanFactory) this.beanFactory).destroySingletons();
this.beanFactory = null;
}
}
@@ -517,7 +518,7 @@
/**
* @see org.apache.cocoon.Processor#getBeanFactory()
*/
- public ConfigurableListableBeanFactory getBeanFactory() {
+ public BeanFactory getBeanFactory() {
return this.beanFactory;
}
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java?rev=392973&r1=392972&r2=392973&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java Mon Apr 10 08:46:36 2006
@@ -108,7 +108,7 @@
protected ConcreteTreeProcessor concreteProcessor;
/** Our bean factory. */
- protected ConfigurableListableBeanFactory beanFactory;
+ protected BeanFactory beanFactory;
/**
* Create a TreeProcessor.
@@ -503,7 +503,7 @@
/**
* @see org.apache.cocoon.Processor#getBeanFactory()
*/
- public ConfigurableListableBeanFactory getBeanFactory() {
+ public BeanFactory getBeanFactory() {
if ( this.concreteProcessor != null ) {
return this.concreteProcessor.getBeanFactory();
}
@@ -514,7 +514,7 @@
* @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory)
*/
public void setBeanFactory(BeanFactory factory) throws BeansException {
- this.beanFactory = (ConfigurableListableBeanFactory) factory;
+ this.beanFactory = factory;
}
/**
Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/MockProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/MockProcessor.java?rev=392973&r1=392972&r2=392973&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/MockProcessor.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/MockProcessor.java Mon Apr 10 08:46:36 2006
@@ -19,6 +19,7 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.SourceResolver;
+import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
/**
@@ -107,7 +108,7 @@
/**
* @see org.apache.cocoon.Processor#getBeanFactory()
*/
- public ConfigurableListableBeanFactory getBeanFactory() {
+ public BeanFactory getBeanFactory() {
return this.beanFactory;
}
}