< prev index next >
modules/jdk.packager/src/main/java/com/oracle/tools/packager/mac/MacPkgBundler.java
Print this page
*** 51,60 ****
--- 51,63 ----
import java.util.Map;
import java.util.Optional;
import java.util.ResourceBundle;
import static com.oracle.tools.packager.StandardBundlerParam.*;
+ import static com.oracle.tools.packager.mac.MacBaseInstallerBundler.SIGNING_KEYCHAIN;
+ import static com.oracle.tools.packager.mac.MacBaseInstallerBundler.SIGNING_KEY_USER;
+ import jdk.packager.internal.mac.MacCertificate;
public class MacPkgBundler extends MacBaseInstallerBundler {
private static final ResourceBundle I18N =
ResourceBundle.getBundle(MacPkgBundler.class.getName());
*** 95,105 ****
public static final BundlerParamInfo<String> DEVELOPER_ID_INSTALLER_SIGNING_KEY = new StandardBundlerParam<>(
I18N.getString("param.signing-key-developer-id-installer.name"),
I18N.getString("param.signing-key-developer-id-installer.description"),
"mac.signing-key-developer-id-installer",
String.class,
! params -> MacBaseInstallerBundler.findKey("Developer ID Installer: " + SIGNING_KEY_USER.fetchFrom(params), SIGNING_KEYCHAIN.fetchFrom(params), VERBOSE.fetchFrom(params)),
(s, p) -> s);
public static final BundlerParamInfo<String> INSTALLER_SUFFIX = new StandardBundlerParam<> (
I18N.getString("param.installer-suffix.name"),
I18N.getString("param.installer-suffix.description"),
--- 98,121 ----
public static final BundlerParamInfo<String> DEVELOPER_ID_INSTALLER_SIGNING_KEY = new StandardBundlerParam<>(
I18N.getString("param.signing-key-developer-id-installer.name"),
I18N.getString("param.signing-key-developer-id-installer.description"),
"mac.signing-key-developer-id-installer",
String.class,
! params -> {
! String result = MacBaseInstallerBundler.findKey("Developer ID Installer: " + SIGNING_KEY_USER.fetchFrom(params),
! SIGNING_KEYCHAIN.fetchFrom(params),
! VERBOSE.fetchFrom(params));
! if (result != null) {
! MacCertificate certificate = new MacCertificate(result, VERBOSE.fetchFrom(params));
!
! if (!certificate.isValid()) {
! Log.info(MessageFormat.format(I18N.getString("error.certificate.expired"), result));
! }
! }
!
! return result;
! },
(s, p) -> s);
public static final BundlerParamInfo<String> INSTALLER_SUFFIX = new StandardBundlerParam<> (
I18N.getString("param.installer-suffix.name"),
I18N.getString("param.installer-suffix.description"),
< prev index next >