Index: .classpath
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/.classpath,v
retrieving revision 1.36
diff -u -r1.36 .classpath
--- .classpath	21 May 2004 18:32:43 -0000	1.36
+++ .classpath	22 May 2004 16:06:21 -0000
@@ -3,11 +3,11 @@
 	<classpathentry excluding="**/CVS/*" kind="src" path="commons/src/java"/>
 	<classpathentry kind="src" path="jetspeed-api/src/java"/>
 	<classpathentry kind="src" path="components/locator/src/java"/>
-	<classpathentry kind="src" path="components/locator/src/test"/>
+	<classpathentry excluding="**/CVS/*|log4j.properties" kind="src" path="components/locator/src/test"/>
 	<classpathentry kind="src" path="components/file-cache/src/java"/>
-	<classpathentry kind="src" path="components/file-cache/src/test"/>
+	<classpathentry excluding="**/CVS/*|log4j.properties" kind="src" path="components/file-cache/src/test"/>
 	<classpathentry kind="src" path="components/id-generator/src/java"/>
-	<classpathentry kind="src" path="components/id-generator/src/test"/>
+	<classpathentry excluding="**/CVS/*|log4j.properties" kind="src" path="components/id-generator/src/test"/>
 	<classpathentry excluding="**/CVS/*" kind="src" path="struts-portlet/demo/src/java"/>
 	<classpathentry excluding="**/CVS/*" kind="src" path="struts-portlet/framework/src/java"/>
 	<classpathentry excluding="**/CVS/*" kind="src" path="struts-portlet/spi/src/java"/>
@@ -18,19 +18,19 @@
 	<classpathentry excluding="**/CVS*" kind="src" path="portal/src/test"/>
 	<classpathentry excluding="**/CVS*" kind="src" path="content-server/src/java"/>
 	<classpathentry excluding="**/CVS*" kind="src" path="components/cm/src/java"/>
-	<classpathentry excluding="**/CVS*" kind="src" path="components/cm/src/test"/>
+	<classpathentry excluding="**/CVS*|Log4j.properties" kind="src" path="components/cm/src/test"/>
 	<classpathentry excluding="**/CVS*" kind="src" path="components/jetspeed/src/java"/>
 	<classpathentry excluding="**/CVS*" kind="src" path="components/jetspeed/src/test"/>
 	<classpathentry excluding="**/CVS*" kind="src" path="components/persistence/src/java"/>
-	<classpathentry excluding="**/CVS*" kind="src" path="components/persistence/src/test"/>
+	<classpathentry excluding="**/CVS*|log4j.properties" kind="src" path="components/persistence/src/test"/>
 	<classpathentry excluding="**/CVS*" kind="src" path="components/rdbms/src/java"/>
-	<classpathentry excluding="**/CVS*" kind="src" path="components/rdbms/src/test"/>
+	<classpathentry excluding="**/CVS*|Log4j.properties" kind="src" path="components/rdbms/src/test"/>
 	<classpathentry excluding="**/CVS*" kind="src" path="components/registry/src/java"/>
-	<classpathentry excluding="**/CVS*" kind="src" path="components/registry/src/test"/>
+	<classpathentry excluding="**/CVS*|Log4j.properties" kind="src" path="components/registry/src/test"/>
 	<classpathentry kind="src" path="components/prefs/src/java"/>
-	<classpathentry kind="src" path="components/prefs/src/test"/>
+	<classpathentry excluding="**/CVS/*|Log4j.properties" kind="src" path="components/prefs/src/test"/>
 	<classpathentry excluding="**/CVS*" kind="src" path="components/security/src/java"/>
-	<classpathentry excluding="**/CVS*" kind="src" path="components/security/src/test"/>
+	<classpathentry excluding="**/CVS*|Log4j.properties" kind="src" path="components/security/src/test"/>
 	<classpathentry excluding="**/CVS/*" kind="src" path="portal/src/java"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="var" path="MAVEN_REPO/jdom/jars/jdom-b8.jar"/>
Index: applications/demo/src/webapp/WEB-INF/demo/security/roles.jsp
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/security/roles.jsp,v
retrieving revision 1.2
diff -u -r1.2 roles.jsp
--- applications/demo/src/webapp/WEB-INF/demo/security/roles.jsp	19 May 2004 02:11:09 -0000	1.2
+++ applications/demo/src/webapp/WEB-INF/demo/security/roles.jsp	22 May 2004 16:06:23 -0000
@@ -57,12 +57,12 @@
       	<td><%= request.isUserInRole("User") %></td>
     	</tr>
     </table>
+    <br><br>
+    <b>Portlet Request - User info:</b>
+    <br>Render request: <%= renderRequest.getAttribute(PortletRequest.USER_INFO) %>
+    <br>Request: <%= request.getAttribute(PortletRequest.USER_INFO) %>
   </c:otherwise>
 
 </c:choose>
-<br><br>
-<b>Portlet Request - User info:</b>
-<br>Render request: <%= renderRequest.getAttribute(PortletRequest.USER_INFO) %>
-<br>Request: <%= request.getAttribute(PortletRequest.USER_INFO) %>
 <br>
 For help on role configuration select the help icon.
Index: components/registry/src/java/META-INF/ojb_repository.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/registry/src/java/META-INF/ojb_repository.xml,v
retrieving revision 1.2
diff -u -r1.2 ojb_repository.xml
--- components/registry/src/java/META-INF/ojb_repository.xml	20 May 2004 23:25:18 -0000	1.2
+++ components/registry/src/java/META-INF/ojb_repository.xml	22 May 2004 16:06:27 -0000
@@ -1293,7 +1293,6 @@
   -->
      <class-descriptor
    	  class="org.apache.jetspeed.om.impl.SecurityRoleRefImpl"
-   	  proxy="dynamic"
    	  table="SECURITY_ROLE_REFERENCE"
    >
       
@@ -1384,7 +1383,6 @@
    -->                                                               
      <class-descriptor                                               
          class="org.apache.jetspeed.om.servlet.impl.SecurityRoleImpl"
-         proxy="dynamic"                                             
          table="SECURITY_ROLE"                                       
    >                                                                 
         <field-descriptor                                            
Index: portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java,v
retrieving revision 1.14
diff -u -r1.14 ServletRequestImpl.java
--- portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java	21 May 2004 20:54:54 -0000	1.14
+++ portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java	22 May 2004 16:06:34 -0000
@@ -215,12 +215,19 @@
                 if (null != portletAppDef)
                 {
                     // PortletApplicationDefinition portletAppDef = portletAppEntity.getPortletApplicationDefinition();
-                    value = context.getUserInfoMap(portletAppDef.getId()); 
-                    System.out.println("_____________HERE0: " + ((Map) value).size());
+                    value = context.getUserInfoMap(portletAppDef.getId());
+                    if ( value != null )
+                    {
+                        System.out.println("_____________HERE0: " + ((Map) value).size());
+                    }
+                    else
+                    {
+                        System.out.println("_____________HERE1: UserInfoMap NULL");
+                    }
                 }
                 else
                 {                    
-                    System.out.println("_____________HERE1: Entity is null!!!! " + entityID);
+                    System.out.println("_____________HERE2: Entity is null!!!! " + entityID);
                 }
                   
             }