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 ta...@apache.org on 2004/06/05 07:11:18 UTC
cvs commit: jakarta-jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletentity TestPortletEntityAccessComponent.java
taylor 2004/06/04 22:11:18
Modified: components/registry/src/java/org/apache/jetspeed/components/portletentity
StoreablePortletEntityDelegate.java
PortletEntityAccessComponentImpl.java
components/registry/src/test/org/apache/jetspeed/components/portletentity
TestPortletEntityAccessComponent.java
Removed: components/registry/src/java/org/apache/jetspeed/components/portletentity
PortletEntityNotDeletedException.java
PortletEntityAccessComponent.java
PortletEntityNotStoredException.java
components/registry/src/java/org/apache/jetspeed/components/portletregistry
PortletRegistryComponent.java
RegistryException.java
Log:
removing registry and entity interfaces from component implementation
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.5 +2 -1 jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/StoreablePortletEntityDelegate.java
Index: StoreablePortletEntityDelegate.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/StoreablePortletEntityDelegate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StoreablePortletEntityDelegate.java 8 Mar 2004 00:48:24 -0000 1.4
+++ StoreablePortletEntityDelegate.java 5 Jun 2004 05:11:17 -0000 1.5
@@ -24,6 +24,7 @@
import org.apache.commons.beanutils.BeanUtils;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.persistence.store.Transaction;
+import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.portlet.impl.StoreablePortletDefinitionDelegate;
import org.apache.jetspeed.om.preference.impl.AbstractPreference;
@@ -55,7 +56,7 @@
* @version $ $
*
*/
-public class StoreablePortletEntityDelegate implements PortletEntity, PortletEntityCtrl
+public class StoreablePortletEntityDelegate implements MutablePortletEntity
{
private PersistenceStore store;
private PortletEntity entity;
1.16 +4 -3 jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponentImpl.java
Index: PortletEntityAccessComponentImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponentImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PortletEntityAccessComponentImpl.java 27 May 2004 19:41:57 -0000 1.15
+++ PortletEntityAccessComponentImpl.java 5 Jun 2004 05:11:17 -0000 1.16
@@ -23,6 +23,7 @@
import org.apache.jetspeed.components.persistence.store.Filter;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.persistence.store.Transaction;
+import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
import org.apache.jetspeed.om.portlet.impl.StoreablePortletDefinitionDelegate;
import org.apache.jetspeed.om.preference.impl.PreferenceSetImpl;
import org.apache.pluto.om.common.ObjectID;
@@ -60,7 +61,7 @@
* @see org.apache.jetspeed.entity.PortletEntityAccessComponent#getPortletEntity(org.apache.pluto.om.common.ObjectID)
*
*/
- public StoreablePortletEntityDelegate getPortletEntity(ObjectID entityId)
+ public MutablePortletEntity getPortletEntity(ObjectID entityId)
{
if (entityCache.get(entityId) != null)
{
@@ -106,7 +107,7 @@
/**
* @see org.apache.jetspeed.entity.PortletEntityAccessComponent#newPortletEntityInstance(org.apache.pluto.om.portlet.PortletDefinition)
*/
- public StoreablePortletEntityDelegate newPortletEntityInstance(PortletDefinition portletDefinition)
+ public MutablePortletEntity newPortletEntityInstance(PortletDefinition portletDefinition)
{
PortletEntityCtrl portletEntity = new PortletEntityImpl();
if (portletDefinition instanceof StoreablePortletDefinitionDelegate)
1.6 +7 -6 jakarta-jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityAccessComponent.java
Index: TestPortletEntityAccessComponent.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityAccessComponent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestPortletEntityAccessComponent.java 27 May 2004 19:44:20 -0000 1.5
+++ TestPortletEntityAccessComponent.java 5 Jun 2004 05:11:18 -0000 1.6
@@ -25,6 +25,7 @@
import org.apache.jetspeed.components.persistence.store.util.PersistenceSupportedTestCase;
import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.components.portletregistry.PortletRegistryComponentImpl;
+import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
@@ -108,22 +109,22 @@
assertTrue("Portlet Def not found", pd.getName().equals("EntityTestPortlet"));
}
assertNotNull("Portlet Def is null", pd);
- StoreablePortletEntityDelegate entity = entityAccess.newPortletEntityInstance(pd);
+ MutablePortletEntity entity = entityAccess.newPortletEntityInstance(pd);
entity.setId(TEST_ENTITY);
entityAccess.storePortletEntity(entity);
- StoreablePortletEntityDelegate entity2 = entityAccess.getPortletEntity(JetspeedObjectID.createFromString(TEST_ENTITY));
+ MutablePortletEntity entity2 = entityAccess.getPortletEntity(JetspeedObjectID.createFromString(TEST_ENTITY));
assertTrue("entity id ", entity2.getId().toString().equals(TEST_ENTITY));
assertNotNull("entity's portlet ", entity2.getPortletDefinition());
- StoreablePortletEntityDelegate entity5 = entityAccess.newPortletEntityInstance(pd);
+ MutablePortletEntity entity5 = entityAccess.newPortletEntityInstance(pd);
System.out.println("before storing entity: " + entity5.getId());
//entity.setId(TEST_ENTITY);
entityAccess.storePortletEntity(entity5);
System.out.println("store done: " + entity5.getId());
- StoreablePortletEntityDelegate entity6 = entityAccess.getPortletEntity(entity5.getId());
+ MutablePortletEntity entity6 = entityAccess.getPortletEntity(entity5.getId());
assertNotNull(entity6);
System.out.println("reget : " + entity6.getId());
@@ -179,7 +180,7 @@
{
registry.removeApplication(pa);
}
- StoreablePortletEntityDelegate entity = entityAccess.getPortletEntity(JetspeedObjectID.createFromString(TEST_ENTITY));
+ MutablePortletEntity entity = entityAccess.getPortletEntity(JetspeedObjectID.createFromString(TEST_ENTITY));
System.out.println("entity == " + entity);
if (entity != null)
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org