Author: ate
Date: Sat Sep 16 05:56:10 2006
New Revision: 446871
URL: http://svn.apache.org/viewvc?view=rev&rev=446871
Log:
Fixes for PB-46 and PB-47 reported on the bridges-user list by Scott Anderson:
http://issues.apache.org/jira/browse/PB-46
http://issues.apache.org/jira/browse/PB-47
Modified:
portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/FilterPortlet.java
portals/bridges/trunk/project.properties
Modified:
portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/FilterPortlet.java
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/FilterPortlet.java?view=diff&rev=446871&r1=446870&r2=446871
==============================================================================
---
portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/FilterPortlet.java
(original)
+++
portals/bridges/trunk/portletfilter/src/java/org/apache/portals/bridges/portletfilter/FilterPortlet.java
Sat Sep 16 05:56:10 2006
@@ -22,6 +22,7 @@
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
+import javax.portlet.GenericPortlet;
import javax.portlet.Portlet;
import javax.portlet.PortletConfig;
import javax.portlet.PortletContext;
@@ -64,7 +65,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Shinsuke Sugaya</a>
*/
-public class FilterPortlet implements Portlet, PortletConfig
+public class FilterPortlet extends GenericPortlet
{
private static final Log log = LogFactory.getLog(FilterPortlet.class);
@@ -72,12 +73,11 @@
private PortletFilterChain portletFilterChain;
- private PortletConfig portletConfig;
-
private Portlet portlet;
public void init(PortletConfig config) throws PortletException
{
+ super.init(config);
if (log.isTraceEnabled())
{
log.trace("Initializing FilterPortlet.");
@@ -159,7 +159,7 @@
{
return ((PortletConfig) portlet).getInitParameter(arg0);
}
- return portletConfig.getInitParameter(arg0);
+ return super.getInitParameter(arg0);
}
/* (non-Javadoc)
@@ -171,7 +171,7 @@
{
return ((PortletConfig) portlet).getInitParameterNames();
}
- return portletConfig.getInitParameterNames();
+ return super.getInitParameterNames();
}
/* (non-Javadoc)
@@ -183,7 +183,7 @@
{
return ((PortletConfig) portlet).getPortletContext();
}
- return portletConfig.getPortletContext();
+ return super.getPortletContext();
}
/* (non-Javadoc)
@@ -195,7 +195,7 @@
{
return ((PortletConfig) portlet).getPortletName();
}
- return portletConfig.getPortletName();
+ return super.getPortletName();
}
/* (non-Javadoc)
@@ -207,7 +207,6 @@
{
return ((PortletConfig) portlet).getResourceBundle(arg0);
}
- return portletConfig.getResourceBundle(arg0);
+ return super.getResourceBundle(arg0);
}
-
}
Modified: portals/bridges/trunk/project.properties
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/project.properties?view=diff&rev=446871&r1=446870&r2=446871
==============================================================================
--- portals/bridges/trunk/project.properties (original)
+++ portals/bridges/trunk/project.properties Sat Sep 16 05:56:10 2006
@@ -93,7 +93,7 @@
portals.bridges.python.version=1.0
portals.bridges.struts.version=1.0.1-dev
portals.bridges.velocity.version=1.0
-portals.bridges.portletfilter.version=1.0
+portals.bridges.portletfilter.version=1.0.1-dev
# dependency versions
commons.logging.version=1.0.4
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]