Merge pull request #2 from cbridgha/OL_product_changes

Fix branding to be Open Liberty rather than WebSphere Liberty
OpenLiberty · Sep 16, 2017 · 4f29557 · 4f29557
2 parents e1b66d5 + ca507bc
commit 4f29557
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...ish/WebSphereApplicationServer.properties → ...uild.image/publish/openliberty.properties b/...ish/WebSphereApplicationServer.properties → ...uild.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/...com.ibm.ws.kernel.boot.nested/src/com/ibm/ws/kernel/launch/internal/FrameworkManager.java b/...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;