weaver 2004/05/27 12:41:57 Modified: components/registry/src/java/org/apache/jetspeed/components/portletentity PortletEntityAccessComponentImpl.java Log: see JS2-40: <http://nagoya.apache.org/jira/browse/JS2-40> Revision Changes Path 1.15 +6 -10 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.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- PortletEntityAccessComponentImpl.java 31 Mar 2004 21:14:42 -0000 1.14 +++ PortletEntityAccessComponentImpl.java 27 May 2004 19:41:57 -0000 1.15 @@ -22,7 +22,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.jetspeed.components.persistence.store.Filter; import org.apache.jetspeed.components.persistence.store.PersistenceStore; -import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer; import org.apache.jetspeed.components.persistence.store.Transaction; import org.apache.jetspeed.om.portlet.impl.StoreablePortletDefinitionDelegate; import org.apache.jetspeed.om.preference.impl.PreferenceSetImpl; @@ -42,10 +41,6 @@ */ public class PortletEntityAccessComponentImpl implements PortletEntityAccessComponent { - private PersistenceStoreContainer pContainer; - - private String storeName; - protected final static Log log = LogFactory.getLog(PortletEntityAccessComponentImpl.class); private boolean autoCreateNewEntities; @@ -53,12 +48,13 @@ // TODO: this should eventually use a system cach like JCS private HashMap entityCache = new HashMap(); + private PersistenceStore persistenceStore; + - public PortletEntityAccessComponentImpl(PersistenceStoreContainer pContainer, String storeId) + public PortletEntityAccessComponentImpl(PersistenceStore persistenceStore) { - this.pContainer = pContainer; - this.storeName = storeId; + this.persistenceStore = persistenceStore; } /** * @see org.apache.jetspeed.entity.PortletEntityAccessComponent#getPortletEntity(org.apache.pluto.om.common.ObjectID) @@ -230,7 +226,7 @@ protected PersistenceStore getPersistenceStore() { - return pContainer.getStoreForThread(storeName); + return persistenceStore; } protected StoreablePortletEntityDelegate wrapEntity(PortletEntityImpl entity)
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]