svn commit: r941547 - in /geronimo/server/trunk/plugins: j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/ jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/

[dj...@apache.org]

Author: djencks
Date: Wed May  5 23:38:47 2010
New Revision: 941547

URL: http://svn.apache.org/viewvc?rev=941547&view=rev
Log:
Fix jaspic message layer name for servlet profile

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/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.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=941547&r1=941546&r2=941547&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 Wed May  5 23:38:47 2010
@@ -204,6 +204,7 @@ public abstract class AbstractWebModuleB
      * effect as URI.create(module.targetPath()).resolve(mcpEntry) executed in the ear configuration.
      */
     private static final URI RELATIVE_MODULE_BASE_URI = URI.create("../");
+    public static final String MESSAGE_LAYER = "HttpServlet";
 
     protected AbstractWebModuleBuilder(Kernel kernel, Collection<NamespaceDrivenBuilder> serviceBuilders, NamingBuilder namingBuilders, ResourceEnvironmentSetter resourceEnvironmentSetter,
             Collection<WebServiceBuilder> webServiceBuilder, Collection<ModuleBuilderExtension> moduleBuilderExtensions) {
@@ -486,8 +487,7 @@ public abstract class AbstractWebModuleB
 
     /**
      * Identify the spec DD schema version, and save it in the EARContext
-     * @param earContext earContext deployment target
-     * @param module module containing source info
+     * @param originalSpecDD text of original spec dd
      */
     private float identifySpecDDSchemaVersion(String originalSpecDD) {
         float schemaVersion = 0f;
@@ -581,8 +581,8 @@ public abstract class AbstractWebModuleB
                     StringWriter out = new StringWriter();
                     JaspiXmlUtil.writeServerAuthModule(authModuleType, out);
                     authConfigProviderData.setAttribute("config", out.toString());
-                    authConfigProviderData.setAttribute("messageLayer", "Http");
-                    authConfigProviderData.setAttribute("appContext", contextPath);
+                    authConfigProviderData.setAttribute("messageLayer", MESSAGE_LAYER);
+                    authConfigProviderData.setAttribute("appContext", "server " + contextPath);
                     //TODO ??
                     authConfigProviderData.setAttribute("authenticationID", contextPath);
                 } finally {

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java?rev=941547&r1=941546&r2=941547&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java Wed May  5 23:38:47 2010
@@ -887,7 +887,7 @@ public class JettyModuleBuilder extends 
 
             if (authType != null) {
                 GBeanData securityFactoryData = new GBeanData(factoryName, AuthConfigProviderHandlerFactory.class);
-                securityFactoryData.setAttribute("messageLayer", "HttpServlet");
+                securityFactoryData.setAttribute("messageLayer", MESSAGE_LAYER);
                 String contextPath = (String)webModuleData.getAttribute("contextPath");
                 securityFactoryData.setAttribute("appContext", "server " + contextPath);
                 configureConfigurationFactory(jettyWebApp, null, securityFactoryData);