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/05/23 15:09:51 UTC

svn commit: r408886 - in /cocoon/trunk: blocks/cocoon-mail/cocoon-mail-impl/pom.xml core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/DefaultClassLoader.java

Author: cziegeler
Date: Tue May 23 06:09:51 2006
New Revision: 408886

URL: http://svn.apache.org/viewvc?rev=408886&view=rev
Log:
Fix pom	and exclude java packages from own classloading

Modified:
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
    cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/DefaultClassLoader.java

Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml?rev=408886&r1=408885&r2=408886&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/pom.xml Tue May 23 06:09:51 2006
@@ -50,7 +50,8 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.3</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/DefaultClassLoader.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/DefaultClassLoader.java?rev=408886&r1=408885&r2=408886&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/DefaultClassLoader.java (original)
+++ cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/DefaultClassLoader.java Tue May 23 06:09:51 2006
@@ -69,6 +69,10 @@
     }
 
     protected boolean tryClassHere(String name) {
+        // don't include classes in the java or javax.servlet package
+        if ( name != null && (name.startsWith("java.") || name.startsWith("javax.servlet") ) ) {
+            return false;
+        }
         // Scan includes, then excludes
         boolean tryHere;