taylor 2004/08/20 09:39:22
Modified: components/registry/src/java/org/apache/jetspeed/om/portlet/impl
PortletDefinitionImpl.java
Log:
Shinsuke: the commented out code was crashing the aggregation engine,
when rendering the PAM page
also, it was bypassing the portlet cache
i think we are guaranteed at this point to have a class loader
but i need to test against a resource bundle
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.18 +20 -3
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
Index: PortletDefinitionImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- PortletDefinitionImpl.java 16 Aug 2004 18:29:13 -0000 1.17
+++ PortletDefinitionImpl.java 20 Aug 2004 16:39:22 -0000 1.18
@@ -175,10 +175,18 @@
public LanguageSet getLanguageSet()
{
if ( languageSet != null )
+ {
langListWrapper.setInnerCollection(languageSet);
+ }
+ /* DTX
+ Shinsuke: this code was crashing the aggregation engine, when rendering
the PAM page
+ also, it was bypassing the portlet cache
+ i think we are guaranteed at this point to have a class loader
+ but i need to test against a resource bundle
+
try
{
- Portlet portlet =
JetspeedPortletFactoryProxy.loadPortletClass(getClassName());
+ Portlet portlet = JetspeedPortletFactoryProxy.getPortlet(config, this);
//loadPortletClass(getClassName());
if (portlet != null)
{
setPortletClassLoader(portlet.getClass().getClassLoader());
@@ -191,7 +199,9 @@
catch (IllegalAccessException e)
{
}
-
+*/
+ langListWrapper.setClassLoader(getPortletClassLoader());
+
return langListWrapper;
}
@@ -834,12 +844,19 @@
{
langListWrapper.setResources(resourceBundle);
}
+ /* DTX
+ Shinsuke: this code was crashing the aggregation engine, when rendering
the PAM page
+ also, it was bypassing the portlet cache
+ i think we are guaranteed at this point to have a class loader
+ but i need to test against a resource bundle
Portlet portlet =
JetspeedPortletFactoryProxy.loadPortletClass(getClassName());
if (portlet != null)
{
setPortletClassLoader(portlet.getClass().getClassLoader());
langListWrapper.setClassLoader(getPortletClassLoader());
}
+ */
+ langListWrapper.setClassLoader(getPortletClassLoader());
langListWrapper.postLoad(this.supportedLocales);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
