You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2004/08/16 20:32:36 UTC

cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor PortletApplicationDescriptor.java

taylor      2004/08/16 11:32:36

  Modified:    portal/src/java/org/apache/jetspeed/util/descriptor
                        PortletApplicationDescriptor.java
  Log:
  adding support for full language support for JSR 168, contribution from Shinsuke
  
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.4       +9 -3      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java
  
  Index: PortletApplicationDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PortletApplicationDescriptor.java	18 Jun 2004 20:48:23 -0000	1.3
  +++ PortletApplicationDescriptor.java	16 Aug 2004 18:32:35 -0000	1.4
  @@ -22,6 +22,7 @@
   import org.apache.commons.digester.Digester;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +import org.apache.jetspeed.om.common.Support;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
   import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
   import org.apache.jetspeed.om.impl.LanguageImpl;
  @@ -92,7 +93,8 @@
               digester.addBeanPropertySetter("portlet-app/portlet/portlet-name", "name");
               digester.addBeanPropertySetter("portlet-app/portlet/portlet-class", "className");
               digester.addBeanPropertySetter("portlet-app/portlet/expiration-cache", "expirationCache");
  -           
  +            digester.addBeanPropertySetter("portlet-app/portlet/resource-bundle", "resourceBundle");
  +            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");
  @@ -154,11 +156,15 @@
               Iterator portletDefs = pd.getPortletDefinitions().iterator();
               while(portletDefs.hasNext())
               {
  -                PortletDefinitionComposite portletDef = (PortletDefinitionComposite) portletDefs.next();
  +                Object obj = portletDefs.next();
  +                PortletDefinitionComposite portletDef = (PortletDefinitionComposite) obj;
                   if(portletDef.getPortletIdentifier() == null)
                   {
                       portletDef.setPortletIdentifier(portletDef.getName());
                   }
  +                
  +                //TODO is pd a proper argument?
  +                ((Support)obj).postLoad(pd);
               }
               
               return pd;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org