From do-not-reply at jboss.org Thu Feb  2 11:54:21 2012
Content-Type: multipart/mixed; boundary="===============6276304541452948720=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r8361 - in
 epp/portal/branches/EPP_5_2_Branch/examples/portlets:
 jsfhellouser/src/main/webapp/WEB-INF and 1 other directory.
Date: Thu, 02 Feb 2012 11:54:21 -0500
Message-ID: <201202021654.q12GsLkJ024502@svn01.web.mwc.hst.phx2.redhat.com>

--===============6276304541452948720==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2012-02-02 11:54:19 -0500 (Thu, 02 Feb 2012)
New Revision: 8361

Modified:
   epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/src/main/webapp=
/WEB-INF/portlet.xml
   epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/src/ma=
in/webapp/WEB-INF/portlet.xml
Log:
- JBEPP-1500: fixed erroneous portlet.xml descriptors.

Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/src/main=
/webapp/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/src/main/webap=
p/WEB-INF/portlet.xml	2012-02-02 16:43:55 UTC (rev 8360)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/src/main/webap=
p/WEB-INF/portlet.xml	2012-02-02 16:54:19 UTC (rev 8361)
@@ -26,109 +26,83 @@
              xsi:schemaLocation=3D"http://java.sun.com/xml/ns/portlet/port=
let-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
  -->
 =

- <portlet-app xmlns=3D"http://java.sun.com/xml/ns/portlet/portlet-app_2_0.=
xsd" xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation=3D"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=3D"1.0=
">
+<portlet-app xmlns=3D"http://java.sun.com/xml/ns/portlet/portlet-app_2_0.x=
sd"
+             xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation=3D"http://java.sun.com/xml/ns/portlet/port=
let-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+             version=3D"1.0">
 =

    <portlet>
-    <description xml:lang=3D"EN">Public Render Parameter API Portlet</desc=
ription>
-    <portlet-name>PRPAPIPortlet</portlet-name>
-    <display-name xml:lang=3D"EN">Public Render Parameter API Portlet</dis=
play-name>
-    <portlet-class>org.gatein.portal.samples.api.PRPPortlet</portlet-class>
+      <description xml:lang=3D"EN">Public Render Parameter API Portlet</de=
scription>
+      <portlet-name>PRPAPIPortlet</portlet-name>
+      <display-name xml:lang=3D"EN">Public Render Parameter API Portlet</d=
isplay-name>
+      <portlet-class>org.gatein.portal.samples.api.PRPPortlet</portlet-cla=
ss>
 =

-    <supports>
-      <mime-type>text/html</mime-type>
-    </supports>
-
-    <portlet-info>
-      <title>PRP Portlet</title>
-      <short-title>PRP Portlet</short-title>
-      <keywords>Sample</keywords>
-    </portlet-info>
-
-     <supported-public-render-parameter>navigation_uri</supported-public-r=
ender-parameter>
-     <supported-public-render-parameter>page_name</supported-public-render=
-parameter>
-     <supported-public-render-parameter>site_type</supported-public-render=
-parameter>
-     <supported-public-render-parameter>site_name</supported-public-render=
-parameter>
-     <supported-public-render-parameter>window_width</supported-public-ren=
der-parameter>
-     <supported-public-render-parameter>window_height</supported-public-re=
nder-parameter>
-     <supported-public-render-parameter>window_show_info_bar</supported-pu=
blic-render-parameter>
-
-  </portlet>
-
-  <public-render-parameter>
-     <identifier>navigation_uri</identifier>
-     <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:navigat=
ion_uri</qname>
-  </public-render-parameter>
-  <public-render-parameter>
-     <identifier>page_name</identifier>
-     <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:page_na=
me</qname>
-  </public-render-parameter>
-  <public-render-parameter>
-     <identifier>site_type</identifier>
-     <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:site_ty=
pe</qname>
-  </public-render-parameter>
-  <public-render-parameter>
-     <identifier>site_name</identifier>
-     <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:site_na=
me</qname>
-  </public-render-parameter>
-  <public-render-parameter>
-     <identifier>window_width</identifier>
-     <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:window_=
width</qname>
-  </public-render-parameter>
-  <public-render-parameter>
-     <identifier>window_height</identifier>
-     <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:window_=
height</qname>
-  </public-render-parameter>
-  <public-render-parameter>
-     <identifier>window_show_info_bar</identifier>
-     <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:window_=
show_info_bar</qname>
-  </public-render-parameter>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
 =

       <portlet-info>
-         <title>API Navigation Portlet</title>
-         <short-title>Navigation Portlet</short-title>
+         <title>PRP Portlet</title>
+         <short-title>PRP Portlet</short-title>
          <keywords>Sample</keywords>
       </portlet-info>
+
+      <supported-public-render-parameter>navigation_uri</supported-public-=
render-parameter>
+      <supported-public-render-parameter>page_name</supported-public-rende=
r-parameter>
+      <supported-public-render-parameter>site_type</supported-public-rende=
r-parameter>
+      <supported-public-render-parameter>site_name</supported-public-rende=
r-parameter>
+      <supported-public-render-parameter>window_width</supported-public-re=
nder-parameter>
+      <supported-public-render-parameter>window_height</supported-public-r=
ender-parameter>
+      <supported-public-render-parameter>window_show_info_bar</supported-p=
ublic-render-parameter>
+
    </portlet>
 =

    <portlet>
-      <description xml:lang=3D"EN">Content Registry Portlet Example using =
GateIn's public API</description>
-      <portlet-name>ContentRegistryAPIPortlet</portlet-name>
-      <display-name xml:lang=3D"EN">API Content Registry Portlet</display-=
name>
-      <portlet-class>org.gatein.portal.samples.api.ContentRegistryPortlet<=
/portlet-class>
+      <description xml:lang=3D"EN">Locale URL Portlet</description>
+      <portlet-name>LocaleURLPortlet</portlet-name>
+      <display-name xml:lang=3D"EN">A Portlet example demonstrating locale=
 selection in URL</display-name>
+      <portlet-class>org.gatein.portal.samples.api.LocaleURLPortlet</portl=
et-class>
 =

       <supports>
          <mime-type>text/html</mime-type>
       </supports>
 =

       <portlet-info>
-         <title>API Content Registry Portlet</title>
-         <short-title>Content Registry Portlet</short-title>
+         <title>Locale URL Portlet</title>
+         <short-title>Locale URL Portlet</short-title>
          <keywords>Sample</keywords>
       </portlet-info>
    </portlet>
 =

-   <portlet>
-    <description xml:lang=3D"EN">Locale URL Portlet</description>
-    <portlet-name>LocaleURLPortlet</portlet-name>
-    <display-name xml:lang=3D"EN">A Portlet example demonstrating locale s=
election in URL</display-name>
-    <portlet-class>org.gatein.portal.samples.api.LocaleURLPortlet</portlet=
-class>
+   <public-render-parameter>
+      <identifier>navigation_uri</identifier>
+      <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:naviga=
tion_uri</qname>
+   </public-render-parameter>
+   <public-render-parameter>
+      <identifier>page_name</identifier>
+      <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:page_n=
ame</qname>
+   </public-render-parameter>
+   <public-render-parameter>
+      <identifier>site_type</identifier>
+      <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:site_t=
ype</qname>
+   </public-render-parameter>
+   <public-render-parameter>
+      <identifier>site_name</identifier>
+      <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:site_n=
ame</qname>
+   </public-render-parameter>
+   <public-render-parameter>
+      <identifier>window_width</identifier>
+      <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:window=
_width</qname>
+   </public-render-parameter>
+   <public-render-parameter>
+      <identifier>window_height</identifier>
+      <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:window=
_height</qname>
+   </public-render-parameter>
+   <public-render-parameter>
+      <identifier>window_show_info_bar</identifier>
+      <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:window=
_show_info_bar</qname>
+   </public-render-parameter>
 =

-    <supports>
-      <mime-type>text/html</mime-type>
-    </supports>
-
-    <portlet-info>
-      <title>Locale URL Portlet</title>
-      <short-title>Locale URL Portlet</short-title>
-      <keywords>Sample</keywords>
-    </portlet-info>
-   </portlet>
-
    <public-render-parameter>
       <identifier>navigation_uri</identifier>
       <qname xmlns:prp=3D'http://www.gatein.org/xml/ns/prp_1_0'>prp:naviga=
tion_uri</qname>

Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser=
/src/main/webapp/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/src/m=
ain/webapp/WEB-INF/portlet.xml	2012-02-02 16:43:55 UTC (rev 8360)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/src/m=
ain/webapp/WEB-INF/portlet.xml	2012-02-02 16:54:19 UTC (rev 8361)
@@ -1,22 +1,12 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <portlet-app xmlns=3D"http://java.sun.com/xml/ns/portlet/portlet-app_2_0.x=
sd"
-version=3D"2.0"
-   xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation=3D"http://java.sun.com/xml/ns/portlet/portlet-app_2_=
0.xsd
+             version=3D"2.0"
+             xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation=3D"http://java.sun.com/xml/ns/portlet/port=
let-app_2_0.xsd
    http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
    <portlet>
       <portlet-name>JSFHelloUserPortlet</portlet-name>
       <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-clas=
s>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>view</portlet-mode>
-         <portlet-mode>edit</portlet-mode>
-         <portlet-mode>help</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>JSF Hello User Portlet</title>
-      </portlet-info>
-      =

       <init-param>
          <name>javax.portlet.faces.defaultViewId.view</name>
          <value>/jsf/welcome.jsp</value>
@@ -31,6 +21,14 @@
          <name>javax.portlet.faces.defaultViewId.help</name>
          <value>/jsf/help.jsp</value>
       </init-param>
-
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>view</portlet-mode>
+         <portlet-mode>edit</portlet-mode>
+         <portlet-mode>help</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>JSF Hello User Portlet</title>
+      </portlet-info>
    </portlet>
 </portlet-app>
\ No newline at end of file


--===============6276304541452948720==--