From 29fe5cf83ac5391cd11321ca23a45b0611fb345e Mon Sep 17 00:00:00 2001
From: Erik Amaru Ortiz <aortiz.erik@gmail.com>
Date: Wed, 11 Sep 2013 10:12:44 -0400
Subject: [PATCH] updating rest dispatching method on bootstrap

---
 gulliver/system/class.bootstrap.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php
index dd51f6a5f..48c54c631 100644
--- a/gulliver/system/class.bootstrap.php
+++ b/gulliver/system/class.bootstrap.php
@@ -1036,7 +1036,7 @@ class Bootstrap
         }
         return $res;
     }
-    //use Luracast\Restler\Format\XmlFormat as XmlFormat;
+    
     /**
      * This method dispatch rest/api service
      *
@@ -1059,11 +1059,19 @@ class Bootstrap
         require_once PATH_CORE . "classes" . PATH_SEP . "class.api.php";
 
         \ProcessMaker\Api::setWorkspace(SYS_SYS);
+        //var_dump($apiDir . 'oauth2/views'); die;
+        Luracast\Restler\Format\HtmlFormat::$viewPath = $servicesDir . 'oauth2/views';
+
+        require_once $servicesDir . 'oauth2/Server.php';
 
         $rest = new Luracast\Restler\Restler();
         $rest->setAPIVersion('1.0');
-        $rest->setSupportedFormats('JsonFormat', 'XmlFormat');//, 'HtmlFormat');
+        
+        $rest->addAuthenticationClass('Api\\OAuth2\\Server', '');
+
+        $rest->setSupportedFormats('JsonFormat', 'XmlFormat'); //, 'HtmlFormat');
         //$rest->setOverridingFormats('UploadFormat', 'JsonFormat', 'XmlFormat', 'HtmlFormat');
+        $rest->setOverridingFormats('HtmlFormat');
 
         $_SERVER['REQUEST_URI'] = $uri;
 
@@ -1082,10 +1090,6 @@ class Bootstrap
             $rest->handleError(500);
         }
 
-        //Luracast\Restler\Format\HtmlFormat::$viewPath = $apiDir . 'oauth2/views';
-        //require_once $apiDir . 'oauth2/Server.php';
-
-        //$rest->addAuthenticationClass('Api\\OAuth2\\Server', '');
 
         $rest->handle();