geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r599090 - in /geronimo/server: branches/2.0/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
Date Wed, 28 Nov 2007 18:48:20 GMT
Author: vamsic007
Date: Wed Nov 28 10:48:20 2007
New Revision: 599090

URL: http://svn.apache.org/viewvc?rev=599090&view=rev
Log:
When objectName is not null, extract J2EEServer from objectName

Modified:
    geronimo/server/branches/2.0/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java

Modified: geronimo/server/branches/2.0/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=599090&r1=599089&r2=599090&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
Wed Nov 28 10:48:20 2007
@@ -230,10 +230,10 @@
                 // Without this the Tomcat FallBack Application is left behind,
                 // MBean - ...J2EEApplication=none,J2EEServer=none,..........
                 ctx.setJ2EEApplication(null);
-                // TODO if objectName != null extract J2EEServer from objectName/host
-                ctx.setJ2EEServer("geronimo");
+                // if objectName != null extract J2EEServer from objectName/host
+                ctx.setJ2EEServer(objName == null ? "geronimo" : objName.getKeyProperty(NameFactory.J2EE_SERVER));
                 ctx.setJavaVMs(new String[]{});
-                ctx.setServer("geronimo");
+                ctx.setServer(objName == null ? "geronimo" : objName.getKeyProperty(NameFactory.J2EE_SERVER));
             }
             hosts[i].addChild(defaultContext);
         }

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=599090&r1=599089&r2=599090&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
Wed Nov 28 10:48:20 2007
@@ -230,10 +230,10 @@
                 // Without this the Tomcat FallBack Application is left behind,
                 // MBean - ...J2EEApplication=none,J2EEServer=none,..........
                 ctx.setJ2EEApplication(null);
-                // TODO if objectName != null extract J2EEServer from objectName/host
-                ctx.setJ2EEServer("geronimo");
+                // if objectName != null extract J2EEServer from objectName/host
+                ctx.setJ2EEServer(objName == null ? "geronimo" : objName.getKeyProperty(NameFactory.J2EE_SERVER));
                 ctx.setJavaVMs(new String[]{});
-                ctx.setServer("geronimo");
+                ctx.setServer(objName == null ? "geronimo" : objName.getKeyProperty(NameFactory.J2EE_SERVER));
             }
             hosts[i].addChild(defaultContext);
         }



Mime
View raw message