diff --git a/Source/ApplicationBase/Usuarios/Data/uUCROConn.pas b/Source/ApplicationBase/Usuarios/Data/uUCROConn.pas
index d8cf9119..46985b4f 100644
Binary files a/Source/ApplicationBase/Usuarios/Data/uUCROConn.pas and b/Source/ApplicationBase/Usuarios/Data/uUCROConn.pas differ
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 1e02efb7..47ff6a76 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -44,6 +44,8 @@
Package
FalseTrueFalseLibreria base de FactuGESTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
+
+
Microsoft Office 2000 Sample Automation Server Wrapper Components
Microsoft Office XP Sample Automation Server Wrapper Components
Base.dpk
@@ -53,58 +55,58 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
TForm
diff --git a/Source/Base/Conexion/uDataModuleConexion.dfm b/Source/Base/Conexion/uDataModuleConexion.dfm
index 8c5d9696..e96d43ec 100644
--- a/Source/Base/Conexion/uDataModuleConexion.dfm
+++ b/Source/Base/Conexion/uDataModuleConexion.dfm
@@ -8,21 +8,12 @@ object dmConexion: TdmConexion
Left = 42
Top = 88
end
- object ROChannel: TROIndyHTTPChannel
- OnFailure = ROChannelFailure
- OnException = ROChannelFailure
+ object ROChannel: TROWinInetHTTPChannel
+ UserAgent = 'RemObjects SDK'
+ TargetURL = 'http://localhost:8099/bin'
ServerLocators = <>
DispatchOptions = []
- IndyClient.AllowCookies = True
- IndyClient.ProxyParams.BasicAuthentication = False
- IndyClient.ProxyParams.ProxyPort = 0
- IndyClient.Request.ContentLength = -1
- IndyClient.Request.Accept = 'text/html, */*'
- IndyClient.Request.BasicAuthentication = False
- IndyClient.Request.UserAgent = 'RemObjects SDK'
- IndyClient.HTTPOptions = [hoForceEncodeParams]
- TargetURL = 'http://localhost:8099/bin'
- Left = 40
- Top = 16
+ Left = 48
+ Top = 8
end
end
diff --git a/Source/Base/Conexion/uDataModuleConexion.pas b/Source/Base/Conexion/uDataModuleConexion.pas
index 3bff79e0..0e30e21a 100644
--- a/Source/Base/Conexion/uDataModuleConexion.pas
+++ b/Source/Base/Conexion/uDataModuleConexion.pas
@@ -5,7 +5,7 @@ interface
uses
SysUtils, Classes, uRORemoteService, uDADataTable,
uDABINAdapter, uROClient, uROBinMessage,
- uDADataStreamer, uROIndyTCPChannel, uROIndyHTTPChannel;
+ uDADataStreamer, uROWinInetHttpChannel;
const
SERVER_URL = 'http://localhost:8099/bin'; // Dirección por defecto del servidor
@@ -13,9 +13,9 @@ const
type
TdmConexion = class(TDataModule)
ROMessage: TROBinMessage;
- ROChannel: TROIndyHTTPChannel;
+ ROChannel: TROWinInetHTTPChannel;
procedure DataModuleDestroy(Sender: TObject);
- procedure ROChannelFailure(Sender: TROTransportChannel;
+ procedure ROChannel2Failure(Sender: TROTransportChannel;
anException: Exception; var aRetry: Boolean);
procedure DataModuleCreate(Sender: TObject);
private
@@ -50,7 +50,7 @@ const
function TdmConexion.HayConexion: Boolean;
begin
- Result := ROChannel.IndyClient.Connected;
+ Result := ROChannel.Connected;
end;
procedure TdmConexion.ConfigurarConexion;
@@ -61,8 +61,8 @@ begin
if ShowModal = mrOk then
begin
ROChannel.TargetURL := TargetURL;
- ROChannel.IndyClient.Disconnect;
- ROChannel.IndyClient.Connect;
+ ROChannel.Connected := False;
+ ROChannel.Connected := True;
dmBase.SalvarConfiguracion;
end;
finally
@@ -72,6 +72,7 @@ end;
procedure TdmConexion.ConfigurarEncriptacionConexion;
begin
+ {
with ROChannel.Encryption do
begin
EncryptionMethod := tetDES;
@@ -79,6 +80,7 @@ begin
EncryptionRecvKey := 'C793F1A04FFC8DF91FF9522951F6B6DF921C70B42D74166C6DF0B697797AAA6A243BEC35A9423A51';
UseCompression := True;
end;
+ }
end;
procedure TdmConexion.DataModuleCreate(Sender: TObject);
@@ -88,7 +90,7 @@ end;
procedure TdmConexion.DataModuleDestroy(Sender: TObject);
begin
- ROChannel.IndyClient.Disconnect;
+ ROChannel.Connected := False;
end;
function TdmConexion.GetChannel: TROTransportChannel;
@@ -108,14 +110,14 @@ end;
function TdmConexion.ProbarConexion(const ATargetURL: String): Boolean;
var
- AHTTPChannel: TROIndyHTTPChannel;
+ AHTTPChannel: TROWinInetHTTPChannel;
AROBinMessage: TROBinMessage;
ACoService: TRORemoteService;
begin
if ATargetURL = '' then
raise Exception.Create('No se ha indicado la URL del servidor (HayConexion)');
- AHTTPChannel := TROIndyHTTPChannel.Create(Self);
+ AHTTPChannel := TROWinInetHTTPChannel.Create(Self);
AROBinMessage := TROBinMessage.Create(Self);
ACoService := TRORemoteService.Create(Self);
@@ -154,7 +156,7 @@ begin
end;
end;
-procedure TdmConexion.ROChannelFailure(Sender: TROTransportChannel;
+procedure TdmConexion.ROChannel2Failure(Sender: TROTransportChannel;
anException: Exception; var aRetry: Boolean);
begin
if (Pos(anException.Message, IE_OFFLINE_ERROR) > 0) then
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index cfa6a61f..267e6347 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 974f0f0d..d70c505d 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -22,7 +22,7 @@
7.0
3
..\..\Output\Debug\Servidor
- DEBUG;
+ DEBUG
True
True
True
@@ -35,7 +35,16 @@
Delphi.Personality
-FalseTrueFalseTrueFalse1020FalseFalseFalseFalseFalse308212521.0.2.01.0.2.0lunes, 03 de marzo de 2008 10:22
+FalseTrueFalseTrueFalse1020FalseFalseFalseFalseFalse308212521.0.2.01.0.2.0lunes, 03 de marzo de 2008 17:25
+
+
+
+
+
+
+
+
+
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index eb1eca3b..cfd6c3f9 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
BEGIN
VALUE "FileVersion", "1.0.2.0\0"
VALUE "ProductVersion", "1.0.2.0\0"
- VALUE "CompileDate", "lunes, 03 de marzo de 2008 13:36\0"
+ VALUE "CompileDate", "lunes, 03 de marzo de 2008 17:25\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Servidor/uDataModuleServer.dfm b/Source/Servidor/uDataModuleServer.dfm
index 8179d795..ff57231a 100644
--- a/Source/Servidor/uDataModuleServer.dfm
+++ b/Source/Servidor/uDataModuleServer.dfm
@@ -5,8 +5,6 @@ object dmServer: TdmServer
Height = 307
Width = 382
object HTTPServer: TROIndyHTTPServer
- Encryption.EncryptionMethod = tetBlowfish
- Encryption.UseCompression = True
Dispatchers = <
item
Name = 'BINMessage'
diff --git a/Source/Servidor/uDataModuleServer.pas b/Source/Servidor/uDataModuleServer.pas
index a68d2bb6..e8fd6f99 100644
--- a/Source/Servidor/uDataModuleServer.pas
+++ b/Source/Servidor/uDataModuleServer.pas
@@ -292,6 +292,7 @@ end;
procedure TdmServer.HTTPServerBeforeServerActivate(Sender: TObject);
begin
HTTPServer.Port := StrToInt(FServerPort);
+ {
with HTTPServer.Encryption do
begin
EncryptionMethod := tetDES;
@@ -299,6 +300,7 @@ begin
EncryptionRecvKey := '127C1A6A4D85F5EFE0A54E104BF7F695CD6C989C1808A57667EF1218E8ED93FC6CDC531631EB9750';
UseCompression := True;
end;
+ }
end;
end.