Merge pull request OpenShiftDemos#9 from siamaksade/master

siamaksade · web-flow · commit d6c81b2c6192 · 2016-07-25T13:01:25.000+02:00
Clustering enabled
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-tasks-rs: JAX-RS, JPA quickstart
+OpenShift Tasks: JAX-RS, JPA quickstart
 ==============================
 Author: Mike Musgrove  
 Level: Intermediate  
@@ -26,26 +26,26 @@ REST Endpoints on OpenShift
 * Create task
 
   ```
-  curl -i -u 'redhat:redhat1!' -H "Content-Length: 0" -X POST http://tasks-dev.10.1.2.10.xip.io/tasks/task1
+  curl -i -u 'redhat:redhat1!' -H "Content-Length: 0" -X POST http://tasks-dev.10.1.2.10.xip.io/ws/tasks/task1
   ```
 
 * Get a task by id
 
   ```
-  curl -u 'redhat:redhat1!' -H "Accept: application/json" -X GET http://tasks-dev.10.1.2.10.xip.io/tasks/1
+  curl -u 'redhat:redhat1!' -H "Accept: application/json" -X GET http://tasks-dev.10.1.2.10.xip.io/ws/tasks/1
   ```
 
 * Get all user tasks
 
   ```
 
-  curl -u 'redhat:redhat1!' -H "Accept: application/json" -X GET http://tasks-dev.10.1.2.10.xip.io/tasks
+  curl -u 'redhat:redhat1!' -H "Accept: application/json" -X GET http://tasks-dev.10.1.2.10.xip.io/ws/tasks
   ```
 
 * Delete a task by id
 
   ```
-  curl -i -u 'redhat:redhat1!' -X DELETE http://tasks-dev.10.1.2.10.xip.io/tasks/1
+  curl -i -u 'redhat:redhat1!' -X DELETE http://tasks-dev.10.1.2.10.xip.io/ws/tasks/1
   ```
 
 * Generate CPU load. Last parameter is duration of load in seconds
diff --git a/app-template.yaml b/app-template.yaml
@@ -1,85 +1,113 @@
 apiVersion: v1
 kind: Template
+labels:
+  template: openshift-tasks
 metadata:
   name: openshift-tasks
 objects:
 - apiVersion: v1
   kind: ImageStream
   metadata:
+    labels:
+      application: ${APPLICATION_NAME}
+    name: ${APPLICATION_NAME}
+- apiVersion: v1
+  kind: Service
+  metadata:
+    annotations:
+      description: The web server's http port.
+    labels:
+      application: ${APPLICATION_NAME}
+    name: ${APPLICATION_NAME}
+  spec:
+    ports:
+    - port: 8080
+      targetPort: 8080
+    selector:
+      deploymentConfig: ${APPLICATION_NAME}
+- apiVersion: v1
+  id: ${APPLICATION_NAME}-http
+  kind: Route
+  metadata:
+    annotations:
+      description: Route for application's http service.
+    labels:
+      application: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
+  spec:
+    to:
+      name: ${APPLICATION_NAME}
 - apiVersion: v1
   kind: BuildConfig
   metadata:
     labels:
-      app: ${APPLICATION_NAME}
+      application: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
   spec:
     output:
       to:
         kind: ImageStreamTag
         name: ${APPLICATION_NAME}:latest
-    postCommit: {}
-    resources: {}
     source:
       git:
-        ref: ${SOURCE_REFERENCE}
+        ref: ${SOURCE_REF}
         uri: ${SOURCE_URL}
-      secrets: null
       type: Git
     strategy:
       sourceStrategy:
+        forcePull: true
         from:
           kind: ImageStreamTag
           name: jboss-eap64-openshift:1.3
           namespace: openshift
-        incremental: false
       type: Source
     triggers:
-    - generic:
-        secret: ${GENERIC_WEBHOOK_SECRET}
-      type: Generic
     - github:
-        secret: ${GITHUB_WEBHOOK_SECRET}
+        secret: kJZLvfQr3hZg
       type: GitHub
+    - generic:
+        secret: kJZLvfQr3hZg
+      type: Generic
     - imageChange: {}
       type: ImageChange
     - type: ConfigChange
-  status:
-    lastVersion: 0
 - apiVersion: v1
   kind: DeploymentConfig
   metadata:
     labels:
-      app: ${APPLICATION_NAME}
+      application: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
   spec:
     replicas: 1
     selector:
-      deploymentconfig: tasks
+      deploymentConfig: ${APPLICATION_NAME}
     strategy:
-      resources: {}
-      rollingParams:
-        intervalSeconds: 1
-        maxSurge: 25%
-        maxUnavailable: 25%
-        timeoutSeconds: 600
-        updatePeriodSeconds: 1
-      type: Rolling
+      type: Recreate
     template:
       metadata:
         labels:
-          app: ${APPLICATION_NAME}
-          deploymentconfig: ${APPLICATION_NAME}
+          application: ${APPLICATION_NAME}
+          deploymentConfig: ${APPLICATION_NAME}
+        name: ${APPLICATION_NAME}
       spec:
         containers:
-        - name: ${APPLICATION_NAME}
-          env:
+        - env:
           - name: MY_POD_IP
             valueFrom:
               fieldRef:
                 apiVersion: v1
                 fieldPath: status.podIP
-          image: " "
+          - name: OPENSHIFT_KUBE_PING_LABELS
+            value: application=${APPLICATION_NAME}
+          - name: OPENSHIFT_KUBE_PING_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          - name: HORNETQ_CLUSTER_PASSWORD
+            value: kJZLvfQr3hZg
+          - name: JGROUPS_CLUSTER_PASSWORD
+            value: kJZLvfQr3hZg
+          image: ${APPLICATION_NAME}
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3
@@ -91,102 +119,43 @@ objects:
             periodSeconds: 45
             successThreshold: 1
             timeoutSeconds: 1
-          name: tasks
+          name: ${APPLICATION_NAME}
           ports:
-          - containerPort: 8080
+          - containerPort: 8778
+            name: jolokia
             protocol: TCP
-          - containerPort: 8443
+          - containerPort: 8080
+            name: http
             protocol: TCP
-          - containerPort: 8778
+          - containerPort: 8888
+            name: ping
             protocol: TCP
           readinessProbe:
             failureThreshold: 3
             httpGet:
               path: /ws/demo/healthcheck
               port: 8080
               scheme: HTTP
-            initialDelaySeconds: 20
-            periodSeconds: 5
-            successThreshold: 1
-            timeoutSeconds: 1
-          resources: {}
-          terminationMessagePath: /dev/termination-log
-        dnsPolicy: ClusterFirst
-        restartPolicy: Always
-        securityContext: {}
-        terminationGracePeriodSeconds: 30
-    test: false
+        terminationGracePeriodSeconds: 60
     triggers:
     - imageChangeParams:
         automatic: true
         containerNames:
         - ${APPLICATION_NAME}
         from:
-          kind: ImageStreamTag
-          name: ${APPLICATION_NAME}:latest
+          kind: ImageStream
+          name: ${APPLICATION_NAME}
       type: ImageChange
     - type: ConfigChange
-  status: {}
-- apiVersion: v1
-  kind: Service
-  metadata:
-    labels:
-      app: ${APPLICATION_NAME}
-    name: ${APPLICATION_NAME}
-  spec:
-    ports:
-    - name: 8080-tcp
-      port: 8080
-      protocol: TCP
-      targetPort: 8080
-    - name: 8443-tcp
-      port: 8443
-      protocol: TCP
-      targetPort: 8443
-    - name: 8778-tcp
-      port: 8778
-      protocol: TCP
-      targetPort: 8778
-    selector:
-      deploymentconfig: ${APPLICATION_NAME}
-    sessionAffinity: None
-    type: ClusterIP
-  status:
-    loadBalancer: {}
-- apiVersion: v1
-  kind: Route
-  metadata:
-    labels:
-      app: ${APPLICATION_NAME}
-    name: ${APPLICATION_NAME}
-  spec:
-    host: ""
-    port:
-      targetPort: 8080-tcp
-    to:
-      kind: Service
-      name: ${APPLICATION_NAME}
 parameters:
-- description: The name of the application and the prefix for its artifacts
-  displayName: Application Name
+- description: The name for the application.
   name: APPLICATION_NAME
+  required: true
   value: tasks
-- description: The URL of the source code repository
-  displayName: Source URL
+- description: Git source URI for application
   name: SOURCE_URL
+  required: true
   value: https://github.com/openshiftdemos/openshift-tasks
-- description: The branch or tag of the source code to use
-  displayName: Source Reference
-  name: SOURCE_REFERENCE
+- description: Git branch/tag reference
+  name: SOURCE_REF
   value: master
-- description: A secret string used to configure the GitHub webhook.
-  displayName: GitHub Webhook Secret
-  from: '[a-zA-Z0-9]{40}'
-  generate: expression
-  name: GITHUB_WEBHOOK_SECRET
-- description: A secret string used to configure the generic webhook.
-  displayName: Generic Webhook Secret
-  from: '[a-zA-Z0-9]{40}'
-  generate: expression
-  name: GENERIC_WEBHOOK_SECRET
- 
diff --git a/src/main/webapp/WEB-INF/tasks-rs-ds.xml b/src/main/webapp/WEB-INF/tasks-rs-ds.xml
@@ -15,17 +15,17 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<!-- This is an unmanaged datasource. It should be used for proofs of concept 
-   or testing only. It uses H2, a lightweight, in-memory, example database that 
-   ships with JBoss EAP. It is not robust or scalable, is not supported, 
-   and should NOT be used in a production environment! -->  
+<!-- This is an unmanaged datasource. It should be used for proofs of concept
+   or testing only. It uses H2, a lightweight, in-memory, example database that
+   ships with JBoss EAP. It is not robust or scalable, is not supported,
+   and should NOT be used in a production environment! -->
 <datasources xmlns="http://www.jboss.org/ironjacamar/schema"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://www.jboss.org/ironjacamar/schema http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
    <!-- The datasource is bound into JNDI at this location. We reference
       this in META-INF/persistence.xml -->
    <datasource jndi-name="java:jboss/datasources/TasksRsQuickstartDS"
-      pool-name="tasks-rs-xml-quickstart" enabled="true"
+      pool-name="TasksRsQuickstartDS" enabled="true"
       use-java-context="true">
       <connection-url>jdbc:h2:mem:tasks-rs-xml-quickstart;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1</connection-url>
       <driver>h2</driver>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -53,4 +53,6 @@
     <security-role>
       <role-name>guest</role-name>
     </security-role>
+
+    <distributable/>
 </web-app>
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
@@ -131,7 +131,7 @@
           <div class="card-pf">
             <div class="card-pf-heading">
               <h2 class="card-pf-title">
-                Pod Info
+                Info
               </h2>
             </div>
             <div class="card-pf-body">
@@ -145,10 +145,14 @@
                     <td>Pod IP</td>
                     <td><%= System.getenv("MY_POD_IP") %></td>
                   </tr>
-                  <tr role="row" class="even">
+                  <tr role="row" class="odd">
                     <td>Used Memory</td>
                     <% int mb = 1024*1024; %>
-                    <td><%= (Runtime.getRuntime().totalMemory()) / mb %></td>
+                    <td><%= (Runtime.getRuntime().totalMemory()) / mb %> MB</td>
+                  </tr>
+                  <tr role="row" class="even">
+                    <td>Session ID</td>
+                    <td><%= session.getId() %></td>
                   </tr>
                 </table>
               </div>
@@ -185,7 +189,7 @@
       });
       setTimeout(doPoll,5000);
     }
-    
+
     $(function() {
       // matchHeight the contents of each .card-pf and then the .card-pf itself
       $(".row-cards-pf > [class*='col'] > .card-pf .card-pf-title").matchHeight();
@@ -199,7 +203,7 @@
     $(document).ready(function() {
       // start polling
       doPoll();
-            
+
       // info button
       $("#loginfo").click(function(e) {
         e.preventDefault();
@@ -261,7 +265,7 @@
           console.log(arguments);
           $("#messages .message-container p").html("Clicking the button did not work.");
         });
-      }); 
+      });
       // kill button
       $("#kill").click(function(e) {
         e.preventDefault();
