From 5d53fb4bc863077f2c62054d48bc92a18f458042 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 13 Oct 2015 16:41:58 +0200
Subject: [PATCH] Reference v2 in the provider list

---
 ocs-provider/provider.php       | 20 +++++++++----------
 tests/ocs-provider/provider.php | 34 ++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/ocs-provider/provider.php b/ocs-provider/provider.php
index 04da7402c9..921362b9e5 100644
--- a/ocs-provider/provider.php
+++ b/ocs-provider/provider.php
@@ -44,9 +44,9 @@ class Provider extends \OCP\AppFramework\Controller {
 			'PRIVATE_DATA' => [
 				'version' => 1,
 				'endpoints' => [
-					'store' => '/ocs/v1.php/privatedata/setattribute',
-					'read' => '/ocs/v1.php/privatedata/getattribute',
-					'delete' => '/ocs/v1.php/privatedata/deleteattribute',
+					'store' => '/ocs/v2.php/privatedata/setattribute',
+					'read' => '/ocs/v2.php/privatedata/getattribute',
+					'delete' => '/ocs/v2.php/privatedata/deleteattribute',
 				],
 			],
 		];
@@ -55,13 +55,13 @@ class Provider extends \OCP\AppFramework\Controller {
 			$services['SHARING'] = [
 				'version' => 1,
 				'endpoints' => [
-					'share' => '/ocs/v1.php/apps/files_sharing/api/v1/shares',
+					'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
 				],
 			];
 			$services['FEDERATED_SHARING'] = [
 				'version' => 1,
 				'endpoints' => [
-					'share' => '/ocs/v1.php/cloud/shares',
+					'share' => '/ocs/v2.php/cloud/shares',
 					'webdav' => '/public.php/webdav/',
 				],
 			];
@@ -71,7 +71,7 @@ class Provider extends \OCP\AppFramework\Controller {
 			$services['ACTIVITY'] = [
 				'version' => 1,
 				'endpoints' => [
-					'list' => '/ocs/v1.php/cloud/activity',
+					'list' => '/ocs/v2.php/cloud/activity',
 				],
 			];
 		}
@@ -80,13 +80,13 @@ class Provider extends \OCP\AppFramework\Controller {
 			$services['PROVISIONING'] = [
 				'version' => 1,
 				'endpoints' => [
-					'user' => '/ocs/v1.php/cloud/users',
-					'groups' => '/ocs/v1.php/cloud/groups',
-					'apps' => '/ocs/v1.php/cloud/apps',
+					'user' => '/ocs/v2.php/cloud/users',
+					'groups' => '/ocs/v2.php/cloud/groups',
+					'apps' => '/ocs/v2.php/cloud/apps',
 				],
 			];
 		}
 
 		return new \OCP\AppFramework\Http\JSONResponse($services);
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/ocs-provider/provider.php b/tests/ocs-provider/provider.php
index 34bd606758..07d66b3625 100644
--- a/tests/ocs-provider/provider.php
+++ b/tests/ocs-provider/provider.php
@@ -60,9 +60,9 @@ class OcsProviderTest extends \Test\TestCase {
 				'PRIVATE_DATA' => [
 					'version' => 1,
 					'endpoints' => [
-						'store' => '/ocs/v1.php/privatedata/setattribute',
-						'read' => '/ocs/v1.php/privatedata/getattribute',
-						'delete' => '/ocs/v1.php/privatedata/deleteattribute',
+						'store' => '/ocs/v2.php/privatedata/setattribute',
+						'read' => '/ocs/v2.php/privatedata/getattribute',
+						'delete' => '/ocs/v2.php/privatedata/deleteattribute',
 					],
 				],
 			]
@@ -94,22 +94,22 @@ class OcsProviderTest extends \Test\TestCase {
 				'PRIVATE_DATA' => [
 					'version' => 1,
 					'endpoints' => [
-						'store' => '/ocs/v1.php/privatedata/setattribute',
-						'read' => '/ocs/v1.php/privatedata/getattribute',
-						'delete' => '/ocs/v1.php/privatedata/deleteattribute',
+						'store' => '/ocs/v2.php/privatedata/setattribute',
+						'read' => '/ocs/v2.php/privatedata/getattribute',
+						'delete' => '/ocs/v2.php/privatedata/deleteattribute',
 					],
 				],
 				'FEDERATED_SHARING' => [
 					'version' => 1,
 					'endpoints' => [
-						'share' => '/ocs/v1.php/cloud/shares',
+						'share' => '/ocs/v2.php/cloud/shares',
 						'webdav' => '/public.php/webdav/',
 					],
 				],
 				'SHARING' => [
 					'version' => 1,
 					'endpoints' => [
-						'share' => '/ocs/v1.php/apps/files_sharing/api/v1/shares',
+						'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
 					],
 				],
 			]
@@ -130,36 +130,36 @@ class OcsProviderTest extends \Test\TestCase {
 				'PRIVATE_DATA' => [
 					'version' => 1,
 					'endpoints' => [
-						'store' => '/ocs/v1.php/privatedata/setattribute',
-						'read' => '/ocs/v1.php/privatedata/getattribute',
-						'delete' => '/ocs/v1.php/privatedata/deleteattribute',
+						'store' => '/ocs/v2.php/privatedata/setattribute',
+						'read' => '/ocs/v2.php/privatedata/getattribute',
+						'delete' => '/ocs/v2.php/privatedata/deleteattribute',
 					],
 				],
 				'FEDERATED_SHARING' => [
 					'version' => 1,
 					'endpoints' => [
-						'share' => '/ocs/v1.php/cloud/shares',
+						'share' => '/ocs/v2.php/cloud/shares',
 						'webdav' => '/public.php/webdav/',
 					],
 				],
 				'SHARING' => [
 					'version' => 1,
 					'endpoints' => [
-						'share' => '/ocs/v1.php/apps/files_sharing/api/v1/shares',
+						'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares',
 					],
 				],
 				'ACTIVITY' => [
 					'version' => 1,
 					'endpoints' => [
-						'list' => '/ocs/v1.php/cloud/activity',
+						'list' => '/ocs/v2.php/cloud/activity',
 					],
 				],
 				'PROVISIONING' => [
 					'version' => 1,
 					'endpoints' => [
-						'user' => '/ocs/v1.php/cloud/users',
-						'groups' => '/ocs/v1.php/cloud/groups',
-						'apps' => '/ocs/v1.php/cloud/apps',
+						'user' => '/ocs/v2.php/cloud/users',
+						'groups' => '/ocs/v2.php/cloud/groups',
+						'apps' => '/ocs/v2.php/cloud/apps',
 					],
 				],
 			]