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

[Julien Viet]

  User: julien  
  Date: 06/08/21 19:20:52

  Modified:    portlet/src/main/org/jboss/portal/portlet/container  
                        PortletApplicationContext.java
                        PortletApplicationContextImpl.java
  Log:
  remove usage of contextPath information coming from the PortalWebApp and instead use information provided by the servlet container at runtime
  
  Revision  Changes    Path
  1.5       +1 -8      jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortletApplicationContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- PortletApplicationContext.java	26 Jun 2006 07:16:13 -0000	1.4
  +++ PortletApplicationContext.java	21 Aug 2006 23:20:52 -0000	1.5
  @@ -27,7 +27,7 @@
    * The context for a portlet application.
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public interface PortletApplicationContext
   {
  @@ -39,13 +39,6 @@
      ServletContext getServletContext();
   
      /**
  -    * Return the context path.
  -    *
  -    * @return the context path
  -    */
  -   String getContextPath();
  -
  -   /**
       * Return the classloader.
       *
       * @return the classloader
  
  
  
  1.3       +1 -14     jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContextImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PortletApplicationContextImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContextImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- PortletApplicationContextImpl.java	26 Jun 2006 07:28:38 -0000	1.2
  +++ PortletApplicationContextImpl.java	21 Aug 2006 23:20:52 -0000	1.3
  @@ -21,9 +21,6 @@
   */
   package org.jboss.portal.portlet.container;
   
  -import org.jboss.portal.portlet.container.PortletApplicationRegistry;
  -import org.jboss.portal.portlet.container.PortletApplicationImpl;
  -import org.jboss.portal.portlet.container.PortletApplicationContext;
   import org.jboss.portal.portlet.impl.jsr168.APIFactory;
   import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
   import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
  @@ -38,7 +35,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class PortletApplicationContextImpl implements PortletApplicationContext, KernelControllerContextAware
   {
  @@ -65,9 +62,6 @@
      private ServletContext servletContext;
   
      /** . */
  -   private String contextPath;
  -
  -   /** . */
      private ClassLoader classLoader;
   
      public PortletApplicationContextImpl(
  @@ -76,7 +70,6 @@
         PortletApplicationMetaData portletAppMD,
         JBossApplicationMetaData jbossAppMD,
         ServletContext servletContext,
  -      String contextPath,
         ClassLoader classLoader)
      {
         this.registry = registry;
  @@ -84,7 +77,6 @@
         this.portletAppMD = portletAppMD;
         this.jbossAppMD = jbossAppMD;
         this.servletContext = servletContext;
  -      this.contextPath = contextPath;
         this.classLoader = classLoader;
      }
   
  @@ -117,11 +109,6 @@
         return servletContext;
      }
   
  -   public String getContextPath()
  -   {
  -      return contextPath;
  -   }
  -
      public ClassLoader getClassLoader()
      {
         return classLoader;