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/main/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 =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/src/main/webapp/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/webapp/WEB-INF/portlet.xml 2012-02-02 16:54:19 UTC (rev 8361) @@ -26,109 +26,83 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1... http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"> --> - <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... http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="1.0"> +<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... http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="1.0"> <portlet> - <description xml:lang="EN">Public Render Parameter API Portlet</description> - <portlet-name>PRPAPIPortlet</portlet-name> - <display-name xml:lang="EN">Public Render Parameter API Portlet</display-name> - <portlet-class>org.gatein.portal.samples.api.PRPPortlet</portlet-class> + <description xml:lang="EN">Public Render Parameter API Portlet</description> + <portlet-name>PRPAPIPortlet</portlet-name> + <display-name xml:lang="EN">Public Render Parameter API Portlet</display-name> + <portlet-class>org.gatein.portal.samples.api.PRPPortlet</portlet-class> - <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-render-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-render-parameter> - <supported-public-render-parameter>window_height</supported-public-render-parameter> - <supported-public-render-parameter>window_show_info_bar</supported-public-render-parameter> - - </portlet> - - <public-render-parameter> - <identifier>navigation_uri</identifier> - <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:navigatio... - </public-render-parameter> - <public-render-parameter> - <identifier>page_name</identifier> - <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:page_name... - </public-render-parameter> - <public-render-parameter> - <identifier>site_type</identifier> - <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:site_type... - </public-render-parameter> - <public-render-parameter> - <identifier>site_name</identifier> - <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:site_name... - </public-render-parameter> - <public-render-parameter> - <identifier>window_width</identifier> - <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:window_wi... - </public-render-parameter> - <public-render-parameter> - <identifier>window_height</identifier> - <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:window_he... - </public-render-parameter> - <public-render-parameter> - <identifier>window_show_info_bar</identifier> - <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:window_sh... - </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-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-render-parameter> + <supported-public-render-parameter>window_height</supported-public-render-parameter> + <supported-public-render-parameter>window_show_info_bar</supported-public-render-parameter> + </portlet> <portlet> - <description xml:lang="EN">Content Registry Portlet Example using GateIn's public API</description> - <portlet-name>ContentRegistryAPIPortlet</portlet-name> - <display-name xml:lang="EN">API Content Registry Portlet</display-name> - <portlet-class>org.gatein.portal.samples.api.ContentRegistryPortlet</portlet-class> + <description xml:lang="EN">Locale URL Portlet</description> + <portlet-name>LocaleURLPortlet</portlet-name> + <display-name xml:lang="EN">A Portlet example demonstrating locale selection in URL</display-name> + <portlet-class>org.gatein.portal.samples.api.LocaleURLPortlet</portlet-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="EN">Locale URL Portlet</description> - <portlet-name>LocaleURLPortlet</portlet-name> - <display-name xml:lang="EN">A Portlet example demonstrating locale selection in URL</display-name> - <portlet-class>org.gatein.portal.samples.api.LocaleURLPortlet</portlet-class> + <public-render-parameter> + <identifier>navigation_uri</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:navigatio... + </public-render-parameter> + <public-render-parameter> + <identifier>page_name</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:page_name... + </public-render-parameter> + <public-render-parameter> + <identifier>site_type</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:site_type... + </public-render-parameter> + <public-render-parameter> + <identifier>site_name</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:site_name... + </public-render-parameter> + <public-render-parameter> + <identifier>window_width</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:window_wi... + </public-render-parameter> + <public-render-parameter> + <identifier>window_height</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:window_he... + </public-render-parameter> + <public-render-parameter> + <identifier>window_show_info_bar</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:window_sh... + </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='http://www.gatein.org/xml/ns/prp_1_0'>prp:navigatio... Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/src/main/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/main/webapp/WEB-INF/portlet.xml 2012-02-02 16:54:19 UTC (rev 8361) @@ -1,22 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" -version="2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... + version="2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... 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-class> - <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