From 14c83b576120e03f4ed4e963ee107e8380023557 Mon Sep 17 00:00:00 2001 From: Eike Hartmann Date: Thu, 27 Jul 2017 22:33:51 +0200 Subject: [PATCH 1/4] Moved files into g8 structure --- .travis.yml | 18 +++++++ README.markdown | 12 +++++ build.sbt | 45 +++++------------- project/build.properties | 2 +- project/giter8.sbt | 1 + LICENSE => src/main/g8/LICENSE | 0 README.md => src/main/g8/README.md | 0 .../main/g8/activator.properties | 0 {app => src/main/g8/app}/ErrorHandler.scala | 0 .../main/g8/app}/controllers/Swagger.scala | 0 .../generated_controllers/example.yaml.scala | 0 .../main/g8/app}/security/example.yaml.scala | 0 src/main/g8/build.sbt | 33 +++++++++++++ {conf => src/main/g8/conf}/application.conf | 0 {conf => src/main/g8/conf}/example.yaml | 0 .../split.petstore.definitions.json | 0 .../split.petstore.definitions.yaml | 0 .../conf}/examples/cross_spec_references.yaml | 0 .../main/g8/conf}/examples/form_data.yaml | 0 .../g8/conf}/examples/numbers.validation.yaml | 0 .../main/g8/conf}/examples/security.api.yaml | 0 .../conf}/examples/simple.petstore.api.yaml | 0 .../examples/string_formats.validation.yaml | 0 .../g8/conf}/examples/type_deduplication.yaml | 0 .../main/g8/conf}/examples/uber.api.yaml | 0 {conf => src/main/g8/conf}/logback.xml | 0 {conf => src/main/g8/conf}/routes | 0 src/main/g8/default.properties | 2 + src/main/g8/project/build.properties | 1 + {project => src/main/g8/project}/plugins.sbt | 0 .../main/g8/public}/swagger/css/print.css | 0 .../main/g8/public}/swagger/css/reset.css | 0 .../main/g8/public}/swagger/css/screen.css | 0 .../main/g8/public}/swagger/css/style.css | 0 .../g8/public}/swagger/css/typography.css | 0 .../public}/swagger/fonts/DroidSans-Bold.ttf | Bin .../g8/public}/swagger/fonts/DroidSans.ttf | Bin .../g8/public}/swagger/images/collapse.gif | Bin .../main/g8/public}/swagger/images/expand.gif | Bin .../public}/swagger/images/explorer_icons.png | Bin .../public}/swagger/images/favicon-16x16.png | Bin .../public}/swagger/images/favicon-32x32.png | Bin .../g8/public}/swagger/images/favicon.ico | Bin .../g8/public}/swagger/images/logo_small.png | Bin .../public}/swagger/images/pet_store_api.png | Bin .../g8/public}/swagger/images/throbber.gif | Bin .../g8/public}/swagger/images/wordnik_api.png | Bin .../main/g8/public}/swagger/index.html | 0 .../main/g8/public}/swagger/lang/en.js | 0 .../main/g8/public}/swagger/lang/es.js | 0 .../main/g8/public}/swagger/lang/fr.js | 0 .../main/g8/public}/swagger/lang/geo.js | 0 .../main/g8/public}/swagger/lang/it.js | 0 .../main/g8/public}/swagger/lang/ja.js | 0 .../main/g8/public}/swagger/lang/pl.js | 0 .../main/g8/public}/swagger/lang/pt.js | 0 .../main/g8/public}/swagger/lang/ru.js | 0 .../main/g8/public}/swagger/lang/tr.js | 0 .../g8/public}/swagger/lang/translator.js | 0 .../main/g8/public}/swagger/lang/zh-cn.js | 0 .../g8/public}/swagger/lib/backbone-min.js | 0 .../public}/swagger/lib/handlebars-2.0.0.js | 0 .../swagger/lib/highlight.9.1.0.pack.js | 0 .../lib/highlight.9.1.0.pack_extended.js | 0 .../public}/swagger/lib/jquery-1.8.0.min.js | 0 .../public}/swagger/lib/jquery.ba-bbq.min.js | 0 .../public}/swagger/lib/jquery.slideto.min.js | 0 .../public}/swagger/lib/jquery.wiggle.min.js | 0 .../g8/public}/swagger/lib/js-yaml.min.js | 0 .../g8/public}/swagger/lib/jsoneditor.min.js | 0 .../main/g8/public}/swagger/lib/lodash.min.js | 0 .../main/g8/public}/swagger/lib/marked.js | 0 .../swagger/lib/object-assign-pollyfill.js | 0 .../g8/public}/swagger/lib/swagger-oauth.js | 0 .../main/g8/public}/swagger/o2c.html | 0 .../main/g8/public}/swagger/swagger-ui.js | 0 .../main/g8/public}/swagger/swagger-ui.min.js | 0 src/main/g8/src/main/scala/Stub.scala | 3 ++ {tutorial => src/main/g8/tutorial}/index.html | 0 .../main/g8/tutorial}/validations-01.png | Bin 80 files changed, 83 insertions(+), 34 deletions(-) create mode 100644 .travis.yml create mode 100644 README.markdown create mode 100644 project/giter8.sbt rename LICENSE => src/main/g8/LICENSE (100%) rename README.md => src/main/g8/README.md (100%) rename activator.properties => src/main/g8/activator.properties (100%) rename {app => src/main/g8/app}/ErrorHandler.scala (100%) rename {app => src/main/g8/app}/controllers/Swagger.scala (100%) rename {app => src/main/g8/app}/generated_controllers/example.yaml.scala (100%) rename {app => src/main/g8/app}/security/example.yaml.scala (100%) create mode 100644 src/main/g8/build.sbt rename {conf => src/main/g8/conf}/application.conf (100%) rename {conf => src/main/g8/conf}/example.yaml (100%) rename {conf => src/main/g8/conf}/examples/cross_spec_parts/split.petstore.definitions.json (100%) rename {conf => src/main/g8/conf}/examples/cross_spec_parts/split.petstore.definitions.yaml (100%) rename {conf => src/main/g8/conf}/examples/cross_spec_references.yaml (100%) rename {conf => src/main/g8/conf}/examples/form_data.yaml (100%) rename {conf => src/main/g8/conf}/examples/numbers.validation.yaml (100%) rename {conf => src/main/g8/conf}/examples/security.api.yaml (100%) rename {conf => src/main/g8/conf}/examples/simple.petstore.api.yaml (100%) rename {conf => src/main/g8/conf}/examples/string_formats.validation.yaml (100%) rename {conf => src/main/g8/conf}/examples/type_deduplication.yaml (100%) rename {conf => src/main/g8/conf}/examples/uber.api.yaml (100%) rename {conf => src/main/g8/conf}/logback.xml (100%) rename {conf => src/main/g8/conf}/routes (100%) create mode 100644 src/main/g8/default.properties create mode 100644 src/main/g8/project/build.properties rename {project => src/main/g8/project}/plugins.sbt (100%) rename {public => src/main/g8/public}/swagger/css/print.css (100%) rename {public => src/main/g8/public}/swagger/css/reset.css (100%) rename {public => src/main/g8/public}/swagger/css/screen.css (100%) rename {public => src/main/g8/public}/swagger/css/style.css (100%) rename {public => src/main/g8/public}/swagger/css/typography.css (100%) rename {public => src/main/g8/public}/swagger/fonts/DroidSans-Bold.ttf (100%) rename {public => src/main/g8/public}/swagger/fonts/DroidSans.ttf (100%) rename {public => src/main/g8/public}/swagger/images/collapse.gif (100%) rename {public => src/main/g8/public}/swagger/images/expand.gif (100%) rename {public => src/main/g8/public}/swagger/images/explorer_icons.png (100%) rename {public => src/main/g8/public}/swagger/images/favicon-16x16.png (100%) rename {public => src/main/g8/public}/swagger/images/favicon-32x32.png (100%) rename {public => src/main/g8/public}/swagger/images/favicon.ico (100%) rename {public => src/main/g8/public}/swagger/images/logo_small.png (100%) rename {public => src/main/g8/public}/swagger/images/pet_store_api.png (100%) rename {public => src/main/g8/public}/swagger/images/throbber.gif (100%) rename {public => src/main/g8/public}/swagger/images/wordnik_api.png (100%) rename {public => src/main/g8/public}/swagger/index.html (100%) rename {public => src/main/g8/public}/swagger/lang/en.js (100%) rename {public => src/main/g8/public}/swagger/lang/es.js (100%) rename {public => src/main/g8/public}/swagger/lang/fr.js (100%) rename {public => src/main/g8/public}/swagger/lang/geo.js (100%) rename {public => src/main/g8/public}/swagger/lang/it.js (100%) rename {public => src/main/g8/public}/swagger/lang/ja.js (100%) rename {public => src/main/g8/public}/swagger/lang/pl.js (100%) rename {public => src/main/g8/public}/swagger/lang/pt.js (100%) rename {public => src/main/g8/public}/swagger/lang/ru.js (100%) rename {public => src/main/g8/public}/swagger/lang/tr.js (100%) rename {public => src/main/g8/public}/swagger/lang/translator.js (100%) rename {public => src/main/g8/public}/swagger/lang/zh-cn.js (100%) rename {public => src/main/g8/public}/swagger/lib/backbone-min.js (100%) rename {public => src/main/g8/public}/swagger/lib/handlebars-2.0.0.js (100%) rename {public => src/main/g8/public}/swagger/lib/highlight.9.1.0.pack.js (100%) rename {public => src/main/g8/public}/swagger/lib/highlight.9.1.0.pack_extended.js (100%) rename {public => src/main/g8/public}/swagger/lib/jquery-1.8.0.min.js (100%) rename {public => src/main/g8/public}/swagger/lib/jquery.ba-bbq.min.js (100%) rename {public => src/main/g8/public}/swagger/lib/jquery.slideto.min.js (100%) rename {public => src/main/g8/public}/swagger/lib/jquery.wiggle.min.js (100%) rename {public => src/main/g8/public}/swagger/lib/js-yaml.min.js (100%) rename {public => src/main/g8/public}/swagger/lib/jsoneditor.min.js (100%) rename {public => src/main/g8/public}/swagger/lib/lodash.min.js (100%) rename {public => src/main/g8/public}/swagger/lib/marked.js (100%) rename {public => src/main/g8/public}/swagger/lib/object-assign-pollyfill.js (100%) rename {public => src/main/g8/public}/swagger/lib/swagger-oauth.js (100%) rename {public => src/main/g8/public}/swagger/o2c.html (100%) rename {public => src/main/g8/public}/swagger/swagger-ui.js (100%) rename {public => src/main/g8/public}/swagger/swagger-ui.min.js (100%) create mode 100644 src/main/g8/src/main/scala/Stub.scala rename {tutorial => src/main/g8/tutorial}/index.html (100%) rename {tutorial => src/main/g8/tutorial}/validations-01.png (100%) diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..64235ba --- /dev/null +++ b/.travis.yml @@ -0,0 +1,18 @@ +language: scala + +# These directories are cached to S3 at the end of the build +cache: + directories: + - $HOME/.ivy2/cache + - $HOME/.sbt/boot/ + +jdk: + - oraclejdk8 + +script: + ## This runs the template with the default parameters, and runs test within the templated app. + - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M test + + # Tricks to avoid unnecessary cache updates + - find $HOME/.sbt -name "*.lock" | xargs rm + - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm diff --git a/README.markdown b/README.markdown new file mode 100644 index 0000000..0157809 --- /dev/null +++ b/README.markdown @@ -0,0 +1,12 @@ +A [Giter8][g8] template for ...! + +Template license +---------------- +Written in by +[other author/contributor lines as appropriate] + +To the extent possible under law, the author(s) have dedicated all copyright and related +and neighboring rights to this template to the public domain worldwide. +This template is distributed without any warranty. See . + +[g8]: http://www.foundweekends.org/giter8/ diff --git a/build.sbt b/build.sbt index c0fb61a..164f192 100644 --- a/build.sbt +++ b/build.sbt @@ -1,33 +1,12 @@ -name := "api-first-hand-activator" - -version := "0.1.18" - -lazy val root = (project in file(".")).enablePlugins(PlayScala, ApiFirstCore, ApiFirstPlayScalaCodeGenerator, ApiFirstSwaggerParser) - -scalaVersion := "2.11.7" - -libraryDependencies ++= Seq( - jdbc, - cache, - ws, - specs2 % Test, - "org.scalacheck" %% "scalacheck" % "1.12.4" % Test, - "org.specs2" %% "specs2-scalacheck" % "3.6" % Test, - "me.jeffmay" %% "play-json-tests" % "1.3.0" % Test, - "org.scalatestplus.play" %% "scalatestplus-play" % "1.5.1" % Test -) - -resolvers ++= Seq( - "zalando-bintray" at "https://dl.bintray.com/zalando/maven", - "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases", - "jeffmay" at "https://dl.bintray.com/jeffmay/maven", - Resolver.url("sbt-plugins", url("http://dl.bintray.com/zalando/sbt-plugins"))(Resolver.ivyStylePatterns) -) - -// Play provides two styles of routers, one expects its actions to be injected, the -// other, legacy style, accesses its actions statically. -routesGenerator := InjectedRoutesGenerator - -apiFirstParsers := Seq(ApiFirstSwaggerParser.swaggerSpec2Ast.value).flatten - -playScalaAutogenerateTests := true \ No newline at end of file +// This build is for this Giter8 template. +// To test the template run `g8` or `g8Test` from the sbt session. +// See http://www.foundweekends.org/giter8/testing.html#Using+the+Giter8Plugin for more details. +lazy val root = (project in file(".")). + settings( + name := "api-first-hand-service", + test in Test := { + val _ = (g8Test in Test).toTask("").value + }, + scriptedLaunchOpts ++= List("-Xms1024m", "-Xmx1024m", "-XX:ReservedCodeCacheSize=128m", "-XX:MaxPermSize=256m", "-Xss2m", "-Dfile.encoding=UTF-8"), + resolvers += Resolver.url("typesafe", url("http://repo.typesafe.com/typesafe/ivy-releases/"))(Resolver.ivyStylePatterns) + ) diff --git a/project/build.properties b/project/build.properties index 9ad7e84..ead2472 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.8 \ No newline at end of file +sbt.version=0.13.16-RC1 diff --git a/project/giter8.sbt b/project/giter8.sbt new file mode 100644 index 0000000..c28a82c --- /dev/null +++ b/project/giter8.sbt @@ -0,0 +1 @@ +addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.9.0") diff --git a/LICENSE b/src/main/g8/LICENSE similarity index 100% rename from LICENSE rename to src/main/g8/LICENSE diff --git a/README.md b/src/main/g8/README.md similarity index 100% rename from README.md rename to src/main/g8/README.md diff --git a/activator.properties b/src/main/g8/activator.properties similarity index 100% rename from activator.properties rename to src/main/g8/activator.properties diff --git a/app/ErrorHandler.scala b/src/main/g8/app/ErrorHandler.scala similarity index 100% rename from app/ErrorHandler.scala rename to src/main/g8/app/ErrorHandler.scala diff --git a/app/controllers/Swagger.scala b/src/main/g8/app/controllers/Swagger.scala similarity index 100% rename from app/controllers/Swagger.scala rename to src/main/g8/app/controllers/Swagger.scala diff --git a/app/generated_controllers/example.yaml.scala b/src/main/g8/app/generated_controllers/example.yaml.scala similarity index 100% rename from app/generated_controllers/example.yaml.scala rename to src/main/g8/app/generated_controllers/example.yaml.scala diff --git a/app/security/example.yaml.scala b/src/main/g8/app/security/example.yaml.scala similarity index 100% rename from app/security/example.yaml.scala rename to src/main/g8/app/security/example.yaml.scala diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt new file mode 100644 index 0000000..c0fb61a --- /dev/null +++ b/src/main/g8/build.sbt @@ -0,0 +1,33 @@ +name := "api-first-hand-activator" + +version := "0.1.18" + +lazy val root = (project in file(".")).enablePlugins(PlayScala, ApiFirstCore, ApiFirstPlayScalaCodeGenerator, ApiFirstSwaggerParser) + +scalaVersion := "2.11.7" + +libraryDependencies ++= Seq( + jdbc, + cache, + ws, + specs2 % Test, + "org.scalacheck" %% "scalacheck" % "1.12.4" % Test, + "org.specs2" %% "specs2-scalacheck" % "3.6" % Test, + "me.jeffmay" %% "play-json-tests" % "1.3.0" % Test, + "org.scalatestplus.play" %% "scalatestplus-play" % "1.5.1" % Test +) + +resolvers ++= Seq( + "zalando-bintray" at "https://dl.bintray.com/zalando/maven", + "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases", + "jeffmay" at "https://dl.bintray.com/jeffmay/maven", + Resolver.url("sbt-plugins", url("http://dl.bintray.com/zalando/sbt-plugins"))(Resolver.ivyStylePatterns) +) + +// Play provides two styles of routers, one expects its actions to be injected, the +// other, legacy style, accesses its actions statically. +routesGenerator := InjectedRoutesGenerator + +apiFirstParsers := Seq(ApiFirstSwaggerParser.swaggerSpec2Ast.value).flatten + +playScalaAutogenerateTests := true \ No newline at end of file diff --git a/conf/application.conf b/src/main/g8/conf/application.conf similarity index 100% rename from conf/application.conf rename to src/main/g8/conf/application.conf diff --git a/conf/example.yaml b/src/main/g8/conf/example.yaml similarity index 100% rename from conf/example.yaml rename to src/main/g8/conf/example.yaml diff --git a/conf/examples/cross_spec_parts/split.petstore.definitions.json b/src/main/g8/conf/examples/cross_spec_parts/split.petstore.definitions.json similarity index 100% rename from conf/examples/cross_spec_parts/split.petstore.definitions.json rename to src/main/g8/conf/examples/cross_spec_parts/split.petstore.definitions.json diff --git a/conf/examples/cross_spec_parts/split.petstore.definitions.yaml b/src/main/g8/conf/examples/cross_spec_parts/split.petstore.definitions.yaml similarity index 100% rename from conf/examples/cross_spec_parts/split.petstore.definitions.yaml rename to src/main/g8/conf/examples/cross_spec_parts/split.petstore.definitions.yaml diff --git a/conf/examples/cross_spec_references.yaml b/src/main/g8/conf/examples/cross_spec_references.yaml similarity index 100% rename from conf/examples/cross_spec_references.yaml rename to src/main/g8/conf/examples/cross_spec_references.yaml diff --git a/conf/examples/form_data.yaml b/src/main/g8/conf/examples/form_data.yaml similarity index 100% rename from conf/examples/form_data.yaml rename to src/main/g8/conf/examples/form_data.yaml diff --git a/conf/examples/numbers.validation.yaml b/src/main/g8/conf/examples/numbers.validation.yaml similarity index 100% rename from conf/examples/numbers.validation.yaml rename to src/main/g8/conf/examples/numbers.validation.yaml diff --git a/conf/examples/security.api.yaml b/src/main/g8/conf/examples/security.api.yaml similarity index 100% rename from conf/examples/security.api.yaml rename to src/main/g8/conf/examples/security.api.yaml diff --git a/conf/examples/simple.petstore.api.yaml b/src/main/g8/conf/examples/simple.petstore.api.yaml similarity index 100% rename from conf/examples/simple.petstore.api.yaml rename to src/main/g8/conf/examples/simple.petstore.api.yaml diff --git a/conf/examples/string_formats.validation.yaml b/src/main/g8/conf/examples/string_formats.validation.yaml similarity index 100% rename from conf/examples/string_formats.validation.yaml rename to src/main/g8/conf/examples/string_formats.validation.yaml diff --git a/conf/examples/type_deduplication.yaml b/src/main/g8/conf/examples/type_deduplication.yaml similarity index 100% rename from conf/examples/type_deduplication.yaml rename to src/main/g8/conf/examples/type_deduplication.yaml diff --git a/conf/examples/uber.api.yaml b/src/main/g8/conf/examples/uber.api.yaml similarity index 100% rename from conf/examples/uber.api.yaml rename to src/main/g8/conf/examples/uber.api.yaml diff --git a/conf/logback.xml b/src/main/g8/conf/logback.xml similarity index 100% rename from conf/logback.xml rename to src/main/g8/conf/logback.xml diff --git a/conf/routes b/src/main/g8/conf/routes similarity index 100% rename from conf/routes rename to src/main/g8/conf/routes diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties new file mode 100644 index 0000000..f8194fb --- /dev/null +++ b/src/main/g8/default.properties @@ -0,0 +1,2 @@ +name=My Something Project +description=Say something about this template. diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties new file mode 100644 index 0000000..9ad7e84 --- /dev/null +++ b/src/main/g8/project/build.properties @@ -0,0 +1 @@ +sbt.version=0.13.8 \ No newline at end of file diff --git a/project/plugins.sbt b/src/main/g8/project/plugins.sbt similarity index 100% rename from project/plugins.sbt rename to src/main/g8/project/plugins.sbt diff --git a/public/swagger/css/print.css b/src/main/g8/public/swagger/css/print.css similarity index 100% rename from public/swagger/css/print.css rename to src/main/g8/public/swagger/css/print.css diff --git a/public/swagger/css/reset.css b/src/main/g8/public/swagger/css/reset.css similarity index 100% rename from public/swagger/css/reset.css rename to src/main/g8/public/swagger/css/reset.css diff --git a/public/swagger/css/screen.css b/src/main/g8/public/swagger/css/screen.css similarity index 100% rename from public/swagger/css/screen.css rename to src/main/g8/public/swagger/css/screen.css diff --git a/public/swagger/css/style.css b/src/main/g8/public/swagger/css/style.css similarity index 100% rename from public/swagger/css/style.css rename to src/main/g8/public/swagger/css/style.css diff --git a/public/swagger/css/typography.css b/src/main/g8/public/swagger/css/typography.css similarity index 100% rename from public/swagger/css/typography.css rename to src/main/g8/public/swagger/css/typography.css diff --git a/public/swagger/fonts/DroidSans-Bold.ttf b/src/main/g8/public/swagger/fonts/DroidSans-Bold.ttf similarity index 100% rename from public/swagger/fonts/DroidSans-Bold.ttf rename to src/main/g8/public/swagger/fonts/DroidSans-Bold.ttf diff --git a/public/swagger/fonts/DroidSans.ttf b/src/main/g8/public/swagger/fonts/DroidSans.ttf similarity index 100% rename from public/swagger/fonts/DroidSans.ttf rename to src/main/g8/public/swagger/fonts/DroidSans.ttf diff --git a/public/swagger/images/collapse.gif b/src/main/g8/public/swagger/images/collapse.gif similarity index 100% rename from public/swagger/images/collapse.gif rename to src/main/g8/public/swagger/images/collapse.gif diff --git a/public/swagger/images/expand.gif b/src/main/g8/public/swagger/images/expand.gif similarity index 100% rename from public/swagger/images/expand.gif rename to src/main/g8/public/swagger/images/expand.gif diff --git a/public/swagger/images/explorer_icons.png b/src/main/g8/public/swagger/images/explorer_icons.png similarity index 100% rename from public/swagger/images/explorer_icons.png rename to src/main/g8/public/swagger/images/explorer_icons.png diff --git a/public/swagger/images/favicon-16x16.png b/src/main/g8/public/swagger/images/favicon-16x16.png similarity index 100% rename from public/swagger/images/favicon-16x16.png rename to src/main/g8/public/swagger/images/favicon-16x16.png diff --git a/public/swagger/images/favicon-32x32.png b/src/main/g8/public/swagger/images/favicon-32x32.png similarity index 100% rename from public/swagger/images/favicon-32x32.png rename to src/main/g8/public/swagger/images/favicon-32x32.png diff --git a/public/swagger/images/favicon.ico b/src/main/g8/public/swagger/images/favicon.ico similarity index 100% rename from public/swagger/images/favicon.ico rename to src/main/g8/public/swagger/images/favicon.ico diff --git a/public/swagger/images/logo_small.png b/src/main/g8/public/swagger/images/logo_small.png similarity index 100% rename from public/swagger/images/logo_small.png rename to src/main/g8/public/swagger/images/logo_small.png diff --git a/public/swagger/images/pet_store_api.png b/src/main/g8/public/swagger/images/pet_store_api.png similarity index 100% rename from public/swagger/images/pet_store_api.png rename to src/main/g8/public/swagger/images/pet_store_api.png diff --git a/public/swagger/images/throbber.gif b/src/main/g8/public/swagger/images/throbber.gif similarity index 100% rename from public/swagger/images/throbber.gif rename to src/main/g8/public/swagger/images/throbber.gif diff --git a/public/swagger/images/wordnik_api.png b/src/main/g8/public/swagger/images/wordnik_api.png similarity index 100% rename from public/swagger/images/wordnik_api.png rename to src/main/g8/public/swagger/images/wordnik_api.png diff --git a/public/swagger/index.html b/src/main/g8/public/swagger/index.html similarity index 100% rename from public/swagger/index.html rename to src/main/g8/public/swagger/index.html diff --git a/public/swagger/lang/en.js b/src/main/g8/public/swagger/lang/en.js similarity index 100% rename from public/swagger/lang/en.js rename to src/main/g8/public/swagger/lang/en.js diff --git a/public/swagger/lang/es.js b/src/main/g8/public/swagger/lang/es.js similarity index 100% rename from public/swagger/lang/es.js rename to src/main/g8/public/swagger/lang/es.js diff --git a/public/swagger/lang/fr.js b/src/main/g8/public/swagger/lang/fr.js similarity index 100% rename from public/swagger/lang/fr.js rename to src/main/g8/public/swagger/lang/fr.js diff --git a/public/swagger/lang/geo.js b/src/main/g8/public/swagger/lang/geo.js similarity index 100% rename from public/swagger/lang/geo.js rename to src/main/g8/public/swagger/lang/geo.js diff --git a/public/swagger/lang/it.js b/src/main/g8/public/swagger/lang/it.js similarity index 100% rename from public/swagger/lang/it.js rename to src/main/g8/public/swagger/lang/it.js diff --git a/public/swagger/lang/ja.js b/src/main/g8/public/swagger/lang/ja.js similarity index 100% rename from public/swagger/lang/ja.js rename to src/main/g8/public/swagger/lang/ja.js diff --git a/public/swagger/lang/pl.js b/src/main/g8/public/swagger/lang/pl.js similarity index 100% rename from public/swagger/lang/pl.js rename to src/main/g8/public/swagger/lang/pl.js diff --git a/public/swagger/lang/pt.js b/src/main/g8/public/swagger/lang/pt.js similarity index 100% rename from public/swagger/lang/pt.js rename to src/main/g8/public/swagger/lang/pt.js diff --git a/public/swagger/lang/ru.js b/src/main/g8/public/swagger/lang/ru.js similarity index 100% rename from public/swagger/lang/ru.js rename to src/main/g8/public/swagger/lang/ru.js diff --git a/public/swagger/lang/tr.js b/src/main/g8/public/swagger/lang/tr.js similarity index 100% rename from public/swagger/lang/tr.js rename to src/main/g8/public/swagger/lang/tr.js diff --git a/public/swagger/lang/translator.js b/src/main/g8/public/swagger/lang/translator.js similarity index 100% rename from public/swagger/lang/translator.js rename to src/main/g8/public/swagger/lang/translator.js diff --git a/public/swagger/lang/zh-cn.js b/src/main/g8/public/swagger/lang/zh-cn.js similarity index 100% rename from public/swagger/lang/zh-cn.js rename to src/main/g8/public/swagger/lang/zh-cn.js diff --git a/public/swagger/lib/backbone-min.js b/src/main/g8/public/swagger/lib/backbone-min.js similarity index 100% rename from public/swagger/lib/backbone-min.js rename to src/main/g8/public/swagger/lib/backbone-min.js diff --git a/public/swagger/lib/handlebars-2.0.0.js b/src/main/g8/public/swagger/lib/handlebars-2.0.0.js similarity index 100% rename from public/swagger/lib/handlebars-2.0.0.js rename to src/main/g8/public/swagger/lib/handlebars-2.0.0.js diff --git a/public/swagger/lib/highlight.9.1.0.pack.js b/src/main/g8/public/swagger/lib/highlight.9.1.0.pack.js similarity index 100% rename from public/swagger/lib/highlight.9.1.0.pack.js rename to src/main/g8/public/swagger/lib/highlight.9.1.0.pack.js diff --git a/public/swagger/lib/highlight.9.1.0.pack_extended.js b/src/main/g8/public/swagger/lib/highlight.9.1.0.pack_extended.js similarity index 100% rename from public/swagger/lib/highlight.9.1.0.pack_extended.js rename to src/main/g8/public/swagger/lib/highlight.9.1.0.pack_extended.js diff --git a/public/swagger/lib/jquery-1.8.0.min.js b/src/main/g8/public/swagger/lib/jquery-1.8.0.min.js similarity index 100% rename from public/swagger/lib/jquery-1.8.0.min.js rename to src/main/g8/public/swagger/lib/jquery-1.8.0.min.js diff --git a/public/swagger/lib/jquery.ba-bbq.min.js b/src/main/g8/public/swagger/lib/jquery.ba-bbq.min.js similarity index 100% rename from public/swagger/lib/jquery.ba-bbq.min.js rename to src/main/g8/public/swagger/lib/jquery.ba-bbq.min.js diff --git a/public/swagger/lib/jquery.slideto.min.js b/src/main/g8/public/swagger/lib/jquery.slideto.min.js similarity index 100% rename from public/swagger/lib/jquery.slideto.min.js rename to src/main/g8/public/swagger/lib/jquery.slideto.min.js diff --git a/public/swagger/lib/jquery.wiggle.min.js b/src/main/g8/public/swagger/lib/jquery.wiggle.min.js similarity index 100% rename from public/swagger/lib/jquery.wiggle.min.js rename to src/main/g8/public/swagger/lib/jquery.wiggle.min.js diff --git a/public/swagger/lib/js-yaml.min.js b/src/main/g8/public/swagger/lib/js-yaml.min.js similarity index 100% rename from public/swagger/lib/js-yaml.min.js rename to src/main/g8/public/swagger/lib/js-yaml.min.js diff --git a/public/swagger/lib/jsoneditor.min.js b/src/main/g8/public/swagger/lib/jsoneditor.min.js similarity index 100% rename from public/swagger/lib/jsoneditor.min.js rename to src/main/g8/public/swagger/lib/jsoneditor.min.js diff --git a/public/swagger/lib/lodash.min.js b/src/main/g8/public/swagger/lib/lodash.min.js similarity index 100% rename from public/swagger/lib/lodash.min.js rename to src/main/g8/public/swagger/lib/lodash.min.js diff --git a/public/swagger/lib/marked.js b/src/main/g8/public/swagger/lib/marked.js similarity index 100% rename from public/swagger/lib/marked.js rename to src/main/g8/public/swagger/lib/marked.js diff --git a/public/swagger/lib/object-assign-pollyfill.js b/src/main/g8/public/swagger/lib/object-assign-pollyfill.js similarity index 100% rename from public/swagger/lib/object-assign-pollyfill.js rename to src/main/g8/public/swagger/lib/object-assign-pollyfill.js diff --git a/public/swagger/lib/swagger-oauth.js b/src/main/g8/public/swagger/lib/swagger-oauth.js similarity index 100% rename from public/swagger/lib/swagger-oauth.js rename to src/main/g8/public/swagger/lib/swagger-oauth.js diff --git a/public/swagger/o2c.html b/src/main/g8/public/swagger/o2c.html similarity index 100% rename from public/swagger/o2c.html rename to src/main/g8/public/swagger/o2c.html diff --git a/public/swagger/swagger-ui.js b/src/main/g8/public/swagger/swagger-ui.js similarity index 100% rename from public/swagger/swagger-ui.js rename to src/main/g8/public/swagger/swagger-ui.js diff --git a/public/swagger/swagger-ui.min.js b/src/main/g8/public/swagger/swagger-ui.min.js similarity index 100% rename from public/swagger/swagger-ui.min.js rename to src/main/g8/public/swagger/swagger-ui.min.js diff --git a/src/main/g8/src/main/scala/Stub.scala b/src/main/g8/src/main/scala/Stub.scala new file mode 100644 index 0000000..c5cb2f6 --- /dev/null +++ b/src/main/g8/src/main/scala/Stub.scala @@ -0,0 +1,3 @@ +class Stub { + // got any helpful boilerplate for your users? +} diff --git a/tutorial/index.html b/src/main/g8/tutorial/index.html similarity index 100% rename from tutorial/index.html rename to src/main/g8/tutorial/index.html diff --git a/tutorial/validations-01.png b/src/main/g8/tutorial/validations-01.png similarity index 100% rename from tutorial/validations-01.png rename to src/main/g8/tutorial/validations-01.png From 0eccd9eb9aecccebd4e5df1a74ca1705df1a2c68 Mon Sep 17 00:00:00 2001 From: Eike Hartmann Date: Fri, 28 Jul 2017 09:27:30 +0200 Subject: [PATCH 2/4] Move license & tutorial files, adjust readme for license & tutorial --- src/main/g8/LICENSE => LICENSE | 0 README.markdown | 13 ++++--------- .../activator.properties => activator.properties | 0 src/main/g8/default.properties | 4 ++-- {src/main/g8/tutorial => tutorial}/index.html | 0 .../g8/tutorial => tutorial}/validations-01.png | Bin 6 files changed, 6 insertions(+), 11 deletions(-) rename src/main/g8/LICENSE => LICENSE (100%) rename src/main/g8/activator.properties => activator.properties (100%) rename {src/main/g8/tutorial => tutorial}/index.html (100%) rename {src/main/g8/tutorial => tutorial}/validations-01.png (100%) diff --git a/src/main/g8/LICENSE b/LICENSE similarity index 100% rename from src/main/g8/LICENSE rename to LICENSE diff --git a/README.markdown b/README.markdown index 0157809..107a200 100644 --- a/README.markdown +++ b/README.markdown @@ -1,12 +1,7 @@ -A [Giter8][g8] template for ...! +A [Giter8][g8] template for the [api-first-hand][afh] plugin. -Template license ----------------- -Written in by -[other author/contributor lines as appropriate] - -To the extent possible under law, the author(s) have dedicated all copyright and related -and neighboring rights to this template to the public domain worldwide. -This template is distributed without any warranty. See . +To get started, read the [tutorial](tutorial/index.html). [g8]: http://www.foundweekends.org/giter8/ +[afh]: https://github.com/zalando/api-first-hand + diff --git a/src/main/g8/activator.properties b/activator.properties similarity index 100% rename from src/main/g8/activator.properties rename to activator.properties diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index f8194fb..de4e7fb 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -1,2 +1,2 @@ -name=My Something Project -description=Say something about this template. +name=api-first-hand-service +description=Seed for starting a new Play Api-First project diff --git a/src/main/g8/tutorial/index.html b/tutorial/index.html similarity index 100% rename from src/main/g8/tutorial/index.html rename to tutorial/index.html diff --git a/src/main/g8/tutorial/validations-01.png b/tutorial/validations-01.png similarity index 100% rename from src/main/g8/tutorial/validations-01.png rename to tutorial/validations-01.png From d92b32d85054fb02863596587d0fdf0221f3502d Mon Sep 17 00:00:00 2001 From: Eike Hartmann Date: Mon, 31 Jul 2017 21:21:39 +0200 Subject: [PATCH 3/4] Exclude js / html / css etc. from g8 template processing --- src/main/g8/default.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index de4e7fb..e452693 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -1,2 +1,3 @@ name=api-first-hand-service description=Seed for starting a new Play Api-First project +verbatim=*.yaml *.html *.js *.css *.ttf *.png *.gif *.ico example.yaml.scala From 323a58c64bafb5f3c827e161a830bfcb22a856f9 Mon Sep 17 00:00:00 2001 From: Eike Hartmann Date: Mon, 31 Jul 2017 21:23:25 +0200 Subject: [PATCH 4/4] Adjust the generated project's name --- src/main/g8/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index c0fb61a..892334a 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,4 +1,4 @@ -name := "api-first-hand-activator" +name := "$name;format="norm"$" version := "0.1.18"