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 2005/10/09 18:02:34 UTC
svn commit: r307448 - in /cocoon:
blocks/portal/trunk/java/org/apache/cocoon/portlet/
trunk/src/java/org/apache/cocoon/core/
trunk/src/java/org/apache/cocoon/core/osgi/
trunk/src/java/org/apache/cocoon/generation/
trunk/src/java/org/apache/cocoon/servl...
Author: cziegeler
Date: Sun Oct 9 08:59:31 2005
New Revision: 307448
URL: http://svn.apache.org/viewcvs?rev=307448&view=rev
Log:
Remove now obsolete stuff
Modified:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/CocoonPortlet.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/SettingsHelper.java
cocoon/trunk/src/java/org/apache/cocoon/core/BaseSettings.java
cocoon/trunk/src/java/org/apache/cocoon/core/MutableSettings.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/generation/StatusGenerator.java
cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java
cocoon/trunk/src/test/org/apache/cocoon/test/core/TestBootstrapEnvironment.java
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/CocoonPortlet.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/CocoonPortlet.java?rev=307448&r1=307447&r2=307448&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/CocoonPortlet.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/CocoonPortlet.java Sun Oct 9 08:59:31 2005
@@ -104,9 +104,6 @@
protected javax.portlet.PortletContext portletContext;
- /** The classloader that will be set as the context classloader if init-classloader is true */
- protected ClassLoader classLoader = this.getClass().getClassLoader();
-
/**
* This is the path to the portlet context (or the result
* of calling getRealPath('/') on the PortletContext.
@@ -228,7 +225,7 @@
}
// initialize settings
- PortletBootstrapEnvironment env = new PortletBootstrapEnvironment(conf, this.classLoader, this.portletContextPath, this.portletContextURL);
+ PortletBootstrapEnvironment env = new PortletBootstrapEnvironment(conf, this.portletContextPath, this.portletContextURL);
try {
this.coreUtil = new CoreUtil(env);
@@ -292,16 +289,6 @@
public void processAction(ActionRequest req, ActionResponse res)
throws PortletException, IOException {
- /* HACK for reducing class loader problems. */
- /* example: xalan extensions fail if someone adds xalan jars in tomcat3.2.1/lib */
- if (this.settings.isInitClassloader()) {
- try {
- Thread.currentThread().setContextClassLoader(this.classLoader);
- } catch (Exception e) {
- // ignore it
- }
- }
-
// remember when we started (used for timing the processing)
long start = System.currentTimeMillis();
@@ -463,17 +450,6 @@
*/
public void render(RenderRequest req, RenderResponse res)
throws PortletException, IOException {
-
- /* HACK for reducing class loader problems. */
- /* example: xalan extensions fail if someone adds xalan jars in tomcat3.2.1/lib */
- if (this.settings.isInitClassloader()) {
- try {
- Thread.currentThread().setContextClassLoader(this.classLoader);
- } catch (Exception e) {
- // ignore it
- }
- }
-
// remember when we started (used for timing the processing)
long start = System.currentTimeMillis();
@@ -835,18 +811,15 @@
implements BootstrapEnvironment {
private final PortletConfig config;
- private final ClassLoader classLoader;
private final File writeableContextPath;
private final String contextPath;
public Logger logger;
private final Context environmentContext;
public PortletBootstrapEnvironment(PortletConfig config,
- ClassLoader cl,
String writeablePath,
String path) {
this.config = config;
- this.classLoader = cl;
if ( writeablePath == null ) {
this.writeableContextPath = null;
} else {
@@ -894,13 +867,6 @@
final File workDir = (File)this.config.getPortletContext().getAttribute("javax.servlet.context.tempdir");
settings.setWorkDirectory(workDir.getAbsolutePath());
}
- }
-
- /**
- * @see org.apache.cocoon.core.BootstrapEnvironment#getInitClassLoader()
- */
- public ClassLoader getInitClassLoader() {
- return this.classLoader;
}
/**
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/SettingsHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/SettingsHelper.java?rev=307448&r1=307447&r2=307448&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/SettingsHelper.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/SettingsHelper.java Sun Oct 9 08:59:31 2005
@@ -39,8 +39,6 @@
public static void fill(MutableSettings s, PortletConfig config) {
String value;
- s.setInitClassloader(getInitParameterAsBoolean(config, "init-classloader", s.isInitClassloader()));
-
handleForceProperty(getInitParameter(config, "force-property"), s);
value = getInitParameter(config, "configurations");
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/BaseSettings.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/BaseSettings.java?rev=307448&r1=307447&r2=307448&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/BaseSettings.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/BaseSettings.java Sun Oct 9 08:59:31 2005
@@ -32,11 +32,6 @@
/** Default value for {@link #isManageExceptions()}. */
boolean MANAGE_EXCEPTIONS = true;
- /**
- * Default value for {@link #isInitClassloader()} setting (false)
- */
- boolean INIT_CLASSLOADER = false;
-
/** Name of the property specifying a user properties file */
String PROPERTY_USER_SETTINGS = "org.apache.cocoon.settings";
@@ -98,13 +93,6 @@
String KEY_PARENT_SERVICE_MANAGER = "parentservicemanager";
/**
- * This parameter tells Cocoon to set the thread's context classloader to
- * its own classloader. If you experience strange classloader issues,
- * try setting this parameter to "true".
- */
- String KEY_INIT_CLASSLOADER = "classloader.init";
-
- /**
* This parameter indicates the category id of the logger from the LogKit
* configuration used by the environment.
*/
@@ -244,12 +232,6 @@
* @see #KEY_FORM_ENCODING
*/
String getFormEncoding();
-
- /**
- * @return Returns the initClassloader.
- * @see #KEY_INIT_CLASSLOADER
- */
- boolean isInitClassloader();
/**
* @return Returns the manageExceptions.
Modified: cocoon/trunk/src/java/org/apache/cocoon/core/MutableSettings.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/MutableSettings.java?rev=307448&r1=307447&r2=307448&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/MutableSettings.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/MutableSettings.java Sun Oct 9 08:59:31 2005
@@ -44,13 +44,6 @@
protected List properties = new ArrayList();
/**
- * This parameter tells Cocoon to set the thread's context classloader to
- * its own classloader. If you experience strange classloader issues,
- * try setting this parameter to "true".
- */
- protected boolean initClassloader = INIT_CLASSLOADER;
-
- /**
* This parameter allows to set system properties
*/
protected Map forceProperties = new HashMap();
@@ -249,9 +242,7 @@
key = key.substring(KEYPREFIX.length());
final String value = current.getValue().toString();
- if ( key.equals(KEY_INIT_CLASSLOADER) ) {
- this.initClassloader = BooleanUtils.toBoolean(value);
- } else if ( key.equals(KEY_CONFIGURATION) ) {
+ if ( key.equals(KEY_CONFIGURATION) ) {
this.configuration = value;
} else if ( key.equals(KEY_CONFIGURATION_RELOAD_DELAY) ) {
this.configurationReloadDelay = NumberUtils.toLong(value);
@@ -384,13 +375,6 @@
}
/**
- * @return Returns the initClassloader.
- */
- public boolean isInitClassloader() {
- return this.initClassloader;
- }
-
- /**
* @return Returns the loadClasses.
*/
public List getLoadClasses() {
@@ -535,9 +519,7 @@
String value = null;
if ( key.startsWith(KEYPREFIX) ) {
final String sKey = key.substring(KEYPREFIX.length());
- if ( sKey.equals(KEY_INIT_CLASSLOADER) ) {
- value = String.valueOf(this.initClassloader);
- } else if ( sKey.equals(KEY_CONFIGURATION) ) {
+ if ( sKey.equals(KEY_CONFIGURATION) ) {
value = this.configuration;
} else if ( sKey.equals(KEY_CONFIGURATION_RELOAD_DELAY) ) {
value = String.valueOf(this.configurationReloadDelay);
@@ -612,7 +594,6 @@
KEY_CONFIGURATION + " : " + this.configuration + '\n' +
KEY_CONFIGURATION_RELOAD_DELAY + " : " + this.configurationReloadDelay + '\n' +
KEY_ALLOW_RELOAD + " : " + this.allowReload + '\n' +
- KEY_INIT_CLASSLOADER + " : " + this.initClassloader + '\n' +
KEY_EXTRA_CLASSPATHS + " : " + this.toString(this.extraClasspaths) + '\n' +
KEY_LOAD_CLASSES + " : " + this.toString(this.loadClasses) + '\n' +
KEY_FORCE_PROPERTIES + " : " + this.toString(this.forceProperties) + '\n' +
@@ -757,14 +738,6 @@
public void setFormEncoding(String formEncoding) {
this.checkWriteable();
this.formEncoding = formEncoding;
- }
-
- /**
- * @param initClassloader The initClassloader to set.
- */
- public void setInitClassloader(boolean initClassloader) {
- this.checkWriteable();
- this.initClassloader = initClassloader;
}
/**
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=307448&r1=307447&r2=307448&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 Sun Oct 9 08:59:31 2005
@@ -23,19 +23,17 @@
import org.apache.cocoon.Processor;
import org.apache.cocoon.core.BootstrapEnvironment;
import org.apache.cocoon.core.Core;
-import org.apache.cocoon.core.CoreUtil;
import org.apache.cocoon.core.container.CoreServiceManager;
import org.osgi.framework.BundleContext;
public class CoreBlockActivator extends ServiceManagerActivator {
- private ClassLoader classLoader = getClass().getClassLoader();
private Core core;
private Processor processor;
public void start(final BundleContext ctx) throws Exception {
Thread.currentThread().setContextClassLoader(CoreBlockActivator.class.getClassLoader());
- BootstrapEnvironment env = new OSGiBootstrapEnvironment(this.classLoader, ctx);
+ BootstrapEnvironment env = new OSGiBootstrapEnvironment(ctx);
env.log("OSGiBootstrapEnvironment created");
OSGICoreUtil coreUtil = new OSGICoreUtil(env);
env.log("CoreUtil created");
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=307448&r1=307447&r2=307448&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 Sun Oct 9 08:59:31 2005
@@ -29,7 +29,6 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.core.BootstrapEnvironment;
import org.apache.cocoon.core.MutableSettings;
-import org.apache.cocoon.core.Settings;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.impl.AbstractContext;
import org.osgi.framework.Bundle;
@@ -43,15 +42,13 @@
private final String configuration = "/WEB-INF/block.xml";
- private final ClassLoader classLoader;
public Logger logger = null;
private final String contextPath;
private final Context environmentContext;
- public OSGiBootstrapEnvironment(ClassLoader classLoader, BundleContext bc)
+ public OSGiBootstrapEnvironment(BundleContext bc)
throws Exception {
- this.classLoader = classLoader;
// Create a logger manager that delegates to OSGi
// FIXME: have the maximum level as a property of the bundle
@@ -128,7 +125,6 @@
// FIXME: Should be found from block.xml
settings.setConfiguration("/WEB-INF/cocoon.xconf");
settings.setWorkDirectory("work");
- settings.setInitClassloader(true);
settings.setLoggingConfiguration("/WEB-INF/logkit.xconf");
}
@@ -137,10 +133,6 @@
}
public void configure(DefaultContext context) {
- }
-
- public ClassLoader getInitClassLoader() {
- return this.classLoader;
}
public Context getEnvironmentContext() {
Modified: cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java?rev=307448&r1=307447&r2=307448&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java Sun Oct 9 08:59:31 2005
@@ -485,7 +485,6 @@
this.addValue(Settings.KEY_LOGGING_MANAGER_CLASS, s.getLoggerManagerClassName());
this.addValue(Settings.KEY_PARENT_SERVICE_MANAGER, s.getParentServiceManagerClassName());
this.addValue(Settings.KEY_LOGGING_COCOON_LOGGER, s.getCocoonLogger());
- this.addValue(Settings.KEY_INIT_CLASSLOADER, s.isInitClassloader());
this.addValue(Settings.KEY_LOGGING_ENVIRONMENT_LOGGER, s.getEnvironmentLogger());
this.addValue(Settings.KEY_LOGGING_OVERRIDE_LOGLEVEL, s.getOverrideLogLevel());
this.addValue(Settings.KEY_MANAGE_EXCEPTIONS, s.isManageExceptions());
Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java?rev=307448&r1=307447&r2=307448&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java Sun Oct 9 08:59:31 2005
@@ -16,21 +16,12 @@
package org.apache.cocoon.servlet;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.SocketException;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -53,15 +44,12 @@
import org.apache.cocoon.core.BootstrapEnvironment;
import org.apache.cocoon.core.CoreUtil;
import org.apache.cocoon.core.MutableSettings;
-import org.apache.cocoon.core.Settings;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.http.HttpContext;
import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.servlet.multipart.MultipartHttpServletRequest;
import org.apache.cocoon.servlet.multipart.RequestFactory;
-import org.apache.cocoon.util.IOUtils;
-import org.apache.commons.lang.SystemUtils;
import org.apache.commons.lang.time.StopWatch;
/**
Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java?rev=307448&r1=307447&r2=307448&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java Sun Oct 9 08:59:31 2005
@@ -28,7 +28,7 @@
* This helper class initializes the {@link MutableSettings} object from the servlet
* configuration.
*
- * @version SVN $Id: Settings.java 125448 2005-01-17 22:28:43Z cziegeler $
+ * @version SVN $Id$
*/
public class SettingsHelper {
@@ -38,8 +38,6 @@
public static void fill(MutableSettings s, ServletConfig config) {
String value;
-
- s.setInitClassloader(getInitParameterAsBoolean(config, "init-classloader", s.isInitClassloader()));
handleForceProperty(getInitParameter(config, "force-property"), s);
Modified: cocoon/trunk/src/test/org/apache/cocoon/test/core/TestBootstrapEnvironment.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/test/core/TestBootstrapEnvironment.java?rev=307448&r1=307447&r2=307448&view=diff
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/test/core/TestBootstrapEnvironment.java (original)
+++ cocoon/trunk/src/test/org/apache/cocoon/test/core/TestBootstrapEnvironment.java Sun Oct 9 08:59:31 2005
@@ -16,15 +16,12 @@
package org.apache.cocoon.test.core;
import java.io.File;
-import java.io.InputStream;
-import java.io.IOException;
import java.net.URL;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.core.BootstrapEnvironment;
import org.apache.cocoon.core.MutableSettings;
-import org.apache.cocoon.core.Settings;
import org.apache.cocoon.environment.Context;
public class TestBootstrapEnvironment
@@ -85,7 +82,6 @@
public void configure(MutableSettings settings) {
settings.setConfiguration(this.configuration);
settings.setWorkDirectory("work");
- settings.setInitClassloader(true);
}
public void configureLoggingContext(DefaultContext context) {