drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bridg...@apache.org
Subject [14/14] drill git commit: remove web ui security straggler, reorg plugins, add jdbc
Date Tue, 20 Oct 2015 22:01:04 GMT
remove web ui security straggler, reorg plugins, add jdbc

minor edits

more edits

more edits

fix curl cmd

fix rn date, link to jdbc plugin doc

minor edit

another web ui security straggler

reference to web ui security

web ui security leftover

minor edit

formatting

yet another web ui security reference

Ted's changes

edits to workarounds

minor tweaks

complex nested data edit

wordsmithing

Uwe's changes

minor tweak

minor edit

consistency issue

pointer to rn for DRILL 3956

nav changes

javadoc

Ted's table alias workaround

links to javadoc


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/dd4cdd0f
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/dd4cdd0f
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/dd4cdd0f

Branch: refs/heads/gh-pages
Commit: dd4cdd0f53ff0d630a13a8fa8b05ef052c579e0b
Parents: c35b782
Author: Kristine Hahn <khahn@maprtech.com>
Authored: Tue Oct 20 05:04:53 2015 -0700
Committer: Kristine Hahn <khahn@maprtech.com>
Committed: Tue Oct 20 14:01:29 2015 -0700

----------------------------------------------------------------------
 _data/docs.json                                 | 488 +++++-----
 .../020-storage-plugin-registration.md          |  18 +-
 .../035-plugin-configuration-basics.md          |   5 +-
 .../040-file-system-storage-plugin.md           |  99 --
 .../060-hbase-storage-plugin.md                 |  18 -
 .../070-hive-storage-plugin.md                  |  80 --
 .../090-mongodb-plugin-for-apache-drill.md      | 184 ----
 .../connect-a-data-source/100-mapr-db-format.md |  27 -
 .../plugins/040-file-system-storage-plugin.md   |  99 ++
 .../plugins/060-hbase-storage-plugin.md         |  18 +
 .../plugins/070-hive-storage-plugin.md          |  80 ++
 .../plugins/080-jdbc-storage-plugin.md          |  61 ++
 .../plugins/090-mongodb-storage-plugin.md       | 184 ++++
 .../plugins/100-mapr-db-format.md               |  27 +
 .../050-json-data-model.md                      |  96 +-
 .../015-using-jdbc-driver.md                    |   2 +-
 _docs/rn/009-1.2.0-rn.md                        |  19 +-
 api/1.2/jdbc/META-INF/DEPENDENCIES              | 243 +++++
 api/1.2/jdbc/META-INF/LICENSE                   | 202 ++++
 api/1.2/jdbc/META-INF/MANIFEST.MF               |   6 +
 api/1.2/jdbc/META-INF/NOTICE                    |   8 +
 api/1.2/jdbc/allclasses-frame.html              |  35 +
 api/1.2/jdbc/allclasses-noframe.html            |  35 +
 api/1.2/jdbc/constant-values.html               | 119 +++
 api/1.2/jdbc/deprecated-list.html               | 119 +++
 api/1.2/jdbc/help-doc.html                      | 224 +++++
 api/1.2/jdbc/index-all.html                     | 661 +++++++++++++
 api/1.2/jdbc/index.html                         |  75 ++
 .../drill/jdbc/AlreadyClosedSqlException.html   | 408 ++++++++
 .../org/apache/drill/jdbc/DrillConnection.html  | 675 +++++++++++++
 .../drill/jdbc/DrillConnectionConfig.html       | 354 +++++++
 .../drill/jdbc/DrillDatabaseMetaData.html       | 940 +++++++++++++++++++
 .../drill/jdbc/DrillPreparedStatement.html      | 226 +++++
 .../org/apache/drill/jdbc/DrillResultSet.html   | 859 +++++++++++++++++
 .../org/apache/drill/jdbc/DrillStatement.html   | 310 ++++++
 api/1.2/jdbc/org/apache/drill/jdbc/Driver.html  | 404 ++++++++
 .../jdbc/ExecutionCanceledSqlException.html     | 280 ++++++
 .../jdbc/InvalidCursorStateSqlException.html    | 409 ++++++++
 .../jdbc/InvalidParameterSqlException.html      | 392 ++++++++
 .../apache/drill/jdbc/JdbcApiSqlException.html  | 466 +++++++++
 .../drill/jdbc/SQLConversionException.html      | 240 +++++
 .../jdbc/SQLConversionOverflowException.html    | 281 ++++++
 .../apache/drill/jdbc/SchemaChangeListener.html | 210 +++++
 .../apache/drill/jdbc/SqlTimeoutException.html  | 228 +++++
 .../class-use/AlreadyClosedSqlException.html    | 186 ++++
 .../drill/jdbc/class-use/DrillConnection.html   | 119 +++
 .../jdbc/class-use/DrillConnectionConfig.html   | 163 ++++
 .../jdbc/class-use/DrillDatabaseMetaData.html   | 119 +++
 .../jdbc/class-use/DrillPreparedStatement.html  | 119 +++
 .../drill/jdbc/class-use/DrillResultSet.html    | 119 +++
 .../drill/jdbc/class-use/DrillStatement.html    | 119 +++
 .../org/apache/drill/jdbc/class-use/Driver.html | 119 +++
 .../ExecutionCanceledSqlException.html          | 119 +++
 .../InvalidCursorStateSqlException.html         | 119 +++
 .../class-use/InvalidParameterSqlException.html | 119 +++
 .../jdbc/class-use/JdbcApiSqlException.html     | 202 ++++
 .../jdbc/class-use/SQLConversionException.html  | 161 ++++
 .../SQLConversionOverflowException.html         | 205 ++++
 .../jdbc/class-use/SchemaChangeListener.html    | 119 +++
 .../jdbc/class-use/SqlTimeoutException.html     | 119 +++
 .../org/apache/drill/jdbc/package-frame.html    |  41 +
 .../org/apache/drill/jdbc/package-summary.html  | 265 ++++++
 .../org/apache/drill/jdbc/package-tree.html     | 228 +++++
 .../jdbc/org/apache/drill/jdbc/package-use.html | 174 ++++
 .../drill/jdbc/proxy/TracingProxyDriver.html    | 435 +++++++++
 .../proxy/class-use/TracingProxyDriver.html     | 119 +++
 .../apache/drill/jdbc/proxy/package-frame.html  |  20 +
 .../drill/jdbc/proxy/package-summary.html       | 149 +++
 .../apache/drill/jdbc/proxy/package-tree.html   | 132 +++
 .../apache/drill/jdbc/proxy/package-use.html    | 119 +++
 api/1.2/jdbc/overview-frame.html                |  23 +
 api/1.2/jdbc/overview-summary.html              | 152 +++
 api/1.2/jdbc/overview-tree.html                 | 251 +++++
 api/1.2/jdbc/package-list                       |   2 +
 api/1.2/jdbc/resources/background.gif           | Bin 0 -> 2313 bytes
 api/1.2/jdbc/resources/tab.gif                  | Bin 0 -> 291 bytes
 api/1.2/jdbc/resources/titlebar.gif             | Bin 0 -> 10701 bytes
 api/1.2/jdbc/resources/titlebar_end.gif         | Bin 0 -> 849 bytes
 api/1.2/jdbc/serialized-form.html               | 195 ++++
 api/1.2/jdbc/stylesheet.css                     | 474 ++++++++++
 80 files changed, 14221 insertions(+), 698 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/dd4cdd0f/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index d5cc023..dda4fcc 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -1646,8 +1646,8 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "File System Storage Plugin", 
-                            "next_url": "/docs/file-system-storage-plugin/", 
+                            "next_title": "Workspaces", 
+                            "next_url": "/docs/workspaces/", 
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "Storage Plugin Configuration", 
                             "previous_url": "/docs/storage-plugin-configuration/", 
@@ -1667,32 +1667,11 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Workspaces", 
-                            "next_url": "/docs/workspaces/", 
+                            "next_title": "Drill Default Input Format", 
+                            "next_url": "/docs/drill-default-input-format/", 
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "Plugin Configuration Basics", 
                             "previous_url": "/docs/plugin-configuration-basics/", 
-                            "relative_path": "_docs/connect-a-data-source/040-file-system-storage-plugin.md", 
-                            "title": "File System Storage Plugin", 
-                            "url": "/docs/file-system-storage-plugin/"
-                        }, 
-                        {
-                            "breadcrumbs": [
-                                {
-                                    "title": "Storage Plugin Configuration", 
-                                    "url": "/docs/storage-plugin-configuration/"
-                                }, 
-                                {
-                                    "title": "Connect a Data Source", 
-                                    "url": "/docs/connect-a-data-source/"
-                                }
-                            ], 
-                            "children": [], 
-                            "next_title": "HBase Storage Plugin", 
-                            "next_url": "/docs/hbase-storage-plugin/", 
-                            "parent": "Storage Plugin Configuration", 
-                            "previous_title": "File System Storage Plugin", 
-                            "previous_url": "/docs/file-system-storage-plugin/", 
                             "relative_path": "_docs/connect-a-data-source/050-workspaces.md", 
                             "title": "Workspaces", 
                             "url": "/docs/workspaces/"
@@ -1709,53 +1688,11 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Hive Storage Plugin", 
-                            "next_url": "/docs/hive-storage-plugin/", 
+                            "next_title": "File System Storage Plugin", 
+                            "next_url": "/docs/file-system-storage-plugin/", 
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "Workspaces", 
                             "previous_url": "/docs/workspaces/", 
-                            "relative_path": "_docs/connect-a-data-source/060-hbase-storage-plugin.md", 
-                            "title": "HBase Storage Plugin", 
-                            "url": "/docs/hbase-storage-plugin/"
-                        }, 
-                        {
-                            "breadcrumbs": [
-                                {
-                                    "title": "Storage Plugin Configuration", 
-                                    "url": "/docs/storage-plugin-configuration/"
-                                }, 
-                                {
-                                    "title": "Connect a Data Source", 
-                                    "url": "/docs/connect-a-data-source/"
-                                }
-                            ], 
-                            "children": [], 
-                            "next_title": "Drill Default Input Format", 
-                            "next_url": "/docs/drill-default-input-format/", 
-                            "parent": "Storage Plugin Configuration", 
-                            "previous_title": "HBase Storage Plugin", 
-                            "previous_url": "/docs/hbase-storage-plugin/", 
-                            "relative_path": "_docs/connect-a-data-source/070-hive-storage-plugin.md", 
-                            "title": "Hive Storage Plugin", 
-                            "url": "/docs/hive-storage-plugin/"
-                        }, 
-                        {
-                            "breadcrumbs": [
-                                {
-                                    "title": "Storage Plugin Configuration", 
-                                    "url": "/docs/storage-plugin-configuration/"
-                                }, 
-                                {
-                                    "title": "Connect a Data Source", 
-                                    "url": "/docs/connect-a-data-source/"
-                                }
-                            ], 
-                            "children": [], 
-                            "next_title": "MongoDB Plugin for Apache Drill", 
-                            "next_url": "/docs/mongodb-plugin-for-apache-drill/", 
-                            "parent": "Storage Plugin Configuration", 
-                            "previous_title": "Hive Storage Plugin", 
-                            "previous_url": "/docs/hive-storage-plugin/", 
                             "relative_path": "_docs/connect-a-data-source/080-drill-default-input-format.md", 
                             "title": "Drill Default Input Format", 
                             "url": "/docs/drill-default-input-format/"
@@ -1778,14 +1715,82 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "MapR-DB Format", 
-                    "next_url": "/docs/mapr-db-format/", 
+                    "next_title": "HBase Storage Plugin", 
+                    "next_url": "/docs/hbase-storage-plugin/", 
                     "parent": "Connect a Data Source", 
                     "previous_title": "Drill Default Input Format", 
                     "previous_url": "/docs/drill-default-input-format/", 
-                    "relative_path": "_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md", 
-                    "title": "MongoDB Plugin for Apache Drill", 
-                    "url": "/docs/mongodb-plugin-for-apache-drill/"
+                    "relative_path": "_docs/connect-a-data-source/plugins/040-file-system-storage-plugin.md", 
+                    "title": "File System Storage Plugin", 
+                    "url": "/docs/file-system-storage-plugin/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Connect a Data Source", 
+                            "url": "/docs/connect-a-data-source/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "Hive Storage Plugin", 
+                    "next_url": "/docs/hive-storage-plugin/", 
+                    "parent": "Connect a Data Source", 
+                    "previous_title": "File System Storage Plugin", 
+                    "previous_url": "/docs/file-system-storage-plugin/", 
+                    "relative_path": "_docs/connect-a-data-source/plugins/060-hbase-storage-plugin.md", 
+                    "title": "HBase Storage Plugin", 
+                    "url": "/docs/hbase-storage-plugin/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Connect a Data Source", 
+                            "url": "/docs/connect-a-data-source/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "JDBC Storage Plugin", 
+                    "next_url": "/docs/jdbc-storage-plugin/", 
+                    "parent": "Connect a Data Source", 
+                    "previous_title": "HBase Storage Plugin", 
+                    "previous_url": "/docs/hbase-storage-plugin/", 
+                    "relative_path": "_docs/connect-a-data-source/plugins/070-hive-storage-plugin.md", 
+                    "title": "Hive Storage Plugin", 
+                    "url": "/docs/hive-storage-plugin/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Connect a Data Source", 
+                            "url": "/docs/connect-a-data-source/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "MongoDB Storage Plugin", 
+                    "next_url": "/docs/mongodb-storage-plugin/", 
+                    "parent": "Connect a Data Source", 
+                    "previous_title": "Hive Storage Plugin", 
+                    "previous_url": "/docs/hive-storage-plugin/", 
+                    "relative_path": "_docs/connect-a-data-source/plugins/080-jdbc-storage-plugin.md", 
+                    "title": "JDBC Storage Plugin", 
+                    "url": "/docs/jdbc-storage-plugin/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Connect a Data Source", 
+                            "url": "/docs/connect-a-data-source/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "MapR-DB Format", 
+                    "next_url": "/docs/mapr-db-format/", 
+                    "parent": "Connect a Data Source", 
+                    "previous_title": "JDBC Storage Plugin", 
+                    "previous_url": "/docs/jdbc-storage-plugin/", 
+                    "relative_path": "_docs/connect-a-data-source/plugins/090-mongodb-storage-plugin.md", 
+                    "title": "MongoDB Storage Plugin", 
+                    "url": "/docs/mongodb-storage-plugin/"
                 }, 
                 {
                     "breadcrumbs": [
@@ -1798,9 +1803,9 @@
                     "next_title": "ODBC/JDBC Interfaces", 
                     "next_url": "/docs/odbc-jdbc-interfaces/", 
                     "parent": "Connect a Data Source", 
-                    "previous_title": "MongoDB Plugin for Apache Drill", 
-                    "previous_url": "/docs/mongodb-plugin-for-apache-drill/", 
-                    "relative_path": "_docs/connect-a-data-source/100-mapr-db-format.md", 
+                    "previous_title": "MongoDB Storage Plugin", 
+                    "previous_url": "/docs/mongodb-storage-plugin/", 
+                    "relative_path": "_docs/connect-a-data-source/plugins/100-mapr-db-format.md", 
                     "title": "MapR-DB Format", 
                     "url": "/docs/mapr-db-format/"
                 }
@@ -2978,11 +2983,11 @@
                 }
             ], 
             "children": [], 
-            "next_title": "MongoDB Plugin for Apache Drill", 
-            "next_url": "/docs/mongodb-plugin-for-apache-drill/", 
+            "next_title": "File System Storage Plugin", 
+            "next_url": "/docs/file-system-storage-plugin/", 
             "parent": "Storage Plugin Configuration", 
-            "previous_title": "Hive Storage Plugin", 
-            "previous_url": "/docs/hive-storage-plugin/", 
+            "previous_title": "Workspaces", 
+            "previous_url": "/docs/workspaces/", 
             "relative_path": "_docs/connect-a-data-source/080-drill-default-input-format.md", 
             "title": "Drill Default Input Format", 
             "url": "/docs/drill-default-input-format/"
@@ -3243,21 +3248,17 @@
         "File System Storage Plugin": {
             "breadcrumbs": [
                 {
-                    "title": "Storage Plugin Configuration", 
-                    "url": "/docs/storage-plugin-configuration/"
-                }, 
-                {
                     "title": "Connect a Data Source", 
                     "url": "/docs/connect-a-data-source/"
                 }
             ], 
             "children": [], 
-            "next_title": "Workspaces", 
-            "next_url": "/docs/workspaces/", 
-            "parent": "Storage Plugin Configuration", 
-            "previous_title": "Plugin Configuration Basics", 
-            "previous_url": "/docs/plugin-configuration-basics/", 
-            "relative_path": "_docs/connect-a-data-source/040-file-system-storage-plugin.md", 
+            "next_title": "HBase Storage Plugin", 
+            "next_url": "/docs/hbase-storage-plugin/", 
+            "parent": "Connect a Data Source", 
+            "previous_title": "Drill Default Input Format", 
+            "previous_url": "/docs/drill-default-input-format/", 
+            "relative_path": "_docs/connect-a-data-source/plugins/040-file-system-storage-plugin.md", 
             "title": "File System Storage Plugin", 
             "url": "/docs/file-system-storage-plugin/"
         }, 
@@ -3416,10 +3417,6 @@
         "HBase Storage Plugin": {
             "breadcrumbs": [
                 {
-                    "title": "Storage Plugin Configuration", 
-                    "url": "/docs/storage-plugin-configuration/"
-                }, 
-                {
                     "title": "Connect a Data Source", 
                     "url": "/docs/connect-a-data-source/"
                 }
@@ -3427,10 +3424,10 @@
             "children": [], 
             "next_title": "Hive Storage Plugin", 
             "next_url": "/docs/hive-storage-plugin/", 
-            "parent": "Storage Plugin Configuration", 
-            "previous_title": "Workspaces", 
-            "previous_url": "/docs/workspaces/", 
-            "relative_path": "_docs/connect-a-data-source/060-hbase-storage-plugin.md", 
+            "parent": "Connect a Data Source", 
+            "previous_title": "File System Storage Plugin", 
+            "previous_url": "/docs/file-system-storage-plugin/", 
+            "relative_path": "_docs/connect-a-data-source/plugins/060-hbase-storage-plugin.md", 
             "title": "HBase Storage Plugin", 
             "url": "/docs/hbase-storage-plugin/"
         }, 
@@ -3458,21 +3455,17 @@
         "Hive Storage Plugin": {
             "breadcrumbs": [
                 {
-                    "title": "Storage Plugin Configuration", 
-                    "url": "/docs/storage-plugin-configuration/"
-                }, 
-                {
                     "title": "Connect a Data Source", 
                     "url": "/docs/connect-a-data-source/"
                 }
             ], 
             "children": [], 
-            "next_title": "Drill Default Input Format", 
-            "next_url": "/docs/drill-default-input-format/", 
-            "parent": "Storage Plugin Configuration", 
+            "next_title": "JDBC Storage Plugin", 
+            "next_url": "/docs/jdbc-storage-plugin/", 
+            "parent": "Connect a Data Source", 
             "previous_title": "HBase Storage Plugin", 
             "previous_url": "/docs/hbase-storage-plugin/", 
-            "relative_path": "_docs/connect-a-data-source/070-hive-storage-plugin.md", 
+            "relative_path": "_docs/connect-a-data-source/plugins/070-hive-storage-plugin.md", 
             "title": "Hive Storage Plugin", 
             "url": "/docs/hive-storage-plugin/"
         }, 
@@ -4312,6 +4305,23 @@
             "title": "Interfaces Introduction", 
             "url": "/docs/interfaces-introduction/"
         }, 
+        "JDBC Storage Plugin": {
+            "breadcrumbs": [
+                {
+                    "title": "Connect a Data Source", 
+                    "url": "/docs/connect-a-data-source/"
+                }
+            ], 
+            "children": [], 
+            "next_title": "MongoDB Storage Plugin", 
+            "next_url": "/docs/mongodb-storage-plugin/", 
+            "parent": "Connect a Data Source", 
+            "previous_title": "Hive Storage Plugin", 
+            "previous_url": "/docs/hive-storage-plugin/", 
+            "relative_path": "_docs/connect-a-data-source/plugins/080-jdbc-storage-plugin.md", 
+            "title": "JDBC Storage Plugin", 
+            "url": "/docs/jdbc-storage-plugin/"
+        }, 
         "JSON Data Model": {
             "breadcrumbs": [
                 {
@@ -4763,9 +4773,9 @@
             "next_title": "ODBC/JDBC Interfaces", 
             "next_url": "/docs/odbc-jdbc-interfaces/", 
             "parent": "Connect a Data Source", 
-            "previous_title": "MongoDB Plugin for Apache Drill", 
-            "previous_url": "/docs/mongodb-plugin-for-apache-drill/", 
-            "relative_path": "_docs/connect-a-data-source/100-mapr-db-format.md", 
+            "previous_title": "MongoDB Storage Plugin", 
+            "previous_url": "/docs/mongodb-storage-plugin/", 
+            "relative_path": "_docs/connect-a-data-source/plugins/100-mapr-db-format.md", 
             "title": "MapR-DB Format", 
             "url": "/docs/mapr-db-format/"
         }, 
@@ -4828,7 +4838,7 @@
             "title": "Modifying Query Planning Options", 
             "url": "/docs/modifying-query-planning-options/"
         }, 
-        "MongoDB Plugin for Apache Drill": {
+        "MongoDB Storage Plugin": {
             "breadcrumbs": [
                 {
                     "title": "Connect a Data Source", 
@@ -4839,11 +4849,11 @@
             "next_title": "MapR-DB Format", 
             "next_url": "/docs/mapr-db-format/", 
             "parent": "Connect a Data Source", 
-            "previous_title": "Drill Default Input Format", 
-            "previous_url": "/docs/drill-default-input-format/", 
-            "relative_path": "_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md", 
-            "title": "MongoDB Plugin for Apache Drill", 
-            "url": "/docs/mongodb-plugin-for-apache-drill/"
+            "previous_title": "JDBC Storage Plugin", 
+            "previous_url": "/docs/jdbc-storage-plugin/", 
+            "relative_path": "_docs/connect-a-data-source/plugins/090-mongodb-storage-plugin.md", 
+            "title": "MongoDB Storage Plugin", 
+            "url": "/docs/mongodb-storage-plugin/"
         }, 
         "Monitoring and Canceling Queries in the Drill Web Console": {
             "breadcrumbs": [
@@ -6270,8 +6280,8 @@
                 }
             ], 
             "children": [], 
-            "next_title": "File System Storage Plugin", 
-            "next_url": "/docs/file-system-storage-plugin/", 
+            "next_title": "Workspaces", 
+            "next_url": "/docs/workspaces/", 
             "parent": "Storage Plugin Configuration", 
             "previous_title": "Storage Plugin Configuration", 
             "previous_url": "/docs/storage-plugin-configuration/", 
@@ -10320,8 +10330,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "File System Storage Plugin", 
-                    "next_url": "/docs/file-system-storage-plugin/", 
+                    "next_title": "Workspaces", 
+                    "next_url": "/docs/workspaces/", 
                     "parent": "Storage Plugin Configuration", 
                     "previous_title": "Storage Plugin Configuration", 
                     "previous_url": "/docs/storage-plugin-configuration/", 
@@ -10341,32 +10351,11 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Workspaces", 
-                    "next_url": "/docs/workspaces/", 
+                    "next_title": "Drill Default Input Format", 
+                    "next_url": "/docs/drill-default-input-format/", 
                     "parent": "Storage Plugin Configuration", 
                     "previous_title": "Plugin Configuration Basics", 
                     "previous_url": "/docs/plugin-configuration-basics/", 
-                    "relative_path": "_docs/connect-a-data-source/040-file-system-storage-plugin.md", 
-                    "title": "File System Storage Plugin", 
-                    "url": "/docs/file-system-storage-plugin/"
-                }, 
-                {
-                    "breadcrumbs": [
-                        {
-                            "title": "Storage Plugin Configuration", 
-                            "url": "/docs/storage-plugin-configuration/"
-                        }, 
-                        {
-                            "title": "Connect a Data Source", 
-                            "url": "/docs/connect-a-data-source/"
-                        }
-                    ], 
-                    "children": [], 
-                    "next_title": "HBase Storage Plugin", 
-                    "next_url": "/docs/hbase-storage-plugin/", 
-                    "parent": "Storage Plugin Configuration", 
-                    "previous_title": "File System Storage Plugin", 
-                    "previous_url": "/docs/file-system-storage-plugin/", 
                     "relative_path": "_docs/connect-a-data-source/050-workspaces.md", 
                     "title": "Workspaces", 
                     "url": "/docs/workspaces/"
@@ -10383,53 +10372,11 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Hive Storage Plugin", 
-                    "next_url": "/docs/hive-storage-plugin/", 
+                    "next_title": "File System Storage Plugin", 
+                    "next_url": "/docs/file-system-storage-plugin/", 
                     "parent": "Storage Plugin Configuration", 
                     "previous_title": "Workspaces", 
                     "previous_url": "/docs/workspaces/", 
-                    "relative_path": "_docs/connect-a-data-source/060-hbase-storage-plugin.md", 
-                    "title": "HBase Storage Plugin", 
-                    "url": "/docs/hbase-storage-plugin/"
-                }, 
-                {
-                    "breadcrumbs": [
-                        {
-                            "title": "Storage Plugin Configuration", 
-                            "url": "/docs/storage-plugin-configuration/"
-                        }, 
-                        {
-                            "title": "Connect a Data Source", 
-                            "url": "/docs/connect-a-data-source/"
-                        }
-                    ], 
-                    "children": [], 
-                    "next_title": "Drill Default Input Format", 
-                    "next_url": "/docs/drill-default-input-format/", 
-                    "parent": "Storage Plugin Configuration", 
-                    "previous_title": "HBase Storage Plugin", 
-                    "previous_url": "/docs/hbase-storage-plugin/", 
-                    "relative_path": "_docs/connect-a-data-source/070-hive-storage-plugin.md", 
-                    "title": "Hive Storage Plugin", 
-                    "url": "/docs/hive-storage-plugin/"
-                }, 
-                {
-                    "breadcrumbs": [
-                        {
-                            "title": "Storage Plugin Configuration", 
-                            "url": "/docs/storage-plugin-configuration/"
-                        }, 
-                        {
-                            "title": "Connect a Data Source", 
-                            "url": "/docs/connect-a-data-source/"
-                        }
-                    ], 
-                    "children": [], 
-                    "next_title": "MongoDB Plugin for Apache Drill", 
-                    "next_url": "/docs/mongodb-plugin-for-apache-drill/", 
-                    "parent": "Storage Plugin Configuration", 
-                    "previous_title": "Hive Storage Plugin", 
-                    "previous_url": "/docs/hive-storage-plugin/", 
                     "relative_path": "_docs/connect-a-data-source/080-drill-default-input-format.md", 
                     "title": "Drill Default Input Format", 
                     "url": "/docs/drill-default-input-format/"
@@ -11592,11 +11539,11 @@
                 }
             ], 
             "children": [], 
-            "next_title": "HBase Storage Plugin", 
-            "next_url": "/docs/hbase-storage-plugin/", 
+            "next_title": "Drill Default Input Format", 
+            "next_url": "/docs/drill-default-input-format/", 
             "parent": "Storage Plugin Configuration", 
-            "previous_title": "File System Storage Plugin", 
-            "previous_url": "/docs/file-system-storage-plugin/", 
+            "previous_title": "Plugin Configuration Basics", 
+            "previous_url": "/docs/plugin-configuration-basics/", 
             "relative_path": "_docs/connect-a-data-source/050-workspaces.md", 
             "title": "Workspaces", 
             "url": "/docs/workspaces/"
@@ -12634,8 +12581,8 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "File System Storage Plugin", 
-                            "next_url": "/docs/file-system-storage-plugin/", 
+                            "next_title": "Workspaces", 
+                            "next_url": "/docs/workspaces/", 
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "Storage Plugin Configuration", 
                             "previous_url": "/docs/storage-plugin-configuration/", 
@@ -12655,32 +12602,11 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Workspaces", 
-                            "next_url": "/docs/workspaces/", 
+                            "next_title": "Drill Default Input Format", 
+                            "next_url": "/docs/drill-default-input-format/", 
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "Plugin Configuration Basics", 
                             "previous_url": "/docs/plugin-configuration-basics/", 
-                            "relative_path": "_docs/connect-a-data-source/040-file-system-storage-plugin.md", 
-                            "title": "File System Storage Plugin", 
-                            "url": "/docs/file-system-storage-plugin/"
-                        }, 
-                        {
-                            "breadcrumbs": [
-                                {
-                                    "title": "Storage Plugin Configuration", 
-                                    "url": "/docs/storage-plugin-configuration/"
-                                }, 
-                                {
-                                    "title": "Connect a Data Source", 
-                                    "url": "/docs/connect-a-data-source/"
-                                }
-                            ], 
-                            "children": [], 
-                            "next_title": "HBase Storage Plugin", 
-                            "next_url": "/docs/hbase-storage-plugin/", 
-                            "parent": "Storage Plugin Configuration", 
-                            "previous_title": "File System Storage Plugin", 
-                            "previous_url": "/docs/file-system-storage-plugin/", 
                             "relative_path": "_docs/connect-a-data-source/050-workspaces.md", 
                             "title": "Workspaces", 
                             "url": "/docs/workspaces/"
@@ -12697,53 +12623,11 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Hive Storage Plugin", 
-                            "next_url": "/docs/hive-storage-plugin/", 
+                            "next_title": "File System Storage Plugin", 
+                            "next_url": "/docs/file-system-storage-plugin/", 
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "Workspaces", 
                             "previous_url": "/docs/workspaces/", 
-                            "relative_path": "_docs/connect-a-data-source/060-hbase-storage-plugin.md", 
-                            "title": "HBase Storage Plugin", 
-                            "url": "/docs/hbase-storage-plugin/"
-                        }, 
-                        {
-                            "breadcrumbs": [
-                                {
-                                    "title": "Storage Plugin Configuration", 
-                                    "url": "/docs/storage-plugin-configuration/"
-                                }, 
-                                {
-                                    "title": "Connect a Data Source", 
-                                    "url": "/docs/connect-a-data-source/"
-                                }
-                            ], 
-                            "children": [], 
-                            "next_title": "Drill Default Input Format", 
-                            "next_url": "/docs/drill-default-input-format/", 
-                            "parent": "Storage Plugin Configuration", 
-                            "previous_title": "HBase Storage Plugin", 
-                            "previous_url": "/docs/hbase-storage-plugin/", 
-                            "relative_path": "_docs/connect-a-data-source/070-hive-storage-plugin.md", 
-                            "title": "Hive Storage Plugin", 
-                            "url": "/docs/hive-storage-plugin/"
-                        }, 
-                        {
-                            "breadcrumbs": [
-                                {
-                                    "title": "Storage Plugin Configuration", 
-                                    "url": "/docs/storage-plugin-configuration/"
-                                }, 
-                                {
-                                    "title": "Connect a Data Source", 
-                                    "url": "/docs/connect-a-data-source/"
-                                }
-                            ], 
-                            "children": [], 
-                            "next_title": "MongoDB Plugin for Apache Drill", 
-                            "next_url": "/docs/mongodb-plugin-for-apache-drill/", 
-                            "parent": "Storage Plugin Configuration", 
-                            "previous_title": "Hive Storage Plugin", 
-                            "previous_url": "/docs/hive-storage-plugin/", 
                             "relative_path": "_docs/connect-a-data-source/080-drill-default-input-format.md", 
                             "title": "Drill Default Input Format", 
                             "url": "/docs/drill-default-input-format/"
@@ -12766,14 +12650,82 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "MapR-DB Format", 
-                    "next_url": "/docs/mapr-db-format/", 
+                    "next_title": "HBase Storage Plugin", 
+                    "next_url": "/docs/hbase-storage-plugin/", 
                     "parent": "Connect a Data Source", 
                     "previous_title": "Drill Default Input Format", 
                     "previous_url": "/docs/drill-default-input-format/", 
-                    "relative_path": "_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md", 
-                    "title": "MongoDB Plugin for Apache Drill", 
-                    "url": "/docs/mongodb-plugin-for-apache-drill/"
+                    "relative_path": "_docs/connect-a-data-source/plugins/040-file-system-storage-plugin.md", 
+                    "title": "File System Storage Plugin", 
+                    "url": "/docs/file-system-storage-plugin/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Connect a Data Source", 
+                            "url": "/docs/connect-a-data-source/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "Hive Storage Plugin", 
+                    "next_url": "/docs/hive-storage-plugin/", 
+                    "parent": "Connect a Data Source", 
+                    "previous_title": "File System Storage Plugin", 
+                    "previous_url": "/docs/file-system-storage-plugin/", 
+                    "relative_path": "_docs/connect-a-data-source/plugins/060-hbase-storage-plugin.md", 
+                    "title": "HBase Storage Plugin", 
+                    "url": "/docs/hbase-storage-plugin/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Connect a Data Source", 
+                            "url": "/docs/connect-a-data-source/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "JDBC Storage Plugin", 
+                    "next_url": "/docs/jdbc-storage-plugin/", 
+                    "parent": "Connect a Data Source", 
+                    "previous_title": "HBase Storage Plugin", 
+                    "previous_url": "/docs/hbase-storage-plugin/", 
+                    "relative_path": "_docs/connect-a-data-source/plugins/070-hive-storage-plugin.md", 
+                    "title": "Hive Storage Plugin", 
+                    "url": "/docs/hive-storage-plugin/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Connect a Data Source", 
+                            "url": "/docs/connect-a-data-source/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "MongoDB Storage Plugin", 
+                    "next_url": "/docs/mongodb-storage-plugin/", 
+                    "parent": "Connect a Data Source", 
+                    "previous_title": "Hive Storage Plugin", 
+                    "previous_url": "/docs/hive-storage-plugin/", 
+                    "relative_path": "_docs/connect-a-data-source/plugins/080-jdbc-storage-plugin.md", 
+                    "title": "JDBC Storage Plugin", 
+                    "url": "/docs/jdbc-storage-plugin/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Connect a Data Source", 
+                            "url": "/docs/connect-a-data-source/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "MapR-DB Format", 
+                    "next_url": "/docs/mapr-db-format/", 
+                    "parent": "Connect a Data Source", 
+                    "previous_title": "JDBC Storage Plugin", 
+                    "previous_url": "/docs/jdbc-storage-plugin/", 
+                    "relative_path": "_docs/connect-a-data-source/plugins/090-mongodb-storage-plugin.md", 
+                    "title": "MongoDB Storage Plugin", 
+                    "url": "/docs/mongodb-storage-plugin/"
                 }, 
                 {
                     "breadcrumbs": [
@@ -12786,9 +12738,9 @@
                     "next_title": "ODBC/JDBC Interfaces", 
                     "next_url": "/docs/odbc-jdbc-interfaces/", 
                     "parent": "Connect a Data Source", 
-                    "previous_title": "MongoDB Plugin for Apache Drill", 
-                    "previous_url": "/docs/mongodb-plugin-for-apache-drill/", 
-                    "relative_path": "_docs/connect-a-data-source/100-mapr-db-format.md", 
+                    "previous_title": "MongoDB Storage Plugin", 
+                    "previous_url": "/docs/mongodb-storage-plugin/", 
+                    "relative_path": "_docs/connect-a-data-source/plugins/100-mapr-db-format.md", 
                     "title": "MapR-DB Format", 
                     "url": "/docs/mapr-db-format/"
                 }

http://git-wip-us.apache.org/repos/asf/drill/blob/dd4cdd0f/_docs/connect-a-data-source/020-storage-plugin-registration.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/020-storage-plugin-registration.md b/_docs/connect-a-data-source/020-storage-plugin-registration.md
index e2d19c3..140b25a 100644
--- a/_docs/connect-a-data-source/020-storage-plugin-registration.md
+++ b/_docs/connect-a-data-source/020-storage-plugin-registration.md
@@ -2,7 +2,9 @@
 title: "Storage Plugin Registration"
 parent: "Connect a Data Source"
 ---
-You connect Drill to a file system, Hive, HBase, or other data source through a storage plugin. On the Storage tab of the Drill Web Console, you can view and reconfigure a storage plugin. If [HTTPS support]({{site.baseurl}}/docs/configuring-web-console-and-rest-api-security/#https-support) is not enabled (the default), go to `http://<IP address>:8047/storage` to view and configure a storage plugin. IP address is the host name or IP address of one of the installed Drillbits in a distributed system or `localhost` in an embedded system. If HTTPS support is enabled and you are [authorized]({{site.baseurl}}/docs/configuring-web-console-and-rest-api-security/) to view and configure a storage plugin, go to `https://<IP address>:8047/storage`. 
+You connect Drill to a file system, Hive, HBase, or other data source through a storage plugin. On the Storage tab of the Drill Web Console, you can view and reconfigure a storage plugin. If [HTTPS support]({{site.baseurl}}/docs/configuring-web-console-and-rest-api-security/#https-support) is not enabled (the default), go to `http://<IP address>:8047/storage` to view and configure a storage plugin. IP address is the host name or IP address of one of the installed Drillbits in a distributed system or `localhost` in an embedded system. If HTTPS support is enabled, go to `https://<IP address>:8047/storage`. 
+
+<!--  DOC NOTE: change when feature added in 1.3: If HTTPS support is enabled and you are [authorized]({{site.baseurl}}/docs/configuring-web-console-and-rest-api-security/) to view and configure a storage plugin, go to -->
 
 The Drill installation registers the `cp`, `dfs`, `hbase`, `hive`, and `mongo` default storage plugin configurations.
 
@@ -22,13 +24,19 @@ In the [Drill sandbox]({{site.baseurl}}/docs/about-the-mapr-sandbox/), the `dfs`
 
 ## Registering a Storage Plugin Configuration
 
-To register a new storage plugin configuration, enter a storage name, click **CREATE**, provide a configuration in JSON format, and click **UPDATE**. In Drill 1.2 and later, updating a storage plugin configuration and other storage plugin tasks require [authorization]({{site.baseurl}}/docs/configuring-web-console-and-rest-api-security/) if security is enabled.
+To register a new storage plugin configuration, enter a storage name, click **CREATE**, provide a configuration in JSON format, and click **UPDATE**. 
+
+<!-- In Drill 1.2 and later, updating a storage plugin configuration and other storage plugin tasks require [authorization]({{site.baseurl}}/docs/configuring-web-console-and-rest-api-security/) if security is enabled. -->
 
 ## Storage Plugin Configuration Persistance
 
-Drill saves storage plugin configurations in a temporary directory (embedded mode) or in ZooKeeper (distributed mode). For example, on Mac OS X, Drill uses `/tmp/drill/sys.storage_plugins` to store storage plugin configurations. Enabling authorization to protect this data through the Web Console and REST API does not include protection for the data in the tmp directory or in ZooKeeper. 
+Drill saves storage plugin configurations in a temporary directory (embedded mode) or in ZooKeeper (distributed mode). For example, on Mac OS X, Drill uses `/tmp/drill/sys.storage_plugins` to store storage plugin configurations. The temporary directory clears when you quit the Drill shell. To save your storage plugin configurations from one session to the next, set the following option in the `drill-override.conf` file if you are running Drill in embedded mode.
+
+`drill.exec.sys.store.provider.local.path = "/mypath"`
+
+<!-- Enabling authorization to protect this data through the Web Console and REST API does not include protection for the data in the tmp directory or in ZooKeeper. 
 
-<!-- See Drill-3780 -->
+DOCS NOTE: See Drill-3780 and 3949
 
-The storage plugin configuration persists after upgrading, so authorized users can see a configuration that you created in one version of Drill in the Drill Web Console of an upgraded version of Drill. To revert to the default storage plugins for a particular version, in embedded mode, delete the contents of this directory and restart the Drill shell.
+The storage plugin configuration persists after upgrading, so authorized users can see a configuration that you created in one version of Drill in the Drill Web Console of an upgraded version of Drill. To revert to the default storage plugins for a particular version, in embedded mode, delete the contents of this directory and restart the Drill shell. -->
 

http://git-wip-us.apache.org/repos/asf/drill/blob/dd4cdd0f/_docs/connect-a-data-source/035-plugin-configuration-basics.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/035-plugin-configuration-basics.md b/_docs/connect-a-data-source/035-plugin-configuration-basics.md
index c5916ac..7b2969b 100644
--- a/_docs/connect-a-data-source/035-plugin-configuration-basics.md
+++ b/_docs/connect-a-data-source/035-plugin-configuration-basics.md
@@ -15,7 +15,6 @@ To create a name and new configuration:
 
 1. [Start the Drill shell]({{site.baseurl}}/docs/starting-drill-on-linux-and-mac-os-x/).  
 2. [Start the Web Console]({{site.baseurl}}/docs/starting-the-web-console/).  
-   The Storage tab appears on the Web Console if you are [authorized]({{site.baseurl}}/docs/configuring-web-console-and-rest-api-security/) to view, update, or add storage plugins.  
 3. On the Storage tab, enter a name in **New Storage Plugin**.
    Each configuration registered with Drill must have a distinct
 name. Names are case-sensitive.  
@@ -27,6 +26,8 @@ name. Names are case-sensitive.
    Using a copy of an existing configuration reduces the risk of JSON coding errors. Use the Storage Plugin Attributes table in the next section as a guide for making typical modifications.  
 6. Click **Create**.
 
+<!-- Add to step 3 when the feature goes into 1.3: The Storage tab appears on the Web Console if you are [authorized]({{site.baseurl}}/docs/configuring-web-console-and-rest-api-security/) to view, update, or add storage plugins.   -->
+
 ## Storage Plugin Attributes
 The following graphic shows key attributes of a typical `dfs`-based storage plugin configuration:  
 ![dfs plugin]({{ site.baseurl }}/docs/img/connect-plugin.png)
@@ -161,7 +162,7 @@ If you need to add a storage plugin configuration to Drill and do not want to us
 
 For example, this command creates a storage plugin named myplugin for reading files of an unknown type located on the root of the file system:
 
-    curl -X POST -/json" -d '{"name":"myplugin", "config": {"type": "file", "enabled": false, "connection": "file:///", "workspaces": { "root": { "location": "/", "writable": false, "defaultInputFormat": null}}, "formats": null}}' https://localhost:8047/storage/myplugin.json
+    curl -X POST -H "Content-Tpe: application/json" -d '{"name":"myplugin", "config": {"type": "file", "enabled": false, "connection": "file:///", "workspaces": { "root": { "location": "/", "writable": false, "defaultInputFormat": null}}, "formats": null}}' https://localhost:8047/storage/myplugin.json
 
 For more information about the REST API, see this [Google doc](https://docs.google.com/document/d/1mRsuWk4Dpt6ts-jQ6ke3bB30PIwanRiCPfGxRwZEQME).
 

http://git-wip-us.apache.org/repos/asf/drill/blob/dd4cdd0f/_docs/connect-a-data-source/040-file-system-storage-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/040-file-system-storage-plugin.md b/_docs/connect-a-data-source/040-file-system-storage-plugin.md
deleted file mode 100644
index 89c00a7..0000000
--- a/_docs/connect-a-data-source/040-file-system-storage-plugin.md
+++ /dev/null
@@ -1,99 +0,0 @@
----
-title: "File System Storage Plugin"
-parent: "Storage Plugin Configuration"
----
-You can register a storage plugin configuration that connects Drill to a local file system or to a distributed file system registered in the Hadoop `core-site.xml`, such as S3
-or HDFS. By
-default, Apache Drill includes a storage plugin configuration named `dfs` that points to the local file
-system on your machine by default. 
-
-## Connecting Drill to a File System
-
-In a Drill cluster, you typically do not query the local file system, but instead place files on the distributed file system. Currently, you need to use a distributed file system when connecting multiple Drillbits to get complete, consistent query results, simulate a distributed file system by copying files to each node, or use an NFS volume, such as Amazon Elastic File System. 
-
-You configure the connection property of the storage plugin workspace to connect Drill to a distributed file system. For example, the following connection property connects Drill to an HDFS cluster from a client:
-
-`"connection": "hdfs://<IP Address>:<Port>/"`   
-
-To query a file on HDFS from a node on the cluster, you can simply change the connection from `file:///` to `hdfs://` in the `dfs` storage plugin.
-
-To change the `dfs` storage plugin configuration to point to a different local or a distributed file system, use `connection` attributes as shown in the following examples.
-
-* Local file system example:
-
-  ```
-  {
-    "type": "file",
-    "enabled": true,
-    "connection": "file:///",
-    "workspaces": {
-      "root": {
-        "location": "/user/max/donuts",
-        "writable": false,
-        "defaultInputFormat": null
-       }
-    },
-    "formats" : {
-      "json" : {
-        "type" : "json"
-      }
-    }
-  }
-  ```
-
-* Distributed file system example:
-
-  ```
-  {
-    "type" : "file",
-    "enabled" : true,
-    "connection" : "hdfs://10.10.30.156:8020/",
-    "workspaces" : {
-      "root" : {
-        "location" : "/user/root/drill",
-        "writable" : true,
-        "defaultInputFormat" : null
-      }
-    },
-    "formats" : {
-      "json" : {
-        "type" : "json"
-      }
-    }
-  }
-  ```
-
-To connect to a Hadoop file system, you include the IP address and port number of the
-name node.
-
-### Querying Donuts Example
-
-The following example shows a file type storage plugin configuration with a
-workspace named `json_files`. The configuration points Drill to the
-`/users/max/drill/json/` directory in the local file system `(dfs)`:
-
-    {
-      "type" : "file",
-      "enabled" : true,
-      "connection" : "file:///",
-      "workspaces" : {
-        "json_files" : {
-          "location" : "/users/max/drill/json/",
-          "writable" : false,
-          "defaultInputFormat" : json
-       } 
-    },
-
-The `connection` parameter in this configuration is "`file:///`", connecting Drill to the local file system.
-
-To query a file in the example `json_files` workspace, you can issue the `USE`
-command to tell Drill to use the `json_files` workspace, which is included in the `dfs`
-configuration for each query that you issue:
-
-    USE dfs.json_files;
-    SELECT * FROM `donuts.json` WHERE type='frosted'
-
-If the `json_files` workspace did not exist, the query would have to include the
-full file path name to the `donuts.json` file:
-
-    SELECT * FROM dfs.`/users/max/drill/json/donuts.json` WHERE type='frosted';
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/dd4cdd0f/_docs/connect-a-data-source/060-hbase-storage-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/060-hbase-storage-plugin.md b/_docs/connect-a-data-source/060-hbase-storage-plugin.md
deleted file mode 100644
index 0242ef8..0000000
--- a/_docs/connect-a-data-source/060-hbase-storage-plugin.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-title: "HBase Storage Plugin"
-parent: "Storage Plugin Configuration"
----
-When connecting Drill to an HBase data source using the HBase storage plugin installed with Drill, you need to specify a ZooKeeper quorum. Drill supports HBase version 0.98.
-
-To view or change the HBase storage plugin configuration, use the [Drill Web Console]({{ site.baseurl }}/docs/plugin-configuration-basics/#using-the-drill-web-console). In the Web Console, select the **Storage** tab, and then click the **Update** button for the `hbase` storage plugin configuration. The following example shows a typical HBase storage plugin:
-
-            {
-              "type": "hbase",
-              "config": {
-                "hbase.zookeeper.quorum": "10.10.100.62,10.10.10.52,10.10.10.53",
-                "hbase.zookeeper.property.clientPort": "2181"
-              },
-              "size.calculator.enabled": false,
-              "enabled": true
-            }
-

http://git-wip-us.apache.org/repos/asf/drill/blob/dd4cdd0f/_docs/connect-a-data-source/070-hive-storage-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/070-hive-storage-plugin.md b/_docs/connect-a-data-source/070-hive-storage-plugin.md
deleted file mode 100644
index a523757..0000000
--- a/_docs/connect-a-data-source/070-hive-storage-plugin.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: "Hive Storage Plugin"
-parent: "Storage Plugin Configuration"
----
-Drill 1.0 supports Hive 0.13. Drill 1.1 supports Hive 1.0. To access Hive tables
-using custom SerDes or InputFormat/OutputFormat, all nodes running Drillbits
-must have the SerDes or InputFormat/OutputFormat `JAR` files in the 
-`<drill_installation_directory>/jars/3rdparty` folder.
-
-## Hive Remote Metastore Configuration
-
-The Hive metastore configuration runs as a separate service outside
-of Hive. Drill communicates with the Hive metastore through Thrift. The
-metastore service communicates with the Hive database over JDBC. Point Drill
-to the Hive metastore service address, and provide the connection parameters
-in a Hive storage plugin configuration to configure a connection to Drill.
-
-{% include startnote.html %}Verify that the Hive metastore service is running before you register the Hive metastore.{% include endnote.html %}  
-
-To register a remote Hive metastore with Drill:
-
-1. Issue the following command to start the Hive metastore service on the system specified in the `hive.metastore.uris`:
-   `hive --service metastore`
-2. In the [Drill Web Console]({{ site.baseurl }}/docs/plugin-configuration-basics/#using-the-drill-web-console), select the **Storage** tab.
-3. In the list of disabled storage plugins in the Drill Web Console, click **Update** next to `hive`. The Hive storage plugin configuration appears:
-
-        {
-          "type": "hive",
-          "enabled": false,
-          "configProps": {
-            "hive.metastore.uris": "",
-            "javax.jdo.option.ConnectionURL": "jdbc:derby:;databaseName=../sample-data/drill_hive_db;create=true",
-            "hive.metastore.warehouse.dir": "/tmp/drill_hive_wh",
-            "fs.default.name": "file:///",
-            "hive.metastore.sasl.enabled": "false"
-          }
-        }
-4. In the configuration window, add the `Thrift URI` and port to `hive.metastore.uris`. For example:
-
-          ...
-             "configProps": {
-             "hive.metastore.uris": "thrift://<host>:<port>",
-          ...
-5. Change the default location of files to suit your environment; for example, change `"fs.default.name"` property from `"file:///"` to one of these locations:
-   * `hdfs://`
-   * `hdfs://<hostname>:<port>`
-6. Click **Enable**.  
-
-After configuring a Hive storage plugin, you can [query Hive tables]({{ site.baseurl }}/docs/querying-hive/).
-
-## Hive Embedded Metastore Configuration
-
-The Hive metastore configuration is embedded within the Drill process. Configure an embedded metastore only in a cluster that runs a single Drillbit and only for testing purposes. Do not embed the Hive metastore in production systems.
-
-Provide the metastore database configuration settings in the Drill Web Console. Before you configure an embedded Hive metastore, verify that the driver you use to connect to the Hive metastore is in the Drill classpath located in `/<drill installation directory>/lib/.` If the driver is not there, copy the driver to `/<drill
-installation directory>/lib` on the Drill node. For more information about storage types and configurations, refer to ["Hive Metastore Administration"](https://cwiki.apache.org/confluence/display/Hive/AdminManual+MetastoreAdmin).
-
-To configure an embedded Hive metastore, complete the following
-steps:
-
-1. In the [Drill Web Console]({{ site.baseurl }}/docs/plugin-configuration-basics/#using-the-drill-web-console), and select the **Storage** tab.
-2. In the disabled storage plugin configurations section, click **Update** next to `hive`.
-3. In the configuration window, add the database configuration settings.
-
-    **Example**
-
-          {
-            "type": "hive",
-            "enabled": false,
-            "configProps": {
-              "hive.metastore.uris": "",
-              "javax.jdo.option.ConnectionURL": "jdbc:<database>://<host:port>/<metastore database>",
-              "hive.metastore.warehouse.dir": "/tmp/drill_hive_wh",
-              "fs.default.name": "file:///",
-              "hive.metastore.sasl.enabled": "false"
-            }
-          }
-5. Change the `"fs.default.name"` attribute to specify the default location of files. The value needs to be a URI that is available and capable of handling file system requests. For example, change the local file system URI `"file:///"` to the HDFS URI: `hdfs://`, or to the path on HDFS with a namenode: `hdfs://<hostname>:<port>`
-6. Click **Enable**.
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/dd4cdd0f/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md b/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
deleted file mode 100644
index f62a3f3..0000000
--- a/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
+++ /dev/null
@@ -1,184 +0,0 @@
----
-title: "MongoDB Plugin for Apache Drill"
-parent: "Connect a Data Source"
----
-## Overview
-
-Drill supports MongoDB 3.0, providing a mongodb storage plugin to connect to MongoDB using MongoDB's latest Java driver. You can run queries
-to read, but not write, Mongo data using Drill. Attempting to write data back to Mongo results in an error. You do not need any upfront schema definitions. 
-
-{% include startnote.html %}In the following examples, you use a local instance of Drill for simplicity. {% include endnote.html %}
-
-You can also run Drill and MongoDB together in distributed mode.
-
-### Before You Begin
-
-To query MongoDB with Drill, you install Drill and MongoDB, and then you import zip code aggregation data into MongoDB. 
-
-  1. [Install Drill]({{ site.baseurl }}/docs/installing-drill-in-embedded-mode), if you do not already have it installed.
-  2. [Install MongoDB](http://docs.mongodb.org/manual/installation), if you do not already have it installed.
-  3. [Import the MongoDB zip code sample data set](http://docs.mongodb.org/manual/tutorial/aggregation-zip-code-data-set).   * Copy the `zips.json` content into a file and save it.  
-     * Create `/data/db` if it doesn't already exist.
-     * Make sure you have permissions to access the directories. 
-     * Use Mongo Import to import `zips.json`. 
-
-## Configuring MongoDB
-
-Drill must be running in order to access the Web Console to configure a storage plugin configuration. Start Drill and view and enable the MongoDB storage plugin configuration as described in the following procedure: 
-
-  1. [Start the Drill shell]({{site.baseurl}}/docs/starting-drill-on-linux-and-mac-os-x/).
-
-     The Drill shell needs to be running to access the Drill Web Console.
-  2. In the [Drill Web Console]({{ site.baseurl }}/docs/plugin-configuration-basics/#using-the-drill-web-console), select the **Storage** tab.
-  4. Under Disabled Storage Plugins, select **Update** to choose the `mongo` storage plugin configuration.
-  5. In the Configuration window, take a look at the default configuration:
-     
-        {
-          "type": "mongo",
-          "connection": "mongodb://localhost:27017/",
-          "enabled": false
-        }
-
-     {% include startnote.html %}27017 is the default port for `mongodb` instances.{% include endnote.html %} 
-  6. Click **Enable** to enable the storage plugin.
-
-## Querying MongoDB
-
-In the [Drill shell]({{site.baseurl}}/docs/starting-drill-on-linux-and-mac-os-x/), set up Drill to use the zips collection you imported into MongoDB.
-
-1. Get a list of schemas from all
-Drill data sources, including MongoDB. 
-
-        SHOW DATABASES;
-   
-        +---------------------+
-        |     SCHEMA_NAME     |
-        +---------------------+
-        | INFORMATION_SCHEMA  |
-        | cp.default          |
-        | dfs.default         |
-        | dfs.root            |
-        | dfs.tmp             |
-        | mongo.local         |
-        | mongo.test          |
-        | sys                 |
-        +---------------------+
-        8 rows selected (1.385 seconds)
-    
-2. Change the schema to mongo.text.
-
-        USE mongo.test;
-
-        +-------+-----------------------------------------+
-        |  ok   |                 summary                 |
-        +-------+-----------------------------------------+
-        | true  | Default schema changed to [mongo.test]  |
-        +-------+-----------------------------------------+
-
-3. List the tables and verify that the `zips` collection appears:
-
-        SHOW TABLES;
-
-        +---------------+-----------------+
-        | TABLE_SCHEMA  |   TABLE_NAME    |
-        +---------------+-----------------+
-        | mongo.test    | system.indexes  |
-        | mongo.test    | zips            |
-        +---------------+-----------------+
-        2 rows selected (0.187 seconds)
-
-4. Set the option to read numbers as doubles instead of as text;
-
-        ALTER SYSTEM SET `store.mongo.read_numbers_as_double` = true;
-        +-------+----------------------------------------------+
-        |  ok   |                   summary                    |
-        +-------+----------------------------------------------+
-        | true  | store.mongo.read_numbers_as_double updated.  |
-        +-------+----------------------------------------------+
-        1 row selected (0.078 seconds)
-
-
-
-### Example Queries
-
-**Example 1: View the zips Collection**
-
-    SELECT * FROM zips LIMIT 10;
-
-    +---------------+-------------------------+--------+--------+
-    |     city      |           loc           |  pop   | state  |
-    +---------------+-------------------------+--------+--------+
-    | AGAWAM        | [-72.622739,42.070206]  | 15338  | MA     |
-    | CUSHMAN       | [-72.51565,42.377017]   | 36963  | MA     |
-    | BELCHERTOWN   | [-72.410953,42.275103]  | 10579  | MA     |
-    | BLANDFORD     | [-72.936114,42.182949]  | 1240   | MA     |
-    | BRIMFIELD     | [-72.188455,42.116543]  | 3706   | MA     |
-    | CHESTERFIELD  | [-72.833309,42.38167]   | 177    | MA     |
-    | BARRE         | [-72.108354,42.409698]  | 4546   | MA     |
-    | CHICOPEE      | [-72.607962,42.162046]  | 23396  | MA     |
-    | CHICOPEE      | [-72.576142,42.176443]  | 31495  | MA     |
-    | CHESTER       | [-72.988761,42.279421]  | 1688   | MA     |
-    +---------------+-------------------------+--------+--------+
-    10 rows selected (0.444 seconds)
-
-
-**Example 2: Aggregation**
-
-```
-SELECT city, avg(pop) FROM zips GROUP BY city LIMIT 10; 
-
-+---------------+---------------------+
-|     city      |       EXPR$1        |
-+---------------+---------------------+
-| AGAWAM        | 15338.0             |
-| CUSHMAN       | 18649.5             |
-| BELCHERTOWN   | 10579.0             |
-| BLANDFORD     | 1240.0              |
-| BRIMFIELD     | 2441.5              |
-| CHESTERFIELD  | 9988.857142857143   |
-| BARRE         | 9770.0              |
-| CHICOPEE      | 27445.5             |
-| CHESTER       | 7285.0952380952385  |
-| WESTOVER AFB  | 1764.0              |
-+---------------+---------------------+
-10 rows selected (1.664 seconds)
-```
-
-**Example 3: Nested Data Column Array**
-
-    0: jdbc:drill:zk=local> SELECT loc FROM zips LIMIT 10;
-    +------------------------+
-    |    loc                 |
-    +------------------------+
-    | [-72.622739,42.070206] |
-    | [-72.51565,42.377017]  |
-    | [-72.108354,42.409698] |
-    | [-72.410953,42.275103] |
-    | [-72.936114,42.182949] |
-    | [-72.188455,42.116543] |
-    | [-72.988761,42.279421] |
-    | [-72.833309,42.38167]  |
-    | [-72.607962,42.162046] |
-    | [-72.576142,42.176443] |
-    +------------------------+
-        
-    0: jdbc:drill:zk=local> SELECT loc[0] FROM zips LIMIT 10;
-    +------------+
-    |   EXPR$0   |
-    +------------+
-    | -72.622739 |
-    | -72.51565  |
-    | -72.108354 |
-    | -72.410953 |
-    | -72.936114 |
-    | -72.188455 |
-    | -72.988761 |
-    | -72.833309 |
-    | -72.607962 |
-    | -72.576142 |
-    +------------+
-
-## Using ODBC/JDBC Drivers
-
-You can query MongoDB through standard
-BI tools, such as Tableau and SQuirreL. For information about Drill ODBC and JDBC drivers, refer to [Drill Interfaces]({{ site.baseurl }}/docs/odbc-jdbc-interfaces).

http://git-wip-us.apache.org/repos/asf/drill/blob/dd4cdd0f/_docs/connect-a-data-source/100-mapr-db-format.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/100-mapr-db-format.md b/_docs/connect-a-data-source/100-mapr-db-format.md
deleted file mode 100755
index a5c7403..0000000
--- a/_docs/connect-a-data-source/100-mapr-db-format.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-title: "MapR-DB Format"
-parent: "Connect a Data Source"
----
-The MapR-DB format is not included in the Apache Drill release. Drill includes a `maprdb` format for MapR-DB that is defined within the
-default `dfs` storage plugin configuration when you install Drill from the `mapr-drill` package on a MapR node. The `maprdb` format improves the
-estimated number of rows that Drill uses to plan a query. It also enables you
-to query tables like you would query files in a file system because MapR-DB
-and MapR-FS share the same namespace. 
-
-You can query tables stored across multiple directories. You do not need to
-create a table mapping to a directory before you query a table in the
-directory. You can select from any table in any directory the same way you
-would select from files in MapR-FS, using the same syntax.
-
-Instead of including the name of a file, you include the table name in the
-query. The userid running the query must have read permission to access the MapR table.  
-
-**Example**
-
-    SELECT * FROM mfs.`/users/max/mytable`;
-
-The following image shows a portion of the `dfs` configuration with the `maprdb`
-format:
-
-![drill query flow]({{ site.baseurl }}/docs/img/18.png)
-

http://git-wip-us.apache.org/repos/asf/drill/blob/dd4cdd0f/_docs/connect-a-data-source/plugins/040-file-system-storage-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/plugins/040-file-system-storage-plugin.md b/_docs/connect-a-data-source/plugins/040-file-system-storage-plugin.md
new file mode 100644
index 0000000..d142152
--- /dev/null
+++ b/_docs/connect-a-data-source/plugins/040-file-system-storage-plugin.md
@@ -0,0 +1,99 @@
+---
+title: "File System Storage Plugin"
+parent: "Connect a Data Source"
+---
+You can register a storage plugin configuration that connects Drill to a local file system or to a distributed file system registered in the Hadoop `core-site.xml`, such as S3
+or HDFS. By
+default, Apache Drill includes a storage plugin configuration named `dfs` that points to the local file
+system on your machine by default. 
+
+## Connecting Drill to a File System
+
+In a Drill cluster, you typically do not query the local file system, but instead place files on the distributed file system. Currently, you need to use a distributed file system when connecting multiple Drillbits to get complete, consistent query results, simulate a distributed file system by copying files to each node, or use an NFS volume, such as Amazon Elastic File System. 
+
+You configure the connection property of the storage plugin workspace to connect Drill to a distributed file system. For example, the following connection property connects Drill to an HDFS cluster from a client:
+
+`"connection": "hdfs://<IP Address>:<Port>/"`   
+
+To query a file on HDFS from a node on the cluster, you can simply change the connection from `file:///` to `hdfs://` in the `dfs` storage plugin.
+
+To change the `dfs` storage plugin configuration to point to a different local or a distributed file system, use `connection` attributes as shown in the following examples.
+
+* Local file system example:
+
+  ```
+  {
+    "type": "file",
+    "enabled": true,
+    "connection": "file:///",
+    "workspaces": {
+      "root": {
+        "location": "/user/max/donuts",
+        "writable": false,
+        "defaultInputFormat": null
+       }
+    },
+    "formats" : {
+      "json" : {
+        "type" : "json"
+      }
+    }
+  }
+  ```
+
+* Distributed file system example:
+
+  ```
+  {
+    "type" : "file",
+    "enabled" : true,
+    "connection" : "hdfs://10.10.30.156:8020/",
+    "workspaces" : {
+      "root" : {
+        "location" : "/user/root/drill",
+        "writable" : true,
+        "defaultInputFormat" : null
+      }
+    },
+    "formats" : {
+      "json" : {
+        "type" : "json"
+      }
+    }
+  }
+  ```
+
+To connect to a Hadoop file system, you include the IP address and port number of the
+name node.
+
+### Querying Donuts Example
+
+The following example shows a file type storage plugin configuration with a
+workspace named `json_files`. The configuration points Drill to the
+`/users/max/drill/json/` directory in the local file system `(dfs)`:
+
+    {
+      "type" : "file",
+      "enabled" : true,
+      "connection" : "file:///",
+      "workspaces" : {
+        "json_files" : {
+          "location" : "/users/max/drill/json/",
+          "writable" : false,
+          "defaultInputFormat" : json
+       } 
+    },
+
+The `connection` parameter in this configuration is "`file:///`", connecting Drill to the local file system.
+
+To query a file in the example `json_files` workspace, you can issue the `USE`
+command to tell Drill to use the `json_files` workspace, which is included in the `dfs`
+configuration for each query that you issue:
+
+    USE dfs.json_files;
+    SELECT * FROM `donuts.json` WHERE type='frosted'
+
+If the `json_files` workspace did not exist, the query would have to include the
+full file path name to the `donuts.json` file:
+
+    SELECT * FROM dfs.`/users/max/drill/json/donuts.json` WHERE type='frosted';
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/dd4cdd0f/_docs/connect-a-data-source/plugins/060-hbase-storage-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/plugins/060-hbase-storage-plugin.md b/_docs/connect-a-data-source/plugins/060-hbase-storage-plugin.md
new file mode 100644
index 0000000..a09a2ee
--- /dev/null
+++ b/_docs/connect-a-data-source/plugins/060-hbase-storage-plugin.md
@@ -0,0 +1,18 @@
+---
+title: "HBase Storage Plugin"
+parent: "Connect a Data Source"
+---
+When connecting Drill to an HBase data source using the HBase storage plugin installed with Drill, you need to specify a ZooKeeper quorum. Drill supports HBase version 0.98.
+
+To view or change the HBase storage plugin configuration, use the [Drill Web Console]({{ site.baseurl }}/docs/plugin-configuration-basics/#using-the-drill-web-console). In the Web Console, select the **Storage** tab, and then click the **Update** button for the `hbase` storage plugin configuration. The following example shows a typical HBase storage plugin:
+
+            {
+              "type": "hbase",
+              "config": {
+                "hbase.zookeeper.quorum": "10.10.100.62,10.10.10.52,10.10.10.53",
+                "hbase.zookeeper.property.clientPort": "2181"
+              },
+              "size.calculator.enabled": false,
+              "enabled": true
+            }
+

http://git-wip-us.apache.org/repos/asf/drill/blob/dd4cdd0f/_docs/connect-a-data-source/plugins/070-hive-storage-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/plugins/070-hive-storage-plugin.md b/_docs/connect-a-data-source/plugins/070-hive-storage-plugin.md
new file mode 100644
index 0000000..9428c1b
--- /dev/null
+++ b/_docs/connect-a-data-source/plugins/070-hive-storage-plugin.md
@@ -0,0 +1,80 @@
+---
+title: "Hive Storage Plugin"
+parent: "Connect a Data Source"
+---
+Drill 1.0 supports Hive 0.13. Drill 1.1 supports Hive 1.0. To access Hive tables
+using custom SerDes or InputFormat/OutputFormat, all nodes running Drillbits
+must have the SerDes or InputFormat/OutputFormat `JAR` files in the 
+`<drill_installation_directory>/jars/3rdparty` folder.
+
+## Hive Remote Metastore Configuration
+
+The Hive metastore configuration runs as a separate service outside
+of Hive. Drill communicates with the Hive metastore through Thrift. The
+metastore service communicates with the Hive database over JDBC. Point Drill
+to the Hive metastore service address, and provide the connection parameters
+in a Hive storage plugin configuration to configure a connection to Drill.
+
+{% include startnote.html %}Verify that the Hive metastore service is running before you register the Hive metastore.{% include endnote.html %}  
+
+To register a remote Hive metastore with Drill:
+
+1. Issue the following command to start the Hive metastore service on the system specified in the `hive.metastore.uris`:
+   `hive --service metastore`
+2. In the [Drill Web Console]({{ site.baseurl }}/docs/plugin-configuration-basics/#using-the-drill-web-console), select the **Storage** tab.
+3. In the list of disabled storage plugins in the Drill Web Console, click **Update** next to `hive`. The Hive storage plugin configuration appears:
+
+        {
+          "type": "hive",
+          "enabled": false,
+          "configProps": {
+            "hive.metastore.uris": "",
+            "javax.jdo.option.ConnectionURL": "jdbc:derby:;databaseName=../sample-data/drill_hive_db;create=true",
+            "hive.metastore.warehouse.dir": "/tmp/drill_hive_wh",
+            "fs.default.name": "file:///",
+            "hive.metastore.sasl.enabled": "false"
+          }
+        }
+4. In the configuration window, add the `Thrift URI` and port to `hive.metastore.uris`. For example:
+
+          ...
+             "configProps": {
+             "hive.metastore.uris": "thrift://<host>:<port>",
+          ...
+5. Change the default location of files to suit your environment; for example, change `"fs.default.name"` property from `"file:///"` to one of these locations:
+   * `hdfs://`
+   * `hdfs://<hostname>:<port>`
+6. Click **Enable**.  
+
+After configuring a Hive storage plugin, you can [query Hive tables]({{ site.baseurl }}/docs/querying-hive/).
+
+## Hive Embedded Metastore Configuration
+
+The Hive metastore configuration is embedded within the Drill process. Configure an embedded metastore only in a cluster that runs a single Drillbit and only for testing purposes. Do not embed the Hive metastore in production systems.
+
+Provide the metastore database configuration settings in the Drill Web Console. Before you configure an embedded Hive metastore, verify that the driver you use to connect to the Hive metastore is in the Drill classpath located in `/<drill installation directory>/lib/.` If the driver is not there, copy the driver to `/<drill
+installation directory>/lib` on the Drill node. For more information about storage types and configurations, refer to ["Hive Metastore Administration"](https://cwiki.apache.org/confluence/display/Hive/AdminManual+MetastoreAdmin).
+
+To configure an embedded Hive metastore, complete the following
+steps:
+
+1. In the [Drill Web Console]({{ site.baseurl }}/docs/plugin-configuration-basics/#using-the-drill-web-console), and select the **Storage** tab.
+2. In the disabled storage plugin configurations section, click **Update** next to `hive`.
+3. In the configuration window, add the database configuration settings.
+
+    **Example**
+
+          {
+            "type": "hive",
+            "enabled": false,
+            "configProps": {
+              "hive.metastore.uris": "",
+              "javax.jdo.option.ConnectionURL": "jdbc:<database>://<host:port>/<metastore database>",
+              "hive.metastore.warehouse.dir": "/tmp/drill_hive_wh",
+              "fs.default.name": "file:///",
+              "hive.metastore.sasl.enabled": "false"
+            }
+          }
+5. Change the `"fs.default.name"` attribute to specify the default location of files. The value needs to be a URI that is available and capable of handling file system requests. For example, change the local file system URI `"file:///"` to the HDFS URI: `hdfs://`, or to the path on HDFS with a namenode: `hdfs://<hostname>:<port>`
+6. Click **Enable**.
+  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/dd4cdd0f/_docs/connect-a-data-source/plugins/080-jdbc-storage-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/plugins/080-jdbc-storage-plugin.md b/_docs/connect-a-data-source/plugins/080-jdbc-storage-plugin.md
new file mode 100644
index 0000000..c0b3093
--- /dev/null
+++ b/_docs/connect-a-data-source/plugins/080-jdbc-storage-plugin.md
@@ -0,0 +1,61 @@
+---
+title: "JDBC Storage Plugin"
+parent: "Connect a Data Source"
+---
+Drill 1.2 includes a JDBC storage plugin for connecting to data sources such as MySQL over JDBC. 
+
+## Example MySQL Setup
+To configure the JDBC storage plugin for MySQL, set up MySQL and the compatible MySQL driver:
+
+1. Download and install a current version MySQL.  
+2. Set up a MySQL password for the user account you plan to use.
+3. Download and unpack the compatible JDBC driver.  
+4. Put a copy of the driver JAR in the following location:  
+   `<drill_installation_directory>/jars/3rdparty`  
+
+## JDBC Storage Plugin Configuration
+
+Drill communicates with MySQL through the JDBC driver using the configuration that you specify in the Web Console or through the [REST API]({{site.baseurl}}/docs/plugin-configuration-basics/#storage-plugin-rest-api).  
+
+{% include startnote.html %}Verify that MySQL is running and the MySQL driver is in place before you configure the JDBC storage plugin.{% include endnote.html %}  
+
+To configure the JDBC storage plugin:
+
+1. To save your storage plugin configurations from one session to the next, set the following option in the `drill-override.conf` file if you are running Drill in embedded mode.
+
+    `drill.exec.sys.store.provider.local.path = "/mypath"`
+
+2. [Start the Drill shell]({{site.baseurl}}/docs/starting-drill-on-linux-and-mac-os-x/).  
+3. [Start the Web Console]({{site.baseurl}}/docs/starting-the-web-console/).  
+4. On the Storage tab, enter a name in **New Storage Plugin**. For example, enter myplugin.
+   Each configuration registered with Drill must have a distinct
+name. Names are case-sensitive.  
+
+    {% include startnote.html %}The URL differs depending on your installation and configuration.{% include endnote.html %}  
+5. Click **Create**.  
+6. In Configuration, set the required properties using JSON formatting as shown in the following example. Change the properties to match your environment.  
+
+        {
+          "type": "jdbc",
+          "driver": "com.mysql.jdbc.Driver",
+          "url": "jdbc:mysql://localhost:3306",
+          "username": "root",
+          "password": "mypassword",
+          "enabled": true
+        }  
+
+7. Click **Create**.  
+
+You can use the performance_schema database, which is installed with MySQL to query your MySQL performance_schema database. Include the names of the storage plugin configuration, the database, and table in dot notation the FROM clause as follows:
+
+      0: jdbc:drill:zk=local> select * from myplugin.performance_schema.accounts;
+      +--------+------------+----------------------+--------------------+
+      |  USER  |    HOST    | CURRENT_CONNECTIONS  | TOTAL_CONNECTIONS  |
+      +--------+------------+----------------------+--------------------+
+      | null   | null       | 18                   | 20                 |
+      | jdoe   | localhost  | 0                    | 813                |
+      | root   | localhost  | 3                    | 5                  |
+      +--------+------------+----------------------+--------------------+
+      3 rows selected (0.171 seconds)
+
+For information about related, unresolved issues in Drill 1.2, see the [release notes]({{site.baseurl}}/docs/apache-drill-1-2-0-release-notes/#important-unresolved-issues).
\ No newline at end of file


Mime
View raw message