Changeset 5479

Timestamp:

Nov 8, 2010, 8:33:46 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1546: Publish news as a rss feed

Added possibility to disable the RSS feed by commenting out the servlet definition in web.xml.

Location:

trunk

Files:

• config/dist/web.xml (modified) (2 diffs)
• src/clients/web/net/sf/basedb/clients/web/servlet/RssNewsFeed.java (modified) (2 diffs)
• www/info/news.jsp (modified) (2 diffs)
• www/main.jsp (modified) (2 diffs)
• www/my_base/index.jsp (modified) (2 diffs)

trunk/config/dist/web.xml

@@ -182 +182 @@
 
   <!-- The News feed servlet  -->
+  <!-- Comment out this servlet to disable the RSS feed -->
   <servlet>
     <servlet-name>news-feed</servlet-name>
@@ -187 +188 @@
       net.sf.basedb.clients.web.servlet.RssNewsFeed
     </servlet-class>
+    <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet-mapping>

trunk/src/clients/web/net/sf/basedb/clients/web/servlet/RssNewsFeed.java

@@ -65 +65 @@
   private static long lastUpdate;
   private static Date lastReset;
+  private static boolean enabled;
   
   /**
@@ -76 +77 @@
     lastUpdate = 0;
     lastReset = new Date();
-  }
-
+    enabled = true;
+  }
+
+  /**
+    Check if the rss servlet has been enabled or not.
+  */
+  public static boolean isEnabled()
+  {
+    return enabled;
+  }
   
   private String host;

trunk/www/info/news.jsp

@@ -41 +41 @@
   import="net.sf.basedb.util.formatter.Formatter"
   import="net.sf.basedb.clients.web.formatter.FormatterFactory"
+  import="net.sf.basedb.clients.web.servlet.RssNewsFeed"
   import="java.util.Date"
 %>
@@ -67 +68 @@
     <tr>
     <td>
-      <h3>News and announcements <a href="news.rss" 
-        title="Subscribe to news from this BASE server"
-        ><base:icon image="rss.png" /></a></h3>
+      <h3>News and announcements 
+      <%
+      if (RssNewsFeed.isEnabled()) 
+      {
+        %><a href="news.rss" 
+          title="Subscribe to news from this BASE server"
+          ><base:icon image="rss.png" /></a>
+        <%
+      }
+      %>
+      </h3>
       <div id="news" class="news">
       <%

trunk/www/main.jsp

@@ -44 +44 @@
   import="net.sf.basedb.util.formatter.Formatter"
   import="net.sf.basedb.clients.web.formatter.FormatterFactory"
+  import="net.sf.basedb.clients.web.servlet.RssNewsFeed"
   import="net.sf.basedb.util.Values"
   import="java.util.Date"
@@ -242 +243 @@
       %>
       
-      <h3>News and announcements <a href="info/news.rss" 
-        title="Subscribe to news from this BASE server"
-        ><base:icon image="rss.png" /></a>
+      <h3>News and announcements 
+      <%
+      if (RssNewsFeed.isEnabled()) 
+      {
+        %>
+        <a href="info/news.rss" 
+          title="Subscribe to news from this BASE server"
+          ><base:icon image="rss.png" /></a>
+        <%
+      }
+      %>
       </h3>
       <div id="news" class="news">

trunk/www/my_base/index.jsp

@@ -54 +54 @@
   import="net.sf.basedb.util.formatter.Formatter"
   import="net.sf.basedb.clients.web.formatter.FormatterFactory"
+  import="net.sf.basedb.clients.web.servlet.RssNewsFeed"
   import="net.sf.basedb.util.Values"
   import="java.util.Date" 
@@ -329 +330 @@
   <td width="50%">
   
-  <h3 class="light docked"><base:icon image="news.gif" />&nbsp;News and announcements (<%=news.size()%>) <a href="../info/news.rss" 
+  <h3 class="light docked"><base:icon image="news.gif" />&nbsp;News and announcements (<%=news.size()%>) 
+    <%
+    if (RssNewsFeed.isEnabled()) 
+    {
+      %>
+      <a href="../info/news.rss" 
         title="Subscribe to news from this BASE server"
-        ><base:icon image="rss.png" /></a></h3>
+        ><base:icon image="rss.png" /></a>
+      <%
+    }
+    %>
+  </h3>
     <div id="news" class="news welcomesection" style="height: 400px; overflow: auto;">
     <%