You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2018/11/04 21:24:17 UTC
[juneau] branch master updated: PetStore example updates.
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 e2ad7c7 PetStore example updates.
e2ad7c7 is described below
commit e2ad7c7cc2d6b9a03e91428bccdb919e238f7981
Author: JamesBognar <ja...@apache.org>
AuthorDate: Sun Nov 4 16:23:58 2018 -0500
PetStore example updates.
---
juneau-doc/docs.txt | 2 +-
.../juneau-examples-rest.PetStoreResource.1a.png | Bin 0 -> 1878139 bytes
.../juneau-examples-rest.PetStoreResource.1b.png | Bin 0 -> 2443657 bytes
juneau-doc/src/main/javadoc/overview.html | 113 ++++++++++++++++++---
.../03.PetStoreResource.html | 103 +++++++++++++++++--
.../juneau-examples-rest.PetStoreResource.1a.png | Bin 0 -> 1878139 bytes
.../src/main/resources/overview-template.html | 8 +-
.../rest/petstore/rest/PetStoreResource.java | 13 ++-
.../apache/juneau/examples/rest/htdocs/bird.png | Bin 1925 -> 0 bytes
.../org/apache/juneau/examples/rest/htdocs/cat.png | Bin 1878 -> 0 bytes
.../org/apache/juneau/examples/rest/htdocs/dog.png | Bin 1980 -> 0 bytes
.../apache/juneau/examples/rest/htdocs/fish.png | Bin 2198 -> 0 bytes
.../apache/juneau/examples/rest/htdocs/mouse.png | Bin 1551 -> 0 bytes
.../apache/juneau/examples/rest/htdocs/rabbit.png | Bin 1603 -> 0 bytes
.../apache/juneau/examples/rest/htdocs/snake.png | Bin 1824 -> 0 bytes
.../rest/petstore/rest/htdocs/background.jpg | Bin 0 -> 105889 bytes
launches/juneau-build-all.launch | 2 +-
launches/juneau-build-all.sh | 2 +-
launches/juneau-build-javadoc.launch | 2 +-
launches/juneau-build-javadoc.sh | 2 +-
launches/juneau-build.launch | 2 +-
launches/juneau-build.sh | 2 +-
22 files changed, 211 insertions(+), 40 deletions(-)
diff --git a/juneau-doc/docs.txt b/juneau-doc/docs.txt
index e54f20d..d20aa27 100644
--- a/juneau-doc/docs.txt
+++ b/juneau-doc/docs.txt
@@ -94,7 +94,7 @@ juneau-examples-rest.ConfigResource = #juneau-examples-rest.ConfigResource, Over
juneau-examples-rest.DtoExamples = #juneau-examples-rest.DtoExamples, Overview > juneau-examples-rest > DtoExamples
juneau-examples-rest.HelloWorldResource = #juneau-examples-rest.HelloWorldResource, Overview > juneau-examples-rest > HelloWorldResource
juneau-examples-rest.LogsResource = #juneau-examples-rest.LogsResource, Overview > juneau-examples-rest > LogsResource
-juneau-examples-rest.PetStoreResource = #juneau-examples-rest.PetStoreResource, Overview > juneau-examples-rest > PetStoreResource
+juneau-examples-rest.PetStoreResource = #juneau-examples-rest.PetStoreResource, Overview > juneau-examples-rest > PetStore
juneau-examples-rest.PhotosResource = #juneau-examples-rest.PhotosResource, Overview > juneau-examples-rest > PhotosResource
juneau-examples-rest.RootResources = #juneau-examples-rest.RootResources, Overview > juneau-examples-rest > RootResources
juneau-examples-rest.SqlQueryResource = #juneau-examples-rest.SqlQueryResource, Overview > juneau-examples-rest > SqlQueryResource
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.1a.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.1a.png
new file mode 100644
index 0000000..fc65f06
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.1a.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.1b.png b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.1b.png
new file mode 100644
index 0000000..60592b8
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/juneau-examples-rest.PetStoreResource.1b.png differ
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index 55537c6..df0cb4e 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -43,11 +43,11 @@
</script>
</head>
<body>
-<h1 class='title'>Apache Juneau 7.2.1 Documentation</h1>
-<h1 class='preview-title'>Apache Juneau 7.2.1 Documentation Preview</h1>
+<h1 class='title'>Apache Juneau {@property juneauVersion} Documentation</h1>
+<h1 class='preview-title'>Apache Juneau {@property juneauVersion} Documentation Preview</h1>
<h2 class='preview-section todo'>Documentation in progress</h2>
-<h2 class='preview-section new'>New documentation in 7.2.1</h2>
-<h2 class='preview-section updated'>Updated documentation in 7.2.1</h2>
+<h2 class='preview-section new'>New documentation in {@property juneauVersion}</h2>
+<h2 class='preview-section updated'>Updated documentation in {@property juneauVersion}</h2>
<script type='text/javascript'>
function toggle(x) {
@@ -431,7 +431,7 @@
<ol>
<li><p class='updated'><a class='doclink' href='#juneau-examples-rest.RootResources'>RootResources</a></p>
<li><p class='updated'><a class='doclink' href='#juneau-examples-rest.HelloWorldResource'>HelloWorldResource</a></p>
- <li><p class='todo'><a class='doclink' href='#juneau-examples-rest.PetStoreResource'>PetStoreResource</a></p>
+ <li><p class='todo'><a class='doclink' href='#juneau-examples-rest.PetStoreResource'>PetStore</a></p>
<li><p class='new'><a class='doclink' href='#juneau-examples-rest.DtoExamples'>DtoExamples</a></p>
<li><p class='todo'><a class='doclink' href='#juneau-examples-rest.PhotosResource'>PhotosResource</a></p>
<li><p class='todo'><a class='doclink' href='#juneau-examples-rest.SqlQueryResource'>SqlQueryResource</a></p>
@@ -24412,10 +24412,24 @@
<!-- ==================================================================================================== -->
-<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-examples-rest.PetStoreResource' id='juneau-examples-rest.PetStoreResource'>12.3 - PetStoreResource</a></h3>
+<h3 class='topic todo' onclick='toggle(this)'><a href='#juneau-examples-rest.PetStoreResource' id='juneau-examples-rest.PetStoreResource'>12.3 - PetStore</a></h3>
<div class='topic'><!-- START: 12.3 - juneau-examples-rest.PetStoreResource -->
<p>
- The <code>PetStoreResource</code> class provides examples for creating a Swagger-based interface.
+ The <code>PetStore</code> application is an functional application meant to demonstrate the following:
+</p>
+<ul class='spaced-list'>
+ <li>
+ Creating a Juneau-based REST interface on top of JPA beans.
+ <li>
+ Creating sophisticated Swagger UI using only annotations.
+</ul>
+<p>
+ When you click the <l>petstore</l> link on the home page of the examples app, you should see this page:
+</p>
+<img class='bordered w800' src='doc-files/juneau-examples-rest.PetStoreResource.1b.png'>
+
+<p>
+ The contents of this page is primarily defined via annotations defined on the <l>PetStoreResource</l> class:
</p>
<h5 class='figure'>PetStoreResource.java</h5>
@@ -24454,17 +24468,86 @@
<js>" <p>It also shows examples of HtmlRender classes and <ja>@BeanProperty</ja>(format) annotations.</p>"</js>,
<js>" <p>It also shows how the Queryable converter and query widget can be used to create searchable interfaces.</p>"</js>,
<js>"</div>"</js>
- }
+ },
+ stylesheet=<js>"servlet:/htdocs/themes/dark.css"</js> <jc>// Use dark theme by default.</jc>
),
- properties= {
- <jc>// Resolve recursive references when showing schema info in the swagger.</jc>
- <ja>@Property</ja>(name=<jsf>SWAGGERUI_resolveRefsMaxDepth</jsf>, value=<js>"99"</js>)
- },
- swagger=<ja>@ResourceSwagger</ja>(<js>"$F{PetStoreResource.json}"</js>),
- staticFiles={<js>"htdocs:htdocs"</js>}
+ ...
+ staticFiles={<js>"htdocs:htdocs"</js>}, <jc>// Expose static files in htdocs subpackage.</jc>
+ children={
+ SqlQueryResource.<jk>class</jk>,
+ PhotosResource.<jk>class</jk>
+ }
)
<jk>public class</jk> PetStoreResource <jk>extends</jk> BasicRestServletJena {
-
+</p>
+<p>
+ The inner contents of the page are generated from this method which is used to define a jumping-off
+ page for the application:
+</p>
+<p class='bpcode w800'>
+ <ja>@RestMethod</ja>(
+ name=<jsf>GET</jsf>,
+ path=<js>"/"</js>,
+ summary=<js>"Navigation page"</js>,
+ htmldoc=<ja>@HtmlDoc</ja>(
+ style={
+ <js>"INHERIT"</js>, <jc>// Flag for inheriting resource-level CSS.</jc>
+ <js>"body { "</js>,
+ <js>"background-image: url('petstore/htdocs/background.jpg'); "</js>,
+ <js>"background-color: black; "</js>,
+ <js>"background-size: cover; "</js>,
+ <js>"background-attachment: fixed; "</js>,
+ <js>"}"</js>
+ }
+ )
+ )
+ <jk>public</jk> ResourceDescriptions getTopPage() {
+ <jk>return new</jk> ResourceDescriptions()
+ .append(<js>"pet"</js>, <js>"All pets in the store"</js>)
+ .append(<js>"store"</js>, <js>"Orders and inventory"</js>)
+ .append(<js>"user"</js>, <js>"Petstore users"</js>)
+ .append(<js>"photos"</js>, <js>"Photos service"</js>)
+ .append(<js>"sql"</js>, <js>"SQL query service"</js>)
+ ;
+ }
+</p>
+<p>
+ Note how we used the <ja>@HtmlDoc</ja> annotation to add some CSS to our page
+ that renders our background image.
+</p>
+<p>
+ The {@link org.apache.juneau.rest.helper.ResourceDescriptions} class used above is a convenience class for creating
+ hyperlinks to child resources.
+</p>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<p class='bpcode w800'>
<jk>private</jk> PetStore <jf>store</jf>;
<ja>@RestHook</ja>(<jsf>INIT</jsf>)
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/03.PetStoreResource.html b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/03.PetStoreResource.html
index 5acb381..83e5659 100644
--- a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/03.PetStoreResource.html
+++ b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/03.PetStoreResource.html
@@ -13,10 +13,24 @@
***************************************************************************************************************************/
-->
-{todo} PetStoreResource
+{todo} PetStore
<p>
- The <code>PetStoreResource</code> class provides examples for creating a Swagger-based interface.
+ The <code>PetStore</code> application is an functional application meant to demonstrate the following:
+</p>
+<ul class='spaced-list'>
+ <li>
+ Creating a Juneau-based REST interface on top of JPA beans.
+ <li>
+ Creating sophisticated Swagger UI using only annotations.
+</ul>
+<p>
+ When you click the <l>petstore</l> link on the home page of the examples app, you should see this page:
+</p>
+<img class='bordered w800' src='doc-files/juneau-examples-rest.PetStoreResource.1a.png'>
+
+<p>
+ The contents of this page is primarily defined via annotations defined on the <l>PetStoreResource</l> class:
</p>
<h5 class='figure'>PetStoreResource.java</h5>
@@ -55,17 +69,86 @@
<js>" <p>It also shows examples of HtmlRender classes and <ja>@BeanProperty</ja>(format) annotations.</p>"</js>,
<js>" <p>It also shows how the Queryable converter and query widget can be used to create searchable interfaces.</p>"</js>,
<js>"</div>"</js>
- }
+ },
+ stylesheet=<js>"servlet:/htdocs/themes/dark.css"</js> <jc>// Use dark theme by default.</jc>
),
- properties= {
- <jc>// Resolve recursive references when showing schema info in the swagger.</jc>
- <ja>@Property</ja>(name=<jsf>SWAGGERUI_resolveRefsMaxDepth</jsf>, value=<js>"99"</js>)
- },
- swagger=<ja>@ResourceSwagger</ja>(<js>"$F{PetStoreResource.json}"</js>),
- staticFiles={<js>"htdocs:htdocs"</js>}
+ ...
+ staticFiles={<js>"htdocs:htdocs"</js>}, <jc>// Expose static files in htdocs subpackage.</jc>
+ children={
+ SqlQueryResource.<jk>class</jk>,
+ PhotosResource.<jk>class</jk>
+ }
)
<jk>public class</jk> PetStoreResource <jk>extends</jk> BasicRestServletJena {
-
+</p>
+<p>
+ The inner contents of the page are generated from this method which is used to define a jumping-off
+ page for the application:
+</p>
+<p class='bpcode w800'>
+ <ja>@RestMethod</ja>(
+ name=<jsf>GET</jsf>,
+ path=<js>"/"</js>,
+ summary=<js>"Navigation page"</js>,
+ htmldoc=<ja>@HtmlDoc</ja>(
+ style={
+ <js>"INHERIT"</js>, <jc>// Flag for inheriting resource-level CSS.</jc>
+ <js>"body { "</js>,
+ <js>"background-image: url('petstore/htdocs/background.jpg'); "</js>,
+ <js>"background-color: black; "</js>,
+ <js>"background-size: cover; "</js>,
+ <js>"background-attachment: fixed; "</js>,
+ <js>"}"</js>
+ }
+ )
+ )
+ <jk>public</jk> ResourceDescriptions getTopPage() {
+ <jk>return new</jk> ResourceDescriptions()
+ .append(<js>"pet"</js>, <js>"All pets in the store"</js>)
+ .append(<js>"store"</js>, <js>"Orders and inventory"</js>)
+ .append(<js>"user"</js>, <js>"Petstore users"</js>)
+ .append(<js>"photos"</js>, <js>"Photos service"</js>)
+ .append(<js>"sql"</js>, <js>"SQL query service"</js>)
+ ;
+ }
+</p>
+<p>
+ Note how we used the <ja>@HtmlDoc</ja> annotation to add some CSS to our page
+ that renders our background image.
+</p>
+<p>
+ The {@link oajr.helper.ResourceDescriptions} class used above is a convenience class for creating
+ hyperlinks to child resources.
+</p>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<p class='bpcode w800'>
<jk>private</jk> PetStore <jf>store</jf>;
<ja>@RestHook</ja>(<jsf>INIT</jsf>)
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.1a.png b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.1a.png
new file mode 100644
index 0000000..fc65f06
Binary files /dev/null and b/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.1a.png differ
diff --git a/juneau-doc/src/main/resources/overview-template.html b/juneau-doc/src/main/resources/overview-template.html
index a7e093a..2baf2f7 100644
--- a/juneau-doc/src/main/resources/overview-template.html
+++ b/juneau-doc/src/main/resources/overview-template.html
@@ -43,11 +43,11 @@
</script>
</head>
<body>
-<h1 class='title'>Apache Juneau 7.2.1 Documentation</h1>
-<h1 class='preview-title'>Apache Juneau 7.2.1 Documentation Preview</h1>
+<h1 class='title'>Apache Juneau {@property juneauVersion} Documentation</h1>
+<h1 class='preview-title'>Apache Juneau {@property juneauVersion} Documentation Preview</h1>
<h2 class='preview-section todo'>Documentation in progress</h2>
-<h2 class='preview-section new'>New documentation in 7.2.1</h2>
-<h2 class='preview-section updated'>Updated documentation in 7.2.1</h2>
+<h2 class='preview-section new'>New documentation in {@property juneauVersion}</h2>
+<h2 class='preview-section updated'>Updated documentation in {@property juneauVersion}</h2>
<script type='text/javascript'>
function toggle(x) {
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PetStoreResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PetStoreResource.java
index 4e0233a..606ab02 100644
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PetStoreResource.java
+++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/petstore/rest/PetStoreResource.java
@@ -79,7 +79,7 @@ import org.apache.juneau.rest.converters.*;
" <p>It also shows how the Queryable converter and query widget can be used to create searchable interfaces.</p>",
"</div>"
},
- stylesheet="servlet:/htdocs/themes/dark.css"
+ stylesheet="servlet:/htdocs/themes/dark.css" // Use dark theme by default.
),
properties= {
// Resolve recursive references when showing schema info in the swagger.
@@ -125,7 +125,7 @@ import org.apache.juneau.rest.converters.*;
)
}
),
- staticFiles={"htdocs:htdocs"},
+ staticFiles={"htdocs:htdocs"}, // Expose static files in htdocs subpackage.
children={
SqlQueryResource.class,
PhotosResource.class
@@ -147,8 +147,13 @@ public class PetStoreResource extends BasicRestServletJena implements PetStore {
summary="Navigation page",
htmldoc=@HtmlDoc(
style={
- "INHERIT",
- "body { background-image: url('/petstore/photos/cat'); background-color: black; background-size: cover; background-attachment: fixed; }"
+ "INHERIT", // Flag for inheriting resource-level CSS.
+ "body { ",
+ "background-image: url('petstore/htdocs/background.jpg'); ",
+ "background-color: black; ",
+ "background-size: cover; ",
+ "background-attachment: fixed; ",
+ "}"
}
)
)
diff --git a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/bird.png b/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/bird.png
deleted file mode 100644
index 636ecf8..0000000
Binary files a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/bird.png and /dev/null differ
diff --git a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/cat.png b/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/cat.png
deleted file mode 100644
index 917abc6..0000000
Binary files a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/cat.png and /dev/null differ
diff --git a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/dog.png b/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/dog.png
deleted file mode 100644
index e100eb2..0000000
Binary files a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/dog.png and /dev/null differ
diff --git a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/fish.png b/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/fish.png
deleted file mode 100644
index ca76a46..0000000
Binary files a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/fish.png and /dev/null differ
diff --git a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/mouse.png b/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/mouse.png
deleted file mode 100644
index 5308006..0000000
Binary files a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/mouse.png and /dev/null differ
diff --git a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/rabbit.png b/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/rabbit.png
deleted file mode 100644
index f013470..0000000
Binary files a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/rabbit.png and /dev/null differ
diff --git a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/snake.png b/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/snake.png
deleted file mode 100644
index 7f17660..0000000
Binary files a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/htdocs/snake.png and /dev/null differ
diff --git a/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/petstore/rest/htdocs/background.jpg b/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/petstore/rest/htdocs/background.jpg
new file mode 100644
index 0000000..d75bcf1
Binary files /dev/null and b/juneau-examples/juneau-examples-rest/src/main/resources/org/apache/juneau/examples/rest/petstore/rest/htdocs/background.jpg differ
diff --git a/launches/juneau-build-all.launch b/launches/juneau-build-all.launch
index a3837ff..e2071bc 100644
--- a/launches/juneau-build-all.launch
+++ b/launches/juneau-build-all.launch
@@ -4,6 +4,6 @@
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau-root/juneau-build-all.sh}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau-root/launches/juneau-build-all.sh}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/juneau-root}"/>
</launchConfiguration>
diff --git a/launches/juneau-build-all.sh b/launches/juneau-build-all.sh
index 2f67582..82e64da 100755
--- a/launches/juneau-build-all.sh
+++ b/launches/juneau-build-all.sh
@@ -11,7 +11,7 @@
# * specific language governing permissions and limitations under the License. *
# ***************************************************************************************************************************
-. juneau-env.sh
+. launches/juneau-env.sh
mvn clean install
. juneau-build-javadoc.sh
diff --git a/launches/juneau-build-javadoc.launch b/launches/juneau-build-javadoc.launch
index fd4921f..f838d73 100644
--- a/launches/juneau-build-javadoc.launch
+++ b/launches/juneau-build-javadoc.launch
@@ -4,6 +4,6 @@
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau-root/juneau-build-javadoc.sh}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau-root/launches/juneau-build-javadoc.sh}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/juneau-root}"/>
</launchConfiguration>
diff --git a/launches/juneau-build-javadoc.sh b/launches/juneau-build-javadoc.sh
index 2fb8afd..3241ca2 100755
--- a/launches/juneau-build-javadoc.sh
+++ b/launches/juneau-build-javadoc.sh
@@ -11,7 +11,7 @@
# * specific language governing permissions and limitations under the License. *
# ***************************************************************************************************************************
-. juneau-env.sh
+. launches/juneau-env.sh
cd juneau-doc
java -cp juneau-doc.jar org.apache.juneau.doc.internal.DocGenerator
diff --git a/launches/juneau-build.launch b/launches/juneau-build.launch
index 5b02ce6..dfb2b1e 100644
--- a/launches/juneau-build.launch
+++ b/launches/juneau-build.launch
@@ -18,6 +18,6 @@
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau-root/juneau-build.sh}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/juneau-root/launches/juneau-build.sh}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/juneau-root}"/>
</launchConfiguration>
diff --git a/launches/juneau-build.sh b/launches/juneau-build.sh
index 84793a3..675fcef 100755
--- a/launches/juneau-build.sh
+++ b/launches/juneau-build.sh
@@ -11,7 +11,7 @@
# * specific language governing permissions and limitations under the License. *
# ***************************************************************************************************************************
-. juneau-env.sh
+. launches/juneau-env.sh
mvn clean install
echo '*******************************************************************************'