portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r776464 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java webapp/WEB-INF/portlet.xml webapp/WEB-INF/view/info/welcome.html
Date Tue, 19 May 2009 21:20:26 GMT
Author: taylor
Date: Tue May 19 21:20:25 2009
New Revision: 776464

URL: http://svn.apache.org/viewvc?rev=776464&view=rev
Log:
testing for min deployment, came across bugs

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/info/welcome.html

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java?rev=776464&r1=776463&r2=776464&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/JetspeedPrincipalManagementPortlet.java
Tue May 19 21:20:25 2009
@@ -109,6 +109,7 @@
     
     public static final String DEFAULT_SUBSITE = "defaultSubsite";
     public static final String DEFAULT_ROLE = "defaultRole";
+    public static final String REQUIRED_ROLE = "requiredRole";
     public static final String DEFAULT_PROFILE = "defaultProfile";
     public static final String NEW_USER_TEMPLATE_DIR = "newUserTemplateDirectory";
     public static final String SUB_SITE_ROOT = "subsiteRootFolder";
@@ -671,6 +672,7 @@
             PortletPreferences preferences = ((AbstractAdminWebApplication)getApplication()).getPortletRequest().getPreferences();
             
             final String defaultRole = preferences.getValue(DEFAULT_ROLE ,"");
+            final String requiredRole = preferences.getValue(REQUIRED_ROLE, "");
             final String defaultProfile = preferences.getValue(DEFAULT_PROFILE ,"");
             final String defaultSubsite = preferences.getValue(DEFAULT_SUBSITE ,"");
             final String templateFolder = preferences.getValue(NEW_USER_TEMPLATE_DIR, "/_user/template/");
@@ -713,6 +715,10 @@
                         {
                             roleManager.addRoleToUser(getUserName(), defaultRole);
                         }
+                        if(!StringUtils.isEmpty(requiredRole))
+                        {
+                            roleManager.addRoleToUser(getUserName(), requiredRole);
+                        }
                        
                         if (!StringUtils.isEmpty(getProfilingRule()))
                         {

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=776464&r1=776463&r2=776464&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml Tue
May 19 21:20:25 2009
@@ -1689,15 +1689,15 @@
       </preference>
       <preference>
         <name>defaultProfile</name>
-        <value>j2</value>
+        <value>user-role-fallback</value>
       </preference>
       <preference>
         <name>newUserTemplateDirectory</name>
-        <value></value>
+        <value>/_user/template-dev/</value>
       </preference>
       <preference>
         <name>requiredRole</name>
-        <value></value>
+        <value>dev</value>
       </preference>
       <preference>
         <name>subsiteRootFolder</name>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/info/welcome.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/info/welcome.html?rev=776464&r1=776463&r2=776464&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/info/welcome.html
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/info/welcome.html
Tue May 19 21:20:25 2009
@@ -45,7 +45,7 @@
 <li>Scaleable, Component Architecture featuring multi-threading</li>
 </ul>
 </p>			
-<p>For a full list of Jetspeed features, see: <a href="http://portals.apache.org/jetspeed-2/features.html">features</a></p>
+<p>For a full list of Jetspeed features, see: <a href="http://portals.apache.org/jetspeed-2/features.html">Jetspeed
Feature List</a></p>
 <p>
 To find out more about the latest Jetspeed news, check out our websites...
 </p>
@@ -58,7 +58,7 @@
 <li><a href="http://www.apache.org/" target='_blank'>Apache Software Foundation</a></li>
 <li><a href='http://portals.apache.org/jetspeed-2/tutorial/index.html' target='_blank'>Jetspeed
Tutorial</a></li>
 </ul>
-<h3>Logging on</h3>
+<h2>Logging on</h2>
 <p>If you installed with the <b>Minimal</b> installer, two test accounts
are available:</p>
 <table>
 <tr>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message