[jboss-cvs] JBossAS SVN: r93053 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2009-08-31 20:49:38 -0400 (Mon, 31 Aug 2009)
New Revision: 93053

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- Add new Servlet 3.0 metadata.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-08-31 21:03:07 UTC (rev 93052)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-09-01 00:49:38 UTC (rev 93053)
@@ -64,6 +64,7 @@
 import org.jboss.metadata.web.jboss.JBossServletsMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.metadata.web.spec.AuthConstraintMetaData;
+import org.jboss.metadata.web.spec.CookieConfigMetaData;
 import org.jboss.metadata.web.spec.DispatcherType;
 import org.jboss.metadata.web.spec.ErrorPageMetaData;
 import org.jboss.metadata.web.spec.FilterMappingMetaData;
@@ -79,6 +80,7 @@
 import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
 import org.jboss.metadata.web.spec.ServletMappingMetaData;
 import org.jboss.metadata.web.spec.SessionConfigMetaData;
+import org.jboss.metadata.web.spec.SessionTrackingModeType;
 import org.jboss.metadata.web.spec.TaglibMetaData;
 import org.jboss.metadata.web.spec.TransportGuaranteeType;
 import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
@@ -218,6 +220,7 @@
                {
                   filterDef.addInitParameter(param.getParamName(), param.getParamValue());
                }
+            filterDef.setAsyncSupported(value.isAsyncSupported());
             context.addFilterDef(filterDef);
          }
       }
@@ -321,6 +324,14 @@
                         collection2.addMethod(method);
                      }
                   }
+                  List<String> methodOmissions = wrc.getHttpMethodOmissions();
+                  if (methodOmissions != null)
+                  {
+                     for (String method : wrc.getHttpMethodOmissions())
+                     {
+                        collection2.addMethodOmission(method);
+                     }
+                  }
                   List<String> patterns = wrc.getUrlPatterns();
                   if (patterns != null)
                   {
@@ -380,6 +391,8 @@
                   wrapper.addSecurityReference(ref.getRoleName(), ref.getRoleLink());
                }
             }
+            wrapper.setAsyncSupported(value.isAsyncSupported());
+            wrapper.setEnabled(value.isEnabled());
             context.addChild(wrapper);
          }
       }
@@ -399,11 +412,11 @@
          }
       }
 
-      // JSP mappings
+      // JSP Config
       JspConfigMetaData config = metaData.getJspConfig();
       if (config != null)
       {
-         // Property groups
+         // JSP Property groups
          List<JspPropertyGroupMetaData> groups = config.getPropertyGroups();
          if (groups != null)
          {
@@ -469,6 +482,28 @@
       if (scmd != null)
       {
          context.setSessionTimeout(scmd.getSessionTimeout());
+         if (scmd.getSessionTrackingModes() != null)
+         {
+            for (SessionTrackingModeType stmt : scmd.getSessionTrackingModes())
+            {
+               // FIXME: woops, I forgot to expose it in Context
+               ((org.apache.catalina.core.StandardContext) context).addSessionTrackingMode(stmt.toString());
+            }
+         }
+         if (scmd.getCookieConfig() != null)
+         {
+            CookieConfigMetaData value = scmd.getCookieConfig();
+            org.apache.catalina.deploy.SessionCookie cookieConfig = 
+               new org.apache.catalina.deploy.SessionCookie();
+            cookieConfig.setName(value.getName());
+            cookieConfig.setDomain(value.getDomain());
+            cookieConfig.setPath(value.getPath());
+            cookieConfig.setComment(value.getComment());
+            cookieConfig.setHttpOnly(value.getHttpOnly());
+            cookieConfig.setSecure(value.getSecure());
+            cookieConfig.setMaxAge(value.getMaxAge());
+            context.setSessionCookie(cookieConfig);
+         }
       }
    }