diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-10 08:47:19 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-10 08:47:19 +0200 |
| commit | b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80 (patch) | |
| tree | d3e9e9340064538a8dc7a645260d0eb3cdf55d63 /java/src/IceInternal/PropertyNames.java | |
| parent | Undo bogus change from an earlier commit. (diff) | |
| download | ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.tar.bz2 ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.tar.xz ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.zip | |
ICE-5582 (SOCKs test), ICE-5314 (HTTP proxies), major refactoring of networking code (addition of StreamSocket class abstraction)
Diffstat (limited to 'java/src/IceInternal/PropertyNames.java')
| -rw-r--r-- | java/src/IceInternal/PropertyNames.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java index 82607dfd1c9..e6669cba0dc 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, Mon Sep 8 11:41:52 2014 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Sep 9 11:19:09 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -80,6 +80,7 @@ public final class PropertyNames new Property("Ice\\.ChangeUser", false, null), new Property("Ice\\.ClientAccessPolicyProtocol", false, null), new Property("Ice\\.Compression\\.Level", false, null), + new Property("Ice\\.CollectObjects", false, null), new Property("Ice\\.Config", false, null), new Property("Ice\\.ConsoleListener", false, null), new Property("Ice\\.Default\\.CollocationOptimized", false, null), @@ -114,13 +115,14 @@ public final class PropertyNames new Property("Ice\\.Default\\.SlicedFormat", false, null), new Property("Ice\\.Default\\.SourceAddress", false, null), new Property("Ice\\.Default\\.Timeout", false, null), - new Property("Ice\\.IPv4", false, null), - new Property("Ice\\.IPv6", false, null), new Property("Ice\\.EventLog\\.Source", false, null), new Property("Ice\\.FactoryAssemblies", false, null), - new Property("Ice\\.CollectObjects", false, null), + new Property("Ice\\.HTTPProxyHost", false, null), + new Property("Ice\\.HTTPProxyPort", false, null), new Property("Ice\\.ImplicitContext", false, null), new Property("Ice\\.InitPlugins", false, null), + new Property("Ice\\.IPv4", false, null), + new Property("Ice\\.IPv6", false, null), new Property("Ice\\.LogFile", false, null), new Property("Ice\\.LogStdErr\\.Convert", false, null), new Property("Ice\\.MessageSizeMax", false, null), |