You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mf...@apache.org on 2010/06/02 01:28:40 UTC

svn commit: r950304 - in /myfaces/portlet-bridge/core/trunk/examples: facelets-guess/src/main/webapp/WEB-INF/portlet.xml helloDuke/src/main/webapp/WEB-INF/portlet.xml

Author: mfreedman
Date: Tue Jun  1 23:28:39 2010
New Revision: 950304

URL: http://svn.apache.org/viewvc?rev=950304&view=rev
Log:
PORTLETBRIDGE-144: Update 1.0 examples with 1.0 portlet.xml syntax

Modified:
    myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/portlet.xml
    myfaces/portlet-bridge/core/trunk/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml

Modified: myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/portlet.xml?rev=950304&r1=950303&r2=950304&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/portlet.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/portlet.xml Tue Jun  1 23:28:39 2010
@@ -17,17 +17,16 @@
     specific language governing permissions and limitations
     under the License.	   
 -->
-<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"
-                   id="CarStore" version="2.0">
+<portlet-app version="1.0"
+             xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             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">
 
 
   <portlet>
-    <description>Facelets Guess Number Demo</description>
+    <description lang="EN">Facelets Guess Number Demo</description>
     <portlet-name>portlet-bridge-facelets-guess</portlet-name>
-    <display-name>Mojarra Car Demo</display-name>
+    <display-name lang="EN">Mojarra Car Demo</display-name>
     <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
 
     <init-param>

Modified: myfaces/portlet-bridge/core/trunk/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml?rev=950304&r1=950303&r2=950304&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml Tue Jun  1 23:28:39 2010
@@ -1,14 +1,13 @@
 <?xml version="1.0"  encoding="ISO-8859-1"?>
 
-<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"
-                   id="helloDuke" version="2.0">
+<portlet-app version="1.0"
+             xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             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">
 	<portlet>
-		<description>helloDuke</description>
+		<description lang="EN">>HelloDuke</description>
 		<portlet-name>portlet-bridge-helloDuke</portlet-name>
-		<display-name>helloDuke</display-name>
+		<display-name lang="EN">>HelloDuke</display-name>
 		<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
 
 		<init-param>
@@ -24,9 +23,9 @@
 		</supports>
 		<supported-locale>en</supported-locale>
 		<portlet-info>
-			<title>helloDuke</title>
-			<short-title>helloDuke</short-title>
-			<keywords>helloDuke</keywords>
+			<title>HelloDuke</title>
+			<short-title>HelloDuke</short-title>
+			<keywords>HelloDuke</keywords>
 		</portlet-info>
 	</portlet>