Add resources directory (#29)

* delete: resources file * move resources to src * fix: edit path base project * fix: copy var file
KnowledgeCaptureAndDiscovery · Feb 17, 2020 · ec2d8aa · ec2d8aa
1 parent 011131c
commit ec2d8aa
Show file tree

Hide file tree

Showing 38 changed files with 14 additions and 19 deletions.
diff --git a/oba.iml b/oba.iml
@@ -6,6 +6,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

diff --git a/pom.xml b/pom.xml
@@ -83,6 +83,12 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+
     <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
       <plugins>
         <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->

diff --git a/src/main/java/edu/isi/oba/Oba.java b/src/main/java/edu/isi/oba/Oba.java
@@ -20,7 +20,7 @@
 
 class Oba {
   public static void main(String[] args) throws Exception {
-    final String base_project_dir = "./tools/base_project/";
+    final String base_project_dir = "./";
 
     //parse command line
     String config_yaml = get_config_yaml(args);

diff --git a/src/main/java/edu/isi/oba/SerializerPython.java b/src/main/java/edu/isi/oba/SerializerPython.java
@@ -18,6 +18,12 @@
 
 class SerializerPython {
   public SerializerPython(List<Mapper> mappers, java.nio.file.Path dir, OpenAPI openAPI) throws IOException {
+    //Create directory utils
+    final String utils_dir = ".openapi-generator/template/static_files/utils/";
+    File utils_dir_path = new File(dir + File.separator + utils_dir);
+    utils_dir_path.mkdir();
+
+    //Create variable file
     final String var_file_python = ".openapi-generator/template/static_files/utils/vars.py";
     FileWriter var_file_writer = new FileWriter(dir + File.separator + var_file_python);
     Iterator i = mappers.iterator();

diff --git a/tools/base_project/.gitignore → src/main/resources/.gitignore b/tools/base_project/.gitignore → src/main/resources/.gitignore
diff --git a/tools/base_project/.openapi-generator-ignore → src/main/resources/.openapi-generator-ignore b/tools/base_project/.openapi-generator-ignore → src/main/resources/.openapi-generator-ignore
diff --git a/...pi-generator/template/Dockerfile.mustache → ...pi-generator/template/Dockerfile.mustache b/...pi-generator/template/Dockerfile.mustache → ...pi-generator/template/Dockerfile.mustache
diff --git a/...penapi-generator/template/README.mustache → ...penapi-generator/template/README.mustache b/...penapi-generator/template/README.mustache → ...penapi-generator/template/README.mustache
diff --git a/...napi-generator/template/__init__.mustache → ...napi-generator/template/__init__.mustache b/...napi-generator/template/__init__.mustache → ...napi-generator/template/__init__.mustache
diff --git a/...generator/template/__init__model.mustache → ...generator/template/__init__model.mustache b/...generator/template/__init__model.mustache → ...generator/template/__init__model.mustache
diff --git a/...-generator/template/__init__test.mustache → ...-generator/template/__init__test.mustache b/...-generator/template/__init__test.mustache → ...-generator/template/__init__test.mustache
diff --git a/...napi-generator/template/__main__.mustache → ...napi-generator/template/__main__.mustache b/...napi-generator/template/__main__.mustache → ...napi-generator/template/__main__.mustache
diff --git a/...i-generator/template/base_model_.mustache → ...i-generator/template/base_model_.mustache b/...i-generator/template/base_model_.mustache → ...i-generator/template/base_model_.mustache
diff --git a/...pi-generator/template/controller.mustache → ...pi-generator/template/controller.mustache b/...pi-generator/template/controller.mustache → ...pi-generator/template/controller.mustache
diff --git a/...nerator/template/controller_test.mustache → ...nerator/template/controller_test.mustache b/...nerator/template/controller_test.mustache → ...nerator/template/controller_test.mustache
diff --git a/...-generator/template/dockerignore.mustache → ...-generator/template/dockerignore.mustache b/...-generator/template/dockerignore.mustache → ...-generator/template/dockerignore.mustache
diff --git a/...enapi-generator/template/encoder.mustache → ...enapi-generator/template/encoder.mustache b/...enapi-generator/template/encoder.mustache → ...enapi-generator/template/encoder.mustache
diff --git a/...i-generator/template/git_push.sh.mustache → ...i-generator/template/git_push.sh.mustache b/...i-generator/template/git_push.sh.mustache → ...i-generator/template/git_push.sh.mustache
diff --git a/...api-generator/template/gitignore.mustache → ...api-generator/template/gitignore.mustache b/...api-generator/template/gitignore.mustache → ...api-generator/template/gitignore.mustache
diff --git a/...openapi-generator/template/model.mustache → ...openapi-generator/template/model.mustache b/...openapi-generator/template/model.mustache → ...openapi-generator/template/model.mustache
diff --git a/...enapi-generator/template/openapi.mustache → ...enapi-generator/template/openapi.mustache b/...enapi-generator/template/openapi.mustache → ...enapi-generator/template/openapi.mustache
diff --git a/...pi-generator/template/param_type.mustache → ...pi-generator/template/param_type.mustache b/...pi-generator/template/param_type.mustache → ...pi-generator/template/param_type.mustache
diff --git a/...-generator/template/requirements.mustache → ...-generator/template/requirements.mustache b/...-generator/template/requirements.mustache → ...-generator/template/requirements.mustache
diff --git a/...or/template/security_controller_.mustache → ...or/template/security_controller_.mustache b/...or/template/security_controller_.mustache → ...or/template/security_controller_.mustache
diff --git a/...openapi-generator/template/setup.mustache → ...openapi-generator/template/setup.mustache b/...openapi-generator/template/setup.mustache → ...openapi-generator/template/setup.mustache
diff --git a/...emplate/static_files/settings/__init__.py → ...emplate/static_files/settings/__init__.py b/...emplate/static_files/settings/__init__.py → ...emplate/static_files/settings/__init__.py
diff --git a/...template/static_files/settings/config.ini → ...template/static_files/settings/config.ini b/...template/static_files/settings/config.ini → ...template/static_files/settings/config.ini
diff --git a/.../template/static_files/user_controller.py → .../template/static_files/user_controller.py b/.../template/static_files/user_controller.py → .../template/static_files/user_controller.py
diff --git a/...or/template/static_files/utils/request.py → ...or/template/static_files/utils/request.py b/...or/template/static_files/utils/request.py → ...or/template/static_files/utils/request.py
diff --git a/...rator/template/test-requirements.mustache → ...rator/template/test-requirements.mustache b/...rator/template/test-requirements.mustache → ...rator/template/test-requirements.mustache
diff --git a/.../.openapi-generator/template/tox.mustache → .../.openapi-generator/template/tox.mustache b/.../.openapi-generator/template/tox.mustache → .../.openapi-generator/template/tox.mustache
diff --git a/...penapi-generator/template/travis.mustache → ...penapi-generator/template/travis.mustache b/...penapi-generator/template/travis.mustache → ...penapi-generator/template/travis.mustache
diff --git a/...-generator/template/typing_utils.mustache → ...-generator/template/typing_utils.mustache b/...-generator/template/typing_utils.mustache → ...-generator/template/typing_utils.mustache
diff --git a/....openapi-generator/template/util.mustache → ....openapi-generator/template/util.mustache b/....openapi-generator/template/util.mustache → ....openapi-generator/template/util.mustache
diff --git a/tools/base_project/generate-server.sh → src/main/resources/generate-server.sh b/tools/base_project/generate-server.sh → src/main/resources/generate-server.sh
diff --git a/tools/base_project/install.sh → src/main/resources/install.sh b/tools/base_project/install.sh → src/main/resources/install.sh
diff --git a/tmp/docs/index.md b/tmp/docs/index.md
diff --git a/tmp/mkdocs.yml b/tmp/mkdocs.yml