This is an automated email from the ASF dual-hosted git repository. jamesbognar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push: new f7c351e Javadocs. f7c351e is described below commit f7c351e344d883ab71ad625c915c649eab18b6d6 Author: JamesBognar <jamesbog...@apache.org> AuthorDate: Mon Dec 17 09:02:30 2018 -0500 Javadocs. --- .../13.my-jetty-microservice/01.Installing.html | 12 +-- .../my-jetty-microservice.Installing.1.png | Bin 159036 -> 84524 bytes .../my-jetty-microservice.Installing.2.png | Bin 93366 -> 159036 bytes .../my-jetty-microservice.Installing.3.png} | Bin .../01.Installing.html | 12 +-- .../my-springboot-microservice.Installing.1.png | Bin 162034 -> 84524 bytes .../my-springboot-microservice.Installing.2.png | Bin 97545 -> 162034 bytes .../my-springboot-microservice.Installing.3.png} | Bin .../15.juneau-examples-core/01.Installing.html | 33 ++++----- .../doc-files/juneau-examples-core.3.png | Bin 133875 -> 0 bytes .../juneau-examples-core.Installing.1.png} | Bin .../juneau-examples-core.Installing.2.png} | Bin .../juneau-examples-core.Installing.3.png | Bin 0 -> 79555 bytes .../01.Installing.html | 12 +-- .../juneau-examples-rest-jetty.Installing.1.png | Bin 160013 -> 84524 bytes .../juneau-examples-rest-jetty.Installing.2.png | Bin 158863 -> 160013 bytes .../juneau-examples-rest-jetty.Installing.3.png} | Bin .../01.Installing.html | 12 +-- ...uneau-examples-rest-springboot.Installing.1.png | Bin 162296 -> 84524 bytes ...uneau-examples-rest-springboot.Installing.2.png | Bin 173827 -> 162296 bytes ...neau-examples-rest-springboot.Installing.3.png} | Bin .../javadoc/doc-files/juneau-examples-core.3.png | Bin 133875 -> 0 bytes .../juneau-examples-core.Installing.1.png} | Bin .../juneau-examples-core.Installing.2.png} | Bin .../juneau-examples-core.Installing.3.png | Bin 0 -> 79555 bytes .../juneau-examples-rest-jetty.Installing.1.png | Bin 160013 -> 84524 bytes .../juneau-examples-rest-jetty.Installing.2.png | Bin 158863 -> 160013 bytes ...=> juneau-examples-rest-jetty.Installing.3.png} | Bin ...uneau-examples-rest-springboot.Installing.1.png | Bin 162296 -> 84524 bytes ...uneau-examples-rest-springboot.Installing.2.png | Bin 173827 -> 162296 bytes ...neau-examples-rest-springboot.Installing.3.png} | Bin .../my-jetty-microservice.Installing.1.png | Bin 159036 -> 84524 bytes .../my-jetty-microservice.Installing.2.png | Bin 93366 -> 159036 bytes ....png => my-jetty-microservice.Installing.3.png} | Bin .../my-springboot-microservice.Installing.1.png | Bin 162034 -> 84524 bytes .../my-springboot-microservice.Installing.2.png | Bin 97545 -> 162034 bytes ...=> my-springboot-microservice.Installing.3.png} | Bin juneau-doc/src/main/javadoc/overview.html | 81 +++++++++++---------- juneau-examples/juneau-examples-core/.classpath | 11 --- .../.settings/org.eclipse.core.resources.prefs | 2 - .../juneau-examples-core/build-overlay/.classpath | 15 +--- .../src/main/resources/empty.txt | 12 --- .../juneau-examples-core/src/test/java/empty.txt | 12 --- 43 files changed, 88 insertions(+), 126 deletions(-) diff --git a/juneau-doc/docs/Topics/13.my-jetty-microservice/01.Installing.html b/juneau-doc/docs/Topics/13.my-jetty-microservice/01.Installing.html index 36aba83..7f930ac 100644 --- a/juneau-doc/docs/Topics/13.my-jetty-microservice/01.Installing.html +++ b/juneau-doc/docs/Topics/13.my-jetty-microservice/01.Installing.html @@ -20,16 +20,18 @@ </p> <ol class='spaced-list'> <li> - Download the latest <l>my-jetty-microservice.zip</l> file. + Download the <code>my-jetty-microservice-{@property juneauVersion}.zip</code> file from the downloads page + (located in the binaries) and import it into your workspace as an existing project: + <br><br> + <img class='bordered' src='doc-files/my-jetty-microservice.Installing.1.png' style='width:524px'> <li> - In your Eclipse workspace, go to <b>File -> Import -> General -> Existing Projects into Workspace</b> - and select the zip file and click <b>Finish</b>. + Select the archive file and import the project: <br><br> - <img class='bordered' src='doc-files/my-jetty-microservice.Installing.1.png' style='width:549px'> + <img class='bordered' src='doc-files/my-jetty-microservice.Installing.2.png' style='width:549px'> <li> In your workspace, you should now see the following project: <br><br> - <img class='bordered' src='doc-files/my-jetty-microservice.Installing.2.png' style='width:400px'> + <img class='bordered' src='doc-files/my-jetty-microservice.Installing.3.png' style='width:400px'> </ol> <p> The important elements in this project are: diff --git a/juneau-doc/docs/Topics/13.my-jetty-microservice/doc-files/my-jetty-microservice.Installing.1.png b/juneau-doc/docs/Topics/13.my-jetty-microservice/doc-files/my-jetty-microservice.Installing.1.png index 3062126..3b9b4e1 100644 Binary files a/juneau-doc/docs/Topics/13.my-jetty-microservice/doc-files/my-jetty-microservice.Installing.1.png and b/juneau-doc/docs/Topics/13.my-jetty-microservice/doc-files/my-jetty-microservice.Installing.1.png differ diff --git a/juneau-doc/docs/Topics/13.my-jetty-microservice/doc-files/my-jetty-microservice.Installing.2.png b/juneau-doc/docs/Topics/13.my-jetty-microservice/doc-files/my-jetty-microservice.Installing.2.png index 367b24d..3062126 100644 Binary files a/juneau-doc/docs/Topics/13.my-jetty-microservice/doc-files/my-jetty-microservice.Installing.2.png and b/juneau-doc/docs/Topics/13.my-jetty-microservice/doc-files/my-jetty-microservice.Installing.2.png differ diff --git a/juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.2.png b/juneau-doc/docs/Topics/13.my-jetty-microservice/doc-files/my-jetty-microservice.Installing.3.png similarity index 100% copy from juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.2.png copy to juneau-doc/docs/Topics/13.my-jetty-microservice/doc-files/my-jetty-microservice.Installing.3.png diff --git a/juneau-doc/docs/Topics/14.my-springboot-microservice/01.Installing.html b/juneau-doc/docs/Topics/14.my-springboot-microservice/01.Installing.html index 1e8e2bf..bb841c6 100644 --- a/juneau-doc/docs/Topics/14.my-springboot-microservice/01.Installing.html +++ b/juneau-doc/docs/Topics/14.my-springboot-microservice/01.Installing.html @@ -20,16 +20,18 @@ </p> <ol class='spaced-list'> <li> - Download the latest <l>my-springboot-microservice.zip</l> file. + Download the <code>my-springboot-microservice-{@property juneauVersion}.zip</code> file from the downloads page + (located in the binaries) and import it into your workspace as an existing project: + <br><br> + <img class='bordered' src='doc-files/my-springboot-microservice.Installing.1.png' style='width:524px'> <li> - In your Eclipse workspace, go to <b>File -> Import -> General -> Existing Projects into Workspace</b> - and select the zip file and click <b>Finish</b>. + Select the archive file and import the project: <br><br> - <img class='bordered' src='doc-files/my-springboot-microservice.Installing.1.png' style='width:549px'> + <img class='bordered' src='doc-files/my-springboot-microservice.Installing.2.png' style='width:549px'> <li> In your workspace, you should now see the following project: <br><br> - <img class='bordered' src='doc-files/my-springboot-microservice.Installing.2.png' style='width:400px'> + <img class='bordered' src='doc-files/my-springboot-microservice.Installing.3.png' style='width:400px'> </ol> <p> The important elements in this project are: diff --git a/juneau-doc/docs/Topics/14.my-springboot-microservice/doc-files/my-springboot-microservice.Installing.1.png b/juneau-doc/docs/Topics/14.my-springboot-microservice/doc-files/my-springboot-microservice.Installing.1.png index 9611f85..3b9b4e1 100644 Binary files a/juneau-doc/docs/Topics/14.my-springboot-microservice/doc-files/my-springboot-microservice.Installing.1.png and b/juneau-doc/docs/Topics/14.my-springboot-microservice/doc-files/my-springboot-microservice.Installing.1.png differ diff --git a/juneau-doc/docs/Topics/14.my-springboot-microservice/doc-files/my-springboot-microservice.Installing.2.png b/juneau-doc/docs/Topics/14.my-springboot-microservice/doc-files/my-springboot-microservice.Installing.2.png index cef51e9..9611f85 100644 Binary files a/juneau-doc/docs/Topics/14.my-springboot-microservice/doc-files/my-springboot-microservice.Installing.2.png and b/juneau-doc/docs/Topics/14.my-springboot-microservice/doc-files/my-springboot-microservice.Installing.2.png differ diff --git a/juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.2.png b/juneau-doc/docs/Topics/14.my-springboot-microservice/doc-files/my-springboot-microservice.Installing.3.png similarity index 100% copy from juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.2.png copy to juneau-doc/docs/Topics/14.my-springboot-microservice/doc-files/my-springboot-microservice.Installing.3.png diff --git a/juneau-doc/docs/Topics/15.juneau-examples-core/01.Installing.html b/juneau-doc/docs/Topics/15.juneau-examples-core/01.Installing.html index 85efcd8..e4dd1f8 100644 --- a/juneau-doc/docs/Topics/15.juneau-examples-core/01.Installing.html +++ b/juneau-doc/docs/Topics/15.juneau-examples-core/01.Installing.html @@ -18,21 +18,18 @@ <p> Follow these instructions to import the Juneau project into Eclipse. </p> -<p> - Download the <code>juneau-examples-core-{@property juneauVersion}.zip</code> file from the downloads page - (located in the binaries) and import it into your workspace as an existing project: -</p> -<img class='bordered' src='doc-files/juneau-examples-core.1.png' style='width:512px'> -<p> - Select the archive file and import the project: -</p> -<img class='bordered' src='doc-files/juneau-examples-core.2.png' style='width:523px'> -<p> - Once loaded, you should see the following project structure: -</p> -<img class='bordered' src='doc-files/juneau-examples-core.3.png' style='width:459px'> - -<p> - The Core library samples are currently a work-in-progress so there's not much here yet. - This section will be updated as new code is added. -</p> +<ol class='spaced-list'> + <li> + Download the <code>juneau-examples-core-{@property juneauVersion}.zip</code> file from the downloads page + (located in the binaries) and import it into your workspace as an existing project: + <br><br> + <img class='bordered' src='doc-files/juneau-examples-core.Installing.1.png' style='width:524px'> + <li> + Select the archive file and import the project: + <br><br> + <img class='bordered' src='doc-files/juneau-examples-core.Installing.2.png' style='width:549px'> + <li> + In your workspace, you should now see the following project: + <br><br> + <img class='bordered' src='doc-files/juneau-examples-core.Installing.3.png' style='width:400px'> +</ol> diff --git a/juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.3.png b/juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.3.png deleted file mode 100644 index 6c8521c..0000000 Binary files a/juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.3.png and /dev/null differ diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.1.png b/juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.Installing.1.png similarity index 100% rename from juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.1.png rename to juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.Installing.1.png diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.2.png b/juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.Installing.2.png similarity index 100% rename from juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.2.png rename to juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.Installing.2.png diff --git a/juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.Installing.3.png b/juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.Installing.3.png new file mode 100644 index 0000000..0e572bb Binary files /dev/null and b/juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.Installing.3.png differ diff --git a/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/01.Installing.html b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/01.Installing.html index 40669c9..96b1da7 100644 --- a/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/01.Installing.html +++ b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/01.Installing.html @@ -20,16 +20,18 @@ </p> <ol class='spaced-list'> <li> - Download the latest <l>juneau-examples-rest-jetty.zip</l> file. + Download the <code>juneau-examples-rest-jetty-{@property juneauVersion}.zip</code> file from the downloads page + (located in the binaries) and import it into your workspace as an existing project: + <br><br> + <img class='bordered' src='doc-files/juneau-examples-rest-jetty.Installing.1.png' style='width:524px'> <li> - In your Eclipse workspace, go to <b>File -> Import -> General -> Existing Projects into Workspace</b> - and select the zip file and click <b>Finish</b>. + Select the archive file and import the project: <br><br> - <img class='bordered' src='doc-files/juneau-examples-rest-jetty.Installing.1.png' style='width:549px'> + <img class='bordered' src='doc-files/juneau-examples-rest-jetty.Installing.2.png' style='width:549px'> <li> In your workspace, you should now see the following project: <br><br> - <img class='bordered' src='doc-files/juneau-examples-rest-jetty.Installing.2.png' style='width:400px'> + <img class='bordered' src='doc-files/juneau-examples-rest-jetty.Installing.3.png' style='width:400px'> </ol> <p> The important elements in this project are: diff --git a/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-jetty.Installing.1.png b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-jetty.Installing.1.png index 38ffe39..3b9b4e1 100644 Binary files a/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-jetty.Installing.1.png and b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-jetty.Installing.1.png differ diff --git a/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-jetty.Installing.2.png b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-jetty.Installing.2.png index d01d24f..38ffe39 100644 Binary files a/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-jetty.Installing.2.png and b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-jetty.Installing.2.png differ diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.2.png b/juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-jetty.Installing.3.png similarity index 100% copy from juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.2.png copy to juneau-doc/docs/Topics/17.juneau-examples-rest-jetty/doc-files/juneau-examples-rest-jetty.Installing.3.png diff --git a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Installing.html b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Installing.html index 95c4c02..3964c43 100644 --- a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Installing.html +++ b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/01.Installing.html @@ -20,16 +20,18 @@ </p> <ol class='spaced-list'> <li> - Download the latest <l>juneau-examples-rest-springboot.zip</l> file. + Download the <code>juneau-examples-rest-springboot-{@property juneauVersion}.zip</code> file from the downloads page + (located in the binaries) and import it into your workspace as an existing project: + <br><br> + <img class='bordered' src='doc-files/juneau-examples-rest-springboot.Installing.1.png' style='width:524px'> <li> - In your Eclipse workspace, go to <b>File -> Import -> General -> Existing Projects into Workspace</b> - and select the zip file and click <b>Finish</b>. + Select the archive file and import the project: <br><br> - <img class='bordered' src='doc-files/juneau-examples-rest-springboot.Installing.1.png' style='width:549px'> + <img class='bordered' src='doc-files/juneau-examples-rest-springboot.Installing.2.png' style='width:549px'> <li> In your workspace, you should now see the following project: <br><br> - <img class='bordered' src='doc-files/juneau-examples-rest-springboot.Installing.2.png' style='width:400px'> + <img class='bordered' src='doc-files/juneau-examples-rest-springboot.Installing.3.png' style='width:400px'> </ol> <p> The important elements in this project are: diff --git a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Installing.1.png b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Installing.1.png index 045030b..3b9b4e1 100644 Binary files a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Installing.1.png and b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Installing.1.png differ diff --git a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Installing.2.png b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Installing.2.png index 0563e0b..045030b 100644 Binary files a/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Installing.2.png and b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Installing.2.png differ diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.2.png b/juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Installing.3.png similarity index 100% copy from juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.2.png copy to juneau-doc/docs/Topics/18.juneau-examples-rest-springboot/doc-files/juneau-examples-rest-springboot.Installing.3.png diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.3.png deleted file mode 100644 index 6c8521c..0000000 Binary files a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.3.png and /dev/null differ diff --git a/juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.Installing.1.png similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.1.png rename to juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.Installing.1.png diff --git a/juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.Installing.2.png similarity index 100% rename from juneau-doc/docs/Topics/15.juneau-examples-core/doc-files/juneau-examples-core.2.png rename to juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.Installing.2.png diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.Installing.3.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.Installing.3.png new file mode 100644 index 0000000..0e572bb Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-core.Installing.3.png differ diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.1.png index 38ffe39..3b9b4e1 100644 Binary files a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.1.png and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.1.png differ diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.2.png index d01d24f..38ffe39 100644 Binary files a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.2.png and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.2.png differ diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.3.png similarity index 100% copy from juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.2.png copy to juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-jetty.Installing.3.png diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.1.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.1.png index 045030b..3b9b4e1 100644 Binary files a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.1.png and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.1.png differ diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.2.png index 0563e0b..045030b 100644 Binary files a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.2.png and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.2.png differ diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.2.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.3.png similarity index 100% copy from juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.2.png copy to juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest-springboot.Installing.3.png diff --git a/juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.1.png b/juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.1.png index 3062126..3b9b4e1 100644 Binary files a/juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.1.png and b/juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.1.png differ diff --git a/juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.2.png b/juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.2.png index 367b24d..3062126 100644 Binary files a/juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.2.png and b/juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.2.png differ diff --git a/juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.2.png b/juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.3.png similarity index 100% copy from juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.2.png copy to juneau-doc/src/main/javadoc/doc-files/my-jetty-microservice.Installing.3.png diff --git a/juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.1.png b/juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.1.png index 9611f85..3b9b4e1 100644 Binary files a/juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.1.png and b/juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.1.png differ diff --git a/juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.2.png b/juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.2.png index cef51e9..9611f85 100644 Binary files a/juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.2.png and b/juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.2.png differ diff --git a/juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.2.png b/juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.3.png similarity index 100% copy from juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.2.png copy to juneau-doc/src/main/javadoc/doc-files/my-springboot-microservice.Installing.3.png diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html index 27bc9d5..8e7fc73 100644 --- a/juneau-doc/src/main/javadoc/overview.html +++ b/juneau-doc/src/main/javadoc/overview.html @@ -25131,16 +25131,18 @@ </p> <ol class='spaced-list'> <li> - Download the latest <l>my-jetty-microservice.zip</l> file. + Download the <code>my-jetty-microservice-{@property juneauVersion}.zip</code> file from the downloads page + (located in the binaries) and import it into your workspace as an existing project: + <br><br> + <img class='bordered' src='doc-files/my-jetty-microservice.Installing.1.png' style='width:524px'> <li> - In your Eclipse workspace, go to <b>File -> Import -> General -> Existing Projects into Workspace</b> - and select the zip file and click <b>Finish</b>. + Select the archive file and import the project: <br><br> - <img class='bordered' src='doc-files/my-jetty-microservice.Installing.1.png' style='width:549px'> + <img class='bordered' src='doc-files/my-jetty-microservice.Installing.2.png' style='width:549px'> <li> In your workspace, you should now see the following project: <br><br> - <img class='bordered' src='doc-files/my-jetty-microservice.Installing.2.png' style='width:400px'> + <img class='bordered' src='doc-files/my-jetty-microservice.Installing.3.png' style='width:400px'> </ol> <p> The important elements in this project are: @@ -25491,16 +25493,18 @@ </p> <ol class='spaced-list'> <li> - Download the latest <l>my-springboot-microservice.zip</l> file. + Download the <code>my-springboot-microservice-{@property juneauVersion}.zip</code> file from the downloads page + (located in the binaries) and import it into your workspace as an existing project: + <br><br> + <img class='bordered' src='doc-files/my-springboot-microservice.Installing.1.png' style='width:524px'> <li> - In your Eclipse workspace, go to <b>File -> Import -> General -> Existing Projects into Workspace</b> - and select the zip file and click <b>Finish</b>. + Select the archive file and import the project: <br><br> - <img class='bordered' src='doc-files/my-springboot-microservice.Installing.1.png' style='width:549px'> + <img class='bordered' src='doc-files/my-springboot-microservice.Installing.2.png' style='width:549px'> <li> In your workspace, you should now see the following project: <br><br> - <img class='bordered' src='doc-files/my-springboot-microservice.Installing.2.png' style='width:400px'> + <img class='bordered' src='doc-files/my-springboot-microservice.Installing.3.png' style='width:400px'> </ol> <p> The important elements in this project are: @@ -25713,24 +25717,21 @@ <p> Follow these instructions to import the Juneau project into Eclipse. </p> -<p> - Download the <code>juneau-examples-core-{@property juneauVersion}.zip</code> file from the downloads page - (located in the binaries) and import it into your workspace as an existing project: -</p> -<img class='bordered' src='doc-files/juneau-examples-core.1.png' style='width:512px'> -<p> - Select the archive file and import the project: -</p> -<img class='bordered' src='doc-files/juneau-examples-core.2.png' style='width:523px'> -<p> - Once loaded, you should see the following project structure: -</p> -<img class='bordered' src='doc-files/juneau-examples-core.3.png' style='width:459px'> - -<p> - The Core library samples are currently a work-in-progress so there's not much here yet. - This section will be updated as new code is added. -</p> +<ol class='spaced-list'> + <li> + Download the <code>juneau-examples-core-{@property juneauVersion}.zip</code> file from the downloads page + (located in the binaries) and import it into your workspace as an existing project: + <br><br> + <img class='bordered' src='doc-files/juneau-examples-core.Installing.1.png' style='width:524px'> + <li> + Select the archive file and import the project: + <br><br> + <img class='bordered' src='doc-files/juneau-examples-core.Installing.2.png' style='width:549px'> + <li> + In your workspace, you should now see the following project: + <br><br> + <img class='bordered' src='doc-files/juneau-examples-core.Installing.3.png' style='width:400px'> +</ol> </div><!-- END: 15.1 - juneau-examples-core.Installing --> <!-- ==================================================================================================== --> @@ -27805,16 +27806,18 @@ </p> <ol class='spaced-list'> <li> - Download the latest <l>juneau-examples-rest-jetty.zip</l> file. + Download the <code>juneau-examples-rest-jetty-{@property juneauVersion}.zip</code> file from the downloads page + (located in the binaries) and import it into your workspace as an existing project: + <br><br> + <img class='bordered' src='doc-files/juneau-examples-rest-jetty.Installing.1.png' style='width:524px'> <li> - In your Eclipse workspace, go to <b>File -> Import -> General -> Existing Projects into Workspace</b> - and select the zip file and click <b>Finish</b>. + Select the archive file and import the project: <br><br> - <img class='bordered' src='doc-files/juneau-examples-rest-jetty.Installing.1.png' style='width:549px'> + <img class='bordered' src='doc-files/juneau-examples-rest-jetty.Installing.2.png' style='width:549px'> <li> In your workspace, you should now see the following project: <br><br> - <img class='bordered' src='doc-files/juneau-examples-rest-jetty.Installing.2.png' style='width:400px'> + <img class='bordered' src='doc-files/juneau-examples-rest-jetty.Installing.3.png' style='width:400px'> </ol> <p> The important elements in this project are: @@ -28190,16 +28193,18 @@ </p> <ol class='spaced-list'> <li> - Download the latest <l>juneau-examples-rest-springboot.zip</l> file. + Download the <code>juneau-examples-rest-springboot-{@property juneauVersion}.zip</code> file from the downloads page + (located in the binaries) and import it into your workspace as an existing project: + <br><br> + <img class='bordered' src='doc-files/juneau-examples-rest-springboot.Installing.1.png' style='width:524px'> <li> - In your Eclipse workspace, go to <b>File -> Import -> General -> Existing Projects into Workspace</b> - and select the zip file and click <b>Finish</b>. + Select the archive file and import the project: <br><br> - <img class='bordered' src='doc-files/juneau-examples-rest-springboot.Installing.1.png' style='width:549px'> + <img class='bordered' src='doc-files/juneau-examples-rest-springboot.Installing.2.png' style='width:549px'> <li> In your workspace, you should now see the following project: <br><br> - <img class='bordered' src='doc-files/juneau-examples-rest-springboot.Installing.2.png' style='width:400px'> + <img class='bordered' src='doc-files/juneau-examples-rest-springboot.Installing.3.png' style='width:400px'> </ol> <p> The important elements in this project are: diff --git a/juneau-examples/juneau-examples-core/.classpath b/juneau-examples/juneau-examples-core/.classpath index b91347d..f183d77 100644 --- a/juneau-examples/juneau-examples-core/.classpath +++ b/juneau-examples/juneau-examples-core/.classpath @@ -6,18 +6,7 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> <classpathentry kind="src" path="src/assembly"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> diff --git a/juneau-examples/juneau-examples-core/.settings/org.eclipse.core.resources.prefs b/juneau-examples/juneau-examples-core/.settings/org.eclipse.core.resources.prefs index 839d647..e9441bb 100644 --- a/juneau-examples/juneau-examples-core/.settings/org.eclipse.core.resources.prefs +++ b/juneau-examples/juneau-examples-core/.settings/org.eclipse.core.resources.prefs @@ -1,5 +1,3 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 encoding/<project>=UTF-8 diff --git a/juneau-examples/juneau-examples-core/build-overlay/.classpath b/juneau-examples/juneau-examples-core/build-overlay/.classpath index 644b8f9..3ad59e4 100644 --- a/juneau-examples/juneau-examples-core/build-overlay/.classpath +++ b/juneau-examples/juneau-examples-core/build-overlay/.classpath @@ -1,28 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> - <attributes> - <attribute name="optional" value="true"/> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> <classpathentry kind="src" output="target/classes" path="src/main/java"> <attributes> <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> diff --git a/juneau-examples/juneau-examples-core/src/main/resources/empty.txt b/juneau-examples/juneau-examples-core/src/main/resources/empty.txt deleted file mode 100644 index 69ece92..0000000 --- a/juneau-examples/juneau-examples-core/src/main/resources/empty.txt +++ /dev/null @@ -1,12 +0,0 @@ - *************************************************************************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations under the License. * - *************************************************************************************************************************** diff --git a/juneau-examples/juneau-examples-core/src/test/java/empty.txt b/juneau-examples/juneau-examples-core/src/test/java/empty.txt deleted file mode 100644 index 69ece92..0000000 --- a/juneau-examples/juneau-examples-core/src/test/java/empty.txt +++ /dev/null @@ -1,12 +0,0 @@ - *************************************************************************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations under the License. * - ***************************************************************************************************************************