taylor 2004/05/14 19:00:07
Modified: commons/src/java/org/apache/jetspeed/portlet
ServletPortlet.java
Log:
patch from Ate Douma for Help mode handling
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.6 +3 -1
jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/portlet/ServletPortlet.java
Index: ServletPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/portlet/ServletPortlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServletPortlet.java 8 May 2004 01:20:00 -0000 1.5
+++ ServletPortlet.java 15 May 2004 02:00:07 -0000 1.6
@@ -154,6 +154,7 @@
this.defaultCustomPage = config.getInitParameter(PARAM_CUSTOM_PAGE);
this.defaultEditPage = config.getInitParameter(PARAM_EDIT_PAGE);
this.defaultViewPage = config.getInitParameter(PARAM_VIEW_PAGE);
+ this.defaultHelpPage = config.getInitParameter(PARAM_HELP_PAGE);
String allowPreferencesString =
config.getInitParameter(PARAM_ALLOW_PREFERENCES);
if (allowPreferencesString != null)
{
@@ -164,6 +165,7 @@
(this.defaultCustomPage == null) &&
(this.defaultEditPage == null) &&
(this.defaultViewPage == null) &&
+ (this.defaultHelpPage == null) &&
(this.allowPreferences == false) )
{
// This portlet is configured to do nothing!
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]