moved endpoint api

ajenti · Apr 18, 2015 · b28bf43 · b28bf43
1 parent dd4b1b1
commit b28bf43
Show file tree

Hide file tree

Showing 23 changed files with 26 additions and 26 deletions.
diff --git a/plugins/core/api/endpoint.py → ajenti-core/aj/api/endpoint.py b/plugins/core/api/endpoint.py → ajenti-core/aj/api/endpoint.py
diff --git a/docs/source/dev/http.rst b/docs/source/dev/http.rst
@@ -17,7 +17,7 @@ Example::
     from aj.api import component
     from aj.api.http import url, HttpPlugin
 
-    from aj.plugins.core.api.endpoint import endpoint, EndpointError, EndpointReturn
+    from aj.api.endpoint import endpoint, EndpointError, EndpointReturn
 
 
     @component(HttpPlugin)

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -30,6 +30,7 @@ Python API Reference
    ref/aj
    ref/aj.api
    ref/aj.api.http
+   ref/aj.api.endpoint
    ref/aj.config
    ref/aj.core
    ref/aj.http
@@ -53,7 +54,6 @@ Python Plugin API Reference
 ---------------------------
 
 .. toctree::
-   ref/aj.plugins.core.api.endpoint
    ref/aj.plugins.core.api.push
    ref/aj.plugins.core.api.sidebar
    ref/aj.plugins.core.api.tasks

diff --git a/docs/source/ref/aj.api.endpoint.rst b/docs/source/ref/aj.api.endpoint.rst
@@ -0,0 +1,6 @@
+Plugin: aj.api.endpoint
+***********************
+
+.. automodule:: aj.api.endpoint
+   :members:
+   :undoc-members:
diff --git a/docs/source/ref/aj.plugins.core.api.endpoint.rst b/docs/source/ref/aj.plugins.core.api.endpoint.rst
diff --git a/plugins/augeas/views.py b/plugins/augeas/views.py
@@ -3,7 +3,7 @@
 from aj.api import component
 from aj.api.http import url, HttpPlugin
 
-from aj.plugins.core.api.endpoint import endpoint, EndpointError, EndpointReturn
+from aj.api.endpoint import endpoint, EndpointError, EndpointReturn
 from aj.plugins.augeas.api import AugeasEndpoint
 
 

diff --git a/plugins/auth_users/views.py b/plugins/auth_users/views.py
@@ -2,7 +2,7 @@
 from aj.api import component
 from aj.api.http import url, HttpPlugin
 
-from aj.plugins.core.api.endpoint import endpoint
+from aj.api.endpoint import endpoint
 from aj.plugins.auth_users.api import UsersAuthenticationProvider
 
 

diff --git a/plugins/core/views/api.py b/plugins/core/views/api.py
@@ -9,7 +9,7 @@
 from aj.api.http import url, HttpPlugin
 from aj.auth import AuthenticationService, SudoError
 
-from aj.plugins.core.api.endpoint import endpoint
+from aj.api.endpoint import endpoint
 from aj.plugins.core.api.sidebar import Sidebar
 from aj.plugins.core.api.navbox import Navbox
 

diff --git a/plugins/core/views/config.py b/plugins/core/views/config.py
@@ -6,7 +6,7 @@
 from aj.config import UserConfig
 from aj.auth import AuthenticationProvider
 
-from aj.plugins.core.api.endpoint import endpoint, EndpointReturn
+from aj.api.endpoint import endpoint, EndpointReturn
 
 
 @component(HttpPlugin)

diff --git a/plugins/core/views/main.py b/plugins/core/views/main.py
@@ -8,7 +8,7 @@
 from aj.api.http import url, HttpPlugin
 from aj.plugins import PluginManager, DirectoryPluginProvider
 
-from aj.plugins.core.api.endpoint import endpoint
+from aj.api.endpoint import endpoint
 
 
 @component(HttpPlugin)

diff --git a/plugins/core/views/resource_server.py b/plugins/core/views/resource_server.py
@@ -6,7 +6,7 @@
 from aj.api.http import url, HttpPlugin
 from aj.plugins import PluginManager
 
-from aj.plugins.core.api.endpoint import endpoint
+from aj.api.endpoint import endpoint
 
 
 @component(HttpPlugin)

diff --git a/plugins/core/views/tasks.py b/plugins/core/views/tasks.py
@@ -2,7 +2,7 @@
 
 from aj.api import *
 from aj.api.http import url, HttpPlugin
-from aj.plugins.core.api.endpoint import endpoint
+from aj.api.endpoint import endpoint
 from aj.plugins.core.api.tasks import TasksService
 
 

diff --git a/plugins/dashboard/views.py b/plugins/dashboard/views.py
@@ -3,7 +3,7 @@
 from aj.api import *
 from aj.api.http import url, HttpPlugin
 
-from aj.plugins.core.api.endpoint import endpoint
+from aj.api.endpoint import endpoint
 from aj.plugins.dashboard.api import Widget
 
 

diff --git a/plugins/datetime/views.py b/plugins/datetime/views.py
@@ -5,7 +5,7 @@
 from aj.api import component
 from aj.api.http import url, HttpPlugin
 
-from aj.plugins.core.api.endpoint import endpoint, EndpointError
+from aj.api.endpoint import endpoint, EndpointError
 from aj.plugins.datetime.api import TZManager
 
 

diff --git a/plugins/filesystem/views.py b/plugins/filesystem/views.py
@@ -7,7 +7,7 @@
 from aj.api import *
 from aj.api.http import url, HttpPlugin
 
-from aj.plugins.core.api.endpoint import endpoint, EndpointError, EndpointReturn
+from aj.api.endpoint import endpoint, EndpointError, EndpointReturn
 
 
 @component(HttpPlugin)

diff --git a/plugins/network/views.py b/plugins/network/views.py
@@ -3,7 +3,7 @@
 from aj.api import *
 from aj.api.http import url, HttpPlugin
 
-from aj.plugins.core.api.endpoint import endpoint
+from aj.api.endpoint import endpoint
 from aj.plugins.network.api import NetworkManager
 
 

diff --git a/plugins/packages/views.py b/plugins/packages/views.py
@@ -3,7 +3,7 @@
 from aj.api import *
 from aj.api.http import url, HttpPlugin
 
-from aj.plugins.core.api.endpoint import endpoint
+from aj.api.endpoint import endpoint
 from aj.plugins.packages.api import PackageManager
 
 

diff --git a/plugins/passwd/views.py b/plugins/passwd/views.py
@@ -3,7 +3,7 @@
 from aj.api import *
 from aj.api.http import url, HttpPlugin
 
-from aj.plugins.core.api.endpoint import endpoint
+from aj.api.endpoint import endpoint
 
 
 @component(HttpPlugin)

diff --git a/plugins/plugins/views.py b/plugins/plugins/views.py
@@ -6,7 +6,7 @@
 from aj.api.http import url, HttpPlugin
 from aj.plugins import PluginManager, PluginDependency, BinaryDependency
 
-from aj.plugins.core.api.endpoint import endpoint, EndpointError
+from aj.api.endpoint import endpoint, EndpointError
 
 
 @component(HttpPlugin)

diff --git a/plugins/power/views.py b/plugins/power/views.py
@@ -6,7 +6,7 @@
 from aj.api import component
 from aj.api.http import url, HttpPlugin
 
-from aj.plugins.core.api.endpoint import endpoint, EndpointError
+from aj.api.endpoint import endpoint, EndpointError
 from aj.plugins.power.api import PowerManager
 
 

diff --git a/plugins/services/views.py b/plugins/services/views.py
@@ -1,7 +1,7 @@
 from aj.api import *
 from aj.api.http import url, HttpPlugin
 
-from aj.plugins.core.api.endpoint import endpoint, EndpointError
+from aj.api.endpoint import endpoint, EndpointError
 from aj.plugins.services.api import ServiceManager, ServiceOperationError
 
 

diff --git a/plugins/settings/views.py b/plugins/settings/views.py
@@ -7,7 +7,7 @@
 from aj.api import component
 from aj.api.http import url, HttpPlugin
 
-from aj.plugins.core.api.endpoint import endpoint
+from aj.api.endpoint import endpoint
 
 
 @component(HttpPlugin)

diff --git a/plugins/terminal/views.py b/plugins/terminal/views.py
@@ -5,7 +5,7 @@
 
 from aj.api import *
 from aj.api.http import url, HttpPlugin, SocketEndpoint
-from aj.plugins.core.api.endpoint import endpoint
+from aj.api.endpoint import endpoint
 
 from .manager import TerminalManager