diff --git a/docs/topics/webservice.rst b/docs/topics/webservice.rst index 5f4222e7c..0d824be89 100644 --- a/docs/topics/webservice.rst +++ b/docs/topics/webservice.rst @@ -72,26 +72,14 @@ Stats Collector JSON-RPC resource Spider Manager JSON-RPC resource ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. module:: scrapy.contrib.webservice.spiders - :synopsis: Spider Manager JSON-RPC resource - -.. class:: SpidersResource - - Provides access to the Spider Manager used by the crawler. - - Available by default at: http://localhost:6080/spiders +You can access the spider manager JSON-RPC resource through the Execution +Manager resource at: http://localhost:6080/manager/spiders Extension Manager JSON-RPC resource ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. module:: scrapy.contrib.webservice.extensions - :synopsis: Extension Manager JSON-RPC resource - -.. class:: ExtensionsResource - - Provides access to the Extension Manager used by the crawler. - - Available by default at: http://localhost:6080/extensions +You can access the extension manager JSON-RPC resource through the Execution +Manager resource at: http://localhost:6080/manager/extensions Available JSON resources ------------------------ @@ -162,8 +150,6 @@ Default:: { 'scrapy.contrib.webservice.manager.ManagerResource': 1, 'scrapy.contrib.webservice.enginestatus.EngineStatusResource': 1, - 'scrapy.contrib.webservice.extensions.ExtensionsResource': 1, - 'scrapy.contrib.webservice.spiders.SpidersResource': 1, 'scrapy.contrib.webservice.stats.StatsResource': 1, } diff --git a/scrapy/conf/default_settings.py b/scrapy/conf/default_settings.py index ba3db6014..d24447447 100644 --- a/scrapy/conf/default_settings.py +++ b/scrapy/conf/default_settings.py @@ -259,7 +259,5 @@ WEBSERVICE_RESOURCES = {} WEBSERVICE_RESOURCES_BASE = { 'scrapy.contrib.webservice.manager.ManagerResource': 1, 'scrapy.contrib.webservice.enginestatus.EngineStatusResource': 1, - 'scrapy.contrib.webservice.extensions.ExtensionsResource': 1, - 'scrapy.contrib.webservice.spiders.SpidersResource': 1, 'scrapy.contrib.webservice.stats.StatsResource': 1, } diff --git a/scrapy/contrib/webservice/extensions.py b/scrapy/contrib/webservice/extensions.py deleted file mode 100644 index 352fca7ac..000000000 --- a/scrapy/contrib/webservice/extensions.py +++ /dev/null @@ -1,12 +0,0 @@ -from scrapy.webservice import JsonRpcResource -from scrapy.project import crawler - -class ExtensionsResource(JsonRpcResource): - - ws_name = 'extensions' - - def __init__(self, _extensions=None): - if _extensions is None: - _extensions = crawler.extensions - JsonRpcResource.__init__(self) - self._target = _extensions diff --git a/scrapy/contrib/webservice/spiders.py b/scrapy/contrib/webservice/spiders.py deleted file mode 100644 index 35997ee6a..000000000 --- a/scrapy/contrib/webservice/spiders.py +++ /dev/null @@ -1,12 +0,0 @@ -from scrapy.webservice import JsonRpcResource -from scrapy.project import crawler - -class SpidersResource(JsonRpcResource): - - ws_name = 'spiders' - - def __init__(self, _spiders=None): - if _spiders is None: - _spiders = crawler.spiders - JsonRpcResource.__init__(self) - self._target = _spiders