Make some edits and update macro system

.gitignore

@@ -12,3 +12,4 @@ dependency-reduced-pom.xml
 *.sublime-*
 /scratch
 .gradle
+README.html

README.adoc

@@ -37,23 +37,29 @@ The `name` parameter value overrides the default value of "World" and is reflect
 
 == What you'll need
 
-include::macros/prereq_editor_jdk_buildtools.asc[]
+include::https://raw.github.com/spring-guides/getting-started-macros/master//prereq_editor_jdk_buildtools.adoc[]
 
 
-include::macros/how_to_complete_this_guide.asc[]
+include::https://raw.github.com/spring-guides/getting-started-macros/master//how_to_complete_this_guide.adoc[]
 
 
 [[scratch]]
 == Set up the project
 
-include::macros/build_system_intro.asc[]
+include::https://raw.github.com/spring-guides/getting-started-macros/master//build_system_intro.adoc[]
 
-include::macros/create_directory_structure_hello.asc[]
+include::https://raw.github.com/spring-guides/getting-started-macros/master//create_directory_structure_hello.adoc[]
 
 
-include::macros/create_both_builds.asc[]
+include::https://raw.github.com/spring-guides/getting-started-macros/master//create_both_builds.adoc[]
+`build.gradle`
+// AsciiDoc source formatting doesn't support groovy, so using java instead
+[source,java]
+----
+include::../initial/build.gradle[]
+----
 
-include::macros/bootstrap_starter_pom_disclaimer.asc[]
+include::https://raw.github.com/spring-guides/getting-started-macros/master//bootstrap_starter_pom_disclaimer.adoc[]
 
 
 [[initial]]
@@ -132,12 +138,12 @@ The `@ComponentScan` annotation tells Spring to search recursively through the `
 
 The http://docs.spring.io/spring-boot/docs/{spring_boot_version}/api/org/springframework/boot/autoconfigure/EnableAutoConfiguration.html[`@EnableAutoConfiguration`] annotation switches on reasonable default behaviors based on the content of your classpath. For example, because the application depends on the embeddable version of Tomcat (tomcat-embed-core.jar), a Tomcat server is set up and configured with reasonable defaults on your behalf. And because the application also depends on Spring MVC (spring-webmvc.jar), a Spring MVC http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/servlet/DispatcherServlet.html[`DispatcherServlet`] is configured and registered for you — no `web.xml` necessary! Auto-configuration is a powerful, flexible mechanism. See the http://docs.spring.io/spring-boot/docs/{spring_boot_version}/api/org/springframework/boot/autoconfigure/EnableAutoConfiguration.html[API documentation] for further details.
 
-include::macros/build_an_executable_jar_subhead.asc[]
+include::https://raw.github.com/spring-guides/getting-started-macros/master//build_an_executable_jar_subhead.adoc[]
 
-include::macros/build_an_executable_jar_with_both.asc[]
+include::https://raw.github.com/spring-guides/getting-started-macros/master//build_an_executable_jar_with_both.adoc[]
 
 :module: service
-include::macros/run_the_application_with_both.asc[]
+include::https://raw.github.com/spring-guides/getting-started-macros/master//run_the_application_with_both.adoc[]
 
 Logging output is displayed. The service should be up and running within a few seconds.
 

macros/bootstrap_starter_pom_disclaimer.asc

@@ -1,6 +0,0 @@
-//
-// WARNING: DO NOT EDIT THIS FILE unless you are inside the getting-started-macros repo.
-// For more information see https://github.com/spring-guides/draft-gs-template/wiki/Pull-in-needed-macros
-// to see how this macro is used for writing Getting Started guides.
-//
-NOTE: This guide is using link:/guides/gs/spring-boot[Spring Boot].

macros/build_an_executable_jar_mainhead.asc

@@ -1,6 +0,0 @@
-//
-// WARNING: DO NOT EDIT THIS FILE unless you are inside the getting-started-macros repo.
-// For more information see https://github.com/spring-guides/draft-gs-template/wiki/Pull-in-needed-macros
-// to see how this macro is used for writing Getting Started guides.
-//
-== Build an executable JAR

macros/build_an_executable_jar_subhead.asc

@@ -1,6 +0,0 @@
-//
-// WARNING: DO NOT EDIT THIS FILE unless you are inside the getting-started-macros repo.
-// For more information see https://github.com/spring-guides/draft-gs-template/wiki/Pull-in-needed-macros
-// to see how this macro is used for writing Getting Started guides.
-//
-=== Build an executable JAR

macros/build_an_executable_jar_with_both.asc

@@ -1,60 +0,0 @@
-//
-// WARNING: DO NOT EDIT THIS FILE unless you are inside the getting-started-macros repo.
-// For more information see https://github.com/spring-guides/draft-gs-template/wiki/Pull-in-needed-macros
-// to see how this macro is used for writing Getting Started guides.
-//
-
-:linkattrs:
-
-Now that your `Application` class is ready, you simply instruct the build system to create a single, executable jar containing everything. This makes it easy to ship, version, and deploy the service as an application throughout the development lifecycle, across different environments, and so forth.
-
-Below are the Gradle steps, but if you are using Maven, you can find the updated pom.xml https://github.com/spring-guides/{project_id}/blob/master/complete/pom.xml[right here] and build it by typing `mvn clean package`.
-
-Update your Gradle `build.gradle` file's `buildscript` section, so that it looks like this:
-
-[source,java]
-----
-buildscript {
-    repositories {
-        maven { url "http://repo.spring.io/libs-snapshot" }
-        mavenLocal()
-    }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:0.5.0.M6")
-    }
-}
-----
-
-Further down inside `build.gradle`, add the following to the list of applied plugins:
-
-[source,java]
-apply plugin: 'spring-boot'
-
-You can see the final version of `build.gradle` https://github.com/spring-guides/{project_id}/blob/master/complete/build.gradle[right here].
-
-The https://github.com/spring-projects/spring-boot/tree/master/spring-boot-tools/spring-boot-gradle-plugin[Spring Boot gradle plugin] collects all the jars on the classpath and builds a single "über-jar", which makes it more convenient to execute and transport your service.
-It also searches for the `public static void main()` method to flag as a runnable class.
-
-Now run the following command to produce a single executable JAR file containing all necessary dependency classes and resources:
-
-[subs="attributes", role="has-copy-button"]
-....
-$ ./gradlew build
-....
-
-If you are using Gradle, you can run the JAR by typing:
-
-[subs="attributes", role="has-copy-button"]
-....
-$ java -jar build/libs/{project_id}-0.1.0.jar
-....
-
-If you are using Maven, you can run the JAR by typing:
-
-[subs="attributes", role="has-copy-button"]
-....
-$ java -jar target/{project_id}-0.1.0.jar
-....
-
-NOTE: The procedure above will create a runnable JAR. You can also opt to link:/guides/gs/convert-jar-to-war/[build a classic WAR file] instead.
-

macros/build_system_intro.asc

@@ -1,9 +0,0 @@
-//
-// WARNING: DO NOT EDIT THIS FILE unless you are inside the getting-started-macros repo.
-// For more information see https://github.com/spring-guides/draft-gs-template/wiki/Pull-in-needed-macros
-// to see how this macro is used for writing Getting Started guides.
-//
-
-:linkattrs:
-
-First you set up a basic build script. You can use any build system you like when building apps with Spring, but the code you need to work with http://gradle.org[Gradle] and https://maven.apache.org[Maven] is included here. If you're not familiar with either, refer to link:/guides/gs/gradle[Building Java Projects with Gradle] or link:/guides/gs/maven[Building Java Projects with Maven].

macros/create_both_builds.asc

@@ -1,14 +0,0 @@
-//
-// WARNING: DO NOT EDIT THIS FILE unless you are inside the getting-started-macros repo.
-// For more information see https://github.com/spring-guides/draft-gs-template/wiki/Pull-in-needed-macros
-// to see how this macro is used for writing Getting Started guides.
-//
-=== Create a Gradle build file
-Below is the https://github.com/spring-guides/{project_id}/blob/master/initial/build.gradle[initial Gradle build file]. But you can also use Maven. The pom.xml file is included https://github.com/spring-guides/{project_id}/blob/master/initial/pom.xml[right here]. If you are using link:/guides/gs/sts[Spring Tool Suite (STS)], you can import the guide directly.
-
-`build.gradle`
-// AsciiDoc source formatting doesn't support groovy, so using java instead
-[source,java]
-----
-include::../initial/build.gradle[]
-----

macros/create_directory_structure_hello.asc

@@ -1,13 +0,0 @@
-//
-// WARNING: DO NOT EDIT THIS FILE unless you are inside the getting-started-macros repo.
-// For more information see https://github.com/spring-guides/draft-gs-template/wiki/Pull-in-needed-macros
-// to see how this macro is used for writing Getting Started guides.
-//
-=== Create the directory structure
-
-In a project directory of your choosing, create the following subdirectory structure; for example, with `mkdir -p src/main/java/hello` on *nix systems:
-
-    └── src
-        └── main
-            └── java
-                └── hello

macros/how_to_complete_this_guide.asc

@@ -1,21 +0,0 @@
-//
-// WARNING: DO NOT EDIT THIS FILE unless you are inside the getting-started-macros repo.
-// For more information see https://github.com/spring-guides/draft-gs-template/wiki/Pull-in-needed-macros
-// to see how this macro is used for writing Getting Started guides.
-//
-ifndef::jump_ahead[:jump_ahead: Create a resource representation class]
-
-How to complete this guide
---------------------------
-Like all Spring's link:/guides/gs[Getting Started guides], you can start from scratch and complete each step, or you can bypass basic setup steps that are already familiar to you. Either way, you end up with working code.
-
-To **start from scratch**, move on to xref:scratch[Set up the project].
-
-To **skip the basics**, do the following:
-
- - https://github.com/spring-guides/{project_id}/archive/master.zip[Download] and unzip the source repository for this guide, or clone it using link:/guides/u/Git[Git]:
-+git clone https://github.com/spring-guides/{project_id}.git+
- - cd into +{project_id}/initial+
- - Jump ahead to xref:initial[{jump_ahead}].
-
-**When you're finished**, you can check your results against the code in +{project_id}/complete+.

macros/prereq_editor_jdk_buildtools.asc

@@ -1,15 +0,0 @@
-//
-// WARNING: DO NOT EDIT THIS FILE unless you are inside the getting-started-macros repo.
-// For more information see https://github.com/spring-guides/draft-gs-template/wiki/Pull-in-needed-macros
-// to see how this macro is used for writing Getting Started guides.
-//
-
-:linkattrs:
-
-ifndef::java_version[:java_version: 1.6]
-
- - About 15 minutes
- - A favorite text editor or IDE
- - http://www.oracle.com/technetwork/java/javase/downloads/index.html[JDK {java_version}] or later
- - http://maven.apache.org/download.cgi[Gradle 1.8+] or http://maven.apache.org/download.cgi[Maven 3.0+]
- - You can also import the code from this guide as well as view the web page directly into link:/guides/gs/sts[Spring Tool Suite (STS)] and work your way through it from there.

macros/run_the_application_with_both.asc

@@ -1,16 +0,0 @@
-//
-// WARNING: DO NOT EDIT THIS FILE unless you are inside the getting-started-macros repo.
-// For more information see https://github.com/spring-guides/draft-gs-template/wiki/Pull-in-needed-macros
-// to see how this macro is used for writing Getting Started guides.
-//
-ifndef::module[:module: service]
-
-== Run the {module}
-If you are using Gradle, you can run your {module} at the command line this way:
-
-[subs="attributes", role="has-copy-button"]
-....
-$ ./gradlew clean build && java -jar build/libs/{project_id}-0.1.0.jar
-....
-
-NOTE: If you are using Maven, you can run your {module} by typing +mvn clean package && java -jar target/{project_id}-0.1.0.jar+.

macros/run_the_utility.asc

@@ -1,19 +0,0 @@
-//
-// WARNING: DO NOT EDIT THIS FILE unless you are inside the getting-started-macros repo.
-// For more information see https://github.com/spring-guides/draft-gs-template/wiki/Pull-in-needed-macros
-// to see how this macro is used for writing Getting Started guides.
-//
-
-To run the utility, simply run it from the command line using link:/guides/gs/gradle[Gradle] like this:
-
-[subs="attributes"]
-----
-$ ./gradlew clean build && java -jar build/libs/{project_id}-0.1.0.jar
-----
-
-Or if you are using link:/guides/gs/maven[Maven], run it like this:
-
-[subs="attributes"]
-----
-$ mvn package && java -jar target/{project_id}-0.1.0.jar
-----