Author: ate
Date: Wed Feb 21 03:54:37 2007
New Revision: 509977
URL: http://svn.apache.org/viewvc?view=rev&rev=509977
Log:
Reverting back the last changes made by David for attempting to get the
CategoryPortletSelector working again
under the default strict parameter merging settings (see: JS2-605)
I've just enhanced JS2-605 allowing individual portlets to override the global
settings though jetspeed-portlet.xml metadata.
I've added these overriding metadata properties for the CategoryPortletSelector
and its now working again as expected.
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/CategoryPortletSelector.java
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/CategoryPortletSelector.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/CategoryPortletSelector.java?view=diff&rev=509977&r1=509976&r2=509977
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/CategoryPortletSelector.java
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/CategoryPortletSelector.java
Wed Feb 21 03:54:37 2007
@@ -522,18 +522,6 @@
session.removeAttribute(PORTLETS);
session.removeAttribute(CATEGORIES);
}
- String category = request.getParameter(CATEGORY);
- if (category != null)
- actionResponse.setRenderParameter(CATEGORY, category);
- String pageNumber = request.getParameter(PAGENUMNER);
- if (pageNumber != null)
- actionResponse.setRenderParameter(PAGENUMNER, pageNumber);
- String filter = request.getParameter(FILTER);
- if (filter != null)
- actionResponse.setRenderParameter(FILTER, filter);
- String pagePath = request.getParameter(JSPAGE);
- if (pagePath != null)
- actionResponse.setRenderParameter(JSPAGE, pagePath);
}
}
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml?view=diff&rev=509977&r1=509976&r2=509977
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/jetspeed-portlet.xml
Wed Feb 21 03:54:37 2007
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<portlet-app id="j2-admin" version="1.0"
- xmlns="http://portals.apache.org/jetspeed";
- xmlns:js="http://portals.apache.org/jetspeed";
- xmlns:dc="http://www.purl.org/dc";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/jetspeed-portlet.xsd";>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<portlet-app id="j2-admin" version="1.0"
+ xmlns="http://portals.apache.org/jetspeed";
+ xmlns:js="http://portals.apache.org/jetspeed";
+ xmlns:dc="http://www.purl.org/dc";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/jetspeed-portlet.xsd";>
<js:security-constraint-ref>admin</js:security-constraint-ref>
-
- <dc:title>Jetspeed-2 Administration Portlets</dc:title>
- <dc:title xml:lang="en">Jetspeed-2 Administration Portlets</dc:title>
- <dc:creator>J2 Team</dc:creator>
- <portlet>
+ <dc:title>Jetspeed-2 Administration Portlets</dc:title>
+ <dc:title xml:lang="en">Jetspeed-2 Administration Portlets</dc:title>
+ <dc:creator>J2 Team</dc:creator>
+
+ <portlet>
<portlet-name>LoginPortlet</portlet-name>
- <js:security-constraint-ref>public-view</js:security-constraint-ref>
- <dc:title>Login Portlet</dc:title>
- <dc:creator>J2 Team</dc:creator>
- </portlet>
-
- <portlet>
- <portlet-name>LocaleSelector</portlet-name>
<js:security-constraint-ref>public-view</js:security-constraint-ref>
- <dc:title>Locale Selector Portlet</dc:title>
- <dc:creator>J2 Team</dc:creator>
- </portlet>
+ <dc:title>Login Portlet</dc:title>
+ <dc:creator>J2 Team</dc:creator>
+ </portlet>
+
+ <portlet>
+ <portlet-name>LocaleSelector</portlet-name>
+ <js:security-constraint-ref>public-view</js:security-constraint-ref>
+ <dc:title>Locale Selector Portlet</dc:title>
+ <dc:creator>J2 Team</dc:creator>
+ </portlet>
<portlet>
<portlet-name>DateTimePortlet</portlet-name>
<js:security-constraint-ref>public-view</js:security-constraint-ref>
- </portlet>
+ </portlet>
<portlet>
<portlet-name>ForgottenPasswordPortlet</portlet-name>
@@ -59,28 +59,30 @@
<portlet>
<portlet-name>CategoryPortletSelector</portlet-name>
<js:security-constraint-ref>AEUV</js:security-constraint-ref>
+ <js:metadata
name="merge.portal.parameters.with.portlet.parameters">true</js:metadata>
+ <js:metadata
name="merge.portal.parameters.before.portlet.parameters">true</js:metadata>
</portlet>
- <js:services>
- <js:service name='ApplicationServerManager'/>
- <js:service name='DeploymentManager'/>
- <js:service name='EntityAccessor'/>
- <js:service name='GroupManager'/>
- <js:service name='PageManager'/>
- <js:service name='PermissionManager'/>
- <js:service name='PortalAdministration'/>
- <js:service name='PortletFactory'/>
- <js:service name='PortalAdministration'/>
- <js:service name='PortletRegistryComponent'/>
- <js:service name='PortalStatistics'/>
- <js:service name="Profiler" />
- <js:service name='RoleManager'/>
- <js:service name='SearchComponent'/>
- <js:service name="SSO" />
- <js:service name='UserManager'/>
+ <js:services>
+ <js:service name='ApplicationServerManager'/>
+ <js:service name='DeploymentManager'/>
+ <js:service name='EntityAccessor'/>
+ <js:service name='GroupManager'/>
+ <js:service name='PageManager'/>
+ <js:service name='PermissionManager'/>
+ <js:service name='PortalAdministration'/>
+ <js:service name='PortletFactory'/>
+ <js:service name='PortalAdministration'/>
+ <js:service name='PortletRegistryComponent'/>
+ <js:service name='PortalStatistics'/>
+ <js:service name="Profiler" />
+ <js:service name='RoleManager'/>
+ <js:service name='SearchComponent'/>
+ <js:service name="SSO" />
+ <js:service name='UserManager'/>
<js:service name='DecorationFactory'/>
<js:service name='SecurityAccessController'/>
- <js:service name='PortletTrackingManager'/>
- </js:services>
-
+ <js:service name='PortletTrackingManager'/>
+ </js:services>
+
</portlet-app>
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm?view=diff&rev=509977&r1=509976&r2=509977
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/selectors/category-portlet-selector.vm
Wed Feb 21 03:54:37 2007
@@ -15,7 +15,7 @@
*#
#set ($refreshLink = $renderResponse.createActionURL())
$refreshLink.setParameter("reset","true")
-#set ($renderLink = $renderResponse.createActionURL())
+#set ($renderLink = $renderResponse.createRenderURL())
#set ($pagePath = $renderRequest.getParameter("jspage"))
<!-- Search Form -->
<form id='jsSelectorForm' onSubmit='return false;' style="height:21px;
padding: 2px; margin:10px">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
