reorganize directory hierarchy:

apigee-labs · Sep 16, 2015 · ad56cbf · ad56cbf
1 parent 80a6311
commit ad56cbf
Show file tree

Hide file tree

Showing 55 changed files with 41 additions and 36 deletions.
diff --git a/js_sdk/base_api.js → js/base_api.js b/js_sdk/base_api.js → js/base_api.js
diff --git a/js_sdk/package.json → js/package.json b/js_sdk/package.json → js/package.json
diff --git a/test/js_sdk/helloMessage/helloMessageApi.js → js/test/helloMessage/helloMessageApi.js b/test/js_sdk/helloMessage/helloMessageApi.js → js/test/helloMessage/helloMessageApi.js
@@ -1,4 +1,4 @@
-var baseAPI = require('./../../../js_sdk/base_api')
+var baseAPI = require('./../../../js/base_api')
 
 var exports = function() {
 

diff --git a/test/js_sdk/helloMessage/run_tests.sh → js/test/helloMessage/run_tests.sh b/test/js_sdk/helloMessage/run_tests.sh → js/test/helloMessage/run_tests.sh
diff --git a/test/js_sdk/helloMessage/test.js → js/test/helloMessage/test.js b/test/js_sdk/helloMessage/test.js → js/test/helloMessage/test.js
diff --git a/test/js_sdk/run_tests.sh → js/test/run_tests.sh b/test/js_sdk/run_tests.sh → js/test/run_tests.sh
diff --git a/test/js_sdk/todoList/package.json → js/test/todoList/package.json b/test/js_sdk/todoList/package.json → js/test/todoList/package.json
diff --git a/test/js_sdk/todoList/run_tests.sh → js/test/todoList/run_tests.sh b/test/js_sdk/todoList/run_tests.sh → js/test/todoList/run_tests.sh
diff --git a/test/js_sdk/todoList/test.js → js/test/todoList/test.js b/test/js_sdk/todoList/test.js → js/test/todoList/test.js
diff --git a/test/js_sdk/todoList/todoListAPI.js → js/test/todoList/todoListAPI.js b/test/js_sdk/todoList/todoListAPI.js → js/test/todoList/todoListAPI.js
@@ -1,4 +1,4 @@
-var baseAPI = require('./../../../js_sdk/base_api')
+var baseAPI = require('./../../../js/base_api')
 
 var exports = function() {
 

diff --git a/gen_swagger/__init__.py → py/__init__.py b/gen_swagger/__init__.py → py/__init__.py
diff --git a/python_sdk/base_api.py → py/base_api.py b/python_sdk/base_api.py → py/base_api.py
diff --git a/python_sdk/__init__.py → py/test/__init__.py b/python_sdk/__init__.py → py/test/__init__.py
diff --git a/test/__init__.py → py/test/hello_message/__init__.py b/test/__init__.py → py/test/hello_message/__init__.py
diff --git a/...on_sdk/hello_message/hello_message_api.py → py/test/hello_message/hello_message_api.py b/...on_sdk/hello_message/hello_message_api.py → py/test/hello_message/hello_message_api.py
@@ -1,4 +1,4 @@
-from rapier.python_sdk.base_api import BaseAPI, BaseEntity
+from rapier.py.base_api import BaseAPI, BaseEntity
 
 class HelloMessageAPI(BaseAPI):
 

diff --git a/test/python_sdk/hello_message/run_tests.sh → py/test/hello_message/run_tests.sh b/test/python_sdk/hello_message/run_tests.sh → py/test/hello_message/run_tests.sh
diff --git a/test/python_sdk/hello_message/test.py → py/test/hello_message/test.py b/test/python_sdk/hello_message/test.py → py/test/hello_message/test.py
@@ -1,4 +1,4 @@
-from rapier.test.python_sdk.hello_message.hello_world_api import api
+from rapier.py.test.hello_message.hello_message_api import api
 
 def main():
     rslt = api.retrieve_well_known_resource('http://localhost:3000/message')

diff --git a/test/python_sdk/run_tests.sh → py/test/run_tests.sh b/test/python_sdk/run_tests.sh → py/test/run_tests.sh
diff --git a/test/python_sdk/__init__.py → py/test/todo_list/__init__.py b/test/python_sdk/__init__.py → py/test/todo_list/__init__.py
diff --git a/test/python_sdk/todo_list/run_tests.sh → py/test/todo_list/run_tests.sh b/test/python_sdk/todo_list/run_tests.sh → py/test/todo_list/run_tests.sh
diff --git a/test/python_sdk/todo_list/test.py → py/test/todo_list/test.py b/test/python_sdk/todo_list/test.py → py/test/todo_list/test.py
@@ -1,4 +1,4 @@
-from rapier.test.python_sdk.todo_list.todo_list_api import api, Item, Collection, TodoList
+from rapier.py.test.todo_list.todo_list_api import api, Item, Collection, TodoList
 
 def test_objects():
     items = Collection('http://localhost:3001/to-dos/items')

diff --git a/test/python_sdk/todo_list/todo_list_api.py → py/test/todo_list/todo_list_api.py b/test/python_sdk/todo_list/todo_list_api.py → py/test/todo_list/todo_list_api.py
@@ -1,4 +1,4 @@
-from rapier.python_sdk.base_api import BaseAPI, BaseResource, BaseEntity, BaseCollection
+from rapier.py.base_api import BaseAPI, BaseResource, BaseEntity, BaseCollection
 
 class API(BaseAPI):
     def well_known_URLs(self):

diff --git a/test/servers/hello_message.js → test-servers/hello_message.js b/test/servers/hello_message.js → test-servers/hello_message.js
diff --git a/test/servers/package.json → test-servers/package.json b/test/servers/package.json → test-servers/package.json
diff --git a/test/servers/todo_list.js → test-servers/todo_list.js b/test/servers/todo_list.js → test-servers/todo_list.js
diff --git a/test/gen_js_client/run-tests.sh b/test/gen_js_client/run-tests.sh
diff --git a/test/gen_python_client/run-tests.sh b/test/gen_python_client/run-tests.sh
diff --git a/test/gen_swagger/run-tests.sh b/test/gen_swagger/run-tests.sh
diff --git a/test/python_sdk/todo_list/__init__.py b/test/python_sdk/todo_list/__init__.py
diff --git a/test/python_sdk/hello_message/__init__.py → util/__init__.py b/test/python_sdk/hello_message/__init__.py → util/__init__.py
diff --git a/gen_js_client/gen_client.py → util/gen_js_sdk.py b/gen_js_client/gen_client.py → util/gen_js_sdk.py
diff --git a/gen_python_client/gen_client.py → util/gen_py_sdk.py b/gen_python_client/gen_client.py → util/gen_py_sdk.py
@@ -16,7 +16,7 @@ def client_from_rapier(self, filename= None):
         well_known_urls = [url for urls in well_known_urls for url in urls]
 
         print '''
-from rapier.python_sdk.base_api import BaseAPI, BaseResource, BaseEntity, BaseCollection
+from rapier.py.base_api import BaseAPI, BaseResource, BaseEntity, BaseCollection
 
 class API(BaseAPI):
     def well_known_URLs(self):

diff --git a/gen_swagger/gen_swagger.py → util/gen_swagger.py b/gen_swagger/gen_swagger.py → util/gen_swagger.py
diff --git a/gen_swagger/requirements.txt → util/requirements.txt b/gen_swagger/requirements.txt → util/requirements.txt
diff --git a/test/dog-tracker.yaml → util/test/dog-tracker.yaml b/test/dog-tracker.yaml → util/test/dog-tracker.yaml
diff --git a/test/gen_js_client/dog-tracker.js → util/test/gen_js_sdk/dog-tracker.js b/test/gen_js_client/dog-tracker.js → util/test/gen_js_sdk/dog-tracker.js
diff --git a/test/gen_js_client/hello-message.js → util/test/gen_js_sdk/hello-message.js b/test/gen_js_client/hello-message.js → util/test/gen_js_sdk/hello-message.js
diff --git a/test/gen_js_client/property-tracker.js → util/test/gen_js_sdk/property-tracker.js b/test/gen_js_client/property-tracker.js → util/test/gen_js_sdk/property-tracker.js
diff --git a/util/test/gen_js_sdk/run-tests.sh b/util/test/gen_js_sdk/run-tests.sh
@@ -0,0 +1,8 @@
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+ROOT_DIR=$( cd "$( dirname "$DIR/../../../../" )" && pwd)
+cd $ROOT_DIR
+
+python util/gen_js_sdk.py util/test/hello-message.yaml > util/test/gen_js_sdk/hello-message.js
+python util/gen_js_sdk.py util/test/todo-list.yaml > util/test/gen_js_sdk/todo-list.js
+python util/gen_js_sdk.py util/test/dog-tracker.yaml > util/test/gen_js_sdk/dog-tracker.js
+python util/gen_js_sdk.py util/test/property-tracker.yaml > util/test/gen_js_sdk/property-tracker.js
diff --git a/test/gen_js_client/todo-list.js → util/test/gen_js_sdk/todo-list.js b/test/gen_js_client/todo-list.js → util/test/gen_js_sdk/todo-list.js
diff --git a/test/gen_python_client/dog-tracker.py → util/test/gen_py_sdk/dog-tracker.py b/test/gen_python_client/dog-tracker.py → util/test/gen_py_sdk/dog-tracker.py
@@ -1,4 +1,5 @@
-from rapier.python_sdk.base_api import BaseAPI, BaseResource, BaseEntity, BaseCollection
+
+from rapier.py.base_api import BaseAPI, BaseResource, BaseEntity, BaseCollection
 
 class API(BaseAPI):
     def well_known_URLs(self):

diff --git a/test/gen_python_client/hello-message.py → util/test/gen_py_sdk/hello-message.py b/test/gen_python_client/hello-message.py → util/test/gen_py_sdk/hello-message.py
@@ -1,4 +1,5 @@
-from rapier.python_sdk.base_api import BaseAPI, BaseResource, BaseEntity, BaseCollection
+
+from rapier.py.base_api import BaseAPI, BaseResource, BaseEntity, BaseCollection
 
 class API(BaseAPI):
     def well_known_URLs(self):

diff --git a/test/gen_python_client/property-tracker.py → util/test/gen_py_sdk/property-tracker.py b/test/gen_python_client/property-tracker.py → util/test/gen_py_sdk/property-tracker.py
@@ -1,4 +1,5 @@
-from rapier.python_sdk.base_api import BaseAPI, BaseResource, BaseEntity, BaseCollection
+
+from rapier.py.base_api import BaseAPI, BaseResource, BaseEntity, BaseCollection
 
 class API(BaseAPI):
     def well_known_URLs(self):

diff --git a/util/test/gen_py_sdk/run-tests.sh b/util/test/gen_py_sdk/run-tests.sh
@@ -0,0 +1,8 @@
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+ROOT_DIR=$( cd "$( dirname "$DIR/../../../../" )" && pwd)
+cd $ROOT_DIR
+echo $ROOT_DIR
+python util/gen_py_sdk.py util/test/hello-message.yaml > util/test/gen_py_sdk/hello-message.py
+python util/gen_py_sdk.py util/test/todo-list.yaml > util/test/gen_py_sdk/todo-list.py
+python util/gen_py_sdk.py util/test/dog-tracker.yaml > util/test/gen_py_sdk/dog-tracker.py
+python util/gen_py_sdk.py util/test/property-tracker.yaml > util/test/gen_py_sdk/property-tracker.py
diff --git a/test/gen_python_client/todo-list.py → util/test/gen_py_sdk/todo-list.py b/test/gen_python_client/todo-list.py → util/test/gen_py_sdk/todo-list.py
@@ -1,4 +1,5 @@
-from rapier.python_sdk.base_api import BaseAPI, BaseResource, BaseEntity, BaseCollection
+
+from rapier.py.base_api import BaseAPI, BaseResource, BaseEntity, BaseCollection
 
 class API(BaseAPI):
     def well_known_URLs(self):

diff --git a/util/test/gen_swagger/run-tests.sh b/util/test/gen_swagger/run-tests.sh
@@ -0,0 +1,10 @@
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+echo $DIR
+ROOT_DIR=$( cd "$( dirname "$DIR/../../../../../" )" && pwd)
+cd $ROOT_DIR
+echo $ROOT_DIR
+python rapier/util/gen_swagger.py rapier/util/test/hello-message.yaml > rapier/util/test/gen_swagger/swagger-hello-message.yaml
+python rapier/util/gen_swagger.py rapier/util/test/todo-list.yaml > rapier/util/test/gen_swagger/swagger-todo-list.yaml
+python rapier/util/gen_swagger.py rapier/util/test/dog-tracker.yaml > rapier/util/test/gen_swagger/swagger-dog-tracker.yaml
+python rapier/util/gen_swagger.py rapier/util/test/property-tracker.yaml > rapier/util/test/gen_swagger/swagger-property-tracker.yaml
+python rapier/util/gen_swagger.py rapier/util/test/spec-hub.yaml > rapier/util/test/gen_swagger/swagger-spec-hub.yaml
diff --git a/test/gen_swagger/swagger-dog-tracker.yaml → ...test/gen_swagger/swagger-dog-tracker.yaml b/test/gen_swagger/swagger-dog-tracker.yaml → ...test/gen_swagger/swagger-dog-tracker.yaml
diff --git a/test/gen_swagger/swagger-hello-message.yaml → ...st/gen_swagger/swagger-hello-message.yaml b/test/gen_swagger/swagger-hello-message.yaml → ...st/gen_swagger/swagger-hello-message.yaml
diff --git a/...gen_swagger/swagger-property-tracker.yaml → ...gen_swagger/swagger-property-tracker.yaml b/...gen_swagger/swagger-property-tracker.yaml → ...gen_swagger/swagger-property-tracker.yaml
diff --git a/test/gen_swagger/swagger-spec-hub.yaml → util/test/gen_swagger/swagger-spec-hub.yaml b/test/gen_swagger/swagger-spec-hub.yaml → util/test/gen_swagger/swagger-spec-hub.yaml
diff --git a/test/gen_swagger/swagger-todo-list.yaml → util/test/gen_swagger/swagger-todo-list.yaml b/test/gen_swagger/swagger-todo-list.yaml → util/test/gen_swagger/swagger-todo-list.yaml
diff --git a/test/hello-message.yaml → util/test/hello-message.yaml b/test/hello-message.yaml → util/test/hello-message.yaml
diff --git a/test/property-tracker.yaml → util/test/property-tracker.yaml b/test/property-tracker.yaml → util/test/property-tracker.yaml
diff --git a/test/spec-hub.yaml → util/test/spec-hub.yaml b/test/spec-hub.yaml → util/test/spec-hub.yaml
diff --git a/test/todo-list.yaml → util/test/todo-list.yaml b/test/todo-list.yaml → util/test/todo-list.yaml