[jboss-svn-commits] JBoss Portal SVN: r5157 - in trunk/portlet/src/main/org/jboss/portal/portlet: container/info deployment info test/support/info

[jboss-svn-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2006-09-06 07:43:31 -0400 (Wed, 06 Sep 2006)
New Revision: 5157

Modified:
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java
   trunk/portlet/src/main/org/jboss/portal/portlet/info/CacheInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/CacheInfoSupport.java
Log:
move caching reference type for fragments into ContainerPortletInfo which is specific to the portlet container. The caching policy is private to producer.

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java	2006-09-06 11:38:31 UTC (rev 5156)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java	2006-09-06 11:43:31 UTC (rev 5157)
@@ -34,6 +34,12 @@
 public class ContainerCacheInfo implements CacheInfo
 {
 
+   /** Cache uses strong references. */
+   public int REF_STRONG = 0;
+
+   /** Cache uses soft references. */
+   public int REF_SOFT = 1;
+
    /** . */
    private static Logger log = Logger.getLogger(ContainerCacheInfo.class);
 

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java	2006-09-06 11:38:31 UTC (rev 5156)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java	2006-09-06 11:43:31 UTC (rev 5157)
@@ -22,11 +22,11 @@
 package org.jboss.portal.portlet.deployment;
 
 import org.jboss.portal.common.transaction.Transactions;
-import org.jboss.portal.portlet.info.CacheInfo;
 import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
 import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
 import org.jboss.portal.portlet.metadata.PolicyPermissionMetaData;
 import org.jboss.portal.portlet.metadata.SecurityConstraintMetaData;
+import org.jboss.portal.portlet.container.info.ContainerCacheInfo;
 import org.jboss.portal.security.SecurityConstants;
 import org.jboss.xb.binding.GenericObjectModelFactory;
 import org.jboss.xb.binding.UnmarshallingContext;
@@ -199,11 +199,11 @@
          {
             if ("strong".equals(localName))
             {
-               portlet.setCacheRefType(new Integer(CacheInfo.REF_STRONG));
+               portlet.setCacheRefType(new Integer(ContainerCacheInfo.REF_STRONG));
             }
             else if ("soft".equals(localName))
             {
-               portlet.setCacheRefType(new Integer(CacheInfo.REF_SOFT));
+               portlet.setCacheRefType(new Integer(ContainerCacheInfo.REF_SOFT));
             }
             else
             {

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/info/CacheInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/info/CacheInfo.java	2006-09-06 11:38:31 UTC (rev 5156)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/info/CacheInfo.java	2006-09-06 11:43:31 UTC (rev 5157)
@@ -27,19 +27,9 @@
  */
 public interface CacheInfo
 {
-   /** Cache uses strong references. */
-   int REF_STRONG = 0;
 
-   /** Cache uses soft references. */
-   int REF_SOFT = 1;
-
    /**
     * The expiration in seconds.
     */
    int getExpirationSecs();
-
-   /**
-    * Return the kind of reference to cache markup fragments.
-    */
-   int getReferenceType();
 }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/CacheInfoSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/CacheInfoSupport.java	2006-09-06 11:38:31 UTC (rev 5156)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/CacheInfoSupport.java	2006-09-06 11:43:31 UTC (rev 5157)
@@ -22,6 +22,7 @@
 package org.jboss.portal.portlet.test.support.info;
 
 import org.jboss.portal.portlet.info.CacheInfo;
+import org.jboss.portal.portlet.container.info.ContainerCacheInfo;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -44,7 +45,7 @@
 
    public CacheInfoSupport()
    {
-      this(0, CacheInfo.REF_STRONG);
+      this(0, ContainerCacheInfo.REF_STRONG);
    }
 
    public int getExpirationSecs()