From portal-commits at lists.jboss.org Mon Mar 19 10:54:27 2007
Content-Type: multipart/mixed; boundary="===============0179132753139801499=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r6746 - in trunk/core-admin/src:
 resources/portal-admin-war/WEB-INF/jsf and 1 other directory.
Date: Mon, 19 Mar 2007 10:54:27 -0400
Message-ID: <E1HTJFj-0001LH-Kv@committer01.frg.pub.inap.atl.jboss.com>

--===============0179132753139801499==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: thomas.heute(a)jboss.com
Date: 2007-03-19 10:54:27 -0400 (Mon, 19 Mar 2007)
New Revision: 6746

Modified:
   trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManager=
Bean.java
   trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecu=
rity.xhtml
   trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSe=
curity.xhtml
   trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xh=
tml
Log:
- Add submit and cancel buttons on instances security
- Make cancel buttons work on security pages
- Let the admin modify the Personalize security flag on instances

Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Instance=
ManagerBean.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManage=
rBean.java	2007-03-19 13:16:17 UTC (rev 6745)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManage=
rBean.java	2007-03-19 14:54:27 UTC (rev 6746)
@@ -24,31 +24,29 @@
 =

 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Comparator;
-import java.util.Collections;
 import java.util.Set;
 =

+import javax.faces.application.FacesMessage;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
-import javax.faces.application.FacesMessage;
 =

-import org.jboss.logging.Logger;
+import org.jboss.portal.common.value.Value;
 import org.jboss.portal.core.model.instance.Instance;
 import org.jboss.portal.core.model.instance.InstanceContainer;
 import org.jboss.portal.core.model.instance.NoSuchInstanceException;
 import org.jboss.portal.identity.RoleModule;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.info.PreferencesInfo;
 import org.jboss.portal.portlet.info.PreferenceInfo;
-import org.jboss.portal.portlet.state.PropertyMap;
+import org.jboss.portal.portlet.info.PreferencesInfo;
 import org.jboss.portal.portlet.state.PropertyChange;
-import org.jboss.portal.security.AuthorizationDomainRegistry;
+import org.jboss.portal.portlet.state.PropertyMap;
 import org.jboss.portal.security.spi.provider.DomainConfigurator;
-import org.jboss.portal.common.value.Value;
 =

 /**
  * @author <a href=3D"mailto:julien(a)jboss.org">Julien Viet</a>
@@ -58,9 +56,6 @@
 public class InstanceManagerBean
 {
 =

-   /** . */
-   private Logger log =3D Logger.getLogger(getClass());
-
    // Wired services
 =

    /** . */
@@ -410,7 +405,8 @@
       public SelectItem[] getAvailableActions()
       {
          return new SelectItem[]{
-            new SelectItem("view")
+            new SelectItem("view", "View"),
+            new SelectItem("personalize", "Personalize"),
          };
       }
    }

Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editP=
ageSecurity.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSec=
urity.xhtml	2007-03-19 13:16:17 UTC (rev 6745)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSec=
urity.xhtml	2007-03-19 14:54:27 UTC (rev 6746)
@@ -11,7 +11,7 @@
             <ui:define name=3D"form_submit">
                <h:form>
                   <h:commandButton value=3D"Update" action=3D"#{auth.execu=
te}" styleClass=3D"portlet-form-button"/>
-                  <h:commandButton value=3D"Cancel" action=3D"#{portalobje=
ctmgr.selectObject}" styleClass=3D"portlet-form-button">
+                  <h:commandButton value=3D"Cancel" action=3D"#{portalobje=
ctmgr.selectObject}" styleClass=3D"portlet-form-button" immediate=3D"true">
                      <f:param name=3D"id" value=3D"#{node.id}"/>
                   </h:commandButton>
                </h:form>

Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editP=
ortalSecurity.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalS=
ecurity.xhtml	2007-03-19 13:16:17 UTC (rev 6745)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalS=
ecurity.xhtml	2007-03-19 14:54:27 UTC (rev 6746)
@@ -12,7 +12,7 @@
             <ui:define name=3D"form_submit">
                <h:form>
                   <h:commandButton value=3D"Update" action=3D"#{auth.execu=
te}" styleClass=3D"portlet-form-button"/>
-                  <h:commandButton value=3D"Cancel" action=3D"#{portalobje=
ctmgr.selectObject}" styleClass=3D"portlet-form-button">
+                  <h:commandButton value=3D"Cancel" action=3D"#{portalobje=
ctmgr.selectObject}" styleClass=3D"portlet-form-button" immediate=3D"true">
                      <f:param name=3D"id" value=3D"#{node.id}"/>
                   </h:commandButton>
                </h:form>

Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/insta=
nces.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.x=
html	2007-03-19 13:16:17 UTC (rev 6745)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.x=
html	2007-03-19 14:54:27 UTC (rev 6746)
@@ -101,9 +101,16 @@
 =

          <c:if test=3D"#{instancemgr.selectedPlugin =3D=3D 'security'}">
             <h3>Editing security of #{instancemgr.selectedInstance.id}: </=
h3>
-            <ui:include src=3D"common/editSecurity.xhtml">
-               <ui:param name=3D"auth" value=3D"#{instancemgr.auth}"/>
-            </ui:include>
+            =

+            <ui:decorate template=3D"/WEB-INF/jsf/common/editSecurity.xhtm=
l">
+              <ui:param name=3D"auth" value=3D"#{instancemgr.auth}"/>
+              <ui:define name=3D"form_submit">
+                <h:form>
+                  <h:commandButton value=3D"Update" action=3D"#{auth.execu=
te}" styleClass=3D"portlet-form-button"/>
+                  <h:commandButton value=3D"Cancel" action=3D"instances" s=
tyleClass=3D"portlet-form-button" immediate=3D"true"/>
+                </h:form>
+              </ui:define>
+            </ui:decorate>
          </c:if>
 =

       </c:if>


--===============0179132753139801499==--