You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/02/16 17:14:49 UTC
svn commit: r628343 - in
/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet:
Constants.java ReloadingClassloaderManager.java ReloadingSpringFilter.java
Author: reinhard
Date: Sat Feb 16 08:14:48 2008
New Revision: 628343
URL: http://svn.apache.org/viewvc?rev=628343&view=rev
Log:
- make the usage of the reloading classloader configureable
- introduce a global constants interface
Added:
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/Constants.java (with props)
Modified:
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingClassloaderManager.java
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingSpringFilter.java
Added: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/Constants.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/Constants.java?rev=628343&view=auto
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/Constants.java (added)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/Constants.java Sat Feb 16 08:14:48 2008
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.tools.rcl.wrapper.servlet;
+
+public interface Constants {
+
+ String WEB_INF_RCL_URLCL_CONF = "/WEB-INF/cocoon/rclwrapper.urlcl.conf";
+
+ String WEB_INF_RCLWRAPPER_RCL_CONF = "/WEB-INF/cocoon/rclwrapper.rcl.conf";
+
+ String WEB_INF_RCLWRAPPER_PROPERTIES = "/WEB-INF/cocoon/rclwrapper.properties";
+
+ String RELOADING_SPRING_ENABLED = "reloading.spring.enabled";
+
+ String RELOADING_CLASSLOADER_ENABLED = "reloading.classloader.enabled";
+
+}
Propchange: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/Constants.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/Constants.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingClassloaderManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingClassloaderManager.java?rev=628343&r1=628342&r2=628343&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingClassloaderManager.java (original)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingClassloaderManager.java Sat Feb 16 08:14:48 2008
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
import javax.servlet.ServletContext;
@@ -34,46 +35,54 @@
private static final String FILE_PROTOCOL = "file:";
- private static final String WEB_INF_RCL_URLCL_CONF = "/WEB-INF/cocoon/rclwrapper.urlcl.conf";
-
- private static final String WEB_INF_RCLWRAPPER_RCL_CONF = "/WEB-INF/cocoon/rclwrapper.rcl.conf";
-
- private static ReloadingClassLoader reloadingClassloader = null;
+ private static ClassLoader reloadingClassloader = null;
private ReloadingClassloaderManager() {
// only allow static usage
}
public static synchronized ClassLoader getClassLoader(ServletContext context) {
- if (ReloadingClassloaderManager.reloadingClassloader == null) {
- final ClassLoader urlClassloader = createURLClassLoader(context);
- final ReloadingClassLoader classloader = new ReloadingClassLoader(urlClassloader);
- final FilesystemAlterationMonitor fam = new FilesystemAlterationMonitor();
+
+ // if there is no classloader, create one
+ if (ReloadingClassloaderManager.reloadingClassloader == null) {
- List lines = null;
- try {
- lines = IOUtils.readLines(context.getResourceAsStream(WEB_INF_RCLWRAPPER_RCL_CONF));
- } catch (IOException ioe) {
- throw new ReloadingClassloaderCreationException(
- "Error while creating the URLClassLoader from context:/" + WEB_INF_RCLWRAPPER_RCL_CONF, ioe);
- }
- for (Iterator linesIt = lines.iterator(); linesIt.hasNext();) {
- String line = (String) linesIt.next();
- if (!line.startsWith(FILE_PROTOCOL)) {
- throw new ReloadingClassloaderCreationException("Only support URLs with file: protocol.");
+ // create the URL classloader
+ final ClassLoader urlClassloader = createURLClassLoader(context);
+ // check, if the reloadking classloader should be used
+ if (isReloadingClassloaderEnabled(context)) {
+ final ReloadingClassLoader classloader = new ReloadingClassLoader(urlClassloader);
+ final FilesystemAlterationMonitor fam = new FilesystemAlterationMonitor();
+
+ List lines = null;
+ try {
+ lines = IOUtils.readLines(context.getResourceAsStream(Constants.WEB_INF_RCLWRAPPER_RCL_CONF));
+ } catch (IOException ioe) {
+ throw new ReloadingClassloaderCreationException(
+ "Error while creating the URLClassLoader from context:/"
+ + Constants.WEB_INF_RCLWRAPPER_RCL_CONF, ioe);
}
- String url = line.substring(FILE_PROTOCOL.length());
- // windows paths
- if (url.indexOf(2) == ':') {
- url = url.substring(1);
+ for (Iterator linesIt = lines.iterator(); linesIt.hasNext();) {
+ String line = (String) linesIt.next();
+ if (!line.startsWith(FILE_PROTOCOL)) {
+ throw new ReloadingClassloaderCreationException("Only support URLs with file: protocol.");
+ }
+ String url = line.substring(FILE_PROTOCOL.length());
+ // windows paths
+ if (url.indexOf(2) == ':') {
+ url = url.substring(1);
+ }
+ File directory = new File(url);
+ org.apache.commons.jci.listeners.ReloadingListener rl = new CocoonReloadingListener();
+ rl.addReloadNotificationListener(classloader);
+ fam.addListener(directory, rl);
}
- File directory = new File(url);
- org.apache.commons.jci.listeners.ReloadingListener rl = new CocoonReloadingListener();
- rl.addReloadNotificationListener(classloader);
- fam.addListener(directory, rl);
+ fam.start();
+ ReloadingClassloaderManager.reloadingClassloader = classloader;
+ }
+ // otherwise use the URL classloader only
+ else {
+ ReloadingClassloaderManager.reloadingClassloader = urlClassloader;
}
- fam.start();
- ReloadingClassloaderManager.reloadingClassloader = classloader;
}
return ReloadingClassloaderManager.reloadingClassloader;
}
@@ -81,7 +90,7 @@
protected static ClassLoader createURLClassLoader(ServletContext context) {
try {
List urlsList = new ArrayList();
- List lines = IOUtils.readLines(context.getResourceAsStream(WEB_INF_RCL_URLCL_CONF));
+ List lines = IOUtils.readLines(context.getResourceAsStream(Constants.WEB_INF_RCL_URLCL_CONF));
for (Iterator linesIt = lines.iterator(); linesIt.hasNext();) {
String line = (String) linesIt.next();
urlsList.add(new URL(line));
@@ -90,8 +99,20 @@
return new URLClassLoader(urls, ReloadingClassloaderManager.class.getClassLoader());
} catch (Exception e) {
throw new ReloadingClassloaderCreationException("Error while creating the URLClassLoader from context:/"
- + WEB_INF_RCL_URLCL_CONF, e);
+ + Constants.WEB_INF_RCL_URLCL_CONF, e);
+ }
+ }
+
+ protected static boolean isReloadingClassloaderEnabled(ServletContext servletContext) {
+ Properties rclProps = new Properties();
+ try {
+ rclProps.load(servletContext.getResourceAsStream(Constants.WEB_INF_RCLWRAPPER_PROPERTIES));
+ } catch (IOException e) {
+ throw new ReloadingClassloaderCreationException("Error while reading "
+ + Constants.WEB_INF_RCLWRAPPER_PROPERTIES + " from servlet context.", e);
}
+ String reloadingEnabled = rclProps.getProperty(Constants.RELOADING_CLASSLOADER_ENABLED, "true");
+ return reloadingEnabled.trim().toLowerCase().equals("true");
}
}
Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingSpringFilter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingSpringFilter.java?rev=628343&r1=628342&r2=628343&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingSpringFilter.java (original)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-webapp-wrapper/src/main/java/org/apache/cocoon/tools/rcl/wrapper/servlet/ReloadingSpringFilter.java Sat Feb 16 08:14:48 2008
@@ -43,8 +43,6 @@
private final Log log = LogFactory.getLog(ReloadingSpringFilter.class);
- private static final String WEB_INF_RCLWRAPPER_PROPERTIES = "/WEB-INF/cocoon/rclwrapper.properties";
-
private FilterConfig config;
public void doFilter(ServletRequest req, ServletResponse res, FilterChain filterChain) throws IOException,
@@ -78,8 +76,8 @@
private boolean isReloadingEnabled() throws IOException {
Properties rclProps = new Properties();
- rclProps.load(this.config.getServletContext().getResourceAsStream(WEB_INF_RCLWRAPPER_PROPERTIES));
- String reloadingEnabled = rclProps.getProperty("reloading.spring.enabled", "true");
+ rclProps.load(this.config.getServletContext().getResourceAsStream(Constants.WEB_INF_RCLWRAPPER_PROPERTIES));
+ String reloadingEnabled = rclProps.getProperty(Constants.RELOADING_SPRING_ENABLED, "true");
return reloadingEnabled.trim().toLowerCase().equals("true");
}