Merge pull request #18 from OpenLiberty/qa

Merge qa to master: fix the travis test

Author: gkwan-ibm

Diff for: .travis.yml

@@ -1,34 +1,22 @@
 language: java
 before_script:
-  - unset _JAVA_OPTIONS # Prevents issues such as formatting the test outputs
-  - cd finish
-  - chmod +x ../scripts/travisTest.sh
-script:
-  - ../scripts/travisTest.sh
-  - serverName=$(target/liberty/wlp/bin/server list | cut -d '.' -f2| tr -d '\n');
-  - build=$(grep "Open Liberty" target/liberty/wlp/usr/servers/"$serverName"/logs/console.log
-    | cut -d' ' -f5 | cut -d')' -f1 ); release=$( echo "$build" | cut -d'/' -f1); number=$(
-    echo "$build" | cut -d'/' -f2); ol_jv=$(grep -i "version" target/liberty/wlp/usr/servers/"$serverName"/logs/console.log);
-    jv=$(printf '%s\n' "${ol_jv//$' on '/$'\n'}" | sed '2q;d'); echo -e "\n"; echo -e  "\033[1;34mOpen
-    Liberty release:\033[0m \033[1;36m$release\033[0m"; echo -e "\033[1;34mOpen Liberty
-    build number:\033[0m \033[1;36m$number\033[0m"; echo -e "\033[1;34mJava version:\033[0m
-    \033[1;36m$jv\033[0m";
-  - cd target/liberty/wlp/usr/servers/"$serverName"/logs/; repo_name=$(echo "$TRAVIS_REPO_SLUG"
-    | sed -e "s/\//-/g"); if [ "$TRAVIS_TEST_RESULT" -eq 0 ]; then result="passed";
-    else result="failed"; fi; serverlogsarchive="$repo_name-$TRAVIS_BUILD_NUMBER-$result.zip";zip
-    -r "$serverlogsarchive" .; curl -H "$JFROG_TOKEN" -T "$serverlogsarchive" "https://na.artifactory.swg-devops.com/artifactory/hyc-openliberty-guides-files-generic-local/";
+- unset _JAVA_OPTIONS
+- cd finish
+- chmod +x ../scripts/travisTest.sh
+script: ../scripts/travisTest.sh
 notifications:
-  slack: 
+  slack:
     template:
-        - "Build: <%{build_url}| %{build_number}> | Commit (<%{compare_url}|%{commit}>): %{commit_message}"
-        - "Repo@Branch: %{repository_slug}@%{branch}"
-        - "Author: %{author}" 
-        - "Summary: %{result} in %{duration}"
+    - 'Build: <%{build_url}| %{build_number}> | Commit (<%{compare_url}|%{commit}>):
+      %{commit_message}'
+    - 'Repo@Branch: %{repository_slug}@%{branch}'
+    - 'Author: %{author}'
+    - 'Summary: %{result} in %{duration}'
     rooms:
-      - #travis encrypt "TOKEN" --add notifications.slack.rooms
+      secure: cVlTnHxyBuaqBaiQfqsyJrSuIYHMA/3Dpdh/0jbL5bITo0MmB6wVcJUTIA/8Nnzgi+cI83n13fGhGBrgefbhRCE+tZAdBPeqYxFbZkVg4JJ909dG8BBwS3N3gFtAGhh7gcZwN5fdc+2cGP4kF18uaViWIitGdmHe5p5XnZBuV0JBL1aXRfZOGbxerpBBEuWjIF7O2b69EWkKTb3nyZlctrSgmZeJWG0xZw7Fahbr7en9hpaemEatCsoiNAIN82CH26kiC3lOVzfGq+WZNabMtnd+ZP3AHnKapmoNB32rMLs3v8A5Nx+IPdwBbM1X0o5kjLgXrGwZhwfRkJ+MxPG8qvbCQNFtsXXhOE/PAFZ4nTn3oyWHRQbKJtYS6gzKGmMTF9BqDpoHsUm0isD/km23ainTc2eQOMgqdGMdzKVFO+4ze6BKhIHWO1VeZBTYkuTDN8S5J7BfMOYC4XhpQHaPvkES56zY2N0fek/AdL/aP5kaa0FwfxC3X/QRNQPe0XMd9MNZNCcOAPn1ieRLq25Lq+osm8we531QjUEU/i6PtPt8wyUzvtHW+oY9ckS67F2kBQ4gLzOckm2ekbnX9SHpd/Ze0BYIaSvFVQrVgKZFM3RvWTD6opGxv3FyRF08bqYT1tcEUPNibUqQ0Cs1ldgPkbcjuIjtArWPcPGzA6AmRtY=
     on_success: never
     on_failure: always
 branches:
-  only: 
+  only:
   - master
-  - dev
+  - qa

Diff for: README.adoc

@@ -9,7 +9,7 @@
 :page-layout: guide-multipane
 :page-duration: 20 minutes
 :page-description: Explore how to access a simple RESTful web service and consume its resources with ReactJS in Open Liberty.
-// :page-releasedate: ...
+:page-releasedate: 2020-07-23
 :page-related-guides: ['rest-intro', 'rest-client-java']
 :page-permalink: /guides/{projectid}
 :imagesdir: /img/guide/{projectid}

Diff for: finish/src/.DS_Store

@@ -4,8 +4,8 @@ import React from 'react';
 // tag::react-dom[]
 import ReactDOM from 'react-dom';
 // end::react-dom[]
-import './styles/index.css';
-import App from './components/App';
+import './Styles/index.css';
+import App from './Components/App';
 
 // tag::dom-render[]
 ReactDOM.render(<App />, document.getElementById('root'));

Diff for: finish/src/main/.DS_Store

@@ -25,6 +25,8 @@ mvn -q clean package liberty:create liberty:install-feature liberty:deploy
 #       failsafe:verify           - Verifies that the integration tests of an application passed.
 mvn liberty:start
 
-status="$(curl --write-out "%{http_code}\n" --silent --output /dev/null "http://localhost:3000")"; if [ "$status" == "200" ]; then echo ENDPOINT OK; else echo "$status"; echo ENDPOINT NOT OK; exit 1; fi;
+curl http://localhost:9080
 
-mvn liberty:stop
+status="$(curl --write-out "%{http_code}\n" --silent --output /dev/null "http://localhost:9080")"; if [ "$status" == "200" ]; then echo ENDPOINT OK; else echo "$status"; echo ENDPOINT NOT OK; exit 1; fi;
+
+mvn liberty:stop