wsd: move StorageConnectionManager into wopi
Change-Id: I1d606f1ccf0c9bc95dfc8b0fa88d082f2c123127 Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
This commit is contained in:
Ashod Nakashian
Ashod Nakashian
parent
af29ad28b0
commit
7b0d87e47c
5 changed files with 32 additions and 33 deletions
|
|
@ -145,13 +145,13 @@ coolwsd_sources = common/Crypto.cpp \
|
|||
wsd/RequestDetails.cpp \
|
||||
wsd/RequestVettingStation.cpp \
|
||||
wsd/Storage.cpp \
|
||||
wsd/StorageConnectionManager.cpp \
|
||||
wsd/HostUtil.cpp \
|
||||
wsd/TileCache.cpp \
|
||||
wsd/ProofKey.cpp \
|
||||
wsd/QuarantineUtil.cpp \
|
||||
wsd/WopiProxy.cpp \
|
||||
wsd/wopi/CheckFileInfo.cpp
|
||||
wsd/wopi/CheckFileInfo.cpp \
|
||||
wsd/wopi/StorageConnectionManager.cpp
|
||||
|
||||
coolwsd_SOURCES = $(coolwsd_sources) \
|
||||
$(shared_sources) \
|
||||
|
|
@ -305,7 +305,6 @@ wsd_headers = wsd/Admin.hpp \
|
|||
wsd/SenderQueue.hpp \
|
||||
wsd/ServerURL.hpp \
|
||||
wsd/Storage.hpp \
|
||||
wsd/StorageConnectionManager.hpp \
|
||||
wsd/TileCache.hpp \
|
||||
wsd/TileDesc.hpp \
|
||||
wsd/TraceFile.hpp \
|
||||
|
|
@ -313,7 +312,8 @@ wsd_headers = wsd/Admin.hpp \
|
|||
wsd/QuarantineUtil.hpp \
|
||||
wsd/HostUtil.hpp \
|
||||
wsd/WopiProxy.hpp \
|
||||
wsd/wopi/CheckFileInfo.hpp
|
||||
wsd/wopi/CheckFileInfo.hpp \
|
||||
wsd/wopi/StorageConnectionManager.hpp
|
||||
|
||||
shared_headers = common/Common.hpp \
|
||||
common/Clipboard.hpp \
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
#include "HttpHelper.hpp"
|
||||
#include "HttpRequest.hpp"
|
||||
#include <COOLWSD.hpp>
|
||||
#include <StorageConnectionManager.hpp>
|
||||
#include <wopi/StorageConnectionManager.hpp>
|
||||
#include <Exceptions.hpp>
|
||||
#include <Log.hpp>
|
||||
#include <common/JsonUtil.hpp>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <COOLWSD.hpp>
|
||||
#include <RequestDetails.hpp>
|
||||
#include <TraceEvent.hpp>
|
||||
#include <StorageConnectionManager.hpp>
|
||||
#include <wopi/StorageConnectionManager.hpp>
|
||||
#include <Exceptions.hpp>
|
||||
#include <Log.hpp>
|
||||
#include <DocumentBroker.hpp>
|
||||
|
|
|
|||
|
|
@ -11,15 +11,27 @@
|
|||
|
||||
#include <config.h>
|
||||
|
||||
#include <iconv.h>
|
||||
#include <string>
|
||||
#include "StorageConnectionManager.hpp"
|
||||
|
||||
#include <Poco/Exception.h>
|
||||
#include <Poco/JSON/Object.h>
|
||||
#include <Poco/JSON/Parser.h>
|
||||
#include <Common.hpp>
|
||||
#include <Exceptions.hpp>
|
||||
#include <Storage.hpp>
|
||||
#include <Log.hpp>
|
||||
#include <Unit.hpp>
|
||||
#include <Util.hpp>
|
||||
#include <common/FileUtil.hpp>
|
||||
#include <common/JsonUtil.hpp>
|
||||
#include <common/TraceEvent.hpp>
|
||||
#include <NetUtil.hpp>
|
||||
#include <CommandControl.hpp>
|
||||
|
||||
#if !MOBILEAPP
|
||||
|
||||
#include <Auth.hpp>
|
||||
#include <HostUtil.hpp>
|
||||
#include <ProofKey.hpp>
|
||||
#include <HttpRequest.hpp>
|
||||
|
||||
#include <Poco/Net/AcceptCertificateHandler.h>
|
||||
#include <Poco/Net/Context.h>
|
||||
#include <Poco/Net/DNS.h>
|
||||
|
|
@ -33,29 +45,16 @@
|
|||
|
||||
#include <cassert>
|
||||
|
||||
#include <Auth.hpp>
|
||||
#include <HostUtil.hpp>
|
||||
#include <ProofKey.hpp>
|
||||
#include <HttpRequest.hpp>
|
||||
|
||||
#endif
|
||||
|
||||
#include <Poco/Exception.h>
|
||||
#include <Poco/JSON/Object.h>
|
||||
#include <Poco/JSON/Parser.h>
|
||||
#include <Poco/StreamCopier.h>
|
||||
#include <Poco/URI.h>
|
||||
|
||||
#include <Common.hpp>
|
||||
#include <Exceptions.hpp>
|
||||
#include <Storage.hpp>
|
||||
#include <Log.hpp>
|
||||
#include <Unit.hpp>
|
||||
#include <Util.hpp>
|
||||
#include <common/FileUtil.hpp>
|
||||
#include <common/JsonUtil.hpp>
|
||||
#include <common/TraceEvent.hpp>
|
||||
#include <NetUtil.hpp>
|
||||
#include <CommandControl.hpp>
|
||||
|
||||
#include <StorageConnectionManager.hpp>
|
||||
#include <iconv.h>
|
||||
#include <string>
|
||||
|
||||
bool StorageConnectionManager::FilesystemEnabled;
|
||||
bool StorageConnectionManager::SSLAsScheme = true;
|
||||
|
|
@ -154,5 +153,3 @@ StorageConnectionManager::getHttpSession(const Poco::URI& uri, std::chrono::seco
|
|||
|
||||
return httpSession;
|
||||
}
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
|
@ -1,5 +1,9 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
|
||||
/*
|
||||
* Copyright the Collabora Online contributors.
|
||||
*
|
||||
* SPDX-License-Identifier: MPL-2.0
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
|
@ -173,5 +177,3 @@ private:
|
|||
/// If true, force SSL communication with storage server
|
||||
static bool SSLEnabled;
|
||||
};
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
Loading…
Reference in a new issue