Index: components/security/src/java/org/apache/jetspeed/security/impl/SecurityProviderImpl.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/SecurityProviderImpl.java,v
retrieving revision 1.1
diff -u -r1.1 SecurityProviderImpl.java
--- components/security/src/java/org/apache/jetspeed/security/impl/SecurityProviderImpl.java	10 Mar 2004 06:07:47 -0000	1.1
+++ components/security/src/java/org/apache/jetspeed/security/impl/SecurityProviderImpl.java	24 May 2004 01:18:06 -0000
@@ -14,7 +14,6 @@
  */
 package org.apache.jetspeed.security.impl;
 
-import java.io.File;
 import java.net.URL;
 import java.security.Policy;
 
@@ -60,9 +59,9 @@
         }
         if (null != loginConfigUrl)
         {
-            File loginConfigFile = new File(loginConfigUrl.getFile());
-            if (log.isDebugEnabled()) log.debug("java.security.auth.login.config = " + loginConfigFile.getAbsolutePath());
-            System.setProperty("java.security.auth.login.config", loginConfigFile.getAbsolutePath());
+            if (log.isDebugEnabled()) 
+                log.debug("java.security.auth.login.config = " + loginConfigUrl.toString());
+            System.setProperty("java.security.auth.login.config", loginConfigUrl.toString());
         }
         Policy.setPolicy(policy);
         Policy.getPolicy().refresh();
Index: portal/src/resources/jetspeed.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/resources/jetspeed.xml,v
retrieving revision 1.4
diff -u -r1.4 jetspeed.xml
--- portal/src/resources/jetspeed.xml	29 Apr 2004 02:53:23 -0000	1.4
+++ portal/src/resources/jetspeed.xml	24 May 2004 01:18:13 -0000
@@ -14,6 +14,13 @@
 limitations under the License.
 -->
 <Context path="/jetspeed" docBase="jetspeed" crossContext="true">
+
+  <Realm className="org.apache.catalina.realm.JAASRealm"
+         appName="Jetspeed"
+         userClassNames="org.apache.jetspeed.security.impl.UserPrincipalImpl"
+         roleClassNames="org.apache.jetspeed.security.impl.RolePrincipalImpl"
+         debug="3"/>
+
 	<ResourceParams name="jdbc/jetspeed">
     <parameter>
       <name>factory</name>
Index: portal/src/webapp/WEB-INF/web.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.11
diff -u -r1.11 web.xml
--- portal/src/webapp/WEB-INF/web.xml	13 May 2004 22:56:50 -0000	1.11
+++ portal/src/webapp/WEB-INF/web.xml	24 May 2004 01:18:13 -0000
@@ -223,7 +223,7 @@
   <!-- Login configuration uses form-based authentication -->
   <login-config>
     <auth-method>FORM</auth-method>
-    <realm-name>Intranet</realm-name>
+    <realm-name>Jetspeed</realm-name>
     <form-login-config>
       <form-login-page>/login/login</form-login-page>
       <form-error-page>/login/error</form-error-page>
Index: src/sql/populate-userinfo-for-default-psml.sql
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/src/sql/populate-userinfo-for-default-psml.sql,v
retrieving revision 1.1
diff -u -r1.1 populate-userinfo-for-default-psml.sql
--- src/sql/populate-userinfo-for-default-psml.sql	22 May 2004 21:34:13 -0000	1.1
+++ src/sql/populate-userinfo-for-default-psml.sql	24 May 2004 01:18:16 -0000
@@ -7,3 +7,21 @@
 INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,61,false,NULL,0,0.0E0,'Test Dude','2004-05-22 16:27:12.562','2004-05-22 16:27:12.562');
 INSERT INTO PREFS_PROPERTY_KEY VALUES(62,'user.name.family',3,'2004-05-22 16:27:12.532','2004-05-22 16:27:12.532');
 INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,62,false,NULL,0,0.0E0,'Dudley','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
+INSERT INTO SECURITY_PRINCIPAL VALUES(2,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/manager','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
+INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
+INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/tomcat','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
+INSERT INTO SECURITY_PRINCIPAL VALUES(5,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/jetspeed','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
+INSERT INTO SECURITY_PRINCIPAL VALUES(6,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl','/role/admin','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
+INSERT INTO SECURITY_PRINCIPAL VALUES(7,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl','/role/manager','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
+INSERT INTO SECURITY_PRINCIPAL VALUES(8,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl','/role/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
+INSERT INTO SECURITY_CREDENTIAL VALUES(1,1,'admin',0,null,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
+INSERT INTO SECURITY_CREDENTIAL VALUES(2,2,'manager',0,null,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
+INSERT INTO SECURITY_CREDENTIAL VALUES(3,3,'user',0,null,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
+INSERT INTO SECURITY_CREDENTIAL VALUES(4,4,'tomcat',0,null,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
+INSERT INTO SECURITY_CREDENTIAL VALUES(5,5,'jetspeed',0,null,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
+INSERT INTO SECURITY_USER_ROLE VALUES(1,6);
+INSERT INTO SECURITY_USER_ROLE VALUES(1,7);
+INSERT INTO SECURITY_USER_ROLE VALUES(1,8);
+INSERT INTO SECURITY_USER_ROLE VALUES(2,7);
+INSERT INTO SECURITY_USER_ROLE VALUES(2,8);
+INSERT INTO SECURITY_USER_ROLE VALUES(3,8);
Index: src/sql/oracle/populate-userinfo-for-default-psml.sql
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/src/sql/oracle/populate-userinfo-for-default-psml.sql,v
retrieving revision 1.1
diff -u -r1.1 populate-userinfo-for-default-psml.sql
--- src/sql/oracle/populate-userinfo-for-default-psml.sql	23 May 2004 20:53:18 -0000	1.1
+++ src/sql/oracle/populate-userinfo-for-default-psml.sql	24 May 2004 01:18:16 -0000
@@ -7,3 +7,21 @@
 INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,61,0,NULL,0,0.0E0,'Test Dude',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
 INSERT INTO PREFS_PROPERTY_KEY VALUES(62,'user.name.family',3,to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
 INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,62,0,NULL,0,0.0E0,'Dudley',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_PRINCIPAL VALUES(2,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/manager',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/user',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/tomcat',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_PRINCIPAL VALUES(5,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl','/user/jetspeed',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_PRINCIPAL VALUES(6,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl','/role/admin',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_PRINCIPAL VALUES(7,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl','/role/manager',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_PRINCIPAL VALUES(8,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl','/role/user',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_CREDENTIAL VALUES(1,1,'admin',0,null,to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_CREDENTIAL VALUES(2,2,'manager',0,null,to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_CREDENTIAL VALUES(3,3,'user',0,null,to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_CREDENTIAL VALUES(4,4,'tomcat',0,null,to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_CREDENTIAL VALUES(5,5,'jetspeed',0,null,to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO SECURITY_USER_ROLE VALUES(1,6);
+INSERT INTO SECURITY_USER_ROLE VALUES(1,7);
+INSERT INTO SECURITY_USER_ROLE VALUES(1,8);
+INSERT INTO SECURITY_USER_ROLE VALUES(2,7);
+INSERT INTO SECURITY_USER_ROLE VALUES(2,8);
+INSERT INTO SECURITY_USER_ROLE VALUES(3,8);