Merge branch 'appframework-master' into server_folder_methods

diff --cc lib/public/iservercontainer.php
index 89e71db8d171a85a00f81603c636af7368e1de29,1725b7c74e04bdd8d6c68495e6bae8312d57b191..cbb9fdf6c2f05a9f4080ce127ce6194cdf811331
--- 1/lib/public/iservercontainer.php
--- 2/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@@ -62,20 -62,13 +62,27 @@@ interface IServerContainer 
         */
        function getRootFolder();
  
 +      /**
 +       * Returns a view to ownCloud's files folder
 +       *
 +       * @return \OCP\Files\Folder
 +       */
 +      function getUserFolder();
 +
 +      /**
 +       * Returns an app-specific view in ownClouds data directory
 +       *
 +       * @return \OCP\Files\Folder
 +       */
 +      function getAppFolder();
 +
+       /**
+        * Returns an ICache instance
+        *
+        * @return \OCP\ICache
+        */
+       function getCache();
+ 
        /**
         * Returns the current session
         *

diff --cc lib/server.php
index 3454622425a0320ff366cf33d067c6445821d0cd,f4dc22a2be49da1f52078214bc8867aebcb7c959..5c386593f1db66ba08541237aac61cfce1d3733b
--- 1/lib/server.php
--- 2/lib/server.php
+++ b/lib/server.php
@@@ -94,42 -97,13 +97,49 @@@ class Server extends SimpleContainer im
                return $this->query('RootFolder');
        }
  
 +      /**
 +       * Returns a view to ownCloud's files folder
 +       *
 +       * @return \OCP\Files\Folder
 +       */
 +      function getUserFolder() {
 +
 +              $dir = '/files';
 +              $root = $this->getRootFolder();
 +              $folder = null;
 +              if(!$root->nodeExists($dir)) {
 +                      $folder = $root->newFolder($dir);
 +              } else {
 +                      $folder = $root->get($dir);
 +              }
 +              return $folder;
 +
 +      }
 +
 +      /**
 +       * Returns an app-specific view in ownClouds data directory
 +       *
 +       * @return \OCP\Files\Folder
 +       */
 +      function getAppFolder() {
 +
 +              $dir = '/' . \OC_App::getCurrentApp();
 +              $root = $this->getRootFolder();
 +              $folder = null;
 +              if(!$root->nodeExists($dir)) {
 +                      $folder = $root->newFolder($dir);
 +              } else {
 +                      $folder = $root->get($dir);
 +              }
 +              return $folder;
 +
+       /**
+        * Returns an ICache instance
+        *
+        * @return \OCP\ICache
+        */
+       function getCache() {
+               return $this->query('UserCache');
        }
  
        /**