[Yanel-commits] rev 48341 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2010-03-29 09:29:51 +0200 (Mon, 29 Mar 2010)
New Revision: 48341

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
differentiate between version 2 and version 1

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2010-03-29 07:29:24 UTC (rev 48340)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2010-03-29 07:29:51 UTC (rev 48341)
@@ -247,9 +247,12 @@
 
             // Check for requests re policies
             String policyRequestPara = request.getParameter(YANEL_ACCESS_POLICY_USECASE);
-            if (policyRequestPara != null || (yanelUsecase != null && yanelUsecase.equals("policy.read"))) {
-                doAccessPolicyRequest(request, response, policyRequestPara);
+            if (policyRequestPara != null) {
+                doAccessPolicyRequest(request, response, 1);
                 return;
+            } else if (yanelUsecase != null && yanelUsecase.equals("policy.read")) {
+                doAccessPolicyRequest(request, response, 2);
+                return;
             }
 
             // Check for requests for global data
@@ -2134,17 +2137,23 @@
 
     /**
      * Handle access policy requests (CRUD, whereas delete is not implemented yet!)
+     * @param version Version of policy manager implementation
      */
-    private void doAccessPolicyRequest(HttpServletRequest request, HttpServletResponse response, String usecase)  throws ServletException, IOException {
+    private void doAccessPolicyRequest(HttpServletRequest request, HttpServletResponse response, int version)  throws ServletException, IOException {
         try {
             String viewId = request.getParameter(VIEW_ID_PARAM_NAME);
             
             Realm realm = map.getRealm(request.getServletPath());
+
+            ResourceConfiguration rc;
+            if (version ==  2) {
+                rc = getGlobalResourceConfiguration("policy-manager-v2_yanel-rc.xml", realm);
+            } else {
+                rc = getGlobalResourceConfiguration("policy-manager_yanel-rc.xml", realm);
+            }
             String path = map.getPath(realm, request.getServletPath());
+            if (generateResponseFromRTview(request, response, rc, path)) return;
 
-            // TODO: Introduce version 2 of policy manager
-            ResourceConfiguration rc = getGlobalResourceConfiguration("policy-manager_yanel-rc.xml", realm);
-            if (generateResponseFromRTview(request, response, rc, path)) return;
             log.error("Something went terribly wrong!");
             response.getWriter().print("Something went terribly wrong!");
             return;