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 2006/03/20 21:21:05 UTC
svn commit: r387301 - in
/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon:
components/treeprocessor/ConcreteTreeProcessor.java
core/container/spring/AvalonServiceSelector.java
Author: cziegeler
Date: Mon Mar 20 12:20:55 2006
New Revision: 387301
URL: http://svn.apache.org/viewcvs?rev=387301&view=rev
Log:
Fix core reload bug and improve factory creation
Use console logger for now
Modified:
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AvalonServiceSelector.java
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java?rev=387301&r1=387300&r2=387301&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java Mon Mar 20 12:20:55 2006
@@ -264,8 +264,6 @@
}
stack.push(oldContext);
}
- System.out.println("Setting factory: " + this.beanFactory);
- System.out.println("Parent: " + this.beanFactory.getParentBeanFactory());
request.setAttribute(CocoonBeanFactory.BEAN_FACTORY_REQUEST_ATTRIBUTE, this.beanFactory, Request.REQUEST_SCOPE);
}
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AvalonServiceSelector.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AvalonServiceSelector.java?rev=387301&r1=387300&r2=387301&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AvalonServiceSelector.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AvalonServiceSelector.java Mon Mar 20 12:20:55 2006
@@ -27,7 +27,7 @@
* @since 2.2
* @version $Id$
*/
-public class AvalonServiceSelector implements BeanFactoryAware {
+public class AvalonServiceSelector implements BeanFactoryAware, ServiceSelector {
protected final String role;
protected String defaultKey;