From: markt Date: Tue, 4 Aug 2009 22:54:25 +0000 (+0000) Subject: Having fixed the typo, fix all the places it was referenced X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=86842e44feaf2ad2d87a7f35b97a72f7b0d828c1;p=tomcat7.0 Having fixed the typo, fix all the places it was referenced git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@801011 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java index 24708769d..ad14fd45d 100644 --- a/java/org/apache/catalina/core/ApplicationContext.java +++ b/java/org/apache/catalina/core/ApplicationContext.java @@ -897,7 +897,7 @@ public class ApplicationContext return null; } - public ServletRegistration.Dynmaic addServlet(String servletName, + public ServletRegistration.Dynamic addServlet(String servletName, String className) throws IllegalStateException { if (context.initialized) { @@ -916,7 +916,7 @@ public class ApplicationContext } - public ServletRegistration.Dynmaic addServlet(String servletName, + public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) throws IllegalStateException { if (context.initialized) { @@ -935,7 +935,7 @@ public class ApplicationContext } - public ServletRegistration.Dynmaic addServlet(String servletName, + public ServletRegistration.Dynamic addServlet(String servletName, Class servletClass) throws IllegalStateException { diff --git a/java/org/apache/catalina/core/ApplicationContextFacade.java b/java/org/apache/catalina/core/ApplicationContextFacade.java index b9ef75130..a9d57ed25 100644 --- a/java/org/apache/catalina/core/ApplicationContextFacade.java +++ b/java/org/apache/catalina/core/ApplicationContextFacade.java @@ -442,10 +442,10 @@ public final class ApplicationContextFacade } - public ServletRegistration.Dynmaic addServlet(String servletName, + public ServletRegistration.Dynamic addServlet(String servletName, String className) { if (SecurityUtil.isPackageProtectionEnabled()) { - return (ServletRegistration.Dynmaic) doPrivileged( + return (ServletRegistration.Dynamic) doPrivileged( "addServlet", new Object[]{servletName, className}); } else { return context.addServlet(servletName, className); @@ -453,10 +453,10 @@ public final class ApplicationContextFacade } - public ServletRegistration.Dynmaic addServlet(String servletName, + public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) { if (SecurityUtil.isPackageProtectionEnabled()) { - return (ServletRegistration.Dynmaic) doPrivileged( + return (ServletRegistration.Dynamic) doPrivileged( "addServlet", new Object[]{servletName, servlet}); } else { return context.addServlet(servletName, servlet); @@ -464,10 +464,10 @@ public final class ApplicationContextFacade } - public ServletRegistration.Dynmaic addServlet(String servletName, + public ServletRegistration.Dynamic addServlet(String servletName, Class servletClass) { if (SecurityUtil.isPackageProtectionEnabled()) { - return (ServletRegistration.Dynmaic) doPrivileged( + return (ServletRegistration.Dynamic) doPrivileged( "addServlet", new Object[]{servletName, servletClass}); } else { return context.addServlet(servletName, servletClass); diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java b/java/org/apache/jasper/servlet/JspCServletContext.java index 0f25f9f38..998536ba2 100644 --- a/java/org/apache/jasper/servlet/JspCServletContext.java +++ b/java/org/apache/jasper/servlet/JspCServletContext.java @@ -450,7 +450,7 @@ public class JspCServletContext implements ServletContext { } - public ServletRegistration.Dynmaic addServlet(String servletName, + public ServletRegistration.Dynamic addServlet(String servletName, String className) { return null; } @@ -488,13 +488,13 @@ public class JspCServletContext implements ServletContext { } - public javax.servlet.Registration.Dynamic addServlet(String servletName, + public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) { return null; } - public javax.servlet.Registration.Dynamic addServlet(String servletName, + public ServletRegistration.Dynamic addServlet(String servletName, Class servletClass) { return null; }