diff --git a/RESTController/RESTController.php b/RESTController/RESTController.php index 2235e286..497e274c 100644 --- a/RESTController/RESTController.php +++ b/RESTController/RESTController.php @@ -109,7 +109,7 @@ public function __construct($iliasRoot, array $userSettings = array()) { $this->container->singleton('response', function ($c) { return new libs\RESTResponse(); }); $this->container->singleton('request', function ($c) { return new libs\RESTRequest($this->environment()); }); - // Initialize ILIAS (if not created via restplugin.php) + // Initialize ILIAS (if not created via api.php) $this->initILIAS(); # Configure the logger @@ -389,7 +389,7 @@ protected function initResponseFormat() { * Function: initILIAS() * Makes sure ILIAS was initialized, eg. * when this has not already been done - * by the restplugin.php + * by the api.php */ protected function initILIAS() { // Initialize ILIAS (if not created via api.php) diff --git a/RESTController/core/oauth2_v2/models/Authorize.php b/RESTController/core/oauth2_v2/models/Authorize.php index e16dd3a7..49d49eda 100644 --- a/RESTController/core/oauth2_v2/models/Authorize.php +++ b/RESTController/core/oauth2_v2/models/Authorize.php @@ -342,7 +342,7 @@ public static function ShowWebsite($app, $param) { array( 'baseURL' => ILIAS_HTTP_PATH, 'viewURL' => ILIAS_HTTP_PATH . '/' . $pluginDir, - 'endpoint' => ILIAS_HTTP_PATH . '/restplugin.php' . $routeURL, + 'endpoint' => ILIAS_HTTP_PATH . '/' . $pluginDir . '/api.php' . $routeURL, 'client' => CLIENT_ID, 'parameters' => $param, ) diff --git a/RESTController/extensions/admin_v1/README.md b/RESTController/extensions/admin_v1/README.md index 4d090547..a520b25e 100644 --- a/RESTController/extensions/admin_v1/README.md +++ b/RESTController/extensions/admin_v1/README.md @@ -39,7 +39,7 @@ Examples --------- Example > **Retrieve info about an object with ref_id 67 ** -curl -X GET http://localhost/restplugin.php/admin/describe/67 +curl -X GET http://localhost/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php/admin/describe/67 > ** Retrieve object properties with an obj_id ** -curl -X GET http://localhost/restplugin.php/admin//describe/308?id_type=obj_id +curl -X GET http://localhost/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php/admin/describe/308?id_type=obj_id diff --git a/RESTController/extensions/files_v1/README.md b/RESTController/extensions/files_v1/README.md index 048a9517..28ca5f82 100644 --- a/RESTController/extensions/files_v1/README.md +++ b/RESTController/extensions/files_v1/README.md @@ -15,7 +15,7 @@ Examples --------- Example > **Retrieve a file with ref_id 67 ** -curl -X GET http://localhost/restplugin.php/v1/files/67 > x.pdf +curl -X GET http://localhost/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php/v1/files/67 > x.pdf > ** Add a file to repository object with ref_id 65 (e.g. a course) ** -curl --form uploadfile=@image.jpg --form ref_id=65 http://localhost/restplugin.php/v1/files +curl --form uploadfile=@image.jpg --form ref_id=65 http://localhost/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php/v1/files diff --git a/RESTController/extensions/mobile_v1/README.md b/RESTController/extensions/mobile_v1/README.md index e969e30f..ea2aaa6e 100644 --- a/RESTController/extensions/mobile_v1/README.md +++ b/RESTController/extensions/mobile_v1/README.md @@ -10,7 +10,7 @@ The goal is to provide additional REST endpoints for a mobile app. * todo #### Notes -Mobile Search: +Mobile Search: For the installation of Elastic Search and the River Connector please refer to: https://github.com/jprante/elasticsearch-river-jdbc @@ -31,11 +31,11 @@ Examples --------- Example > **Retrieve info about an object with ref_id 67 ** -curl -K token --data "q=Test" -X POST http://localhost/ilias5/restplugin.php/m/v1/search +curl -K token --data "q=Test" -X POST http://localhost/ilias5/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php/m/v1/search #### History: v0.2 - 2014-12 Mobile Search -- v0.1 - 2014-07 INIT ##### Authors: -Dirk Schaefer \ No newline at end of file +Dirk Schaefer diff --git a/RESTController/libs/RESTilias.php b/RESTController/libs/RESTilias.php index 05167be1..66d8c0a0 100644 --- a/RESTController/libs/RESTilias.php +++ b/RESTController/libs/RESTilias.php @@ -141,7 +141,7 @@ public static function initILIAS($client = null) { * Function: FetchILIASClient() * Returns the current ILIAS Client-ID. This cannot be changed * and can only be controlled by setting $_GET['ilias_client_id'] - * (see restplugin.php) or via $_COOKIE['client_id'] (See ilInitialize) + * (see RESTController.php) or via $_COOKIE['client_id'] (See ilInitialize) * * Return: * - ILIAS Client-ID (fixed) diff --git a/tools/RESTClient/restsystemclient.ini.default b/tools/RESTClient/restsystemclient.ini.default index 32d5126e..b774af8d 100644 --- a/tools/RESTClient/restsystemclient.ini.default +++ b/tools/RESTClient/restsystemclient.ini.default @@ -1,6 +1,6 @@ ; ILIAS REST System Client - Configuration File ; by D.Schaefer -host = "http://localhost/ilias5/restplugin.php" +host = "http://localhost/ilias5/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php" oauth2_endpoint = "/v2/oauth2/token" ; Please do not change grant_type - at current the tool only supports this type. diff --git a/tools/codeception/tests/api.suite.yml b/tools/codeception/tests/api.suite.yml index f42d790d..ac463749 100644 --- a/tools/codeception/tests/api.suite.yml +++ b/tools/codeception/tests/api.suite.yml @@ -5,5 +5,4 @@ modules: PhpBrowser: url: http://localhost/ilias5/ REST: - url: http://localhost/ilias5/restplugin.php/ - + url: http://localhost/ilias5/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php/ diff --git a/tools/shell/ishell.ini.default b/tools/shell/ishell.ini.default index 20c28828..78b78a17 100644 --- a/tools/shell/ishell.ini.default +++ b/tools/shell/ishell.ini.default @@ -8,4 +8,4 @@ oauth2_endpoint=/v2/oauth2/token [System] ilias_client_id=beta -rest_endpoint=http://localhost/ilias5/restplugin.php +rest_endpoint=http://localhost/ilias5/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php