Skip to content

Commit

Permalink
CPP RTN updated for 4.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kanaalgh committed Feb 18, 2018
1 parent 81b577a commit cb8456f
Show file tree
Hide file tree
Showing 12 changed files with 37,969 additions and 27,020 deletions.
8 changes: 4 additions & 4 deletions Connector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Server::State::State(ConnectionState connectionState) {
Server::State::State(ns1__getMyTasksResponse* response) {
this->connectionState = CONNECTION_STATE_CONNECTED;
this->unreadTasksCount = 0;
this->totalTasksCount = response->__sizeresult;
this->totalTasksCount = response->result.size();
this->taskIds = new LONG64[totalTasksCount];
this->taskNames = new wstring[totalTasksCount];
for (int i = 0; i < totalTasksCount; i++) {
Expand Down Expand Up @@ -151,7 +151,7 @@ ns1__user* Server::Connector::AuthenticateByKerberos() {
ns1__authenticateByKerberosResponse response;
string authenticationUrl = IO::ToString(RtnResources::GetWebServiceURL(serverType, serverVersion, L"Authentication"));
ServerAPIBindingProxy authProxy(authenticationUrl.c_str());
int result = authProxy.authenticateByKerberos(&request, &response);
int result = authProxy.authenticateByKerberos(&request, response);
if (result == SOAP_OK) {
LOG_DEBUG("call AuthenticateByKerberos completed");
return response.result;
Expand All @@ -175,7 +175,7 @@ ns1__user* Server::Connector::AuthenticateByLoginAndPassword() {
string authServiceUrl = IO::ToString(RtnResources::GetWebServiceURL(serverType, serverVersion, L"Authentication"));
ServerAPIBindingProxy authServiceProxy(authServiceUrl.c_str());
ns1__authenticateByLoginPasswordResponse response;
int result = authServiceProxy.authenticateByLoginPassword(&request, &response);
int result = authServiceProxy.authenticateByLoginPassword(&request, response);
if (result == SOAP_OK) {
LOG_DEBUG("call AuthenticateByKerberos completed");
return response.result;
Expand All @@ -193,7 +193,7 @@ Server::State* Server::Connector::GetTasks() {
ServerAPIBindingProxy taskServiceProxy(taskServiceUrl.c_str());
request.user = user;
ns1__getMyTasksResponse response;
int result = taskServiceProxy.getMyTasks(&request, &response);
int result = taskServiceProxy.getMyTasks(&request, response);
State* state;
if (result == SOAP_OK) {
LOG_DEBUG("call GetMyTasks completed");
Expand Down
3 changes: 3 additions & 0 deletions Utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,9 @@ wstring IO::GetServerTypeByUrl(const string& url) {
}
closesocket(clientSocket);
WSACleanup();
if (version.empty()) {
version="jboss7";
}
if (!version.empty()) {
return ToWideString(version);
}
Expand Down
390 changes: 197 additions & 193 deletions rtn.vcxproj

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions rtn.vcxproj.user
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ShowAllFiles>true</ShowAllFiles>
</PropertyGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ShowAllFiles>true</ShowAllFiles>
</PropertyGroup>
</Project>
23 changes: 11 additions & 12 deletions ws/ServerAPIBinding.nsmap
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@

#include "soapH.h"
SOAP_NMAC struct Namespace namespaces[] =
{
{"SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/", "http://www.w3.org/*/soap-envelope", NULL},
{"SOAP-ENC", "http://schemas.xmlsoap.org/soap/encoding/", "http://www.w3.org/*/soap-encoding", NULL},
{"xsi", "http://www.w3.org/2001/XMLSchema-instance", "http://www.w3.org/*/XMLSchema-instance", NULL},
{"xsd", "http://www.w3.org/2001/XMLSchema", "http://www.w3.org/*/XMLSchema", NULL},
{"ns2", "http://stub.service.wfe.runa.ru/", NULL, NULL},
{"ns1", "http://impl.service.wfe.runa.ru/", NULL, NULL},
{NULL, NULL, NULL, NULL}
};

#include "stdsoap2.h"
/* This defines the global XML namespaces[] table to #include and compile */
SOAP_NMAC struct Namespace namespaces[] = {
{"SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/", "http://www.w3.org/*/soap-envelope", NULL},
{"SOAP-ENC", "http://schemas.xmlsoap.org/soap/encoding/", "http://www.w3.org/*/soap-encoding", NULL},
{"xsi", "http://www.w3.org/2001/XMLSchema-instance", "http://www.w3.org/*/XMLSchema-instance", NULL},
{"xsd", "http://www.w3.org/2001/XMLSchema", "http://www.w3.org/*/XMLSchema", NULL},
{"ns1", "http://impl.service.wfe.runa.ru/", NULL, NULL},
{NULL, NULL, NULL, NULL}
};
373 changes: 196 additions & 177 deletions ws/ServerAPIBindingProxy.cpp

Large diffs are not rendered by default.

213 changes: 110 additions & 103 deletions ws/ServerAPIBindingProxy.h

Large diffs are not rendered by default.

Loading

0 comments on commit cb8456f

Please sign in to comment.