diff --git a/wst/trunk/client_utils.pas b/wst/trunk/client_utils.pas index b4e2b80a2..f4d95b5b0 100644 --- a/wst/trunk/client_utils.pas +++ b/wst/trunk/client_utils.pas @@ -38,6 +38,7 @@ Type public constructor Create();override; destructor Destroy();override; + function GetTransportName() : string; virtual; function GetPropertyManager():IPropertyManager; procedure SendAndReceive(ARequest,AResponse:TStream); virtual; function GetCookieManager() : ICookieManager; virtual; @@ -65,12 +66,12 @@ begin inherited; end; -procedure TBaseTransport.SendAndReceive(ARequest, AResponse : TStream); +procedure TBaseTransport.SendAndReceive(ARequest, AResponse : TStream); begin raise ETransportExecption.CreateFmt(SERR_UnsupportedOperation,['SendAndReceive']); end; -function TBaseTransport.GetCookieManager() : ICookieManager; +function TBaseTransport.GetCookieManager() : ICookieManager; begin raise ETransportExecption.CreateFmt(SERR_UnsupportedOperation,['GetCookieManager']); end; @@ -154,6 +155,11 @@ begin Result := locRes; end; +function TBaseTransport.GetTransportName() : string; +begin + Result := ClassName(); +end; + function TBaseTransport.GetPropertyManager() : IPropertyManager; begin Result := FPropMngr; diff --git a/wst/trunk/indy_http_protocol.pas b/wst/trunk/indy_http_protocol.pas index 108d7c3bf..074fa1760 100644 --- a/wst/trunk/indy_http_protocol.pas +++ b/wst/trunk/indy_http_protocol.pas @@ -69,6 +69,7 @@ Type public constructor Create();override; destructor Destroy();override; + function GetTransportName() : string; override; procedure SendAndReceive(ARequest,AResponse:TStream); override; function GetCookieManager() : ICookieManager; override; published @@ -142,6 +143,11 @@ begin Result := FConnection.ProxyParams.ProxyUsername; end; +function THTTPTransport.GetTransportName() : string; +begin + Result := sTRANSPORT_NAME; +end; + procedure THTTPTransport.SetAddress(const AValue: string); begin FConnection.Request.URL := AValue; diff --git a/wst/trunk/indy_tcp_protocol.pas b/wst/trunk/indy_tcp_protocol.pas index 8fadd7cb1..aa7e2638e 100644 --- a/wst/trunk/indy_tcp_protocol.pas +++ b/wst/trunk/indy_tcp_protocol.pas @@ -45,6 +45,7 @@ Type public constructor Create();override; destructor Destroy();override; + function GetTransportName() : string; override; procedure SendAndReceive(ARequest,AResponse:TStream); override; Published property Target : string Read FTarget Write FTarget; @@ -99,6 +100,11 @@ begin inherited Destroy(); end; +function TTCPTransport.GetTransportName() : string; +begin + Result := sTRANSPORT_NAME; +end; + procedure TTCPTransport.SendAndReceive(ARequest, AResponse: TStream); var wrtr : IDataStore; diff --git a/wst/trunk/library_protocol.pas b/wst/trunk/library_protocol.pas index ff032599f..21fc13f52 100644 --- a/wst/trunk/library_protocol.pas +++ b/wst/trunk/library_protocol.pas @@ -44,6 +44,7 @@ Type public constructor Create();override; destructor Destroy();override; + function GetTransportName() : string; override; procedure SendAndReceive(ARequest,AResponse:TStream); override; published property ContentType : string read FContentType write FContentType; @@ -91,6 +92,11 @@ begin inherited Destroy(); end; +function TLIBTransport.GetTransportName() : string; +begin + Result := sTRANSPORT_NAME; +end; + const MAX_ERR_LEN = 500; procedure TLIBTransport.SendAndReceive(ARequest, AResponse: TStream); Var diff --git a/wst/trunk/same_process_protocol.pas b/wst/trunk/same_process_protocol.pas index 2f6ea1882..a644f9e3b 100644 --- a/wst/trunk/same_process_protocol.pas +++ b/wst/trunk/same_process_protocol.pas @@ -35,7 +35,8 @@ Type FAdress: string; FContentType: string; FFormat : string; - Public + Public + function GetTransportName() : string; override; procedure SendAndReceive(ARequest,AResponse:TStream); override; Published property ContentType : string Read FContentType Write FContentType; @@ -50,6 +51,11 @@ implementation { TInProcessTransport } +function TInProcessTransport.GetTransportName() : string; +begin + Result := sTRANSPORT_NAME; +end; + procedure TInProcessTransport.SendAndReceive(ARequest, AResponse: TStream); Var bffr : IRequestBuffer; diff --git a/wst/trunk/service_intf.pas b/wst/trunk/service_intf.pas index e503684b9..02c2b1da7 100644 --- a/wst/trunk/service_intf.pas +++ b/wst/trunk/service_intf.pas @@ -38,6 +38,7 @@ Type ITransport = Interface ['{AEB6677A-9620-4E7D-82A0-43E3C4C52B43}'] + function GetTransportName() : string; function GetPropertyManager():IPropertyManager; procedure SendAndReceive(ARequest,AResponse:TStream); function GetCookieManager() : ICookieManager; diff --git a/wst/trunk/synapse_http_protocol.pas b/wst/trunk/synapse_http_protocol.pas index 740ebda84..00d32ff41 100644 --- a/wst/trunk/synapse_http_protocol.pas +++ b/wst/trunk/synapse_http_protocol.pas @@ -69,7 +69,8 @@ Type procedure SetProxyUsername(const AValue: string); Public constructor Create();override; - destructor Destroy();override; + destructor Destroy();override; + function GetTransportName() : string; override; procedure SendAndReceive(ARequest,AResponse:TStream); override; function GetCookieManager() : ICookieManager; override; Published @@ -165,6 +166,11 @@ begin inherited Destroy(); end; +function THTTPTransport.GetTransportName() : string; +begin + Result := sTRANSPORT_NAME; +end; + procedure THTTPTransport.SendAndReceive(ARequest, AResponse: TStream); {$IFDEF WST_DBG} procedure Display(const AStr : string); diff --git a/wst/trunk/synapse_tcp_protocol.pas b/wst/trunk/synapse_tcp_protocol.pas index b856aabd4..6f881cc5c 100644 --- a/wst/trunk/synapse_tcp_protocol.pas +++ b/wst/trunk/synapse_tcp_protocol.pas @@ -45,7 +45,8 @@ Type procedure Connect(); public constructor Create();override; - destructor Destroy();override; + destructor Destroy();override; + function GetTransportName() : string; override; procedure SendAndReceive(ARequest,AResponse:TStream); override; Published property Target : string Read FTarget Write FTarget; @@ -99,6 +100,11 @@ begin inherited Destroy(); end; +function TTCPTransport.GetTransportName() : string; +begin + Result := sTRANSPORT_NAME; +end; + procedure TTCPTransport.SendAndReceive(ARequest, AResponse: TStream); procedure ReadResponse(ADest : TStream);