From 327868b2791fed17fa5120216839ef46aa949889 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 29 Jun 2018 10:52:42 +0200
Subject: [PATCH 1/2] ENTESB-9124 - Change api path of fuse-rest-http-booster
 in readme

---
 README.adoc                                                | 2 +-
 src/main/resources/META-INF/resources/rest-http-index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.adoc b/README.adoc
index 88e307b..64f27c6 100644
--- a/README.adoc
+++ b/README.adoc
@@ -8,7 +8,7 @@ Creating an HTTP endpoint using REST and its underlying principles to define you
 
 This booster introduces the mechanics of interacting with a remote (exposed by <strong>Apache Camel</strong>) service using the HTTP protocol. It allows you to:
 
-* Execute an HTTP GET request on `api/greetings/{name}`` endpoint; using the url parameter `{name}` and producing a response in JSON format with a payload of Hello, $name! with $name replaced by the value of the url parameter used into the request.
+* Execute an HTTP GET request on `camel/greetings/{name}`` endpoint; using the url parameter `{name}` and producing a response in JSON format with a payload of Hello, $name! with $name replaced by the value of the url parameter used into the request.
 * Browse the api's Swagger page.
                 
 == Deployment options
diff --git a/src/main/resources/META-INF/resources/rest-http-index.html b/src/main/resources/META-INF/resources/rest-http-index.html
index 52dbfb6..b37f6a4 100644
--- a/src/main/resources/META-INF/resources/rest-http-index.html
+++ b/src/main/resources/META-INF/resources/rest-http-index.html
@@ -20,7 +20,7 @@
             This booster introduces the mechanics of interacting with a remote (exposed by <strong>Apache Camel</strong>) service using the HTTP protocol. It allows you to:
             <dl>
                 <dt class="lead"><strong>Execute an HTTP GET request on api/greetings/{name} endpoint:</strong></dt>
-                <dd class="lead"><a class="btn btn-info" href="/camel/greetings/Jacopo" target="_blank">api/greetings/{name}</a> this uses the url parameter <code>{name}</code> and produce a response in JSON format with a payload of Hello, $name! with $name replaced by the value of the url parameter used into the request.</dd>
+                <dd class="lead"><a class="btn btn-info" href="/camel/greetings/Jacopo" target="_blank">camel/greetings/{name}</a> this uses the url parameter <code>{name}</code> and produce a response in JSON format with a payload of Hello, $name! with $name replaced by the value of the url parameter used into the request.</dd>
                 <dt class="lead"><strong>Browse the api's Swagger page:</strong></dt>
                 <dd class="lead"><a class="btn btn-info" href="/webjars/swagger-ui/index.html?url=/camel/api-doc&validatorUrl=" target="_blank">Api Swagger page</a> this displays the swagger-ui for the rest api.</dd>
             </dl>

From b8022cbcf866a4d20a9ba8fa8e2c2e53f7c1e3fe Mon Sep 17 00:00:00 2001
From: Andrea Tarocchi <atarocch@redhat.com>
Date: Fri, 29 Jun 2018 15:32:05 +0200
Subject: [PATCH 2/2] Minor fix on template metadata.

---
 .openshiftio/application.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.openshiftio/application.yaml b/.openshiftio/application.yaml
index c1fa499..817f325 100644
--- a/.openshiftio/application.yaml
+++ b/.openshiftio/application.yaml
@@ -51,7 +51,6 @@ objects:
       annotations:
         description: Fabric8 Java S2I images.
         iconClass: icon-jboss
-        supports: 'jboss-fuse:7,java:8,xpaas:1.2'
         tags: 'builder,jboss-fuse,java,xpaas,hidden'
         version: '1.0'
       from: