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/05/14 12:26:18 UTC
svn commit: r406306 - in
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon:
components/treeprocessor/ components/treeprocessor/sitemap/
core/container/spring/ core/osgi/ environment/
Author: cziegeler
Date: Sun May 14 03:26:16 2006
New Revision: 406306
URL: http://svn.apache.org/viewcvs?rev=406306&view=rev
Log:
Rename StandaloneServiceSelector to NodeBuilderSelector and more cleanup
Added:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/NodeBuilderSelector.java
- copied, changed from r406300, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/StandaloneServiceSelector.java
Removed:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/StandaloneServiceSelector.java
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ActNodeBuilder.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/CallNodeBuilder.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNodeBuilder.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
Copied: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/NodeBuilderSelector.java (from r406300, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/StandaloneServiceSelector.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/NodeBuilderSelector.java?p2=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/NodeBuilderSelector.java&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/StandaloneServiceSelector.java&r1=406300&r2=406306&rev=406306&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/StandaloneServiceSelector.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/NodeBuilderSelector.java Sun May 14 03:26:16 2006
@@ -46,7 +46,7 @@
* @version $Id$
* @since 2.2
*/
-public class StandaloneServiceSelector
+public class NodeBuilderSelector
extends AbstractLogEnabled
implements ServiceSelector,
Serviceable,
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=406306&r1=406305&r2=406306&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 Sun May 14 03:26:16 2006
@@ -52,7 +52,6 @@
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.xml.sax.SAXException;
/**
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ActNodeBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ActNodeBuilder.java?rev=406306&r1=406305&r2=406306&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ActNodeBuilder.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ActNodeBuilder.java Sun May 14 03:26:16 2006
@@ -35,6 +35,9 @@
private ActSetNode actSetNode;
private String actSetName;
+ /**
+ * @see org.apache.cocoon.components.treeprocessor.ProcessingNodeBuilder#buildNode(org.apache.avalon.framework.configuration.Configuration)
+ */
public ProcessingNode buildNode(Configuration config) throws Exception {
boolean inActionSet = this.treeBuilder.getAttribute(ActionSetNodeBuilder.IN_ACTION_SET) != null;
@@ -89,6 +92,9 @@
return this.actSetNode;
}
+ /**
+ * @see org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder#linkNode()
+ */
public void linkNode() throws Exception {
if (this.actSetNode != null) {
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/CallNodeBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/CallNodeBuilder.java?rev=406306&r1=406305&r2=406306&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/CallNodeBuilder.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/CallNodeBuilder.java Sun May 14 03:26:16 2006
@@ -44,6 +44,9 @@
protected String continuationId;
+ /**
+ * @see org.apache.cocoon.components.treeprocessor.ProcessingNodeBuilder#buildNode(org.apache.avalon.framework.configuration.Configuration)
+ */
public ProcessingNode buildNode(Configuration config)
throws Exception {
resourceName = config.getAttribute("resource", null);
@@ -91,6 +94,9 @@
return this.node;
}
+ /**
+ * @see org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder#linkNode()
+ */
public void linkNode() throws Exception {
if (resourceName != null) {
// We have a <map:call resource="..."/>
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java?rev=406306&r1=406305&r2=406306&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java Sun May 14 03:26:16 2006
@@ -59,7 +59,7 @@
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.ProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessorComponentInfo;
-import org.apache.cocoon.components.treeprocessor.StandaloneServiceSelector;
+import org.apache.cocoon.components.treeprocessor.NodeBuilderSelector;
import org.apache.cocoon.components.treeprocessor.TreeBuilder;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
@@ -403,7 +403,7 @@
// Create & initialize the NodeBuilder selector.
{
- StandaloneServiceSelector selector = new StandaloneServiceSelector();
+ NodeBuilderSelector selector = new NodeBuilderSelector();
// Load the builder config file
SourceResolver resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNodeBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNodeBuilder.java?rev=406306&r1=406305&r2=406306&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNodeBuilder.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNodeBuilder.java Sun May 14 03:26:16 2006
@@ -37,6 +37,9 @@
private Collection views;
private Map pipelineHints;
+ /**
+ * @see org.apache.cocoon.components.treeprocessor.ProcessingNodeBuilder#buildNode(org.apache.avalon.framework.configuration.Configuration)
+ */
public ProcessingNode buildNode(Configuration config) throws Exception {
String type = this.treeBuilder.getTypeForStatement(config, Transformer.ROLE);
@@ -53,6 +56,9 @@
return this.treeBuilder.setupNode(node, config);
}
+ /**
+ * @see org.apache.cocoon.components.treeprocessor.LinkedProcessingNodeBuilder#linkNode()
+ */
public void linkNode() throws Exception {
this.node.setViews(
((SitemapLanguage)this.treeBuilder).getViewNodes(this.views)
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java?rev=406306&r1=406305&r2=406306&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java Sun May 14 03:26:16 2006
@@ -15,8 +15,6 @@
*/
package org.apache.cocoon.core.container.spring;
-import javax.servlet.ServletConfig;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.Logger;
@@ -24,7 +22,6 @@
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.core.Settings;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.servlet.CocoonServlet;
import org.apache.excalibur.source.SourceResolver;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java?rev=406306&r1=406305&r2=406306&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java Sun May 14 03:26:16 2006
@@ -36,7 +36,6 @@
import org.apache.cocoon.core.container.spring.ConfigReader;
import org.apache.cocoon.core.container.spring.ConfigurationInfo;
import org.apache.cocoon.environment.Context;
-import org.apache.excalibur.store.Store;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceFactory;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java?rev=406306&r1=406305&r2=406306&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java Sun May 14 03:26:16 2006
@@ -180,6 +180,7 @@
try {
final String JAVA_PACKAGE = "JavaPackage";
ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ // FIXME - NativeJavaPackage is an internal class which we should not use
Scriptable newPackages = new NativeJavaPackage( "", cl );
newPackages.setParentScope( getScope() );
newPackages.setPrototype( ScriptableObject.getClassPrototype( getScope(),