From 914ba1d65f49d686e08afb67b4223a3fb4496f14 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 10 Jul 2016 18:42:10 +0800 Subject: [PATCH 01/24] add run all petstore shell script --- .travis.yml | 1 + bin/run-all-petstore.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100755 bin/run-all-petstore.sh diff --git a/.travis.yml b/.travis.yml index 1a0be745a6e..00df6f8eb4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ install: script: - mvn verify -Psamples - if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_IMAGE_NAME ./modules/swagger-generator && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_IMAGE_NAME:latest $DOCKER_IMAGE_NAME:$TRAVIS_TAG; fi && docker push $DOCKER_IMAGE_NAME; fi + - ./bin/run-all-petstore.sh env: - DOCKER_IMAGE_NAME=swaggerapi/swagger-generator diff --git a/bin/run-all-petstore.sh b/bin/run-all-petstore.sh new file mode 100755 index 00000000000..c98b9627709 --- /dev/null +++ b/bin/run-all-petstore.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +for SCRIPT in ./bin/* +do + if [ -f $SCRIPT -a -x $SCRIPT ] + then + $SCRIPT + rc=$? + if [[ $rc != 0 ]] + then + echo "ERROR!! FAILED TO RUN $SCRIPT" + exit $rc; + fi + fi +done From 7c58386f75ae7e81c6f3e59391ba4dd2b2315a46 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 10 Jul 2016 18:59:01 +0800 Subject: [PATCH 02/24] add run all petstore batch file for windows tests --- appveyor.yml | 1 + bin/windows/run-all-petstore.bat | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 bin/windows/run-all-petstore.bat diff --git a/appveyor.yml b/appveyor.yml index f55637ac920..ed88ddbd70a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,6 +19,7 @@ build_script: - mvn clean package --batch-mode -DskipTest test_script: - mvn clean install --batch-mode + - .\bin\windows\run-all-petstore.bat cache: - C:\maven\ - C:\Users\appveyor\.m2 diff --git a/bin/windows/run-all-petstore.bat b/bin/windows/run-all-petstore.bat new file mode 100644 index 00000000000..2b49a860a61 --- /dev/null +++ b/bin/windows/run-all-petstore.bat @@ -0,0 +1,7 @@ +for /f "delims=" %%i in ('dir /b ".\bin\windows\*.bat"') do ( + + CALL .\bin\windows\%%i + + IF ERRORLEVEL 1 IF NOT ERRORLEVEL 2 exit /b 1 + +) From 8a40c92c3b9c14dc9277861f6cd5b9e0097328e2 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 10 Jul 2016 19:04:59 +0800 Subject: [PATCH 03/24] better output for travis and appveyor --- .travis.yml | 3 ++- appveyor.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 00df6f8eb4d..5de50fc6410 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,8 @@ install: script: - mvn verify -Psamples - if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_IMAGE_NAME ./modules/swagger-generator && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_IMAGE_NAME:latest $DOCKER_IMAGE_NAME:$TRAVIS_TAG; fi && docker push $DOCKER_IMAGE_NAME; fi - - ./bin/run-all-petstore.sh + - ./bin/run-all-petstore.sh 2>&1 > run-all-petstore.log + - tail run-all-petstore.log env: - DOCKER_IMAGE_NAME=swaggerapi/swagger-generator diff --git a/appveyor.yml b/appveyor.yml index ed88ddbd70a..7f8f330faa5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,8 @@ build_script: - mvn clean package --batch-mode -DskipTest test_script: - mvn clean install --batch-mode - - .\bin\windows\run-all-petstore.bat + - .\bin\windows\run-all-petstore.bat 2>&1 > run-all-petstore.log + - tail .\run-all-petstore.log cache: - C:\maven\ - C:\Users\appveyor\.m2 From d7d4d5cd6d40e5d96cc39d17740adb1604089715 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 10 Jul 2016 19:25:07 +0800 Subject: [PATCH 04/24] add shippable config to test all petstore --- shippable.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 shippable.yml diff --git a/shippable.yml b/shippable.yml new file mode 100644 index 00000000000..ed1d8395e4f --- /dev/null +++ b/shippable.yml @@ -0,0 +1,10 @@ +language: java + +jdk: +- openjdk7 +- openjdk8 +- oraclejdk7 +- oraclejdk8 + +after_success: +- ./bin/run-all-petstore.sh From c07c5937b7fafe4bae612a6a2f132267d3af410e Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 10 Jul 2016 22:08:16 +0800 Subject: [PATCH 05/24] show log after test script --- .travis.yml | 1 + appveyor.yml | 1 + bin/windows/dynamic-html-petstore.bat | 2 +- shippable.yml | 7 +++++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5de50fc6410..81ae041cb86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ script: - mvn verify -Psamples - if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_IMAGE_NAME ./modules/swagger-generator && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_IMAGE_NAME:latest $DOCKER_IMAGE_NAME:$TRAVIS_TAG; fi && docker push $DOCKER_IMAGE_NAME; fi - ./bin/run-all-petstore.sh 2>&1 > run-all-petstore.log +after_script: - tail run-all-petstore.log env: diff --git a/appveyor.yml b/appveyor.yml index 7f8f330faa5..0d27746a725 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,6 +20,7 @@ build_script: test_script: - mvn clean install --batch-mode - .\bin\windows\run-all-petstore.bat 2>&1 > run-all-petstore.log +after_test: - tail .\run-all-petstore.log cache: - C:\maven\ diff --git a/bin/windows/dynamic-html-petstore.bat b/bin/windows/dynamic-html-petstore.bat index 27595a54a16..073886085c0 100755 --- a/bin/windows/dynamic-html-petstore.bat +++ b/bin/windows/dynamic-html-petstore.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\dynamic-html -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l dynamic-html -o samples\client\petstore\dynamic-html +set ags=generate -t modules\swagger-codegen\src\main\resources\swagger-static -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l dynamic-html -o samples\client\petstore\dynamic-html java %JAVA_OPTS% -jar %executable% %ags% diff --git a/shippable.yml b/shippable.yml index ed1d8395e4f..abc2899f8f6 100644 --- a/shippable.yml +++ b/shippable.yml @@ -6,5 +6,8 @@ jdk: - oraclejdk7 - oraclejdk8 -after_success: -- ./bin/run-all-petstore.sh +ci: +- ./bin/run-all-petstore.sh 2>&1 > run-all-petstore.log + +post_ci: +- tail run-all-petstore.log From 25734d4a6bbe927fef16e1cb782473cf9a2f0973 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 10 Jul 2016 22:12:42 +0800 Subject: [PATCH 06/24] remo all-petstore, update travis build --- .travis.yml | 3 --- bin/all-petstore.sh | 56 ----------------------------------------- bin/run-all-petstore.sh | 15 ----------- shippable.yml | 2 +- 4 files changed, 1 insertion(+), 75 deletions(-) delete mode 100755 bin/all-petstore.sh delete mode 100755 bin/run-all-petstore.sh diff --git a/.travis.yml b/.travis.yml index 81ae041cb86..1a0be745a6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,6 @@ install: script: - mvn verify -Psamples - if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_IMAGE_NAME ./modules/swagger-generator && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_IMAGE_NAME:latest $DOCKER_IMAGE_NAME:$TRAVIS_TAG; fi && docker push $DOCKER_IMAGE_NAME; fi - - ./bin/run-all-petstore.sh 2>&1 > run-all-petstore.log -after_script: - - tail run-all-petstore.log env: - DOCKER_IMAGE_NAME=swaggerapi/swagger-generator diff --git a/bin/all-petstore.sh b/bin/all-petstore.sh deleted file mode 100755 index 62dfae74542..00000000000 --- a/bin/all-petstore.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -SCRIPT="$0" - -while [ -h "$SCRIPT" ] ; do - ls=`ls -ld "$SCRIPT"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - SCRIPT="$link" - else - SCRIPT=`dirname "$SCRIPT"`/"$link" - fi -done - -if [ ! -d "${APP_DIR}" ]; then - APP_DIR=`dirname "$SCRIPT"`/.. - APP_DIR=`cd "${APP_DIR}"; pwd` -fi - -cd $APP_DIR -./bin/akka-scala-petstore.sh -./bin/android-petstore.sh -./bin/aspnet5-petstore-server.sh -./bin/clojure-petstore.sh -./bin/csharp-petstore.sh -./bin/dynamic-html.sh -./bin/haskell-petstore.sh -./bin/html-petstore.sh -./bin/java-petstore.sh -./bin/java-petstore-jersey2.sh -./bin/java-petstore-okhttp-gson.sh -./bin/java-petstore-retrofit.sh -./bin/java-petstore-retrofit2.sh -./bin/java8-petstore-jersey2.sh -./bin/jaxrs-petstore-server.sh -./bin/nodejs-petstore-server.sh -./bin/objc-petstore.sh -./bin/perl-petstore.sh -./bin/php-petstore.sh -./bin/python-petstore.sh -./bin/qt5-petstore.sh -./bin/ruby-petstore.sh -./bin/scala-async-petstore.sh -./bin/scala-petstore.sh -./bin/scalatra-petstore-server.sh -./bin/silex-petstore-server.sh -./bin/slim-petstore-server.sh -./bin/spring-mvc-petstore-server.sh -./bin/spring-mvc-petstore-j8-async-server.sh -./bin/swift-petstore.sh -./bin/tizen-petstore.sh -./bin/typescript-angular-petstore.sh -./bin/typescript-angular2-petstore.sh -./bin/typescript-angular2-petstore-with-npm.sh -./bin/typescript-node-petstore.sh -./bin/lumen-petstore-server.sh \ No newline at end of file diff --git a/bin/run-all-petstore.sh b/bin/run-all-petstore.sh deleted file mode 100755 index c98b9627709..00000000000 --- a/bin/run-all-petstore.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -for SCRIPT in ./bin/* -do - if [ -f $SCRIPT -a -x $SCRIPT ] - then - $SCRIPT - rc=$? - if [[ $rc != 0 ]] - then - echo "ERROR!! FAILED TO RUN $SCRIPT" - exit $rc; - fi - fi -done diff --git a/shippable.yml b/shippable.yml index abc2899f8f6..817b44222c0 100644 --- a/shippable.yml +++ b/shippable.yml @@ -7,7 +7,7 @@ jdk: - oraclejdk8 ci: -- ./bin/run-all-petstore.sh 2>&1 > run-all-petstore.log +- ./bin/run-all-petstore 2>&1 > run-all-petstore.log post_ci: - tail run-all-petstore.log From c8311fbcf09360498ba4a05f82591fdd7ac50ac7 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 10 Jul 2016 22:25:54 +0800 Subject: [PATCH 07/24] update shiippable config --- shippable.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shippable.yml b/shippable.yml index 817b44222c0..eb041384e62 100644 --- a/shippable.yml +++ b/shippable.yml @@ -6,8 +6,8 @@ jdk: - oraclejdk7 - oraclejdk8 -ci: -- ./bin/run-all-petstore 2>&1 > run-all-petstore.log - -post_ci: -- tail run-all-petstore.log +build: + ci: + - ./bin/run-all-petstore 2>&1 > run-all-petstore.log + post_ci: + - tail run-all-petstore.log From 239fd2dccf0a5e8974d604d350ce607a50d4cee3 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 10 Jul 2016 22:34:58 +0800 Subject: [PATCH 08/24] add run-all-petstore --- bin/run-all-petstore | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 bin/run-all-petstore diff --git a/bin/run-all-petstore b/bin/run-all-petstore new file mode 100755 index 00000000000..60b2af0761f --- /dev/null +++ b/bin/run-all-petstore @@ -0,0 +1,15 @@ +#!/bin/sh + +for SCRIPT in ./bin/*.sh +do + if [ -f $SCRIPT -a -x $SCRIPT ] + then + $SCRIPT + rc=$? + if [[ $rc != 0 ]] + then + echo "ERROR!! FAILED TO RUN $SCRIPT" + exit $rc; + fi + fi +done From fc38353642b95b1b72e03d25840f6740812f6171 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 10 Jul 2016 23:06:35 +0800 Subject: [PATCH 09/24] failure test using ruby model --- modules/swagger-codegen/src/main/resources/ruby/model.mustache | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/swagger-codegen/src/main/resources/ruby/model.mustache b/modules/swagger-codegen/src/main/resources/ruby/model.mustache index 33a5d134029..74ededf095c 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/model.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/model.mustache @@ -7,3 +7,4 @@ require 'date' module {{moduleName}} {{#models}}{{#model}}{{#isEnum}}{{>partial_model_enum_class}}{{/isEnum}}{{^isEnum}}{{>partial_model_generic}}{{/isEnum}}{{/model}}{{/models}} end +{{#models}} From 3c0e7c18df9246e9422c7e0effa9f520b820c5a0 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 10 Jul 2016 23:24:57 +0800 Subject: [PATCH 10/24] use bash script for run-all-petstore --- bin/run-all-petstore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/run-all-petstore b/bin/run-all-petstore index 60b2af0761f..715287e1582 100755 --- a/bin/run-all-petstore +++ b/bin/run-all-petstore @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash -e for SCRIPT in ./bin/*.sh do From e868f7c5f9691bb5a2f31d4499aa4abfd486486f Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 10 Jul 2016 23:47:19 +0800 Subject: [PATCH 11/24] update script permission --- bin/jaxrs-spec-petstore-server.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/jaxrs-spec-petstore-server.sh diff --git a/bin/jaxrs-spec-petstore-server.sh b/bin/jaxrs-spec-petstore-server.sh old mode 100644 new mode 100755 From 860c31d5df3e62c2ac9e9799e274f13f8474b15e Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 10 Jul 2016 23:53:28 +0800 Subject: [PATCH 12/24] fix html batch script --- bin/windows/html-petstore.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/windows/html-petstore.bat b/bin/windows/html-petstore.bat index 82cc490027a..8de09f899fb 100755 --- a/bin/windows/html-petstore.bat +++ b/bin/windows/html-petstore.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\html -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l html -o samples\client\petstore\html +set ags=generate -t modules\swagger-codegen\src\main\resources\htmlDocs -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l html -o samples\client\petstore\html java %JAVA_OPTS% -jar %executable% %ags% From 6d5b4beaf7eb22c44cd1ca05069e271501ae06ef Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 11 Jul 2016 00:10:29 +0800 Subject: [PATCH 13/24] fix missing doc in jaxrs spec generator --- .../codegen/languages/JavaJAXRSSpecServerCodegen.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java index 1219af14763..89cc7f2b056 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java @@ -36,6 +36,12 @@ public JavaJAXRSSpecServerCodegen() apiPackage = "io.swagger.api"; modelPackage = "io.swagger.model"; + // clear model and api doc template as this codegen + // does not support auto-generated markdown doc at the moment + //TODO: add doc templates + modelDocTemplateFiles.remove("model_doc.mustache"); + apiDocTemplateFiles.remove("api_doc.mustache"); + additionalProperties.put("title", title); typeMapping.put("date", "LocalDate"); From 73dcbdf482f2ae3487fcc366f820de29fe7b7255 Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 11 Jul 2016 00:20:22 +0800 Subject: [PATCH 14/24] fix missing api, model test in jaxrs spec generator --- .../swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java index 89cc7f2b056..e7d15868282 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java @@ -36,6 +36,9 @@ public JavaJAXRSSpecServerCodegen() apiPackage = "io.swagger.api"; modelPackage = "io.swagger.model"; + apiTestTemplateFiles.clear(); // TODO: add api test template + modelTestTemplateFiles.clear(); // TODO: add model test template + // clear model and api doc template as this codegen // does not support auto-generated markdown doc at the moment //TODO: add doc templates From d3de03bd4c8ded26a31634eacfd032220a1b20eb Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 11 Jul 2016 00:38:05 +0800 Subject: [PATCH 15/24] rename licenseInfo for lumen --- .../lumen/{licenseinfo.mustache => licenseInfo.mustache} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename modules/swagger-codegen/src/main/resources/lumen/{licenseinfo.mustache => licenseInfo.mustache} (100%) diff --git a/modules/swagger-codegen/src/main/resources/lumen/licenseinfo.mustache b/modules/swagger-codegen/src/main/resources/lumen/licenseInfo.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/lumen/licenseinfo.mustache rename to modules/swagger-codegen/src/main/resources/lumen/licenseInfo.mustache From f3d1f5e5284185a6256973177df4c80d4543ce06 Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 11 Jul 2016 00:45:23 +0800 Subject: [PATCH 16/24] remove ruby model failure (for CI test) --- modules/swagger-codegen/src/main/resources/ruby/model.mustache | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/ruby/model.mustache b/modules/swagger-codegen/src/main/resources/ruby/model.mustache index 74ededf095c..33a5d134029 100644 --- a/modules/swagger-codegen/src/main/resources/ruby/model.mustache +++ b/modules/swagger-codegen/src/main/resources/ruby/model.mustache @@ -7,4 +7,3 @@ require 'date' module {{moduleName}} {{#models}}{{#model}}{{#isEnum}}{{>partial_model_enum_class}}{{/isEnum}}{{^isEnum}}{{>partial_model_generic}}{{/isEnum}}{{/model}}{{/models}} end -{{#models}} From 4a054bcec57c6161a0cf8fa748781791a868a267 Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 11 Jul 2016 01:27:05 +0800 Subject: [PATCH 17/24] fix "the input line is too long" --- bin/windows/akka-scala-petstore.bat | 4 ++-- bin/windows/android-petstore.bat | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/windows/akka-scala-petstore.bat b/bin/windows/akka-scala-petstore.bat index ecd7433d2e2..c828827f8af 100755 --- a/bin/windows/akka-scala-petstore.bat +++ b/bin/windows/akka-scala-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\akka-scala -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l akka-scala -o samples\client\petstore\akka-scala +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l akka-scala -o samples\client\petstore\akka-scala java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/android-petstore.bat b/bin/windows/android-petstore.bat index 03ee8a85836..2da636601aa 100755 --- a/bin/windows/android-petstore.bat +++ b/bin/windows/android-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\android -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l android -o samples\client\petstore\android\default +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l android -o samples\client\petstore\android\default java %JAVA_OPTS% -jar %executable% %ags% From 0b8cb18d7d9df1ae4bc339515d073a312fdf835e Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 11 Jul 2016 02:00:04 +0800 Subject: [PATCH 18/24] update windows batch file to shorten the commands --- bin/windows/aspnet5-petstore-server.bat | 4 ++-- bin/windows/async-scala-petstore.bat | 4 ++-- bin/windows/clojure-petstore.bat | 4 ++-- bin/windows/cpprest-petstore.bat | 4 ++-- bin/windows/csharp-petstore.bat | 4 ++-- bin/windows/dart-petstore.bat | 4 ++-- bin/windows/dynamic-html-petstore.bat | 4 ++-- bin/windows/flash-petstore.bat | 4 ++-- bin/windows/go-petstore.bat | 4 ++-- bin/windows/html-petstore.bat | 4 ++-- bin/windows/java-petstore-okhttp-gson.bat | 4 ++-- bin/windows/java-petstore.bat | 4 ++-- bin/windows/javascript-petstore.bat | 4 ++-- bin/windows/nancyfx-petstore-server.bat | 2 +- bin/windows/objc-petstore.bat | 4 ++-- bin/windows/perl-petstore.bat | 4 ++-- bin/windows/php-petstore.bat | 4 ++-- bin/windows/python-petstore.bat | 4 ++-- bin/windows/qt5cpp-petstore.bat | 4 ++-- bin/windows/rails-petstore-server.bat | 10 ---------- bin/windows/rails5-petstore-server.bat | 4 ++-- bin/windows/ruby-petstore.bat | 4 ++-- bin/windows/scala-petstore.bat | 4 ++-- bin/windows/spring-mvc-petstore-j8-async-server.bat | 6 +++--- bin/windows/spring-mvc-petstore-server.bat | 6 +++--- bin/windows/springboot-petstore-server.bat | 6 +++--- bin/windows/swift-petstore.bat | 4 ++-- bin/windows/tizen-petstore.bat | 4 ++-- bin/windows/typescript-angular.bat | 4 ++-- bin/windows/typescript-angular2-with-npm.bat | 4 ++-- bin/windows/typescript-angular2.bat | 4 ++-- bin/windows/typescript-fetch.bat | 4 ++-- bin/windows/typescript-node-with-npm.bat | 4 ++-- bin/windows/typescript-node.bat | 4 ++-- 34 files changed, 68 insertions(+), 78 deletions(-) delete mode 100644 bin/windows/rails-petstore-server.bat diff --git a/bin/windows/aspnet5-petstore-server.bat b/bin/windows/aspnet5-petstore-server.bat index 955ad6677b8..ec29e206d1f 100755 --- a/bin/windows/aspnet5-petstore-server.bat +++ b/bin/windows/aspnet5-petstore-server.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\aspnet5 -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnet5 -o samples\server\petstore\aspnet5\ +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnet5 -o samples\server\petstore\aspnet5\ java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/async-scala-petstore.bat b/bin/windows/async-scala-petstore.bat index d2b772b91b8..deb4288935b 100755 --- a/bin/windows/async-scala-petstore.bat +++ b/bin/windows/async-scala-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\asyncscala -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l async-scala -o samples\client\petstore\async-scala +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l async-scala -o samples\client\petstore\async-scala java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/clojure-petstore.bat b/bin/windows/clojure-petstore.bat index bfbb6663d11..9afcf4de749 100755 --- a/bin/windows/clojure-petstore.bat +++ b/bin/windows/clojure-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\clojure -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l clojure -o samples\client\petstore\clojure +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l clojure -o samples\client\petstore\clojure java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/cpprest-petstore.bat b/bin/windows/cpprest-petstore.bat index 43312669840..5b279b241ed 100755 --- a/bin/windows/cpprest-petstore.bat +++ b/bin/windows/cpprest-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\cpprest -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l cpprest -o samples\client\petstore\cpprest +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l cpprest -o samples\client\petstore\cpprest java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/csharp-petstore.bat b/bin/windows/csharp-petstore.bat index fbfc18d334d..965be2c6d5f 100755 --- a/bin/windows/csharp-petstore.bat +++ b/bin/windows/csharp-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\csharp -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l csharp -o samples\client\petstore\csharp\SwaggerClient +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l csharp -o samples\client\petstore\csharp\SwaggerClient java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/dart-petstore.bat b/bin/windows/dart-petstore.bat index bbf77fed2cc..37b7232d2d4 100755 --- a/bin/windows/dart-petstore.bat +++ b/bin/windows/dart-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\dart -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l dart -o samples\client\petstore\dart +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l dart -o samples\client\petstore\dart java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/dynamic-html-petstore.bat b/bin/windows/dynamic-html-petstore.bat index 073886085c0..7d22d0248c3 100755 --- a/bin/windows/dynamic-html-petstore.bat +++ b/bin/windows/dynamic-html-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\swagger-static -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l dynamic-html -o samples\client\petstore\dynamic-html +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l dynamic-html -o samples\client\petstore\dynamic-html java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/flash-petstore.bat b/bin/windows/flash-petstore.bat index 9e4445b77ea..65cdf0b4d76 100755 --- a/bin/windows/flash-petstore.bat +++ b/bin/windows/flash-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\flash -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l flash -o samples\client\petstore\flash +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l flash -o samples\client\petstore\flash java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/go-petstore.bat b/bin/windows/go-petstore.bat index 050bfd23cc8..4718a3ab362 100755 --- a/bin/windows/go-petstore.bat +++ b/bin/windows/go-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\go -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l go -o samples\client\petstore\go +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l go -o samples\client\petstore\go java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/html-petstore.bat b/bin/windows/html-petstore.bat index 8de09f899fb..47161c0ff58 100755 --- a/bin/windows/html-petstore.bat +++ b/bin/windows/html-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\htmlDocs -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l html -o samples\client\petstore\html +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l html -o samples\client\petstore\html java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/java-petstore-okhttp-gson.bat b/bin/windows/java-petstore-okhttp-gson.bat index e7c1dde982a..bba55c9d4dc 100755 --- a/bin/windows/java-petstore-okhttp-gson.bat +++ b/bin/windows/java-petstore-okhttp-gson.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\java -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java --library=okhttp-gson -DdateLibrary=joda,hideGenerationTimestamp=true +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java --library=okhttp-gson -DdateLibrary=joda,hideGenerationTimestamp=true java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/java-petstore.bat b/bin/windows/java-petstore.bat index 02a81e1adbf..79e33d5e91b 100755 --- a/bin/windows/java-petstore.bat +++ b/bin/windows/java-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\java -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java -DdateLibrary=joda,hideGenerationTimestamp=true +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java -DdateLibrary=joda,hideGenerationTimestamp=true java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/javascript-petstore.bat b/bin/windows/javascript-petstore.bat index 6ee220a7062..3b54dfb4c32 100755 --- a/bin/windows/javascript-petstore.bat +++ b/bin/windows/javascript-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\javascript -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l javascript -o samples\client\petstore\javascript +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l javascript -o samples\client\petstore\javascript java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/nancyfx-petstore-server.bat b/bin/windows/nancyfx-petstore-server.bat index 72af10287ce..0a7d0858f63 100644 --- a/bin/windows/nancyfx-petstore-server.bat +++ b/bin/windows/nancyfx-petstore-server.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\nancyfx -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l nancyfx -o samples\server\petstore\nancyfx\ +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l nancyfx -o samples\server\petstore\nancyfx\ java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/objc-petstore.bat b/bin/windows/objc-petstore.bat index 9e64a80ac00..8952cdcd0f7 100755 --- a/bin/windows/objc-petstore.bat +++ b/bin/windows/objc-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\objc -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l objc -o samples\client\petstore\objc\default +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l objc -o samples\client\petstore\objc\default java %JAVA_OPTS% -DappName=PetstoreClient -jar %executable% %ags% diff --git a/bin/windows/perl-petstore.bat b/bin/windows/perl-petstore.bat index da526e40dd7..bfbf309a984 100755 --- a/bin/windows/perl-petstore.bat +++ b/bin/windows/perl-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\perl -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l perl -o samples\client\petstore\perl +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l perl -o samples\client\petstore\perl java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/php-petstore.bat b/bin/windows/php-petstore.bat index cc10b72a609..76aee4f04aa 100755 --- a/bin/windows/php-petstore.bat +++ b/bin/windows/php-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\php -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l php -o samples\client\petstore\php +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l php -o samples\client\petstore\php java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/python-petstore.bat b/bin/windows/python-petstore.bat index 2762cf15b81..17feefa9b5e 100755 --- a/bin/windows/python-petstore.bat +++ b/bin/windows/python-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\python -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l python -o samples\client\petstore\python +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l python -o samples\client\petstore\python java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/qt5cpp-petstore.bat b/bin/windows/qt5cpp-petstore.bat index 3c5b849a3f1..a9067ebca68 100755 --- a/bin/windows/qt5cpp-petstore.bat +++ b/bin/windows/qt5cpp-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\qt5cpp -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l qt5cpp -o samples\client\petstore\qt5cpp +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l qt5cpp -o samples\client\petstore\qt5cpp java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/rails-petstore-server.bat b/bin/windows/rails-petstore-server.bat deleted file mode 100644 index 55677b55197..00000000000 --- a/bin/windows/rails-petstore-server.bat +++ /dev/null @@ -1,10 +0,0 @@ -set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar - -If Not Exist %executable% ( - mvn clean package -) - -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\rails5 -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnet5 -o samples\server\petstore\rails5\ - -java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/rails5-petstore-server.bat b/bin/windows/rails5-petstore-server.bat index a0316279784..654297cea43 100755 --- a/bin/windows/rails5-petstore-server.bat +++ b/bin/windows/rails5-petstore-server.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\rails5 -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l rails5 -o samples\server\petstore\rails5\ +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l rails5 -o samples\server\petstore\rails5\ java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/ruby-petstore.bat b/bin/windows/ruby-petstore.bat index 3642a6e19ba..4bae50af543 100755 --- a/bin/windows/ruby-petstore.bat +++ b/bin/windows/ruby-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\ruby -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l ruby -o samples\client\petstore\ruby +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l ruby -o samples\client\petstore\ruby java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/scala-petstore.bat b/bin/windows/scala-petstore.bat index 5d72d6e0c61..6fccfe62bcb 100755 --- a/bin/windows/scala-petstore.bat +++ b/bin/windows/scala-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\scala -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l scala -o samples\client\petstore\scala +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l scala -o samples\client\petstore\scala java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/spring-mvc-petstore-j8-async-server.bat b/bin/windows/spring-mvc-petstore-j8-async-server.bat index 601de1ff6f8..0f96b52714a 100644 --- a/bin/windows/spring-mvc-petstore-j8-async-server.bat +++ b/bin/windows/spring-mvc-petstore-j8-async-server.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\JavaSpringMVC -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring-mvc -o samples/server/petstore/spring-mvc-j8-async -c bin/spring-mvc-petstore-j8-async.json +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring-mvc -o samples\server\petstore\spring-mvc-j8-async -c bin\spring-mvc-petstore-j8-async.json -java %JAVA_OPTS% -jar %executable% %ags% \ No newline at end of file +java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/spring-mvc-petstore-server.bat b/bin/windows/spring-mvc-petstore-server.bat index f4ab64d5bd8..ac35e57f619 100644 --- a/bin/windows/spring-mvc-petstore-server.bat +++ b/bin/windows/spring-mvc-petstore-server.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\JavaSpringMVC -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring-mvc -o samples\server\petstore\spring-mvc +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring-mvc -o samples\server\petstore\spring-mvc -java %JAVA_OPTS% -jar %executable% %ags% \ No newline at end of file +java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/springboot-petstore-server.bat b/bin/windows/springboot-petstore-server.bat index 18077852db3..49b8c0c2371 100644 --- a/bin/windows/springboot-petstore-server.bat +++ b/bin/windows/springboot-petstore-server.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\JavaSpringBoot -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l springboot -o samples\server\petstore\springboot +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l springboot -o samples\server\petstore\springboot -java %JAVA_OPTS% -jar %executable% %ags% \ No newline at end of file +java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/swift-petstore.bat b/bin/windows/swift-petstore.bat index 31d19c18399..0b131e1d855 100755 --- a/bin/windows/swift-petstore.bat +++ b/bin/windows/swift-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\swift -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l swift -o samples\client\petstore\swift +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l swift -o samples\client\petstore\swift java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/tizen-petstore.bat b/bin/windows/tizen-petstore.bat index 27122c2cb94..3a4e10268c7 100755 --- a/bin/windows/tizen-petstore.bat +++ b/bin/windows/tizen-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\tizen -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l tizen -o samples\client\petstore\tizen +set JAVA_OPTS=%JAVA_OPTS% Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l tizen -o samples\client\petstore\tizen java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/typescript-angular.bat b/bin/windows/typescript-angular.bat index d77012e1b3d..3579ae9d6d0 100755 --- a/bin/windows/typescript-angular.bat +++ b/bin/windows/typescript-angular.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-angular -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-angular -o samples\client\petstore\typescript-angular +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-angular -o samples\client\petstore\typescript-angular java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/typescript-angular2-with-npm.bat b/bin/windows/typescript-angular2-with-npm.bat index dcbd6df8155..11794e262eb 100644 --- a/bin/windows/typescript-angular2-with-npm.bat +++ b/bin/windows/typescript-angular2-with-npm.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-angular -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -c bin/typescript-petstore-npm.json -l typescript-angular2 -o samples\client\petstore\typescript-angular2\npm +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -c bin\typescript-petstore-npm.json -l typescript-angular2 -o samples\client\petstore\typescript-angular2\npm java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/typescript-angular2.bat b/bin/windows/typescript-angular2.bat index ce2f0e0dc8c..820b36baf3d 100755 --- a/bin/windows/typescript-angular2.bat +++ b/bin/windows/typescript-angular2.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-angular -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-angular2 -o samples\client\petstore\typescript-angular2\default +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-angular2 -o samples\client\petstore\typescript-angular2\default java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/typescript-fetch.bat b/bin/windows/typescript-fetch.bat index b3ff19ea211..1cd879aa552 100755 --- a/bin/windows/typescript-fetch.bat +++ b/bin/windows/typescript-fetch.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-fetch -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-fetch -o samples\client\petstore\typescript-fetch +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-fetch -o samples\client\petstore\typescript-fetch java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/typescript-node-with-npm.bat b/bin/windows/typescript-node-with-npm.bat index a433181fde9..8b5df98c831 100755 --- a/bin/windows/typescript-node-with-npm.bat +++ b/bin/windows/typescript-node-with-npm.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-node -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -c bin/typescript-petstore-npm.json -l typescript-node -o samples\client\petstore\typescript-node\npm +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -c bin\typescript-petstore-npm.json -l typescript-node -o samples\client\petstore\typescript-node\npm java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/typescript-node.bat b/bin/windows/typescript-node.bat index 53f8b34e843..7c9b5a2afcc 100755 --- a/bin/windows/typescript-node.bat +++ b/bin/windows/typescript-node.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -t modules\swagger-codegen\src\main\resources\typescript-node -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-node -o samples\client\petstore\typescript-node\default +set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-node -o samples\client\petstore\typescript-node\default java %JAVA_OPTS% -jar %executable% %ags% From a1ce48bb938e72f03fe437f7deb8231003f1be2d Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 11 Jul 2016 02:03:18 +0800 Subject: [PATCH 19/24] update appveyor config --- appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0d27746a725..829fe27a037 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,11 +15,9 @@ install: - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH% - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g -build_script: - - mvn clean package --batch-mode -DskipTest test_script: - mvn clean install --batch-mode - - .\bin\windows\run-all-petstore.bat 2>&1 > run-all-petstore.log + - .\bin\windows\run-all-petstore.bat > run-all-petstore.log 2>&1 after_test: - tail .\run-all-petstore.log cache: From 6fe606c76e884a9b41dce4c065bcf0a8f09fccca Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 11 Jul 2016 02:04:28 +0800 Subject: [PATCH 20/24] update shippable config --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index eb041384e62..c28371ec252 100644 --- a/shippable.yml +++ b/shippable.yml @@ -8,6 +8,6 @@ jdk: build: ci: - - ./bin/run-all-petstore 2>&1 > run-all-petstore.log + - ./bin/run-all-petstore > run-all-petstore.log 2>&1 post_ci: - tail run-all-petstore.log From 0d1853259f80cc89699e8a128f28ed2a6e4a9af8 Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 11 Jul 2016 02:22:17 +0800 Subject: [PATCH 21/24] add build script --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 829fe27a037..0948328bd30 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,8 +15,9 @@ install: - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH% - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g -test_script: +build_script: - mvn clean install --batch-mode +test_script: - .\bin\windows\run-all-petstore.bat > run-all-petstore.log 2>&1 after_test: - tail .\run-all-petstore.log From 5403a52c09dfd4ccade041ec421e7232307d4e6b Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 11 Jul 2016 03:27:00 +0800 Subject: [PATCH 22/24] update batch file to remove args option --- appveyor.yml | 2 +- bin/windows/akka-scala-petstore.bat | 2 +- bin/windows/android-petstore.bat | 2 +- bin/windows/aspnet5-petstore-server.bat | 2 +- bin/windows/async-scala-petstore.bat | 2 +- bin/windows/clojure-petstore.bat | 2 +- bin/windows/cpprest-petstore.bat | 2 +- bin/windows/csharp-petstore.bat | 2 +- bin/windows/dart-petstore.bat | 2 +- bin/windows/dynamic-html-petstore.bat | 2 +- bin/windows/flash-petstore.bat | 2 +- bin/windows/go-petstore.bat | 2 +- bin/windows/html-petstore.bat | 2 +- bin/windows/java-petstore-okhttp-gson.bat | 2 +- bin/windows/java-petstore.bat | 2 +- bin/windows/javascript-petstore.bat | 2 +- bin/windows/nancyfx-petstore-server.bat | 2 +- bin/windows/objc-petstore.bat | 2 +- bin/windows/perl-petstore.bat | 2 +- bin/windows/php-petstore.bat | 2 +- bin/windows/python-petstore.bat | 2 +- bin/windows/qt5cpp-petstore.bat | 2 +- bin/windows/rails5-petstore-server.bat | 2 +- bin/windows/ruby-petstore.bat | 2 +- bin/windows/{run-all-petstore.bat => run-all-petstore.cmd} | 0 bin/windows/scala-petstore.bat | 2 +- bin/windows/spring-mvc-petstore-j8-async-server.bat | 2 +- bin/windows/spring-mvc-petstore-server.bat | 2 +- bin/windows/springboot-petstore-server.bat | 2 +- bin/windows/swift-petstore.bat | 2 +- bin/windows/tizen-petstore.bat | 2 +- bin/windows/typescript-angular.bat | 2 +- bin/windows/typescript-angular2-with-npm.bat | 2 +- bin/windows/typescript-angular2.bat | 2 +- bin/windows/typescript-fetch.bat | 2 +- bin/windows/typescript-node-with-npm.bat | 2 +- bin/windows/typescript-node.bat | 2 +- 37 files changed, 36 insertions(+), 36 deletions(-) rename bin/windows/{run-all-petstore.bat => run-all-petstore.cmd} (100%) diff --git a/appveyor.yml b/appveyor.yml index 0948328bd30..a887ddf761a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ install: build_script: - mvn clean install --batch-mode test_script: - - .\bin\windows\run-all-petstore.bat > run-all-petstore.log 2>&1 + - .\bin\windows\run-all-petstore.cmd > run-all-petstore.log 2>&1 after_test: - tail .\run-all-petstore.log cache: diff --git a/bin/windows/akka-scala-petstore.bat b/bin/windows/akka-scala-petstore.bat index c828827f8af..27598a00a4b 100755 --- a/bin/windows/akka-scala-petstore.bat +++ b/bin/windows/akka-scala-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l akka-scala -o samples\client\petstore\akka-scala java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/android-petstore.bat b/bin/windows/android-petstore.bat index 2da636601aa..21200f12883 100755 --- a/bin/windows/android-petstore.bat +++ b/bin/windows/android-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l android -o samples\client\petstore\android\default java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/aspnet5-petstore-server.bat b/bin/windows/aspnet5-petstore-server.bat index ec29e206d1f..0823553857b 100755 --- a/bin/windows/aspnet5-petstore-server.bat +++ b/bin/windows/aspnet5-petstore-server.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnet5 -o samples\server\petstore\aspnet5\ java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/async-scala-petstore.bat b/bin/windows/async-scala-petstore.bat index deb4288935b..9d3eac55eb2 100755 --- a/bin/windows/async-scala-petstore.bat +++ b/bin/windows/async-scala-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l async-scala -o samples\client\petstore\async-scala java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/clojure-petstore.bat b/bin/windows/clojure-petstore.bat index 9afcf4de749..a0f5bb77a4b 100755 --- a/bin/windows/clojure-petstore.bat +++ b/bin/windows/clojure-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l clojure -o samples\client\petstore\clojure java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/cpprest-petstore.bat b/bin/windows/cpprest-petstore.bat index 5b279b241ed..9f977cf9b86 100755 --- a/bin/windows/cpprest-petstore.bat +++ b/bin/windows/cpprest-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l cpprest -o samples\client\petstore\cpprest java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/csharp-petstore.bat b/bin/windows/csharp-petstore.bat index 965be2c6d5f..77493d69ae7 100755 --- a/bin/windows/csharp-petstore.bat +++ b/bin/windows/csharp-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l csharp -o samples\client\petstore\csharp\SwaggerClient java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/dart-petstore.bat b/bin/windows/dart-petstore.bat index 37b7232d2d4..bb0140ffe0d 100755 --- a/bin/windows/dart-petstore.bat +++ b/bin/windows/dart-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l dart -o samples\client\petstore\dart java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/dynamic-html-petstore.bat b/bin/windows/dynamic-html-petstore.bat index 7d22d0248c3..be4aa1a5d35 100755 --- a/bin/windows/dynamic-html-petstore.bat +++ b/bin/windows/dynamic-html-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l dynamic-html -o samples\client\petstore\dynamic-html java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/flash-petstore.bat b/bin/windows/flash-petstore.bat index 65cdf0b4d76..9e656642e45 100755 --- a/bin/windows/flash-petstore.bat +++ b/bin/windows/flash-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l flash -o samples\client\petstore\flash java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/go-petstore.bat b/bin/windows/go-petstore.bat index 4718a3ab362..c684f19ed2b 100755 --- a/bin/windows/go-petstore.bat +++ b/bin/windows/go-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l go -o samples\client\petstore\go java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/html-petstore.bat b/bin/windows/html-petstore.bat index 47161c0ff58..34c1d8af3ec 100755 --- a/bin/windows/html-petstore.bat +++ b/bin/windows/html-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l html -o samples\client\petstore\html java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/java-petstore-okhttp-gson.bat b/bin/windows/java-petstore-okhttp-gson.bat index bba55c9d4dc..0a771bd9bd4 100755 --- a/bin/windows/java-petstore-okhttp-gson.bat +++ b/bin/windows/java-petstore-okhttp-gson.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java --library=okhttp-gson -DdateLibrary=joda,hideGenerationTimestamp=true java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/java-petstore.bat b/bin/windows/java-petstore.bat index 79e33d5e91b..ef508c6590a 100755 --- a/bin/windows/java-petstore.bat +++ b/bin/windows/java-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l java -o samples\client\petstore\java -DdateLibrary=joda,hideGenerationTimestamp=true java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/javascript-petstore.bat b/bin/windows/javascript-petstore.bat index 3b54dfb4c32..cb7f97bab2c 100755 --- a/bin/windows/javascript-petstore.bat +++ b/bin/windows/javascript-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l javascript -o samples\client\petstore\javascript java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/nancyfx-petstore-server.bat b/bin/windows/nancyfx-petstore-server.bat index 0a7d0858f63..fff39d8e86a 100644 --- a/bin/windows/nancyfx-petstore-server.bat +++ b/bin/windows/nancyfx-petstore-server.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l nancyfx -o samples\server\petstore\nancyfx\ java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/objc-petstore.bat b/bin/windows/objc-petstore.bat index 8952cdcd0f7..13c11d2adcd 100755 --- a/bin/windows/objc-petstore.bat +++ b/bin/windows/objc-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l objc -o samples\client\petstore\objc\default java %JAVA_OPTS% -DappName=PetstoreClient -jar %executable% %ags% diff --git a/bin/windows/perl-petstore.bat b/bin/windows/perl-petstore.bat index bfbf309a984..d8bd90fd675 100755 --- a/bin/windows/perl-petstore.bat +++ b/bin/windows/perl-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l perl -o samples\client\petstore\perl java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/php-petstore.bat b/bin/windows/php-petstore.bat index 76aee4f04aa..603a33140b7 100755 --- a/bin/windows/php-petstore.bat +++ b/bin/windows/php-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l php -o samples\client\petstore\php java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/python-petstore.bat b/bin/windows/python-petstore.bat index 17feefa9b5e..4c3db67398e 100755 --- a/bin/windows/python-petstore.bat +++ b/bin/windows/python-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l python -o samples\client\petstore\python java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/qt5cpp-petstore.bat b/bin/windows/qt5cpp-petstore.bat index a9067ebca68..55e8cd417bd 100755 --- a/bin/windows/qt5cpp-petstore.bat +++ b/bin/windows/qt5cpp-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l qt5cpp -o samples\client\petstore\qt5cpp java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/rails5-petstore-server.bat b/bin/windows/rails5-petstore-server.bat index 654297cea43..8c4df75b87f 100755 --- a/bin/windows/rails5-petstore-server.bat +++ b/bin/windows/rails5-petstore-server.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l rails5 -o samples\server\petstore\rails5\ java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/ruby-petstore.bat b/bin/windows/ruby-petstore.bat index 4bae50af543..2c7cfa7d783 100755 --- a/bin/windows/ruby-petstore.bat +++ b/bin/windows/ruby-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l ruby -o samples\client\petstore\ruby java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/run-all-petstore.bat b/bin/windows/run-all-petstore.cmd similarity index 100% rename from bin/windows/run-all-petstore.bat rename to bin/windows/run-all-petstore.cmd diff --git a/bin/windows/scala-petstore.bat b/bin/windows/scala-petstore.bat index 6fccfe62bcb..b06be64cc4c 100755 --- a/bin/windows/scala-petstore.bat +++ b/bin/windows/scala-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l scala -o samples\client\petstore\scala java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/spring-mvc-petstore-j8-async-server.bat b/bin/windows/spring-mvc-petstore-j8-async-server.bat index 0f96b52714a..5849aa53b2b 100644 --- a/bin/windows/spring-mvc-petstore-j8-async-server.bat +++ b/bin/windows/spring-mvc-petstore-j8-async-server.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring-mvc -o samples\server\petstore\spring-mvc-j8-async -c bin\spring-mvc-petstore-j8-async.json java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/spring-mvc-petstore-server.bat b/bin/windows/spring-mvc-petstore-server.bat index ac35e57f619..c4583a8b808 100644 --- a/bin/windows/spring-mvc-petstore-server.bat +++ b/bin/windows/spring-mvc-petstore-server.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring-mvc -o samples\server\petstore\spring-mvc java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/springboot-petstore-server.bat b/bin/windows/springboot-petstore-server.bat index 49b8c0c2371..8a6a125e093 100644 --- a/bin/windows/springboot-petstore-server.bat +++ b/bin/windows/springboot-petstore-server.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l springboot -o samples\server\petstore\springboot java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/swift-petstore.bat b/bin/windows/swift-petstore.bat index 0b131e1d855..b0ef85d695d 100755 --- a/bin/windows/swift-petstore.bat +++ b/bin/windows/swift-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l swift -o samples\client\petstore\swift java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/tizen-petstore.bat b/bin/windows/tizen-petstore.bat index 3a4e10268c7..3da907bd485 100755 --- a/bin/windows/tizen-petstore.bat +++ b/bin/windows/tizen-petstore.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l tizen -o samples\client\petstore\tizen java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/typescript-angular.bat b/bin/windows/typescript-angular.bat index 3579ae9d6d0..26245ef22b1 100755 --- a/bin/windows/typescript-angular.bat +++ b/bin/windows/typescript-angular.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-angular -o samples\client\petstore\typescript-angular java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/typescript-angular2-with-npm.bat b/bin/windows/typescript-angular2-with-npm.bat index 11794e262eb..1d6766a17ec 100644 --- a/bin/windows/typescript-angular2-with-npm.bat +++ b/bin/windows/typescript-angular2-with-npm.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -c bin\typescript-petstore-npm.json -l typescript-angular2 -o samples\client\petstore\typescript-angular2\npm java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/typescript-angular2.bat b/bin/windows/typescript-angular2.bat index 820b36baf3d..a3bff34c87f 100755 --- a/bin/windows/typescript-angular2.bat +++ b/bin/windows/typescript-angular2.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-angular2 -o samples\client\petstore\typescript-angular2\default java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/typescript-fetch.bat b/bin/windows/typescript-fetch.bat index 1cd879aa552..9d78c6f754a 100755 --- a/bin/windows/typescript-fetch.bat +++ b/bin/windows/typescript-fetch.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-fetch -o samples\client\petstore\typescript-fetch java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/typescript-node-with-npm.bat b/bin/windows/typescript-node-with-npm.bat index 8b5df98c831..d33958637bb 100755 --- a/bin/windows/typescript-node-with-npm.bat +++ b/bin/windows/typescript-node-with-npm.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -c bin\typescript-petstore-npm.json -l typescript-node -o samples\client\petstore\typescript-node\npm java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/typescript-node.bat b/bin/windows/typescript-node.bat index 7c9b5a2afcc..f756deafb7b 100755 --- a/bin/windows/typescript-node.bat +++ b/bin/windows/typescript-node.bat @@ -4,7 +4,7 @@ If Not Exist %executable% ( mvn clean package ) -set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l typescript-node -o samples\client\petstore\typescript-node\default java %JAVA_OPTS% -jar %executable% %ags% From 4339699dcd6e20c2dfdb9c727bcc952e25d6b5d7 Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 11 Jul 2016 03:53:38 +0800 Subject: [PATCH 23/24] fix window batch file for spring mvc/boot --- bin/windows/spring-mvc-petstore-j8-async-server.bat | 2 +- bin/windows/spring-mvc-petstore-server.bat | 2 +- bin/windows/springboot-petstore-server.bat | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/windows/spring-mvc-petstore-j8-async-server.bat b/bin/windows/spring-mvc-petstore-j8-async-server.bat index 5849aa53b2b..4ef8db44568 100644 --- a/bin/windows/spring-mvc-petstore-j8-async-server.bat +++ b/bin/windows/spring-mvc-petstore-j8-async-server.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring-mvc -o samples\server\petstore\spring-mvc-j8-async -c bin\spring-mvc-petstore-j8-async.json +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring --library=spring-mvc -o samples\server\petstore\spring-mvc-j8-async -c bin\spring-mvc-petstore-j8-async.json java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/spring-mvc-petstore-server.bat b/bin/windows/spring-mvc-petstore-server.bat index c4583a8b808..258495f6cd7 100644 --- a/bin/windows/spring-mvc-petstore-server.bat +++ b/bin/windows/spring-mvc-petstore-server.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring-mvc -o samples\server\petstore\spring-mvc +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring --library=spring-mvc -o samples\server\petstore\spring-mvc java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/springboot-petstore-server.bat b/bin/windows/springboot-petstore-server.bat index 8a6a125e093..44f100a9f6d 100644 --- a/bin/windows/springboot-petstore-server.bat +++ b/bin/windows/springboot-petstore-server.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l springboot -o samples\server\petstore\springboot +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l spring -o samples\server\petstore\springboot java %JAVA_OPTS% -jar %executable% %ags% From e47d2bee2550fea0943b98d751eb5f46f9177a7f Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 11 Jul 2016 04:08:00 +0800 Subject: [PATCH 24/24] remove logging output to file --- appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a887ddf761a..2b31bd9f70a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,9 +18,7 @@ install: build_script: - mvn clean install --batch-mode test_script: - - .\bin\windows\run-all-petstore.cmd > run-all-petstore.log 2>&1 -after_test: - - tail .\run-all-petstore.log + - .\bin\windows\run-all-petstore.cmd cache: - C:\maven\ - C:\Users\appveyor\.m2