Author: chris.laprun(a)jboss.com
Date: 2007-07-01 21:25:13 -0400 (Sun, 01 Jul 2007)
New Revision: 7659
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java
Log:
- JBPORTAL-1391: obsolete (line causing the exception has changed), however it was
probably caused due to a null portletApp.
- JBPORTAL-1394: Do not attempt to close the valve if the container didn't properly
start.
- JBPORTAL-1516: renamed 'Edit page' to 'Configure dashboard'.
- JBPORTAL-1518: Updated theme section to look similar to the other sections.
- JBPORTAL-1510: do not underline portlet-mode links on hover...
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-06-30
01:05:22 UTC (rev 7658)
+++
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-07-02
01:25:13 UTC (rev 7659)
@@ -608,6 +608,10 @@
padding-left: 3px;
}
+.portlet-mode-maximized:hover {
+ text-decoration: none;
+}
+
.portlet-mode-minimized {
background-image: url( images/ico_16_minimize.gif );
background-repeat: no-repeat;
@@ -619,6 +623,10 @@
padding-left: 3px;
}
+.portlet-mode-minimized:hover {
+ text-decoration: none;
+}
+
.portlet-mode-normal {
background-image: url( images/ico_16_normal.gif );
width: 16px;
@@ -630,6 +638,10 @@
padding-left: 3px;
}
+.portlet-mode-normal:hover {
+ text-decoration: none;
+}
+
.portlet-mode-help {
background-image: url( images/ico_16_help.gif );
width: 16px;
@@ -641,6 +653,10 @@
padding-left: 3px;
}
+.portlet-mode-help:hover {
+ text-decoration: none;
+}
+
.portlet-mode-edit {
background-image: url( images/ico_edit.gif );
background-repeat: no-repeat;
@@ -652,6 +668,10 @@
padding-left: 3px;
}
+.portlet-mode-edit:hover {
+ text-decoration: none;
+}
+
.portlet-mode-remove {
background-image: url( images/ico_16_remove.gif );
background-repeat: no-repeat;
@@ -663,6 +683,10 @@
padding-left: 3px;
}
+.portlet-mode-remove:hover {
+ text-decoration: none;
+}
+
.portlet-mode-view {
background-image: url( images/ico_cancel.gif );
background-repeat: no-repeat;
@@ -675,6 +699,10 @@
padding-right: 20px;
}
+.portlet-mode-view:hover {
+ text-decoration: none;
+}
+
.portlet-mode-reload {
background-image: url( images/ico_16_reload.gif );
background-repeat: no-repeat;
@@ -686,6 +714,10 @@
padding-left: 3px;
}
+.portlet-mode-reload:hover {
+ text-decoration: none;
+}
+
.portlet-mode-hide {
background-image: url( images/ico_16_swizzleclosed.gif );
background-repeat: no-repeat;
@@ -696,6 +728,10 @@
cursor: pointer;
}
+.portlet-mode-hide:hover {
+ text-decoration: none;
+}
+
/**********************
* Copyright Selectors *
***********************/
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-06-30
01:05:22 UTC (rev 7658)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-07-02
01:25:13 UTC (rev 7659)
@@ -1,5 +1,5 @@
+<%@ page import="org.jboss.portal.api.PortalURL" %>
<%@ page import="org.jboss.portal.identity.User" %>
-<%@ page import="org.jboss.portal.api.PortalURL" %>
<%
User user = (User)request.getAttribute("org.jboss.portal.header.USER");
@@ -16,39 +16,39 @@
if (user == null)
{
%>
- <a href="<%= loginURL %>">Login</a>
+<a href="<%= loginURL %>">Login</a>
<%
- }
- else
- {
+}
+else
+{
%>
Logged in as: <%= user.getUserName() %><br/><br/>
<%
- if (dashboardURL != null)
- {
+ if (dashboardURL != null)
+ {
%> <a href="<%= dashboardURL
%>">Dashboard</a> |<%
- }
+ }
- if (defaultPortalURL != null)
- {
+ if (defaultPortalURL != null)
+ {
%> <a href="<%= defaultPortalURL
%>">Portal</a> |<%
- }
+ }
- if (adminPortalURL != null)
- {
+ if (adminPortalURL != null)
+ {
%> <a href="<%= adminPortalURL
%>">Admin</a> |<%
- }
+ }
- if (editDashboardURL != null)
- {
-%> <a href="<%= editDashboardURL %>">Edit
page</a> |<%
- }
-
- if (copyToDashboardURL != null)
- {
+ if (editDashboardURL != null)
+ {
+%> <a href="<%= editDashboardURL
%>">Configure dashboard</a> |<%
+ }
+
+ if (copyToDashboardURL != null)
+ {
%> <a href="<%= copyToDashboardURL %>">Copy
to my dashboard</a> |<%
- }
+ }
%> <a href="<%= signOutURL
%>">Logout</a>
<%
}
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-06-30
01:05:22 UTC (rev 7658)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-07-02
01:25:13 UTC (rev 7659)
@@ -1,8 +1,8 @@
<div
-
xmlns="http://www.w3.org/1999/xhtml"
-
xmlns:f="http://java.sun.com/jsf/core"
-
xmlns:ui="http://java.sun.com/jsf/facelets"
-
xmlns:h="http://java.sun.com/jsf/html">
+
xmlns="http://www.w3.org/1999/xhtml"
+
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
+
xmlns:h="http://java.sun.com/jsf/html">
<ui:composition template="dashboardsTemplate.xhtml">
@@ -27,17 +27,22 @@
<!-- Separation -->
<br/>
- <h3>Dashboard theme properties:</h3>
- <p>The settings defined here will be applied to the dashboards including
all the pages and windows unless they have been assigned with different
settings</p>
- <ui:decorate template="common/editTheme.xhtml">
- <ui:param name="theme"
value="#{dashboardmgr.theme}"/>
- <ui:define name="form_submit">
- <h:commandButton value="Update"
actionListener="#{dashboardmgr.theme.execute}"
styleClass="portlet-form-button"/>
- </ui:define>
- </ui:decorate>
- </ui:define>
+ <div class="portlet-area-header">Dashboard theme
properties</div>
+ <div class="portlet-area-body">
+ The settings defined here will be applied to the dashboards including all the
pages and windows unless they
+ have been assigned with different settings.
+ <ui:decorate template="common/editTheme.xhtml">
+ <ui:param name="theme"
value="#{dashboardmgr.theme}"/>
+ <ui:define name="form_submit">
+ <h:commandButton value="Update"
actionListener="#{dashboardmgr.theme.execute}"
+ styleClass="portlet-form-button"/>
+ </ui:define>
+ </ui:decorate>
+ </div>
+ </ui:define>
+
</ui:composition>
</div>
Modified:
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2007-06-30
01:05:22 UTC (rev 7658)
+++
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2007-07-02
01:25:13 UTC (rev 7659)
@@ -22,18 +22,18 @@
******************************************************************************/
package org.jboss.portal.portlet.impl.container;
-import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory;
-import org.jboss.portal.portlet.impl.jsr168.spi.PortletInfoFactory;
+import org.jboss.portal.portlet.container.PortletApplicationContext;
+import org.jboss.portal.portlet.container.PortletApplicationRegistrationContext;
+import org.jboss.portal.portlet.container.PortletApplicationRegistry;
+import org.jboss.portal.portlet.container.PortletContainer;
import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl;
import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl;
import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
+import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory;
+import org.jboss.portal.portlet.impl.jsr168.spi.PortletInfoFactory;
import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
-import org.jboss.portal.portlet.container.PortletApplicationContext;
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
-import org.jboss.portal.portlet.container.PortletApplicationRegistrationContext;
-import org.jboss.portal.portlet.container.PortletContainer;
import javax.servlet.ServletContext;
import java.util.Iterator;
@@ -106,7 +106,7 @@
registrationContext = registry.registerPortletApplication(portletApp);
//
- for (Iterator i = portletAppMD.getPortlets().iterator();i.hasNext();)
+ for (Iterator i = portletAppMD.getPortlets().iterator(); i.hasNext();)
{
PortletMetaData portletMD = (PortletMetaData)i.next();
@@ -139,31 +139,35 @@
public void stopPortletApplication()
{
- for (Iterator i = portletApp.getPortletContainers().iterator();i.hasNext();)
+ // if the portlet application wasn't properly started, we shouldn't be
trying to stop it
+ if (portletApp != null)
{
- PortletContainerImpl container = (PortletContainerImpl)i.next();
- try
+ for (Iterator i = portletApp.getPortletContainers().iterator(); i.hasNext();)
{
- registrationContext.unregisterPortlet(container);
- container.stop();
+ PortletContainerImpl container = (PortletContainerImpl)i.next();
+ try
+ {
+ registrationContext.unregisterPortlet(container);
+ container.stop();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
+ //
+ portletApp.removeContainer(container);
+ container.setApplication(null);
}
- catch (Exception e)
- {
- e.printStackTrace();
- }
//
- portletApp.removeContainer(container);
- container.setApplication(null);
+ registry.unregisterPortletApplication(portletApp);
+ portletApp.stop();
+
+ //
+ portletApp = null;
+ registrationContext = null;
}
-
- //
- registry.unregisterPortletApplication(portletApp);
- portletApp.stop();
-
- //
- portletApp = null;
- registrationContext = null;
}
public void startPortletContainer(String portletName) throws Exception
Modified:
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2007-06-30
01:05:22 UTC (rev 7658)
+++
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2007-07-02
01:25:13 UTC (rev 7659)
@@ -23,47 +23,47 @@
package org.jboss.portal.portlet.impl.jsr168;
import org.jboss.logging.Logger;
+import org.jboss.portal.common.concurrent.Valve;
+import org.jboss.portal.common.i18n.ResourceBundleManager;
+import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor;
+import org.jboss.portal.portlet.container.PortletApplication;
+import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.PortletInitializationException;
+import org.jboss.portal.portlet.impl.jsr168.api.ActionRequestImpl;
+import org.jboss.portal.portlet.impl.jsr168.api.ActionResponseImpl;
import org.jboss.portal.portlet.impl.jsr168.api.PortletConfigImpl;
-import org.jboss.portal.portlet.impl.jsr168.api.ActionResponseImpl;
+import org.jboss.portal.portlet.impl.jsr168.api.RenderRequestImpl;
import org.jboss.portal.portlet.impl.jsr168.api.RenderResponseImpl;
-import org.jboss.portal.portlet.impl.jsr168.api.RenderRequestImpl;
-import org.jboss.portal.portlet.impl.jsr168.api.ActionRequestImpl;
-import org.jboss.portal.portlet.container.PortletInitializationException;
-import org.jboss.portal.portlet.container.PortletApplication;
-import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData;
import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
import org.jboss.portal.portlet.impl.jsr168.metadata.PortletPreferencesMetaData;
import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityRoleRefMetaData;
-import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData;
import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory;
-import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.invocation.RenderInvocation;
+import org.jboss.portal.portlet.invocation.response.ErrorResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.invocation.response.ErrorResponse;
import org.jboss.portal.portlet.invocation.response.SecurityErrorResponse;
import org.jboss.portal.portlet.invocation.response.UnavailableResponse;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.ActionInvocation;
-import org.jboss.portal.portlet.invocation.RenderInvocation;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor;
-import org.jboss.portal.common.concurrent.Valve;
-import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.common.i18n.ResourceBundleManager;
+import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
+import javax.portlet.Portlet;
import javax.portlet.PortletConfig;
-import javax.portlet.Portlet;
-import javax.portlet.PreferencesValidator;
import javax.portlet.PortletException;
import javax.portlet.PortletSecurityException;
+import javax.portlet.PreferencesValidator;
import javax.portlet.UnavailableException;
import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Collections;
-import java.io.IOException;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -271,20 +271,20 @@
public void stop()
{
- // Wait at most 60 seconds before all invocations are done
- log.debug("Trying to close the valve");
- boolean done = valve.closing(60000);
- if (!done)
+ // if the portlet is not started, we shouldn't be trying to stop it...
+ if (started)
{
- log.warn("The valve is still holding invocations, continue anyway");
- }
+ // Wait at most 60 seconds before all invocations are done
+ log.debug("Trying to close the valve");
+ boolean done = valve.closing(60000);
+ if (!done)
+ {
+ log.warn("The valve is still holding invocations, continue
anyway");
+ }
- //
- valve.closed();
+ //
+ valve.closed();
- //
- if (started)
- {
//
started = false;