From ba39a27904f3c907bc133dba1edcfcf5b2d86908 Mon Sep 17 00:00:00 2001
From: Erik Amaru Ortiz <aortiz.erik@gmail.com>
Date: Thu, 26 Sep 2013 15:01:15 -0400
Subject: [PATCH] More OAuth2 updates (not functional yet)

---
 gulliver/system/class.bootstrap.php           |  2 +-
 .../classes/model/om/BaseConfiguration.php    | 15 ---------
 workflow/engine/classes/model/om/BaseTask.php |  4 +--
 workflow/engine/config/schema.xml             | 33 +++++++++++++++++++
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php
index 5f5861ae6..8c8fb8775 100644
--- a/gulliver/system/class.bootstrap.php
+++ b/gulliver/system/class.bootstrap.php
@@ -1078,7 +1078,7 @@ class Bootstrap
 
         $rest->setSupportedFormats('JsonFormat', 'XmlFormat'); //, 'HtmlFormat');
         //$rest->setOverridingFormats('UploadFormat', 'JsonFormat', 'XmlFormat', 'HtmlFormat');
-        $rest->setOverridingFormats('HtmlFormat');
+        $rest->setOverridingFormats('HtmlFormat', 'JsonFormat', 'UploadFormat');
 
         $_SERVER['REQUEST_URI'] = $uri;
 
diff --git a/workflow/engine/classes/model/om/BaseConfiguration.php b/workflow/engine/classes/model/om/BaseConfiguration.php
index cf5250d19..7c5e79a84 100755
--- a/workflow/engine/classes/model/om/BaseConfiguration.php
+++ b/workflow/engine/classes/model/om/BaseConfiguration.php
@@ -823,20 +823,5 @@ abstract class BaseConfiguration extends BaseObject implements Persistent
         }
         return self::$peer;
     }
-
-    /**
-     * Set properties related to Configuration table
-     * 
-     * @return void
-     */
-    public function setProperties()
-    {
-        $this->cfg_uid = '';
-        $this->obj_uid = '';
-        $this->cfg_value = '';
-        $this->pro_uid = '';
-        $this->usr_uid = '';
-        $this->app_uid = '';
-    }
 }
 
diff --git a/workflow/engine/classes/model/om/BaseTask.php b/workflow/engine/classes/model/om/BaseTask.php
index f15c778a2..9ba6c01e8 100755
--- a/workflow/engine/classes/model/om/BaseTask.php
+++ b/workflow/engine/classes/model/om/BaseTask.php
@@ -103,7 +103,7 @@ abstract class BaseTask extends BaseObject implements Persistent
      * The value for the tas_group_variable field.
      * @var        string
      */
-    protected $tas_group_variable = '@@SYS_GROUP_TO_BE_ASSIGNED';
+    protected $tas_group_variable;
 
     /**
      * The value for the tas_mi_instance_variable field.
@@ -1090,7 +1090,7 @@ abstract class BaseTask extends BaseObject implements Persistent
             $v = (string) $v;
         }
 
-        if ($this->tas_group_variable !== $v || $v === '@@SYS_GROUP_TO_BE_ASSIGNED') {
+        if ($this->tas_group_variable !== $v) {
             $this->tas_group_variable = $v;
             $this->modifiedColumns[] = TaskPeer::TAS_GROUP_VARIABLE;
         }
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 20b163643..87d804456 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -3009,4 +3009,37 @@
       <index-column name="ID"/>
     </index>
   </table>
+
+    <table name="OAUTH_ACCESS_TOKENS">
+        <column name="ACCESS_TOKEN" type="VARCHAR" size="40" required="true" primaryKey="true" />
+        <column name="CLIENT_ID" type="VARCHAR"  size="80" required="true" />
+        <column name="USER_ID" type="VARCHAR"  size="32" required="true" />
+        <column name="EXPIRES" type="TIMESTAMP" required="true" />
+        <column name="SCOPE" type="VARCHAR" size="2000" required="false" />
+    </table>
+    <table name="OAUTH_AUTHORIZATION_CODES">
+        <column name="AUTHORIZATION_CODE" type="VARCHAR" size="40" required="true" primaryKey="true" />
+        <column name="CLIENT_ID" type="VARCHAR"  size="80" required="true" />
+        <column name="USER_ID" type="VARCHAR"  size="32" required="false" />
+        <column name="REDIRECT_URI" type="VARCHAR" size="2000" required="false" />
+        <column name="EXPIRES" type="TIMESTAMP" required="true" />
+        <column name="SCOPE" type="VARCHAR" size="2000" required="false" />
+    </table>
+    <table name="OAUTH_CLIENTS">
+        <column name="CLIENT_ID" type="VARCHAR" size="80" required="true" primaryKey="true" />
+        <column name="CLIENT_SECRET" type="VARCHAR"  size="80" required="true" />
+        <column name="REDIRECT_URI" type="VARCHAR" size="2000" required="true" />
+    </table>
+    <table name="OAUTH_REFRESH_TOKENS">
+        <column name="REFRESH_TOKES" type="VARCHAR" size="40" required="true" primaryKey="true" />
+        <column name="CLIENT_ID" type="VARCHAR"  size="80" required="true" />
+        <column name="USER_ID" type="VARCHAR"  size="32" required="false" />
+        <column name="EXPIRES" type="TIMESTAMP" required="true" />
+        <column name="SCOPE" type="VARCHAR" size="2000" required="false" />
+    </table>
+    <table name="OAUTH_SCOPES">
+        <column name="TYPE" type="VARCHAR" size="40" required="true" />
+        <column name="SCOPE" type="VARCHAR" size="2000" required="false" />
+        <column name="CLIENT_ID" type="VARCHAR"  size="80" required="true" />
+    </table>
 </database>