craigmcc 02/02/08 09:07:42
Modified: catalina/src/conf server.xml
catalina/src/share/org/apache/catalina/realm
UserDatabaseRealm.java
Log:
Stop playing games with the "resourceName" property setter. (Manveen, you
will want to add a validation on the "java:" prefix in the admin app.)
Revision Changes Path
1.53 +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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- server.xml 23 Jan 2002 17:42:19 -0000 1.52
+++ server.xml 8 Feb 2002 17:07:42 -0000 1.53
@@ -164,7 +164,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="UserDatabase"/>
+ debug="0" resourceName="java:UserDatabase"/>
<!-- Comment out the old realm but leave here for now in case we
need to go back quickly -->
1.6 +6 -6
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserDatabaseRealm.java 3 Feb 2002 00:56:58 -0000 1.5
+++ UserDatabaseRealm.java 8 Feb 2002 17:07:42 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java,v
1.5 2002/02/03 00:56:58 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/03 00:56:58 $
+ * $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 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* of <code>UserDatabase</code> that we should consult.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2002/02/03 00:56:58 $
+ * @version $Revision: 1.6 $ $Date: 2002/02/08 17:07:42 $
* @since 4.1
*/
@@ -131,7 +131,7 @@
* The global JNDI name of the <code>UserDatabase</code> resource
* we will be utilizing.
*/
- protected String resourceName = "java:/UserDatabase";
+ protected String resourceName = "java:UserDatabase";
/**
@@ -175,7 +175,7 @@
*/
public void setResourceName(String resourceName) {
- this.resourceName = "java:" + resourceName;
+ this.resourceName = resourceName;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
