[jboss-svn-commits] JBoss Portal SVN: r5141 - in trunk: core/src/main/org/jboss/portal/core/controller/command portlet portlet/src/main/org/jboss/portal/portlet/aspects/portlet

[jboss-svn-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2006-09-04 19:04:56 -0400 (Mon, 04 Sep 2006)
New Revision: 5141

Modified:
   trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java
   trunk/portlet/build.xml
   trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java
Log:
- JBPORTAL-1018 : Do not display edit mode when user is not logged in
- bundle jems jar with test-info.sar so it deploys correctly

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java	2006-09-04 21:16:38 UTC (rev 5140)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java	2006-09-04 23:04:56 UTC (rev 5141)
@@ -492,10 +492,10 @@
 
             // Remove edit mode if the user is not logged it
             // commenting out for now since it breaks the tests
-            /*if (renderCmd.getInvocation().getUserContext().getUser() == null)
+            if (renderCmd.getInvocation().getUserContext().getId() == null)
             {
                supportedModes.remove(Mode.EDIT);
-            }*/
+            }
 
             //
             addModeActions(actionMap, windowNavState.getMode(), supportedModes, invCtx);

Modified: trunk/portlet/build.xml
===================================================================
--- trunk/portlet/build.xml	2006-09-04 21:16:38 UTC (rev 5140)
+++ trunk/portlet/build.xml	2006-09-04 23:04:56 UTC (rev 5141)
@@ -294,6 +294,7 @@
       </jar>
       <jar jarfile="${build.lib}/test-info.sar">
          <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+         <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
          <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar,portal-server-test-lib.jar"/>
          <fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/>
          <fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java	2006-09-04 21:16:38 UTC (rev 5140)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java	2006-09-04 23:04:56 UTC (rev 5141)
@@ -27,7 +27,9 @@
 import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.invocation.PortletInterceptor;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.state.AccessMode;
 import org.jboss.portal.server.util.HTTPStreamInfo;
+import org.jboss.portal.Mode;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -86,11 +88,11 @@
 
       // If user is not logged in then remove the edit mode
       // commenting out for now since it breaks tests
-      /*AccessMode accessMode = invocation.getInstanceContext().getAccessMode();
-      if (accessMode == AccessMode.READ_ONLY)
-      {
-         modes.remove(Mode.EDIT);
-      }*/
+//      AccessMode accessMode = invocation.getInstanceContext().getAccessMode();
+//      if (accessMode == AccessMode.READ_ONLY)
+//      {
+//         modes.remove(Mode.EDIT);
+//      }
 
       //
       return modes;