Merge branch 'master' into redhat

.openshiftio/application.yaml

@@ -35,11 +35,16 @@ parameters:
   description: Maven Nexus Repository to be used during build phase
   displayName:
   required: false
+- name: BUILDER_IMAGE_NAME
+  description: Name of the image to use as a builder image
+  displayName: Builder Image Name
+  value: 'registry.access.redhat.com/fuse7/fuse-java-openshift:1.0'
+  required: true
 objects:
 - apiVersion: v1
   kind: ImageStream
   metadata:
-    name: fis-java-openshift
+    name: fuse-java-openshift
   spec:
     tags:
     - name: "1.0"
@@ -51,17 +56,7 @@ objects:
         version: '1.0'
       from:
         kind: DockerImage
-        name: 'registry.access.redhat.com/jboss-fuse-6/fis-java-openshift:1.0'
+        name: ${BUILDER_IMAGE_NAME}
-    - name: "2.0"
-      annotations:
-        description: JBoss Fuse Integration Services 2.0 Java S2I images.
-        iconClass: icon-jboss
-        supports: 'jboss-fuse:6.3.0,java:8,xpaas:1.2'
-        tags: 'builder,jboss-fuse,java,xpaas'
-        version: '2.0'
-      from:
-        kind: DockerImage
-        name: 'registry.access.redhat.com/jboss-fuse-6/fis-java-openshift:2.0'
 - apiVersion: v1
   kind: ImageStream
   metadata:
@@ -105,7 +100,7 @@ objects:
         forcePull: true
         from:
           kind: ImageStreamTag
-          name: fis-java-openshift:2.0
+          name: fuse-java-openshift:latest
         incremental: true
       type: Source
     triggers:

README.adoc

@@ -7,8 +7,9 @@ The REST API Level 0 mission shows how to map business operations to a remote pr
 Creating an HTTP endpoint using REST and its underlying principles to define your API lets you quickly prototype and design the API flexibly.
 
 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.
+
-. Browse the api's Swagger page.
+* 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.
+* Browse the api's Swagger page.
                 
 == Deployment options
 

src/main/fabric8/deployment.yml

@@ -0,0 +1,16 @@
+spec:
+  template:
+    spec:
+      serviceAccountName: "qs-camel-config"
+      containers:
+        -
+          resources:
+           requests:
+             cpu: "0.2"
+             memory: 256Mi
+           limits:
+             cpu: "1.0"
+             memory: 256Mi
+          env:
+          - name: SPRING_APPLICATION_JSON
+            value: '{"server":{"undertow":{"io-threads":1, "worker-threads":2 }}}'