move the private namespace OC into lib/private - OCP will stay in lib/public

Conflicts:
	lib/private/vcategories.php

3 files changed, 0 insertions, 181 deletions

diff --git a/lib/session/internal.php b/lib/session/internal.php
deleted file mode 100644
index 60aecccc8aa..00000000000
--- a/lib/session/internal.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Session;
-
-/**
- * Class Internal
- *
- * wrap php's internal session handling into the Session interface
- *
- * @package OC\Session
- */
-class Internal extends Memory {
-	public function __construct($name) {
-		session_name($name);
-		session_start();
-		if (!isset($_SESSION)) {
-			throw new \Exception('Failed to start session');
-		}
-		$this->data = $_SESSION;
-	}
-
-	public function __destruct() {
-		$_SESSION = $this->data;
-		session_write_close();
-	}
-
-	public function clear() {
-		session_unset();
-		@session_regenerate_id(true);
-		@session_start();
-		$this->data = $_SESSION = array();
-	}
-}
diff --git a/lib/session/memory.php b/lib/session/memory.php
deleted file mode 100644
index c148ff4b9b9..00000000000
--- a/lib/session/memory.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Session;
-
-/**
- * Class Internal
- *
- * store session data in an in-memory array, not persistance
- *
- * @package OC\Session
- */
-class Memory extends Session {
-	protected $data;
-
-	public function __construct($name) {
-		//no need to use $name since all data is already scoped to this instance
-		$this->data = array();
-	}
-
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function set($key, $value) {
-		$this->data[$key] = $value;
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function get($key) {
-		if (!$this->exists($key)) {
-			return null;
-		}
-		return $this->data[$key];
-	}
-
-	/**
-	 * @param string $key
-	 * @return bool
-	 */
-	public function exists($key) {
-		return isset($this->data[$key]);
-	}
-
-	/**
-	 * @param string $key
-	 */
-	public function remove($key) {
-		unset($this->data[$key]);
-	}
-
-	public function clear() {
-		$this->data = array();
-	}
-}
diff --git a/lib/session/session.php b/lib/session/session.php
deleted file mode 100644
index c55001eccac..00000000000
--- a/lib/session/session.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Session;
-
-abstract class Session implements \ArrayAccess, \OCP\ISession {
-	/**
-	 * $name serves as a namespace for the session keys
-	 *
-	 * @param string $name
-	 */
-	abstract public function __construct($name);
-
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	abstract public function set($key, $value);
-
-	/**
-	 * @param string $key
-	 * @return mixed should return null if $key does not exist
-	 */
-	abstract public function get($key);
-
-	/**
-	 * @param string $key
-	 * @return bool
-	 */
-	abstract public function exists($key);
-
-	/**
-	 * should not throw any errors if $key does not exist
-	 *
-	 * @param string $key
-	 */
-	abstract public function remove($key);
-
-	/**
-	 * removes all entries within the cache namespace
-	 */
-	abstract public function clear();
-
-	/**
-	 * @param mixed $offset
-	 * @return bool
-	 */
-	public function offsetExists($offset) {
-		return $this->exists($offset);
-	}
-
-	/**
-	 * @param mixed $offset
-	 * @return mixed
-	 */
-	public function offsetGet($offset) {
-		return $this->get($offset);
-	}
-
-	/**
-	 * @param mixed $offset
-	 * @param mixed $value
-	 */
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
-
-	/**
-	 * @param mixed $offset
-	 */
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
-}