[jboss-svn-commits] JBL Code SVN: r14642 - in labs/jbosslabs/branches/identity_integration_labs2/portal-extensions: forge-common/src/java/org/jboss/forge/common/projects and 12 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 27 09:24:01 EDT 2007
Author: szimano
Date: 2007-08-27 09:24:00 -0400 (Mon, 27 Aug 2007)
New Revision: 14642
Modified:
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgePropertiesWatcher.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsConfigurationWatcher.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConNodeWatcher.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/portlets/ProjectsPortletsCacheItem.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/portlets/ProjectsPortletsServiceImpl.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/MetricsPortlet.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraPortlet.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnPortlet.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastConfWatcher.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastTools.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/FreezoneConfWatcher.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/forums-portlets/project.xml
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/project.xml
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/polls/src/java/org/jboss/forge/polls/PollTools.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsCacheItem.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesCacheItem.java
labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java
Log:
svn merge -r 14487:14640 https://svn.labs.jboss.org/labs/jbosslabs/trunk/portal-extensions .
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -21,13 +21,10 @@
*/
package org.jboss.forge.common;
-import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
@@ -44,7 +41,8 @@
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.shotoku.ContentManager;
-import org.jboss.shotoku.aop.CacheItem;
+import org.jboss.shotoku.aop.CacheItemInject;
+import org.jboss.shotoku.cache.CacheItemUser;
import org.w3c.dom.Node;
import com.twmacinta.util.MD5;
@@ -105,8 +103,8 @@
vtfRemover.start();
}
- @CacheItem
- private static ForgePropertiesWatcher forgeProperties;
+ @CacheItemInject(dataSource = ForgePropertiesWatcher.class)
+ private static CacheItemUser<String, Properties> forgeProperties;
public static Properties getProperties() {
return forgeProperties.get("");
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgePropertiesWatcher.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgePropertiesWatcher.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgePropertiesWatcher.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -1,13 +1,13 @@
package org.jboss.forge.common;
+import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
+import org.jboss.shotoku.cache.ValueChange;
import org.jboss.shotoku.ContentManager;
-import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
import org.jboss.logging.Logger;
import java.util.Properties;
import java.util.Map;
-import java.io.IOException;
/**
* @author Adam Warski (adamw at aster.pl)
@@ -32,8 +32,8 @@
return getProperties(key);
}
- protected void update(String key, Properties currentObject, Map changes) {
- put(key, getProperties(key));
+ protected ValueChange<Properties> update(String key, Properties currentObject, Map<String, ChangeType> changes) {
+ return ValueChange.changeTo(getProperties(key));
}
protected ContentManager initContentManager(String key) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCounterTools.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -28,8 +28,8 @@
import org.jboss.forge.common.ForgeHelper;
import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
-import org.jboss.shotoku.ContentManager;
-import org.jboss.shotoku.aop.CacheItem;
+import org.jboss.shotoku.aop.CacheItemInject;
+import org.jboss.shotoku.cache.CacheItemUser;
/**
* DownloadCounterTools class is just a tool class with static methods
@@ -121,7 +121,7 @@
return ctx;
}
- private static @CacheItem DownloadCountersWatcher dcw;
+ private static @CacheItemInject(dataSource=DownloadCountersWatcher.class) CacheItemUser<String, DownloadCountersDescriptor> dcw;
/**
* Method gets DownloadCountersDescriptor object from the forge cache.
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -28,6 +28,7 @@
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
+import org.jboss.shotoku.cache.ValueChange;
/**
* DownloadCounterWatcher class which implements NodeWatcher interface
@@ -65,8 +66,8 @@
return descriptor;
}
- protected void update(String key, DownloadCountersDescriptor currentObject, Map<String, ChangeType> changes) {
- put(key, getDescriptor(key));
+ protected ValueChange<DownloadCountersDescriptor> update(String key, DownloadCountersDescriptor currentObject, Map<String, ChangeType> changes) {
+ return ValueChange.changeTo(getDescriptor(key));
}
public DownloadCountersDescriptor init(String key) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -27,6 +27,8 @@
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.forge.common.projects.permissions.TotalPermissionsChecker;
+import org.jboss.shotoku.cache.CacheItem;
+import org.jboss.shotoku.cache.CacheItemUser;
/**
* A class which manages creating project and projects descriptors for a given
@@ -41,10 +43,10 @@
private String portalName;
// @CacheItem
- private ProjectsConfigurationWatcher pcw;
+ private CacheItemUser<String, ProjectsDescriptor> pcw;
public Projects(String portalName) {
- pcw = new ProjectsConfigurationWatcher();
+ pcw = CacheItem.create(new ProjectsConfigurationWatcher());
this.portalName = portalName;
}
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsConfigurationWatcher.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsConfigurationWatcher.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsConfigurationWatcher.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -24,6 +24,7 @@
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
+import org.jboss.shotoku.cache.ValueChange;
import java.io.Serializable;
import java.util.Map;
@@ -51,9 +52,9 @@
return getProjectsDescriptor(key);
}
- protected void update(String key, ProjectsDescriptor currentObject,
+ protected ValueChange<ProjectsDescriptor> update(String key, ProjectsDescriptor currentObject,
Map<String, ChangeType> changes) {
- put(key, getProjectsDescriptor(key));
+ return ValueChange.changeTo(getProjectsDescriptor(key));
}
protected ContentManager initContentManager(String key) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConNodeWatcher.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConNodeWatcher.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConNodeWatcher.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -23,6 +23,7 @@
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
+import org.jboss.shotoku.cache.ValueChange;
import java.util.Map;
@@ -39,8 +40,8 @@
return getDesc(key);
}
- protected void update(String key, ConDescriptor currentObject, Map changes) {
- put(key, getDesc(key));
+ protected ValueChange<ConDescriptor> update(String key, ConDescriptor currentObject, Map changes) {
+ return ValueChange.changeTo(getDesc(key));
}
protected ContentManager initContentManager(String key) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -43,8 +43,9 @@
import org.jboss.portal.identity.User;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.Node;
-import org.jboss.shotoku.aop.CacheItem;
+import org.jboss.shotoku.aop.CacheItemInject;
import org.jboss.shotoku.aop.Inject;
+import org.jboss.shotoku.cache.CacheItemUser;
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
import org.jboss.shotoku.exceptions.SaveException;
@@ -86,8 +87,8 @@
@Inject
private ContentManager cm;
- @CacheItem
- private ConNodeWatcher conf;
+ @CacheItemInject(dataSource=ConNodeWatcher.class)
+ private CacheItemUser<String, ConDescriptor> conf;
private ResourceBundle messages;
private Locale currentLocale;
@@ -111,7 +112,7 @@
}
synchronized void resetDesc(String portalName) {
- conf.update(portalName, null, null);
+ // TODO
}
private boolean checkString(String s) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/portlets/ProjectsPortletsCacheItem.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/portlets/ProjectsPortletsCacheItem.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/portlets/ProjectsPortletsCacheItem.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -1,6 +1,7 @@
package org.jboss.forge.ejb3.projects.portlets;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
+import org.jboss.shotoku.cache.ValueChange;
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
import org.jboss.forge.common.projects.portlets.ProjectsPortlets;
import org.apache.log4j.Logger;
@@ -42,8 +43,8 @@
return null;
}
- protected void update(String key, ProjectsPortlets currentObject, Map changes) {
- put(key, parseProjectsPortlets(key));
+ protected ValueChange<ProjectsPortlets> update(String key, ProjectsPortlets currentObject, Map changes) {
+ return ValueChange.changeTo(parseProjectsPortlets(key));
}
public ProjectsPortlets init(String key) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/portlets/ProjectsPortletsServiceImpl.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/portlets/ProjectsPortletsServiceImpl.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/portlets/ProjectsPortletsServiceImpl.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -3,6 +3,8 @@
import org.jboss.forge.common.ejb3.ProjectsPortletsService;
import org.jboss.forge.common.projects.portlets.ProjectsPortlets;
import org.jboss.forge.common.projects.portlets.ProjectsPortlet;
+import org.jboss.shotoku.cache.CacheItem;
+import org.jboss.shotoku.cache.CacheItemUser;
import org.jboss.annotation.ejb.Service;
import org.jboss.annotation.ejb.Management;
import org.jboss.annotation.ejb.Depends;
@@ -17,7 +19,7 @@
@Remote(ProjectsPortletsService.class)
@Depends(org.jboss.shotoku.tools.Constants.SHOTOKU_SERVICE_NAME)
public class ProjectsPortletsServiceImpl implements ProjectsPortletsService {
- ProjectsPortletsCacheItem ppci;
+ CacheItemUser<String, ProjectsPortlets> ppci;
public ProjectsPortlets getProjectsPortlets() {
return ppci.get("");
@@ -40,7 +42,7 @@
}
public void start() throws Exception {
- ppci = new ProjectsPortletsCacheItem();
+ ppci = CacheItem.create(new ProjectsPortletsCacheItem());
}
public void stop() throws Exception {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/MetricsPortlet.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/MetricsPortlet.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/MetricsPortlet.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -37,7 +37,8 @@
import org.jboss.forge.kosmos.svn.LabsKosmosSvnDescriptor;
import org.jboss.forge.kosmos.svn.LabsKosmosSvnWatcher;
import org.jboss.logging.Logger;
-import org.jboss.shotoku.aop.CacheItem;
+import org.jboss.shotoku.aop.CacheItemInject;
+import org.jboss.shotoku.cache.CacheItemUser;
import org.jboss.shotoku.tools.Pair;
/**
@@ -52,11 +53,11 @@
private static final String METRICS_JSP = "kosmos/labs/metrics.jsp";
private static final long METRICS_PORTLET_UPDATE_INTERVAL = 1000*60*30; // 30 minutes
- @CacheItem(interval=METRICS_PORTLET_UPDATE_INTERVAL)
- private static LabsKosmosJiraWatcher jiraWatcher;
+ @CacheItemInject(interval=METRICS_PORTLET_UPDATE_INTERVAL,dataSource=LabsKosmosJiraWatcher.class)
+ private static CacheItemUser<Pair<String,String>,LabsKosmosJiraDescriptor> jiraWatcher;
- @CacheItem(interval=METRICS_PORTLET_UPDATE_INTERVAL)
- private static LabsKosmosSvnWatcher svnWatcher;
+ @CacheItemInject(interval=METRICS_PORTLET_UPDATE_INTERVAL,dataSource=LabsKosmosSvnWatcher.class)
+ private static CacheItemUser<Pair<String,String>,LabsKosmosSvnDescriptor> svnWatcher;
private String serviceUrl;
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraPortlet.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraPortlet.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraPortlet.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -26,7 +26,8 @@
import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.forge.kosmos.LabsKosmosPortlet;
-import org.jboss.shotoku.aop.CacheItem;
+import org.jboss.shotoku.aop.CacheItemInject;
+import org.jboss.shotoku.cache.CacheItemUser;
import org.jboss.shotoku.tools.Pair;
/**
@@ -35,8 +36,8 @@
*/
public class LabsKosmosJiraPortlet extends LabsKosmosPortlet {
- @CacheItem(interval=KOSMOS_PORTLET_UPDATE_INTERVAL)
- private static LabsKosmosJiraWatcher jiraWatcher;
+ @CacheItemInject(interval=KOSMOS_PORTLET_UPDATE_INTERVAL,dataSource=LabsKosmosJiraWatcher.class)
+ private static CacheItemUser<Pair<String,String>,LabsKosmosJiraDescriptor> jiraWatcher;
@Override
public void doView(RenderRequest request, RenderResponse response) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -27,6 +27,7 @@
import org.jboss.logging.Logger;
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
+import org.jboss.shotoku.cache.ValueChange;
import org.jboss.shotoku.tools.Pair;
/**
@@ -36,11 +37,6 @@
protected final static Logger log = Logger.getLogger(LabsKosmosJiraWatcher.class);
- public LabsKosmosJiraWatcher(long interval) {
- super(interval);
- }
-
- @Override
public LabsKosmosJiraDescriptor init(Pair<String,String> key) {
try {
return getDesc(key);
@@ -50,28 +46,27 @@
}
}
- @Override
- protected void update(Pair<String,String> key, LabsKosmosJiraDescriptor currentObject,
+ protected ValueChange<LabsKosmosJiraDescriptor> update(Pair<String,String> key, LabsKosmosJiraDescriptor currentObject,
Map<String, ChangeType> changes) {
- updateDesc(key);
+ return updateDesc(key);
}
- @Override
- public void update(Pair<String, String> key,
+ public ValueChange<LabsKosmosJiraDescriptor> update(Pair<String, String> key,
LabsKosmosJiraDescriptor currentObject) {
- updateDesc(key);
+ return updateDesc(key);
}
- private void updateDesc(Pair<String, String> key) {
+ private ValueChange<LabsKosmosJiraDescriptor> updateDesc(Pair<String, String> key) {
LabsKosmosJiraDescriptor desc;
try {
desc = getDesc(key);
- put(key, desc);
+ return ValueChange.changeTo(desc);
} catch (Exception e) {
log.warn("Unable to update", e);
+ return ValueChange.noChange();
}
}
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnPortlet.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnPortlet.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnPortlet.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -26,7 +26,8 @@
import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.forge.kosmos.LabsKosmosPortlet;
-import org.jboss.shotoku.aop.CacheItem;
+import org.jboss.shotoku.aop.CacheItemInject;
+import org.jboss.shotoku.cache.CacheItemUser;
import org.jboss.shotoku.tools.Pair;
/**
@@ -35,8 +36,8 @@
*/
public class LabsKosmosSvnPortlet extends LabsKosmosPortlet {
- @CacheItem(interval=KOSMOS_PORTLET_UPDATE_INTERVAL)
- private static LabsKosmosSvnWatcher svnWatcher;
+ @CacheItemInject(interval=KOSMOS_PORTLET_UPDATE_INTERVAL, dataSource=LabsKosmosSvnWatcher.class)
+ private static CacheItemUser<Pair<String,String>,LabsKosmosSvnDescriptor> svnWatcher;
@Override
public void doView(RenderRequest request, RenderResponse response) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -27,6 +27,7 @@
import org.jboss.logging.Logger;
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
+import org.jboss.shotoku.cache.ValueChange;
import org.jboss.shotoku.tools.Pair;
/**
@@ -36,11 +37,6 @@
protected final static Logger log = Logger.getLogger(LabsKosmosSvnWatcher.class);
- public LabsKosmosSvnWatcher(long interval) {
- super(interval);
- }
-
- @Override
public LabsKosmosSvnDescriptor init(Pair<String,String> key) {
try {
return getDesc(key);
@@ -50,26 +46,26 @@
}
}
- @Override
- protected void update(Pair<String,String> key, LabsKosmosSvnDescriptor currentObject,
+ protected ValueChange<LabsKosmosSvnDescriptor> update(Pair<String,String> key, LabsKosmosSvnDescriptor currentObject,
Map<String, ChangeType> changes) {
- updateDesc(key);
+ return updateDesc(key);
}
- @Override public void update(Pair<String, String> key,
+ public ValueChange<LabsKosmosSvnDescriptor> update(Pair<String, String> key,
LabsKosmosSvnDescriptor currentObject) {
- updateDesc(key);
+ return updateDesc(key);
}
- private void updateDesc(Pair<String, String> key) {
+ private ValueChange<LabsKosmosSvnDescriptor> updateDesc(Pair<String, String> key) {
LabsKosmosSvnDescriptor desc;
try {
desc = getDesc(key);
- put(key, desc);
+ return ValueChange.changeTo(desc);
} catch (Exception e) {
log.warn("Unable to update", e);
+ return ValueChange.noChange();
}
}
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastConfWatcher.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastConfWatcher.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastConfWatcher.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -26,6 +26,7 @@
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
+import org.jboss.shotoku.cache.ValueChange;
import org.jboss.shotoku.tools.Pair;
/**
@@ -35,11 +36,6 @@
public class PodcastConfWatcher extends
ShotokuResourceWatcher<Pair<String,String>, PodcastDescriptor> {
- public PodcastConfWatcher(long interval) {
- super(interval);
- }
-
- @Override
public PodcastDescriptor init(Pair<String, String> key) {
String portalName = key.getFirst();
@@ -50,17 +46,15 @@
//return getDesc(key);
}
- @Override
/* Called only when some of the watched resources changes. */
- protected void update(Pair<String, String> key,
+ protected ValueChange<PodcastDescriptor> update(Pair<String, String> key,
PodcastDescriptor currentObject, Map<String, ChangeType> changes) {
- put(key, getDesc(key));
+ return ValueChange.changeTo(getDesc(key));
}
- @Override
/* Called to check whether observed feeds changed. */
- public void update(Pair<String, String> key, PodcastDescriptor desc) {
- put(key, getDesc(key));
+ public ValueChange<PodcastDescriptor> update(Pair<String, String> key, PodcastDescriptor desc) {
+ return ValueChange.changeTo(getDesc(key));
}
private PodcastDescriptor getDesc(Pair<String,String> key) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastTools.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastTools.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/podcast/PodcastTools.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -1,6 +1,7 @@
package org.jboss.forge.podcast;
-import org.jboss.shotoku.aop.CacheItem;
+import org.jboss.shotoku.aop.CacheItemInject;
+import org.jboss.shotoku.cache.CacheItemUser;
import org.jboss.shotoku.tools.Pair;
/**
@@ -11,8 +12,8 @@
/* update every 5 minutes */
private static final long UPDATE_INTERVAL = 5*60*1000; /* milliseconds */
- @CacheItem(interval=UPDATE_INTERVAL)
- private static PodcastConfWatcher conf;
+ @CacheItemInject(interval=UPDATE_INTERVAL, dataSource=PodcastConfWatcher.class)
+ private static CacheItemUser<Pair<String,String>, PodcastDescriptor> conf;
public static synchronized PodcastDescriptor
getDesc(final String portalName, String serverAdress) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -40,8 +40,9 @@
import org.jboss.portlet.JBossRenderResponse;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.Node;
-import org.jboss.shotoku.aop.CacheItem;
+import org.jboss.shotoku.aop.CacheItemInject;
import org.jboss.shotoku.aop.Inject;
+import org.jboss.shotoku.cache.CacheItemUser;
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
import org.jboss.shotoku.exceptions.SaveException;
import org.jboss.shotoku.tools.Tools;
@@ -57,8 +58,8 @@
@Inject
private ContentManager cm;
- @CacheItem
- private FreezoneConfWatcher conf;
+ @CacheItemInject(dataSource=FreezoneConfWatcher.class)
+ private CacheItemUser<String, List<String>> conf;
private final static String ERROR_404_MSG = "404 - Not found.";
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/FreezoneConfWatcher.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/FreezoneConfWatcher.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/FreezoneConfWatcher.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -11,6 +11,7 @@
import org.jboss.shotoku.tools.Tools;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
+import org.jboss.shotoku.cache.ValueChange;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
@@ -26,9 +27,9 @@
return Tools.concatenatePaths(key, "freezone/forcelogin.xml");
}
- protected void update(String key, List<String> currentObject,
+ protected ValueChange<List<String>> update(String key, List<String> currentObject,
Map<String, ChangeType> changes) {
- put(key, parseConfiguration(key));
+ return ValueChange.changeTo(parseConfiguration(key));
}
public List<String> init(String key) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/forums-portlets/project.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/forums-portlets/project.xml 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/forums-portlets/project.xml 2007-08-27 13:24:00 UTC (rev 14642)
@@ -81,6 +81,12 @@
<jar>portal-forums-ui.jar</jar>
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>shotoku</groupId>
+ <artifactId>shotoku-aop</artifactId>
+ <version>1.0</version>
+ <jar>shotoku-aop.jar</jar>
+ </dependency>
</dependencies>
<build>
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/project.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/project.xml 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jboss-forums/project.xml 2007-08-27 13:24:00 UTC (rev 14642)
@@ -12,4 +12,11 @@
<currentVersion>1.0</currentVersion>
<organization></organization>
<description></description>
+
+ <dependency>
+ <groupId>shotoku</groupId>
+ <artifactId>shotoku-aop</artifactId>
+ <version>1.0</version>
+ <jar>shotoku-aop.jar</jar>
+ </dependency>
</project>
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -37,7 +37,10 @@
import org.jboss.shotoku.Directory;
import org.jboss.shotoku.Node;
import org.jboss.shotoku.Resource;
+import org.jboss.shotoku.cache.CacheItem;
+import org.jboss.shotoku.cache.CacheItemUser;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
+import org.jboss.shotoku.cache.ValueChange;
import org.jboss.shotoku.exceptions.DeleteException;
import org.jboss.shotoku.exceptions.NameFormatException;
import org.jboss.shotoku.exceptions.RepositoryException;
@@ -204,7 +207,7 @@
String key = getLangCode() + getPagePath(pageName);
- PageChangeWatcher pgch = new PageChangeWatcher(key);
+ CacheItemUser<String, String> pgch = CacheItem.create(new PageChangeWatcher(key));
// initialize watcher
pgch.get(key);
@@ -654,10 +657,12 @@
this.keyBase = keyBase;
}
- protected void update(String key, String currentObject, Map changes) {
+ protected ValueChange<String> update(String key, String currentObject, Map changes) {
wikiEngine.refreshPage(keyBase.substring(getLangCode().length(),
keyBase.length() - ("/" + NODE_NAME).length()),
getLangCode());
+
+ return ValueChange.noChange();
}
public String init(String key) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/polls/src/java/org/jboss/forge/polls/PollTools.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/polls/src/java/org/jboss/forge/polls/PollTools.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/polls/src/java/org/jboss/forge/polls/PollTools.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -40,9 +40,9 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portlet.JBossRenderResponse;
-import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.tools.Pair;
-import org.jboss.shotoku.aop.CacheItem;
+import org.jboss.shotoku.aop.CacheItemInject;
+import org.jboss.shotoku.cache.CacheItemUser;
/**
* This class is used for creating context for PollsPortlet and is
@@ -160,7 +160,8 @@
File.separator+ProjectsHelper.POLL_DESC;
}
- private static @CacheItem PollsCacheItem pci;
+ private static @CacheItemInject(dataSource=PollsCacheItem.class)
+ CacheItemUser<Pair<String, String>, PollsDescriptor> pci;
/**
* This method returns PollsDescriptor received from Cache. If there is no object
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsCacheItem.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsCacheItem.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsCacheItem.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -3,6 +3,7 @@
import org.jboss.shotoku.tools.Pair;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
+import org.jboss.shotoku.cache.ValueChange;
import org.jboss.forge.common.projects.ProjectsHelper;
import java.util.Map;
@@ -12,8 +13,8 @@
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
*/
public class PollsCacheItem extends ShotokuResourceWatcher<Pair<String, String>, PollsDescriptor> {
- protected void update(Pair<String, String> key, PollsDescriptor currentObject, Map<String, ChangeType> changes) {
- put(key, getDescriptor(key));
+ protected ValueChange<PollsDescriptor> update(Pair<String, String> key, PollsDescriptor currentObject, Map<String, ChangeType> changes) {
+ return ValueChange.changeTo(getDescriptor(key));
}
public PollsDescriptor init(Pair<String, String> key) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesCacheItem.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesCacheItem.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesCacheItem.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -2,6 +2,7 @@
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
+import org.jboss.shotoku.cache.ValueChange;
import org.jboss.shotoku.tools.Pair;
import java.util.Map;
@@ -10,8 +11,8 @@
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
*/
public class PrimatesCacheItem extends ShotokuResourceWatcher<Pair<String, String>, PrimatesDescriptor> {
- protected void update(Pair<String, String> key, PrimatesDescriptor currentObject, Map<String, ChangeType> changes) {
- put(key, new PrimatesDescriptor(key.getFirst(), getContentManager(key)));
+ protected ValueChange<PrimatesDescriptor> update(Pair<String, String> key, PrimatesDescriptor currentObject, Map<String, ChangeType> changes) {
+ return ValueChange.changeTo(new PrimatesDescriptor(key.getFirst(), getContentManager(key)));
}
public PrimatesDescriptor init(Pair<String, String> key) {
Modified: labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java
===================================================================
--- labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java 2007-08-27 13:13:39 UTC (rev 14641)
+++ labs/jbosslabs/branches/identity_integration_labs2/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java 2007-08-27 13:24:00 UTC (rev 14642)
@@ -25,8 +25,8 @@
import org.jboss.forge.common.ForgeHelper;
import java.io.File;
-import org.jboss.shotoku.ContentManager;
-import org.jboss.shotoku.aop.CacheItem;
+import org.jboss.shotoku.aop.CacheItemInject;
+import org.jboss.shotoku.cache.CacheItemUser;
import org.jboss.shotoku.tools.Tools;
import org.jboss.shotoku.tools.Pair;
@@ -105,7 +105,8 @@
+ BIOS_DIR;
}
- private static @CacheItem PrimatesCacheItem pci;
+ private static @CacheItemInject(dataSource=PrimatesCacheItem.class)
+ CacheItemUser<Pair<String, String>, PrimatesDescriptor> pci;
public static synchronized PrimatesDescriptor getDesc(
final String portalName) {
More information about the jboss-svn-commits
mailing list