Changeset 1579
- Timestamp:
- 04/16/09 17:44:58 (16 years ago)
- Location:
- trunk/sources
- Files:
-
- 1 deleted
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/HeuristicLab.Hive.Client.Communication-3.2.csproj
r1534 r1579 4 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 5 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 6 <ProductVersion>9.0. 30729</ProductVersion>6 <ProductVersion>9.0.21022</ProductVersion> 7 7 <SchemaVersion>2.0</SchemaVersion> 8 8 <ProjectGuid>{AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}</ProjectGuid> … … 96 96 </ItemGroup> 97 97 <ItemGroup> 98 <None Include="app.config" />99 98 <None Include="HeuristicLab.snk" /> 100 99 <None Include="Properties\AssemblyInfo.frame" /> -
trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs
r1530 r1579 75 75 try { 76 76 proxy = new ClientCommunicatorClient( 77 new NetTcpBinding(SecurityMode.None, true),77 WcfSettings.GetBinding(), 78 78 new EndpointAddress("net.tcp://" + ServerIP + ":" + ServerPort + "/HiveServer/ClientCommunicator") 79 79 ); -
trunk/sources/HeuristicLab.Hive.Client.Console/3.2/HeuristicLab.Hive.Client.Console-3.2.csproj
r1534 r1579 4 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 5 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 6 <ProductVersion>9.0. 30729</ProductVersion>6 <ProductVersion>9.0.21022</ProductVersion> 7 7 <SchemaVersion>2.0</SchemaVersion> 8 8 <ProjectGuid>{8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}</ProjectGuid> … … 121 121 <EmbeddedResource Include="EventLogEntryForm.resx"> 122 122 <DependentUpon>EventLogEntryForm.cs</DependentUpon> 123 <SubType>Designer</SubType> 123 124 </EmbeddedResource> 124 125 <EmbeddedResource Include="HiveClientConsole.resx"> … … 133 134 <EmbeddedResource Include="Recurrence.resx"> 134 135 <DependentUpon>Recurrence.cs</DependentUpon> 136 <SubType>Designer</SubType> 135 137 </EmbeddedResource> 136 138 <Compile Include="Properties\Resources.Designer.cs"> … … 164 166 </ItemGroup> 165 167 <ItemGroup> 168 <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj"> 169 <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project> 170 <Name>HeuristicLab.Hive.Contracts-3.2</Name> 171 </ProjectReference> 166 172 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj"> 167 173 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project> -
trunk/sources/HeuristicLab.Hive.Client.Console/3.2/HiveClientConsole.cs
r1530 r1579 31 31 using HeuristicLab.Hive.Client.Console.ClientService; 32 32 using ZedGraph; 33 using HeuristicLab.Hive.Contracts; 33 34 34 35 namespace HeuristicLab.Hive.Client.Console … … 108 109 try 109 110 { 110 cccc = new ClientConsoleCommunicatorClient(new NetTcpBinding(), new EndpointAddress(ENDPOINTADRESS)); 111 //changed by MB, 16.04.09 112 //cccc = new ClientConsoleCommunicatorClient(new NetTcpBinding(), new EndpointAddress(ENDPOINTADRESS)); 113 cccc = new ClientConsoleCommunicatorClient(WcfSettings.GetBinding(), new EndpointAddress(ENDPOINTADRESS)); 111 114 cccc.GetStatusInfosCompleted += new EventHandler<GetStatusInfosCompletedEventArgs>(cccc_GetStatusInfosCompleted); 112 115 cccc.GetCurrentConnectionCompleted += new EventHandler<GetCurrentConnectionCompletedEventArgs>(cccc_GetCurrentConnectionCompleted); -
trunk/sources/HeuristicLab.Hive.Client.Console/3.2/app.config
r1530 r1579 6 6 </sectionGroup> 7 7 </configSections> 8 <system.serviceModel> 9 <bindings> 10 <netTcpBinding> 11 <binding name="NetTcpBinding_IClientConsoleCommunicator" closeTimeout="00:01:00" 12 openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" 13 transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions" 14 hostNameComparisonMode="StrongWildcard" listenBacklog="10" 15 maxBufferPoolSize="524288" maxBufferSize="65536" maxConnections="10" 16 maxReceivedMessageSize="65536"> 17 <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" 18 maxBytesPerRead="4096" maxNameTableCharCount="16384" /> 19 <reliableSession ordered="true" inactivityTimeout="00:10:00" 20 enabled="false" /> 21 <security mode="None"> 22 <transport clientCredentialType="None" protectionLevel="None" /> 23 <message clientCredentialType="None" /> 24 </security> 25 </binding> 26 </netTcpBinding> 27 </bindings> 28 <client> 29 <endpoint address="net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator" 30 binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IClientConsoleCommunicator" 31 contract="ClientService.IClientConsoleCommunicator" name="NetTcpBinding_IClientConsoleCommunicator"> 32 <identity> 33 <userPrincipalName value="mse08026@fhs-hagenberg.ac.at" /> 34 </identity> 35 </endpoint> 36 </client> 37 </system.serviceModel> 38 <userSettings> 8 <userSettings> 39 9 <HeuristicLab.Hive.Client.Console.Properties.Settings> 40 10 <setting name="IpAdress" serializeAs="String"> -
trunk/sources/HeuristicLab.Hive.Client.Core/3.2/ClientConsoleService/ClientConsoleServer.cs
r919 r1579 7 7 using HeuristicLab.PluginInfrastructure; 8 8 using HeuristicLab.Hive.Client.Core.ClientConsoleService.Interfaces; 9 using HeuristicLab.Hive.Contracts; 9 10 10 11 namespace HeuristicLab.Hive.Client.Core.ClientConsoleService { … … 36 37 uriTcp); 37 38 38 System.ServiceModel.Channels.Binding binding =39 new NetTcpBinding();40 41 39 serviceHost.AddServiceEndpoint( 42 40 typeof(IClientConsoleCommunicator), 43 binding,41 WcfSettings.GetBinding(), 44 42 "ClientConsoleCommunicator"); 45 43 -
trunk/sources/HeuristicLab.Hive.Contracts/3.2/WcfSettings.cs
r1530 r1579 1 using System; 1 #define USE_MSG_BINDING 2 using System; 2 3 using System.Collections.Generic; 3 4 using System.Linq; … … 11 12 public static class WcfSettings { 12 13 14 public const string SERVERCERT = "HIVE-Server"; 15 public const int DEFAULTPORT = 9000; 16 17 /// <summary> 18 /// Gets a pre-defined binding using TCP for secure transport. 19 /// </summary> 20 /// <returns>A binding type of <see cref="NetTcpBinding"/></returns> 13 21 public static Binding GetBinding() { 22 #if USE_MSG_BINDING 14 23 NetTcpBinding binding = new NetTcpBinding(SecurityMode.Message); 24 #else 25 NetTcpBinding binding = new NetTcpBinding(SecurityMode.TransportWithMessageCredential); 26 binding.Security.Message.ClientCredentialType = MessageCredentialType.Certificate; 27 #endif 15 28 return binding; 16 29 } 17 30 31 /// <summary> 32 /// Defines the used certificate for authentification located in a certification store. 33 /// </summary> 34 /// <param name="svchost">A service for which this certificate is applicable.</param> 35 public static void SetServiceCertificate(ServiceHost svchost) { 36 svchost.Credentials.ServiceCertificate.SetCertificate( 37 StoreLocation.LocalMachine, 38 StoreName.My, 39 X509FindType.FindBySubjectName, 40 SERVERCERT); 41 } 42 43 /// <summary> 44 /// Gets the currently active IP address. 45 /// <remarks>If more than one IP connections is active, the first one will be used.</remarks> 46 /// </summary> 47 /// <returns></returns> 18 48 public static string GetActiveIP() { 19 49 return System.Net.NetworkInformation.IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections()[0].LocalEndPoint.Address.ToString(); 20 50 } 21 51 52 /// <summary> 53 /// Gets the default port used for HIVE services. 54 /// </summary> 55 /// <returns></returns> 22 56 public static int GetDefaultPort() { 23 return 9000;57 return DEFAULTPORT; 24 58 } 25 59 } 26 60 27 // WARNUNG: Dieser Code wird nur für Testzertifikate benötigt, wie sie beispielsweise von makecert erstellt werden. 28 // Sie sollten diesen Code nicht in einer Produktionsumgebung verwenden. 61 /// <summary> 62 /// This class verifies the certificate defined by <see cref="SetServerCertificate"></see> method. Normally, 63 /// the verification process is managed by the underlying operating system. 64 /// </summary> 65 /// <remarks> 66 /// WARNUNG: Dieser Code wird nur für Testzertifikate benötigt, wie sie beispielsweise von makecert erstellt werden. 67 /// Sie sollten diesen Code nicht in einer Produktionsumgebung verwenden. 68 /// </remarks> 29 69 public class PermissiveCertificatePolicy { 30 70 string subjectName; … … 44 84 return true; 45 85 } 46 47 86 return false; 48 87 } -
trunk/sources/HeuristicLab.Hive.Engine/3.2/HeuristicLab.Hive.Engine-3.2.csproj
r1534 r1579 4 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 5 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 6 <ProductVersion>9.0. 30729</ProductVersion>6 <ProductVersion>9.0.21022</ProductVersion> 7 7 <SchemaVersion>2.0</SchemaVersion> 8 8 <ProjectGuid>{C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}</ProjectGuid> … … 130 130 <EmbeddedResource Include="HiveEngineEditor.resx"> 131 131 <DependentUpon>HiveEngineEditor.cs</DependentUpon> 132 <SubType>Designer</SubType> 132 133 </EmbeddedResource> 133 134 </ItemGroup> -
trunk/sources/HeuristicLab.Hive.Server.Console/3.2/ServiceLocator.cs
r1530 r1579 6 6 using HeuristicLab.Hive.Contracts.Interfaces; 7 7 using System.ServiceModel; 8 using HeuristicLab.Hive.Contracts; 8 9 9 10 namespace HeuristicLab.Hive.Server.ServerConsole { … … 27 28 Port != String.Empty) { 28 29 29 NetTcpBinding binding = 30 new NetTcpBinding(SecurityMode.None, true); 31 32 binding.MaxReceivedMessageSize = 5000000; 30 //binding.MaxReceivedMessageSize = 5000000; 33 31 34 32 ChannelFactory<IServerConsoleFacade> factory = 35 33 new ChannelFactory<IServerConsoleFacade>( 36 binding,34 WcfSettings.GetBinding(), 37 35 new EndpointAddress("net.tcp://" + Address + ":" + Port + "/HiveServerConsole/ServerConsoleFacade")); 38 36 -
trunk/sources/HeuristicLab.Hive.Server/3.2/HiveServerApplication.cs
r1530 r1579 36 36 AutoRestart = true)] 37 37 public class HiveServerApplication : ApplicationBase { 38 private const int DEFAULT_PORT = 9000;39 38 public const string STR_ClientCommunicator = "ClientCommunicator"; 40 39 public const string STR_ServerConsoleFacade = "ServerConsoleFacade"; … … 43 42 private DiscoveryService discService = new DiscoveryService(); 44 43 private Dictionary<string, ServiceHost> runningServices = new Dictionary<string, ServiceHost>(); 45 private NetTcpBinding binding = new NetTcpBinding(SecurityMode.None, true); 46 //private WSHttpBinding binding = new WSHttpBinding(SecurityMode.TransportWithMessageCredential, true); 44 private NetTcpBinding binding = (NetTcpBinding)WcfSettings.GetBinding(); 47 45 48 46 private enum Services { … … 105 103 if ((serviceHost != null) && (!String.IsNullOrEmpty(curServiceHost))) { 106 104 AddMexEndpoint(serviceHost); 105 WcfSettings.SetServiceCertificate(serviceHost); 107 106 serviceHost.Open(); 108 107 runningServices.Add(curServiceHost, serviceHost); … … 146 145 Dictionary<string, Uri> baseAddrDict = new Dictionary<string, Uri>(); 147 146 baseAddrDict.Add(STR_ClientCommunicator, 148 StartService(Services.ClientCommunicator, addresses[index], DEFAULT_PORT));147 StartService(Services.ClientCommunicator, addresses[index], WcfSettings.DEFAULTPORT)); 149 148 baseAddrDict.Add(STR_ServerConsoleFacade, 150 StartService(Services.ServerConsoleFacade, addresses[index], DEFAULT_PORT));149 StartService(Services.ServerConsoleFacade, addresses[index], WcfSettings.DEFAULTPORT)); 151 150 baseAddrDict.Add(STR_ExecutionEngineFacade, 152 StartService(Services.ExecutionEngineFacade, addresses[index], DEFAULT_PORT));151 StartService(Services.ExecutionEngineFacade, addresses[index], WcfSettings.DEFAULTPORT)); 153 152 154 153 ILifecycleManager[] lifecycleManagers = discService.GetInstances<ILifecycleManager>();
Note: See TracChangeset
for help on using the changeset viewer.