Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2849E5E9F for ; Tue, 10 May 2011 05:26:31 +0000 (UTC) Received: (qmail 60340 invoked by uid 500); 10 May 2011 05:26:30 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 60200 invoked by uid 500); 10 May 2011 05:26:29 -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 60190 invoked by uid 99); 10 May 2011 05:26:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 May 2011 05:26:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 May 2011 05:26:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 14D1F2388901; Tue, 10 May 2011 05:26:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1101313 - in /geronimo/server/trunk/plugins: j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/ jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/ Date: Tue, 10 May 2011 05:26:04 -0000 To: scm@geronimo.apache.org From: violalu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110510052604.14D1F2388901@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: violalu Date: Tue May 10 05:26:03 2011 New Revision: 1101313 URL: http://svn.apache.org/viewvc?rev=1101313&view=rev Log: GERONIMO-5949 Move session-config and login-config from JspModuleBuilderExtension.java to AbstractWebModuleBuilder.java Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?rev=1101313&r1=1101312&r2=1101313&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java Tue May 10 05:26:03 2011 @@ -97,8 +97,10 @@ import org.apache.geronimo.xbeans.geroni import org.apache.openejb.jee.Filter; import org.apache.openejb.jee.JaxbJavaee; import org.apache.openejb.jee.Listener; +import org.apache.openejb.jee.LoginConfig; import org.apache.openejb.jee.Servlet; import org.apache.openejb.jee.ServletMapping; +import org.apache.openejb.jee.SessionConfig; import org.apache.openejb.jee.WebApp; import org.apache.xbean.finder.AbstractFinder; import org.apache.xbean.finder.ClassFinder; @@ -442,6 +444,19 @@ public abstract class AbstractWebModuleB if (hasSecurityRealmName) { earContext.setHasSecurity(true); } + + //Inform errors if login-config element contains more than one + List loginConfigs = webApp.getLoginConfig(); + if (loginConfigs.size() > 1) { + throw new DeploymentException("Web app " + webApp.getDisplayName() + " cannot have more than one login-config element. Currently has " + loginConfigs.size() + " login-config elements."); + } + + //Inform errors if session-config element contains more than one + List sessionConfigs = webApp.getSessionConfig(); + if (sessionConfigs.size() > 1) { + throw new DeploymentException("Web app " + webApp.getDisplayName() + " cannot have more than one sesion-config element. Currently has " + sessionConfigs.size() + " session-config elements."); + } + //TODO think about how to provide a default security realm name XmlObject[] securityElements = XmlBeansUtil.selectSubstitutionGroupElements(SECURITY_QNAME, gerWebApp); if (securityElements.length > 0 && !hasSecurityRealmName) { Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java?rev=1101313&r1=1101312&r2=1101313&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java (original) +++ geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java Tue May 10 05:26:03 2011 @@ -71,8 +71,6 @@ import org.apache.openejb.jee.Tag; import org.apache.openejb.jee.Taglib; import org.apache.openejb.jee.TldTaglib; import org.apache.openejb.jee.WebApp; -import org.apache.openejb.jee.LoginConfig; -import org.apache.openejb.jee.SessionConfig; import org.apache.xbean.finder.ClassFinder; import org.apache.xmlbeans.XmlObject; import org.osgi.framework.Bundle; @@ -195,20 +193,7 @@ public class JspModuleBuilderExtension i for (JspPropertyGroup propertyGroup : jspConfig.getJspPropertyGroup()) { WebAppInfoBuilder.normalizeUrlPatterns(propertyGroup.getUrlPattern(), jspMappings); } - } - - - //login-config element - List loginConfigs = webApp.getLoginConfig(); - if (loginConfigs.size() > 1) { - throw new DeploymentException("Web app " + module.getName() + " cannot have more than one login-config element. Currently has " + loginConfigs.size() + " login-config elements."); - } - - //session-config element - List sessionConfigs = webApp.getSessionConfig(); - if (sessionConfigs.size() > 1) { - throw new DeploymentException("Web app " + module.getName() + " cannot have more than one sesion-config element. Currently has " + sessionConfigs.size() + " session-config elements."); - } + } jspServlet.servletMappings.addAll(jspMappings); for (ServletInfo servletInfo: webAppInfo.servlets) {