diff options
Diffstat (limited to 'cpp')
20 files changed, 111 insertions, 183 deletions
diff --git a/cpp/demo/Glacier2/chat/config.glacier2 b/cpp/demo/Glacier2/chat/config.glacier2 index df8cf551dd5..e1bc1dd5f24 100644 --- a/cpp/demo/Glacier2/chat/config.glacier2 +++ b/cpp/demo/Glacier2/chat/config.glacier2 @@ -6,13 +6,26 @@ Glacier2.InstanceName=DemoGlacier2 # # The client-visible endpoint of Glacier2. This should be an endpoint # visible from the public Internet, and it should be secure. +# +# When no -h <host> option is specified in the endpoints, the default +# value from the Ice.Default.Host property is used. If this property +# isn't set, the endpoints will listen on all available network +# interfaces. # -Glacier2.Client.Endpoints=tcp -p 4063 -h 127.0.0.1:ssl -p 4064 -h 127.0.0.1:ws -p 5063 -h 127.0.0.1:wss -p 5064 -h 127.0.0.1 +Glacier2.Client.Endpoints=tcp -p 4063:ssl -p 4064:ws -p 5063:wss -p 5064 # -# We need to disable VerifyPeer for secure WebSocket (WSS) and Windows Store App clients. +# Only listen on the localhost interface by default. You can comment +# out this property to allow listening on all available interfaces. # -IceSSL.VerifyPeer=0 +Ice.Default.Host=127.0.0.1 + +# +# For secure WebSocket (WSS) clients and Windows Store App clients, +# you should disable this property. JavaScript browser clients and +# Windows Store App clients don't use client-side authentication. +# +#IceSSL.VerifyPeer=0 # # The server-visible endpoint of Glacier2. This endpoint is only @@ -66,13 +79,6 @@ IceSSL.Keychain=glacier2.keychain IceSSL.KeychainPassword=password # -# Uncomment the properties below if you want run the demo with the -# Windows Store App chat client. -# -#Glacier2.Client.Endpoints=ssl -p 4064 -#IceSSL.DefaultDir=../../../../certs/winrt - -# # IceMX configuration. # #Ice.Admin.Endpoints=tcp -h localhost -p 10004 diff --git a/cpp/demo/Glacier2/winrt/chat/Package.appxmanifest b/cpp/demo/Glacier2/winrt/chat/Package.appxmanifest index 7ad321278b9..8f5d7754192 100644 --- a/cpp/demo/Glacier2/winrt/chat/Package.appxmanifest +++ b/cpp/demo/Glacier2/winrt/chat/Package.appxmanifest @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest"> <Identity Name="46e81031-9c5b-4caa-92cb-57fbccb3dc93" Publisher="CN=ZeroC Glacier2 Chat App" Version="1.1.0.0" /> <Properties> @@ -32,10 +32,10 @@ <Extensions> <Extension Category="windows.certificates"> <Certificates> - <Certificate StoreName="Root" Content="cacert.pem" /> - <Certificate StoreName="CA" Content="cacert.pem" /> + <Certificate StoreName="Root" Content="cacert.der" /> + <Certificate StoreName="CA" Content="cacert.der" /> <TrustFlags ExclusiveTrust="true" /> </Certificates> </Extension> </Extensions> -</Package>
\ No newline at end of file +</Package> diff --git a/cpp/demo/Glacier2/winrt/chat/README.txt b/cpp/demo/Glacier2/winrt/chat/README.txt index 23ff2b90267..68e4a4959e3 100644 --- a/cpp/demo/Glacier2/winrt/chat/README.txt +++ b/cpp/demo/Glacier2/winrt/chat/README.txt @@ -9,11 +9,11 @@ uncomment the IceSSL.VerifyPeer=0 property. If you run the client from a remote device such as the Surface, you will also need to regenerate the server certificate to ensure the certificate common name is set to the IP address of the server. To regenerate the certificate, you can -run the makewinrtcerts.py Python script from the certs directory at -the top of this distribution. For example: +run the makecerts.py Python script from the certs directory at the top +of this distribution. For example: > cd certs - > makewinrtcerts.py 192.168.1.53 + > makecerts.py 192.168.1.53 This will regenerate a server certificate with a common name set to 192.168.1.53. This can either be set to an IP address or DNS name, the diff --git a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj index 17c0770cf08..19d6b5c1d53 100644 --- a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj +++ b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> @@ -193,7 +193,7 @@ <AppxManifest Include="Package.appxmanifest"> <SubType>Designer</SubType> </AppxManifest> - <None Include="..\..\..\..\..\certs\winrt\cacert.pem"> + <None Include="..\..\..\..\..\certs\cacert.der"> <DeploymentContent>true</DeploymentContent> </None> <None Include="Chat.ice" /> @@ -242,4 +242,4 @@ <UserProperties ZerocIce_ProjectVersion="3.6" ZerocIce_Enabled="True" /> </VisualStudio> </ProjectExtensions> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj.filters b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj.filters index 8e44081f10a..df920f4c9fc 100644 --- a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj.filters +++ b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Common"> @@ -44,7 +44,7 @@ </ItemGroup> <ItemGroup> <None Include="Chat.ice" /> - <None Include="..\..\..\..\..\certs\winrt\cacert.pem" /> + <None Include="..\..\..\..\..\certs\cacert.der" /> <None Include="chat_TemporaryKey.pfx" /> </ItemGroup> <ItemGroup> @@ -58,4 +58,4 @@ <ItemGroup> <AppxManifest Include="Package.appxmanifest" /> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/demo/Ice/hello/config.server b/cpp/demo/Ice/hello/config.server index 9381d16a1f2..bb96a7a798b 100644 --- a/cpp/demo/Ice/hello/config.server +++ b/cpp/demo/Ice/hello/config.server @@ -3,17 +3,25 @@ # "Hello". The following line sets the endpoints for this # adapter. # +# When no -h <host> option is specified in the endpoints, the default +# value from the Ice.Default.Host property is used. If this property +# isn't set, the endpoints will listen on all available network +# interfaces. +# Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001:ws -p 10002:wss -p 10003 # -# Only listen on the localhost interface by default. +# Only listen on the localhost interface by default. You can comment +# out this property to allow listening on all available interfaces. # Ice.Default.Host=localhost # -# We need to disable VerifyPeer for secure WebSocket (WSS) and Windows Store App clients. +# For secure WebSocket (WSS) clients and Windows Store App clients, +# you should disable this property. JavaScript browser clients and +# Windows Store App clients don't use client-side authentication. # -IceSSL.VerifyPeer=0 +#IceSSL.VerifyPeer=0 # # Warn about connection exceptions @@ -58,14 +66,6 @@ IceSSL.Keychain=server.keychain IceSSL.KeychainPassword=password # -# Uncomment the properties below if you want run the demo with the -# Windows Store App hello client. -# -#Ice.Default.Host= -#Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 -#IceSSL.DefaultDir=../../../../certs/winrt - -# # IceMX configuration # #Ice.Admin.Endpoints=tcp -p 10004 diff --git a/cpp/demo/Ice/latency/config.server b/cpp/demo/Ice/latency/config.server index 58bdc036da1..198f27bb539 100644 --- a/cpp/demo/Ice/latency/config.server +++ b/cpp/demo/Ice/latency/config.server @@ -5,14 +5,17 @@ Latency.Endpoints=tcp -p 10000:ssl -p 10001:ws -p 10002:wss -p 10003 # -# Only listen on the localhost interface by default. +# Only listen on the localhost interface by default. You can comment +# out this property to allow listening on all available interfaces. # Ice.Default.Host=localhost # -# We need to disable VerifyPeer for secure WebSocket (WSS) clients. +# For secure WebSocket (WSS) clients you should disable this +# property. JavaScript browser clients don't use client-side +# authentication. # -IceSSL.VerifyPeer=0 +#IceSSL.VerifyPeer=0 # # Warn about connection exceptions diff --git a/cpp/demo/Ice/throughput/config.server b/cpp/demo/Ice/throughput/config.server index 532326d86f7..babd85df454 100644 --- a/cpp/demo/Ice/throughput/config.server +++ b/cpp/demo/Ice/throughput/config.server @@ -6,14 +6,17 @@ Throughput.Endpoints=tcp -p 10000:ssl -p 10001:ws -p 10002:wss -p 10003 # -# Only listen on the localhost interface by default. +# Only listen on the localhost interface by default. You can comment +# out this property to allow listening on all available interfaces. # Ice.Default.Host=localhost # -# We need to disable VerifyPeer for secure WebSocket (WSS) clients. +# For secure WebSocket (WSS) clients you should disable this +# property. JavaScript browser clients don't use client-side +# authentication. # -IceSSL.VerifyPeer=0 +#IceSSL.VerifyPeer=0 # # Warn about connection exceptions diff --git a/cpp/demo/Ice/winrt/hello/Package.appxmanifest b/cpp/demo/Ice/winrt/hello/Package.appxmanifest index 18092e29240..8ac5ff54ead 100644 --- a/cpp/demo/Ice/winrt/hello/Package.appxmanifest +++ b/cpp/demo/Ice/winrt/hello/Package.appxmanifest @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest"> <Identity Name="be9e42f6-f89b-4671-8754-e408ccec94f0" Publisher="CN=ZeroC Hello App" Version="1.1.0.0" /> <Properties> @@ -33,10 +33,10 @@ <Extensions> <Extension Category="windows.certificates"> <Certificates> - <Certificate StoreName="Root" Content="cacert.pem" /> - <Certificate StoreName="CA" Content="cacert.pem" /> + <Certificate StoreName="Root" Content="cacert.der" /> + <Certificate StoreName="CA" Content="cacert.der" /> <TrustFlags ExclusiveTrust="true" /> </Certificates> </Extension> </Extensions> -</Package>
\ No newline at end of file +</Package> diff --git a/cpp/demo/Ice/winrt/hello/README.txt b/cpp/demo/Ice/winrt/hello/README.txt index 64fafbac233..08a63dfd18d 100644 --- a/cpp/demo/Ice/winrt/hello/README.txt +++ b/cpp/demo/Ice/winrt/hello/README.txt @@ -9,12 +9,12 @@ configuration file config.server to uncomment the IceSSL.VerifyPeer=0 property. If you run the client from a remote device such as the Surface, you will also need to regenerate the server certificate to ensure the certificate common name is set to the IP address of the -server. To regenerate the certificate, you can run the -makewinrtcerts.py Python script from the certs directory at the top of -this distribution. For example: +server. To regenerate the certificate, you can run the makecerts.py +Python script from the certs directory at the top of this +distribution. For example: > cd certs - > makewinrtcerts.py 192.168.1.53 + > makecerts.py 192.168.1.53 This will regenerate a server certificate with a common name set to 192.168.1.53. This can either be set to an IP address or DNS name, the diff --git a/cpp/demo/Ice/winrt/hello/hello.vcxproj b/cpp/demo/Ice/winrt/hello/hello.vcxproj index aed2bd55634..0cd018b568f 100644 --- a/cpp/demo/Ice/winrt/hello/hello.vcxproj +++ b/cpp/demo/Ice/winrt/hello/hello.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> @@ -181,7 +181,7 @@ <AppxManifest Include="Package.appxmanifest"> <SubType>Designer</SubType> </AppxManifest> - <None Include="..\..\..\..\..\certs\winrt\cacert.pem"> + <None Include="..\..\..\..\..\certs\cacert.der"> <DeploymentContent>true</DeploymentContent> </None> <None Include="Hello.ice" /> @@ -224,4 +224,4 @@ <UserProperties ZerocIce_ProjectVersion="3.6" ZerocIce_Enabled="True" /> </VisualStudio> </ProjectExtensions> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/demo/Ice/winrt/hello/hello.vcxproj.filters b/cpp/demo/Ice/winrt/hello/hello.vcxproj.filters index 6c42a0f7286..b932aad7f5b 100644 --- a/cpp/demo/Ice/winrt/hello/hello.vcxproj.filters +++ b/cpp/demo/Ice/winrt/hello/hello.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Common"> @@ -40,7 +40,7 @@ </ItemGroup> <ItemGroup> <None Include="Hello.ice" /> - <None Include="..\..\..\..\..\certs\winrt\cacert.pem" /> + <None Include="..\..\..\..\..\certs\cacert.der" /> <None Include="hello_TemporaryKey.pfx" /> </ItemGroup> <ItemGroup> @@ -50,6 +50,6 @@ <Text Include="README.txt" /> </ItemGroup> <ItemGroup> - <AppxManifest Include="Package-8.1.appxmanifest" /> + <AppxManifest Include="Package.appxmanifest" /> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/demo/IceDiscovery/hello/config.server b/cpp/demo/IceDiscovery/hello/config.server index 668edbddfba..b00a0113dd7 100644 --- a/cpp/demo/IceDiscovery/hello/config.server +++ b/cpp/demo/IceDiscovery/hello/config.server @@ -33,14 +33,6 @@ IceSSL.Keychain=server.keychain IceSSL.KeychainPassword=password # -# Uncomment the properties below if you want run the demo with the -# Windows Store App hello client. -# -#Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 -#IceSSL.VerifyPeer=0 -#IceSSL.DefaultDir=../../../../certs/winrt - -# # IceMX configuration. # #Ice.Admin.Endpoints=tcp -h localhost -p 10002 diff --git a/cpp/demo/demo-winrt-8.0.sln b/cpp/demo/demo-winrt-8.0.sln deleted file mode 100644 index 8ed37773e1c..00000000000 --- a/cpp/demo/demo-winrt-8.0.sln +++ /dev/null @@ -1,87 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bidir", "Ice\winrt\bidir\bidir.vcxproj", "{4EF04DDD-1B81-4DC7-ADF2-290E22008616}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hello", "Ice\winrt\hello\hello.vcxproj", "{DC1A22CC-0AD9-40CF-9159-952962F71520}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ice", "Ice", "{2EA0DDEB-E230-4ABE-8257-3418A534FD0F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Glacier2", "Glacier2", "{B4B6E47C-00B7-439B-A3D7-04A80F4643B8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chat", "Glacier2\winrt\chat\chat.vcxproj", "{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|ARM.ActiveCfg = Debug|ARM - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|ARM.Build.0 = Debug|ARM - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|ARM.Deploy.0 = Debug|ARM - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|Win32.ActiveCfg = Debug|Win32 - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|Win32.Build.0 = Debug|Win32 - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|Win32.Deploy.0 = Debug|Win32 - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|x64.ActiveCfg = Debug|x64 - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|x64.Build.0 = Debug|x64 - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|x64.Deploy.0 = Debug|x64 - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|ARM.ActiveCfg = Release|ARM - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|ARM.Build.0 = Release|ARM - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|ARM.Deploy.0 = Release|ARM - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|Win32.ActiveCfg = Release|Win32 - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|Win32.Build.0 = Release|Win32 - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|Win32.Deploy.0 = Release|Win32 - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|x64.ActiveCfg = Release|x64 - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|x64.Build.0 = Release|x64 - {4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|x64.Deploy.0 = Release|x64 - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|ARM.ActiveCfg = Debug|ARM - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|ARM.Build.0 = Debug|ARM - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|ARM.Deploy.0 = Debug|ARM - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|Win32.ActiveCfg = Debug|Win32 - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|Win32.Build.0 = Debug|Win32 - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|Win32.Deploy.0 = Debug|Win32 - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|x64.ActiveCfg = Debug|x64 - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|x64.Build.0 = Debug|x64 - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|x64.Deploy.0 = Debug|x64 - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|ARM.ActiveCfg = Release|ARM - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|ARM.Build.0 = Release|ARM - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|ARM.Deploy.0 = Release|ARM - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|Win32.ActiveCfg = Release|Win32 - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|Win32.Build.0 = Release|Win32 - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|Win32.Deploy.0 = Release|Win32 - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|x64.ActiveCfg = Release|x64 - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|x64.Build.0 = Release|x64 - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|x64.Deploy.0 = Release|x64 - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|ARM.ActiveCfg = Debug|ARM - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|ARM.Build.0 = Debug|ARM - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|ARM.Deploy.0 = Debug|ARM - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|Win32.ActiveCfg = Debug|Win32 - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|Win32.Build.0 = Debug|Win32 - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|Win32.Deploy.0 = Debug|Win32 - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|x64.ActiveCfg = Debug|x64 - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|x64.Build.0 = Debug|x64 - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|x64.Deploy.0 = Debug|x64 - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|ARM.ActiveCfg = Release|ARM - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|ARM.Build.0 = Release|ARM - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|ARM.Deploy.0 = Release|ARM - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|Win32.ActiveCfg = Release|Win32 - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|Win32.Build.0 = Release|Win32 - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|Win32.Deploy.0 = Release|Win32 - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|x64.ActiveCfg = Release|x64 - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|x64.Build.0 = Release|x64 - {DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|x64.Deploy.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {4EF04DDD-1B81-4DC7-ADF2-290E22008616} = {2EA0DDEB-E230-4ABE-8257-3418A534FD0F} - {C56BDB5E-9829-49D6-B5EB-9089AD7E89CC} = {B4B6E47C-00B7-439B-A3D7-04A80F4643B8} - {DC1A22CC-0AD9-40CF-9159-952962F71520} = {2EA0DDEB-E230-4ABE-8257-3418A534FD0F} - EndGlobalSection -EndGlobal diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h index 1414bb37f03..5133c4404b6 100644 --- a/cpp/include/Ice/LoggerUtil.h +++ b/cpp/include/Ice/LoggerUtil.h @@ -36,10 +36,10 @@ ICE_API LoggerOutputBase& loggerInsert(LoggerOutputBase& out, const IceUtil::Exc template<typename T> struct IsException { - static char test(IceUtil::Exception*); - static long test(...); + static char testex(IceUtil::Exception*); + static long testex(...); - static const bool value = sizeof(test(static_cast<T*>(0))) == sizeof(char); + static const bool value = sizeof(testex(static_cast<T*>(0))) == sizeof(char); }; template<typename T, bool = false> diff --git a/cpp/include/IceGrid/.headers b/cpp/include/IceGrid/.headers index 973e1bf0a8f..a10f5bdac20 100644 --- a/cpp/include/IceGrid/.headers +++ b/cpp/include/IceGrid/.headers @@ -2,11 +2,13 @@ SDK_HEADERS = \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Admin.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Config.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Descriptor.h \ + $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Discovery.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Exception.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\FileParser.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\IceGrid.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Locator.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Observer.h \ + $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\PluginFacade.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Query.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Registry.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ReplicaGroupFilter.h \ diff --git a/cpp/test/Ice/info/AllTests.cpp b/cpp/test/Ice/info/AllTests.cpp index 6be9365150a..f951c92aa9c 100644 --- a/cpp/test/Ice/info/AllTests.cpp +++ b/cpp/test/Ice/info/AllTests.cpp @@ -32,7 +32,9 @@ allTests(const Ice::CommunicatorPtr& communicator) test(ipEndpoint->host == "tcphost"); test(ipEndpoint->port == 10000); test(ipEndpoint->timeout == 1200); +#if !defined(ICE_OS_WINRT) test(ipEndpoint->sourceAddress == "10.10.10.10"); +#endif test(ipEndpoint->compress); test(!ipEndpoint->datagram()); test((ipEndpoint->type() == Ice::TCPEndpointType && !ipEndpoint->secure()) || @@ -48,7 +50,9 @@ allTests(const Ice::CommunicatorPtr& communicator) test(udpEndpoint); test(udpEndpoint->host == "udphost"); test(udpEndpoint->port == 10001); +#if !defined(ICE_OS_WINRT) test(udpEndpoint->sourceAddress == "10.10.10.10"); +#endif test(udpEndpoint->mcastInterface == "eth0"); test(udpEndpoint->mcastTtl == 5); test(udpEndpoint->timeout == -1); diff --git a/cpp/test/WinRT/TestSuite/Package.appxmanifest b/cpp/test/WinRT/TestSuite/Package.appxmanifest index 419ec7a2af1..54e7c753e07 100644 --- a/cpp/test/WinRT/TestSuite/Package.appxmanifest +++ b/cpp/test/WinRT/TestSuite/Package.appxmanifest @@ -1,24 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> -<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest"> - <Identity Name="9cf3ce93-b7f1-414e-b2bd-7181121c15ac" Publisher="CN=ZeroC" Version="1.0.0.0" /> +<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest"> + <Identity Name="9cf3ce93-b7f1-414e-b2bd-7181121c15ac" Publisher="CN=ZeroC" Version="1.1.0.0" /> <Properties> <DisplayName>Ice Test Suite</DisplayName> <PublisherDisplayName>ZeroC</PublisherDisplayName> <Logo>Assets\StoreLogo.png</Logo> </Properties> <Prerequisites> - <OSMinVersion>6.2.0</OSMinVersion> - <OSMaxVersionTested>6.2.0</OSMaxVersionTested> + <OSMinVersion>6.3</OSMinVersion> + <OSMaxVersionTested>6.3</OSMaxVersionTested> </Prerequisites> <Resources> <Resource Language="x-generate" /> </Resources> <Applications> <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="TestSuite.App"> - <VisualElements DisplayName="Ice Test Suite" Logo="Assets\Logo.png" SmallLogo="Assets\SmallLogo.png" Description="TestSuite" ForegroundText="light" BackgroundColor="#464646"> - <DefaultTile ShowName="allLogos" /> - <SplashScreen Image="Assets\SplashScreen.png" /> - </VisualElements> + <m2:VisualElements DisplayName="Ice Test Suite" Description="TestSuite" BackgroundColor="#464646" ForegroundText="light" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png"> + <m2:DefaultTile> + <m2:ShowNameOnTiles> + <m2:ShowOn Tile="square150x150Logo" /> + </m2:ShowNameOnTiles> + </m2:DefaultTile> + <m2:SplashScreen Image="Assets\SplashScreen.png" /> + </m2:VisualElements> </Application> </Applications> <Capabilities> @@ -28,8 +32,8 @@ <Extensions> <Extension Category="windows.certificates"> <Certificates> - <Certificate StoreName="Root" Content="cacert.pem" /> - <Certificate StoreName="CA" Content="cacert.pem" /> + <Certificate StoreName="Root" Content="cacert.der" /> + <Certificate StoreName="CA" Content="cacert.der" /> <TrustFlags ExclusiveTrust="true" /> </Certificates> </Extension> diff --git a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj index e826de5f680..018a1112ab0 100644 --- a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj +++ b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -30,70 +30,71 @@ <ProjectGuid>{3ce71594-e3a4-4c38-9d0f-46e2a2076f6c}</ProjectGuid> <RootNamespace>TestSuite</RootNamespace> <DefaultLanguage>en-US</DefaultLanguage> - <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath> - <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> + <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> <AppContainerApplication>true</AppContainerApplication> + <ApplicationType>Windows Store</ApplicationType> + <ApplicationTypeRevision>8.1</ApplicationTypeRevision> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" /> + <Import Project="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.6`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.6`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" /> + <Import Project="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.6`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.6`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" /> + <Import Project="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.6`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.6`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" /> + <Import Project="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.6`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.6`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" /> + <Import Project="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.6`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.6`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\Ice\3.6@)\DesignTime\CommonConfiguration\Neutral\Ice.props" /> + <Import Project="$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.6`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props" Condition="exists('$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\$(TargetPlatformIdentifier)\v$(TargetPlatformVersion)\ExtensionSDKS\Ice\3.6`, ``))\DesignTime\CommonConfiguration\Neutral\Ice.props')" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -373,7 +374,7 @@ <None Include="..\..\Ice\udp\Ice_udp_server.dll"> <DeploymentContent>true</DeploymentContent> </None> - <None Include="..\..\..\..\certs\winrt\cacert.pem"> + <None Include="..\..\..\..\certs\cacert.der"> <DeploymentContent>true</DeploymentContent> </None> <None Include="TestSuite_TemporaryKey.pfx" /> @@ -408,7 +409,7 @@ </ImportGroup> <ProjectExtensions> <VisualStudio> - <UserProperties ZerocIce_Enabled="True" ZerocIce_Streaming="False" ZerocIce_ProjectVersion="1" /> + <UserProperties ZerocIce_Streaming="False" ZerocIce_ProjectVersion="3.6" ZerocIce_Enabled="True" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj.filters b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj.filters index 17d799266e4..d03de5397c3 100644 --- a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj.filters +++ b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Common"> @@ -167,7 +167,7 @@ <None Include="..\..\Ice\udp\Ice_udp_server.dll"> <Filter>Tests</Filter> </None> - <None Include="..\..\..\..\certs\winrt\cacert.pem" /> + <None Include="..\..\..\..\certs\cacert.der" /> <None Include="..\..\Ice\operations\Ice_operations_collocated.dll" /> <None Include="..\..\Ice\operations\Ice_operations_server.dll" /> <None Include="..\..\Ice\operations\Ice_operations_serveramd.dll" /> @@ -236,4 +236,4 @@ <ItemGroup> <Page Include="MainPage.xaml" /> </ItemGroup> -</Project>
\ No newline at end of file +</Project> |