Author: cziegeler
Date: Sat Oct 8 10:20:59 2005
New Revision: 307316
URL: http://svn.apache.org/viewcvs?rev=307316&view=rev
Log:
Clean up code
Modified:
cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java
cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java
cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockContext.java
cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlocksManager.java
cocoon/trunk/src/java/org/apache/cocoon/core/CoreResourceNotFoundException.java
cocoon/trunk/src/java/org/apache/cocoon/core/osgi/CoreBlockActivator.java
cocoon/trunk/src/java/org/apache/cocoon/core/osgi/OSGiBootstrapEnvironment.java
cocoon/trunk/src/java/org/apache/cocoon/core/osgi/ServiceManagerActivator.java
cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
cocoon/trunk/src/java/org/apache/cocoon/environment/internal/BlockEnvironmentHelper.java
cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
Modified: cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java?rev=307316&r1=307315&r2=307316&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java Sat Oct 8
10:20:59 2005
@@ -266,7 +266,7 @@
if (params == null) {
throw new ProcessingException("Neither a constraint-set nor parameters in the
sitemap "
+ "were specified for validating at "
- + SitemapParameters.getStatementLocation(parameters));
+ + SitemapParameters.getLocation(parameters));
}
HashMap values = this.createMapOfParameters(objectModel, params);
allOK = this.validateSetOfParameters(desc, actionMap, resultMap, params, values,
this.isStringEncoded());
Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java?rev=307316&r1=307315&r2=307316&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java Sat Oct 8 10:20:59 2005
@@ -16,10 +16,8 @@
package org.apache.cocoon.bean;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockContext.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockContext.java?rev=307316&r1=307315&r2=307316&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockContext.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlockContext.java Sat Oct 8
10:20:59 2005
@@ -23,7 +23,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlocksManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlocksManager.java?rev=307316&r1=307315&r2=307316&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlocksManager.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/blocks/BlocksManager.java Sat Oct
8 10:20:59 2005
@@ -16,8 +16,6 @@
package org.apache.cocoon.components.blocks;
import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
@@ -38,14 +36,14 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.components.LifecycleHelper;
import org.apache.cocoon.components.container.CocoonServiceManager;
import org.apache.cocoon.core.Core;
import org.apache.cocoon.core.container.SingleComponentServiceManager;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.internal.EnvironmentHelper;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceResolver;
import org.xml.sax.SAXException;
/**
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/CoreResourceNotFoundException.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/CoreResourceNotFoundException.java?rev=307316&r1=307315&r2=307316&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/CoreResourceNotFoundException.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/CoreResourceNotFoundException.java Sat Oct
8 10:20:59 2005
@@ -15,17 +15,13 @@
*/
package org.apache.cocoon.core;
-import org.apache.avalon.framework.CascadingRuntimeException;
+public final class CoreResourceNotFoundException extends CoreException {
-public final class CoreResourceNotFoundException extends CoreException
-{
- public CoreResourceNotFoundException(String message)
- {
+ public CoreResourceNotFoundException(String message) {
super(message, null);
}
- public CoreResourceNotFoundException(String message, Throwable cause)
- {
+ public CoreResourceNotFoundException(String message, Throwable cause){
super(message, cause);
}
}
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/osgi/CoreBlockActivator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/osgi/CoreBlockActivator.java?rev=307316&r1=307315&r2=307316&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/osgi/CoreBlockActivator.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/osgi/CoreBlockActivator.java Sat Oct 8 10:20:59
2005
@@ -16,9 +16,7 @@
*/
package org.apache.cocoon.core.osgi;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.Cocoon;
@@ -31,7 +29,7 @@
public class CoreBlockActivator extends ServiceManagerActivator {
- private ClassLoader classLoader = getClass().getClassLoader();;
+ private ClassLoader classLoader = getClass().getClassLoader();
private Core core;
private Processor processor;
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/osgi/OSGiBootstrapEnvironment.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/osgi/OSGiBootstrapEnvironment.java?rev=307316&r1=307315&r2=307316&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/osgi/OSGiBootstrapEnvironment.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/osgi/OSGiBootstrapEnvironment.java Sat Oct
8 10:20:59 2005
@@ -17,8 +17,8 @@
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
@@ -34,7 +34,6 @@
import org.apache.cocoon.environment.impl.AbstractContext;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
import org.osgi.service.log.LogService;
/**
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/osgi/ServiceManagerActivator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/osgi/ServiceManagerActivator.java?rev=307316&r1=307315&r2=307316&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/osgi/ServiceManagerActivator.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/osgi/ServiceManagerActivator.java Sat Oct
8 10:20:59 2005
@@ -27,7 +27,6 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.core.Core;
import org.apache.cocoon.core.container.CoreServiceManager;
-import org.apache.cocoon.components.container.ComponentContext;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
Modified: cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java?rev=307316&r1=307315&r2=307316&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java Sat
Oct 8 10:20:59 2005
@@ -22,7 +22,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.components.flow.FlowHelper;
-import org.apache.cocoon.components.flow.javascript.fom.FOM_Cocoon;
import org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptFlowHelper;
import org.apache.commons.jxpath.DynamicPropertyHandler;
import org.apache.commons.jxpath.JXPathBeanInfo;
Modified: cocoon/trunk/src/java/org/apache/cocoon/environment/internal/BlockEnvironmentHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/environment/internal/BlockEnvironmentHelper.java?rev=307316&r1=307315&r2=307316&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/environment/internal/BlockEnvironmentHelper.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/environment/internal/BlockEnvironmentHelper.java
Sat Oct 8 10:20:59 2005
@@ -17,8 +17,6 @@
import java.net.URL;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.Processor;
import org.apache.cocoon.components.blocks.Block;
/**
Modified: cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java?rev=307316&r1=307315&r2=307316&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java Sat Oct 8 10:20:59
2005
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.util.log;
-import org.apache.avalon.framework.ExceptionUtil;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.cocoon.environment.ObjectModelHelper;
|