Merge pull request #5 from anandvarkeyphilips/development

modifying README and generating new Release
anandvarkeyphilips · Nov 6, 2018 · 46aead9 · 46aead9
2 parents e49d7ed + 3ab2c0d
commit 46aead9
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,37 +1,40 @@
 
-# Welcome to Enterprise YAML Validator
+# Welcome to Enterprise Validator Suite
 
 [comment]: # (REPLACE ME: Add Brief description of your service)
 
-Latest version as of 27-10-2018 is 2.0.1.RELEASE
+Latest version as of 07-11-2018 is 2.0.4.RELEASE
 
 ### Getting Started
 
 [comment]: # (REPLACE ME: Add a Getting Started guide)
 
-Enterprise YAML validator is better than http://www.yamllint.com.
-Enterprise YAML Validator follows YAML spec, support multiple doc feature which is not supported my YAML Lint.
+YAML validator is better than http://www.yamllint.com.
+YAML Validator follows YAML spec, support multiple doc feature which is not supported my YAML Lint.
+JSON validator and formatter follows the JSON spec at http://json.org/.
 Also, now you dont have to use https://www.base64decode.org/,
 This app also supports Decode from and to Base64 format.
 
 Here's the working version of the Application hosted in Microsoft Azure Cloud:
-http://varkeys-rhel-jenkins.westus.cloudapp.azure.com:9090/validator/editor
+  http://varkeys-rhel-jenkins.westus.cloudapp.azure.com:9090/validator/editor
 
-![Alt text](enterprise-yaml-validator-image.PNG?raw=true "Enterprise YAML Validator")
+![Alt text](enterprise-validator-suite-image.PNG?raw=true "Enterprise Validator Suite")
 
 ### Recipe Ingredients
  * spring-boot-starter-web
  * spring-boot-starter-freemarker
  * springfox-swagger2, springfox-swagger-ui
- * snakeyaml, lombok, jackson-databind, spring-boot-test
+ * org.json,snakeyaml, lombok, jackson-databind, spring-boot-test
 
 
 ### How to?
 [comment]: # (REPLACE ME: Add your confluence page in below format)
 * Click on "BASE 64Encode" to encode to Base64 format.
 * Click on "BASE 64Encode" to decode from Base64 format.
 * Click on "Validate YAML" to validate YAML data.
-* Click on "Share YAML" to share the YAML data through Outlook Mail.
+* Click on "Validate JSON" to validate JSON data.
+* Click on "Format YAML" to format JSON data.
+* Click on "Share Data" to share the data through configured Mailing App.
 
 
 ### Jira
@@ -44,14 +47,23 @@ Please contact: [Anand Varkey Philips] ([email protected]) (Anand Var
 ### Change Log
 [comment]: # (REPLACE ME: Add the changelog in below format)
 
-* Version 2.*-RELEASE
+* Version 2.0.4-RELEASE
+
+> Released *[07/11/2018]* : 2.0.4.RELEASE
+>
+> Changes includes the following:
+>
+> 1. Added JSON validation and Formatting capabilities.
+
+* Version 2.0.0-RELEASE
 
 > Released *[27/10/2018]* : 2.0.0.RELEASE
 >
 > Changes includes the following:
 >
 > 1. Added front end-web page for Enterprise YAML Validator.
 > 2. Made it a complete standalone microservie app.
+> 3. Added JSON validation and Formatting capabilities.
 
 * Version 1.*-RELEASE
 

diff --git a/enterprise-validator-suite-image.PNG b/enterprise-validator-suite-image.PNG
diff --git a/enterprise-yaml-validator-image.PNG b/enterprise-yaml-validator-image.PNG
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.exnihilo</groupId>
-    <artifactId>yaml-validator</artifactId>
+    <artifactId>validator-microservice</artifactId>
     <version>2.0.4.RELEASE</version>
     <packaging>jar</packaging>
 

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -1,9 +1,9 @@
 server:
     port: 9090
-    servlet.context-path: /validator
+    servlet.context-path: /validator-microservice
 logging:
   level.root: info
   level.io.exnihilo: debug
-  file: /packages/logs/yaml-editor/yaml-editor.log
+  file: /packages/logs/validator-microservice/validator-microservice.log
 spring.pid.fail-on-write-error: true
-spring.pid.file: /packages/config/yaml-editor/yaml-editor.pid
+spring.pid.file: /packages/config/validator-microservice/validator-microservice.pid
diff --git a/src/main/resources/templates/editor.ftl b/src/main/resources/templates/editor.ftl
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Enterprise YAML Validator</title>
+    <title>Enterprise Validator Suite</title>
     <link rel="icon" type="image/png" href="favicon.ico">
     <link rel="stylesheet" href="css/bootstrap-theme.min.css">
     <link rel="stylesheet" href="css/bootstrap.min.css">
@@ -21,9 +21,10 @@
 <section class="hero is-light">
     <div class="hero-body">
         <div class="container">
-            <p class="title">Enterprise YAML Validator</p>
+            <p class="title">Enterprise Validator Suite</p>
             <p class="subtitle">
-            Now you can validate YAML easily!! It's optimized for Spring Boot Snake YAML validtions.
+                Now you can validate JSON and YAML easily!! YAML validator is better than <a href="http://www.yamllint.com">YAML Lint</a>.
+                JSON validator and formatter follows the JSON spec at <a href="http://json.org/">JSON.org</a>.
             </p>
         </div>
     </div>
@@ -36,7 +37,7 @@
             <button type="button" id="validateYamlData" class="btn btn-success">Validate YAML</button>
             <button type="button" id="validateJsonData" class="btn btn-success">Validate JSON</button>
             <button type="button" id="formatJsonData" class="btn btn-success">Format JSON</button>
-            <button type="button" id="shareByEmail" class="btn btn-info">Share YAML</button>
+            <button type="button" id="shareByEmail" class="btn btn-info">Share Data</button>
             <div class="form-group" style="min-width: 100%">
                     <pre id="editor" style="height:75vh;">
                     </pre>