[jboss-cvs] jboss-portal/portlet/src/main/org/jboss/portal/portlet/deployment ...

[Chris Laprun]

  User: claprun 
  Date: 06/08/17 03:05:48

  Modified:    portlet/src/main/org/jboss/portal/portlet/deployment 
                        JBossApplicationMetaDataFactory.java
  Log:
  - Added test to test app-level remotable.
  - Added call to merge in JBossApplicationMetaDataFactory to fix issue with app-level remotable.
  - Might need to fix PortletAppDeployment as well.
  
  Revision  Changes    Path
  1.7       +19 -20    jboss-portal/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossApplicationMetaDataFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- JBossApplicationMetaDataFactory.java	2 Jul 2006 17:50:34 -0000	1.6
  +++ JBossApplicationMetaDataFactory.java	17 Aug 2006 07:05:48 -0000	1.7
  @@ -21,20 +21,20 @@
   */
   package org.jboss.portal.portlet.deployment;
   
  -import org.jboss.xb.binding.UnmarshallingContext;
  -import org.jboss.xb.binding.GenericObjectModelFactory;
  +import org.jboss.portal.common.transaction.Transactions;
  +import org.jboss.portal.portlet.info.CacheInfo;
  +import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
   import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
   import org.jboss.portal.portlet.metadata.PolicyPermissionMetaData;
   import org.jboss.portal.portlet.metadata.SecurityConstraintMetaData;
  -import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
  -import org.jboss.portal.portlet.info.CacheInfo;
  -import org.jboss.portal.common.transaction.Transactions;
   import org.jboss.portal.security.SecurityConstants;
  +import org.jboss.xb.binding.GenericObjectModelFactory;
  +import org.jboss.xb.binding.UnmarshallingContext;
   import org.xml.sax.Attributes;
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public class JBossApplicationMetaDataFactory implements GenericObjectModelFactory
   {
  @@ -66,14 +66,14 @@
               return createJBossPortlet();
            }
         }
  -      if (object instanceof JBossPortletMetaData)
  +      else if (object instanceof JBossPortletMetaData)
         {
            if ("security-constraint".equals(localName))
            {
               return new SecurityConstraintMetaData();
            }
         }
  -      if (object instanceof SecurityConstraintMetaData)
  +      else if (object instanceof SecurityConstraintMetaData)
         {
            if ("policy-permission".equals(localName))
            {
  @@ -99,9 +99,10 @@
            {
               JBossPortletMetaData portlet = (JBossPortletMetaData)child;
               app.getPortlets().put(portlet.getName(), portlet);
  +            portlet.merge(app);
            }
         }
  -      if (parent instanceof JBossPortletMetaData)
  +      else if (parent instanceof JBossPortletMetaData)
         {
            JBossPortletMetaData portlet = (JBossPortletMetaData)parent;
            if (child instanceof SecurityConstraintMetaData)
  @@ -109,7 +110,7 @@
               portlet.setSecurityConstraint((SecurityConstraintMetaData)child);
            }
         }
  -      if (parent instanceof SecurityConstraintMetaData)
  +      else if (parent instanceof SecurityConstraintMetaData)
         {
            SecurityConstraintMetaData securityConstraint = (SecurityConstraintMetaData)parent;
            if (child instanceof PolicyPermissionMetaData)
  @@ -126,7 +127,7 @@
               }
            }
         }
  -      if (parent instanceof PolicyPermissionMetaData)
  +      else if (parent instanceof PolicyPermissionMetaData)
         {
            PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)parent;
            if ("unchecked".equals(child))
  @@ -157,14 +158,14 @@
               }
            }
         }
  -      if (object instanceof JBossPortletMetaData)
  +      else if (object instanceof JBossPortletMetaData)
         {
            JBossPortletMetaData portlet = (JBossPortletMetaData)object;
            if ("portlet-name".equals(localName))
            {
               portlet.setName(value);
            }
  -         if ("remotable".equals(localName))
  +         else if ("remotable".equals(localName))
            {
               if ("true".equalsIgnoreCase(value))
               {
  @@ -179,7 +180,7 @@
                  throw new RuntimeException();
               }
            }
  -         if ("distributed".equals(localName))
  +         else if ("distributed".equals(localName))
            {
               if ("true".equalsIgnoreCase(value))
               {
  @@ -194,7 +195,7 @@
                  throw new RuntimeException();
               }
            }
  -         if ("ref-type".equals(localName))
  +         else if ("ref-type".equals(localName))
            {
               if ("strong".equals(localName))
               {
  @@ -209,7 +210,7 @@
                  // log.warn("Unrecognized reference type " + refType);
               }
            }
  -         if ("trans-attribute".equals(localName))
  +         else if ("trans-attribute".equals(localName))
            {
               if ("Required".equalsIgnoreCase(value))
               {
  @@ -241,7 +242,7 @@
               }
            }
         }
  -      if (object instanceof PolicyPermissionMetaData)
  +      else if (object instanceof PolicyPermissionMetaData)
         {
            PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)object;
            if ("role-name".equals(localName))
  @@ -255,9 +256,7 @@
         }
      }
   
  -   /**
  -    * Can be subclasses to allow sub class.
  -    */
  +   /** Can be subclasses to allow sub class. */
      protected JBossPortletMetaData createJBossPortlet()
      {
         return new JBossPortletMetaData();