Skip to content

Commit

Permalink
Remove processing of boot delegations
Browse files Browse the repository at this point in the history
  • Loading branch information
brettaufheber committed Jun 25, 2023
1 parent 19a97a6 commit 24cd3ef
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions src/main/java/systems/opalia/launcher/Launcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public final class Launcher {
public static final String PROPERTY_AUTO_DEPLOYMENT_DIRECTORY = "launcher.auto-deployment-directory";
public static final String PROPERTY_CACHE_DIRECTORY = "launcher.cache-directory";
public static final String PROPERTY_PID_FILE = "launcher.pid-file";
public static final String PROPERTY_BOOT_DELEGATIONS = "launcher.boot-delegations";
public static final String PROPERTY_EXTRA_EXPORT_PACKAGES = "launcher.extra-export-packages";
public static final String PROPERTY_BUNDLE_ARTIFACTS = "launcher.bundle-artifacts";
public static final String PROPERTY_REMOTE_REPOSITORIES = "launcher.remote-repositories";
Expand Down Expand Up @@ -190,9 +189,6 @@ private Framework getFramework() {
if (System.getProperty(Constants.FRAMEWORK_STORAGE_CLEAN) == null)
System.setProperty(Constants.FRAMEWORK_STORAGE_CLEAN, Constants.FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT);

if (System.getProperty(Constants.FRAMEWORK_BOOTDELEGATION) == null)
System.setProperty(Constants.FRAMEWORK_BOOTDELEGATION, String.join(",", getBootDelegations()));

if (System.getProperty(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA) == null)
System.setProperty(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA,
String.join(",", transformExports(getExtraExportPackages())));
Expand Down Expand Up @@ -367,20 +363,6 @@ private Path getPidFile() {
return Paths.get(value).toAbsolutePath().normalize();
}

private List<String> getBootDelegations() {

final var value = System.getProperty(PROPERTY_BOOT_DELEGATIONS);

if (value == null || value.isEmpty())
return Arrays.asList("javax.*", "sun.*", "com.sun.*", "org.xml.*", "org.w3c.*"); // default value

return Arrays.stream(value.split(","))
.filter(x -> !x.isBlank())
.map(String::trim)
.distinct()
.collect(Collectors.toList());
}

private List<String> getExtraExportPackages() {

final var value = System.getProperty(PROPERTY_EXTRA_EXPORT_PACKAGES);
Expand Down

0 comments on commit 24cd3ef

Please sign in to comment.