[jboss-svn-commits] JBL Code SVN: r9651 - in labs/jbosslabs/trunk/portal-extensions: jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 20 09:14:58 EST 2007
Author: szimano
Date: 2007-02-20 09:14:58 -0500 (Tue, 20 Feb 2007)
New Revision: 9651
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
jbosswiki session fix
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-02-20 14:04:47 UTC (rev 9650)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-02-20 14:14:58 UTC (rev 9651)
@@ -76,9 +76,11 @@
*/
public void processAction(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
- if (sessionTimedOut(request))
- return;
+ //if (sessionTimedOut(request))
+ // return;
+ log.info("pp action");
+
setPortletRequestFlag(request);
// parse and setup any attachments if they are sent in
@@ -197,6 +199,7 @@
}
private void prepareParams(ActionRequest request, ActionResponse response) {
+ log.info("pp param");
Map<String, String> paramMap = request.getParameterMap();
for (String key : paramMap.keySet()) {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-02-20 14:04:47 UTC (rev 9650)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-02-20 14:14:58 UTC (rev 9651)
@@ -137,6 +137,8 @@
}
+ log.info("page loaded: "+currentPage.getName());
+
return currentPage;
}
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-02-20 14:04:47 UTC (rev 9650)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-02-20 14:14:58 UTC (rev 9651)
@@ -425,35 +425,30 @@
<portal>
<portal-name>template</portal-name>
<properties>
+ <!-- Set the layout for the default portal, see also portal-layouts.xml. -->
+ <property>
+ <name>layout.id</name>
+ <value>org</value>
+ </property>
+ <!-- Set the theme for the default portal, see also portal-themes.xml. -->
+ <property>
+ <name>theme.id</name>
+ <!--value>jboss-forge</value-->
+ <value>org</value>
+ </property>
+ <!-- Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml -->
+ <property>
+ <name>theme.renderSetId</name>
+ <!--value>emptyRenderer</value-->
+ <value>divRenderer</value>
+ </property>
+ <!-- Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml -->
+ <property>
+ <name>layout.strategyId</name>
+ <!--<value>jbfStrategy</value>-->
+ <value>maximizedRegion</value>
+ </property>
<!--
- | Set the layout for the default portal, see also portal-layouts.xml.
- -->
- <property>
- <name>layout.id</name>
- <value>generic</value>
- </property>
- <!--
- | Set the theme for the default portal, see also portal-themes.xml.
- -->
- <property>
- <name>theme.id</name>
- <value>renaissance</value>
- </property>
- <!--
- | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
- -->
- <property>
- <name>theme.renderSetId</name>
- <value>divRenderer</value>
- </property>
- <!--
- | Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml
- -->
- <property>
- <name>layout.strategyId</name>
- <value>maximizedRegion</value>
- </property>
- <!--
| The default page name, if the property is not explicited then the default page name is "default"
-->
<property>
@@ -509,35 +504,30 @@
<context>
<context-name>dashboard</context-name>
<properties>
+ <!-- Set the layout for the default portal, see also portal-layouts.xml. -->
+ <property>
+ <name>layout.id</name>
+ <value>org</value>
+ </property>
+ <!-- Set the theme for the default portal, see also portal-themes.xml. -->
+ <property>
+ <name>theme.id</name>
+ <!--value>jboss-forge</value-->
+ <value>org</value>
+ </property>
+ <!-- Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml -->
+ <property>
+ <name>theme.renderSetId</name>
+ <!--value>emptyRenderer</value-->
+ <value>divRenderer</value>
+ </property>
+ <!-- Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml -->
+ <property>
+ <name>layout.strategyId</name>
+ <!--<value>jbfStrategy</value>-->
+ <value>maximizedRegion</value>
+ </property>
<!--
- | Set the layout for the default portal, see also portal-layouts.xml.
- -->
- <property>
- <name>layout.id</name>
- <value>generic</value>
- </property>
- <!--
- | Set the theme for the default portal, see also portal-themes.xml.
- -->
- <property>
- <name>theme.id</name>
- <value>renaissance</value>
- </property>
- <!--
- | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
- -->
- <property>
- <name>theme.renderSetId</name>
- <value>divRenderer</value>
- </property>
- <!--
- | Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml
- -->
- <property>
- <name>layout.strategyId</name>
- <value>maximizedRegion</value>
- </property>
- <!--
| Set the dashboard property
-->
<property>
More information about the jboss-svn-commits
mailing list