[jboss-cvs] jboss-portal/core/src/resources/portal-samples-war/WEB-INF ...
Julien Viet
julien at jboss.com
Thu Aug 3 13:06:47 EDT 2006
User: julien
Date: 06/08/03 13:06:47
Modified: core/src/resources/portal-samples-war/WEB-INF
default-object.xml portlet-instances.xml
portlet.xml
Log:
- make an instance creation faillure not prevent the creational of other instances
- removed theme portlet as it changes the theme globally and is rather confusing as we have the new feature of having per user theme configuration in the profile
Revision Changes Path
1.13 +0 -136 jboss-portal/core/src/resources/portal-samples-war/WEB-INF/default-object.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: default-object.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/resources/portal-samples-war/WEB-INF/default-object.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- default-object.xml 21 Jul 2006 10:02:12 -0000 1.12
+++ default-object.xml 3 Aug 2006 17:06:47 -0000 1.13
@@ -54,12 +54,6 @@
<region>left</region>
<height>1</height>
</window>
- <window>
- <window-name>ThemeSelectorWindow</window-name>
- <instance-ref>ThemeSelectorInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- </window>
<page>
<page-name>event test</page-name>
<window>
@@ -420,136 +414,6 @@
<height>0</height>
</window>
</page>
- <page>
- <page-name>theme test</page-name>
- <properties>
- <!-- set a different (from the portal) property (properties) for this page -->
- <!--
- <property>
- <name>org.jboss.portal.property.layout</name>
- <value>some other layout from /WEB-INF/portal-layouts.xml</value>
- </property>
- <property>
- <name>org.jboss.portal.property.strategy</name>
- <value>some other strategy from /WEB-INF/layout/portal-strategies.xml</value>
- </property>
- <property>
- <name>org.jboss.portal.property.renderSet</name>
- <value>some other render set from /WEB-INF/layouts/portal-renderSet.xml</value>
- </property>
- <property>
- <name>org.jboss.portal.property.theme</name>
- <value>some other theme from /WEB-INF/portal-themes.xml</value>
- </property>
- -->
- </properties>
- <window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
- <window-name>CatalogPortletWindow</window-name>
- <instance-ref>CatalogPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>ThemeSelectorWindow</window-name>
- <instance-ref>ThemeSelectorInstance</instance-ref>
- <region>left</region>
- <height>1</height>
- </window>
- <window>
- <window-name>ContentRewriteWindow</window-name>
- <instance-ref>ContentRewriteInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- </window>
- <window>
- <window-name>HeaderContentWindow</window-name>
- <instance-ref>HeaderContentInstance</instance-ref>
- <region>left</region>
- <height>3</height>
- </window>
- <window>
- <window-name>HintPortletWindow</window-name>
- <instance-ref>HintPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- <properties>
- <!-- turn the decoration off for this portlet (i.e. no title and mode/state links) -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
- <window-name>WsrpSelectorTestWindow</window-name>
- <instance-ref>WsrpSelectorTestPortletInstance</instance-ref>
- <region>center</region>
- <height>1</height>
- </window>
- </page>
- <page>
- <page-name>theme selector</page-name>
- <window>
- <window-name>NavigationPortletWindow</window-name>
- <instance-ref>NavigationPortletInstance</instance-ref>
- <region>navigation</region>
- <height>0</height>
- <!-- keep portal and page properties for this window -->
- <properties>
- <!-- use the window renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.windowRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the decoration renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.decorationRendererId</name>
- <value>emptyRenderer</value>
- </property>
- <!-- use the portlet renderer from the emptyRenderer renderSet -->
- <property>
- <name>theme.portletRendererId</name>
- <value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
- <window-name>CatalogPortletWindow</window-name>
- <instance-ref>CatalogPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>ThemePortletWindow</window-name>
- <instance-ref>ThemePortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- </page>
</page>
</deployment>
</deployments>
1.6 +0 -62 jboss-portal/core/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: portlet-instances.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- portlet-instances.xml 12 Jul 2006 09:29:55 -0000 1.5
+++ portlet-instances.xml 3 Aug 2006 17:06:47 -0000 1.6
@@ -46,30 +46,6 @@
<portlet-ref>TestPortlet</portlet-ref>
</instance>
</deployment>
-<!--
- <deployment>
- <instance>
- <instance-id>PreferencesPortletInstance</instance-id>
- <portlet-ref>PreferencesPortlet</portlet-ref>
- <preferences>
- <preference>
- <name>one</name>
- <value>1.5</value>
- </preference>
- <preference>
- <name>two</name>
- <value>2.5</value>
- <read-only>true</read-only>
- </preference>
- <preference>
- <name>three</name>
- <value>3.5</value>
- <read-only>true</read-only>
- </preference>
- </preferences>
- </instance>
- </deployment>
--->
<deployment>
<instance>
<instance-id>PortletAInstance</instance-id>
@@ -82,26 +58,6 @@
<portlet-ref>PortletB</portlet-ref>
</instance>
</deployment>
-<!--
- <deployment>
- <instance>
- <instance-id>ThemePortletInstance</instance-id>
- <portlet-ref>ThemeManager</portlet-ref>
- </instance>
- </deployment>
--->
- <deployment>
- <instance>
- <instance-id>HeaderContentInstance</instance-id>
- <portlet-ref>HeaderContentPortlet</portlet-ref>
- </instance>
- </deployment>
- <deployment>
- <instance>
- <instance-id>ContentRewriteInstance</instance-id>
- <portlet-ref>ContentRewritePortlet</portlet-ref>
- </instance>
- </deployment>
<deployment>
<instance>
<instance-id>SecuredTestPortletInstance</instance-id>
@@ -110,12 +66,6 @@
</deployment>
<deployment>
<instance>
- <instance-id>HintPortletInstance</instance-id>
- <portlet-ref>HintPortlet</portlet-ref>
- </instance>
- </deployment>
- <deployment>
- <instance>
<instance-id>CharsetPortletInstance</instance-id>
<portlet-ref>CharsetPortlet</portlet-ref>
</instance>
@@ -156,16 +106,4 @@
<portlet-ref>EncodingPortlet</portlet-ref>
</instance>
</deployment>
- <deployment>
- <instance>
- <instance-id>WsrpSelectorTestPortletInstance</instance-id>
- <portlet-ref>WsrpSelectorTestPortlet</portlet-ref>
- </instance>
- </deployment>
- <deployment>
- <instance>
- <instance-id>ThemeSelectorPortletInstance</instance-id>
- <portlet-ref>ThemeSelectorPortlet</portlet-ref>
- </instance>
- </deployment>
</deployments>
\ No newline at end of file
1.17 +2 -119 jboss-portal/core/src/resources/portal-samples-war/WEB-INF/portlet.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: portlet.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/resources/portal-samples-war/WEB-INF/portlet.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- portlet.xml 12 Jul 2006 09:29:55 -0000 1.16
+++ portlet.xml 3 Aug 2006 17:06:47 -0000 1.17
@@ -103,40 +103,6 @@
<title>Portlet session portlet</title>
</portlet-info>
</portlet>
- <!--
- <portlet>
- <portlet-name>PreferencesPortlet</portlet-name>
- <portlet-class>org.jboss.portal.test.portlet.TestPortletPreferencesPortlet</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- </supports>
- <portlet-info>
- <title>Preferences</title>
- </portlet-info>
- <portlet-preferences>
- <preference>
- <name>one</name>
- <value>1</value>
- </preference>
- <preference>
- <name>two</name>
- <value>2</value>
- <read-only>false</read-only>
- </preference>
- <preference>
- <name>three</name>
- <value>3</value>
- <read-only>true</read-only>
- </preference>
- <preference>
- <name>all</name>
- <value>1</value>
- <value>2</value>
- <value>3</value>
- </preference>
- </portlet-preferences>
- </portlet>
- -->
<portlet>
<description>Portlet for demonstrating IPC</description>
<portlet-name>PortletA</portlet-name>
@@ -210,89 +176,6 @@
</portlet-info>
</portlet>
<portlet>
- <description>Header Content Portlet</description>
- <portlet-name>HeaderContentPortlet</portlet-name>
- <display-name>Header Content Portlet</display-name>
-
- <portlet-class>org.jboss.portal.core.portlet.plugins.HeaderContentPortlet</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <portlet-info>
- <title>Inject Header Content</title>
- </portlet-info>
- </portlet>
- <portlet>
- <description>Portlet demonstrating content rewrite</description>
- <portlet-name>ContentRewritePortlet</portlet-name>
- <display-name>Content Rewrite Portlet</display-name>
-
- <portlet-class>org.jboss.portal.core.portlet.plugins.ContentRewritePortlet</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <portlet-info>
- <title>Rewrite Portlet Content</title>
- </portlet-info>
- </portlet>
- <portlet>
- <description>Portlet providing hints</description>
- <portlet-name>HintPortlet</portlet-name>
- <display-name>Hint Portlet</display-name>
-
- <portlet-class>org.jboss.portal.core.portlet.plugins.HintPortlet</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <portlet-info>
- <title>Header Content Hint</title>
- </portlet-info>
- <portlet-preferences>
- <preference>
- <name>hint-title</name>
- <value>Please Note:</value>
- </preference>
- <preference>
- <name>hint-text</name>
- <value>In order for the portlets on this page to fully function, you need to pick a layout that contains the
- header content tag (p:headerContent).
- A good example is the 'industrial' layout. Also note that this portlet does not have a title bar
- (decoration)!</value>
- </preference>
- </portlet-preferences>
- </portlet>
- <portlet>
- <description>Portlet for testing WSRP selection</description>
- <portlet-name>WsrpSelectorTestPortlet</portlet-name>
- <display-name>WSRP Selector Test Portlet</display-name>
-
- <portlet-class>org.jboss.portal.core.portlet.theme.WsrpSelectorTestPortlet</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <portlet-info>
- <title>WSRP CSS Selectors</title>
- </portlet-info>
- </portlet>
- <portlet>
- <description>Porlet providing ability to select theme</description>
- <portlet-name>ThemeSelectorPortlet</portlet-name>
- <display-name>Theme Selector Portlet</display-name>
-
- <portlet-class>org.jboss.portal.core.portlet.theme.ThemeSelectorPortlet</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <portlet-info>
- <title>Select the Portal Theme</title>
- </portlet-info>
- </portlet>
- <portlet>
<description>Portlet providing weather forecast</description>
<portlet-name>WeatherPortlet</portlet-name>
<display-name>Weather Portlet</display-name>
@@ -373,9 +256,9 @@
</portlet-preferences>
</portlet>
<portlet>
- <description>Simple JSF portlet</description>
+ <description>Simple JSP portlet</description>
<portlet-name>JSPPortlet</portlet-name>
- <display-name>JSF Portlet</display-name>
+ <display-name>JSP Portlet</display-name>
<portlet-class>org.jboss.samples.portlet.jsp.JSPPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
More information about the jboss-cvs-commits
mailing list