portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager PortletDescriptorUtilities.java
Date Wed, 04 Feb 2004 21:33:12 GMT
weaver      2004/02/04 13:33:12

  Modified:    portal/src/java/org/apache/jetspeed/tools/pamanager
                        PortletDescriptorUtilities.java
  Log:
  refactored to use impl specific DisplayName and Description classes
  
  Revision  Changes    Path
  1.4       +10 -8     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletDescriptorUtilities.java
  
  Index: PortletDescriptorUtilities.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletDescriptorUtilities.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PortletDescriptorUtilities.java	6 Jan 2004 19:31:31 -0000	1.3
  +++ PortletDescriptorUtilities.java	4 Feb 2004 21:33:12 -0000	1.4
  @@ -63,10 +63,12 @@
   import org.apache.jetspeed.Jetspeed;
   import org.apache.jetspeed.PortalContext;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
  -import org.apache.jetspeed.om.impl.DescriptionImpl;
  -import org.apache.jetspeed.om.impl.DisplayNameImpl;
   import org.apache.jetspeed.om.impl.LanguageImpl;
  +import org.apache.jetspeed.om.impl.ParameterDescriptionImpl;
  +import org.apache.jetspeed.om.impl.PortletDescriptionImpl;
  +import org.apache.jetspeed.om.impl.PortletDisplayNameImpl;
   import org.apache.jetspeed.om.impl.PortletInitParameterImpl;
  +import org.apache.jetspeed.om.impl.SecurityRoleRefDescriptionImpl;
   import org.apache.jetspeed.om.impl.SecurityRoleRefImpl;
   import org.apache.jetspeed.om.portlet.impl.ContentTypeImpl;
   import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
  @@ -198,12 +200,12 @@
               digester.addBeanPropertySetter("portlet-app/portlet/expiration-cache", "expirationCache");
               digester.addSetNext("portlet-app/portlet", "addPortletDefinition");
   
  -            digester.addObjectCreate("portlet-app/portlet/display-name", DisplayNameImpl.class);
  +            digester.addObjectCreate("portlet-app/portlet/display-name", PortletDisplayNameImpl.class);
               digester.addSetProperties("portlet-app/portlet/display-name", "lang", "language");
               digester.addBeanPropertySetter("portlet-app/portlet/display-name", "displayName");
               digester.addSetNext("portlet-app/portlet/display-name", "addDisplayName");
   
  -            digester.addObjectCreate("portlet-app/portlet/description", DescriptionImpl.class);
  +            digester.addObjectCreate("portlet-app/portlet/description", PortletDescriptionImpl.class);
               digester.addSetProperties("portlet-app/portlet/description", "lang", "language");
               digester.addBeanPropertySetter("portlet-app/portlet/description", "description");
               digester.addSetNext("portlet-app/portlet/description", "addDescription");
  @@ -213,7 +215,7 @@
               digester.addBeanPropertySetter("portlet-app/portlet/init-param/value", "value");
               digester.addSetNext("portlet-app/portlet/init-param", "addInitParameter");
   
  -            digester.addObjectCreate("portlet-app/portlet/init-param/description", DescriptionImpl.class);
  +            digester.addObjectCreate("portlet-app/portlet/init-param/description", ParameterDescriptionImpl.class);
               digester.addSetProperties("portlet-app/portlet/init-param/description", "lang",
"language");
               digester.addBeanPropertySetter("portlet-app/portlet/init-param/description",
"description");
               digester.addSetNext("portlet-app/portlet/init-param/description", "addDescription");
  @@ -244,7 +246,7 @@
               digester.addBeanPropertySetter("portlet-app/portlet/security-role-ref/role-link",
"roleLink");
               digester.addSetNext("portlet-app/portlet/security-role-ref", "addSecurityRoleRef");
   
  -            digester.addObjectCreate("portlet-app/portlet/security-role-ref/description",
DescriptionImpl.class);
  +            digester.addObjectCreate("portlet-app/portlet/security-role-ref/description",
SecurityRoleRefDescriptionImpl.class);
               digester.addSetProperties("portlet-app/portlet/security-role-ref/description",
"lang", "language");
               digester.addBeanPropertySetter("portlet-app/portlet/security-role-ref/description",
"description");
               digester.addSetNext("portlet-app/portlet/security-role-ref/description", "addDescription");
  @@ -258,7 +260,7 @@
           }
           catch (Throwable t)
           {
  -            String msg = "Could not unmarshal: " + pathPortletXML;
  +            String msg = "Could not unmarshal \"" + pathPortletXML+"\".  "+t.toString();
               log.error(msg, t);
               throw new PortletApplicationException(msg, t);
           }
  
  
  

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


Mime
View raw message