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 we...@apache.org on 2003/10/06 02:34:52 UTC

cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information DynamicInformationProviderImpl.java StaticInformationProviderImpl.java InformationProviderServiceImpl.java

weaver      2003/10/05 17:34:52

  Modified:    portal/src/java/org/apache/jetspeed/services/information
                        DynamicInformationProviderImpl.java
                        StaticInformationProviderImpl.java
                        InformationProviderServiceImpl.java
  Log:
  - changes due to new Pluto drop
    - method signatures extended by the base pluto interfaces
  
  Revision  Changes    Path
  1.2       +37 -5     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java
  
  Index: DynamicInformationProviderImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DynamicInformationProviderImpl.java	28 Jul 2003 23:47:47 -0000	1.1
  +++ DynamicInformationProviderImpl.java	6 Oct 2003 00:34:52 -0000	1.2
  @@ -65,11 +65,14 @@
   import javax.portlet.PortletMode;
   
   import org.apache.pluto.services.information.DynamicInformationProvider;
  +import org.apache.pluto.services.information.PortletActionProvider;
  +import org.apache.pluto.services.information.ResourceURLProvider;
   import org.apache.pluto.om.window.PortletWindow;
   import org.apache.pluto.util.NamespaceMapperAccess;
   import org.apache.pluto.services.information.PortletURLProvider;
   import org.apache.jetspeed.engine.core.PortalControlParameter;
   import org.apache.jetspeed.engine.core.PortalURL;
  +import org.apache.jetspeed.engine.core.PortletActionProviderImpl;
   import org.apache.jetspeed.request.JetspeedRequestContext;
   import org.apache.jetspeed.request.RequestContext;
   import org.apache.jetspeed.Jetspeed;
  @@ -112,25 +115,25 @@
           control = new PortalControlParameter(currentURL);
       }
   
  -    public PortletURLProvider getPortletURL(PortletWindow portletWindow)
  +    public PortletURLProvider getPortletURLProvider(PortletWindow portletWindow)
       {
           return new PortletURLProviderImpl(this,
                                             portletWindow);
       }
   
  -     public String getRequestMimeType()
  +     public String getRequestContentType()
        {
            RequestContext context = JetspeedRequestContext.getRequestContext(this.request);
            return context.getMimeType().toString();
        }
   
  -     public String getResponseMimeType()
  +     public String getResponseContentType()
        {
            RequestContext context = JetspeedRequestContext.getRequestContext(this.request);
            return context.getMimeType().toString();
        }
   
  -     public Iterator getResponseMimeTypes()
  +     public Iterator getResponseContentTypes()
        {
           HashSet responseMimeTypes = new HashSet(NumberOfKnownMimetypes);
           // TODO: need to integrate with capability code       
  @@ -254,4 +257,33 @@
       private final static int NumberOfKnownMimetypes = 15;
   
       
  +    /** 
  +     * <p>
  +     * getPortletActionProvider
  +     * </p>
  +     * 
  +     * @see org.apache.pluto.services.information.DynamicInformationProvider#getPortletActionProvider(org.apache.pluto.om.window.PortletWindow)
  +     * @param arg0
  +     * @return
  +     */
  +    public PortletActionProvider getPortletActionProvider(PortletWindow window)
  +    {        
  +        return new PortletActionProviderImpl(request, config, window);
  +    }
  +
  +    /** 
  +     * <p>
  +     * getResourceURLProvider
  +     * </p>
  +     * 
  +     * @see org.apache.pluto.services.information.DynamicInformationProvider#getResourceURLProvider(org.apache.pluto.om.window.PortletWindow)
  +     * @param arg0
  +     * @return
  +     */
  +    public ResourceURLProvider getResourceURLProvider(PortletWindow window)
  +    {
  +        
  +        return new ResourceURLProviderImpl(this, window);
  +    }
  +
   }
  
  
  
  1.2       +43 -1     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java
  
  Index: StaticInformationProviderImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StaticInformationProviderImpl.java	28 Jul 2003 23:47:47 -0000	1.1
  +++ StaticInformationProviderImpl.java	6 Oct 2003 00:34:52 -0000	1.2
  @@ -55,8 +55,11 @@
   
   import javax.servlet.ServletConfig;
   
  +import org.apache.pluto.services.information.PortalContextProvider;
   import org.apache.pluto.services.information.StaticInformationProvider;
  +import org.apache.pluto.om.common.ObjectID;
   import org.apache.pluto.om.portlet.PortletDefinition;
  +import org.apache.jetspeed.engine.core.PortalContextProviderImpl;
   import org.apache.jetspeed.services.registry.JetspeedPortletRegistry;
   
   /**
  @@ -89,4 +92,43 @@
           return JetspeedPortletRegistry.getPortletDefinitionByIndetifier(uniqueId); 
       }
       
  +    /** 
  +     * <p>
  +     * getPortalContextProvider
  +     * </p>
  +     * 
  +     * @see org.apache.pluto.services.information.StaticInformationProvider#getPortalContextProvider()
  +     * @return
  +     */
  +        public PortalContextProvider getPortalContextProvider()
  +        {
  +            javax.servlet.ServletContext context = config.getServletContext();
  +
  +            PortalContextProvider provider =
  +                (PortalContextProvider) context.getAttribute("org.apache.engine.core.PortalContextProvider");
  +
  +            if (provider == null)
  +            {
  +                provider = new PortalContextProviderImpl();
  +                context.setAttribute("org.apache.engine.core.PortalContextProvider", provider);
  +            }
  +
  +            return provider;
  +        }
  +
  +    /** 
  +     * <p>
  +     * getPortletDefinition
  +     * </p>
  +     * 
  +     * @see org.apache.pluto.services.information.StaticInformationProvider#getPortletDefinition(org.apache.pluto.om.common.ObjectID)
  +     * @param arg0
  +     * @return
  +     */
  +    public PortletDefinition getPortletDefinition(ObjectID arg0)
  +    {
  +        // TODO Auto-generated method stub
  +        return null;
  +    }
  +
   }
  
  
  
  1.3       +32 -30    jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java
  
  Index: InformationProviderServiceImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InformationProviderServiceImpl.java	15 Aug 2003 00:27:54 -0000	1.2
  +++ InformationProviderServiceImpl.java	6 Oct 2003 00:34:52 -0000	1.3
  @@ -58,6 +58,7 @@
   import org.apache.fulcrum.BaseService;
   import org.apache.fulcrum.InitializationException;
   import org.apache.jetspeed.engine.core.PortalContextProviderImpl;
  +import org.apache.jetspeed.engine.core.PortalURL;
   import org.apache.jetspeed.engine.core.PortletActionProviderImpl;
   import org.apache.pluto.factory.Factory;
   import org.apache.pluto.services.information.DynamicInformationProvider;
  @@ -127,35 +128,36 @@
           return provider;
       }
   
  -    public PortalContextProvider getPortalContextProvider()
  -    {
  -        javax.servlet.ServletContext context = servletConfig.getServletContext();
  -
  -        PortalContextProvider provider =
  -            (PortalContextProvider) context.getAttribute("org.apache.engine.core.PortalContextProvider");
  -
  -        if (provider == null)
  -        {
  -            provider = new PortalContextProviderImpl();
  -            context.setAttribute("org.apache.engine.core.PortalContextProvider", provider);
  -        }
  -
  -        return provider;
  -    }
  -
  -    public PortletActionProvider getPortletActionProvider(javax.servlet.http.HttpServletRequest request)
  -    {
  -        PortletActionProvider provider =
  -            (PortletActionProvider) request.getAttribute("org.apache.engine.core.PortletActionProvider");
  -
  -        if (provider == null)
  -        {
  -            provider = new PortletActionProviderImpl(request, servletConfig);
  -            request.setAttribute("org.apache.engine.core.PortletActionProvider", provider);
  -        }
  -
  -        return provider;
  -    }
  +    //    public PortalContextProvider getPortalContextProvider()
  +    //    {
  +    //        javax.servlet.ServletContext context = servletConfig.getServletContext();
  +    //
  +    //        PortalContextProvider provider =
  +    //            (PortalContextProvider) context.getAttribute("org.apache.engine.core.PortalContextProvider");
  +    //
  +    //        if (provider == null)
  +    //        {
  +    //            provider = new PortalContextProviderImpl();
  +    //            context.setAttribute("org.apache.engine.core.PortalContextProvider", provider);
  +    //        }
  +    //
  +    //        return provider;
  +    //    }
  +    //	
  +    //    public PortletActionProvider getPortletActionProvider(javax.servlet.http.HttpServletRequest request)
  +    //    {
  +    //        PortletActionProvider provider =
  +    //            (PortletActionProvider) request.getAttribute("org.apache.engine.core.PortletActionProvider");
  +    //
  +    //        if (provider == null)
  +    //        {
  +    //        	        	
  +    //            provider = new PortletActionProviderImpl(request, servletConfig);
  +    //            request.setAttribute("org.apache.engine.core.PortletActionProvider", provider);
  +    //        }
  +    //
  +    //        return provider;
  +    //    }
   
       /**
        * @see org.apache.fulcrum.Service#init()
  
  
  

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