[Jboss-svn-commits] JBL Code SVN: r4317 - in labs/shotoku/trunk/shotoku-feeds/src: java/org/jboss/shotoku/feeds web/WEB-INF

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

Author: adamw
Date: 2006-05-18 16:33:34 -0400 (Thu, 18 May 2006)
New Revision: 4317

Added:
   labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/feeds-object.xml-old
   labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/portlet.xml-old
Removed:
   labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/feeds-object.xml
   labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/portlet.xml
Modified:
   labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java
Log:
http://jira.jboss.com/jira/browse/JBSHOTOKU-36


Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java	2006-05-18 18:12:04 UTC (rev 4316)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java	2006-05-18 20:33:34 UTC (rev 4317)
@@ -30,8 +30,8 @@
     }
 
     public void update(Pair<String, String> key, FeedsDescriptor currentObject) {
-        put(key, getDesc(key.getFirst(), key.getSecond()));
-        currentObject.release();
+        //put(key, getDesc(key.getFirst(), key.getSecond()));
+        //currentObject.release();
     }
 
     public FeedsDescriptor init(Pair<String, String> key) {

Deleted: labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/feeds-object.xml
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/feeds-object.xml	2006-05-18 18:12:04 UTC (rev 4316)
+++ labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/feeds-object.xml	2006-05-18 20:33:34 UTC (rev 4317)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-   <deployment>
-      <if-exists>overwrite</if-exists>
-      <instance>
-         <instance-name>FeedsPortletInstance</instance-name>
-         <component-ref>feeds.FeedsPortlet</component-ref>
-      </instance>
-   </deployment>
-</deployments>
\ No newline at end of file

Copied: labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/feeds-object.xml-old (from rev 4110, labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/feeds-object.xml)
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/feeds-object.xml	2006-05-06 15:51:26 UTC (rev 4110)
+++ labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/feeds-object.xml-old	2006-05-18 20:33:34 UTC (rev 4317)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <instance>
+         <instance-name>FeedsPortletInstance</instance-name>
+         <component-ref>feeds.FeedsPortlet</component-ref>
+      </instance>
+   </deployment>
+</deployments>
\ No newline at end of file

Deleted: labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/portlet.xml	2006-05-18 18:12:04 UTC (rev 4316)
+++ labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/portlet.xml	2006-05-18 20:33:34 UTC (rev 4317)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
-	version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
-	<portlet>
-	    <description>Forge feeds portlet</description>
-    	    <portlet-name>FeedsPortlet</portlet-name>
-    	    <display-name>Feeds portlet</display-name>
-            <portlet-class>org.jboss.forge.feeds.FeedsPortlet</portlet-class>
-    	    <supports>
-		<mime-type>text/html</mime-type>
-		<portlet-mode>VIEW</portlet-mode>
-	    </supports>
-	    <portlet-info>
-		<title>Feeds</title>
-	    </portlet-info>
-	</portlet>
- </portlet-app>

Copied: labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/portlet.xml-old (from rev 4110, labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/portlet.xml)
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/portlet.xml	2006-05-06 15:51:26 UTC (rev 4110)
+++ labs/shotoku/trunk/shotoku-feeds/src/web/WEB-INF/portlet.xml-old	2006-05-18 20:33:34 UTC (rev 4317)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
+	version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+	<portlet>
+	    <description>Forge feeds portlet</description>
+    	    <portlet-name>FeedsPortlet</portlet-name>
+    	    <display-name>Feeds portlet</display-name>
+            <portlet-class>org.jboss.forge.feeds.FeedsPortlet</portlet-class>
+    	    <supports>
+		<mime-type>text/html</mime-type>
+		<portlet-mode>VIEW</portlet-mode>
+	    </supports>
+	    <portlet-info>
+		<title>Feeds</title>
+	    </portlet-info>
+	</portlet>
+ </portlet-app>