From f64624bee4b0e0099e74f8fe4078562d5002ded2 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 17 Jun 2018 12:25:04 +0900 Subject: [PATCH 1/6] Rename templateDir: pistache-server -> cpp-pistache-server --- .../codegen/languages/CppPistacheServerCodegen.java | 2 +- .../{pistache-server => cpp-pistache-server}/README.mustache | 0 .../api-header.mustache | 0 .../api-impl-header.mustache | 0 .../api-impl-source.mustache | 0 .../api-source.mustache | 0 .../{pistache-server => cpp-pistache-server}/cmake.mustache | 0 .../licenseInfo.mustache | 0 .../main-api-server.mustache | 0 .../model-header.mustache | 0 .../model-source.mustache | 0 .../modelbase-header.mustache | 0 .../modelbase-source.mustache | 0 13 files changed, 1 insertion(+), 1 deletion(-) rename modules/openapi-generator/src/main/resources/{pistache-server => cpp-pistache-server}/README.mustache (100%) rename modules/openapi-generator/src/main/resources/{pistache-server => cpp-pistache-server}/api-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{pistache-server => cpp-pistache-server}/api-impl-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{pistache-server => cpp-pistache-server}/api-impl-source.mustache (100%) rename modules/openapi-generator/src/main/resources/{pistache-server => cpp-pistache-server}/api-source.mustache (100%) rename modules/openapi-generator/src/main/resources/{pistache-server => cpp-pistache-server}/cmake.mustache (100%) rename modules/openapi-generator/src/main/resources/{pistache-server => cpp-pistache-server}/licenseInfo.mustache (100%) rename modules/openapi-generator/src/main/resources/{pistache-server => cpp-pistache-server}/main-api-server.mustache (100%) rename modules/openapi-generator/src/main/resources/{pistache-server => cpp-pistache-server}/model-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{pistache-server => cpp-pistache-server}/model-source.mustache (100%) rename modules/openapi-generator/src/main/resources/{pistache-server => cpp-pistache-server}/modelbase-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{pistache-server => cpp-pistache-server}/modelbase-source.mustache (100%) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java index b11c02f6329c..1bbfafbce377 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java @@ -74,7 +74,7 @@ public CppPistacheServerCodegen() { apiTemplateFiles.put("api-impl-source.mustache", ".cpp"); apiTemplateFiles.put("main-api-server.mustache", ".cpp"); - embeddedTemplateDir = templateDir = "pistache-server"; + embeddedTemplateDir = templateDir = "cpp-pistache-server"; cliOptions.clear(); diff --git a/modules/openapi-generator/src/main/resources/pistache-server/README.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/README.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/pistache-server/README.mustache rename to modules/openapi-generator/src/main/resources/cpp-pistache-server/README.mustache diff --git a/modules/openapi-generator/src/main/resources/pistache-server/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/pistache-server/api-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-pistache-server/api-header.mustache diff --git a/modules/openapi-generator/src/main/resources/pistache-server/api-impl-header.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/pistache-server/api-impl-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-header.mustache diff --git a/modules/openapi-generator/src/main/resources/pistache-server/api-impl-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/pistache-server/api-impl-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-pistache-server/api-impl-source.mustache diff --git a/modules/openapi-generator/src/main/resources/pistache-server/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/pistache-server/api-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache diff --git a/modules/openapi-generator/src/main/resources/pistache-server/cmake.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/cmake.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/pistache-server/cmake.mustache rename to modules/openapi-generator/src/main/resources/cpp-pistache-server/cmake.mustache diff --git a/modules/openapi-generator/src/main/resources/pistache-server/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/licenseInfo.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/pistache-server/licenseInfo.mustache rename to modules/openapi-generator/src/main/resources/cpp-pistache-server/licenseInfo.mustache diff --git a/modules/openapi-generator/src/main/resources/pistache-server/main-api-server.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/main-api-server.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/pistache-server/main-api-server.mustache rename to modules/openapi-generator/src/main/resources/cpp-pistache-server/main-api-server.mustache diff --git a/modules/openapi-generator/src/main/resources/pistache-server/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/pistache-server/model-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-pistache-server/model-header.mustache diff --git a/modules/openapi-generator/src/main/resources/pistache-server/model-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/pistache-server/model-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache diff --git a/modules/openapi-generator/src/main/resources/pistache-server/modelbase-header.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/modelbase-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/pistache-server/modelbase-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-pistache-server/modelbase-header.mustache diff --git a/modules/openapi-generator/src/main/resources/pistache-server/modelbase-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/modelbase-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/pistache-server/modelbase-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-pistache-server/modelbase-source.mustache From 2020bbd793b88c08b624784134d06d2ce406221c Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 17 Jun 2018 12:30:46 +0900 Subject: [PATCH 2/6] Rename templateDir: qt5cpp -> cpp-qt5-client --- bin/cpp-qt5-petstore.sh | 2 +- .../org/openapitools/codegen/languages/CppQt5ClientCodegen.java | 2 +- .../{qt5cpp => cpp-qt5-client}/HttpRequest.cpp.mustache | 0 .../resources/{qt5cpp => cpp-qt5-client}/HttpRequest.h.mustache | 0 .../main/resources/{qt5cpp => cpp-qt5-client}/Project.mustache | 0 .../{qt5cpp => cpp-qt5-client}/QObjectWrapper.h.mustache | 0 .../main/resources/{qt5cpp => cpp-qt5-client}/api-body.mustache | 0 .../resources/{qt5cpp => cpp-qt5-client}/api-header.mustache | 0 .../resources/{qt5cpp => cpp-qt5-client}/helpers-body.mustache | 0 .../{qt5cpp => cpp-qt5-client}/helpers-header.mustache | 0 .../resources/{qt5cpp => cpp-qt5-client}/licenseInfo.mustache | 0 .../resources/{qt5cpp => cpp-qt5-client}/model-body.mustache | 0 .../resources/{qt5cpp => cpp-qt5-client}/model-header.mustache | 0 .../resources/{qt5cpp => cpp-qt5-client}/modelFactory.mustache | 0 .../main/resources/{qt5cpp => cpp-qt5-client}/object.mustache | 0 15 files changed, 2 insertions(+), 2 deletions(-) rename modules/openapi-generator/src/main/resources/{qt5cpp => cpp-qt5-client}/HttpRequest.cpp.mustache (100%) rename modules/openapi-generator/src/main/resources/{qt5cpp => cpp-qt5-client}/HttpRequest.h.mustache (100%) rename modules/openapi-generator/src/main/resources/{qt5cpp => cpp-qt5-client}/Project.mustache (100%) rename modules/openapi-generator/src/main/resources/{qt5cpp => cpp-qt5-client}/QObjectWrapper.h.mustache (100%) rename modules/openapi-generator/src/main/resources/{qt5cpp => cpp-qt5-client}/api-body.mustache (100%) rename modules/openapi-generator/src/main/resources/{qt5cpp => cpp-qt5-client}/api-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{qt5cpp => cpp-qt5-client}/helpers-body.mustache (100%) rename modules/openapi-generator/src/main/resources/{qt5cpp => cpp-qt5-client}/helpers-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{qt5cpp => cpp-qt5-client}/licenseInfo.mustache (100%) rename modules/openapi-generator/src/main/resources/{qt5cpp => cpp-qt5-client}/model-body.mustache (100%) rename modules/openapi-generator/src/main/resources/{qt5cpp => cpp-qt5-client}/model-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{qt5cpp => cpp-qt5-client}/modelFactory.mustache (100%) rename modules/openapi-generator/src/main/resources/{qt5cpp => cpp-qt5-client}/object.mustache (100%) diff --git a/bin/cpp-qt5-petstore.sh b/bin/cpp-qt5-petstore.sh index fdca2260d5ec..3ed26ff9fe8a 100755 --- a/bin/cpp-qt5-petstore.sh +++ b/bin/cpp-qt5-petstore.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/cpp-qt5 $@" +ags="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/cpp-qt5 $@" java $JAVA_OPTS -jar $executable $ags diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java index dab947d9dd7f..fa3e9ca643de 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java @@ -92,7 +92,7 @@ public CppQt5ClientCodegen() { * Template Location. This is the location which templates will be read from. The generator * will use the resource stream to attempt to read the templates. */ - embeddedTemplateDir = templateDir = "qt5cpp"; + embeddedTemplateDir = templateDir = "cpp-qt5-client"; // CLI options addOption(CPP_NAMESPACE, CPP_NAMESPACE_DESC, this.cppNamespace); diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/HttpRequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/qt5cpp/HttpRequest.cpp.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/HttpRequest.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/qt5cpp/HttpRequest.h.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/Project.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/Project.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/qt5cpp/Project.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-client/Project.mustache diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/QObjectWrapper.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/QObjectWrapper.h.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/qt5cpp/QObjectWrapper.h.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-client/QObjectWrapper.h.mustache diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/api-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/qt5cpp/api-body.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/qt5cpp/api-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/helpers-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/helpers-body.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/qt5cpp/helpers-body.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-client/helpers-body.mustache diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/helpers-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/helpers-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/qt5cpp/helpers-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-client/helpers-header.mustache diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/licenseInfo.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/qt5cpp/licenseInfo.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-client/licenseInfo.mustache diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/model-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-body.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/qt5cpp/model-body.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-client/model-body.mustache diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/qt5cpp/model-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/modelFactory.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/modelFactory.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/qt5cpp/modelFactory.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-client/modelFactory.mustache diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/object.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/qt5cpp/object.mustache rename to modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache From 077b25e2242b0d12de3bbbbcbdbe8397e1251a01 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 17 Jun 2018 12:33:37 +0900 Subject: [PATCH 3/6] Rename templateDir: restbed -> cpp-restbed-server --- .../openapitools/codegen/languages/CppRestbedServerCodegen.java | 2 +- .../resources/{restbed => cpp-restbed-server}/README.mustache | 0 .../{restbed => cpp-restbed-server}/api-header.mustache | 0 .../{restbed => cpp-restbed-server}/api-source.mustache | 0 .../{restbed => cpp-restbed-server}/git_push.sh.mustache | 0 .../{restbed => cpp-restbed-server}/gitignore.mustache | 0 .../{restbed => cpp-restbed-server}/licenseInfo.mustache | 0 .../{restbed => cpp-restbed-server}/model-header.mustache | 0 .../{restbed => cpp-restbed-server}/model-source.mustache | 0 9 files changed, 1 insertion(+), 1 deletion(-) rename modules/openapi-generator/src/main/resources/{restbed => cpp-restbed-server}/README.mustache (100%) rename modules/openapi-generator/src/main/resources/{restbed => cpp-restbed-server}/api-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{restbed => cpp-restbed-server}/api-source.mustache (100%) rename modules/openapi-generator/src/main/resources/{restbed => cpp-restbed-server}/git_push.sh.mustache (100%) rename modules/openapi-generator/src/main/resources/{restbed => cpp-restbed-server}/gitignore.mustache (100%) rename modules/openapi-generator/src/main/resources/{restbed => cpp-restbed-server}/licenseInfo.mustache (100%) rename modules/openapi-generator/src/main/resources/{restbed => cpp-restbed-server}/model-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{restbed => cpp-restbed-server}/model-source.mustache (100%) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java index 69e0ebe17f68..fb8e289b3af4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java @@ -53,7 +53,7 @@ public CppRestbedServerCodegen() { apiTemplateFiles.put("api-header.mustache", ".h"); apiTemplateFiles.put("api-source.mustache", ".cpp"); - embeddedTemplateDir = templateDir = "restbed"; + embeddedTemplateDir = templateDir = "cpp-restbed-server"; cliOptions.clear(); diff --git a/modules/openapi-generator/src/main/resources/restbed/README.mustache b/modules/openapi-generator/src/main/resources/cpp-restbed-server/README.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/restbed/README.mustache rename to modules/openapi-generator/src/main/resources/cpp-restbed-server/README.mustache diff --git a/modules/openapi-generator/src/main/resources/restbed/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/restbed/api-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-restbed-server/api-header.mustache diff --git a/modules/openapi-generator/src/main/resources/restbed/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/restbed/api-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache diff --git a/modules/openapi-generator/src/main/resources/restbed/git_push.sh.mustache b/modules/openapi-generator/src/main/resources/cpp-restbed-server/git_push.sh.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/restbed/git_push.sh.mustache rename to modules/openapi-generator/src/main/resources/cpp-restbed-server/git_push.sh.mustache diff --git a/modules/openapi-generator/src/main/resources/restbed/gitignore.mustache b/modules/openapi-generator/src/main/resources/cpp-restbed-server/gitignore.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/restbed/gitignore.mustache rename to modules/openapi-generator/src/main/resources/cpp-restbed-server/gitignore.mustache diff --git a/modules/openapi-generator/src/main/resources/restbed/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/cpp-restbed-server/licenseInfo.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/restbed/licenseInfo.mustache rename to modules/openapi-generator/src/main/resources/cpp-restbed-server/licenseInfo.mustache diff --git a/modules/openapi-generator/src/main/resources/restbed/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-restbed-server/model-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/restbed/model-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-restbed-server/model-header.mustache diff --git a/modules/openapi-generator/src/main/resources/restbed/model-source.mustache b/modules/openapi-generator/src/main/resources/cpp-restbed-server/model-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/restbed/model-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-restbed-server/model-source.mustache From 73e1ec745b6d827941c6f4ef8810cd49d1e3c6f4 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 17 Jun 2018 12:36:02 +0900 Subject: [PATCH 4/6] Rename templateDir: cpprest -> cpp-rest-sdk-client --- bin/cpp-restsdk-petstore.sh | 2 +- .../openapitools/codegen/languages/CppRestSdkClientCodegen.java | 2 +- .../{cpprest => cpp-rest-sdk-client}/api-header.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/api-source.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/apiclient-header.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/apiclient-source.mustache | 0 .../apiconfiguration-header.mustache | 0 .../apiconfiguration-source.mustache | 0 .../apiexception-header.mustache | 0 .../apiexception-source.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/cmake-lists.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/git_push.sh.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/gitignore.mustache | 0 .../httpcontent-header.mustache | 0 .../httpcontent-source.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/ihttpbody-header.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/jsonbody-header.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/jsonbody-source.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/licenseInfo.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/model-header.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/model-source.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/modelbase-header.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/modelbase-source.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/multipart-header.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/multipart-source.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/object-header.mustache | 0 .../{cpprest => cpp-rest-sdk-client}/object-source.mustache | 0 27 files changed, 2 insertions(+), 2 deletions(-) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/api-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/api-source.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/apiclient-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/apiclient-source.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/apiconfiguration-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/apiconfiguration-source.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/apiexception-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/apiexception-source.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/cmake-lists.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/git_push.sh.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/gitignore.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/httpcontent-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/httpcontent-source.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/ihttpbody-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/jsonbody-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/jsonbody-source.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/licenseInfo.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/model-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/model-source.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/modelbase-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/modelbase-source.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/multipart-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/multipart-source.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/object-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{cpprest => cpp-rest-sdk-client}/object-source.mustache (100%) diff --git a/bin/cpp-restsdk-petstore.sh b/bin/cpp-restsdk-petstore.sh index 0a33cb36e3e8..3eecfa7a0271 100755 --- a/bin/cpp-restsdk-petstore.sh +++ b/bin/cpp-restsdk-petstore.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/cpprest -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-restsdk -o samples/client/petstore/cpp-restsdk $@" +ags="generate -t modules/openapi-generator/src/main/resources/cpp-rest-sdk-client -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-restsdk -o samples/client/petstore/cpp-restsdk $@" java $JAVA_OPTS -jar $executable $ags diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java index d8aed6bd8636..8cf9a14af6d6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java @@ -99,7 +99,7 @@ public CppRestSdkClientCodegen() { apiTemplateFiles.put("api-header.mustache", ".h"); apiTemplateFiles.put("api-source.mustache", ".cpp"); - embeddedTemplateDir = templateDir = "cpprest"; + embeddedTemplateDir = templateDir = "cpp-rest-sdk-client"; cliOptions.clear(); diff --git a/modules/openapi-generator/src/main/resources/cpprest/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/api-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-header.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/api-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/apiclient-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/apiclient-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-header.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/apiclient-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/apiclient-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-source.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/apiconfiguration-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiconfiguration-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/apiconfiguration-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiconfiguration-header.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/apiconfiguration-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiconfiguration-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/apiconfiguration-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiconfiguration-source.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/apiexception-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiexception-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/apiexception-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiexception-header.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/apiexception-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiexception-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/apiexception-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiexception-source.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/cmake-lists.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/cmake-lists.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/cmake-lists.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/cmake-lists.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/git_push.sh.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/git_push.sh.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/git_push.sh.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/git_push.sh.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/gitignore.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/gitignore.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/gitignore.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/gitignore.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/httpcontent-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/httpcontent-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/httpcontent-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/httpcontent-header.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/httpcontent-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/httpcontent-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/httpcontent-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/httpcontent-source.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/ihttpbody-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/ihttpbody-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/ihttpbody-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/ihttpbody-header.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/jsonbody-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/jsonbody-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/jsonbody-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/jsonbody-header.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/jsonbody-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/jsonbody-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/jsonbody-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/jsonbody-source.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/licenseInfo.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/licenseInfo.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/licenseInfo.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/model-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-header.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/model-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/model-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/modelbase-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/modelbase-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-header.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/modelbase-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/modelbase-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/multipart-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/multipart-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/multipart-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/multipart-header.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/multipart-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/multipart-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/multipart-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/multipart-source.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/object-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/object-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/object-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/object-header.mustache diff --git a/modules/openapi-generator/src/main/resources/cpprest/object-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/object-source.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/cpprest/object-source.mustache rename to modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/object-source.mustache From 7738e4eada428644d17529c96d963c1f7e50e497 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 17 Jun 2018 12:38:06 +0900 Subject: [PATCH 5/6] Rename templateDir: tizen -> cpp-tizen-client --- bin/cpp-tizen-petstore.sh | 2 +- .../openapitools/codegen/languages/CppTizenClientCodegen.java | 2 +- .../resources/{tizen => cpp-tizen-client}/Doxyfile.mustache | 0 .../resources/{tizen => cpp-tizen-client}/api-body.mustache | 0 .../resources/{tizen => cpp-tizen-client}/api-header.mustache | 0 .../resources/{tizen => cpp-tizen-client}/doc-readme.mustache | 0 .../resources/{tizen => cpp-tizen-client}/error-body.mustache | 0 .../resources/{tizen => cpp-tizen-client}/error-header.mustache | 0 .../{tizen => cpp-tizen-client}/generateDocumentation.mustache | 0 .../resources/{tizen => cpp-tizen-client}/helpers-body.mustache | 0 .../{tizen => cpp-tizen-client}/helpers-header.mustache | 0 .../resources/{tizen => cpp-tizen-client}/model-body.mustache | 0 .../resources/{tizen => cpp-tizen-client}/model-header.mustache | 0 .../{tizen => cpp-tizen-client}/netclient-body.mustache | 0 .../{tizen => cpp-tizen-client}/netclient-header.mustache | 0 .../main/resources/{tizen => cpp-tizen-client}/object.mustache | 0 .../resources/{tizen => cpp-tizen-client}/requestinfo.mustache | 0 17 files changed, 2 insertions(+), 2 deletions(-) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/Doxyfile.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/api-body.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/api-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/doc-readme.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/error-body.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/error-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/generateDocumentation.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/helpers-body.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/helpers-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/model-body.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/model-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/netclient-body.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/netclient-header.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/object.mustache (100%) rename modules/openapi-generator/src/main/resources/{tizen => cpp-tizen-client}/requestinfo.mustache (100%) diff --git a/bin/cpp-tizen-petstore.sh b/bin/cpp-tizen-petstore.sh index 82d9d9cd3ae7..72b0fbe71349 100755 --- a/bin/cpp-tizen-petstore.sh +++ b/bin/cpp-tizen-petstore.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/tizen -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-tizen -o samples/client/petstore/cpp-tizen $@" +ags="generate -t modules/openapi-generator/src/main/resources/cpp-tizen-client -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-tizen -o samples/client/petstore/cpp-tizen $@" java $JAVA_OPTS -jar $executable $ags diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java index 2f2afe39139b..1e3f1a849f1e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java @@ -44,7 +44,7 @@ public CppTizenClientCodegen() { modelTemplateFiles.put("model-body.mustache", ".cpp"); apiTemplateFiles.put("api-header.mustache", ".h"); apiTemplateFiles.put("api-body.mustache", ".cpp"); - embeddedTemplateDir = templateDir = "tizen"; + embeddedTemplateDir = templateDir = "cpp-tizen-client"; modelPackage = ""; defaultIncludes = new HashSet( diff --git a/modules/openapi-generator/src/main/resources/tizen/Doxyfile.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/Doxyfile.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/Doxyfile.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/Doxyfile.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/api-body.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/api-body.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/api-body.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/api-body.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/api-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/api-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/api-header.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/doc-readme.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/doc-readme.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/doc-readme.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/doc-readme.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/error-body.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/error-body.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/error-body.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/error-body.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/error-header.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/error-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/error-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/error-header.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/generateDocumentation.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/generateDocumentation.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/generateDocumentation.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/generateDocumentation.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/helpers-body.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/helpers-body.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/helpers-body.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/helpers-body.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/helpers-header.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/helpers-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/helpers-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/helpers-header.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/model-body.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/model-body.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/model-body.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/model-body.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/model-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/model-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/model-header.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/netclient-body.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/netclient-body.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/netclient-body.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/netclient-body.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/netclient-header.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/netclient-header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/netclient-header.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/netclient-header.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/object.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/object.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/object.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/object.mustache diff --git a/modules/openapi-generator/src/main/resources/tizen/requestinfo.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/requestinfo.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/tizen/requestinfo.mustache rename to modules/openapi-generator/src/main/resources/cpp-tizen-client/requestinfo.mustache From 7b2607f7bd90f25f356b5e1a5c581a5451f0740e Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 17 Jun 2018 18:24:37 +0900 Subject: [PATCH 6/6] Update scripts --- bin/openapi3/cpp-qt5-petstore.sh | 2 +- bin/openapi3/cpp-tizen-petstore.sh | 2 +- bin/security/cpp-qt5-petstore.sh | 2 +- bin/security/windows/qt5cpp-petstore.bat | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/openapi3/cpp-qt5-petstore.sh b/bin/openapi3/cpp-qt5-petstore.sh index d9e1835cc244..aa92aa3b5732 100755 --- a/bin/openapi3/cpp-qt5-petstore.sh +++ b/bin/openapi3/cpp-qt5-petstore.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/cpp-qt5 $@" +ags="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/cpp-qt5 $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/openapi3/cpp-tizen-petstore.sh b/bin/openapi3/cpp-tizen-petstore.sh index 2b1179642af2..149ec49339c8 100755 --- a/bin/openapi3/cpp-tizen-petstore.sh +++ b/bin/openapi3/cpp-tizen-petstore.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/tizen -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-tizen -o samples/client/petstore/cpp-tizen $@" +ags="generate -t modules/openapi-generator/src/main/resources/cpp-tizen-client -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-tizen -o samples/client/petstore/cpp-tizen $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/security/cpp-qt5-petstore.sh b/bin/security/cpp-qt5-petstore.sh index 1a2b5e76a16e..47ec7af45483 100755 --- a/bin/security/cpp-qt5-petstore.sh +++ b/bin/security/cpp-qt5-petstore.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -g cpp-qt5 -o samples/client/petstore-security-test/cpp-qt5 $@" +ags="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -g cpp-qt5 -o samples/client/petstore-security-test/cpp-qt5 $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/security/windows/qt5cpp-petstore.bat b/bin/security/windows/qt5cpp-petstore.bat index 6cb8a45dbe13..57d6b6c5f9ec 100644 --- a/bin/security/windows/qt5cpp-petstore.bat +++ b/bin/security/windows/qt5cpp-petstore.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -t modules/openapi-generator/src/main/resources/qt5cpp -i modules\openapi-generator\src\test\resources\2_0\petstore-security-test.yaml -g qt5cpp -o samples\client\petstore-security-test\qt5cpp +set ags=generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules\openapi-generator\src\test\resources\2_0\petstore-security-test.yaml -g qt5cpp -o samples\client\petstore-security-test\qt5cpp java %JAVA_OPTS% -jar %executable% %ags%