remm 2002/06/08 00:24:59 Modified: catalina/src/share/org/apache/catalina/deploy ContextEjb.java ContextEnvironment.java ContextLocalEjb.java ContextResource.java ContextResourceLink.java ResourceParams.java Log: - Rename methods getNamingResource -> getNamingResources (missing 's' was breaking the JavaBeans conventions). Revision Changes Path 1.7 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextEjb.java Index: ContextEjb.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextEjb.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ContextEjb.java 3 May 2002 00:13:01 -0000 1.6 +++ ContextEjb.java 8 Jun 2002 07:24:59 -0000 1.7 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextEjb.java,v 1.6 2002/05/03 00:13:01 craigmcc Exp $ - * $Revision: 1.6 $ - * $Date: 2002/05/03 00:13:01 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextEjb.java,v 1.7 2002/06/08 07:24:59 remm Exp $ + * $Revision: 1.7 $ + * $Date: 2002/06/08 07:24:59 $ * * ==================================================================== * @@ -71,7 +71,7 @@ * deployment descriptor. * * @author Craig R. McClanahan - * @version $Revision: 1.6 $ $Date: 2002/05/03 00:13:01 $ + * @version $Revision: 1.7 $ $Date: 2002/06/08 07:24:59 $ */ public final class ContextEjb { @@ -209,7 +209,7 @@ */ protected NamingResources resources = null; - public NamingResources getNamingResource() { + public NamingResources getNamingResources() { return (this.resources); } 1.7 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextEnvironment.java Index: ContextEnvironment.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextEnvironment.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ContextEnvironment.java 3 May 2002 00:13:01 -0000 1.6 +++ ContextEnvironment.java 8 Jun 2002 07:24:59 -0000 1.7 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextEnvironment.java,v 1.6 2002/05/03 00:13:01 craigmcc Exp $ - * $Revision: 1.6 $ - * $Date: 2002/05/03 00:13:01 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextEnvironment.java,v 1.7 2002/06/08 07:24:59 remm Exp $ + * $Revision: 1.7 $ + * $Date: 2002/06/08 07:24:59 $ * * ==================================================================== * @@ -70,7 +70,7 @@ * an <code><env-entry></code> element in the deployment descriptor. * * @author Craig R. McClanahan - * @version $Revision: 1.6 $ $Date: 2002/05/03 00:13:01 $ + * @version $Revision: 1.7 $ $Date: 2002/06/08 07:24:59 $ */ public final class ContextEnvironment { @@ -188,7 +188,7 @@ */ protected NamingResources resources = null; - public NamingResources getNamingResource() { + public NamingResources getNamingResources() { return (this.resources); } 1.4 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextLocalEjb.java Index: ContextLocalEjb.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextLocalEjb.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ContextLocalEjb.java 3 May 2002 00:13:01 -0000 1.3 +++ ContextLocalEjb.java 8 Jun 2002 07:24:59 -0000 1.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextLocalEjb.java,v 1.3 2002/05/03 00:13:01 craigmcc Exp $ - * $Revision: 1.3 $ - * $Date: 2002/05/03 00:13:01 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextLocalEjb.java,v 1.4 2002/06/08 07:24:59 remm Exp $ + * $Revision: 1.4 $ + * $Date: 2002/06/08 07:24:59 $ * * ==================================================================== * @@ -71,7 +71,7 @@ * deployment descriptor. * * @author Craig R. McClanahan - * @version $Revision: 1.3 $ $Date: 2002/05/03 00:13:01 $ + * @version $Revision: 1.4 $ $Date: 2002/06/08 07:24:59 $ */ public final class ContextLocalEjb { @@ -209,7 +209,7 @@ */ protected NamingResources resources = null; - public NamingResources getNamingResource() { + public NamingResources getNamingResources() { return (this.resources); } 1.6 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextResource.java Index: ContextResource.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextResource.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ContextResource.java 3 May 2002 00:13:01 -0000 1.5 +++ ContextResource.java 8 Jun 2002 07:24:59 -0000 1.6 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextResource.java,v 1.5 2002/05/03 00:13:01 craigmcc Exp $ - * $Revision: 1.5 $ - * $Date: 2002/05/03 00:13:01 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextResource.java,v 1.6 2002/06/08 07:24:59 remm Exp $ + * $Revision: 1.6 $ + * $Date: 2002/06/08 07:24:59 $ * * ==================================================================== * @@ -71,7 +71,7 @@ * deployment descriptor. * * @author Craig R. McClanahan - * @version $Revision: 1.5 $ $Date: 2002/05/03 00:13:01 $ + * @version $Revision: 1.6 $ $Date: 2002/06/08 07:24:59 $ */ public final class ContextResource { @@ -193,7 +193,7 @@ */ protected NamingResources resources = null; - public NamingResources getNamingResource() { + public NamingResources getNamingResources() { return (this.resources); } 1.3 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextResourceLink.java Index: ContextResourceLink.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextResourceLink.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ContextResourceLink.java 3 May 2002 00:13:01 -0000 1.2 +++ ContextResourceLink.java 8 Jun 2002 07:24:59 -0000 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextResourceLink.java,v 1.2 2002/05/03 00:13:01 craigmcc Exp $ - * $Revision: 1.2 $ - * $Date: 2002/05/03 00:13:01 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ContextResourceLink.java,v 1.3 2002/06/08 07:24:59 remm Exp $ + * $Revision: 1.3 $ + * $Date: 2002/06/08 07:24:59 $ * * ==================================================================== * @@ -71,7 +71,7 @@ * server configuration file. * * @author Remy Maucherat - * @version $Revision: 1.2 $ $Date: 2002/05/03 00:13:01 $ + * @version $Revision: 1.3 $ $Date: 2002/06/08 07:24:59 $ */ public final class ContextResourceLink { @@ -155,7 +155,7 @@ */ protected NamingResources resources = null; - public NamingResources getNamingResource() { + public NamingResources getNamingResources() { return (this.resources); } 1.4 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ResourceParams.java Index: ResourceParams.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ResourceParams.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ResourceParams.java 3 May 2002 00:13:01 -0000 1.3 +++ ResourceParams.java 8 Jun 2002 07:24:59 -0000 1.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ResourceParams.java,v 1.3 2002/05/03 00:13:01 craigmcc Exp $ - * $Revision: 1.3 $ - * $Date: 2002/05/03 00:13:01 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/ResourceParams.java,v 1.4 2002/06/08 07:24:59 remm Exp $ + * $Revision: 1.4 $ + * $Date: 2002/06/08 07:24:59 $ * * ==================================================================== * @@ -71,7 +71,7 @@ * external resources defined in the web application deployment descriptor. * * @author Remy Maucherat - * @version $Revision: 1.3 $ $Date: 2002/05/03 00:13:01 $ + * @version $Revision: 1.4 $ $Date: 2002/06/08 07:24:59 $ */ public final class ResourceParams { @@ -131,7 +131,7 @@ */ protected NamingResources resources = null; - public NamingResources getNamingResource() { + public NamingResources getNamingResources() { return (this.resources); }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>