From ca507bc4e6edf6b113d62438ce54ae684145de65 Mon Sep 17 00:00:00 2001 From: Alasdair Nottingham Date: Fri, 15 Sep 2017 22:01:16 -0400 Subject: [PATCH] Fix branding to be Open Liberty rather than WebSphere Liberty --- ...icationServer.properties => openliberty.properties} | 10 +++++----- .../ws/kernel/launch/internal/FrameworkManager.java | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) rename dev/build.image/publish/{WebSphereApplicationServer.properties => openliberty.properties} (70%) diff --git a/dev/build.image/publish/WebSphereApplicationServer.properties b/dev/build.image/publish/openliberty.properties similarity index 70% rename from dev/build.image/publish/WebSphereApplicationServer.properties rename to dev/build.image/publish/openliberty.properties index 1612cd21e41..468e44df2fe 100644 --- a/dev/build.image/publish/WebSphereApplicationServer.properties +++ b/dev/build.image/publish/openliberty.properties @@ -8,10 +8,10 @@ # Contributors: # IBM Corporation - initial API and implementation ############################################################################### -com.ibm.websphere.productId=com.ibm.websphere.appserver -com.ibm.websphere.productOwner=IBM +com.ibm.websphere.productId=io.openliberty +com.ibm.websphere.productOwner=Open Liberty Project com.ibm.websphere.productVersion=@PRODUCT_VERSION@ -com.ibm.websphere.productName=WebSphere Application Server +com.ibm.websphere.productName=Open Liberty com.ibm.websphere.productInstallType=Archive -com.ibm.websphere.productEdition=@PRODUCT_EDITION@ -com.ibm.websphere.productLicenseType=@PRODUCT_LICENSE_TYPE@ +com.ibm.websphere.productEdition=Open +com.ibm.websphere.productLicenseType=EPL diff --git a/dev/com.ibm.ws.kernel.boot.nested/src/com/ibm/ws/kernel/launch/internal/FrameworkManager.java b/dev/com.ibm.ws.kernel.boot.nested/src/com/ibm/ws/kernel/launch/internal/FrameworkManager.java index 2a11aa2e8ec..d838eb418da 100644 --- a/dev/com.ibm.ws.kernel.boot.nested/src/com/ibm/ws/kernel/launch/internal/FrameworkManager.java +++ b/dev/com.ibm.ws.kernel.boot.nested/src/com/ibm/ws/kernel/launch/internal/FrameworkManager.java @@ -363,8 +363,9 @@ private void launchClient() { */ private void outputLicenseRestrictionMessage() { try { + // TODO need to work out how to strip the IBM branding knowledge out of here. ProductInfo pi = ProductInfo.getAllProductInfo().get("com.ibm.websphere.appserver"); - if (pi.getReplacedBy() == null) { + if (pi != null && pi.getReplacedBy() == null) { String edition = String.valueOf(pi.getEdition()).toLowerCase(); String licenseType = String.valueOf(pi.getProperty("com.ibm.websphere.productLicenseType")).toLowerCase(); String key = "audit.licenseRestriction." + edition + '.' + licenseType;