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

[Chris Laprun]

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

  Modified:    portlet/src/main/org/jboss/portal/portlet/deployment/jboss 
                        PortletAppDeployment.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.62      +8 -8      jboss-portal/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortletAppDeployment.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -b -r1.61 -r1.62
  --- PortletAppDeployment.java	26 Jun 2006 07:14:10 -0000	1.61
  +++ PortletAppDeployment.java	17 Aug 2006 07:05:48 -0000	1.62
  @@ -31,24 +31,24 @@
   import org.jboss.kernel.Kernel;
   import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
   import org.jboss.portal.common.util.Tools;
  -import org.jboss.portal.portlet.container.PortletContainerAdapter;
   import org.jboss.portal.portlet.container.PortletApplicationContextImpl;
  +import org.jboss.portal.portlet.container.PortletApplicationRegistry;
  +import org.jboss.portal.portlet.container.PortletContainerAdapter;
   import org.jboss.portal.portlet.deployment.JBossApplicationMetaDataFactory;
   import org.jboss.portal.portlet.deployment.PortletApplicationMetaDataFactory;
   import org.jboss.portal.portlet.impl.jsr168.APIFactory;
   import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
   import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
  -import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
   import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
  -import org.jboss.portal.portlet.metadata.SecurityConstraintMetaData;
  +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.security.PortletSecurityService;
  -import org.jboss.portal.portlet.container.PortletApplicationRegistry;
  -import org.jboss.portal.security.SecurityConstants;
   import org.jboss.portal.security.RoleSecurityBinding;
  +import org.jboss.portal.security.SecurityConstants;
   import org.jboss.portal.security.spi.provider.AuthorizationDomain;
  -import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
   import org.jboss.portal.security.spi.provider.DomainConfigurator;
  +import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
   import org.jboss.portal.server.deployment.PortalWebApp;
   import org.jboss.portal.server.deployment.jboss.Deployment;
   import org.jboss.system.ServiceControllerMBean;
  @@ -70,7 +70,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.61 $
  + * @version $Revision: 1.62 $
    */
   public class PortletAppDeployment extends Deployment
   {
  @@ -150,7 +150,7 @@
                        log.debug("Merging default jboss portlet meta data for " + name);
   
                        // Merge with app settings
  -                     jbossPortletMD.merge(jbossAppMD);
  +                     jbossPortletMD.merge(jbossAppMD); // todo: remove since it shouldn't be needed anymore with the adding of merge in factory...
   
                        // Merge with default portlet
                        jbossPortletMD.merge(defaultJBossPortletMD);