Author: woonsan
Date: Fri Mar 19 19:30:06 2010
New Revision: 925391

URL: http://svn.apache.org/viewvc?rev=925391&view=rev
Log:
JS2-1135: Adding the default spaceAdminRoles pref.

Modified:
    
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpaceAdminUtils.java
    
portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml

Modified: 
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpaceAdminUtils.java
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpaceAdminUtils.java?rev=925391&r1=925390&r2=925391&view=diff
==============================================================================
--- 
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpaceAdminUtils.java
 (original)
+++ 
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpaceAdminUtils.java
 Fri Mar 19 19:30:06 2010
@@ -53,7 +53,7 @@ public class SpaceAdminUtils
     {
         String spaceAdminRolesPref = 
request.getPreferences().getValue(SPACE_ADMIN_ROLES_PARAM_NAME, null);
         
-        if (spaceAdminRolesPref != null)
+        if (!StringUtils.isBlank(spaceAdminRolesPref))
         {
             String [] spaceAdminRoles = StringUtils.split(spaceAdminRolesPref, 
", \t\r\n");
             

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=925391&r1=925390&r2=925391&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
 Fri Mar 19 19:30:06 2010
@@ -2371,6 +2371,11 @@
         <name>spaceTemplate</name>
         <value>/_template/space/</value>
       </preference>
+      <!-- If the following pref is blank, then the default admin role and 
admin user is used. -->
+      <preference>
+        <name>spaceAdminRoles</name>
+        <value></value>
+      </preference>
        </portlet-preferences>        
   </portlet>
  
@@ -2405,6 +2410,11 @@
         <name>spaceEditPath</name>
         <value>/spaces.psml</value>
       </preference>
+      <!-- If the following pref is blank, then the default admin role and 
admin user is used. -->
+      <preference>
+        <name>spaceAdminRoles</name>
+        <value></value>
+      </preference>
        </portlet-preferences>    
   </portlet>
 
@@ -2444,6 +2454,11 @@
           /_template/new-user/default-page.psml
         </value>
       </preference>
+      <!-- If the following pref is blank, then the default admin role and 
admin user is used. -->
+      <preference>
+        <name>spaceAdminRoles</name>
+        <value></value>
+      </preference>
     </portlet-preferences>
   </portlet>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to