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 ta...@apache.org on 2004/04/07 05:55:00 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session NavigationalState.java
taylor 2004/04/06 20:55:00
Modified: portal/src/java/org/apache/jetspeed/container/url
PortalURL.java
portal/src/java/org/apache/jetspeed/container/session/impl
PathNavigationalState.java
SessionNavigationalState.java
JetspeedNavigationalStateComponent.java
portal/src/java/org/apache/jetspeed/container/url/impl
SessionPortalURL.java PathPortalURL.java
AbstractPortalURL.java
portal/src/java/org/apache/jetspeed/container
ContainerValve.java
portal/src/java/org/apache/jetspeed/container/session
NavigationalState.java
Log:
working on the final step, sync'ing up the nav state
unfortunately im still getting NPEs out of Tomcat's getPathInfo
giving up for now
PR:
Obtained from:
Submitted by:
Reviewed by:
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.5 +4 -1 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/PortalURL.java
Index: PortalURL.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/PortalURL.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PortalURL.java 7 Apr 2004 00:49:29 -0000 1.4
+++ PortalURL.java 7 Apr 2004 03:55:00 -0000 1.5
@@ -11,6 +11,7 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
+import org.apache.jetspeed.container.url.impl.PortalControlParameter;
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.om.window.PortletWindow;
@@ -65,6 +66,8 @@
WindowState getPreviousState(PortletWindow window);
///////////////////////////////////////////////
+
+ PortalControlParameter getControlParameters();
boolean isNavigationalParameter(String token);
1.9 +5 -1 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/PathNavigationalState.java
Index: PathNavigationalState.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/PathNavigationalState.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PathNavigationalState.java 6 Apr 2004 19:45:56 -0000 1.8
+++ PathNavigationalState.java 7 Apr 2004 03:55:00 -0000 1.9
@@ -85,4 +85,8 @@
return url.getPreviousState(window);
}
+ public void sync()
+ {
+ // do nothing
+ }
}
1.10 +28 -1 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/SessionNavigationalState.java
Index: SessionNavigationalState.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/SessionNavigationalState.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SessionNavigationalState.java 7 Apr 2004 00:49:29 -0000 1.9
+++ SessionNavigationalState.java 7 Apr 2004 03:55:00 -0000 1.10
@@ -16,6 +16,7 @@
package org.apache.jetspeed.container.session.impl;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import javax.portlet.PortletMode;
@@ -23,6 +24,8 @@
import org.apache.jetspeed.container.session.NavigationalState;
import org.apache.jetspeed.container.session.NavigationalStateComponent;
+import org.apache.jetspeed.container.url.PortalURL;
+import org.apache.jetspeed.container.url.impl.PortalControlParameter;
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.om.window.PortletWindow;
@@ -108,6 +111,30 @@
return WindowState.NORMAL;
}
return state;
+ }
+
+ public void sync()
+ {
+ /*
+ PortalURL url = context.getPortalURL();
+ PortalControlParameter pcp = url.getControlParameters();
+
+ System.out.println("SYNCING NOW: " + context.getPath());
+
+ Iterator stateful = pcp.getStateFullControlParameter().entrySet().iterator();
+ while (stateful.hasNext())
+ {
+ Map.Entry entry = (Map.Entry)stateful.next();
+ System.out.println("STATEFUL KEY = " + entry.getKey() + ", VALUE = " + entry.getValue());
+ }
+ Iterator stateless = pcp.getStateLessControlParameter().entrySet().iterator();
+ while (stateless.hasNext())
+ {
+ Map.Entry entry = (Map.Entry)stateless.next();
+ System.out.println("STATELESS KEY = " + entry.getKey() + ", VALUE = " + entry.getValue());
+ }
+ System.out.println("DONE SYNCING NOW: " );
+ */
}
}
1.4 +2 -2 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/JetspeedNavigationalStateComponent.java
Index: JetspeedNavigationalStateComponent.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/JetspeedNavigationalStateComponent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JetspeedNavigationalStateComponent.java 6 Apr 2004 19:45:56 -0000 1.3
+++ JetspeedNavigationalStateComponent.java 7 Apr 2004 03:55:00 -0000 1.4
@@ -123,7 +123,7 @@
if (sessionBased && session != null)
{
session.setAttribute(NAVSTATE_SESSION_KEY, state);
- }
+ }
}
catch(Exception e)
1.3 +1 -5 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/SessionPortalURL.java
Index: SessionPortalURL.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/SessionPortalURL.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionPortalURL.java 7 Apr 2004 00:49:29 -0000 1.2
+++ SessionPortalURL.java 7 Apr 2004 03:55:00 -0000 1.3
@@ -15,16 +15,12 @@
*/
package org.apache.jetspeed.container.url.impl;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
import org.apache.jetspeed.container.session.NavigationalStateComponent;
import org.apache.jetspeed.container.url.PortalURL;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.window.PortletWindow;
/**
* PortalURL defines the interface for manipulating Jetspeed Portal URLs.
1.3 +1 -12 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/PathPortalURL.java
Index: PathPortalURL.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/PathPortalURL.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PathPortalURL.java 7 Apr 2004 00:49:29 -0000 1.2
+++ PathPortalURL.java 7 Apr 2004 03:55:00 -0000 1.3
@@ -15,17 +15,6 @@
*/
package org.apache.jetspeed.container.url.impl;
-import java.util.Iterator;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
-import javax.portlet.PortletMode;
-import javax.portlet.WindowState;
-
-import org.apache.pluto.om.window.PortletWindow;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.container.session.NavigationalStateComponent;
1.3 +6 -5 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java
Index: AbstractPortalURL.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/url/impl/AbstractPortalURL.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractPortalURL.java 7 Apr 2004 00:49:29 -0000 1.2
+++ AbstractPortalURL.java 7 Apr 2004 03:55:00 -0000 1.3
@@ -64,7 +64,7 @@
this.nsc = nsc;
init(context);
pcp = new PortalControlParameter(this, nsc);
- pcp.init();
+ pcp.init();
}
public void init(RequestContext context)
@@ -217,10 +217,11 @@
// check the complete pathInfo for
// * navigational information
// * control information
- String pathInfo = context.getRequest().getPathInfo();
+
- if (pathInfo != null)
+ if (context.getRequest().getPathInfo() != null)
{
+ String pathInfo = new String(context.getRequest().getPathInfo());
StringTokenizer tokenizer = new StringTokenizer(pathInfo, "/.");
int mode = 0; // 0=navigation, 1=control information
@@ -517,7 +518,7 @@
public abstract boolean isStateFullParameter(String tag);
- public PortalControlParameter getControlParameter()
+ public PortalControlParameter getControlParameters()
{
return this.pcp;
}
1.6 +7 -1 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/ContainerValve.java
Index: ContainerValve.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/ContainerValve.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContainerValve.java 6 Apr 2004 19:45:57 -0000 1.5
+++ ContainerValve.java 7 Apr 2004 03:55:00 -0000 1.6
@@ -19,6 +19,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.container.session.NavigationalState;
import org.apache.jetspeed.container.url.PortalURL;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
@@ -45,6 +46,11 @@
try
{
//PortletContainerServices.prepare();
+ NavigationalState state = request.getNavigationalState();
+ if (state != null)
+ {
+ state.sync();
+ }
PortalURL url = request.getPortalURL();
PortletWindow actionWindow = url.getPortletWindowOfAction();
1.8 +8 -2 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/NavigationalState.java
Index: NavigationalState.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/NavigationalState.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NavigationalState.java 6 Apr 2004 19:45:56 -0000 1.7
+++ NavigationalState.java 7 Apr 2004 03:55:00 -0000 1.8
@@ -75,5 +75,11 @@
* @return
*/
WindowState getPreviousState(PortletWindow window);
-
+
+ /**
+ * Synchronize the navigation state with the request parameters
+ *
+ */
+ void sync();
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org