[Jboss-svn-commits] JBL Code SVN: r1019 - in qa/forge/portal-extensions: forge-common/src/java/org/jboss/forge/common/blog forge-service/src/java/org/jboss/forge/service jboss-as-binaries

[<jbo...@li...>]

Author: dam...@jb...
Date: 2005-08-30 16:16:03 -0400 (Tue, 30 Aug 2005)
New Revision: 1019

Removed:
   qa/forge/portal-extensions/jboss-as-binaries/to-copy/
Modified:
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java
   qa/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java
Log:
MERGED: -r 976:1000 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions.

Modified: qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java
===================================================================
--- qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java	2005-08-30 20:12:06 UTC (rev 1018)
+++ qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java	2005-08-30 20:16:03 UTC (rev 1019)
@@ -93,7 +93,10 @@
                 .getServerName());
         feedAddress = replaceProperty(feedAddress, "${host.port}", Integer
                 .toString(request.getServerPort()));
-        feedAddress = replaceProperty(feedAddress, "${project.name}", projectId);
+        if (projectId != null)
+        		feedAddress = replaceProperty(feedAddress, "${project.name}", projectId);
+        else
+        		feedAddress = replaceProperty(feedAddress, "${project.name}", "default");
         feedAddress = replaceProperty(feedAddress, "${portal.name}", portalName);
         feedAddress = replaceProperty(feedAddress, "${feed.type}", "atom");
         
@@ -133,13 +136,15 @@
         // Now we are sure that fromEntryString has the value that was given to
         // us in the address
         int fromEntry = Integer.parseInt(fromEntryString);
-
+        
+        String cacheKey = AbstractBlog.class.getName()+"/"+projectId;
+        
         SyndFeed feed = (SyndFeed) forgeHelper.getForgeManagement().getFromCache(
-        		portalName, AbstractBlog.class.getName());
+        		portalName, cacheKey);
         
         if (feed == null) {
         	feed = (SyndFeed) forgeHelper.getForgeManagement().
-        		addNodeWatcher(portalName, AbstractBlog.class.getName(),
+        		addNodeWatcher(portalName, cacheKey,
         				new BlogNodeWatcher(feedAddress));
         }
 
@@ -308,27 +313,4 @@
 
         return found;
     }
-
-    /**
-     * Item of the cache
-     */
-    class CacheItem {
-        private long time;
-
-        private SyndFeed feed;
-
-        CacheItem(long time, SyndFeed feed) {
-            this.time = time;
-            this.feed = feed;
-        }
-
-        long getTime() {
-            return time;
-        }
-
-        SyndFeed getFeed() {
-            return feed;
-        }
-
-    }
 }
\ No newline at end of file

Modified: qa/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java
===================================================================
--- qa/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java	2005-08-30 20:12:06 UTC (rev 1018)
+++ qa/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java	2005-08-30 20:16:03 UTC (rev 1019)
@@ -42,7 +42,7 @@
 			fm.update();
 			
 			// Avoiding WARN.
-			timer.cancel();
+			//timer.cancel(); -- Maybe this caused the TX exception.
 			
 			// Scheduling next timer to timeout after the amount of time that
 			// is set in forgeManagement.