Index: PortletApplicationDescriptor.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java,v
retrieving revision 1.6
diff -u -r1.6 PortletApplicationDescriptor.java
--- PortletApplicationDescriptor.java	9 Apr 2005 17:57:39 -0000	1.6
+++ PortletApplicationDescriptor.java	10 Jun 2005 11:04:38 -0000
@@ -103,12 +103,12 @@
             digester.addCallMethod("portlet-app/portlet/supported-locale", "addSupportedLocale", 0);
             
             digester.addObjectCreate("portlet-app/portlet/display-name", PortletDisplayNameImpl.class);
-            digester.addSetProperties("portlet-app/portlet/display-name", "lang", "language");
+            digester.addSetProperties("portlet-app/portlet/display-name", "xml:lang", "language");
             digester.addBeanPropertySetter("portlet-app/portlet/display-name", "displayName");
             digester.addSetNext("portlet-app/portlet/display-name", "addDisplayName");
 
             digester.addObjectCreate("portlet-app/portlet/description", PortletDescriptionImpl.class);
-            digester.addSetProperties("portlet-app/portlet/description", "lang", "language");
+            digester.addSetProperties("portlet-app/portlet/description", "xml:lang", "language");
             digester.addBeanPropertySetter("portlet-app/portlet/description", "description");
             digester.addSetNext("portlet-app/portlet/description", "addDescription");
 
@@ -118,7 +118,7 @@
             digester.addSetNext("portlet-app/portlet/init-param", "addInitParameter");
 
             digester.addObjectCreate("portlet-app/portlet/init-param/description", ParameterDescriptionImpl.class);
-            digester.addSetProperties("portlet-app/portlet/init-param/description", "lang", "language");
+            digester.addSetProperties("portlet-app/portlet/init-param/description", "xml:lang", "language");
             digester.addBeanPropertySetter("portlet-app/portlet/init-param/description", "description");
             digester.addSetNext("portlet-app/portlet/init-param/description", "addDescription");
 
@@ -147,7 +147,7 @@
             digester.addSetNext("portlet-app/portlet/security-role-ref", "addSecurityRoleRef");
 
             digester.addObjectCreate("portlet-app/portlet/security-role-ref/description", SecurityRoleRefDescriptionImpl.class);
-            digester.addSetProperties("portlet-app/portlet/security-role-ref/description", "lang", "language");
+            digester.addSetProperties("portlet-app/portlet/security-role-ref/description", "xml:lang", "language");
             digester.addBeanPropertySetter("portlet-app/portlet/security-role-ref/description", "description");
             digester.addSetNext("portlet-app/portlet/security-role-ref/description", "addDescription");


Index: JetspeedLocale.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/util/JetspeedLocale.java,v
retrieving revision 1.2
diff -u -r1.2 JetspeedLocale.java
--- JetspeedLocale.java	8 Mar 2004 00:39:32 -0000	1.2
+++ JetspeedLocale.java	10 Jun 2005 11:05:40 -0000
@@ -31,9 +31,12 @@
 public class JetspeedLocale
 {
     // TODO We need to get this from the properties
-
-     public static Locale getDefaultLocale()
-     {
-         return Locale.getDefault();
-     }
+    
+    /**
+     * According to PLT.21.8.1, the default locale should be English.
+     */
+    public static Locale getDefaultLocale()
+    {
+        return Locale.ENGLISH;
+    }
 }


Index: PortletSelector.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/selector/PortletSelector.java,v
retrieving revision 1.2
diff -u -r1.2 PortletSelector.java
--- PortletSelector.java	25 May 2005 01:30:38 -0000	1.2
+++ PortletSelector.java	10 Jun 2005 11:06:37 -0000
@@ -149,7 +149,17 @@
                 if (appName != null && appName.equals("jetspeed"))
                     continue;
                 
-                list.add(new PortletInfo(appName + "::" + portlet.getName(), portlet.getDisplayNameText(locale), portlet.getDescriptionText(locale)));
+                // Try to get the display-name of request locale. If can't, return the default English locale display-name.
+                String displayNameText = portlet.getDisplayNameText(locale);
+                if(displayNameText == null || displayNameText.length() == 0)
+                    displayNameText = portlet.getDisplayNameText(Locale.ENGLISH);
+                
+                // Try to get the descriptionText of request locale. If can't, return the default English locale display-name.
+                String descriptionText = portlet.getDescriptionText(locale);
+                if(descriptionText == null || descriptionText.length() == 0)
+                    descriptionText = portlet.getDescriptionText(Locale.ENGLISH);                
+                
+                list.add(new PortletInfo(appName + "::" + portlet.getName(), displayNameText, descriptionText));
             }            
             BrowserIterator iterator = new PortletIterator(
                     list, resultSetTitleList, resultSetTypeList,