cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r473340 - in /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon: acting/ components/pipeline/impl/ components/sax/ components/source/impl/ components/treeprocessor/sitemap/ core/container/spring/ environment/http/
Date Fri, 10 Nov 2006 13:49:11 GMT
Author: cziegeler
Date: Fri Nov 10 05:49:10 2006
New Revision: 473340

URL: http://svn.apache.org/viewvc?view=rev&rev=473340
Log:
Code cleanup

Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/CopySourceAction.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/AbstractXMLByteStreamInterpreter.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSource.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSourceFactory.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNode.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/http/HttpRequest.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/CopySourceAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/CopySourceAction.java?view=diff&rev=473340&r1=473339&r2=473340
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/CopySourceAction.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/CopySourceAction.java
Fri Nov 10 05:49:10 2006
@@ -17,8 +17,6 @@
 package org.apache.cocoon.acting;
 
 import java.util.Map;
-import java.io.InputStream;
-import java.io.OutputStream;
 
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;
@@ -82,12 +80,6 @@
                 }
             }
         }
-
-        ModifiableSource wdest = (ModifiableSource)dest;
-
-        // Get streams
-        InputStream is = src.getInputStream();
-        OutputStream os = wdest.getOutputStream();
 
         // And transfer all content.
         try {

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java?view=diff&rev=473340&r1=473339&r2=473340
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
Fri Nov 10 05:49:10 2006
@@ -23,7 +23,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 
-import org.apache.avalon.framework.component.ComponentException;
 import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/AbstractXMLByteStreamInterpreter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/AbstractXMLByteStreamInterpreter.java?view=diff&rev=473340&r1=473339&r2=473340
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/AbstractXMLByteStreamInterpreter.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/AbstractXMLByteStreamInterpreter.java
Fri Nov 10 05:49:10 2006
@@ -16,7 +16,6 @@
  */
 package org.apache.cocoon.components.sax;
 
-import java.io.IOException;
 import java.util.ArrayList;
 
 import org.apache.cocoon.xml.DefaultLexicalHandler;

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSource.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSource.java?view=diff&rev=473340&r1=473339&r2=473340
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSource.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSource.java
Fri Nov 10 05:49:10 2006
@@ -22,7 +22,6 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.excalibur.source.Source;
@@ -37,22 +36,21 @@
  * 
  * @version $Id$
  */
-public class BlockContextSource extends AbstractSource implements
-        TraversableSource {
+public class BlockContextSource
+    extends AbstractSource
+    implements TraversableSource {
     
     private Map blockContexts;
     private ServiceManager manager;
-    private Logger logger;
 
     /**
      * 
      */
-    public BlockContextSource(String location, Map blockContexts, ServiceManager manager,
Logger logger) {
+    public BlockContextSource(String location, Map blockContexts, ServiceManager manager)
{
         this.setScheme(location.substring(0, location.indexOf(":/")));
         this.setSystemId(location);
         this.blockContexts = blockContexts;
         this.manager = manager;
-        this.logger = logger;
     }
 
     /* (non-Javadoc)

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSourceFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSourceFactory.java?view=diff&rev=473340&r1=473339&r2=473340
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSourceFactory.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSourceFactory.java
Fri Nov 10 05:49:10 2006
@@ -59,7 +59,7 @@
 
         // the root "directory" of the blocks
         if (location.endsWith(":/"))
-            return new BlockContextSource(location, blockContexts, this.serviceManager, this.getLogger());
+            return new BlockContextSource(location, blockContexts, this.serviceManager);
         
         // Remove the protocol and the first '/'
         int pos = location.indexOf(":/");

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNode.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNode.java?view=diff&rev=473340&r1=473339&r2=473340
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNode.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNode.java
Fri Nov 10 05:49:10 2006
@@ -23,7 +23,6 @@
 import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
 import org.apache.cocoon.environment.Environment;
 import org.apache.cocoon.sitemap.SitemapExecutor;
-import org.apache.cocoon.ProcessingException;
 
 import java.util.Map;
 

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java?view=diff&rev=473340&r1=473339&r2=473340
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
Fri Nov 10 05:49:10 2006
@@ -21,7 +21,6 @@
 import java.util.Properties;
 
 import org.apache.cocoon.configuration.Settings;
-import org.apache.cocoon.configuration.SettingsDefaults;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.PropertyOverrideConfigurer;

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java?view=diff&rev=473340&r1=473339&r2=473340
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java
Fri Nov 10 05:49:10 2006
@@ -26,8 +26,7 @@
  * @since 2.2
  * @version $Id$
  */
-public class RunningModeHelper
-{
+public class RunningModeHelper {
 
     public final static String PROPERTY_RUNNING_MODE = "org.apache.cocoon.mode";
     
@@ -44,8 +43,7 @@
     }
 
     /** Name of the property specifying the running mode. */
-    private RunningModeHelper()
-    {
+    private RunningModeHelper() {
         // never initiate
     }
 
@@ -55,10 +53,10 @@
      * The system default running mode will be used if the passed parameter mode is null.
      */
     public static String determineRunningMode(String mode) {
-        if(SYSTEM_RUNNING_MODE != null) {
+        if (SYSTEM_RUNNING_MODE != null) {
             return SYSTEM_RUNNING_MODE;
         }
-        if(mode == null) {
+        if (mode == null) {
             return SettingsDefaults.DEFAULT_RUNNING_MODE;
         }
         return mode;

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java?view=diff&rev=473340&r1=473339&r2=473340
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
Fri Nov 10 05:49:10 2006
@@ -23,7 +23,6 @@
 import java.util.Properties;
 
 import org.apache.cocoon.configuration.Settings;
-import org.apache.cocoon.configuration.SettingsDefaults;
 import org.apache.cocoon.util.Deprecation;
 import org.apache.cocoon.xml.dom.DomHelper;
 import org.springframework.beans.factory.BeanDefinitionStoreException;

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/http/HttpRequest.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/http/HttpRequest.java?view=diff&rev=473340&r1=473339&r2=473340
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/http/HttpRequest.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/http/HttpRequest.java
Fri Nov 10 05:49:10 2006
@@ -36,7 +36,6 @@
 import org.apache.cocoon.environment.Session;
 import org.apache.cocoon.environment.ValueHolder;
 import org.apache.cocoon.environment.impl.AbstractRequest;
-import org.apache.cocoon.servlet.multipart.MultipartHttpServletRequest;
 import org.apache.commons.collections.IteratorUtils;
 
 /**



Mime
View raw message