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 2012/12/31 12:09:32 UTC

svn commit: r1427082 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Author: rmannibucau
Date: Mon Dec 31 11:09:32 2012
New Revision: 1427082

URL: http://svn.apache.org/viewvc?rev=1427082&view=rev
Log:
avoiding win issue due to : in app path

Modified:
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1427082&r1=1427081&r2=1427082&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Mon Dec 31 11:09:32 2012
@@ -773,13 +773,17 @@ public class TomcatWebAppBuilder impleme
 
             final ContextInfo contextInfo = getContextInfo(standardContext);
             if (contextInfo == null || contextInfo.appInfo == null || contextInfo.appInfo.path == null) {
-                standardContext.setJ2EEApplication(standardContext.getName());
+                standardContext.setJ2EEApplication(jmxName(standardContext.getName()));
             } else {
-                standardContext.setJ2EEApplication(shortName(contextInfo.appInfo.path));
+                standardContext.setJ2EEApplication(jmxName(shortName(contextInfo.appInfo.path)));
             }
         }
     }
 
+    private String jmxName(final String name) { // see javax.management.ObjectName.construct()
+        return name.replace(':', '_');
+    }
+
     private String shortName(final String path) {
         if (path.contains("/")) {
             return path.substring(path.lastIndexOf('/'), path.length());