diff options
| author | Jose <jose@zeroc.com> | 2014-06-06 16:33:11 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-06-06 16:33:11 +0200 |
| commit | 7ba5b1fa9d9849182b19aebe5bad1570fb82452b (patch) | |
| tree | 2b6a4f6407b4cc860d01f6e737959122a719ca3f /java/src/IceInternal/PropertyNames.java | |
| parent | Fixed ICE-5499, new garbage collection support (diff) | |
| download | ice-7ba5b1fa9d9849182b19aebe5bad1570fb82452b.tar.bz2 ice-7ba5b1fa9d9849182b19aebe5bad1570fb82452b.tar.xz ice-7ba5b1fa9d9849182b19aebe5bad1570fb82452b.zip | |
Fixed (ICE-4894) - Native SSL implementation for OS X
Diffstat (limited to 'java/src/IceInternal/PropertyNames.java')
| -rw-r--r-- | java/src/IceInternal/PropertyNames.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java index 9859bfcac97..51aaf7ee700 100644 --- a/java/src/IceInternal/PropertyNames.java +++ b/java/src/IceInternal/PropertyNames.java @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Jun 4 19:01:29 2014 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Jun 5 21:19:31 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -111,8 +111,7 @@ public final class PropertyNames new Property("Ice\\.IPv6", false, null), new Property("Ice\\.EventLog\\.Source", false, null), new Property("Ice\\.FactoryAssemblies", false, null), - new Property("Ice\\.GC", false, null), - new Property("Ice\\.GC\\.Interval", true, "Ice.GC"), + new Property("Ice\\.CollectObjects", false, null), new Property("Ice\\.ImplicitContext", false, null), new Property("Ice\\.InitPlugins", false, null), new Property("Ice\\.LogFile", false, null), @@ -157,7 +156,6 @@ public final class PropertyNames new Property("Ice\\.ThreadPool\\.Server\\.ThreadPriority", false, null), new Property("Ice\\.ThreadPriority", false, null), new Property("Ice\\.Trace\\.Admin\\.Properties", false, null), - new Property("Ice\\.Trace\\.GC", true, null), new Property("Ice\\.Trace\\.Locator", false, null), new Property("Ice\\.Trace\\.Network", false, null), new Property("Ice\\.Trace\\.Protocol", false, null), @@ -816,12 +814,15 @@ public final class PropertyNames new Property("IceSSL\\.Ciphers", false, null), new Property("IceSSL\\.DefaultDir", false, null), new Property("IceSSL\\.DH\\.[^\\s]+", false, null), + new Property("IceSSL\\.DHParams", false, null), new Property("IceSSL\\.EntropyDaemon", false, null), new Property("IceSSL\\.FindCert\\.[^\\s]+", false, null), new Property("IceSSL\\.ImportCert\\.[^\\s]+", false, null), new Property("IceSSL\\.InitOpenSSL", false, null), new Property("IceSSL\\.KeyFile", false, null), new Property("IceSSL\\.KeySet", false, null), + new Property("IceSSL\\.Keychain", false, null), + new Property("IceSSL\\.KeychainPassword", false, null), new Property("IceSSL\\.Keystore", false, null), new Property("IceSSL\\.KeystorePassword", false, null), new Property("IceSSL\\.KeystoreType", false, null), @@ -830,6 +831,8 @@ public final class PropertyNames new Property("IceSSL\\.PasswordRetryMax", false, null), new Property("IceSSL\\.PersistKeySet", false, null), new Property("IceSSL\\.Protocols", false, null), + new Property("IceSSL\\.ProtocolVersionMax", false, null), + new Property("IceSSL\\.ProtocolVersionMin", false, null), new Property("IceSSL\\.Random", false, null), new Property("IceSSL\\.Trace\\.Security", false, null), new Property("IceSSL\\.TrustOnly", false, null), |