geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r983700 - in /geronimo/server/trunk: ./ plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/ plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/
Date Mon, 09 Aug 2010 15:58:49 GMT
Author: gawor
Date: Mon Aug  9 15:58:49 2010
New Revision: 983700

URL: http://svn.apache.org/viewvc?rev=983700&view=rev
Log:
pass stripped down and complete DD to Tomcat. Make sure Tomcat only parses the stripped down
version.

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=983700&r1=983699&r2=983700&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Mon Aug  9 15:58:49 2010
@@ -593,24 +593,24 @@ public class TomcatModuleBuilder extends
             //not truly metadata complete until MBEs have run
             //if (!webApp.isMetadataComplete()) {
             if (INITIAL_WEB_XML_SCHEMA_VERSION.get(earContext.getGeneralData()) >= 2.5f)
{
-                //Those elements have been processed by Geronimo, Tomatt no need to do it
now.
+                //Those elements have been processed by Geronimo, Tomcat no need to do it
now.
                 //Also, currently, it seems that Tomcat could not handle those jndi elements
correctly
                 webApp.setMetadataComplete(true);
-                if (INITIAL_WEB_XML_SCHEMA_VERSION.get(earContext.getGeneralData()) >=
2.5f) {
-                    String specDeploymentPlan = getSpecDDAsString(webModule);
-                    module.setOriginalSpecDD(specDeploymentPlan);
-                    //remove naming stuff from webApp so tomcat doesn't process it uselessly
-                    webApp.getEjbLocalRef().clear();
-                    webApp.getEjbRef().clear();
-                    webApp.getEnvEntry().clear();
-                    webApp.getDataSource().clear();
-                    webApp.getMessageDestinationRef().clear();
-                    webApp.getResourceEnvRef().clear();
-                    webApp.getResourceRef().clear();
-                    webApp.getServiceRef().clear();
-                    specDeploymentPlan = getSpecDDAsString(webModule);
-                    earContext.addFile(new URI("./WEB-INF/web.xml"), specDeploymentPlan);
-                }
+
+                String specDeploymentPlan = getSpecDDAsString(webModule);
+                module.setOriginalSpecDD(specDeploymentPlan);
+                
+                //remove naming stuff from webApp so tomcat doesn't process it uselessly
+                webApp.getEjbLocalRef().clear();
+                webApp.getEjbRef().clear();
+                webApp.getEnvEntry().clear();
+                webApp.getDataSource().clear();
+                webApp.getMessageDestinationRef().clear();
+                webApp.getResourceEnvRef().clear();
+                webApp.getResourceRef().clear();
+                webApp.getServiceRef().clear();
+                specDeploymentPlan = getSpecDDAsString(webModule);
+                earContext.addFile(new URI("./WEB-INF/web.xml"), specDeploymentPlan);   
            
             }
             //}
             webModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=983700&r1=983699&r2=983700&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
Mon Aug  9 15:58:49 2010
@@ -272,7 +272,7 @@ public class TomcatContainer implements 
      * @see org.apache.catalina.Host
      */
     public void addContext(TomcatContext contextInfo) throws Exception {
-        Context context = createContext(contextInfo.getContextPath(), contextInfo.getClassLoader(),
contextInfo.getDeploymentDescriptor());
+        Context context = createContext(contextInfo.getContextPath(), contextInfo.getClassLoader(),
null);
         //Was a virtual server defined?
         String virtualServer = contextInfo.getVirtualServer();
         if (virtualServer == null) {

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=983700&r1=983699&r2=983700&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Aug  9 15:58:49 2010
@@ -67,7 +67,7 @@
         FIXME: STOP using properties for dependency versions unless you absolutly need them,
                ie. you have a hundred dependencies that all use the same version.
         -->
-        <tomcatVersion>7.0.0.2-SNAPSHOT</tomcatVersion>
+        <tomcatVersion>7.0.0.1</tomcatVersion>
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
         <openejbVersion>3.2-SNAPSHOT</openejbVersion>



Mime
View raw message