Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix branding to be Open Liberty rather than WebSphere Liberty #2

Merged
merged 1 commit into from
Sep 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down