[jboss-svn-commits] JBL Code SVN: r14600 - in labs/jbosslabs/trunk/portal-extensions: jbosswiki/wiki-common/src/java/org/jboss/wiki and 1 other directories.

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

Author: adamw
Date: 2007-08-26 12:18:02 -0400 (Sun, 26 Aug 2007)
New Revision: 14600

Modified:
   labs/jbosslabs/trunk/portal-extensions/jboss-forums/forums-portlets/project.xml
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java
   labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesCacheItem.java
   labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java
Log:
Fixing after refactoring

Modified: labs/jbosslabs/trunk/portal-extensions/jboss-forums/forums-portlets/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jboss-forums/forums-portlets/project.xml	2007-08-26 15:50:48 UTC (rev 14599)
+++ labs/jbosslabs/trunk/portal-extensions/jboss-forums/forums-portlets/project.xml	2007-08-26 16:18:02 UTC (rev 14600)
@@ -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/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java	2007-08-26 15:50:48 UTC (rev 14599)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuMediaDataSource.java	2007-08-26 16:18:02 UTC (rev 14600)
@@ -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/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesCacheItem.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesCacheItem.java	2007-08-26 15:50:48 UTC (rev 14599)
+++ labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesCacheItem.java	2007-08-26 16:18:02 UTC (rev 14600)
@@ -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/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java	2007-08-26 15:50:48 UTC (rev 14599)
+++ labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java	2007-08-26 16:18:02 UTC (rev 14600)
@@ -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) {