You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/09/20 14:27:20 UTC

svn commit: r1173110 - /openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBContextConfig.java

Author: rmannibucau
Date: Tue Sep 20 12:27:20 2011
New Revision: 1173110

URL: http://svn.apache.org/viewvc?rev=1173110&view=rev
Log:
allowing to manage web app version for each app

Modified:
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBContextConfig.java

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBContextConfig.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBContextConfig.java?rev=1173110&r1=1173109&r2=1173110&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBContextConfig.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/OpenEJBContextConfig.java Tue Sep 20 12:27:20 2011
@@ -1,5 +1,6 @@
 package org.apache.openejb.tomcat.catalina;
 
+import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.deploy.WebXml;
 import org.apache.catalina.startup.ContextConfig;
 
@@ -8,12 +9,28 @@ import org.apache.catalina.startup.Conte
  */
 public class OpenEJBContextConfig extends ContextConfig {
     @Override protected WebXml createWebXml() {
-        return new OpenEJBWebXml();
+        String prefix = "";
+        if (context instanceof StandardContext) {
+            StandardContext standardContext = (StandardContext) context;
+            prefix = standardContext.getEncodedPath();
+            if (prefix.startsWith("/")) {
+                prefix = prefix.substring(1);
+            }
+        }
+        return new OpenEJBWebXml(prefix);
     }
 
     private class OpenEJBWebXml extends WebXml {
+        public static final String OPENEJB_WEB_XML_MAJOR_VERSION_PROPERTY = "openejb.web.xml.major";
+        private String prefix;
+
+        public OpenEJBWebXml(String prefix) {
+            this.prefix = prefix;
+        }
+
         @Override public int getMajorVersion() {
-            return Integer.getInteger("openejb.web.xml.major", super.getMajorVersion());
+            return Integer.getInteger(prefix + "." + OPENEJB_WEB_XML_MAJOR_VERSION_PROPERTY,
+                    Integer.getInteger(OPENEJB_WEB_XML_MAJOR_VERSION_PROPERTY, super.getMajorVersion()));
         }
     }
 }