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/07/03 13:29:40 UTC
svn commit: r418746 -
/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java
Author: cziegeler
Date: Mon Jul 3 04:29:39 2006
New Revision: 418746
URL: http://svn.apache.org/viewvc?rev=418746&view=rev
Log:
Prefer Cocoon lib/classes before web lib/classes
Modified:
cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java
Modified: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java?rev=418746&r1=418745&r2=418746&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java (original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java Mon Jul 3 04:29:39 2006
@@ -60,17 +60,17 @@
ClassLoaderConfiguration config = new ClassLoaderConfiguration();
try {
- if ( servletContext.getResource("/" + WEB_INF_CLASSES) != null ) {
- config.addClassDirectory(WEB_INF_CLASSES);
- }
- if ( servletContext.getResource("/" + WEB_INF_LIB) != null ) {
- config.addLibDirectory(WEB_INF_LIB);
- }
if ( servletContext.getResource("/" + WEB_INF_COCOON_CLASSES) != null ) {
config.addClassDirectory(WEB_INF_COCOON_CLASSES);
}
if ( servletContext.getResource("/" + WEB_INF_COCOON_LIB) != null ) {
config.addLibDirectory(WEB_INF_COCOON_LIB);
+ }
+ if ( servletContext.getResource("/" + WEB_INF_CLASSES) != null ) {
+ config.addClassDirectory(WEB_INF_CLASSES);
+ }
+ if ( servletContext.getResource("/" + WEB_INF_LIB) != null ) {
+ config.addLibDirectory(WEB_INF_LIB);
}
} catch (MalformedURLException mue) {
throw new ServletException("", mue);