portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/userinfo/impl FusionUserInfoManagerImpl.java
Date Mon, 08 Nov 2004 05:20:45 GMT
taylor      2004/11/07 21:20:45

  Modified:    fusion/src/java/org/apache/jetspeed/fusion/modules/actions/portlets
                        AbstractPortletApplicationAction.java
                        FusionEndCustomize.java CustomizeJSR168Action.java
               fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager
                        FusionPAM.java FusionAppServerPAM.java
               fusion/src/java/org/apache/jetspeed/fusion/services/fusion
                        FusionServiceImpl.java
               fusion/src/java/org/apache/jetspeed/fusion/util/template
                        FusionJetspeedLink.java
               fusion/src/java/org/apache/jetspeed/fusion/portal/portlets
                        JetspeedFusionPortlet.java
               fusion/src/java/org/apache/jetspeed/fusion/modules/actions
                        FusionAccessController.java
               fusion   locator.ent project.xml
               fusion/src/java/org/apache/jetspeed/fusion/portal/controls
                        FusionPortletControl.java
               fusion/src/java/org/apache/jetspeed/fusion/userinfo/impl
                        FusionUserInfoManagerImpl.java
  Log:
  converting over Fusion to the latest changes in J2 dependencies, DAO components, etc
  adding support for new PortalURL implementation. still working on this, its broken at this
point but at least it compiles and runs
  getting an NPE in SessionNavigationalState because we don't have a Page in the request context
  considering adding a page valve to insert the current page from J1 into the request context
  
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.3       +9 -9      jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/modules/actions/portlets/AbstractPortletApplicationAction.java
  
  Index: AbstractPortletApplicationAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/modules/actions/portlets/AbstractPortletApplicationAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractPortletApplicationAction.java	3 Aug 2004 05:06:16 -0000	1.2
  +++ AbstractPortletApplicationAction.java	8 Nov 2004 05:20:44 -0000	1.3
  @@ -16,9 +16,9 @@
   package org.apache.jetspeed.fusion.modules.actions.portlets;
   
   import java.util.ArrayList;
  -import java.util.List;
  +import java.util.Collection;
   
  -import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
  +import org.apache.jetspeed.components.portletregistry.PortletRegistry;
   import org.apache.jetspeed.modules.actions.portlets.VelocityPortletAction;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
   import org.apache.jetspeed.services.JetspeedPortletServices;
  @@ -42,13 +42,13 @@
   {
       protected static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(AbstractPortletApplicationAction.class.getName());
       protected DeploymentRegistration registrar = null;
  -    protected PortletRegistryComponent registry = null;
  +    protected PortletRegistry registry = null;
       protected final String PANEID_PA_UPDATE = "PAUpdate";
       protected final String PANEID_PA_BROWSER = "PABrowser";
       
  -    protected List getPortletApplications()
  +    protected Collection getPortletApplications()
       {
  -        PortletRegistryComponent reg = getRegistryComponent();
  +        PortletRegistry reg = getRegistryComponent();
           if (null == reg)
           {
               return new ArrayList(); 
  @@ -58,7 +58,7 @@
       
       protected PortletApplicationViewBean getPortletApplication(String name)
       {
  -        PortletRegistryComponent reg = getRegistryComponent();
  +        PortletRegistry reg = getRegistryComponent();
           if (null == reg)
           {
               return null; 
  @@ -94,7 +94,7 @@
           return registrar;
       }
   
  -    private PortletRegistryComponent getRegistryComponent()
  +    private PortletRegistry getRegistryComponent()
       {
           if (registry != null)
           {
  @@ -106,7 +106,7 @@
               PortletServices services = JetspeedPortletServices.getSingleton();
               if (services != null)
               {
  -                registry = (PortletRegistryComponent)services.getService("PortletRegistryComponent");
  +                registry = (PortletRegistry)services.getService("PortletRegistryComponent");
               }
           }
           catch (Exception e)
  
  
  
  1.3       +3 -3      jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/modules/actions/portlets/FusionEndCustomize.java
  
  Index: FusionEndCustomize.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/modules/actions/portlets/FusionEndCustomize.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FusionEndCustomize.java	10 Aug 2004 04:15:54 -0000	1.2
  +++ FusionEndCustomize.java	8 Nov 2004 05:20:44 -0000	1.3
  @@ -19,7 +19,7 @@
   
   import org.apache.jetspeed.Jetspeed;
   import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
  -import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
  +import org.apache.jetspeed.components.portletregistry.PortletRegistry;
   import org.apache.jetspeed.modules.actions.controls.EndCustomize;
   import org.apache.jetspeed.om.profile.Entry;
   import org.apache.jetspeed.om.profile.Parameter;
  @@ -104,8 +104,8 @@
                   Parameter param = entry.getParameter(J2_ENTITY);
                   if (param == null)
                   {
  -                    PortletRegistryComponent registryAccess =
  -                        (PortletRegistryComponent)Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
  +                    PortletRegistry registryAccess =
  +                        (PortletRegistry)Jetspeed.getComponentManager().getComponent(PortletRegistry.class);
                       PortletEntityAccessComponent entityAccess =
                           (PortletEntityAccessComponent)Jetspeed.getComponentManager().getComponent(PortletEntityAccessComponent.class);
                       
  
  
  
  1.4       +2 -2      jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/modules/actions/portlets/CustomizeJSR168Action.java
  
  Index: CustomizeJSR168Action.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/modules/actions/portlets/CustomizeJSR168Action.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CustomizeJSR168Action.java	29 Aug 2004 22:20:06 -0000	1.3
  +++ CustomizeJSR168Action.java	8 Nov 2004 05:20:44 -0000	1.4
  @@ -9,7 +9,7 @@
   import java.util.prefs.Preferences;
   
   import org.apache.jetspeed.Jetspeed;
  -import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
  +import org.apache.jetspeed.components.portletregistry.PortletRegistry;
   import org.apache.jetspeed.modules.actions.portlets.CustomizeSetAction;
   import org.apache.jetspeed.modules.actions.portlets.VelocityPortletAction;
   import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
  @@ -109,7 +109,7 @@
   		        
   		        //TODO:  get prefs from user and entity, add to hash
   		        
  -		        PortletRegistryComponent registry = (PortletRegistryComponent) Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
  +		        PortletRegistry registry = (PortletRegistry) Jetspeed.getComponentManager().getComponent(PortletRegistry.class);
   		        //PersistenceStore store = registry.getPersistenceStore();
   		        
   		        //store.getTransaction().begin();
  
  
  
  1.15      +5 -9      jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionPAM.java
  
  Index: FusionPAM.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionPAM.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- FusionPAM.java	16 Aug 2004 22:33:44 -0000	1.14
  +++ FusionPAM.java	8 Nov 2004 05:20:44 -0000	1.15
  @@ -25,9 +25,8 @@
   import org.apache.commons.logging.LogFactory;
   import org.apache.jetspeed.Jetspeed;
   import org.apache.jetspeed.cache.PortletCache;
  -import org.apache.jetspeed.components.persistence.store.PersistenceStore;
   import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
  -import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
  +import org.apache.jetspeed.components.portletregistry.PortletRegistry;
   import org.apache.jetspeed.container.window.PortletWindowAccessor;
   import org.apache.jetspeed.exception.RegistryException;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
  @@ -87,7 +86,7 @@
       private static final String JS1_REFERENCE_TYPE = "ref";
           
       public FusionPAM(String webAppsDir, 
  -                     PortletRegistryComponent registry, 
  +                     PortletRegistry registry, 
                        PortletEntityAccessComponent entityAccess, 
                        PortletWindowAccessor windowAccess,
                        PortletCache portletCache,                     
  @@ -179,13 +178,11 @@
       private void fusionDeploy(String paName)
       throws PortletApplicationException    
       {        
  -        //create xreg
  -        PersistenceStore store = registry.getPersistenceStore();
  +        //create xreg        
           try
           {
               // remove entries from the registry
               // registry.processPortletApplicationTree(app, "remove");
  -            store.getTransaction().begin();
               log.info("Saving the portlet.xml in the J1 registry...");
               
               MutablePortletApplication app = registry.getPortletApplication(paName);
  @@ -201,7 +198,6 @@
                   System.out.println("Writing registry: " + entry.getName());
               }
               
  -            store.getTransaction().commit();
           }        
           catch (Exception e1)
           {
  @@ -441,7 +437,7 @@
      
       private void fusionUndeploy(String paName, boolean zapPSML)
       {
  -        PortletRegistryComponent registry = (PortletRegistryComponent) Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
  +        PortletRegistry registry = (PortletRegistry) Jetspeed.getComponentManager().getComponent(PortletRegistry.class);
           
           try
           {
  
  
  
  1.8       +3 -3      jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionAppServerPAM.java
  
  Index: FusionAppServerPAM.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionAppServerPAM.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- FusionAppServerPAM.java	4 Aug 2004 04:52:18 -0000	1.7
  +++ FusionAppServerPAM.java	8 Nov 2004 05:20:45 -0000	1.8
  @@ -22,7 +22,7 @@
   import org.apache.commons.logging.LogFactory;
   import org.apache.jetspeed.cache.PortletCache;
   import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
  -import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
  +import org.apache.jetspeed.components.portletregistry.PortletRegistry;
   import org.apache.jetspeed.container.window.PortletWindowAccessor;
   import org.apache.jetspeed.tools.pamanager.Lifecycle;
   import org.apache.jetspeed.tools.pamanager.PortletApplicationException;
  @@ -49,7 +49,7 @@
       private ApplicationServerManager appServerManager = null;
       protected static final Log log = LogFactory.getLog("deployment");
   
  -    public FusionAppServerPAM( String webAppsDir, PortletRegistryComponent registry, 
  +    public FusionAppServerPAM( String webAppsDir, PortletRegistry registry, 
               PortletEntityAccessComponent entityAccess, PortletWindowAccessor windowAccess,
               ApplicationServerManager appServerManager, PortletCache portletCache )
       {     
  
  
  
  1.5       +6 -4      jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/services/fusion/FusionServiceImpl.java
  
  Index: FusionServiceImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/services/fusion/FusionServiceImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FusionServiceImpl.java	17 Oct 2004 10:37:47 -0000	1.4
  +++ FusionServiceImpl.java	8 Nov 2004 05:20:45 -0000	1.5
  @@ -21,7 +21,8 @@
   import org.apache.commons.configuration.PropertiesConfiguration;
   
   import org.apache.jetspeed.components.ComponentManager;
  -import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
  +import org.apache.jetspeed.components.portletregistry.PortletRegistry;
  +import org.apache.jetspeed.cps.CommonPortletServices;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
   import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
   import org.apache.jetspeed.services.logging.JetspeedLogger;
  @@ -34,7 +35,6 @@
   // Fusion
   import org.apache.jetspeed.Jetspeed;
   import org.apache.jetspeed.engine.Engine;
  -import org.apache.jetspeed.engine.JetspeedEngineConstants;
   import org.apache.jetspeed.engine.SpringEngine;
   import org.apache.jetspeed.exception.JetspeedException;
   
  @@ -56,6 +56,8 @@
       private boolean debug = false;
       private String propertiesFile = "/WEB-INF/conf/fusion.properties";
               
  +    protected CommonPortletServices cps = null;
  +
       // Jetspeed engine
       private Engine jetspeed = null;
       
  @@ -88,7 +90,7 @@
               applicationRoot = conf.getServletContext().getRealPath("/");
               String realPath = conf.getServletContext().getRealPath(propertiesFile);
               properties = (Configuration) new PropertiesConfiguration(realPath);
  -            properties.setProperty(JetspeedEngineConstants.APPLICATION_ROOT_KEY, applicationRoot);
  +            properties.setProperty(CommonPortletServices.APPLICATION_ROOT_KEY, applicationRoot);
       
               System.out.println("APP ROOT = " + applicationRoot);
               System.out.println("PROP FILE = " + realPath);
  @@ -167,7 +169,7 @@
       try
       {
           ComponentManager cm = Jetspeed.getComponentManager();
  -        PortletRegistryComponent registry = (PortletRegistryComponent)cm.getComponent(PortletRegistryComponent.class);
  +        PortletRegistry registry = (PortletRegistry)cm.getComponent(PortletRegistry.class);
           if (registry == null) 
           {
               System.err.println("Failed to get registry component!");
  
  
  
  1.3       +16 -7     jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/util/template/FusionJetspeedLink.java
  
  Index: FusionJetspeedLink.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/util/template/FusionJetspeedLink.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FusionJetspeedLink.java	29 Aug 2004 22:20:19 -0000	1.2
  +++ FusionJetspeedLink.java	8 Nov 2004 05:20:45 -0000	1.3
  @@ -18,9 +18,8 @@
   import java.util.Iterator;
   import java.util.Map;
   
  -import org.apache.jetspeed.container.session.NavigationalState;
  -import org.apache.jetspeed.container.session.impl.JetspeedNavigationalStateComponent;
  -import org.apache.jetspeed.container.url.PortalControlParameter;
  +import org.apache.jetspeed.container.state.NavigationalState;
  +import org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateComponent;
   import org.apache.jetspeed.container.url.PortalURL;
   import org.apache.jetspeed.fusion.portal.portlets.JetspeedFusionPortlet;
   import org.apache.jetspeed.request.RequestContext;
  @@ -82,13 +81,19 @@
       }
   
       public DynamicURI getLink(int rootType, String rootValue, String pageName, int elementType,
String elementValue, String actionName, String templateName, String mediaType, String language,
String country)
  -    {
  +    {        
           DynamicURI uri = super.getLink(rootType, rootValue, pageName, elementType, elementValue,
actionName, templateName, mediaType, language, country);
  -        NavigationalState state = getNavigationalState(this.rundata);
  +        
  +        //NavigationalState state = getNavigationalState(this.rundata);
           RequestContext context = (RequestContext) this.rundata.getRequest().getAttribute(JetspeedFusionPortlet.FUSION_NAV_STATE);
  -        if (context != null)
  +        
  +        // PortalURL url = context.getPortalURL();
  +        // url.getNavigationalState().getParameterNames();
  +/*
  +                if (context != null)
           {
               PortalURL url = context.getPortalURL();
  +            url.getNavigationalState().get
               PortalControlParameter pcp = url.getControlParameters();
               Map stateful = pcp.getStateFullControlParameter();
               Iterator params = stateful.entrySet().iterator();
  @@ -100,12 +105,16 @@
               }
           }
           return uri;
  +        */
  +        return uri;
       }
       
  +    /*
       public NavigationalState getNavigationalState(JetspeedRunData data)
       {
           return
               (NavigationalState)data.getSession().getAttribute(JetspeedNavigationalStateComponent.NAVSTATE_SESSION_KEY);
       }
  +    */
       
   }
  
  
  
  1.8       +11 -11    jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/portal/portlets/JetspeedFusionPortlet.java
  
  Index: JetspeedFusionPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/portal/portlets/JetspeedFusionPortlet.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JetspeedFusionPortlet.java	13 Aug 2004 22:38:51 -0000	1.7
  +++ JetspeedFusionPortlet.java	8 Nov 2004 05:20:45 -0000	1.8
  @@ -27,10 +27,10 @@
   import org.apache.jetspeed.Jetspeed;
   import org.apache.jetspeed.PortalReservedParameters;
   import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
  -import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
  -import org.apache.jetspeed.container.session.NavigationalState;
  -import org.apache.jetspeed.container.session.NavigationalStateComponent;
  -import org.apache.jetspeed.container.session.impl.JetspeedNavigationalStateComponent;
  +import org.apache.jetspeed.components.portletregistry.PortletRegistry;
  +import org.apache.jetspeed.container.state.NavigationalState;
  +import org.apache.jetspeed.container.state.MutableNavigationalState;
  +import org.apache.jetspeed.container.state.NavigationalStateComponent;
   import org.apache.jetspeed.container.window.PortletWindowAccessor;
   import org.apache.jetspeed.engine.Engine;
   import org.apache.jetspeed.portal.PortletException;
  @@ -74,7 +74,7 @@
       private NavigationalStateComponent navState;
       private PortletWindowAccessor windowAccessor;
       private PortletEntityAccessComponent entityAccess;
  -    private PortletRegistryComponent registryAccess;
  +    private PortletRegistry registryAccess;
           
       public void init()
       throws PortletException
  @@ -85,8 +85,8 @@
               Jetspeed.getComponentManager().getComponent(PortletWindowAccessor.class);
           entityAccess = (PortletEntityAccessComponent) 
               Jetspeed.getComponentManager().getComponent(PortletEntityAccessComponent.class);
  -        registryAccess = (PortletRegistryComponent)
  -            Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
       
  +        registryAccess = (PortletRegistry)
  +            Jetspeed.getComponentManager().getComponent(PortletRegistry.class);       

       }
   
       
  @@ -246,10 +246,10 @@
           return new JetspeedClearElement(result);        
       }
       
  -    public NavigationalState getNavigationalState(JetspeedRunData data)
  +    public MutableNavigationalState getNavigationalState(JetspeedRunData data)
       {
           return
  -            (NavigationalState)data.getSession().getAttribute(JetspeedNavigationalStateComponent.NAVSTATE_SESSION_KEY);
  +            (MutableNavigationalState)data.getSession().getAttribute(NavigationalState.NAVSTATE_SESSION_KEY);
       }
       
       private void syncNavigationalState(PortletWindow window,
  @@ -257,7 +257,7 @@
                                          int mode,
                                          PortletInstance instance)
       {
  -        NavigationalState nav = getNavigationalState(data);
  +        MutableNavigationalState nav = getNavigationalState(data);
           if (null == nav)
           {
               return;
  
  
  
  1.5       +35 -18    jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/modules/actions/FusionAccessController.java
  
  Index: FusionAccessController.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/modules/actions/FusionAccessController.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FusionAccessController.java	11 Aug 2004 21:24:10 -0000	1.4
  +++ FusionAccessController.java	8 Nov 2004 05:20:45 -0000	1.5
  @@ -24,7 +24,9 @@
   
   import org.apache.jetspeed.Jetspeed;
   import org.apache.jetspeed.PortalReservedParameters;
  -import org.apache.jetspeed.container.session.NavigationalStateComponent;
  +import org.apache.jetspeed.container.state.NavigationalState;
  +import org.apache.jetspeed.container.state.NavigationalStateComponent;
  +import org.apache.jetspeed.container.url.PortalURL;
   import org.apache.jetspeed.engine.Engine;
   import org.apache.jetspeed.modules.actions.JetspeedAccessController;
   import org.apache.jetspeed.om.profile.Entry;
  @@ -41,6 +43,7 @@
   import org.apache.jetspeed.services.resources.FusionResources;
   import org.apache.jetspeed.services.resources.JetspeedResources;
   import org.apache.jetspeed.services.rundata.JetspeedRunData;
  +import org.apache.pluto.om.window.PortletWindow;
   import org.apache.turbine.TurbineConstants;
   import org.apache.turbine.util.RunData;
   
  @@ -92,29 +95,43 @@
               //
               // Handle Action Phase via Action Pipeline
               //
  -            String action[] = nav.parsePortalParameter(request, NavigationalStateComponent.ACTION);
  -            if (null != action)
  -            {                
  -                // System.out.println("*** ACTION PARAM FOUND!!!!!!!!!!! ****");      
         
  -                ServletConfig config = data.getServletConfig();
  -                Engine engine = Jetspeed.getEngine();
  -                contextComponent = (RequestContextComponent)Jetspeed.getComponentManager().getComponent(RequestContextComponent.class);
  -                context = contextComponent.create(request, response, config);
  -                context.setAttribute(PortalReservedParameters.PIPELINE, PortalReservedParameters.ACTION_PIPELINE);
               
  -                
  -                engine.service(context);
  -            }
  +            
  +            // System.out.println("*** ACTION PARAM FOUND!!!!!!!!!!! ****");          
     
  +            ServletConfig config = data.getServletConfig();
  +            Engine engine = Jetspeed.getEngine();
  +            contextComponent = (RequestContextComponent)Jetspeed.getComponentManager().getComponent(RequestContextComponent.class);
  +            context = contextComponent.create(request, response, config);
  +
               
               //
               // Sync up navigational state for J1 Portlet Control decorators
               //            
  -            String state[] = nav.parsePortalParameter(request, NavigationalStateComponent.STATE);
  -            if (state != null)
  +            //if (state.)
  +            //String state[] = nav.parsePortalParameter(request, "_ns"); // TODO don't
hard code
  +            //if (state != null)
  +            
  +            PortalURL url = context.getPortalURL();
  +            if (url != null)
               {
  -                String windowId = nav.getWindowIdFromKey(state[0]);
  +                NavigationalState state = url.getNavigationalState();
  +                PortletWindow actionWindow = state.getPortletWindowOfAction();
  +                if (actionWindow != null)
  +                {
  +                    context.setAttribute(PortalReservedParameters.PIPELINE, PortalReservedParameters.ACTION_PIPELINE);
                               
  +                    engine.service(context);
  +                }
  +            
  +                String windowId = actionWindow.getId().toString();
  +                //String windowId = nav.getWindowIdFromKey(state[0]);
                   //System.out.println("got token = " + state[0]+ ", window id = " + windowId
+ ", action = " + state[1]);
                   Portlets portlets = ((JetspeedRunData)data).getProfile().getDocument().getPortlets();
  -                traverse(portlets, windowId, state[1], (JetspeedRunData)data);
  +                //traverse(portlets, windowId, state[1], (JetspeedRunData)data);
  +                String windowState = state.getState(actionWindow).toString();
  +                if (windowState == null)
  +                {
  +                    windowState = "";
  +                }
  +                traverse(portlets, windowId, windowState, (JetspeedRunData)data);
               }
           }
           catch (Throwable t)
  
  
  
  1.4       +1 -1      jakarta-jetspeed/fusion/locator.ent
  
  Index: locator.ent
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/locator.ent,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- locator.ent	13 Oct 2004 15:57:00 -0000	1.3
  +++ locator.ent	8 Nov 2004 05:20:45 -0000	1.4
  @@ -14,4 +14,4 @@
   limitations under the License.
   -->
   <!ENTITY fusion SYSTEM "file:../etc/project-dependencies/use-fusion.xml">	
  -<!ENTITY pico-nano-groovy SYSTEM "file:../etc/project-dependencies/spring-deps.xml">

  \ No newline at end of file
  +<!ENTITY spring SYSTEM "file:../etc/project-dependencies/spring-deps.xml">	
  \ No newline at end of file
  
  
  
  1.8       +8 -9      jakarta-jetspeed/fusion/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	23 Jul 2004 00:10:00 -0000	1.7
  +++ project.xml	8 Nov 2004 05:20:45 -0000	1.8
  @@ -46,7 +46,7 @@
       </developer>
     </developers>
     <dependencies>
  -  	&pico-nano-groovy;
  +  	&spring;
       &fusion;
       <dependency>
         <id>fulcrum</id>
  @@ -99,14 +99,13 @@
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>  
  -    <dependency>
  -      <id>ojb:db-ojb</id>
  -      <version>1.0.rc6-patched</version>
  -      <properties>
  -        <war.bundle>true</war.bundle>
  -      </properties>
  -    </dependency>
  -          
  +	<dependency>
  +		<id>ojb:db-ojb</id>
  +	    <version>1.0.1</version>
  +	    <properties>
  +	    	<war.bundle>true</war.bundle>
  +	    </properties>
  +	</dependency>          
       <dependency>
           <id>turbine</id>
           <version>2.2</version>
  
  
  
  1.3       +2 -2      jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/portal/controls/FusionPortletControl.java
  
  Index: FusionPortletControl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/portal/controls/FusionPortletControl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FusionPortletControl.java	24 Aug 2004 18:14:32 -0000	1.2
  +++ FusionPortletControl.java	8 Nov 2004 05:20:45 -0000	1.3
  @@ -27,7 +27,7 @@
   
   import org.apache.jetspeed.Jetspeed;
   import org.apache.jetspeed.PortalReservedParameters;
  -import org.apache.jetspeed.container.session.NavigationalState;
  +import org.apache.jetspeed.container.state.NavigationalState;
   import org.apache.jetspeed.engine.Engine;
   import org.apache.jetspeed.fusion.portal.portlets.JetspeedFusionPortlet;
   import org.apache.jetspeed.om.security.JetspeedUser;
  
  
  
  1.3       +4 -4      jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/userinfo/impl/FusionUserInfoManagerImpl.java
  
  Index: FusionUserInfoManagerImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/userinfo/impl/FusionUserInfoManagerImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FusionUserInfoManagerImpl.java	11 Aug 2004 23:59:11 -0000	1.2
  +++ FusionUserInfoManagerImpl.java	8 Nov 2004 05:20:45 -0000	1.3
  @@ -21,7 +21,7 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
  +import org.apache.jetspeed.components.portletregistry.PortletRegistry;
   import org.apache.jetspeed.om.common.UserAttributeRef;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
   import org.apache.jetspeed.om.security.JetspeedUser;
  @@ -52,9 +52,9 @@
       private final static String FUSION_USER_INFO = "org.apache.jetspeed.fusion.userinfo";
       
       private JetspeedRunDataService runDataService = null;
  -    private PortletRegistryComponent registry;
  +    private PortletRegistry registry;
       
  -    public FusionUserInfoManagerImpl(PortletRegistryComponent registry)
  +    public FusionUserInfoManagerImpl(PortletRegistry registry)
       {
           this.registry = registry;
       }
  
  
  

---------------------------------------------------------------------
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