diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/doc/Properties.sgml | 65 | ||||
| -rwxr-xr-x | cpp/install/common/components/ice.java.runtime | 1 | ||||
| -rwxr-xr-x | cpp/install/vc71/Ice.ism | 3 | ||||
| -rwxr-xr-x | cpp/install/vc80/Ice.ism | 2 |
4 files changed, 70 insertions, 1 deletions
diff --git a/cpp/doc/Properties.sgml b/cpp/doc/Properties.sgml index fb83f1bb326..608c4a2e9aa 100644 --- a/cpp/doc/Properties.sgml +++ b/cpp/doc/Properties.sgml @@ -5022,6 +5022,71 @@ The default size of the routing table is 1000. </section> </section> +<section><title>Glacier2.Filter.Address.Accept</title> +<section><title>Synopsis</title> +<synopsis> +Glacier2.Filter.Address.Accept=<replaceable>string</replaceable> +</synopsis> +</section> +<section> +<title>Description</title> +<para> +This property specifies a space separated list of address-port pairs. When defined, the &Glacier2; router only allows requests to &Ice; objects through proxies that contain network endpoint information that matches an address-port pair listed in this property. If not defined, the value defaults to <literal>*</literal> which indicates that any network address is permitted. Requests accepted by this property may be rejected by the <literal>Glacier2.Filter.Address.Reject</literal> property. +</para> +<para>Each pair is of the form <replaceable>address:port</replaceable>. The address or port number portion can include wildcards '*' or value ranges or groups. Ranges and groups are in the form of [value1, value2, value3...] and/or [value1-value2]. Wildcards, ranges and groups may appear anywhere in the address-port pair string. +</para> +</section> +</section> + +<section><title>Glacier2.Filter.Address.Reject</title> +<section><title>Synopsis</title> +<synopsis> +Glacier2.Filter.Address.Reject=<replaceable>string</replaceable> +</synopsis> +</section> +<section> +<title>Description</title> +<para> +This property specifies a space separated list of address-port pairs. When defined, the &Glacier2; router rejects requests to &Ice; objects through proxies that contain network endpoint information that matches an address-port pair listed in this property. If not set, the &Glacier2; router allows requests to any network address unless the <literal>Glacier2.Filter.Address.Accept</literal> property is set, in which case requests will be accepted or rejected based on the <literal>Glacier2.Filter.Address.Accept</literal> property. If both the <literal>Glacier2.Filter.Address.Accept<literal> and <literal>Glacier2.Filter.Address.Reject</literal> properties are defined then the <literal>Glacier2.Filter.Address.Reject</literal> property takes precedence over the <literal>Glacier2.Filter.Address.Accept</literal> property. +</para> +<para>Each pair is of the form <replaceable>address:port</replaceable>. The address or port number portion can include wildcards '*' or value ranges or groups. Ranges and groups are in the form of [value1, value2, value3...] and/or [value1-value2]. Wildcards, ranges and groups may appear anywhere in the address-port pair string. +</para> +</section> +</section> + +<section><title>Glacier2.Filter.Category.Accept</title> +<section><title>Synopsis</title> +<synopsis> +Glacier2.Filter.Category.Accept=<replaceable>string</replaceable> +</synopsis> +</section> +<section> +<title>Description</title> +</section> +</section> + +<section><title>Glacier2.Filter.AdapterId.Accept</title> +<section><title>Synopsis</title> +<synopsis> +Glacier2.Filter.AdapterId.Accept=<replaceable>string</replaceable> +</synopsis> +</section> +<section> +<title>Description</title> +</section> +</section> + +<section><title>Glacier2.Filter.Identity.Accept</title> +<section><title>Synopsis</title> +<synopsis> +Glacier2.Filter.AdapterId.Accept=<replaceable>string</replaceable> +</synopsis> +</section> +<section> +<title>Description</title> +</section> +</section> + <section><title>Glacier2.Trace.Session</title> <section><title>Synopsis</title> <synopsis> diff --git a/cpp/install/common/components/ice.java.runtime b/cpp/install/common/components/ice.java.runtime index b08064c7203..d1db27597b1 100755 --- a/cpp/install/common/components/ice.java.runtime +++ b/cpp/install/common/components/ice.java.runtime @@ -1 +1,2 @@ Ice.jar +java5/Ice.jar diff --git a/cpp/install/vc71/Ice.ism b/cpp/install/vc71/Ice.ism index 4cdf67b5b64..6d5a87903d4 100755 --- a/cpp/install/vc71/Ice.ism +++ b/cpp/install/vc71/Ice.ism @@ -1072,7 +1072,8 @@ <row><td>ICE_2.1.0_THIRD_PARTY_PACKAGES</td><td>WindowsVolume</td><td>ICE-2_~1|Ice-2.1.0-ThirdParty</td><td/><td>0</td><td/></row>
<row><td>ICE_3.0.1</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.0.1</td><td/><td>0</td><td/></row>
<row><td>ICE_3.1.0</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.1.0</td><td/><td>0</td><td/></row>
- <row><td>INSTALLDIR</td><td>ICE_3.1.0</td><td>.</td><td/><td>0</td><td/></row>
+ <row><td>ICE_3.1.0_VC71</td><td>WindowsVolume</td><td>ICE-3_~1|Ice-3.1.0-VC71</td><td/><td>0</td><td/></row>
+ <row><td>INSTALLDIR</td><td>ICE_3.1.0_VC71</td><td>.</td><td/><td>0</td><td/></row>
<row><td>ISCommonFilesFolder</td><td>CommonFilesFolder</td><td>Instal~1|InstallShield</td><td/><td>0</td><td/></row>
<row><td>ISMyCompanyDir</td><td>ProgramFilesFolder</td><td>MYCOMP~1|My Company Name</td><td/><td>0</td><td/></row>
<row><td>ISMyProductDir</td><td>WindowsVolume</td><td>ICE-2_~1|Ice-2.1.0</td><td/><td>0</td><td/></row>
diff --git a/cpp/install/vc80/Ice.ism b/cpp/install/vc80/Ice.ism index 83155f22fd4..a12a1a7f7ee 100755 --- a/cpp/install/vc80/Ice.ism +++ b/cpp/install/vc80/Ice.ism @@ -1632,6 +1632,7 @@ <row><td>ice_runtime</td><td>BerkeleyDBJava.VC80.E108EC08_BBAD_487E_894D_AC83937057AD</td><td>0</td></row>
<row><td>ice_runtime</td><td>BerkeleyDBRuntime.VC80.8B4C6A8F_5ED7_425D_98B7_CB354DC66CFB</td><td>0</td></row>
<row><td>ice_runtime</td><td>Bzip2Runtime.VC80.8A1A3328_212D_49E1_B41F_75B30E27102E</td><td>0</td></row>
+ <row><td>ice_runtime</td><td>CRT.98CB24AD_52FB_DB5F_FF1F_C8B3B9A1E18E</td><td>0</td></row>
<row><td>ice_runtime</td><td>ExpatRuntime.VC80.6D0446E4_2246_4BE2_841E_248BD4AE3795</td><td>0</td></row>
<row><td>ice_runtime</td><td>OpenSSLRuntime.VC80.D9B20109_6C0A_461C_ABDD_5B86C7169DC4</td><td>0</td></row>
</table>
@@ -1719,6 +1720,7 @@ <row><td>BerkeleyDBJava.VC80.E108EC08_BBAD_487E_894D_AC83937057AD</td><td>0</td><td>BerkeleyDB Java Runtime for Visual Studio 2005</td><td>[INSTALLDIR]</td><td/></row>
<row><td>BerkeleyDBRuntime.VC80.8B4C6A8F_5ED7_425D_98B7_CB354DC66CFB</td><td>0</td><td>BerkeleyDB Runtime for Visual Studio 2005</td><td>[INSTALLDIR]</td><td/></row>
<row><td>Bzip2Runtime.VC80.8A1A3328_212D_49E1_B41F_75B30E27102E</td><td>0</td><td>Bzip2 Runtime for Visual Studio 2005</td><td>[INSTALLDIR]</td><td/></row>
+ <row><td>CRT.98CB24AD_52FB_DB5F_FF1F_C8B3B9A1E18E</td><td>0</td><td>Visual C++ 8.0 CRT (x86) WinSXS MSM Beta2</td><td/><td/></row>
<row><td>ExpatRuntime.VC80.6D0446E4_2246_4BE2_841E_248BD4AE3795</td><td>0</td><td>Expat Runtime for Visual Studio 2005</td><td>[INSTALLDIR]</td><td/></row>
<row><td>OpenSSLRuntime.VC80.D9B20109_6C0A_461C_ABDD_5B86C7169DC4</td><td>0</td><td>OpenSSL Runtime for Visual Studio 2005</td><td>[INSTALLDIR]</td><td/></row>
</table>
|