JBoss Portal SVN: r7658 - branches/JBoss_Portal_Branch_2_6/build.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-29 21:05:22 -0400 (Fri, 29 Jun 2007)
New Revision: 7658
Modified:
branches/JBoss_Portal_Branch_2_6/build/build.xml
Log:
fix javadoc generation
Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-06-30 00:47:17 UTC (rev 7657)
+++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-06-30 01:05:22 UTC (rev 7658)
@@ -408,6 +408,12 @@
<packageset dir="../search/src/main">
<exclude name="org/jboss/portal/test/**"/>
</packageset>
+ <packageset dir="../core-samples/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../core-search/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
</javadoc>
</target>
16 years, 10 months
JBoss Portal SVN: r7657 - trunk/build.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-29 20:47:17 -0400 (Fri, 29 Jun 2007)
New Revision: 7657
Modified:
trunk/build/build.xml
Log:
fix javadoc generation
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-06-30 00:27:57 UTC (rev 7656)
+++ trunk/build/build.xml 2007-06-30 00:47:17 UTC (rev 7657)
@@ -408,6 +408,12 @@
<packageset dir="../search/src/main">
<exclude name="org/jboss/portal/test/**"/>
</packageset>
+ <packageset dir="../core-samples/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
+ <packageset dir="../core-search/src/main">
+ <exclude name="org/jboss/portal/test/**"/>
+ </packageset>
</javadoc>
</target>
16 years, 10 months
JBoss Portal SVN: r7655 - docs/branches.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-29 20:21:05 -0400 (Fri, 29 Jun 2007)
New Revision: 7655
Added:
docs/branches/JBoss_Portal_Branch_2_6/
Log:
2.6 branch
Copied: docs/branches/JBoss_Portal_Branch_2_6 (from rev 7654, docs/tags/JBoss_Portal_2_6_0)
16 years, 10 months
JBoss Portal SVN: r7654 - branches.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-29 20:20:03 -0400 (Fri, 29 Jun 2007)
New Revision: 7654
Added:
branches/JBoss_Portal_Branch_2_6/
Log:
2.6 branch
Copied: branches/JBoss_Portal_Branch_2_6 (from rev 7653, tags/JBoss_Portal_2_6_0)
16 years, 10 months
JBoss Portal SVN: r7653 - trunk/core/src/bin/portal-core-war/themes/renaissance.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-06-29 18:05:09 -0400 (Fri, 29 Jun 2007)
New Revision: 7653
Modified:
trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
Log:
- JBPORTAL-1510: do not underline portlet-mode links on hover...
Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-06-29 21:24:50 UTC (rev 7652)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-06-29 22:05:09 UTC (rev 7653)
@@ -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 *
***********************/
16 years, 10 months
JBoss Portal SVN: r7652 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-06-29 17:24:50 -0400 (Fri, 29 Jun 2007)
New Revision: 7652
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml
Log:
- JBPORTAL-1518: Updated theme section to look similar to the other sections.
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-06-29 21:00:54 UTC (rev 7651)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-06-29 21:24:50 UTC (rev 7652)
@@ -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>
16 years, 10 months
JBoss Portal SVN: r7651 - in docs/trunk/userGuide/en: modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-06-29 17:00:54 -0400 (Fri, 29 Jun 2007)
New Revision: 7651
Modified:
docs/trunk/userGuide/en/images/intro/dashboard.png
docs/trunk/userGuide/en/modules/intro.xml
Log:
- JBPORTAL-1516: updated documentation after rename.
Modified: docs/trunk/userGuide/en/images/intro/dashboard.png
===================================================================
(Binary files differ)
Modified: docs/trunk/userGuide/en/modules/intro.xml
===================================================================
--- docs/trunk/userGuide/en/modules/intro.xml 2007-06-29 21:00:27 UTC (rev 7650)
+++ docs/trunk/userGuide/en/modules/intro.xml 2007-06-29 21:00:54 UTC (rev 7651)
@@ -483,7 +483,7 @@
<sect1 id="dashboard">
<title>Personal Dashboard</title>
<para>Once logged in, all users/administrations of the portal can access a personal dashboard by clicking the
- <emphasis>Dashboard</emphasis> link at the top-right of the portal page.
+ <emphasis>Dashboard</emphasis> link at the top-right of the portal page. Note how the links changed.
<mediaobject>
<imageobject>
<imagedata fileref="images/intro/dashboard.png" format="png" align="center" valign="middle"/>
@@ -495,7 +495,7 @@
location, if the administrator allows this functionality. Changes made in this fashion will also be persisted.
</para>
<para>
- It is also possible to copy the content of a shared page to your dashboard so you can customize it to your
+ It is also possible to copy the content of a shared page to your dashboard so you can customize it to your
liking. Just click the <emphasis>'Copy to my dashboard'</emphasis> link at the top right of the page.
This will clone the page and add it to your personal dashboard as a page with the same name.
<mediaobject>
@@ -507,7 +507,7 @@
<sect2 id="dashboard_configure">
<title>Configuring your personal dashboard</title>
<para>
- You can configure your dashboard by using the top-right menu item labeled <emphasis>'Edit Page'</emphasis>:
+ You can configure your dashboard by using the top-right menu item labeled <emphasis>'Configure dashboard'</emphasis>:
<mediaobject>
<imageobject>
<imagedata fileref="images/intro/dashboard_configure.png" format="png" align="center"
16 years, 10 months
JBoss Portal SVN: r7650 - trunk/core/src/resources/portal-core-war/WEB-INF/jsp/header.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-06-29 17:00:27 -0400 (Fri, 29 Jun 2007)
New Revision: 7650
Modified:
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
Log:
- JBPORTAL-1516: renamed 'Edit page' to 'Configure dashboard'.
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-06-29 20:25:28 UTC (rev 7649)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-06-29 21:00:27 UTC (rev 7650)
@@ -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>
<%
}
16 years, 10 months
JBoss Portal SVN: r7649 - trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-06-29 16:25:28 -0400 (Fri, 29 Jun 2007)
New Revision: 7649
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java
Log:
- JBPORTAL-1394: Do not attempt to close the valve if the container didn't properly start.
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2007-06-29 20:23:10 UTC (rev 7648)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2007-06-29 20:25:28 UTC (rev 7649)
@@ -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;
16 years, 10 months
JBoss Portal SVN: r7648 - trunk/portlet/src/main/org/jboss/portal/portlet/impl/container.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-06-29 16:23:10 -0400 (Fri, 29 Jun 2007)
New Revision: 7648
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java
Log:
- JBPORTAL-1391: obsolete (line causing the exception has changed), however it was probably caused due to a null portletApp.
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2007-06-29 13:46:03 UTC (rev 7647)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2007-06-29 20:23:10 UTC (rev 7648)
@@ -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
16 years, 10 months