JBoss Portal SVN: r7116 - tags.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-27 11:23:33 -0400 (Fri, 27 Apr 2007)
New Revision: 7116
Added:
tags/JBoss_Portal_2_6_0_CR2/
Log:
2.6CR2
Copied: tags/JBoss_Portal_2_6_0_CR2 (from rev 7115, trunk)
19 years
JBoss Portal SVN: r7115 - trunk/server/src/main/org/jboss/portal/server.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-27 11:22:05 -0400 (Fri, 27 Apr 2007)
New Revision: 7115
Modified:
trunk/server/src/main/org/jboss/portal/server/PortalConstants.java
Log:
CR2 programmatic version
Modified: trunk/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-04-27 15:21:36 UTC (rev 7114)
+++ trunk/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-04-27 15:22:05 UTC (rev 7115)
@@ -35,7 +35,7 @@
public class PortalConstants
{
/** Current version. */
- public static Version VERSION = new Version("JBoss Portal", 2, 6, 0, new Version.Qualifier(Version.Qualifier.Prefix.CR, "1"), "Ninja");
+ public static Version VERSION = new Version("JBoss Portal", 2, 6, 0, new Version.Qualifier(Version.Qualifier.Prefix.CR, "2"), "Ninja");
/** The default portal name. */
public static String DEFAULT_PORTAL_NAME = "default";
19 years
JBoss Portal SVN: r7114 - trunk/build.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-27 11:21:36 -0400 (Fri, 27 Apr 2007)
New Revision: 7114
Modified:
trunk/build/distrib.xml
Log:
CR2 output dir in distrib.xml
Modified: trunk/build/distrib.xml
===================================================================
--- trunk/build/distrib.xml 2007-04-27 15:15:44 UTC (rev 7113)
+++ trunk/build/distrib.xml 2007-04-27 15:21:36 UTC (rev 7114)
@@ -1,7 +1,7 @@
<project default="main" name="JBoss Portal">
<property name="source.dir" value="../../jboss-portal-2.6"/>
- <property name="release.version" value="2.6-CR1"/>
+ <property name="release.version" value="2.6-CR2"/>
<!-- -->
<property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
19 years
JBoss Portal SVN: r7113 - trunk/core/src/resources/portal-core-sar/conf/hibernate/instance.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-27 11:15:44 -0400 (Fri, 27 Apr 2007)
New Revision: 7113
Modified:
trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml
Log:
suggestion from Adam for mysql5 prb with key lengths
Modified: trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml 2007-04-27 14:53:40 UTC (rev 7112)
+++ trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml 2007-04-27 15:15:44 UTC (rev 7113)
@@ -115,7 +115,7 @@
name="customizationId"
column="USER_ID"
not-null="true"
- length="170"/>
+ length="160"/>
<property
name="portletRef"
column="PORTLET_REF"
19 years
JBoss Portal SVN: r7112 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-27 10:53:40 -0400 (Fri, 27 Apr 2007)
New Revision: 7112
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
Log:
minor
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-04-27 14:39:56 UTC (rev 7111)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-04-27 14:53:40 UTC (rev 7112)
@@ -134,8 +134,8 @@
</td>
</tr>
<tr>
- <td colspan="2" align="center">
- <div style="margin-top:3em;">
+ <td colspan="2">
+ <div style="margin:3em;">
<jbp:portlet
portletId="#{pageManager.selectedEditorPortletId}"
portletInvoker="#{pageManager.portletInvoker}"
19 years
JBoss Portal SVN: r7111 - trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/admin.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-27 10:39:56 -0400 (Fri, 27 Apr 2007)
New Revision: 7111
Modified:
trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSContentEditorPortlet.java
Log:
Oups
Modified: trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSContentEditorPortlet.java
===================================================================
--- trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSContentEditorPortlet.java 2007-04-27 14:34:59 UTC (rev 7110)
+++ trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSContentEditorPortlet.java 2007-04-27 14:39:56 UTC (rev 7111)
@@ -112,7 +112,7 @@
if (content == null)
{
- getContentCMD = cmsService.getCommandFactory().createFileGetCommand(contentUri, new Locale(cmsService.getDefaultLocale()));
+ getContentCMD = cmsService.getCommandFactory().createContentGetCommand(contentUri, null, new Locale(cmsService.getDefaultLocale()));
content = (Content)cmsService.execute(getContentCMD);
}
req.setAttribute("content" , content);
19 years
JBoss Portal SVN: r7110 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsf/wizard and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-27 10:34:59 -0400 (Fri, 27 Apr 2007)
New Revision: 7110
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml
Log:
Fixed Wizard bug (portals list was empty)
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2007-04-27 14:32:26 UTC (rev 7109)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2007-04-27 14:34:59 UTC (rev 7110)
@@ -187,6 +187,13 @@
return portalObjectContainer.getObject(id);
}
+ public List getPortals()
+ {
+ PortalObject root = portalObjectContainer.getRootObject();
+ return new ArrayList(root.getChildren(PortalObject.PORTAL_MASK));
+ }
+
+
public List getPages()
{
if (selectedParentPageId != null)
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2007-04-27 14:32:26 UTC (rev 7109)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2007-04-27 14:34:59 UTC (rev 7110)
@@ -16,7 +16,7 @@
</tbody>
<tbody>
<h:form>
- <c:forEach items="#{portalobjectmgr.selectedObject.portals}" var="object" varStatus="status">
+ <c:forEach items="#{newWindowWizard.portals}" var="object" varStatus="status">
<tr
class="#{object.id == newWindowWizard.selectedPortalId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
<td>
19 years
JBoss Portal SVN: r7109 - trunk/core/src/main/org/jboss/portal/core/model/portal/navstate.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-27 10:32:26 -0400 (Fri, 27 Apr 2007)
New Revision: 7109
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java
Log:
- WindowNS serialiable
Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java 2007-04-27 14:25:24 UTC (rev 7108)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java 2007-04-27 14:32:26 UTC (rev 7109)
@@ -28,11 +28,13 @@
import org.jboss.portal.core.navstate.NavigationalStateKey;
import org.jboss.portal.portlet.StateString;
+import java.io.Serializable;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public final class WindowNavigationalState
+public final class WindowNavigationalState implements Serializable
{
/** . */
19 years
JBoss Portal SVN: r7108 - in trunk: core-admin/src/resources/portal-admin-war/WEB-INF and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-27 10:25:24 -0400 (Fri, 27 Apr 2007)
New Revision: 7108
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml
trunk/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java
Log:
- improved page layout editor layout
- use right stylesheet for the dashboard part that uses the page layout editor
Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java 2007-04-27 14:03:28 UTC (rev 7107)
+++ trunk/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java 2007-04-27 14:25:24 UTC (rev 7108)
@@ -81,9 +81,12 @@
// For now let the controller handle non fragment response
String content;
+ String header = "";
if (response instanceof FragmentResponse)
{
- content = ((FragmentResponse)response).getContent();
+ FragmentResponse fragment = (FragmentResponse)response;
+ content = fragment.getContent();
+ header = fragment.getHeader();
}
else if (response instanceof ErrorResponse)
{
@@ -110,7 +113,7 @@
windowProps.put(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER, "emptyRenderer");
//
- WindowResult res = new WindowResult("", content, Collections.EMPTY_MAP, windowProps, null, WindowState.MAXIMIZED, Mode.VIEW);
+ WindowResult res = new WindowResult("", content, Collections.EMPTY_MAP, windowProps, header, WindowState.MAXIMIZED, Mode.VIEW);
WindowContext blah = new WindowContext("BILTO", "maximized", 0, res);
result.addWindowContext(blah);
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2007-04-27 14:03:28 UTC (rev 7107)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2007-04-27 14:25:24 UTC (rev 7108)
@@ -40,6 +40,9 @@
<transaction>
<trans-attribute>Required</trans-attribute>
</transaction>
+ <header-content>
+ <link rel="stylesheet" type="text/css" href="/style.css" title="" media="screen"/>
+ </header-content>
</portlet>
<!-- Service injected in the portlet context. -->
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-04-27 14:03:28 UTC (rev 7107)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-04-27 14:25:24 UTC (rev 7108)
@@ -11,24 +11,10 @@
<table>
<c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status">
<tbody>
- <c:choose>
- <c:when test="#{status.index > 0}">
- <tr>
- <td colspan="2" class="portlet-form-field-label"
- style="border-width:0px;border-top:1px dashed #d5d5d5">#{regionName}
- Region
- </td>
- </tr>
- </c:when>
- <c:otherwise>
- <tr>
- <td colspan="2" class="portlet-form-field-label">#{regionName}
- Region
- </td>
- </tr>
- </c:otherwise>
- </c:choose>
<tr>
+ <td colspan="2" class="portlet-form-field-label"><hr/> #{regionName} Region </td>
+ </tr>
+ <tr>
<td>
<div>
<h:commandButton
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-04-27 14:03:28 UTC (rev 7107)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-04-27 14:25:24 UTC (rev 7108)
@@ -114,9 +114,11 @@
<table>
<tr>
<td>
- <ui:include src="/WEB-INF/jsf/common/editPageLayout.xhtml">
- <ui:param name="pageManager" value="#{dashboard.pageManager}"/>
- </ui:include>
+ <div class="admin-ui">
+ <ui:include src="/WEB-INF/jsf/common/editPageLayout.xhtml">
+ <ui:param name="pageManager" value="#{dashboard.pageManager}"/>
+ </ui:include>
+ </div>
</td>
</tr>
</table>
19 years
JBoss Portal SVN: r7107 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-27 10:03:28 -0400 (Fri, 27 Apr 2007)
New Revision: 7107
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
Log:
improved page layout editor layout
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-04-27 13:39:35 UTC (rev 7106)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-04-27 14:03:28 UTC (rev 7107)
@@ -9,8 +9,7 @@
<div style="float:left; padding:0 2em 0 2em">
<h:form id="layoutForm">
<table>
- <c:forEach items="#{pageManager.regionNames}" var="regionName"
- varStatus="status">
+ <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status">
<tbody>
<c:choose>
<c:when test="#{status.index > 0}">
@@ -92,6 +91,10 @@
<div style="float:left">
<table class="form">
<tr>
+ <td colspan="2"><hr/>You can choose among several types of content to assign on the page:
+ </td>
+ </tr>
+ <tr>
<td class="label">
<span class="portlet-form-field-label">Content type:</span>
</td>
@@ -109,6 +112,10 @@
</td>
</tr>
<tr>
+ <td colspan="2"><hr/>You can enter a window name used during content selection (optional):
+ </td>
+ </tr>
+ <tr>
<td class="label">
<span class="portlet-form-field-label">Window Name:</span>
</td>
@@ -120,6 +127,10 @@
</td>
</tr>
<tr>
+ <td colspan="2"><hr/>The page region will contain the selected content:
+ </td>
+ </tr>
+ <tr>
<td class="label">
<span class="portlet-form-field-label">Target Region:</span>
</td>
@@ -133,9 +144,11 @@
</td>
</tr>
<tr>
- <td class="label">
+ <td colspan="2"><hr/>Select content that will be added to the page:
</td>
- <td class="widget">
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
<div style="margin-top:3em;">
<jbp:portlet
portletId="#{pageManager.selectedEditorPortletId}"
19 years