You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2009/04/29 15:30:42 UTC

svn commit: r769782 - in /portals/jetspeed-2/applications/j2-admin/trunk/src: main/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java webapp/WEB-INF/portlet.xml

Author: vkumar
Date: Wed Apr 29 13:30:41 2009
New Revision: 769782

URL: http://svn.apache.org/viewvc?rev=769782&view=rev
Log:
Fixing broken Security Permissions portlet

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

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java?rev=769782&r1=769781&r2=769782&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java Wed Apr 29 13:30:41 2009
@@ -30,10 +30,7 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.headerresource.HeaderResource;
 import org.apache.jetspeed.portlets.dojo.AbstractAdminDojoVelocityPortlet;
 import org.apache.jetspeed.security.JetspeedPermission;
 import org.apache.jetspeed.security.JetspeedPrincipal;
@@ -43,6 +40,8 @@
 import org.apache.jetspeed.security.Role;
 import org.apache.jetspeed.security.RoleManager;
 import org.apache.velocity.context.Context;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Security Permissions Portlet
@@ -87,23 +86,7 @@
                 "Could not get instance of portal role manager component");        
     }
 
-    protected void includeHeaderContent( HeaderResource headerResource )
-    {
-        headerResource.dojoAddCoreLibraryRequire( "dojo.lang.*" );
-        headerResource.dojoAddCoreLibraryRequire( "dojo.event.*" );
-        headerResource.dojoAddCoreLibraryRequire( "dojo.io.*" );
-        headerResource.dojoAddCoreLibraryRequire( "dojo.widget.*" );
-        headerResource.dojoAddCoreLibraryRequire( "dojo.widget.LayoutContainer" );
-        headerResource.dojoAddCoreLibraryRequire( "dojo.widget.ContentPane" );
-        headerResource.dojoAddCoreLibraryRequire( "dojo.widget.SplitContainer" );
-        headerResource.dojoAddCoreLibraryRequire( "dojo.widget.TabContainer" );
-        headerResource.dojoAddCoreLibraryRequire( "dojo.widget.Checkbox" );
-        headerResource.dojoAddCoreLibraryRequire( "dojo.widget.Dialog" );
-        headerResource.dojoAddCoreLibraryRequire( "dojo.widget.Button" );
-        headerResource.dojoAddCoreLibraryRequire( "dojo.widget.Menu2" );
-        headerResource.dojoAddModuleLibraryRequire( "jetspeed.widget.EditorTable" );
-    }
-    
+   
     public void doView(RenderRequest request, RenderResponse response)
             throws PortletException, IOException
     {

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml?rev=769782&r1=769781&r2=769782&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml Wed Apr 29 13:30:41 2009
@@ -661,8 +661,8 @@
     <display-name xml:lang="ja">セキュリティパーミッションポリシー</display-name>
     <portlet-class>org.apache.jetspeed.portlets.security.permissions.SecurityPermissionsPortlet</portlet-class>
     <init-param>
-      <name>dojo.js.relative.url</name>
-      <value>/javascript/dojo/dojo.js</value>
+      <name>dojo.requires.core</name>
+      <value>dojo.lang.*;dojo.event.*;dojo.io.*;dojo.widget.*;dojo.widget.LayoutContainer;dojo.widget.ContentPane;dojo.widget.SplitContainer;dojo.widget.TabContainer;dojo.widget.Checkbox;dojo.widget.Dialog;dojo.widget.Button;dojo.widget.Menu2;jetspeed.widget.EditorTable</value>
     </init-param>
     <init-param>
         <name>ViewPage</name>



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