weaver 2003/08/06 12:41:19
Modified: portal/src/java/org/apache/jetspeed/services/entity
PortletEntityService.java PortletEntityAccess.java
PortletEntityServiceImpl.java
Log:
Now supports the InitablePortletEntity interface
Revision Changes Path
1.2 +19 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityService.java
Index: PortletEntityService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletEntityService.java 1 Aug 2003 20:10:31 -0000 1.1
+++ PortletEntityService.java 6 Aug 2003 19:41:19 -0000 1.2
@@ -54,6 +54,7 @@
package org.apache.jetspeed.services.entity;
import org.apache.fulcrum.Service;
+import org.apache.jetspeed.om.common.entity.InitablePortletEntity;
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.entity.PortletEntity;
@@ -72,12 +73,27 @@
{
String SERVICE_NAME = "PortletEntityService";
- PortletEntity getPortletEntity(ObjectID id);
+ InitablePortletEntity getPortletEntity(ObjectID id);
- PortletEntity getPortletEntity(RequestContext request, PortletDefinition
portletDefinition, String portletName);
+ InitablePortletEntity getPortletEntity(PortletDefinition portletDefinition,
String portletName);
void storePortletEntity(PortletEntity portletEntity);
void removePortletEntity(PortletEntity portletEntity);
+
+ InitablePortletEntity newPortletEntityInstance();
+
+ /**
+ * Provides the thread-safe servicing of a request for this
<code>PortletEntity.</code>
+ * <br/>
+ * This should involve:
+ * <ul>
+ * <li>Intializing the user preferences</li>
+ * </ul>
+ *
+ * @param request The @link{org.apache.jetspeed.request.RequestContext
RequestContext}
+ * that this PortletEntity will service.
+ */
+ void serviceRequest(InitablePortletEntity portletEntity, RequestContext
request);
}
1.2 +9 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityAccess.java
Index: PortletEntityAccess.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityAccess.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletEntityAccess.java 1 Aug 2003 20:10:31 -0000 1.1
+++ PortletEntityAccess.java 6 Aug 2003 19:41:19 -0000 1.2
@@ -53,6 +53,7 @@
*/
package org.apache.jetspeed.services.entity;
+import org.apache.jetspeed.om.common.entity.InitablePortletEntity;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.util.ServiceUtil;
import org.apache.pluto.om.entity.PortletEntity;
@@ -70,9 +71,14 @@
public class PortletEntityAccess
{
- public static PortletEntity getEntity(RequestContext request, PortletDefinition
def, String portletName)
+ public static InitablePortletEntity getEntity(PortletDefinition def, String
portletName)
{
- return getService().getPortletEntity(request, def, portletName);
+ return getService().getPortletEntity(def, portletName);
+ }
+
+ public static void serviceRequest(InitablePortletEntity portletEntity,
RequestContext request)
+ {
+ getService().serviceRequest(portletEntity, request);
}
protected static PortletEntityService getService()
1.4 +28 -10
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityServiceImpl.java
Index: PortletEntityServiceImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/entity/PortletEntityServiceImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PortletEntityServiceImpl.java 4 Aug 2003 15:45:38 -0000 1.3
+++ PortletEntityServiceImpl.java 6 Aug 2003 19:41:19 -0000 1.4
@@ -58,7 +58,11 @@
import org.apache.fulcrum.BaseService;
import org.apache.fulcrum.InitializationException;
import org.apache.jetspeed.om.common.entity.PortletEntityImpl;
+import org.apache.jetspeed.om.common.entity.InitablePortletEntity;
+import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.util.ArgUtil;
+import org.apache.jetspeed.util.JetspeedObjectID;
import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.portlet.PortletDefinition;
@@ -93,7 +97,7 @@
/**
* @see
org.apache.jetspeed.services.entity.PortletEntityService#getPortletEntity(org.apache.pluto.om.common.ObjectID)
*/
- public PortletEntity getPortletEntity(ObjectID id)
+ public InitablePortletEntity getPortletEntity(ObjectID id)
{
// TODO Auto-generated method stub
return null;
@@ -102,20 +106,19 @@
/**
* @see
org.apache.jetspeed.services.entity.PortletEntityService#getPortletEntity(org.apache.jetspeed.request.RequestContext)
*/
- public PortletEntity getPortletEntity(RequestContext request, PortletDefinition
portletDefinition, String portletName)
+ public InitablePortletEntity getPortletEntity(PortletDefinition
portletDefinition, String instanceName)
{
- PortletEntityImpl portletEntity = new PortletEntityImpl(portletDefinition,
portletName);
+ ObjectID entityId =
JetspeedObjectID.createPortletEntityId(portletDefinition, instanceName);
- if (entityCache.containsKey(portletEntity.getId()))
+ if (entityCache.containsKey(entityId))
{
- ObjectID oid = portletEntity.getId();
- // Speed GC object reclaimation.
- portletEntity = null;
- return (PortletEntity) entityCache.get(oid);
+ return (InitablePortletEntity) entityCache.get(entityId);
}
else
{
- entityCache.put(portletEntity.getId(), portletEntity);
+ InitablePortletEntity portletEntity = newPortletEntityInstance();
+ portletEntity.init(portletDefinition, instanceName);
+ entityCache.put(entityId, portletEntity);
return portletEntity;
}
@@ -136,6 +139,21 @@
public void removePortletEntity(PortletEntity portletEntity)
{
// TODO Auto-generated method stub
+
+ }
+
+ /**
+ * @see
org.apache.jetspeed.services.entity.PortletEntityService#newPortletEntityInstance()
+ */
+ public InitablePortletEntity newPortletEntityInstance()
+ {
+ // TODO: need to be made configurable
+ return new PortletEntityImpl();
+ }
+
+ public void serviceRequest(InitablePortletEntity portletEntity, RequestContext
request)
+ {
+ ArgUtil.notNull(new Object[] { portletEntity, request }, new String[] {
"portletEntity", "request" }, "serviceRequest()");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
