geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r357646 - /geronimo/branches/1.0/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Date Mon, 19 Dec 2005 05:57:49 GMT
Author: hogstrom
Date: Sun Dec 18 21:57:46 2005
New Revision: 357646

URL: http://svn.apache.org/viewcvs?rev=357646&view=rev
Log:
GERONIMO-1384 Fixed secure pages issue in 1.0

Modified:
    geronimo/branches/1.0/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java

Modified: geronimo/branches/1.0/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=357646&r1=357645&r2=357646&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/branches/1.0/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Sun Dec 18 21:57:46 2005
@@ -421,6 +421,10 @@
         GerMessageDestinationType[] gerMessageDestinations = gerWebApp.getMessageDestinationArray();
 
         ENCConfigBuilder.registerMessageDestinations(earContext.getRefContext(), module.getName(),
messageDestinations, gerMessageDestinations);
+        if((webApp.getSecurityConstraintArray().length > 0 || webApp.getSecurityRoleArray().length
> 0) &&
+                (!gerWebApp.isSetSecurityRealmName() || !gerWebApp.isSetSecurity())) {
+            throw new DeploymentException("web.xml includes security elements but Geronimo
deployment plan is not provided or does not contain <security-realm-name> and <security>
elements necessary to configured security accordingly.");
+        }
         if (gerWebApp.isSetSecurity()) {
             if (!gerWebApp.isSetSecurityRealmName()) {
                 throw new DeploymentException("You have supplied a security configuration
for web app " + module.getName() + " but no security-realm-name to allow login");



Mime
View raw message