From tomcat-dev-return-22922-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org Tue Dec 10 18:13:04 2002 Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 22913 invoked from network); 10 Dec 2002 18:13:03 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 10 Dec 2002 18:13:03 -0000 Received: (qmail 1724 invoked by uid 97); 10 Dec 2002 18:14:09 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 1659 invoked by uid 97); 10 Dec 2002 18:14:08 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 1638 invoked by uid 97); 10 Dec 2002 18:14:07 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 10 Dec 2002 18:12:51 -0000 Message-ID: <20021210181251.23489.qmail@icarus.apache.org> From: remm@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans NamingResourcesMBean.java mbeans-descriptors.xml X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N remm 2002/12/10 10:12:51 Modified: catalina/src/share/org/apache/catalina/mbeans NamingResourcesMBean.java mbeans-descriptors.xml Log: - Fix bug 15239. - Remove useless parameter. Revision Changes Path 1.2 +6 -7 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java Index: NamingResourcesMBean.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NamingResourcesMBean.java 18 Jul 2002 16:48:00 -0000 1.1 +++ NamingResourcesMBean.java 10 Dec 2002 18:12:51 -0000 1.2 @@ -272,8 +272,8 @@ * @param resourceLinkName New resource link reference name * @param type New resource link reference type */ - public String addResourceLink(String global, String resourceLinkName, - String type) throws MalformedObjectNameException { + public String addResourceLink(String resourceLinkName, String type) + throws MalformedObjectNameException { NamingResources nresources = (NamingResources) this.resource; if (nresources == null) { @@ -289,7 +289,6 @@ resourceLink = new ContextResourceLink(); resourceLink.setName(resourceLinkName); resourceLink.setType(type); - resourceLink.setGlobal(global); nresources.addResourceLink(resourceLink); // Return the corresponding MBean name 1.15 +1 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml Index: mbeans-descriptors.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mbeans-descriptors.xml 8 Dec 2002 13:42:09 -0000 1.14 +++ mbeans-descriptors.xml 10 Dec 2002 18:12:51 -0000 1.15 @@ -1701,9 +1701,6 @@ description="Add a resource link reference for this web application" impact="ACTION" returnType="void"> - -- To unsubscribe, e-mail: For additional commands, e-mail: