diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-04-28 22:32:02 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-04-28 22:32:02 +0200 |
| commit | 8fe52c0cd380c685040d95be59abba478b8fe6a9 (patch) | |
| tree | 18e0c1ded5f2c150607385f5ca1b0448debb4f60 /java/src | |
| parent | ICE-5865 Added license info to pom files (diff) | |
| download | ice-8fe52c0cd380c685040d95be59abba478b8fe6a9.tar.bz2 ice-8fe52c0cd380c685040d95be59abba478b8fe6a9.tar.xz ice-8fe52c0cd380c685040d95be59abba478b8fe6a9.zip | |
Fixed ICE-6464 and deprecated various IceSSL properties
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/IceInternal/PropertyNames.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java index 54868a2488f..52c143b4085 100644 --- a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java +++ b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue Apr 28 17:34:50 2015 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue Apr 28 22:03:41 2015 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -971,9 +971,10 @@ public final class PropertyNames { new Property("IceSSL\\.Alias", false, null), new Property("IceSSL\\.CAs", false, null), - new Property("IceSSL\\.CertAuthDir", true, null), - new Property("IceSSL\\.CertAuthFile", true, null), + new Property("IceSSL\\.CertAuthDir", true, "IceSSL.CAs"), + new Property("IceSSL\\.CertAuthFile", true, "IceSSL.CAs"), new Property("IceSSL\\.CertStore", false, null), + new Property("IceSSL\\.CertStoreLocation", false, null), new Property("IceSSL\\.CertFile", false, null), new Property("IceSSL\\.CertVerifier", false, null), new Property("IceSSL\\.CheckCertName", false, null), @@ -984,11 +985,11 @@ public final class PropertyNames new Property("IceSSL\\.DHParams", false, null), new Property("IceSSL\\.EntropyDaemon", false, null), new Property("IceSSL\\.FindCert", false, null), - new Property("IceSSL\\.FindCert\\.[^\\s]+", true, null), + new Property("IceSSL\\.FindCert\\.[^\\s]+", true, "IceSSL.FindCert"), new Property("IceSSL\\.ImportCert\\.[^\\s]+", true, null), new Property("IceSSL\\.InitOpenSSL", false, null), new Property("IceSSL\\.KeyFile", true, null), - new Property("IceSSL\\.KeySet", false, null), + new Property("IceSSL\\.KeySet", true, "IceSSL.CertStoreLocation"), new Property("IceSSL\\.Keychain", false, null), new Property("IceSSL\\.KeychainPassword", false, null), new Property("IceSSL\\.Keystore", false, null), @@ -997,7 +998,7 @@ public final class PropertyNames new Property("IceSSL\\.Password", false, null), new Property("IceSSL\\.PasswordCallback", false, null), new Property("IceSSL\\.PasswordRetryMax", false, null), - new Property("IceSSL\\.PersistKeySet", false, null), + new Property("IceSSL\\.PersistKeySet", true, null), new Property("IceSSL\\.Protocols", false, null), new Property("IceSSL\\.ProtocolVersionMax", false, null), new Property("IceSSL\\.ProtocolVersionMin", false, null), |