Skip to content

Commit f577345

Browse files
fehguyfehguy
committed
fixed examples, readme
1 parent d2f5b9e commit f577345

19 files changed

+41
-131
lines changed

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You can build a client against the swagger sample [petstore](http://petstore.swa
4646
This will run the generator with this command:
4747

4848
```
49-
java -jar modules/swagger-codegen-distribution/target/swagger-codegen-distribution-2.1.3-M1-SNAPSHOT.jar \
49+
java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
5050
-i http://petstore.swagger.io/v2/swagger.json \
5151
-l java \
5252
-o samples/client/petstore/java
@@ -97,7 +97,7 @@ You can look at `modules/swagger-codegen/src/main/resources/${your-language}` fo
9797
If you're starting a project with a new language and don't see what you need, swagger-codegen can help you create a project to generate your own libraries:
9898

9999
```
100-
java -cp modules/swagger-codegen-distribution/target/swagger-codegen-distribution-2.1.3-M1-SNAPSHOT.jar \
100+
java -cp modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
101101
com.wordnik.swagger.codegen.MetaGenerator \
102102
-o output/myLibrary -n myClientCodegen -p com.my.company.codegen
103103
```
@@ -200,7 +200,7 @@ You can also use the codegen to generate a server for a couple different framewo
200200

201201
### node.js
202202
```
203-
java -jar modules/swagger-codegen-distribution/target/swagger-codegen-distribution-2.1.3-M1-SNAPSHOT.jar \
203+
java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
204204
-i http://petstore.swagger.io/v2/swagger.json \
205205
-l nodejs \
206206
-o samples/server/petstore/nodejs
@@ -212,7 +212,7 @@ java -jar modules/swagger-codegen-distribution/target/swagger-codegen-distributi
212212

213213
### scala scalatra
214214
```
215-
java -jar modules/swagger-codegen-distribution/target/swagger-codegen-distribution-2.1.3-M1-SNAPSHOT.jar \
215+
java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
216216
-i http://petstore.swagger.io/v2/swagger.json \
217217
-l scalatra \
218218
-o samples/server/petstore/scalatra
@@ -221,7 +221,7 @@ java -jar modules/swagger-codegen-distribution/target/swagger-codegen-distributi
221221
### java jax-rs
222222

223223
```
224-
java -jar modules/swagger-codegen-distribution/target/swagger-codegen-distribution-2.1.3-M1-SNAPSHOT.jar \
224+
java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
225225
-i http://petstore.swagger.io/v2/swagger.json \
226226
-l jaxrs \
227227
-o samples/server/petstore/jaxrs

‎bin/android-java-petstore.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
1717
APP_DIR=`cd "${APP_DIR}"; pwd`
1818
fi
1919

20-
root=./modules/swagger-codegen-distribution/pom.xml
21-
22-
# gets version of swagger-codegen
23-
version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
24-
25-
executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
2621

2722
if [ ! -f "$executable" ]
2823
then
@@ -31,6 +26,6 @@ fi
3126

3227
# if you've executed sbt assembly previously it will use that instead.
3328
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
34-
ags="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l android -o samples/client/petstore/android-java"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l android -o samples/client/petstore/android-java"
3530

3631
java $JAVA_OPTS -jar $executable $ags

‎bin/android-java-wordnik-api.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
1717
APP_DIR=`cd "${APP_DIR}"; pwd`
1818
fi
1919

20-
root=./modules/swagger-codegen-distribution/pom.xml
21-
22-
# gets version of swagger-codegen
23-
version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
24-
25-
executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
2621

2722
if [ ! -f "$executable" ]
2823
then
@@ -31,6 +26,6 @@ fi
3126

3227
# if you've executed sbt assembly previously it will use that instead.
3328
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
34-
ags="$@ -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l android -o samples/client/wordnik/android-java"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l android -o samples/client/wordnik/android-java"
3530

3631
java $JAVA_OPTS -jar $executable $ags

‎bin/dynamic-html.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
1717
APP_DIR=`cd "${APP_DIR}"; pwd`
1818
fi
1919

20-
root=./modules/swagger-codegen-distribution/pom.xml
21-
22-
# gets version of swagger-codegen
23-
version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
24-
25-
executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
2621

2722
if [ ! -f "$executable" ]
2823
then
@@ -31,6 +26,6 @@ fi
3126

3227
# if you've executed sbt assembly previously it will use that instead.
3328
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
34-
ags="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l dynamic-html -o samples/dynamic-html"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l dynamic-html -o samples/dynamic-html"
3530

3631
java $JAVA_OPTS -jar $executable $ags

‎bin/html-petstore.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
1717
APP_DIR=`cd "${APP_DIR}"; pwd`
1818
fi
1919

20-
root=./modules/swagger-codegen-distribution/pom.xml
21-
22-
# gets version of swagger-codegen
23-
version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
24-
25-
executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
2621

2722
if [ ! -f "$executable" ]
2823
then
@@ -31,6 +26,6 @@ fi
3126

3227
# if you've executed sbt assembly previously it will use that instead.
3328
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
34-
ags="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l html -o samples/html"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l html -o samples/html"
3530

3631
java $JAVA_OPTS -jar $executable $ags

‎bin/java-petstore.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
1717
APP_DIR=`cd "${APP_DIR}"; pwd`
1818
fi
1919

20-
root=./modules/swagger-codegen-distribution/pom.xml
21-
22-
# gets version of swagger-codegen
23-
version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
24-
25-
executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
2621

2722
if [ ! -f "$executable" ]
2823
then
@@ -31,6 +26,6 @@ fi
3126

3227
# if you've executed sbt assembly previously it will use that instead.
3328
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
34-
ags="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -o samples/client/petstore/java"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -o samples/client/petstore/java"
3530

3631
java $JAVA_OPTS -jar $executable $ags

‎bin/java-wordnik-api.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
1717
APP_DIR=`cd "${APP_DIR}"; pwd`
1818
fi
1919

20-
root=./modules/swagger-codegen-distribution/pom.xml
21-
22-
# gets version of swagger-codegen
23-
version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
24-
25-
executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
2621

2722
if [ ! -f "$executable" ]
2823
then
@@ -31,6 +26,6 @@ fi
3126

3227
# if you've executed sbt assembly previously it will use that instead.
3328
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
34-
ags="$@ -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l java -o samples/client/wordnik/java"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l java -o samples/client/wordnik/java"
3530

3631
java $JAVA_OPTS -jar $executable $ags

‎bin/jaxrs-petstore-server.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
1717
APP_DIR=`cd "${APP_DIR}"; pwd`
1818
fi
1919

20-
root=./modules/swagger-codegen-distribution/pom.xml
21-
22-
# gets version of swagger-codegen
23-
version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
24-
25-
executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
2621

2722
if [ ! -f "$executable" ]
2823
then
@@ -31,6 +26,6 @@ fi
3126

3227
# if you've executed sbt assembly previously it will use that instead.
3328
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
34-
ags="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l jaxrs -o samples/server/petstore/jaxrs"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l jaxrs -o samples/server/petstore/jaxrs"
3530

3631
java $JAVA_OPTS -jar $executable $ags

‎bin/nodejs-petstore-server.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
1717
APP_DIR=`cd "${APP_DIR}"; pwd`
1818
fi
1919

20-
root=./modules/swagger-codegen-distribution/pom.xml
21-
22-
# gets version of swagger-codegen
23-
version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
24-
25-
executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
2621

2722
if [ ! -f "$executable" ]
2823
then
@@ -31,6 +26,6 @@ fi
3126

3227
# if you've executed sbt assembly previously it will use that instead.
3328
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
34-
ags="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l nodejs -o samples/server/petstore/nodejs"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l nodejs -o samples/server/petstore/nodejs"
3530

3631
java $JAVA_OPTS -Dservice -jar $executable $ags

‎bin/objc-petstore.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
1717
APP_DIR=`cd "${APP_DIR}"; pwd`
1818
fi
1919

20-
root=./modules/swagger-codegen-distribution/pom.xml
21-
22-
# gets version of swagger-codegen
23-
version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
24-
25-
executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
2621

2722
if [ ! -f "$executable" ]
2823
then
@@ -31,6 +26,6 @@ fi
3126

3227
# if you've executed sbt assembly previously it will use that instead.
3328
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
34-
ags="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc"
3530

3631
java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags

0 commit comments

Comments
 (0)