Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 87808 invoked from network); 15 Apr 2006 16:10:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Apr 2006 16:10:41 -0000 Received: (qmail 7965 invoked by uid 500); 15 Apr 2006 16:10:40 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 7929 invoked by uid 500); 15 Apr 2006 16:10:40 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 7918 invoked by uid 99); 15 Apr 2006 16:10:39 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Apr 2006 09:10:39 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 15 Apr 2006 09:10:39 -0700 Received: (qmail 87589 invoked by uid 65534); 15 Apr 2006 16:10:19 -0000 Message-ID: <20060415161019.87588.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r394320 - /geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java Date: Sat, 15 Apr 2006 16:10:18 -0000 To: scm@geronimo.apache.org From: kevan@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: kevan Date: Sat Apr 15 09:10:17 2006 New Revision: 394320 URL: http://svn.apache.org/viewcvs?rev=394320&view=rev Log: Make sure WEB-INF/classes is properly added to the CLASSPATH during jsp/servlet deployment Modified: geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java Modified: geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java?rev=394320&r1=394319&r2=394320&view=diff ============================================================================== --- geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java (original) +++ geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java Sat Apr 15 09:10:17 2006 @@ -194,6 +194,7 @@ // add the warfile's content to the configuration JarFile warFile = module.getModuleFile(); Enumeration entries = warFile.entries(); + boolean addedClasses = false; while (entries.hasMoreElements()) { ZipEntry entry = (ZipEntry) entries.nextElement(); URI targetPath = new URI(null, entry.getName(), null); @@ -201,10 +202,12 @@ moduleContext.addFile(targetPath, module.getOriginalSpecDD()); } else if (entry.getName().startsWith("WEB-INF/lib") && entry.getName().endsWith(".jar")) { moduleContext.addInclude(targetPath, warFile, entry); - } else if (entry.getName().equals("WEB-INF/classes/")) { - moduleContext.addInclude(targetPath, warFile, entry); } else { moduleContext.addFile(targetPath, warFile, entry); + if (!addedClasses && entry.getName().startsWith("WEB-INF/classes/")) { + addedClasses = true; + moduleContext.getConfiguration().addToClassPath(new URI(null, "WEB-INF/classes/", null)); + } } }