svn commit: r389601 - in /incubator/roller/trunk/sandbox: atomadminprotocol/src/org/roller/presentation/atomadminapi/Handler.java atomprotocol/src/org/roller/presentation/atomapi/AtomServlet.java

[sn...@apache.org]

Author: snoopdave
Date: Tue Mar 28 12:51:18 2006
New Revision: 389601

URL: http://svn.apache.org/viewcvs?rev=389601&view=rev
Log:
APP and AAPP now must be enable via properties: webservices.atomprotocol.enabled and webservices.adminprotocol.enabled, respectively

Modified:
    incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/Handler.java
    incubator/roller/trunk/sandbox/atomprotocol/src/org/roller/presentation/atomapi/AtomServlet.java

Modified: incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/Handler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/Handler.java?rev=389601&r1=389600&r2=389601&view=diff
==============================================================================
--- incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/Handler.java (original)
+++ incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/Handler.java Tue Mar 28 12:51:18 2006
@@ -9,8 +9,8 @@
 import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jdom.Namespace;
 import org.roller.RollerException;
+import org.roller.config.RollerRuntimeConfig;
 import org.roller.model.Roller;
 import org.roller.model.RollerFactory;
 import org.roller.pojos.UserData;
@@ -88,6 +88,13 @@
     
     /** Get a Handler object implementation based on the given request. */
     public static Handler getHandler(HttpServletRequest req) throws HandlerException {
+        
+         boolean enabled = RollerRuntimeConfig.getBooleanProperty(
+              "webservices.adminprotocol.enable");
+         if (!enabled) { 
+              throw new NotAllowedException("ERROR: Admin protocol not enabled");    
+         }
+         
          URI uri = new URI(req);
          Handler handler;
          

Modified: incubator/roller/trunk/sandbox/atomprotocol/src/org/roller/presentation/atomapi/AtomServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/sandbox/atomprotocol/src/org/roller/presentation/atomapi/AtomServlet.java?rev=389601&r1=389600&r2=389601&view=diff
==============================================================================
--- incubator/roller/trunk/sandbox/atomprotocol/src/org/roller/presentation/atomapi/AtomServlet.java (original)
+++ incubator/roller/trunk/sandbox/atomprotocol/src/org/roller/presentation/atomapi/AtomServlet.java Tue Mar 28 12:51:18 2006
@@ -46,6 +46,7 @@
 import com.sun.syndication.io.WireFeedOutput;
 import java.io.StringWriter;
 import org.jdom.Namespace;
+import org.roller.config.RollerRuntimeConfig;
 
 /**
  * Atom Servlet implements Atom by calling a Roller independent handler.
@@ -64,7 +65,13 @@
      * Create an Atom request handler.
      * TODO: make AtomRequestHandler implementation configurable.
      */
-    private AtomHandler createAtomRequestHandler(HttpServletRequest request) {
+    private AtomHandler createAtomRequestHandler(HttpServletRequest request) 
+    throws ServletException {
+        boolean enabled = RollerRuntimeConfig.getBooleanProperty(
+            "webservices.atomprotocol.enable");
+        if (!enabled) {
+            throw new ServletException("ERROR: Atom protocol not enabled");
+        }
         return new RollerAtomHandler(request);
     }