[jboss-cvs] JBossAS SVN: r62790 - in trunk: server/src/main/org/jboss/metadata/web and 1 other directories.

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

Author: scott.stark at jboss.org
Date: 2007-05-03 13:47:55 -0400 (Thu, 03 May 2007)
New Revision: 62790

Modified:
   trunk/server/src/main/org/jboss/metadata/WebMetaData.java
   trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
Log:
JBCTS-594, add web.xml dtd public id to WebMetaData

Modified: trunk/server/src/main/org/jboss/metadata/WebMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-05-03 17:40:31 UTC (rev 62789)
+++ trunk/server/src/main/org/jboss/metadata/WebMetaData.java	2007-05-03 17:47:55 UTC (rev 62790)
@@ -77,6 +77,8 @@
    private int webMajorVersion;
    /** web.xml minor version */
    private int webMinorVersion;
+   /** The DTD public id */
+   private String publicID;
 
    /** web-app/description */
    private String description;
@@ -229,6 +231,15 @@
    /** The ClassLoader to load additional resources */
    private URLClassLoader resourceCl;
 
+   public String getPublicID()
+   {
+      return publicID;
+   }
+   public void setPublicID(String publicID)
+   {
+      this.publicID = publicID;
+   }
+
    public int getWebMajorVersion()
    {
       return webMajorVersion;

Modified: trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java	2007-05-03 17:40:31 UTC (rev 62789)
+++ trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java	2007-05-03 17:47:55 UTC (rev 62790)
@@ -60,6 +60,7 @@
    private static final ThreadLocal<WebMetaData> activeMetaData = new ThreadLocal<WebMetaData>();
    private int webMajorVersion = -1;
    private int webMinorVersion = -1;
+   private String dtdPublicID = null;
 
    /**
     * Called for descriptors with DTDs
@@ -70,6 +71,7 @@
    public void startDTD(String name, String publicId, String systemId)
    {
       // Check for a known public Id
+      dtdPublicID = publicId;
       if (publicId.startsWith("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"))
       {
          webMajorVersion = 2;
@@ -106,6 +108,7 @@
 
       metaData.setWebMajorVersion(webMajorVersion);
       metaData.setWebMinorVersion(webMinorVersion);
+      metaData.setPublicID(dtdPublicID);
 
       return metaData;
    }

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-05-03 17:40:31 UTC (rev 62789)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-05-03 17:47:55 UTC (rev 62790)
@@ -202,6 +202,7 @@
       context.setConfigFile(ctxConfig);
       context.setDefaultContextXml("context.xml");
       context.setDefaultWebXml("conf/web.xml");
+      context.setPublicId(metaData.getPublicID());
       // If there is an alt-dd set it
       if (metaData.getAltDDPath() != null)
       {