diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-08-29 11:24:49 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-08-29 11:24:49 -0400 |
| commit | 33702f21d02bd543f365e4db6e118ba5257c109b (patch) | |
| tree | 5ee69df98dcb14ba47d60e727c59f6f1018692a5 /java/src/IceInternal/PropertyNames.java | |
| parent | Minor fix for JS OutgoingConnectionFactory (diff) | |
| download | ice-33702f21d02bd543f365e4db6e118ba5257c109b.tar.bz2 ice-33702f21d02bd543f365e4db6e118ba5257c109b.tar.xz ice-33702f21d02bd543f365e4db6e118ba5257c109b.zip | |
New fix for ICE-5637: Glacier2CryptPermissionsVerifier plugin + Glacier2Internal::setupNullPermissionsVerifier function
Diffstat (limited to 'java/src/IceInternal/PropertyNames.java')
| -rw-r--r-- | java/src/IceInternal/PropertyNames.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java index 5d7a635acd8..b494f0eefe1 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 Aug 18 23:51:46 2014 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Aug 29 11:20:17 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -1080,6 +1080,7 @@ public final class PropertyNames new Property("Glacier2\\.Client\\.Trace\\.Override", false, null), new Property("Glacier2\\.Client\\.Trace\\.Reject", false, null), new Property("Glacier2\\.Client\\.Trace\\.Request", false, null), + new Property("Glacier2\\.CryptPasswords", false, null), new Property("Glacier2\\.Filter\\.Address\\.Reject", false, null), new Property("Glacier2\\.Filter\\.Address\\.Accept", false, null), new Property("Glacier2\\.Filter\\.ProxySizeMax", false, null), @@ -1087,7 +1088,6 @@ public final class PropertyNames new Property("Glacier2\\.Filter\\.Category\\.AcceptUser", false, null), new Property("Glacier2\\.Filter\\.AdapterId\\.Accept", false, null), new Property("Glacier2\\.Filter\\.Identity\\.Accept", false, null), - new Property("Glacier2\\.CryptPasswords", false, null), new Property("Glacier2\\.InstanceName", false, null), new Property("Glacier2\\.PermissionsVerifier\\.EndpointSelection", false, null), new Property("Glacier2\\.PermissionsVerifier\\.ConnectionCached", false, null), @@ -1179,6 +1179,13 @@ public final class PropertyNames null }; + public static final Property Glacier2CryptPermissionsVerifierProps[] = + { + new Property("Glacier2CryptPermissionsVerifier\\.[^\\s]+\\.PermissionsVerifier", false, null), + new Property("Glacier2CryptPermissionsVerifier\\.[^\\s]+\\.AdminPermissionsVerifier", false, null), + null + }; + public static final Property FreezeProps[] = { new Property("Freeze\\.DbEnv\\.[^\\s]+\\.CheckpointPeriod", false, null), @@ -1226,6 +1233,7 @@ public final class PropertyNames IceSSLProps, IceStormAdminProps, Glacier2Props, + Glacier2CryptPermissionsVerifierProps, FreezeProps, null }; @@ -1245,6 +1253,7 @@ public final class PropertyNames "IceSSL", "IceStormAdmin", "Glacier2", + "Glacier2CryptPermissionsVerifier", "Freeze", null }; |