Author: markt
Date: Tue Mar 8 15:58:53 2011
New Revision: 1079405
URL: http://svn.apache.org/viewvc?rev=1079405&view=rev
Log:
Expose the global naming context for all Server implementations
Modified:
tomcat/trunk/java/org/apache/catalina/Server.java
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/Server.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Server.java?rev=1079405&r1=1079404&r2=1079405&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Server.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Server.java Tue Mar 8 15:58:53 2011
@@ -76,6 +76,12 @@ public interface Server extends Lifecycl
/**
+ * Return the global naming resources context.
+ */
+ public javax.naming.Context getGlobalNamingContext();
+
+
+ /**
* Return the port number we listen to for shutdown commands.
*/
public int getPort();
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1079405&r1=1079404&r2=1079405&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Tue Mar 8
15:58:53 2011
@@ -173,6 +173,7 @@ public final class StandardServer extend
/**
* Return the global naming resources context.
*/
+ @Override
public javax.naming.Context getGlobalNamingContext() {
return (this.globalNamingContext);
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1079405&r1=1079404&r2=1079405&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Tue Mar
8 15:58:53 2011
@@ -457,8 +457,8 @@ public class ManagerServlet extends Http
// Acquire global JNDI resources if available
Server server = ((Engine)host.getParent()).getService().getServer();
- if ((server != null) && (server instanceof StandardServer)) {
- global = ((StandardServer) server).getGlobalNamingContext();
+ if (server != null) {
+ global = server.getGlobalNamingContext();
}
// Calculate the directory into which we will be deploying applications
Modified: tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=1079405&r1=1079404&r2=1079405&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Tue Mar 8
15:58:53 2011
@@ -30,7 +30,6 @@ import javax.naming.Context;
import javax.sql.DataSource;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.core.StandardServer;
import org.apache.naming.ContextBindings;
/**
@@ -390,8 +389,7 @@ public class DataSourceRealm
context = ContextBindings.getClassLoader();
context = (Context) context.lookup("comp/env");
} else {
- context =
- ((StandardServer)getServer()).getGlobalNamingContext();
+ context = getServer().getGlobalNamingContext();
}
DataSource dataSource = (DataSource)context.lookup(dataSourceName);
return dataSource.getConnection();
Modified: tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java?rev=1079405&r1=1079404&r2=1079405&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java Tue Mar
8 15:58:53 2011
@@ -32,7 +32,6 @@ import org.apache.catalina.Role;
import org.apache.catalina.User;
import org.apache.catalina.UserDatabase;
import org.apache.catalina.Wrapper;
-import org.apache.catalina.core.StandardServer;
import org.apache.tomcat.util.ExceptionUtils;
@@ -252,8 +251,7 @@ public class UserDatabaseRealm
protected void startInternal() throws LifecycleException {
try {
- Context context =
- ((StandardServer)getServer()).getGlobalNamingContext();
+ Context context = getServer().getGlobalNamingContext();
database = (UserDatabase) context.lookup(resourceName);
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
