diff --git a/src/main/liberty/config/server.xml b/src/main/liberty/config/server.xml
index decebbb..19c8554 100755
--- a/src/main/liberty/config/server.xml
+++ b/src/main/liberty/config/server.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/src/main/webapp/css/main.css b/src/main/webapp/css/main.css
index 7f4ea6a..b6ca1be 100644
--- a/src/main/webapp/css/main.css
+++ b/src/main/webapp/css/main.css
@@ -1,5 +1,5 @@
/*******************************************************************************
-* Copyright (c) 2018 IBM Corporation and others.
+* Copyright (c) 2018, 2024 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,382 +8,380 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-@import url("https://fonts.googleapis.com/css?family=Asap:300,400,500");
-
@font-face {
- font-family: BunueloLight;
- src: url("/fonts/BunueloCleanPro-Light.woff");
+ font-family: BunueloLight;
+ src: url("/fonts/BunueloCleanPro-Light.otf");
}
@font-face {
- font-family: BunueloSemiBold;
- src: url("/fonts/BunueloCleanPro-SemiBold.woff");
+ font-family: BunueloSemiBold;
+ src: url("/fonts/BunueloCleanPro-SemiBold.otf");
}
-body{
- font-family:Asap;
- font-size: 16px;
- color:#24243b;
- background-color: white;
- margin: 0px;
+body {
+ font-family: BunueloSemiBold;
+ font-size: 16px;
+ color: #24243b;
+ background-color: white;
+ margin: 0px;
}
section {
- padding-top: 55px;
- padding-left: 8%;
- padding-right: 8%;
- /* font-weight: 400; */
- letter-spacing:0;
- text-align:left;
+ padding-top: 55px;
+ padding-left: 8%;
+ padding-right: 8%;
+ /* font-weight: 400; */
+ letter-spacing: 0;
+ text-align: left;
}
.line {
- margin-right: 200px;
- height: 1px;
- background-color: #C8D3D3;
+ margin-right: 200px;
+ height: 1px;
+ background-color: #C8D3D3;
}
.headerImage {
- background-image: url(/img/header_ufo.png);
- background-repeat: no-repeat;
- background-position: top 20px right 15px;
- height: 103px;
- margin-top: -94px;
+ background-image: url("/img/header_ufo.png");
+ background-repeat: no-repeat;
+ background-position: top 20px right 15px;
+ height: 103px;
+ margin-top: -94px;
}
#whereTo {
- padding-bottom: 80px;
- width: 50%;
+ padding-bottom: 80px;
+ width: 50%;
}
p {
- line-height: 22px;
- margin-top: 0px;
+ line-height: 22px;
+ margin-top: 0px;
}
h1 {
- font-family:BunueloSemiBold;
- font-size: 40px;
- font-weight: 400;
- letter-spacing:0;
- text-align:left;
+ font-family: BunueloSemiBold;
+ font-size: 40px;
+ font-weight: 400;
+ letter-spacing: 0;
+ text-align: left;
}
h2 {
- font-size: 24px;
- font-weight: 400;
+ font-size: 24px;
+ font-weight: 400;
}
h4 {
- margin-top: 52px;
+ margin-top: 52px;
}
a {
- text-decoration: none;
+ text-decoration: none;
}
#appIntro {
- background-image:linear-gradient(#141427 0%, #2c2e50 100%);
- background-size: 100% calc(100% - 70px);
- background-repeat: no-repeat;
+ background-image: linear-gradient(#141427 0%, #2c2e50 100%);
+ background-size: 100% calc(100% - 70px);
+ background-repeat: no-repeat;
}
#titleSection {
- color: white;
- margin-bottom: 80px;
+ color: white;
+ margin-bottom: 80px;
}
#appTitle {
- font-family:BunueloLight;
- font-size:55px;
+ font-family: BunueloLight;
+ font-size: 55px;
}
.headerRow {
- height: 100px;
- position:relative;
- z-index:2;
- box-shadow: 0 2px 4px 0 rgba(0,0,0,0.50);
+ height: 100px;
+ position: relative;
+ z-index: 2;
+ box-shadow: 0 2px 4px 0 rgba(0,0,0,0.50);
}
.headerRow > div {
- display: inline-block;
+ display: inline-block;
}
.collapsibleRow {
- transition: border 400ms ease-out, box-shadow 200ms linear;
- cursor: pointer;
+ transition: border 400ms ease-out, box-shadow 200ms linear;
+ cursor: pointer;
}
.collapsibleRow:hover .headerTitle {
- background-color: #f4f4f4;
- transition: background-color 0.1s;
+ background-color: #f4f4f4;
+ transition: background-color 0.1s;
}
.collapsed .collapsibleRow {
- box-shadow: none;
- border-bottom: 4px solid;
+ box-shadow: none;
+ border-bottom: 4px solid;
}
.collapsed#healthSection > .headerRow {
- border-bottom-color: #D6D9E4;
+ border-bottom-color: #D6D9E4;
}
.collapsed#configSection > .headerRow {
- border-bottom-color: #F8D7C1;
+ border-bottom-color: #F8D7C1;
}
.collapsed#metricsSection > .headerRow {
- border-bottom-color: #EEF3C3;
+ border-bottom-color: #EEF3C3;
}
.collapsed .collapsibleContent { /* collapsing animation */
- transition: all 400ms ease-out, opacity 300ms ease-in;
+ transition: all 400ms ease-out, opacity 300ms ease-in;
}
.expanded .collapsibleContent { /* expanding animation */
- transition: all 400ms ease-out, opacity 450ms ease-out;
+ transition: all 400ms ease-out, opacity 450ms ease-out;
}
.collapsed .collapsibleContent {
- opacity: 0;
- max-height: 0;
- visibility: hidden;
+ opacity: 0;
+ max-height: 0;
+ visibility: hidden;
}
.expanded .collapsibleContent {
- opacity: 1;
- max-height: 1000px;
- visibility: visible;
+ opacity: 1;
+ max-height: 1000px;
+ visibility: visible;
}
.headerIcon {
- width: 160px;
- height: 100%;
- float: left;
- background-color: #E8EAEF;
+ width: 160px;
+ height: 100%;
+ float: left;
+ background-color: #E8EAEF;
}
.headerIcon img {
- display:block;
- margin:auto;
- margin-top: 20px;
+ display: Block;
+ margin:auto;
+ margin-top: 20px;
}
#healthSection .headerIcon {
- background-color: #E8EAEF;
+ background-color: #E8EAEF;
}
#configSection .headerIcon {
- background-color: #FDE4D1;
+ background-color: #FDE4D1;
}
#metricsSection .headerIcon {
- background-color: #F5F8DA;
+ background-color: #F5F8DA;
}
.headerTitle {
- background-color: white;
- color:#5d6a8e;
- letter-spacing:0;
- text-align:left;
- padding-left: 40px;
- padding-top: 10px;
- width: calc(100% - 200px); /* 160 from icon, 40 from padding */
+ background-color: white;
+ color: #5d6a8e;
+ letter-spacing:0;
+ text-align:left;
+ padding-left: 40px;
+ padding-top: 10px;
+ width: calc(100% - 200px); /* 160 from icon, 40 from padding */
}
#healthSection h2 {
- color: #5D6A8E;
+ color: #5D6A8E;
}
#configSection h2 {
- color: #E57000;
+ color: #E57000;
}
#metricsSection h2 {
- color: #4F6700;
+ color: #4F6700;
}
#sysPropTitle {
- padding-top: 28px;
+ padding-top: 28px;
}
.headerTitle > h2 {
- font-family: BunueloLight;
- font-size:40px;
- margin: 0;
+ font-family: BunueloLight;
+ font-size: 40px;
+ margin: 0;
}
.caret {
- position: absolute;
- right: 45px;
- top: 45px;
+ position: absolute;
+ right: 45px;
+ top: 45px;
}
.collapsed#configSection .caret {
- background-image: url("../img/carets/caret_down_orange.svg")
+ background-image: url("../img/carets/caret_down_orange.svg")
}
.expanded#configSection .caret {
- background-image: url("../img/carets/caret_up_orange.svg")
+ background-image: url("../img/carets/caret_up_orange.svg")
}
.msSection {
- background: white;
- box-shadow: 0 2px 4px 0 rgba(63,70,89,0.31);
+ background: white;
+ box-shadow: 0 2px 4px 0 rgba(63,70,89,0.31);
}
.sectionContent {
- margin-left: 160px;
+ margin-left: 160px;
}
#systemPropertiesTable {
- padding-left: 160px;
- background: white;
+ padding-left: 160px;
+ background: white;
}
button {
- border-radius:100px;
- height:44px;
- color:#24253a;
- text-align:center;
- font-family: Asap;
- margin-top: 25px;
- margin-bottom: 70px;
- cursor: pointer;
- border: none;
+ border-radius: 100px;
+ height: 44px;
+ color: #24253a;
+ text-align: center;
+ font-family: BunueloSemiBold;
+ margin-top: 25px;
+ margin-bottom: 70px;
+ cursor: pointer;
+ border: none;
}
button a {
- text-decoration: none;
- color:#F4914D;
+ text-decoration: none;
+ color: #F4914D;
}
#guidesButton {
- background-color:#abd155;
- width:269px;
- font-weight: 500;
- font-size:16px;
- transition: background-color .2s;
+ background-color: #abd155;
+ width: 269px;
+ font-weight: 500;
+ font-size: 16px;
+ transition: background-color .2s;
}
#guidesButton:hover {
- background-color: #C7EE63;
+ background-color: #C7EE63;
}
#mpGuidesButton {
- border:2px solid #f4914d8c;
- border-radius:100px;
- font-size:20px;
- letter-spacing:0;
- padding-left: 40px;
- padding-right: 40px;
- background-color: white;
- transition: background-color .2s, color .2s;
+ border: 2px solid #f4914d8c;
+ border-radius: 100px;
+ font-size: 20px;
+ letter-spacing: 0;
+ padding-left: 40px;
+ padding-right: 40px;
+ background-color: white;
+ transition: background-color .2s, color .2s;
}
#mpGuidesButton:hover {
- background-color: #f4914d;
- color: white;
+ background-color: #f4914d;
+ color: white;
}
section#openLibertyAndMp {
- background:#f4f4f5;
- background-size: 100% calc(100% - 70px);
- background-repeat: no-repeat;
+ background: #f4f4f5;
+ background-size: 100% calc(100% - 70px);
+ background-repeat: no-repeat;
}
#healthBox {
- text-align: left;
- display: table-cell;
- vertical-align: middle;
- width: 47%;
+ text-align: left;
+ display: table-cell;
+ vertical-align: middle;
+ width: 47%;
}
#healthBox > div {
- display: table-cell;
- vertical-align: middle;
+ display: table-cell;
+ vertical-align: middle;
}
#healthIcon {
- padding-left: 73px;
- padding-top: 56px;
- padding-bottom: 56px;
+ padding-left: 73px;
+ padding-top: 56px;
+ padding-bottom: 56px;
}
#healthStatusIcon {
- width: 104px;
- height: 104px;
+ width: 104px;
+ height: 104px;
}
#healthText {
- padding: 50px;
+ padding: 50px;
}
#serviceStatus {
- font-size: 50px;
- font-family:BunueloLight;
- margin-top: 30px;
+ font-size: 50px;
+ font-family: BunueloLight;
+ margin-top: 30px;
}
#healthNote {
- text-align: left;
- display: table-cell;
- vertical-align: middle;
- padding-left: 43px;
- line-height: 26px;
- width: 53%;
+ text-align: left;
+ display: table-cell;
+ vertical-align: middle;
+ padding-left: 43px;
+ line-height: 26px;
+ width: 53%;
}
table {
- width: 100%;
- font-size: 14px;
- text-align: left;
- border-collapse: collapse;
+ width: 100%;
+ font-size: 14px;
+ text-align: left;
+ border-collapse: collapse;
}
th {
- height: 63px;
- padding-left: 41px;
- font-size: 16px;
+ height: 63px;
+ padding-left: 41px;
+ font-size: 16px;
}
tr {
- height: 45px;
+ height: 45px;
}
td {
- padding-left: 41px;
+ padding-left: 41px;
}
#systemPropertiesTable tr:first-child {
- background: #D6D9E4;
+ background: #D6D9E4;
}
#configTable tr:first-child {
- background: #F8D7C1;;
+ background: #F8D7C1;;
}
#metricsTable tr:first-child {
- background: #EEF3C3;
+ background: #EEF3C3;
}
#systemPropertiesTable tr:nth-child(2n+3) {
- background: #EEEFF3;
+ background: #EEEFF3;
}
#configTable tr:nth-child(2n+2) {
- background: #FEF8F4;
+ background: #FEF8F4;
}
#metricsTable tr:nth-child(2n+2) {
- background: #FBFCEE;
+ background: #FBFCEE;
}
#systemPropertiesTable .sourceRow,
#healthTable .sourceRow {
- border-top: 4px solid #D6D9E4;
+ border-top: 4px solid #D6D9E4;
}
#systemPropertiesTable .sourceRow a,
#healthTable .sourceRow a {
- color: #5D6A8E;
+ color: #5D6A8E;
}
#configTable .sourceRow {
- border-top: 4px solid #F8D7C1;
+ border-top: 4px solid #F8D7C1;
}
#configTable .sourceRow a {
- color: #E57000;
+ color: #E57000;
}
#metricsTable .sourceRow {
- border-top: 4px solid #EEF3C3;
+ border-top: 4px solid #EEF3C3;
}
#metricsTable .sourceRow a {
- color: #4F6700;
+ color: #4F6700;
}
.sourceRow a {
- font-weight: 500;
+ font-weight: 500;
}
#learnMore {
- margin-top: 120px;
- padding: 0px 200px 100px;
+ margin-top: 120px;
+ padding: 0px 200px 100px;
}
#learnMore > h2 {
- color:#5e6b8d;
+ color: #5e6b8d;
}
.bodyFooter {
padding: 5px 8%;
- background-image: url(/img/footer_main.png);
+ background-image: url("/img/footer_main.png");
background-repeat: no-repeat;
background-position: top 20px right 110px;
margin-bottom: 40px;
@@ -392,7 +390,7 @@ td {
}
.bodyFooterLink {
- font-family: Asap;
+ font-family: BunueloSemiBold;
font-weight: 300;
font-size: 14px;
letter-spacing: 0;
@@ -405,9 +403,9 @@ td {
}
.bodyFooterLink > a {
- text-decoration: none;
- padding: 10px;
- color: #96bc32;
+ text-decoration: none;
+ padding: 10px;
+ color: #96bc32;
}
#licenseLink {
@@ -416,9 +414,9 @@ td {
}
#footer_text {
- margin-top: 4px;
- margin-bottom: 4px;
- font-size: 16px;
+ margin-top: 4px;
+ margin-bottom: 4px;
+ font-size: 16px;
}
#footer_copyright {
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index ce8f3d1..e2d2315 100755
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -1,20 +1,7 @@
-
-
+
+
+ olproperties
@@ -22,7 +9,7 @@
-
Java-PitStop Openliberty/Java17 voorbeeld 3.0
+
Java-PitStop Openliberty/Java17 voorbeeld 1.7
Open Liberty Java17 applicatie op Container Hosting Platform!
@@ -104,16 +91,16 @@
- Where to next, captain?
- Set course for the Open Liberty guides!
- All of the info you need to continue your journey is here, laid out in easy to follow steps and examples. Searching our current selection makes it easy to find the guide that will help make your next project a reality.
- View all Open Liberty guides
+ Waar wil je nu naartoe?
+ Ga naar Open Liberty tutorials!
+ Alle verdere informatie, voorbeelden en hulp vind je hier:
+ Open Liberty Tutorials
@@ -124,7 +111,7 @@
GitHub
openliberty.io
-
-
+
+
diff --git a/src/main/webapp/js/mpData.js b/src/main/webapp/js/mpData.js
index d6968cc..9a7acc1 100644
--- a/src/main/webapp/js/mpData.js
+++ b/src/main/webapp/js/mpData.js
@@ -13,7 +13,7 @@ function displayMetrics() {
}
function getSystemMetrics() {
- var url = "https://olproperties-riscv.alldcs.nl/metrics";
+ var url = "https://olproperties-dev.allarddcs.nl/metrics";
var req = new XMLHttpRequest();
var metricToDisplay = {};
@@ -86,7 +86,7 @@ function displaySystemProperties() {
function getSystemPropertiesRequest() {
var propToDisplay = ["java.vendor", "java.version", "user.name", "os.name", "wlp.install.dir", "wlp.server.name" ];
- var url = "https://olproperties-riscv.alldcs.nl/system/properties";
+ var url = "https://olproperties-dev.allarddcs.nl/system/properties";
var req = new XMLHttpRequest();
var table = document.getElementById("systemPropertiesTable");
// Create the callback:
@@ -131,7 +131,7 @@ function displayHealth() {
}
function getHealth() {
- var url = "https://olproperties-riscv.alldcs.nl/health";
+ var url = "https://olproperties-dev.allarddcs.nl/health";
var req = new XMLHttpRequest();
var healthBox = document.getElementById("healthBox");
@@ -173,7 +173,7 @@ function displayConfigProperties() {
}
function getConfigPropertiesRequest() {
- var url = "https://olproperties-riscv.alldcs.nl/config";
+ var url = "https://olproperties-dev.allarddcs.nl/config";
var req = new XMLHttpRequest();
var configToDisplay = {};