You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2005/07/23 05:10:28 UTC

svn commit: r224433 - /geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java

Author: jgenender
Date: Fri Jul 22 20:10:25 2005
New Revision: 224433

URL: http://svn.apache.org/viewcvs?rev=224433&view=rev
Log:
Added getServlets() per JSR77

Modified:
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=224433&r1=224432&r2=224433&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Fri Jul 22 20:10:25 2005
@@ -30,6 +30,7 @@
 import org.apache.catalina.Context;
 import org.apache.catalina.Realm;
 import org.apache.catalina.Valve;
+import org.apache.catalina.core.StandardContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -299,6 +300,14 @@
         return webServices;
     }
 
+    public String[] getServlets(){
+        String[] result = null;
+        if ((context != null) && (context instanceof StandardContext))
+            result = ((StandardContext)context).getServlets();
+        
+        return result;
+    }
+    
     /**
      * ObjectName must match this pattern: <p/>
      * domain:j2eeType=WebModule,name=MyName,J2EEServer=MyServer,J2EEApplication=MyApplication
@@ -333,11 +342,6 @@
                     "WebModule object name can only have j2eeType, name, J2EEApplication, and J2EEServer properties",
                     objectName);
         }
-    }
-
-
-    public String[] getServlets() {
-        return new String[0]; //todo: implement me: ObjectNames (as Strings) of the Servlets in this Web App
     }
 
     public String[] getJavaVMs() {