You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by mo...@apache.org on 2003/06/18 20:06:27 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletfactory JetspeedPortletFactoryService.java
morciuch 2003/06/18 11:06:26
Modified: src/java/org/apache/jetspeed/services/portaltoolkit
JetspeedPortalToolkitService.java
src/java/org/apache/jetspeed/services/portletfactory
JetspeedPortletFactoryService.java
Log:
Correcting some performance problems with default security ref feature (see Bugzilla bug# 18885):
1. Default security was attempted to be retrieved regardless of whether default refs are defined in jr.props.
2. Entry parent registry lookup was made regardless of whether portlet has a
parent or not.
3. Redundant default security call was made in getPortlet(Entry entry). It calls
getPortletConfig which already retrieves default security.
Revision Changes Path
1.30 +17 -14 jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit/JetspeedPortalToolkitService.java
Index: JetspeedPortalToolkitService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit/JetspeedPortalToolkitService.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- JetspeedPortalToolkitService.java 11 Apr 2003 16:01:57 -0000 1.29
+++ JetspeedPortalToolkitService.java 18 Jun 2003 18:06:26 -0000 1.30
@@ -911,23 +911,26 @@
defaultRef = this.defaultGroupSecurityRef;
}
- entry = (SecurityEntry) Registry.getEntry(Registry.SECURITY, defaultRef);
- if (Log.getLogger().isDebugEnabled())
+ if (defaultRef != null)
{
- Log.debug(
- "JetspeedPortalToolkit: default security for type: " + type + " is " + defaultRef);
- }
- if (entry != null)
- {
- result = new BaseSecurityReference();
- result.setParent(entry.getName());
+ entry = (SecurityEntry) Registry.getEntry(Registry.SECURITY, defaultRef);
if (Log.getLogger().isDebugEnabled())
{
Log.debug(
- "JetspeedPortalToolkit: default security for type: "
- + type
- + " was set to "
- + entry.getName());
+ "JetspeedPortalToolkit: default security for type: " + type + " is " + defaultRef);
+ }
+ if (entry != null)
+ {
+ result = new BaseSecurityReference();
+ result.setParent(entry.getName());
+ if (Log.getLogger().isDebugEnabled())
+ {
+ Log.debug(
+ "JetspeedPortalToolkit: default security for type: "
+ + type
+ + " was set to "
+ + entry.getName());
+ }
}
}
1.18 +13 -5 jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java
Index: JetspeedPortletFactoryService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JetspeedPortletFactoryService.java 7 May 2003 15:16:52 -0000 1.17
+++ JetspeedPortletFactoryService.java 18 Jun 2003 18:06:26 -0000 1.18
@@ -154,7 +154,9 @@
// Set portlet config with values from PSML Entry
pc.getInitParameters().putAll(getParameters(entry));
pc.setPortletSkin( PortalToolkit.getSkin( entry.getSkin() ) );
- pc.setSecurityRef( getSecurityReference(entry, regEntry));
+
+ // This is already done in getPortletConfig()
+ //pc.setSecurityRef( getSecurityReference(entry, regEntry));
return getPortlet( getClassname(regEntry), pc, entry.getId() );
}
@@ -396,7 +398,8 @@
pc.setMetainfo( getMetaData( portletEntry ) );
pc.setURL( portletEntry.getURL() );
pc.setCachedOnURL( portletEntry.isCachedOnURL() );
- pc.setSecurityRef( getSecurityReference(null, portletEntry));
+ //pc.setSecurityRef(portletEntry.getSecurityRef());
+ pc.setSecurityRef(getSecurityReference(null, portletEntry));
if (runDataService != null)
{
@@ -507,9 +510,14 @@
*/
protected static PortletEntry getParentEntry(PortletEntry entry)
{
- PortletEntry parent = (PortletEntry) Registry.getEntry(Registry.PORTLET, entry.getParent());
+ PortletEntry result = null;
+ String parent = entry.getParent();
+ if (parent != null)
+ {
+ result = (PortletEntry) Registry.getEntry(Registry.PORTLET, parent);
+ }
- return parent;
+ return result;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org