[jboss-cvs] jboss-portal/core/src/resources/portal-samples-war/WEB-INF ...
Chris Laprun
chris.laprun at jboss.com
Mon Aug 14 16:32:23 EDT 2006
User: claprun
Date: 06/08/14 16:32:23
Modified: core/src/resources/portal-samples-war/WEB-INF
default-object.xml portlet.xml
portlet-instances.xml jboss-portlet.xml
Log:
JBPORTAL-980:
- Fixed Test page.
- Removed PreferencesPortlet from Test page.
- Added HeaderContentPortlet to Test page.
Revision Changes Path
1.14 +86 -17 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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- default-object.xml 3 Aug 2006 17:06:47 -0000 1.13
+++ default-object.xml 14 Aug 2006 20:32:23 -0000 1.14
@@ -34,25 +34,13 @@
<window-name>TestPortletWindow</window-name>
<instance-ref>TestPortletInstance</instance-ref>
<region>center</region>
- <height>1</height>
- </window>
- <window>
- <window-name>PreferencesPortletWindow</window-name>
- <instance-ref>PreferencesPortletInstance</instance-ref>
- <region>center</region>
- <height>2</height>
- </window>
- <window>
- <window-name>UserPortletWindow</window-name>
- <instance-ref>UserPortletInstance</instance-ref>
- <region>left</region>
<height>0</height>
</window>
<window>
<window-name>CatalogPortletWindow</window-name>
<instance-ref>CatalogPortletInstance</instance-ref>
<region>left</region>
- <height>1</height>
+ <height>0</height>
</window>
<page>
<page-name>event test</page-name>
@@ -126,6 +114,12 @@
</properties>
</window>
<window>
+ <window-name>CatalogPortletWindow</window-name>
+ <instance-ref>CatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
<window-name>SecuredTestPortletWindow</window-name>
<instance-ref>SecuredTestPortletInstance</instance-ref>
<region>center</region>
@@ -159,6 +153,12 @@
</properties>
</window>
<window>
+ <window-name>CatalogPortletWindow</window-name>
+ <instance-ref>CatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
<window-name>ExceptionPortletWindow</window-name>
<instance-ref>ExceptionPortletInstance</instance-ref>
<region>center</region>
@@ -192,6 +192,12 @@
</properties>
</window>
<window>
+ <window-name>CatalogPortletWindow</window-name>
+ <instance-ref>CatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
<window-name>CachedCounterPortletWindow</window-name>
<instance-ref>CachedCounterPortletInstance</instance-ref>
<region>center</region>
@@ -231,6 +237,12 @@
</properties>
</window>
<window>
+ <window-name>CatalogPortletWindow</window-name>
+ <instance-ref>CatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
<window-name>PortletSessionPortletWindow</window-name>
<instance-ref>PortletSessionPortletInstance</instance-ref>
<region>center</region>
@@ -264,6 +276,12 @@
</properties>
</window>
<window>
+ <window-name>CatalogPortletWindow</window-name>
+ <instance-ref>CatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
<window-name>MissingPortletWindow</window-name>
<instance-ref>MissingPortletInstance</instance-ref>
<region>center</region>
@@ -273,8 +291,8 @@
<page>
<page-name>URL portlet</page-name>
<window>
- <window-name>URLPortletWindow</window-name>
- <instance-ref>URLPortletInstance</instance-ref>
+ <window-name>NavigationPortletWindow</window-name>
+ <instance-ref>NavigationPortletInstance</instance-ref>
<region>navigation</region>
<height>0</height>
<!-- keep portal and page properties for this window -->
@@ -297,8 +315,14 @@
</properties>
</window>
<window>
- <window-name>MissingPortletWindow</window-name>
- <instance-ref>MissingPortletInstance</instance-ref>
+ <window-name>CatalogPortletWindow</window-name>
+ <instance-ref>CatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>URLPortletWindow</window-name>
+ <instance-ref>URLPortletInstance</instance-ref>
<region>center</region>
<height>0</height>
</window>
@@ -330,6 +354,12 @@
</properties>
</window>
<window>
+ <window-name>CatalogPortletWindow</window-name>
+ <instance-ref>CatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
<window-name>MissingInstanceWindow</window-name>
<instance-ref>MissingInstance</instance-ref>
<region>center</region>
@@ -414,6 +444,45 @@
<height>0</height>
</window>
</page>
+ <page>
+ <page-name>header test</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>HeaderContentPortletWindow</window-name>
+ <instance-ref>HeaderContentPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ </page>
</page>
</deployment>
</deployments>
1.18 +17 -4 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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- portlet.xml 3 Aug 2006 17:06:47 -0000 1.17
+++ portlet.xml 14 Aug 2006 20:32:23 -0000 1.18
@@ -5,6 +5,19 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
version="1.0">
<portlet>
+ <description>Portlet to test modification of head content.</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>
+ </supports>
+ <portlet-info>
+ <title>Header Content portlet</title>
+ </portlet-info>
+ </portlet>
+ <portlet>
<description>This is a test portlet</description>
<description xml:lang="fr">C'est une portlet de test</description>
<portlet-name>TestPortlet</portlet-name>
1.7 +6 -0 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- portlet-instances.xml 3 Aug 2006 17:06:47 -0000 1.6
+++ portlet-instances.xml 14 Aug 2006 20:32:23 -0000 1.7
@@ -2,6 +2,12 @@
<deployments>
<deployment>
<instance>
+ <instance-id>HeaderContentPortletInstance</instance-id>
+ <portlet-ref>HeaderContentPortlet</portlet-ref>
+ </instance>
+ </deployment>
+ <deployment>
+ <instance>
<instance-id>WeatherPortletInstance</instance-id>
<portlet-ref>WeatherPortlet</portlet-ref>
</instance>
1.21 +1 -0 jboss-portal/core/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: jboss-portlet.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- jboss-portlet.xml 26 Jun 2006 07:04:19 -0000 1.20
+++ jboss-portlet.xml 14 Aug 2006 20:32:23 -0000 1.21
@@ -12,6 +12,7 @@
<header-content>
<link rel="stylesheet" type="text/css" href="/portlet-styles/HeaderContent.css" title="" media="screen"/>
<script type="text/javascript" src="/portlet-styles/HeaderContent.js" title=""/>
+ <meta name="description" content="test"/>
</header-content>
</portlet>
More information about the jboss-cvs-commits
mailing list