allard/olproperties
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

javacode gecopieerd van dev-versie

This commit is contained in:
ubuntu 2025-10-28 17:32:44 +00:00
parent 2002870c24
commit 39b141064d
4 changed files with 201 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/liberty/config/server.xml
View File

@ -12,7 +12,7 @@
<variable name="default.http.port" defaultValue="9080"/> <variable name="default.http.port" defaultValue="9080"/>
<variable name="default.https.port" defaultValue="9443"/> <variable name="default.https.port" defaultValue="9443"/>
<webApplication location="riscv64-olproperties.war" contextRoot="/" /> <webApplication location="guide-getting-started.war" contextRoot="/" />
<mpMetrics authentication="false"/> <mpMetrics authentication="false"/>

78
src/main/webapp/css/main.css
View File

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -8,22 +8,20 @@
* Contributors: * Contributors:
* IBM Corporation - initial API and implementation * IBM Corporation - initial API and implementation
*******************************************************************************/ *******************************************************************************/
@import url("https://fonts.googleapis.com/css?family=Asap:300,400,500");
@font-face { @font-face {
font-family: BunueloLight; font-family: BunueloLight;
src: url("/fonts/BunueloCleanPro-Light.woff"); src: url("/fonts/BunueloCleanPro-Light.otf");
} }
@font-face { @font-face {
font-family: BunueloSemiBold; font-family: BunueloSemiBold;
src: url("/fonts/BunueloCleanPro-SemiBold.woff"); src: url("/fonts/BunueloCleanPro-SemiBold.otf");
} }
body{ body {
font-family:Asap; font-family: BunueloSemiBold;
font-size: 16px; font-size: 16px;
color:#24243b; color: #24243b;
background-color: white; background-color: white;
margin: 0px; margin: 0px;
} }
@ -33,8 +31,8 @@ section {
padding-left: 8%; padding-left: 8%;
padding-right: 8%; padding-right: 8%;
/* font-weight: 400; */ /* font-weight: 400; */
letter-spacing:0; letter-spacing: 0;
text-align:left; text-align: left;
} }
.line { .line {
@ -44,7 +42,7 @@ section {
} }
.headerImage { .headerImage {
background-image: url(/img/header_ufo.png); background-image: url("/img/header_ufo.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: top 20px right 15px; background-position: top 20px right 15px;
height: 103px; height: 103px;
@ -61,11 +59,11 @@ p {
margin-top: 0px; margin-top: 0px;
} }
h1 { h1 {
font-family:BunueloSemiBold; font-family: BunueloSemiBold;
font-size: 40px; font-size: 40px;
font-weight: 400; font-weight: 400;
letter-spacing:0; letter-spacing: 0;
text-align:left; text-align: left;
} }
h2 { h2 {
font-size: 24px; font-size: 24px;
@ -79,7 +77,7 @@ a {
} }
#appIntro { #appIntro {
background-image:linear-gradient(#141427 0%, #2c2e50 100%); background-image: linear-gradient(#141427 0%, #2c2e50 100%);
background-size: 100% calc(100% - 70px); background-size: 100% calc(100% - 70px);
background-repeat: no-repeat; background-repeat: no-repeat;
} }
@ -90,14 +88,14 @@ a {
} }
#appTitle { #appTitle {
font-family:BunueloLight; font-family: BunueloLight;
font-size:55px; font-size: 55px;
} }
.headerRow { .headerRow {
height: 100px; height: 100px;
position:relative; position: relative;
z-index:2; z-index: 2;
box-shadow: 0 2px 4px 0 rgba(0,0,0,0.50); box-shadow: 0 2px 4px 0 rgba(0,0,0,0.50);
} }
.headerRow > div { .headerRow > div {
@ -150,7 +148,7 @@ a {
background-color: #E8EAEF; background-color: #E8EAEF;
} }
.headerIcon img { .headerIcon img {
display:block; display: Block;
margin:auto; margin:auto;
margin-top: 20px; margin-top: 20px;
} }
@ -167,7 +165,7 @@ a {
.headerTitle { .headerTitle {
background-color: white; background-color: white;
color:#5d6a8e; color: #5d6a8e;
letter-spacing:0; letter-spacing:0;
text-align:left; text-align:left;
padding-left: 40px; padding-left: 40px;
@ -190,7 +188,7 @@ a {
.headerTitle > h2 { .headerTitle > h2 {
font-family: BunueloLight; font-family: BunueloLight;
font-size:40px; font-size: 40px;
margin: 0; margin: 0;
} }
@ -222,11 +220,11 @@ a {
} }
button { button {
border-radius:100px; border-radius: 100px;
height:44px; height: 44px;
color:#24253a; color: #24253a;
text-align:center; text-align: center;
font-family: Asap; font-family: BunueloSemiBold;
margin-top: 25px; margin-top: 25px;
margin-bottom: 70px; margin-bottom: 70px;
cursor: pointer; cursor: pointer;
@ -235,24 +233,24 @@ button {
button a { button a {
text-decoration: none; text-decoration: none;
color:#F4914D; color: #F4914D;
} }
#guidesButton { #guidesButton {
background-color:#abd155; background-color: #abd155;
width:269px; width: 269px;
font-weight: 500; font-weight: 500;
font-size:16px; font-size: 16px;
transition: background-color .2s; transition: background-color .2s;
} }
#guidesButton:hover { #guidesButton:hover {
background-color: #C7EE63; background-color: #C7EE63;
} }
#mpGuidesButton { #mpGuidesButton {
border:2px solid #f4914d8c; border: 2px solid #f4914d8c;
border-radius:100px; border-radius: 100px;
font-size:20px; font-size: 20px;
letter-spacing:0; letter-spacing: 0;
padding-left: 40px; padding-left: 40px;
padding-right: 40px; padding-right: 40px;
background-color: white; background-color: white;
@ -264,7 +262,7 @@ button a {
} }
section#openLibertyAndMp { section#openLibertyAndMp {
background:#f4f4f5; background: #f4f4f5;
background-size: 100% calc(100% - 70px); background-size: 100% calc(100% - 70px);
background-repeat: no-repeat; background-repeat: no-repeat;
} }
@ -297,7 +295,7 @@ section#openLibertyAndMp {
#serviceStatus { #serviceStatus {
font-size: 50px; font-size: 50px;
font-family:BunueloLight; font-family: BunueloLight;
margin-top: 30px; margin-top: 30px;
} }
@ -378,12 +376,12 @@ td {
} }
#learnMore > h2 { #learnMore > h2 {
color:#5e6b8d; color: #5e6b8d;
} }
.bodyFooter { .bodyFooter {
padding: 5px 8%; padding: 5px 8%;
background-image: url(/img/footer_main.png); background-image: url("/img/footer_main.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: top 20px right 110px; background-position: top 20px right 110px;
margin-bottom: 40px; margin-bottom: 40px;
@ -392,7 +390,7 @@ td {
} }
.bodyFooterLink { .bodyFooterLink {
font-family: Asap; font-family: BunueloSemiBold;
font-weight: 300; font-weight: 300;
font-size: 14px; font-size: 14px;
letter-spacing: 0; letter-spacing: 0;

35
src/main/webapp/index.html
View File

@ -1,20 +1,7 @@
<!-- <!DOCTYPE html>
Copyright (c) 2016, 2023 IBM Corp. <html lang="en">
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<html>
<head> <head>
<title>olproperties</title>
<script src="js/mpData.js"></script> <script src="js/mpData.js"></script>
<link href="https://fonts.googleapis.com/css?family=Asap" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Asap" rel="stylesheet">
<link rel="stylesheet" href="css/main.css"> <link rel="stylesheet" href="css/main.css">
@ -22,7 +9,7 @@
<body> <body>
<section id="appIntro"> <section id="appIntro">
<div id="titleSection"> <div id="titleSection">
<h1 id="appTitle">Java-PitStop Openliberty/Java17 voorbeeld 3.0</h1> <h1 id="appTitle">Java-PitStop Openliberty/Java17 voorbeeld 1.7</h1>
<div class="line"></div> <div class="line"></div>
<div class="headerImage"></div> <div class="headerImage"></div>
<h2>Open Liberty Java17 applicatie op Container Hosting Platform!</h2> <h2>Open Liberty Java17 applicatie op Container Hosting Platform!</h2>
@ -104,16 +91,16 @@
</section> </section>
<section id="whereToNext"> <section id="whereToNext">
<h2>Where to next, captain?</h2> <h2>Waar wil je nu naartoe?</h2>
<h4>Set course for the Open Liberty guides!</h4> <h4>Ga naar Open Liberty tutorials!</h4>
<p>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.</p> <p>Alle verdere informatie, voorbeelden en hulp vind je hier:</p>
<a href="https://openliberty.io/guides/"><button id="guidesButton">View all Open Liberty guides</button></a> <a href="https://openliberty.io/guides/"><button id="guidesButton">Open Liberty Tutorials</button></a>
</section> </section>
<script> <script>
displaySystemProperties(); // this calls displayMetrics() because it is a dependency displaySystemProperties(); // this calls displayMetrics() because it is a dependency
displayHealth(); displayHealth();
//displayConfigProperties(); displayConfigProperties();
</script> </script>
</body> </body>
@ -124,7 +111,7 @@
<a href="https://github.com/OpenLiberty">GitHub</a> <a href="https://github.com/OpenLiberty">GitHub</a>
<a href="https://openliberty.io/">openliberty.io</a> <a href="https://openliberty.io/">openliberty.io</a>
</div> </div>
<p id="footerText">an IBM open source project</p> <p id="footerText">Een open-source project van Allard</p>
<p id="footerCopyright">&copy;Copyright IBM Corp. 2018, 2023</p> <p id="footerCopyright">&copy;Copyright AllardDCS 2025</p>
</footer> </footer>
</html> </html>

8
src/main/webapp/js/mpData.js
View File

@ -13,7 +13,7 @@ function displayMetrics() {
} }
function getSystemMetrics() { function getSystemMetrics() {
var url = "https://olproperties-riscv.alldcs.nl/metrics"; var url = "https://olproperties-dev.allarddcs.nl/metrics";
var req = new XMLHttpRequest(); var req = new XMLHttpRequest();
var metricToDisplay = {}; var metricToDisplay = {};
@ -86,7 +86,7 @@ function displaySystemProperties() {
function getSystemPropertiesRequest() { function getSystemPropertiesRequest() {
var propToDisplay = ["java.vendor", "java.version", "user.name", "os.name", "wlp.install.dir", "wlp.server.name" ]; 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 req = new XMLHttpRequest();
var table = document.getElementById("systemPropertiesTable"); var table = document.getElementById("systemPropertiesTable");
// Create the callback: // Create the callback:
@ -131,7 +131,7 @@ function displayHealth() {
} }
function getHealth() { function getHealth() {
var url = "https://olproperties-riscv.alldcs.nl/health"; var url = "https://olproperties-dev.allarddcs.nl/health";
var req = new XMLHttpRequest(); var req = new XMLHttpRequest();
var healthBox = document.getElementById("healthBox"); var healthBox = document.getElementById("healthBox");
@ -173,7 +173,7 @@ function displayConfigProperties() {
} }
function getConfigPropertiesRequest() { function getConfigPropertiesRequest() {
var url = "https://olproperties-riscv.alldcs.nl/config"; var url = "https://olproperties-dev.allarddcs.nl/config";
var req = new XMLHttpRequest(); var req = new XMLHttpRequest();
var configToDisplay = {}; var configToDisplay = {};