pero 2005/03/25 00:38:48 Modified: catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java Log: Remove StandardDefaultContext Handling at findObjectName correct some Indentation! Revision Changes Path 1.36 +9 -11 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java Index: MBeanFactory.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- MBeanFactory.java 25 Mar 2005 08:31:31 -0000 1.35 +++ MBeanFactory.java 25 Mar 2005 08:38:48 -0000 1.36 @@ -117,8 +117,6 @@ if (type.equals("org.apache.catalina.core.StandardContext")) { return "StandardContext"; - } else if (type.equals("org.apache.catalina.core.StandardDefaultContext")) { - return "DefaultContext"; } else if (type.equals("org.apache.catalina.core.StandardEngine")) { return "Engine"; } else if (type.equals("org.apache.catalina.core.StandardHost")) { @@ -277,10 +275,10 @@ // Create a new DataSourceRealm instance DataSourceRealm realm = new DataSourceRealm(); - realm.setDataSourceName(dataSourceName); - realm.setRoleNameCol(roleNameCol); - realm.setUserCredCol(userCredCol); - realm.setUserNameCol(userNameCol); + realm.setDataSourceName(dataSourceName); + realm.setRoleNameCol(roleNameCol); + realm.setUserCredCol(userCredCol); + realm.setUserNameCol(userNameCol); realm.setUserRoleTable(userRoleTable); realm.setUserTable(userTable); @@ -377,10 +375,10 @@ // Create a new JDBCRealm instance JDBCRealm realm = new JDBCRealm(); - realm.setDriverName(driverName); - realm.setConnectionName(connectionName); - realm.setConnectionPassword(connectionPassword); - realm.setConnectionURL(connectionURL); + realm.setDriverName(driverName); + realm.setConnectionName(connectionName); + realm.setConnectionPassword(connectionPassword); + realm.setConnectionURL(connectionURL); // Add the new instance to its parent component ObjectName pname = new ObjectName(parent);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]