[EMAIL PROTECTED] wrote:
> amyroh 2003/03/10 19:25:52
>
> Modified: catalina/src/share/org/apache/catalina/mbeans
> MBeanFactory.java ServerLifecycleListener.java
> Log:
> Set to use JSR77 names as default.
Please make sure tomcat 5 is also updated.
I would do it in reverse - first tc5 and then backport.
Costin
>
> Revision Changes Path
> 1.41 +11 -8
>
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
>
> Index: MBeanFactory.java
> ===================================================================
> RCS file:
>
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
> retrieving revision 1.40 retrieving revision 1.41
> diff -u -r1.40 -r1.41
> --- MBeanFactory.java 19 Sep 2002 22:55:48 -0000 1.40
> +++ MBeanFactory.java 11 Mar 2003 03:25:52 -0000 1.41
> @@ -1227,13 +1227,16 @@
> *
> * @exception Exception if a component cannot be removed
> */
> - public void removeContext(String name) throws Exception {
> + public void removeContext(String name, String pname) throws
> Exception {
>
> // Acquire a reference to the component to be removed
> ObjectName oname = new ObjectName(name);
> - String serviceName = oname.getKeyProperty("service");
> - String hostName = oname.getKeyProperty("host");
> - String contextName = getPathStr(oname.getKeyProperty("path"));
> + ObjectName poname = new ObjectName(pname);
> + String serviceName = poname.getKeyProperty("service");
> + String hostName = poname.getKeyProperty("host");
> + String pathname = oname.getKeyProperty("name");
> + String path = pathname.substring(pathname.lastIndexOf('/'));
> + String contextName = getPathStr(path);
> Server server = ServerFactory.getServer();
> Service service = server.findService(serviceName);
> Engine engine = (Engine) service.getContainer();
>
>
>
> 1.38 +5 -4
>
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
>
> Index: ServerLifecycleListener.java
> ===================================================================
> RCS file:
>
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
> retrieving revision 1.37 retrieving revision 1.38
> diff -u -r1.37 -r1.38
> --- ServerLifecycleListener.java 12 Feb 2003 22:11:27 -0000 1.37
> +++ ServerLifecycleListener.java 11 Mar 2003 03:25:52 -0000 1.38
> @@ -367,6 +367,7 @@
>
> try {
>
> + setJsr77Names(true);
> MBeanFactory factory = new MBeanFactory();
> createMBeans(factory);
> createMBeans(ServerFactory.getServer());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
