[portal-commits] JBoss Portal SVN: r10793 - in branches/JBoss_Portal_Branch_2_7: core-samples/src/resources/portal-basic-samples-war/WEB-INF and 1 other directories.
Author: thomas.heute(a)jboss.com
Date: 2008-05-22 08:56:37 -0400 (Thu, 22 May 2008)
New Revision: 10793
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java
Log:
- Fixed 2.0 sample portlets
- Removed 2 out of 3 google map windows
(Google map window requires a portlet module upgrade to work)
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-05-21
14:11:59 UTC (rev 10792)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-05-22
12:56:37 UTC (rev 10793)
@@ -134,7 +134,10 @@
if (oldNS == null)
{
PortalObjectId id = (PortalObjectId)wantedKey.getId();
- oldNS = (WindowNavigationalState)store.getAttribute(id.toString());
+ if (store.getAttribute(id.toString()) instanceof WindowNavigationalState)
+ {
+ oldNS = (WindowNavigationalState)store.getAttribute(id.toString());
+ }
}
//
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-05-21
14:11:59 UTC (rev 10792)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-05-22
12:56:37 UTC (rev 10793)
@@ -143,6 +143,10 @@
<security-role-ref>
<role-name>Authenticated</role-name>
</security-role-ref>
+ <supported-publishing-event>
+ <qname xmlns:jbp="urn:jboss:portal">jbp:signOut</qname>
+ </supported-publishing-event>
+
</portlet>
<portlet>
<description>Portlet displaying the number of it's action/render
calls</description>
@@ -467,4 +471,10 @@
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint>
</security-constraint>
+
+ <event-definition>
+ <qname xmlns:jbp="urn:jboss:portal">jbp:signOut</qname>
+ <value-type>java.lang.String</value-type>
+ </event-definition>
+
</portlet-app>
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml 2008-05-21
14:11:59 UTC (rev 10792)
+++
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml 2008-05-22
12:56:37 UTC (rev 10793)
@@ -61,25 +61,8 @@
<region>center</region>
<height>1</height>
</window>
+
<window>
- <window-name>GoogleWeatherPortletWindow1</window-name>
- <instance-ref>GoogleWeatherPortletInstance</instance-ref>
- <region>center</region>
- <height>2</height>
- </window>
- <window>
- <window-name>GoogleWeatherPortletWindow2</window-name>
- <instance-ref>GoogleWeatherPortletInstance</instance-ref>
- <region>center</region>
- <height>3</height>
- </window>
- <window>
- <window-name>GoogleWeatherPortletWindow3</window-name>
- <instance-ref>GoogleWeatherPortletInstance</instance-ref>
- <region>center</region>
- <height>4</height>
- </window>
- <window>
<window-name>ShoppingCatalogPortletWindow</window-name>
<instance-ref>ShoppingCatalogPortletInstance</instance-ref>
<region>center</region>