Add internal configuration for legacy EAR classpath behavior

OpenLiberty · Aug 13, 2024 · fd968d1 · fd968d1
1 parent 653475d
commit fd968d1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/dev/com.ibm.ws.classloading.configuration/bnd.bnd b/dev/com.ibm.ws.classloading.configuration/bnd.bnd
@@ -39,5 +39,6 @@ Import-Package: \
 
 -buildpath: \
 	com.ibm.websphere.org.osgi.service.component,\
-	com.ibm.wsspi.org.osgi.service.component.annotations, \
-	com.ibm.ws.org.osgi.annotation.versioning;version=latest
+	com.ibm.wsspi.org.osgi.service.component.annotations,\
+	com.ibm.ws.org.osgi.annotation.versioning;version=latest,\
+	com.ibm.ws.kernel.boot.core
diff --git a/dev/com.ibm.ws.classloading.configuration/resources/OSGI-INF/metatype/classloading.xml b/dev/com.ibm.ws.classloading.configuration/resources/OSGI-INF/metatype/classloading.xml
@@ -21,8 +21,14 @@
         id="useJarUrls" 
         required="false" 
         default="false"
-        type="Boolean"      
-    />
+        type="Boolean"
+     />
+     <AD name="internal" description="internal use only"
+        id="useLegacyEARClassPath"
+        required="false"
+        default="false"
+        type="Boolean"
+     />
    </OCD>
 
    <Designate pid="com.ibm.ws.classloading.global">

diff --git a/...figuration/src/com/ibm/ws/classloading/configuration/GlobalClassloadingConfiguration.java b/...figuration/src/com/ibm/ws/classloading/configuration/GlobalClassloadingConfiguration.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -21,11 +21,13 @@
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Modified;
 
+import com.ibm.ws.kernel.productinfo.ProductInfo;
+
 @Component(service = GlobalClassloadingConfiguration.class, immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE,
            configurationPid = "com.ibm.ws.classloading.global", property = "service.vendor=IBM")
 public class GlobalClassloadingConfiguration {
 
-    private Map<String, Object> properties;
+    private volatile Map<String, Object> properties;
 
     @Activate
     protected void activate(ComponentContext cCtx, Map<String, Object> properties) {
@@ -47,7 +49,15 @@ protected void modified(ComponentContext ctx, Map<String, Object> props) {
      * @return
      */
     public boolean useJarUrls() {
-        return properties == null || (Boolean) properties.get("useJarUrls");
+        return getBooleanProperty("useJarUrls", true);
     }
 
+    public boolean useLegacyEARClassPath() {
+        return ProductInfo.getBetaEdition() && getBooleanProperty("useLegacyEARClassPath", false);
+    }
+
+    private boolean getBooleanProperty(String key, boolean nullPropsValue) {
+        Map<String, Object> current = properties;
+        return current == null ? nullPropsValue : (Boolean) current.get(key);
+    }
 }