craigmcc 02/05/06 16:08:32 Modified: catalina/src/conf server.xml catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java mbeans-descriptors.xml catalina/src/share/org/apache/catalina/realm UserDatabaseRealm.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm SaveUserDatabaseRealmAction.java UserDatabaseRealmForm.java Log: Add "resourceName" to the set of parameters passed to the factory create method for a UserDatabaseRealm instance, since it has to have the correct value at start() time. Correctly look up the global naming resources javax.naming.Context value in UserDatabaseRealm.start(). Remove the artificial "java:" prefix on the global resource name, so that this value is consistent with all the other uses of global resource names in server.xml (and the admin tool). Revision Changes Path 1.58 +1 -1 jakarta-tomcat-4.0/catalina/src/conf/server.xml Index: server.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- server.xml 11 Apr 2002 23:01:26 -0000 1.57 +++ server.xml 6 May 2002 23:08:31 -0000 1.58 @@ -182,7 +182,7 @@ that are performed against this UserDatabase are immediately available for use by the Realm. --> <Realm className="org.apache.catalina.realm.UserDatabaseRealm" - debug="0" resourceName="java:UserDatabase"/> + debug="0" resourceName="UserDatabase"/> <!-- Comment out the old realm but leave here for now in case we need to go back quickly --> 1.32 +8 -5 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.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- MBeanFactory.java 3 May 2002 23:47:28 -0000 1.31 +++ MBeanFactory.java 6 May 2002 23:08:31 -0000 1.32 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v 1.31 2002/05/03 23:47:28 amyroh Exp $ - * $Revision: 1.31 $ - * $Date: 2002/05/03 23:47:28 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v 1.32 2002/05/06 23:08:31 craigmcc Exp $ + * $Revision: 1.32 $ + * $Date: 2002/05/06 23:08:31 $ * * ==================================================================== * @@ -117,7 +117,7 @@ * <code>org.apache.catalina.core.StandardServer</code> component.</p> * * @author Amy Roh - * @version $Revision: 1.31 $ $Date: 2002/05/03 23:47:28 $ + * @version $Revision: 1.32 $ $Date: 2002/05/06 23:08:31 $ */ public class MBeanFactory extends BaseModelMBean { @@ -1049,14 +1049,17 @@ * Create a new UserDatabaseRealm. * * @param parent MBean Name of the associated parent component + * @param resourceName Global JNDI resource name of the associated + * UserDatabase * * @exception Exception if an MBean cannot be created or registered */ - public String createUserDatabaseRealm(String parent) + public String createUserDatabaseRealm(String parent, String resourceName) throws Exception { // Create a new UserDatabaseRealm instance UserDatabaseRealm realm = new UserDatabaseRealm(); + realm.setResourceName(resourceName); // Add the new instance to its parent component ObjectName pname = new ObjectName(parent); String type = pname.getKeyProperty("type"); 1.56 +4 -1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml Index: mbeans-descriptors.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- mbeans-descriptors.xml 3 May 2002 23:45:40 -0000 1.55 +++ mbeans-descriptors.xml 6 May 2002 23:08:31 -0000 1.56 @@ -6,7 +6,7 @@ <!-- Descriptions of JMX MBeans for Catalina - $Id: mbeans-descriptors.xml,v 1.55 2002/05/03 23:45:40 amyroh Exp $ + $Id: mbeans-descriptors.xml,v 1.56 2002/05/06 23:08:31 craigmcc Exp $ --> <mbeans-descriptors> @@ -1108,6 +1108,9 @@ returnType="java.lang.String"> <parameter name="parent" description="MBean Name of the associated parent component" + type="java.lang.String"/> + <parameter name="resourceName" + description="Global JNDI resource name of our UserDatabase instance" type="java.lang.String"/> </operation> 1.7 +10 -7 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java Index: UserDatabaseRealm.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- UserDatabaseRealm.java 8 Feb 2002 17:07:42 -0000 1.6 +++ UserDatabaseRealm.java 6 May 2002 23:08:32 -0000 1.7 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java,v 1.6 2002/02/08 17:07:42 craigmcc Exp $ - * $Revision: 1.6 $ - * $Date: 2002/02/08 17:07:42 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java,v 1.7 2002/05/06 23:08:32 craigmcc Exp $ + * $Revision: 1.7 $ + * $Date: 2002/05/06 23:08:32 $ * * ==================================================================== * @@ -81,8 +81,10 @@ import org.apache.catalina.Realm; import org.apache.catalina.Role; import org.apache.catalina.Server; +import org.apache.catalina.ServerFactory; import org.apache.catalina.User; import org.apache.catalina.UserDatabase; +import org.apache.catalina.core.StandardServer; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; import org.apache.commons.digester.Digester; @@ -96,7 +98,7 @@ * of <code>UserDatabase</code> that we should consult.</p> * * @author Craig R. McClanahan - * @version $Revision: 1.6 $ $Date: 2002/02/08 17:07:42 $ + * @version $Revision: 1.7 $ $Date: 2002/05/06 23:08:32 $ * @since 4.1 */ @@ -131,7 +133,7 @@ * The global JNDI name of the <code>UserDatabase</code> resource * we will be utilizing. */ - protected String resourceName = "java:UserDatabase"; + protected String resourceName = "UserDatabase"; /** @@ -297,8 +299,9 @@ public synchronized void start() throws LifecycleException { try { - database = - (UserDatabase) (new InitialContext()).lookup(resourceName); + StandardServer server = (StandardServer) ServerFactory.getServer(); + Context context = server.getGlobalNamingContext(); + database = (UserDatabase) context.lookup(resourceName); } catch (Throwable e) { e.printStackTrace(); log(sm.getString("userDatabaseRealm.lookup", resourceName), e); 1.4 +10 -8 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java Index: SaveUserDatabaseRealmAction.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SaveUserDatabaseRealmAction.java 29 Apr 2002 21:47:08 -0000 1.3 +++ SaveUserDatabaseRealmAction.java 6 May 2002 23:08:32 -0000 1.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java,v 1.3 2002/04/29 21:47:08 manveen Exp $ - * $Revision: 1.3 $ - * $Date: 2002/04/29 21:47:08 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java,v 1.4 2002/05/06 23:08:32 craigmcc Exp $ + * $Revision: 1.4 $ + * $Date: 2002/05/06 23:08:32 $ * * ==================================================================== * @@ -96,7 +96,7 @@ * <em>Edit Realm</em> transactions for UserDatabase realm. * * @author Manveen Kaur - * @version $Revision: 1.3 $ $Date: 2002/04/29 21:47:08 $ + * @version $Revision: 1.4 $ $Date: 2002/05/06 23:08:32 $ */ public final class SaveUserDatabaseRealmAction extends Action { @@ -105,10 +105,11 @@ // ----------------------------------------------------- Instance Variables /** - * Signature for the <code>createStandardRealm</code> operation. + * Signature for the <code>createUserDatabaseRealm</code> operation. */ - private String createStandardRealmTypes[] = + private String createUserDatabaseRealmTypes[] = { "java.lang.String", // parent + "java.lang.String", // name }; @@ -216,12 +217,13 @@ new ObjectName(TomcatTreeBuilder.FACTORY_TYPE); // Create a new StandardRealm object - values = new String[1]; + values = new String[2]; values[0] = parent; + values[1] = rform.getResource(); operation = "createUserDatabaseRealm"; rObjectName = (String) mBServer.invoke(fname, operation, - values, createStandardRealmTypes); + values, createUserDatabaseRealmTypes); // Add the new Realm to our tree control node TreeControl control = (TreeControl) 1.6 +4 -7 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java Index: UserDatabaseRealmForm.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- UserDatabaseRealmForm.java 3 May 2002 18:34:14 -0000 1.5 +++ UserDatabaseRealmForm.java 6 May 2002 23:08:32 -0000 1.6 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java,v 1.5 2002/05/03 18:34:14 manveen Exp $ - * $Revision: 1.5 $ - * $Date: 2002/05/03 18:34:14 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java,v 1.6 2002/05/06 23:08:32 craigmcc Exp $ + * $Revision: 1.6 $ + * $Date: 2002/05/06 23:08:32 $ * * ==================================================================== * @@ -76,7 +76,7 @@ * Form bean for the User Database realm page. * * @author Manveen Kaur - * @version $Revision: 1.5 $ $Date: 2002/05/03 18:34:14 $ + * @version $Revision: 1.6 $ $Date: 2002/05/06 23:08:32 $ */ public final class UserDatabaseRealmForm extends RealmForm { @@ -167,9 +167,6 @@ if ((resource == null) || (resource.length() < 1)) { errors.add("resource", new ActionError("error.resource.required")); - } else if (!resource.startsWith("java:")) { - errors.add("resource", - new ActionError("error.resource.javaprefix")); } } return errors;
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>