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/06/27 16:14:27 UTC
svn commit: r417463 - in /cocoon/trunk:
core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/
tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/
tools/cocoon-block-deployer/cocoon-deplo...
Author: cziegeler
Date: Tue Jun 27 07:14:26 2006
New Revision: 417463
URL: http://svn.apache.org/viewvc?rev=417463&view=rev
Log:
Rename paranoid to something more common...
Added:
cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingListener.java
- copied, changed from r417407, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidListener.java
cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServlet.java
- copied, changed from r417202, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServlet.java
cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServletFilter.java
- copied, changed from r417202, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServletFilter.java
Removed:
cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/AbstractParanoidListener.java
cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidListener.java
cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServlet.java
cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServletFilter.java
Modified:
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/utils/WebApplicationRewriter.java
Copied: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingListener.java (from r417407, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidListener.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingListener.java?p2=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingListener.java&p1=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidListener.java&r1=417407&r2=417463&rev=417463&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidListener.java (original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingListener.java Tue Jun 27 07:14:26 2006
@@ -39,7 +39,7 @@
*
* @version $Id$
*/
-public class ParanoidListener
+public class ShieldingListener
implements HttpSessionListener,
ServletContextListener,
HttpSessionActivationListener,
@@ -101,7 +101,7 @@
final ClassLoader old = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(this.classloader);
- final String listenersConfig = context.getInitParameter(ParanoidListener.class.getName());
+ final String listenersConfig = context.getInitParameter(ShieldingListener.class.getName());
if ( listenersConfig != null ) {
final StringTokenizer st = new StringTokenizer(listenersConfig, " \t\r\n\f;,", false);
while ( st.hasMoreTokens() ) {
@@ -146,33 +146,33 @@
while ( i.hasNext() ) {
final Object listener = i.next();
try {
- if ( ParanoidListener.SERVLET_CONTEXT_CREATED.equals(identifier) ) {
+ if ( ShieldingListener.SERVLET_CONTEXT_CREATED.equals(identifier) ) {
((ServletContextListener)listener).contextInitialized((ServletContextEvent)event);
- } else if ( ParanoidListener.SERVLET_CONTEXT_DESTROYED.equals(identifier) ) {
+ } else if ( ShieldingListener.SERVLET_CONTEXT_DESTROYED.equals(identifier) ) {
((ServletContextListener)listener).contextDestroyed((ServletContextEvent)event);
- } else if ( ParanoidListener.SESSION_CREATED.equals(identifier) ) {
+ } else if ( ShieldingListener.SESSION_CREATED.equals(identifier) ) {
((HttpSessionListener)listener).sessionCreated((HttpSessionEvent)event);
- } else if ( ParanoidListener.SESSION_DESTROYED.equals(identifier) ) {
+ } else if ( ShieldingListener.SESSION_DESTROYED.equals(identifier) ) {
((HttpSessionListener)listener).sessionDestroyed((HttpSessionEvent)event);
- } else if ( ParanoidListener.VALUE_BOUND.equals(identifier) ) {
+ } else if ( ShieldingListener.VALUE_BOUND.equals(identifier) ) {
((HttpSessionBindingListener)listener).valueBound((HttpSessionBindingEvent)event);
- } else if ( ParanoidListener.VALUE_UNBOUND.equals(identifier) ) {
+ } else if ( ShieldingListener.VALUE_UNBOUND.equals(identifier) ) {
((HttpSessionBindingListener)listener).valueUnbound((HttpSessionBindingEvent)event);
- } else if ( ParanoidListener.ATTR_ADDED.equals(identifier) ) {
+ } else if ( ShieldingListener.ATTR_ADDED.equals(identifier) ) {
((HttpSessionAttributeListener)listener).attributeAdded((HttpSessionBindingEvent)event);
- } else if ( ParanoidListener.ATTR_REMOVED.equals(identifier) ) {
+ } else if ( ShieldingListener.ATTR_REMOVED.equals(identifier) ) {
((HttpSessionAttributeListener)listener).attributeRemoved((HttpSessionBindingEvent)event);
- } else if ( ParanoidListener.ATTR_REPLACED.equals(identifier) ) {
+ } else if ( ShieldingListener.ATTR_REPLACED.equals(identifier) ) {
((HttpSessionAttributeListener)listener).attributeReplaced((HttpSessionBindingEvent)event);
- } else if ( ParanoidListener.CONTEXT_ATTR_ADDED.equals(identifier) ) {
+ } else if ( ShieldingListener.CONTEXT_ATTR_ADDED.equals(identifier) ) {
((ServletContextAttributeListener)listener).attributeAdded((ServletContextAttributeEvent)event);
- } else if ( ParanoidListener.CONTEXT_ATTR_REMOVED.equals(identifier) ) {
+ } else if ( ShieldingListener.CONTEXT_ATTR_REMOVED.equals(identifier) ) {
((ServletContextAttributeListener)listener).attributeRemoved((ServletContextAttributeEvent)event);
- } else if ( ParanoidListener.CONTEXT_ATTR_REPLACED.equals(identifier) ) {
+ } else if ( ShieldingListener.CONTEXT_ATTR_REPLACED.equals(identifier) ) {
((ServletContextAttributeListener)listener).attributeReplaced((ServletContextAttributeEvent)event);
- } else if ( ParanoidListener.SESSION_ACTIVATED.equals(identifier) ) {
+ } else if ( ShieldingListener.SESSION_ACTIVATED.equals(identifier) ) {
((HttpSessionActivationListener)listener).sessionDidActivate((HttpSessionEvent)event);
- } else if ( ParanoidListener.SESSION_PASSIVATE.equals(identifier) ) {
+ } else if ( ShieldingListener.SESSION_PASSIVATE.equals(identifier) ) {
((HttpSessionActivationListener)listener).sessionWillPassivate((HttpSessionEvent)event);
}
} catch (Exception e) {
@@ -189,7 +189,7 @@
* @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
*/
public void contextDestroyed(ServletContextEvent contextEvent) {
- this.invoke(this.servletContextListeners, ParanoidListener.SERVLET_CONTEXT_DESTROYED, contextEvent);
+ this.invoke(this.servletContextListeners, ShieldingListener.SERVLET_CONTEXT_DESTROYED, contextEvent);
}
/**
@@ -199,90 +199,90 @@
final ServletContext context = contextEvent.getServletContext();
this.init(context);
- this.invoke(this.servletContextListeners, ParanoidListener.SERVLET_CONTEXT_CREATED, contextEvent);
+ this.invoke(this.servletContextListeners, ShieldingListener.SERVLET_CONTEXT_CREATED, contextEvent);
}
/**
* @see javax.servlet.http.HttpSessionListener#sessionCreated(javax.servlet.http.HttpSessionEvent)
*/
public void sessionCreated(HttpSessionEvent event) {
- this.invoke(this.httpSessionListeners, ParanoidListener.SESSION_CREATED, event);
+ this.invoke(this.httpSessionListeners, ShieldingListener.SESSION_CREATED, event);
}
/**
* @see javax.servlet.http.HttpSessionListener#sessionDestroyed(javax.servlet.http.HttpSessionEvent)
*/
public void sessionDestroyed(HttpSessionEvent event) {
- this.invoke(this.httpSessionListeners, ParanoidListener.SESSION_DESTROYED, event);
+ this.invoke(this.httpSessionListeners, ShieldingListener.SESSION_DESTROYED, event);
}
/**
* @see javax.servlet.http.HttpSessionBindingListener#valueBound(javax.servlet.http.HttpSessionBindingEvent)
*/
public void valueBound(HttpSessionBindingEvent event) {
- this.invoke(this.httpSessionBindingListeners, ParanoidListener.VALUE_BOUND, event);
+ this.invoke(this.httpSessionBindingListeners, ShieldingListener.VALUE_BOUND, event);
}
/**
* @see javax.servlet.http.HttpSessionBindingListener#valueUnbound(javax.servlet.http.HttpSessionBindingEvent)
*/
public void valueUnbound(HttpSessionBindingEvent event) {
- this.invoke(this.httpSessionBindingListeners, ParanoidListener.VALUE_UNBOUND, event);
+ this.invoke(this.httpSessionBindingListeners, ShieldingListener.VALUE_UNBOUND, event);
}
/**
* @see javax.servlet.http.HttpSessionAttributeListener#attributeAdded(javax.servlet.http.HttpSessionBindingEvent)
*/
public void attributeAdded(HttpSessionBindingEvent event) {
- this.invoke(this.httpSessionAttributeListeners, ParanoidListener.ATTR_ADDED, event);
+ this.invoke(this.httpSessionAttributeListeners, ShieldingListener.ATTR_ADDED, event);
}
/**
* @see javax.servlet.http.HttpSessionAttributeListener#attributeRemoved(javax.servlet.http.HttpSessionBindingEvent)
*/
public void attributeRemoved(HttpSessionBindingEvent event) {
- this.invoke(this.httpSessionAttributeListeners, ParanoidListener.ATTR_REMOVED, event);
+ this.invoke(this.httpSessionAttributeListeners, ShieldingListener.ATTR_REMOVED, event);
}
/**
* @see javax.servlet.http.HttpSessionAttributeListener#attributeReplaced(javax.servlet.http.HttpSessionBindingEvent)
*/
public void attributeReplaced(HttpSessionBindingEvent event) {
- this.invoke(this.httpSessionAttributeListeners, ParanoidListener.ATTR_REPLACED, event);
+ this.invoke(this.httpSessionAttributeListeners, ShieldingListener.ATTR_REPLACED, event);
}
/**
* @see javax.servlet.http.HttpSessionActivationListener#sessionDidActivate(javax.servlet.http.HttpSessionEvent)
*/
public void sessionDidActivate(HttpSessionEvent event) {
- this.invoke(this.httpSessionActivationListeners, ParanoidListener.SESSION_ACTIVATED, event);
+ this.invoke(this.httpSessionActivationListeners, ShieldingListener.SESSION_ACTIVATED, event);
}
/**
* @see javax.servlet.http.HttpSessionActivationListener#sessionWillPassivate(javax.servlet.http.HttpSessionEvent)
*/
public void sessionWillPassivate(HttpSessionEvent event) {
- this.invoke(this.httpSessionActivationListeners, ParanoidListener.SESSION_PASSIVATE, event);
+ this.invoke(this.httpSessionActivationListeners, ShieldingListener.SESSION_PASSIVATE, event);
}
/**
* @see javax.servlet.ServletContextAttributeListener#attributeAdded(javax.servlet.ServletContextAttributeEvent)
*/
public void attributeAdded(ServletContextAttributeEvent event) {
- this.invoke(this.servletContextAttributeListeners, ParanoidListener.CONTEXT_ATTR_ADDED, event);
+ this.invoke(this.servletContextAttributeListeners, ShieldingListener.CONTEXT_ATTR_ADDED, event);
}
/**
* @see javax.servlet.ServletContextAttributeListener#attributeRemoved(javax.servlet.ServletContextAttributeEvent)
*/
public void attributeRemoved(ServletContextAttributeEvent event) {
- this.invoke(this.servletContextAttributeListeners, ParanoidListener.CONTEXT_ATTR_REMOVED, event);
+ this.invoke(this.servletContextAttributeListeners, ShieldingListener.CONTEXT_ATTR_REMOVED, event);
}
/**
* @see javax.servlet.ServletContextAttributeListener#attributeReplaced(javax.servlet.ServletContextAttributeEvent)
*/
public void attributeReplaced(ServletContextAttributeEvent event) {
- this.invoke(this.servletContextAttributeListeners, ParanoidListener.CONTEXT_ATTR_REPLACED, event);
+ this.invoke(this.servletContextAttributeListeners, ShieldingListener.CONTEXT_ATTR_REPLACED, event);
}
}
Copied: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServlet.java (from r417202, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServlet.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServlet.java?p2=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServlet.java&p1=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServlet.java&r1=417202&r2=417463&rev=417463&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServlet.java (original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServlet.java Tue Jun 27 07:14:26 2006
@@ -49,7 +49,7 @@
*
* @version $Id$
*/
-public class ParanoidServlet extends HttpServlet {
+public class ShieldingServlet extends HttpServlet {
/**
* The name of the actual servlet class.
Copied: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServletFilter.java (from r417202, cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServletFilter.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServletFilter.java?p2=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServletFilter.java&p1=cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServletFilter.java&r1=417202&r2=417463&rev=417463&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ParanoidServletFilter.java (original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServletFilter.java Tue Jun 27 07:14:26 2006
@@ -30,7 +30,7 @@
*
* @version $Id$
*/
-public class ParanoidServletFilter implements Filter {
+public class ShieldingServletFilter implements Filter {
protected Filter filter;
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java?rev=417463&r1=417462&r2=417463&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java Tue Jun 27 07:14:26 2006
@@ -143,18 +143,18 @@
private String webXml;
/**
- * Use paranoid classloading
+ * Use shielded classloading
*
- * @parameter expression="${maven.war.paranoidclassloader}"
+ * @parameter expression="${maven.war.shieldingclassloader}"
*/
- private boolean useParanoidClassloader = true;
+ private boolean useShieldingClassloader = true;
/**
- * Move jars for paranoid classloading
+ * Move jars for shielded classloading
*
- * @parameter expression="${maven.war.paranoidrepository}"
+ * @parameter expression="${maven.war.shieldingrepository}"
*/
- private boolean useParanoidRepository = true;
+ private boolean useShieldingRepository = true;
/**
* Deploy a monolithic Cocoon web application. This means it doesn't use
@@ -178,24 +178,24 @@
}
// take care of paranoid classloading
- if ( this.useParanoidClassloader ) {
+ if ( this.useShieldingClassloader ) {
String webXmlLocation = this.getWebXml();
if ( webXmlLocation == null ) {
webXmlLocation = getWarSourceDirectory().getAbsolutePath() + File.separatorChar + "WEB-INF" + File.separatorChar + "web.xml";
}
- this.getLog().info("Adding paranoid classloader configuration.");
- this.getLog().info("Reading web.xml: " + webXmlLocation);
+ this.getLog().info("Adding shielded classloader configuration to webapp configuration.");
+ this.getLog().debug("Reading web.xml: " + webXmlLocation);
try {
final Document webAppDoc = XMLUtils.parseXml(new FileInputStream(new File(webXmlLocation)));
WebApplicationRewriter.rewrite(webAppDoc);
final String dest = webappDirectory_.getAbsolutePath() + File.separatorChar + "WEB-INF" + File.separatorChar + "web.xml";
- this.getLog().info("Writing web.xml: " + dest);
+ this.getLog().debug("Writing web.xml: " + dest);
XMLUtils.write(webAppDoc, new FileOutputStream(dest));
} catch (Exception e) {
throw new MojoExecutionException("Unable to read web.xml from " + webXmlLocation, e);
}
- if ( this.useParanoidRepository ) {
- this.getLog().info("Moving classes and libs");
+ if ( this.useShieldingRepository ) {
+ this.getLog().info("Moving classes and libs to shielded location.");
final String webInfDir = webappDirectory_.getAbsolutePath() + File.separatorChar + "WEB-INF";
this.move(webInfDir, "lib", "cocoon-lib");
this.move(webInfDir, "classes", "cocoon-classes");
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/utils/WebApplicationRewriter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/utils/WebApplicationRewriter.java?rev=417463&r1=417462&r2=417463&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/utils/WebApplicationRewriter.java (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/utils/WebApplicationRewriter.java Tue Jun 27 07:14:26 2006
@@ -26,11 +26,11 @@
*/
public class WebApplicationRewriter {
- public static final String SERVLET_CLASS = "org.apache.cocoon.bootstrap.servlet.ParanoidServlet";
+ public static final String SERVLET_CLASS = "org.apache.cocoon.bootstrap.servlet.ShieldingServlet";
- public static final String LISTENER_CLASS = "org.apache.cocoon.bootstrap.servlet.ParanoidListener";
+ public static final String LISTENER_CLASS = "org.apache.cocoon.bootstrap.servlet.ShieldingListener";
- public static final String FILTER_CLASS = "org.apache.cocoon.bootstrap.servlet.ParanoidServletFilter";
+ public static final String FILTER_CLASS = "org.apache.cocoon.bootstrap.servlet.ShieldingServletFilter";
public static boolean rewrite(Document webAppDoc) {
boolean rewritten = false;