luehe 2004/04/14 10:29:16 Modified: catalina/src/share/org/apache/catalina/mbeans DefaultContextMBean.java GroupMBean.java MemoryUserDatabaseMBean.java NamingResourcesMBean.java StandardContextMBean.java UserMBean.java Log: Added support for exception chaining. Revision Changes Path 1.4 +10 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java Index: DefaultContextMBean.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DefaultContextMBean.java 27 Feb 2004 14:58:44 -0000 1.3 +++ DefaultContextMBean.java 14 Apr 2004 17:29:16 -0000 1.4 @@ -105,8 +105,10 @@ MBeanUtils.createObjectName(managed.getDomain(), envs[i]); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for environment " + envs[i]); + iae.initCause(e); + throw iae; } } return ((String[]) results.toArray(new String[results.size()])); @@ -128,8 +130,10 @@ MBeanUtils.createObjectName(managed.getDomain(), resources[i]); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for resource " + resources[i]); + iae.initCause(e); + throw iae; } } return ((String[]) results.toArray(new String[results.size()])); @@ -151,8 +155,10 @@ MBeanUtils.createObjectName(managed.getDomain(), links[i]); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for resource " + links[i]); + iae.initCause(e); + throw iae; } } return ((String[]) results.toArray(new String[results.size()])); 1.4 +7 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/GroupMBean.java Index: GroupMBean.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/GroupMBean.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- GroupMBean.java 27 Feb 2004 14:58:45 -0000 1.3 +++ GroupMBean.java 14 Apr 2004 17:29:16 -0000 1.4 @@ -106,8 +106,10 @@ MBeanUtils.createObjectName(managed.getDomain(), role); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for role " + role); + iae.initCause(e); + throw iae; } } return ((String[]) results.toArray(new String[results.size()])); @@ -131,8 +133,10 @@ MBeanUtils.createObjectName(managed.getDomain(), user); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for user " + user); + iae.initCause(e); + throw iae; } } return ((String[]) results.toArray(new String[results.size()])); 1.3 +34 -40 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java Index: MemoryUserDatabaseMBean.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MemoryUserDatabaseMBean.java 27 Feb 2004 14:58:45 -0000 1.2 +++ MemoryUserDatabaseMBean.java 14 Apr 2004 17:29:16 -0000 1.3 @@ -174,23 +174,13 @@ UserDatabase database = (UserDatabase) this.resource; Group group = database.createGroup(groupname, description); - /* - if (roles != null) { - for (int i = 0; i < roles.length; i++) { - Role role = database.findRole(roles[i]); - if (role == null) { - createRole(roles[i], null); - role = database.findRole(roles[i]); - } - group.addRole(role); - } - } - */ try { MBeanUtils.createMBean(group); } catch (Exception e) { - throw new IllegalArgumentException("Exception creating group " + - group + " MBean: " + e); + IllegalArgumentException iae = new IllegalArgumentException + ("Exception creating group " + group + " MBean"); + iae.initCause(e); + throw iae; } return (findGroup(groupname)); @@ -210,8 +200,10 @@ try { MBeanUtils.createMBean(role); } catch (Exception e) { - throw new IllegalArgumentException("Exception creating role " + - role + " MBean: " + e); + IllegalArgumentException iae = new IllegalArgumentException + ("Exception creating role " + role + " MBean"); + iae.initCause(e); + throw iae; } return (findRole(rolename)); @@ -230,23 +222,13 @@ UserDatabase database = (UserDatabase) this.resource; User user = database.createUser(username, password, fullName); - /* - if (roles != null) { - for (int i = 0; i < roles.length; i++) { - Role role = database.findRole(roles[i]); - if (role == null) { - createRole(roles[i], null); - role = database.findRole(roles[i]); - } - user.addRole(role); - } - } - */ try { MBeanUtils.createMBean(user); } catch (Exception e) { - throw new IllegalArgumentException("Exception creating user " + - user + " MBean: " + e); + IllegalArgumentException iae = new IllegalArgumentException + ("Exception creating user " + user + " MBean"); + iae.initCause(e); + throw iae; } return (findUser(username)); @@ -271,8 +253,10 @@ MBeanUtils.createObjectName(managedGroup.getDomain(), group); return (oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for group " + group); + iae.initCause(e); + throw iae; } } @@ -296,8 +280,10 @@ MBeanUtils.createObjectName(managedRole.getDomain(), role); return (oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for role " + role); + iae.initCause(e); + throw iae; } } @@ -321,8 +307,10 @@ MBeanUtils.createObjectName(managedUser.getDomain(), user); return (oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for user " + user); + iae.initCause(e); + throw iae; } } @@ -344,8 +332,10 @@ MBeanUtils.destroyMBean(group); database.removeGroup(group); } catch (Exception e) { - throw new IllegalArgumentException("Exception destroying group " + - group + " MBean: " + e); + IllegalArgumentException iae = new IllegalArgumentException + ("Exception destroying group " + group + " MBean"); + iae.initCause(e); + throw iae; } } @@ -367,8 +357,10 @@ MBeanUtils.destroyMBean(role); database.removeRole(role); } catch (Exception e) { - throw new IllegalArgumentException("Exception destroying role " + - role + " MBean: " + e); + IllegalArgumentException iae = new IllegalArgumentException + ("Exception destroying role " + role + " MBean"); + iae.initCause(e); + throw iae; } } @@ -390,8 +382,10 @@ MBeanUtils.destroyMBean(user); database.removeUser(user); } catch (Exception e) { - throw new IllegalArgumentException("Exception destroying user " + - user + " MBean: " + e); + IllegalArgumentException iae = new IllegalArgumentException + ("Exception destroying user " + user + " MBean"); + iae.initCause(e); + throw iae; } } 1.5 +10 -4 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- NamingResourcesMBean.java 27 Feb 2004 14:58:45 -0000 1.4 +++ NamingResourcesMBean.java 14 Apr 2004 17:29:16 -0000 1.5 @@ -95,8 +95,10 @@ MBeanUtils.createObjectName(managed.getDomain(), envs[i]); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for environment " + envs[i]); + iae.initCause(e); + throw iae; } } return ((String[]) results.toArray(new String[results.size()])); @@ -119,8 +121,10 @@ MBeanUtils.createObjectName(managed.getDomain(), resources[i]); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for resource " + resources[i]); + iae.initCause(e); + throw iae; } } return ((String[]) results.toArray(new String[results.size()])); @@ -143,8 +147,10 @@ MBeanUtils.createObjectName(managed.getDomain(), resourceLinks[i]); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for resource " + resourceLinks[i]); + iae.initCause(e); + throw iae; } } return ((String[]) results.toArray(new String[results.size()])); 1.6 +10 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java Index: StandardContextMBean.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- StandardContextMBean.java 27 Feb 2004 14:58:45 -0000 1.5 +++ StandardContextMBean.java 14 Apr 2004 17:29:16 -0000 1.6 @@ -114,8 +114,10 @@ MBeanUtils.createObjectName(managed.getDomain(), envs[i]); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for environment " + envs[i]); + iae.initCause(e); + throw iae; } } return ((String[]) results.toArray(new String[results.size()])); @@ -137,8 +139,10 @@ MBeanUtils.createObjectName(managed.getDomain(), resources[i]); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for resource " + resources[i]); + iae.initCause(e); + throw iae; } } return ((String[]) results.toArray(new String[results.size()])); @@ -160,8 +164,10 @@ MBeanUtils.createObjectName(managed.getDomain(), links[i]); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for resource " + links[i]); + iae.initCause(e); + throw iae; } } return ((String[]) results.toArray(new String[results.size()])); 1.4 +7 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/UserMBean.java Index: UserMBean.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/UserMBean.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- UserMBean.java 27 Feb 2004 14:58:45 -0000 1.3 +++ UserMBean.java 14 Apr 2004 17:29:16 -0000 1.4 @@ -106,8 +106,10 @@ MBeanUtils.createObjectName(managed.getDomain(), group); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for group " + group); + iae.initCause(e); + throw iae; } } return ((String[]) results.toArray(new String[results.size()])); @@ -131,8 +133,10 @@ MBeanUtils.createObjectName(managed.getDomain(), role); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException + IllegalArgumentException iae = new IllegalArgumentException ("Cannot create object name for role " + role); + iae.initCause(e); + throw iae; } } return ((String[]) results.toArray(new String[results.size()]));
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]