[jboss-cvs] JBossAS SVN: r93363 - 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-09-10 09:14:40 -0400 (Thu, 10 Sep 2009)
New Revision: 93363

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- Add two commented out sections for the 3.0 flag and multipart config.

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-09-10 12:47:15 UTC (rev 93362)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-09-10 13:14:40 UTC (rev 93363)
@@ -176,7 +176,10 @@
       context.setVersion(metaData.getVersion());
 
       // SetPublicId
-      if (metaData.is25())
+      /* TODO
+       if (metaData.is30())
+         context.setPublicId("/javax/servlet/resources/web-app_3_0.dtd");
+      else */ if (metaData.is25())
          context.setPublicId("/javax/servlet/resources/web-app_2_5.dtd");
       else if (metaData.is24())
          context.setPublicId("/javax/servlet/resources/web-app_2_4.dtd");
@@ -185,8 +188,6 @@
       else
          context.setPublicId(org.apache.catalina.startup.Constants.WebDtdPublicId_22);
       
-      // processContextParameters() provides a merged view of the context params
-
       // Display name
       DescriptionGroupMetaData dg = metaData.getDescriptionGroup();
       if (dg != null)
@@ -403,6 +404,19 @@
             }
             wrapper.setAsyncSupported(value.isAsyncSupported());
             wrapper.setEnabled(value.isEnabled());
+            // TODO: Multipart configuration
+            /*
+            if (value.getMultipartConfigMetaData() != null)
+            {
+               MultipartConfigMetaData multipartConfigMetaData = value.getMultipartConfig();
+               Multipart multipartConfig = new Multipart();
+               multipartConfig.setLocation(multipartConfigMetaData.getLocation());
+               multipartConfig.setMaxRequestSize(multipartConfigMetaData.getMaxRequestSize());
+               multipartConfig.setMaxFileSize(multipartConfigMetaData.getMaxFileSize());
+               multipartConfig.setFileSizeThreshold(multipartConfigMetaData.getFileSizeThreshold());
+               wrapper.setMultipartConfig(multipartConfig);
+             }
+             */
             context.addChild(wrapper);
          }
       }