[portal-commits] JBoss Portal SVN: r11914 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/resources/portal-admin-war/WEB-INF and 3 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Wed Sep 17 08:29:20 EDT 2008
Author: thomas.heute at jboss.com
Date: 2008-09-17 08:29:20 -0400 (Wed, 17 Sep 2008)
New Revision: 11914
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
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-users-samples-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml
Log:
Make the portlet.xml validate
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2008-09-17 08:21:23 UTC (rev 11913)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2008-09-17 12:29:20 UTC (rev 11914)
@@ -42,7 +42,7 @@
<title>Portlet Content Portlet</title>
<keywords>management,admin</keywords>
</portlet-info>
- <supported-publishing-event xmlns:x="urn:jboss:portal:content">x:select</supported-publishing-event>
+ <supported-publishing-event><qname xmlns:x="urn:jboss:portal:content">select</qname></supported-publishing-event>
<supported-public-render-parameter>uri</supported-public-render-parameter>
</portlet>
<user-attribute>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-09-17 08:21:23 UTC (rev 11913)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-09-17 12:29:20 UTC (rev 11914)
@@ -32,9 +32,6 @@
<portlet-name>AdminPortlet</portlet-name>
<display-name>Administration Portlet</display-name>
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
- <supported-locale>en</supported-locale>
- <supported-locale>it</supported-locale>
- <supported-locale>de</supported-locale>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
<value>/jsf/objects.xhtml</value>
@@ -47,6 +44,9 @@
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
</supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>it</supported-locale>
+ <supported-locale>de</supported-locale>
<portlet-info>
<title>Management Portlet</title>
<keywords>management,admin</keywords>
@@ -75,7 +75,7 @@
<keywords>management,admin</keywords>
</portlet-info>
- <supported-processing-event xmlns:x="urn:jboss:portal:content">x:select</supported-processing-event>
+ <supported-processing-event><qname xmlns:x="urn:jboss:portal:content">select</qname></supported-processing-event>
</portlet>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-09-17 08:21:23 UTC (rev 11913)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-09-17 12:29:20 UTC (rev 11914)
@@ -63,7 +63,7 @@
<value>false</value>
</preference>
</portlet-preferences>
- <supported-publishing-event xmlns:x="urn:jboss:portal:content">x:select</supported-publishing-event>
+ <supported-publishing-event><qname xmlns:x="urn:jboss:portal:content">select</qname></supported-publishing-event>
<supported-public-render-parameter>uri</supported-public-render-parameter>
</portlet>
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-09-17 08:21:23 UTC (rev 11913)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-09-17 12:29:20 UTC (rev 11914)
@@ -1,45 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
- version="2.0">
-
- <filter>
- <filter-name>JBoss Portlet Filter</filter-name>
- <filter-class>org.jboss.portlet.filter.JBossPortletFilter</filter-class>
- <lifecycle>ACTION_PHASE</lifecycle>
- <lifecycle>RENDER_PHASE</lifecycle>
- </filter>
-
- <filter-mapping>
- <filter-name>JBoss Portlet Filter</filter-name>
- <portlet-name>TestPortlet</portlet-name>
- <portlet-name>ModePortlet</portlet-name>
- </filter-mapping>
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+ version="2.0">
<portlet>
<description>Mode Portlet</description>
<portlet-name>ModePortlet</portlet-name>
@@ -61,7 +47,9 @@
<portlet-name>HeaderContentPortlet</portlet-name>
<display-name>Header Content Portlet</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.HeaderContentPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.HeaderContentPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -74,7 +62,9 @@
<description>Event Portlet</description>
<portlet-name>EventPortlet</portlet-name>
<display-name>Event Portlet</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.event.EventPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.event.EventPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -85,20 +75,6 @@
</portlet-info>
</portlet>
<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.samples.basic.HeaderContentPortlet</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- </supports>
- <portlet-info>
- <title>Header Content portlet</title>
- <keywords>sample,test</keywords>
- </portlet-info>
- </portlet>
- <portlet>
<description>A test portlet</description>
<description xml:lang="fr">C'est une portlet de test</description>
<portlet-name>TestPortlet</portlet-name>
@@ -146,7 +122,7 @@
<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>
@@ -191,7 +167,9 @@
<description>Portlet using portlet session</description>
<portlet-name>PortletSessionPortlet</portlet-name>
<display-name>Portlet Session Portlet</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.PortletSessionPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.PortletSessionPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -229,7 +207,9 @@
</portlet-info>
</portlet>
<portlet>
- <description>Portlet showing different ways to properly display and submit unicode text</description>
+ <description>
+ Portlet showing different ways to properly display and submit unicode text
+ </description>
<portlet-name>CharsetPortlet</portlet-name>
<display-name>Charset Portlet</display-name>
<portlet-class>org.jboss.portal.core.samples.basic.CharsetPortlet</portlet-class>
@@ -303,8 +283,8 @@
</portlet>
<portlet>
<portlet-name>BasicPortlet</portlet-name>
+ <display-name>Basic Portlet</display-name>
<portlet-class>org.jboss.portal.core.samples.basic.BasicPortlet</portlet-class>
- <display-name>Basic Portlet</display-name>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -318,7 +298,9 @@
<description>File System Content Driven Portlet</description>
<portlet-name>FSContentDrivenPortlet</portlet-name>
<display-name>File System Content Driven Portlet</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.FSContentDrivenPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.FSContentDrivenPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -328,8 +310,10 @@
<title>File Portlet</title>
<keywords>sample,test</keywords>
</portlet-info>
+ <supported-publishing-event>
+ <qname xmlns:x="urn:jboss:portal:content">select</qname>
+ </supported-publishing-event>
<supported-public-render-parameter>uri</supported-public-render-parameter>
- <supported-publishing-event xmlns:x="urn:jboss:portal:content">x:select</supported-publishing-event>
</portlet>
<portlet>
<description>File Upload Portlet</description>
@@ -348,7 +332,9 @@
<description>Portlet which performs a programmatic submit of a form</description>
<portlet-name>FormAutoSubmitPortlet</portlet-name>
<display-name>Form auto submit Portlet</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.FormAutoSubmitPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.FormAutoSubmitPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -376,7 +362,9 @@
<description>Portlet that manipulates its public render parameters</description>
<portlet-name>PublicParametersPortlet1</portlet-name>
<display-name>Public Parameters Portlet 1</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.PublicParametersPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.PublicParametersPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -391,7 +379,9 @@
<description>Portlet that manipulates its public render parameters</description>
<portlet-name>PublicParametersPortlet2</portlet-name>
<display-name>Public Parameters Portlet 2</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.PublicParametersPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.PublicParametersPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -406,7 +396,9 @@
<description>Portlet that manipulates its public render parameters</description>
<portlet-name>PublicParametersPortlet3</portlet-name>
<display-name>Public Parameters Portlet 3</display-name>
- <portlet-class>org.jboss.portal.core.samples.basic.PublicParametersPortlet</portlet-class>
+ <portlet-class>
+ org.jboss.portal.core.samples.basic.PublicParametersPortlet
+ </portlet-class>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -418,36 +410,6 @@
<supported-public-render-parameter>juu</supported-public-render-parameter>
</portlet>
- <public-render-parameter>
- <name>foo</name>
- <identifier>foo</identifier>
- </public-render-parameter>
-
- <public-render-parameter>
- <name>bar</name>
- <identifier>bar</identifier>
- </public-render-parameter>
-
- <public-render-parameter>
- <name>juu</name>
- <identifier>juu</identifier>
- </public-render-parameter>
-
- <public-render-parameter>
- <identifier>uri</identifier>
- <qname xmlns:c="urn:jboss:portal:content">c:uri</qname>
- </public-render-parameter>
-
- <event-definition>
- <qname xmlns:x="urn:jboss:portal:content">x:select</qname>
- <value-type>java.lang.String</value-type>
- </event-definition>
-
- <!--
- <custom-portlet-mode>
- <name>ADMIN</name>
- </custom-portlet-mode>
--->
<user-attribute>
<name>user.name.nickName</name>
</user-attribute>
@@ -469,6 +431,7 @@
<user-attribute>
<name>portal.user.last-login-date</name>
</user-attribute>
+
<security-constraint>
<portlet-collection>
<portlet-name>SecuredTestPortlet</portlet-name>
@@ -477,10 +440,48 @@
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint>
</security-constraint>
-
- <event-definition>
+
+ <filter>
+ <filter-name>JBoss Portlet Filter</filter-name>
+ <filter-class>org.jboss.portlet.filter.JBossPortletFilter</filter-class>
+ <lifecycle>ACTION_PHASE</lifecycle>
+ <lifecycle>RENDER_PHASE</lifecycle>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>JBoss Portlet Filter</filter-name>
+ <portlet-name>TestPortlet</portlet-name>
+ <portlet-name>ModePortlet</portlet-name>
+ </filter-mapping>
+
+ <event-definition>
+ <qname xmlns:x="urn:jboss:portal:content">x:select</qname>
+ <value-type>java.lang.String</value-type>
+ </event-definition>
+
+ <event-definition>
<qname xmlns:jbp="urn:jboss:portal">jbp:signOut</qname>
<value-type>java.lang.String</value-type>
</event-definition>
-
+
+ <public-render-parameter>
+ <identifier>foo</identifier>
+ <name>foo</name>
+ </public-render-parameter>
+
+ <public-render-parameter>
+ <identifier>bar</identifier>
+ <name>bar</name>
+ </public-render-parameter>
+
+ <public-render-parameter>
+ <identifier>juu</identifier>
+ <name>juu</name>
+ </public-render-parameter>
+
+ <public-render-parameter>
+ <identifier>uri</identifier>
+ <qname xmlns:c="urn:jboss:portal:content">c:uri</qname>
+ </public-render-parameter>
+
</portlet-app>
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-09-17 08:21:23 UTC (rev 11913)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-09-17 12:29:20 UTC (rev 11914)
@@ -28,18 +28,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
version="2.0">
- <filter>
- <filter-name>JBoss Portlet Filter</filter-name>
- <filter-class>org.jboss.portlet.filter.JBossPortletFilter</filter-class>
- <lifecycle>ACTION_PHASE</lifecycle>
- <lifecycle>RENDER_PHASE</lifecycle>
- </filter>
-
- <filter-mapping>
- <filter-name>JBoss Portlet Filter</filter-name>
- <portlet-name>CurrentUsersPortlet</portlet-name>
- </filter-mapping>
-
<portlet>
<description>Current users portlet</description>
<portlet-name>CurrentUsersPortlet</portlet-name>
@@ -71,4 +59,17 @@
</preference>
</portlet-preferences>
</portlet>
+
+ <filter>
+ <filter-name>JBoss Portlet Filter</filter-name>
+ <filter-class>org.jboss.portlet.filter.JBossPortletFilter</filter-class>
+ <lifecycle>ACTION_PHASE</lifecycle>
+ <lifecycle>RENDER_PHASE</lifecycle>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>JBoss Portlet Filter</filter-name>
+ <portlet-name>CurrentUsersPortlet</portlet-name>
+ </filter-mapping>
+
</portlet-app>
More information about the portal-commits
mailing list