.clang-tidy | 3
.gitignore | 58
COPYING | 5
ChangeLog | 1
INSTALL | 1
Makefile.am | 211 +
NEWS | 1
PROBLEMS | 55
README | 20
TODO | 25
autogen.sh | 27
bundled/include/LibreOfficeKit/LibreOfficeKit.h | 263 +
bundled/include/LibreOfficeKit/LibreOfficeKit.hxx | 610 +++
bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h | 532 ++
bundled/include/LibreOfficeKit/LibreOfficeKitInit.h | 293 +
bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h | 30
common/Common.hpp | 48
common/FileUtil.cpp | 205 +
common/FileUtil.hpp | 93
common/IoUtil.cpp | 335 +
common/IoUtil.hpp | 69
common/Log.cpp | 207 +
common/Log.hpp | 185
common/MessageQueue.cpp | 317 +
common/MessageQueue.hpp | 152
common/Png.hpp | 235 +
common/Protocol.cpp | 204 +
common/Protocol.hpp | 226 +
common/Rectangle.hpp | 82
common/Session.cpp | 247 +
common/Session.hpp | 208 +
common/SigUtil.cpp | 302 +
common/SigUtil.hpp | 61
common/Unit.cpp | 205 +
common/Unit.hpp | 240 +
common/UnitHTTP.cpp | 35
common/UnitHTTP.hpp | 138
common/Util.cpp | 209 +
common/Util.hpp | 257 +
common/security.h | 40
configure.ac | 326 +
debian/changelog | 25
debian/compat | 1
debian/control | 14
debian/copyright | 31
debian/loolwsd.cron.d | 1
debian/loolwsd.postinst | 28
debian/loolwsd.preinst | 10
debian/rules | 29
debian/source/format | 1
dev/null |binary
discovery.xml | 303 +
etc/ca-chain.cert.pem | 71
etc/cert.pem | 35
etc/key.pem | 27
favicon.ico |binary
kit/ChildSession.cpp | 1152 +++++
kit/ChildSession.hpp | 154
kit/ForKit.cpp | 449 ++
kit/Kit.cpp | 1662 ++++++++
kit/Kit.hpp | 45
kit/KitHelper.hpp | 162
loolstat | 90
loolwsd-systemplate-setup | 97
loolwsd.service | 13
loolwsd.spec.in | 191
loolwsd.xml.in | 76
loolwsd/.clang-tidy | 3
loolwsd/.gitignore | 58
loolwsd/Admin.cpp | 391 -
loolwsd/Admin.hpp | 158
loolwsd/AdminModel.cpp | 361 -
loolwsd/AdminModel.hpp | 191
loolwsd/Auth.cpp | 238 -
loolwsd/Auth.hpp | 95
loolwsd/COPYING | 5
loolwsd/ChangeLog | 1
loolwsd/ChildSession.cpp | 1152 -----
loolwsd/ChildSession.hpp | 154
loolwsd/ClientSession.cpp | 401 --
loolwsd/ClientSession.hpp | 113
loolwsd/Common.hpp | 48
loolwsd/Connect.cpp | 262 -
loolwsd/DocumentBroker.cpp | 1026 -----
loolwsd/DocumentBroker.hpp | 352 -
loolwsd/Exceptions.hpp | 72
loolwsd/FileServer.cpp | 257 -
loolwsd/FileServer.hpp | 65
loolwsd/INSTALL | 1
loolwsd/IoUtil.cpp | 335 -
loolwsd/IoUtil.hpp | 69
loolwsd/LOKitClient.cpp | 222 -
loolwsd/LOKitHelper.hpp | 162
loolwsd/LOOLForKit.cpp | 449 --
loolwsd/LOOLKit.cpp | 1662 --------
loolwsd/LOOLKit.hpp | 45
loolwsd/LOOLProtocol.cpp | 204 -
loolwsd/LOOLProtocol.hpp | 226 -
loolwsd/LOOLSession.cpp | 247 -
loolwsd/LOOLSession.hpp | 208 -
loolwsd/LOOLStress.cpp | 553 --
loolwsd/LOOLTool.cpp | 253 -
loolwsd/LOOLWSD.cpp | 2191 -----------
loolwsd/LOOLWSD.hpp | 169
loolwsd/LOOLWebSocket.hpp | 153
loolwsd/Log.cpp | 207 -
loolwsd/Log.hpp | 185
loolwsd/Makefile.am | 206 -
loolwsd/MessageQueue.cpp | 317 -
loolwsd/MessageQueue.hpp | 152
loolwsd/NEWS | 1
loolwsd/PROBLEMS | 55
loolwsd/Png.hpp | 235 -
loolwsd/PrisonerSession.cpp | 263 -
loolwsd/PrisonerSession.hpp | 41
loolwsd/QueueHandler.hpp | 68
loolwsd/README | 389 -
loolwsd/README.vars | 33
loolwsd/Rectangle.hpp | 82
loolwsd/Storage.cpp | 532 --
loolwsd/Storage.hpp | 262 -
loolwsd/TODO | 25
loolwsd/TileCache.cpp | 542 --
loolwsd/TileCache.hpp | 104
loolwsd/TileDesc.hpp | 415 --
loolwsd/TraceFile.hpp | 309 -
loolwsd/Unit.cpp | 205 -
loolwsd/Unit.hpp | 240 -
loolwsd/UnitHTTP.cpp | 35
loolwsd/UnitHTTP.hpp | 138
loolwsd/UserMessages.hpp | 21
loolwsd/Util.cpp | 209 -
loolwsd/Util.hpp | 257 -
loolwsd/autogen.sh | 27
loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h | 263 -
loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx | 610 ---
loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h | 532 --
loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h | 293 -
loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h | 30
loolwsd/common/FileUtil.cpp | 205 -
loolwsd/common/FileUtil.hpp | 93
loolwsd/common/SigUtil.cpp | 302 -
loolwsd/common/SigUtil.hpp | 61
loolwsd/configure.ac | 326 -
loolwsd/debian/changelog | 25
loolwsd/debian/compat | 1
loolwsd/debian/control | 14
loolwsd/debian/copyright | 31
loolwsd/debian/loolwsd.cron.d | 1
loolwsd/debian/loolwsd.postinst | 28
loolwsd/debian/loolwsd.preinst | 10
loolwsd/debian/rules | 29
loolwsd/debian/source/format | 1
loolwsd/discovery.xml | 303 -
loolwsd/etc/ca-chain.cert.pem | 71
loolwsd/etc/cert.pem | 35
loolwsd/etc/key.pem | 27
loolwsd/lint-discovery.py | 246 -
loolwsd/loolmap.c | 180
loolwsd/loolmount.c | 35
loolwsd/loolstat | 90
loolwsd/loolwsd-systemplate-setup | 97
loolwsd/loolwsd.service | 13
loolwsd/loolwsd.spec.in | 191
loolwsd/loolwsd.xml.in | 76
loolwsd/maketarballfordeb.sh.in | 14
loolwsd/protocol.txt | 572 --
loolwsd/reference.txt | 7
loolwsd/robots.txt | 2
loolwsd/security.h | 40
loolwsd/sysconfig.loolwsd | 6
loolwsd/test/.gitignore | 12
loolwsd/test/Makefile.am | 90
loolwsd/test/TileCacheTests.cpp | 985 ----
loolwsd/test/TileQueueTests.cpp | 264 -
loolwsd/test/UnitAdmin.cpp | 482 --
loolwsd/test/UnitFonts.cpp | 169
loolwsd/test/UnitFuzz.cpp | 75
loolwsd/test/UnitPrefork.cpp | 328 -
loolwsd/test/UnitRequests.cpp | 99
loolwsd/test/UnitStorage.cpp | 80
loolwsd/test/UnitTileCache.cpp | 90
loolwsd/test/UnitTimeout.cpp | 70
loolwsd/test/WhiteBoxTests.cpp | 224 -
loolwsd/test/countloolkits.hpp | 112
loolwsd/test/data/hello.txt | 1
loolwsd/test/data/paste.html | 1
loolwsd/test/helpers.hpp | 566 --
loolwsd/test/httpcrashtest.cpp | 263 -
loolwsd/test/httpwserror.cpp | 195
loolwsd/test/httpwstest.cpp | 2145 ----------
loolwsd/test/integration-http-server.cpp | 288 -
loolwsd/test/run_unit.sh.in | 121
loolwsd/test/test.cpp | 103
maketarballfordeb.sh.in | 14
rename.sh | 1
robots.txt | 2
sysconfig.loolwsd | 6
test/.gitignore | 12
test/Makefile.am | 91
test/TileCacheTests.cpp | 985 ++++
test/TileQueueTests.cpp | 264 +
test/UnitAdmin.cpp | 482 ++
test/UnitFonts.cpp | 169
test/UnitFuzz.cpp | 75
test/UnitPrefork.cpp | 328 +
test/UnitRequests.cpp | 99
test/UnitStorage.cpp | 80
test/UnitTileCache.cpp | 90
test/UnitTimeout.cpp | 70
test/WhiteBoxTests.cpp | 224 +
test/countloolkits.hpp | 112
test/data/Example.odt |binary
test/data/calc_render.xls |binary
test/data/calc_render_0_512x512.3840,0.7680x7680.png |binary
test/data/empty.odg |binary
test/data/empty.odp |binary
test/data/empty.ods |binary
test/data/empty.odt |binary
test/data/graphicviewselection.odp |binary
test/data/graphicviewselection.ods |binary
test/data/graphicviewselection.odt |binary
test/data/hello.odt |binary
test/data/hello.txt | 1
test/data/hide-whitespace.odt |binary
test/data/insert-delete.odp |binary
test/data/load12.ods |binary
test/data/password-protected.ods |binary
test/data/paste.html | 1
test/data/setclientpart.odp |binary
test/data/setclientpart.ods |binary
test/data/shape.ods |binary
test/data/timeline.xlsx |binary
test/data/viewcursor.odp |binary
test/data/with_comment.odt |binary
test/helpers.hpp | 566 ++
test/httpcrashtest.cpp | 263 +
test/httpwserror.cpp | 195
test/httpwstest.cpp | 2145 ++++++++++
test/integration-http-server.cpp | 288 +
test/run_unit.sh.in | 121
test/test.cpp | 103
tools/Connect.cpp | 262 +
tools/KitClient.cpp | 222 +
tools/Stress.cpp | 553 ++
tools/Tool.cpp | 253 +
tools/map.cpp | 180
tools/mount.cpp | 35
wsd/Admin.cpp | 391 +
wsd/Admin.hpp | 158
wsd/AdminModel.cpp | 361 +
wsd/AdminModel.hpp | 191
wsd/Auth.cpp | 238 +
wsd/Auth.hpp | 95
wsd/ClientSession.cpp | 401 ++
wsd/ClientSession.hpp | 113
wsd/DocumentBroker.cpp | 1026 +++++
wsd/DocumentBroker.hpp | 352 +
wsd/Exceptions.hpp | 72
wsd/FileServer.cpp | 257 +
wsd/FileServer.hpp | 65
wsd/LOOLWSD.cpp | 2191 +++++++++++
wsd/LOOLWSD.hpp | 169
wsd/LOOLWebSocket.hpp | 153
wsd/PrisonerSession.cpp | 263 +
wsd/PrisonerSession.hpp | 41
wsd/QueueHandler.hpp | 68
wsd/README | 389 +
wsd/README.vars | 33
wsd/Storage.cpp | 532 ++
wsd/Storage.hpp | 262 +
wsd/TileCache.cpp | 542 ++
wsd/TileCache.hpp | 104
wsd/TileDesc.hpp | 415 ++
wsd/TraceFile.hpp | 309 +
wsd/UserMessages.hpp | 21
wsd/lint-discovery.py | 246 +
wsd/protocol.txt | 572 ++
wsd/reference.txt | 7
279 files changed, 29749 insertions(+), 29738 deletions(-)
New commits:
commit bbe0723e7883e6ec559bbb0dda012744ccce31e6
Author: Michael Meeks <michael.me...@collabora.com>
Date: Thu Nov 24 19:32:51 2016 +0000
Tweak code to use new paths.
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 50527f8..c3a550b 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -9,7 +9,7 @@
<child_root_path desc="Path to the directory under which the chroot jails
for the child processes will be created. Should be on the same file system as
systemplate and lotemplate. Must be an empty directory." type="path"
relative="true" default="jails"></child_root_path>
<server_name desc="Hostname:port of the server running loolwsd. If empty,
it's derived from the request." type="string" default=""></server_name>
- <file_server_root_path desc="Path to the directory that should be
considered root for the file server. This should be the directory containing
loleaflet." type="path" relative="true"
default="../loleaflet/../"></file_server_root_path>
+ <file_server_root_path desc="Path to the directory that should be
considered root for the file server. This should be the directory containing
loleaflet." type="path" relative="true"
default="loleaflet/../"></file_server_root_path>
<num_prespawn_children desc="Number of child processes to keep started in
advance and waiting for new clients." type="uint"
default="1">1</num_prespawn_children>
<per_document desc="Document-specific settings, including LO Core
settings.">
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index b03d59f..64eabf0 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1489,7 +1489,7 @@ void LOOLWSD::initialize(Application& self)
{ "child_root_path", "jails" },
{ "lo_jail_subpath", "lo" },
{ "server_name", "" },
- { "file_server_root_path", "../loleaflet/../" },
+ { "file_server_root_path", "loleaflet/.." },
{ "num_prespawn_children", "1" },
{ "per_document.max_concurrency", "4" },
{ "loleaflet_html", "loleaflet.html" },
@@ -1927,7 +1927,7 @@ int LOOLWSD::main(const std::vector<std::string>&
/*args*/)
FileUtil::registerFileSystemForDiskSpaceChecks(Cache + "/.");
if (FileServerRoot.empty())
- FileServerRoot =
Poco::Path(Application::instance().commandPath()).parent().parent().toString();
+ FileServerRoot =
Poco::Path(Application::instance().commandPath()).parent().toString();
FileServerRoot = Poco::Path(FileServerRoot).absolute().toString();
LOG_DBG("FileServerRoot: " << FileServerRoot);
commit c1a398977ffc10364bc37221e4b75c3996ca4cec
Author: Michael Meeks <michael.me...@collabora.com>
Date: Thu Nov 24 14:56:06 2016 +0000
Adapt makefiles, includes etc. to new locations.
diff --git a/Makefile.am b/Makefile.am
index 6df3998..d25ee75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,109 +24,114 @@ endif
ACLOCAL_AMFLAGS = -I m4
-AM_CPPFLAGS = -pthread -DLOOLWSD_DATADIR='"@LOOLWSD_DATADIR@"'
-DLOOLWSD_CONFIGDIR='"@LOOLWSD_CONFIGDIR@"'
+# quick and easy for now.
+include_paths = -I${top_srcdir}/common -I${top_srcdir}/wsd -I${top_srcdir}/kit
+
+AM_CPPFLAGS = -pthread -DLOOLWSD_DATADIR='"@LOOLWSD_DATADIR@"'
-DLOOLWSD_CONFIGDIR='"@LOOLWSD_CONFIGDIR@"' ${include_paths}
AM_LDFLAGS = -pthread -Wl,-E
AM_ETAGSFLAGS = --c++-kinds=+p --fields=+iaS --extra=+q -R --totals=yes *
AM_CTAGSFLAGS = $(AM_ETAGSFLAGS)
-shared_sources = ChildSession.cpp \
- common/FileUtil.cpp \
+shared_sources = common/FileUtil.cpp \
+ common/IoUtil.cpp \
+ common/Log.cpp \
+ common/Protocol.cpp \
+ common/Session.cpp \
+ common/MessageQueue.cpp \
common/SigUtil.cpp \
- IoUtil.cpp \
- Log.cpp \
- LOOLProtocol.cpp \
- LOOLSession.cpp \
- MessageQueue.cpp \
- Unit.cpp \
- UnitHTTP.cpp \
- Util.cpp
-
-loolwsd_SOURCES = Admin.cpp \
- AdminModel.cpp \
- Auth.cpp \
- DocumentBroker.cpp \
- LOOLWSD.cpp \
- ClientSession.cpp \
- FileServer.cpp \
- PrisonerSession.cpp \
- Storage.cpp \
- TileCache.cpp \
+ common/Unit.cpp \
+ common/UnitHTTP.cpp \
+ common/Util.cpp
+
+loolwsd_SOURCES = wsd/Admin.cpp \
+ wsd/AdminModel.cpp \
+ wsd/Auth.cpp \
+ wsd/DocumentBroker.cpp \
+ wsd/LOOLWSD.cpp \
+ wsd/ClientSession.cpp \
+ wsd/FileServer.cpp \
+ wsd/PrisonerSession.cpp \
+ wsd/Storage.cpp \
+ wsd/TileCache.cpp \
$(shared_sources)
noinst_PROGRAMS = connect \
lokitclient \
loolforkit-nocaps
-connect_SOURCES = Connect.cpp \
- Log.cpp \
- LOOLProtocol.cpp \
- Util.cpp
+connect_SOURCES = tools/Connect.cpp \
+ common/Log.cpp \
+ common/Protocol.cpp \
+ common/Util.cpp
-lokitclient_SOURCES = IoUtil.cpp \
- Log.cpp \
- LOKitClient.cpp \
- LOOLProtocol.cpp \
- Util.cpp
+lokitclient_SOURCES = common/IoUtil.cpp \
+ common/Log.cpp \
+ tools/KitClient.cpp \
+ common/Protocol.cpp \
+ common/Util.cpp
-loolforkit_SOURCES = LOOLForKit.cpp \
- LOOLKit.cpp \
+loolforkit_SOURCES = kit/ChildSession.cpp \
+ kit/ForKit.cpp \
+ kit/Kit.cpp \
$(shared_sources)
# build a binary with no caps to help debugging
loolforkit_nocaps_SOURCES = $(loolforkit_SOURCES)
-loolmount_SOURCES = loolmount.c
-
-loolmap_SOURCES = loolmap.c
-
-looltool_SOURCES = LOOLTool.cpp
-
-loolstress_CPPFLAGS = -DTDOC=\"$(abs_top_srcdir)/test/data\"
-loolstress_SOURCES = LOOLStress.cpp \
- LOOLProtocol.cpp \
- Log.cpp
-
-noinst_HEADERS = Admin.hpp \
- AdminModel.hpp \
- Auth.hpp \
- ChildSession.hpp \
- Common.hpp \
- DocumentBroker.hpp \
- Exceptions.hpp \
- FileServer.hpp \
- common/FileUtil.hpp \
- common/SigUtil.hpp \
- IoUtil.hpp \
- Log.hpp \
- LOKitHelper.hpp \
- LOOLKit.hpp \
- LOOLProtocol.hpp \
- LOOLSession.hpp \
- LOOLWebSocket.hpp \
- LOOLWSD.hpp \
- ClientSession.hpp \
- PrisonerSession.hpp \
- MessageQueue.hpp \
- Png.hpp \
- QueueHandler.hpp \
- Rectangle.hpp \
- Storage.hpp \
- TileCache.hpp \
- TileDesc.hpp \
- TraceFile.hpp \
- Unit.hpp \
- UnitHTTP.hpp \
- UserMessages.hpp \
- Util.hpp \
+loolmount_SOURCES = tools/mount.cpp
+
+loolmap_SOURCES = tools/map.cpp
+
+looltool_SOURCES = tools/Tool.cpp
+
+loolstress_CPPFLAGS = -DTDOC=\"$(abs_top_srcdir)/test/data\" ${include_paths}
+loolstress_SOURCES = tools/Stress.cpp \
+ common/Protocol.cpp \
+ common/Log.cpp
+
+wsd_headers = wsd/Admin.hpp \
+ wsd/AdminModel.hpp \
+ wsd/Auth.hpp \
+ wsd/ClientSession.hpp \
+ wsd/DocumentBroker.hpp \
+ wsd/Exceptions.hpp \
+ wsd/FileServer.hpp \
+ wsd/LOOLWebSocket.hpp \
+ wsd/LOOLWSD.hpp \
+ wsd/PrisonerSession.hpp \
+ wsd/QueueHandler.hpp \
+ wsd/Storage.hpp \
+ wsd/TileCache.hpp \
+ wsd/TileDesc.hpp \
+ wsd/TraceFile.hpp \
+ wsd/UserMessages.hpp
+
+shared_headers = common/Common.hpp \
+ common/IoUtil.hpp \
+ common/Log.hpp \
+ common/Protocol.hpp \
+ common/Session.hpp \
+ common/Unit.hpp \
+ common/UnitHTTP.hpp \
+ common/Util.hpp \
+ common/MessageQueue.hpp \
+ common/Png.hpp \
+ common/Rectangle.hpp \
+ common/security.h
+
+kit_headers = kit/ChildSession.hpp \
+ kit/Kit.hpp \
+ kit/KitHelper.hpp
+
+noinst_HEADERS = $(wsd_headers) $(shared_headers) $(kit_headers) \
bundled/include/LibreOfficeKit/LibreOfficeKit.h \
bundled/include/LibreOfficeKit/LibreOfficeKit.hxx \
bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
bundled/include/LibreOfficeKit/LibreOfficeKitInit.h \
bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h \
test/countloolkits.hpp \
- test/helpers.hpp \
- security.h
+ test/helpers.hpp
EXTRA_DIST = discovery.xml \
favicon.ico \
diff --git a/README b/README
index dd0ae68..9a7f327 100644
--- a/README
+++ b/README
@@ -1,16 +1,22 @@
LibreOffice on-line.
-This project fundamentally has two pieces:
+This project has several components:
-loolwsd/
- The server side component.
+wsd/
+ The Web Services Daemon - which accepts external connections.
+
+kit/
+ The client which lives in its own chroot and renders documents.
+
+common/
+ Shared code between these processes.
loleaflet/
- The client side component.
+ The client side JavaScript component.
-First compile loolwsd, and then loleaflet.
+It is recommended to read these files:
-Since you need both of these to get things working, it is recommended
-to read the READMEs in both projects.
+ wsd/README
+ loleaflet/README
Enjoy.
diff --git a/common/IoUtil.cpp b/common/IoUtil.cpp
index 035dcf8..6ae507c 100644
--- a/common/IoUtil.cpp
+++ b/common/IoUtil.cpp
@@ -27,7 +27,7 @@
#include <Poco/URI.h>
#include "Common.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include <LOOLWebSocket.hpp>
#include "Log.hpp"
#include "Util.hpp"
diff --git a/common/MessageQueue.cpp b/common/MessageQueue.cpp
index db9d223..b32fdeb 100644
--- a/common/MessageQueue.cpp
+++ b/common/MessageQueue.cpp
@@ -13,7 +13,7 @@
#include <Poco/StringTokenizer.h>
-#include <LOOLProtocol.hpp>
+#include <Protocol.hpp>
#include <Log.hpp>
#include <TileDesc.hpp>
diff --git a/common/Protocol.cpp b/common/Protocol.cpp
index 30f75c6..6cd5455 100644
--- a/common/Protocol.cpp
+++ b/common/Protocol.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include "config.h"
#include <cassert>
diff --git a/common/Session.cpp b/common/Session.cpp
index c503af7..36bf79c 100644
--- a/common/Session.cpp
+++ b/common/Session.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "LOOLSession.hpp"
+#include "Session.hpp"
#include "config.h"
#include <sys/stat.h>
@@ -34,7 +34,7 @@
#include "Common.hpp"
#include "IoUtil.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include <LOOLWebSocket.hpp>
#include "Log.hpp"
#include "TileCache.hpp"
diff --git a/common/Session.hpp b/common/Session.hpp
index 736e63d..9873aad 100644
--- a/common/Session.hpp
+++ b/common/Session.hpp
@@ -22,7 +22,7 @@
#include <Poco/StringTokenizer.h>
#include <Poco/Types.h>
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include <LOOLWebSocket.hpp>
#include "Log.hpp"
#include "MessageQueue.hpp"
diff --git a/configure.ac b/configure.ac
index 9b6fc3d..7aa8775 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_SUBST([LOOLWSD_VERSION_HASH])
AC_DEFINE_UNQUOTED([LOOLWSD_VERSION_HASH],[["$LOOLWSD_VERSION_HASH"]],[LibreOffice
On-Line git hash if present])
-AC_CONFIG_SRCDIR([LOOLWSD.cpp])
+AC_CONFIG_SRCDIR([wsd/LOOLWSD.cpp])
AC_CONFIG_HEADERS([config.h])
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 07b3a4c..5e364ae 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -19,7 +19,7 @@
#include <Poco/URI.h>
#include "common/FileUtil.hpp"
-#include "LOKitHelper.hpp"
+#include "KitHelper.hpp"
#include "Log.hpp"
#include "Png.hpp"
#include "Util.hpp"
diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp
index 871de23..665e09f 100644
--- a/kit/ChildSession.hpp
+++ b/kit/ChildSession.hpp
@@ -19,8 +19,8 @@
#include <Poco/Thread.h>
#include "Common.hpp"
-#include "LOOLKit.hpp"
-#include "LOOLSession.hpp"
+#include "Kit.hpp"
+#include "Session.hpp"
class ChildSession;
diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp
index ab3d2c3..4680c4d 100644
--- a/kit/ForKit.cpp
+++ b/kit/ForKit.cpp
@@ -33,7 +33,7 @@
#include "Common.hpp"
#include "IoUtil.hpp"
-#include "LOOLKit.hpp"
+#include "Kit.hpp"
#include "Log.hpp"
#include "Unit.hpp"
#include "Util.hpp"
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 7407384..255e473 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -52,9 +52,9 @@
#include "ChildSession.hpp"
#include "Common.hpp"
#include "IoUtil.hpp"
-#include "LOKitHelper.hpp"
-#include "LOOLKit.hpp"
-#include "LOOLProtocol.hpp"
+#include "KitHelper.hpp"
+#include "Kit.hpp"
+#include "Protocol.hpp"
#include "LOOLWebSocket.hpp"
#include "Log.hpp"
#include "Png.hpp"
diff --git a/test/Makefile.am b/test/Makefile.am
index fec8969..e18d3db 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -9,7 +9,8 @@ check_PROGRAMS = test
noinst_PROGRAMS = test unittest
-AM_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTDOC=\"$(top_srcdir)/test/data\"
+AM_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTDOC=\"$(top_srcdir)/test/data\" \
+ -I${top_srcdir}/common -I${top_srcdir}/wsd -I${top_srcdir}/kit
noinst_LTLIBRARIES = \
unit-timeout.la unit-prefork.la \
@@ -29,15 +30,15 @@ AM_CPPFLAGS = -pthread -I$(top_srcdir) -DBUILDING_TESTS
wsd_sources = \
../common/FileUtil.cpp \
../common/SigUtil.cpp \
- ../IoUtil.cpp \
- ../Log.cpp \
- ../LOOLKit.cpp \
- ../LOOLProtocol.cpp \
- ../LOOLSession.cpp \
- ../TileCache.cpp \
- ../MessageQueue.cpp \
- ../Unit.cpp \
- ../Util.cpp
+ ../common/IoUtil.cpp \
+ ../common/Log.cpp \
+ ../common/Protocol.cpp \
+ ../common/Session.cpp \
+ ../common/MessageQueue.cpp \
+ ../kit/Kit.cpp \
+ ../wsd/TileCache.cpp \
+ ../common/Unit.cpp \
+ ../common/Util.cpp
test_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS
test_SOURCES = TileCacheTests.cpp integration-http-server.cpp \
diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index e391526..64780a6 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -12,7 +12,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include "Common.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include <LOOLWebSocket.hpp>
#include "MessageQueue.hpp"
#include "Png.hpp"
diff --git a/test/TileQueueTests.cpp b/test/TileQueueTests.cpp
index 964df48..dea692b 100644
--- a/test/TileQueueTests.cpp
+++ b/test/TileQueueTests.cpp
@@ -12,7 +12,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include "Common.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include "MessageQueue.hpp"
#include "Util.hpp"
diff --git a/test/UnitFonts.cpp b/test/UnitFonts.cpp
index 60312d4..265d5b2 100644
--- a/test/UnitFonts.cpp
+++ b/test/UnitFonts.cpp
@@ -20,7 +20,7 @@
#include <Poco/Timestamp.h>
#include "Common.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include "Log.hpp"
#include "Unit.hpp"
#include "Util.hpp"
diff --git a/test/UnitFuzz.cpp b/test/UnitFuzz.cpp
index 7454aa4..fba1d73 100644
--- a/test/UnitFuzz.cpp
+++ b/test/UnitFuzz.cpp
@@ -16,7 +16,7 @@
#include "Common.hpp"
#include "IoUtil.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include <LOOLWebSocket.hpp>
#include "Unit.hpp"
#include "Util.hpp"
diff --git a/test/UnitPrefork.cpp b/test/UnitPrefork.cpp
index 9f5463b..93d4adb 100644
--- a/test/UnitPrefork.cpp
+++ b/test/UnitPrefork.cpp
@@ -24,7 +24,7 @@
#include "Common.hpp"
#include "IoUtil.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include <LOOLWebSocket.hpp>
#include "Log.hpp"
#include "Unit.hpp"
diff --git a/test/WhiteBoxTests.cpp b/test/WhiteBoxTests.cpp
index 2224619..6ca75bc 100644
--- a/test/WhiteBoxTests.cpp
+++ b/test/WhiteBoxTests.cpp
@@ -13,8 +13,8 @@
#include <ChildSession.hpp>
#include <Common.hpp>
-#include <LOOLKit.hpp>
-#include <LOOLProtocol.hpp>
+#include <Kit.hpp>
+#include <Protocol.hpp>
#include <MessageQueue.hpp>
#include <Util.hpp>
diff --git a/test/helpers.hpp b/test/helpers.hpp
index 30aeac1..a10cc53 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -41,7 +41,7 @@
#include <Common.hpp>
#include "common/FileUtil.hpp"
-#include <LOOLProtocol.hpp>
+#include <Protocol.hpp>
#include <LOOLWebSocket.hpp>
#include <UserMessages.hpp>
#include <Util.hpp>
diff --git a/test/httpcrashtest.cpp b/test/httpcrashtest.cpp
index 1bfd4f2..a4a4ff3 100644
--- a/test/httpcrashtest.cpp
+++ b/test/httpcrashtest.cpp
@@ -40,7 +40,7 @@
#include <Common.hpp>
#include <UserMessages.hpp>
#include <Util.hpp>
-#include <LOOLProtocol.hpp>
+#include <Protocol.hpp>
#include <LOOLWebSocket.hpp>
#include "helpers.hpp"
#include "countloolkits.hpp"
diff --git a/test/httpwserror.cpp b/test/httpwserror.cpp
index 0bd8b65..67fd235 100644
--- a/test/httpwserror.cpp
+++ b/test/httpwserror.cpp
@@ -22,7 +22,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include "Common.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include <LOOLWebSocket.hpp>
#include "helpers.hpp"
#include "countloolkits.hpp"
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 1e65fc2..d180820 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -40,7 +40,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include "Common.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include <LOOLWebSocket.hpp>
#include "Png.hpp"
#include "UserMessages.hpp"
diff --git a/tools/Connect.cpp b/tools/Connect.cpp
index 5b550dd..d45b243 100644
--- a/tools/Connect.cpp
+++ b/tools/Connect.cpp
@@ -41,7 +41,7 @@
#include <Poco/Version.h>
#include "Common.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include <LOOLWebSocket.hpp>
#include "Log.hpp"
#include "Util.hpp"
diff --git a/tools/KitClient.cpp b/tools/KitClient.cpp
index 06d0a33..a587a28 100644
--- a/tools/KitClient.cpp
+++ b/tools/KitClient.cpp
@@ -27,7 +27,7 @@
#include <Poco/URI.h>
#include <Poco/Util/Application.h>
-#include "LOKitHelper.hpp"
+#include "KitHelper.hpp"
#include "Png.hpp"
#include "Util.hpp"
diff --git a/tools/Tool.cpp b/tools/Tool.cpp
index b658108..437fe1d 100644
--- a/tools/Tool.cpp
+++ b/tools/Tool.cpp
@@ -40,7 +40,7 @@
#include <Poco/Util/OptionSet.h>
#include "Common.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include "Util.hpp"
#include <Poco/Util/Application.h>
diff --git a/tools/map.c b/tools/map.cpp
similarity index 100%
rename from tools/map.c
rename to tools/map.cpp
diff --git a/tools/mount.c b/tools/mount.cpp
similarity index 100%
rename from tools/mount.c
rename to tools/mount.cpp
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index c9bd23b..09a561e 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -31,8 +31,8 @@
#include "Common.hpp"
#include "FileServer.hpp"
#include "IoUtil.hpp"
-#include "LOOLProtocol.hpp"
-#include <LOOLWebSocket.hpp>
+#include "Protocol.hpp"
+#include "LOOLWebSocket.hpp"
#include "LOOLWSD.hpp"
#include "Log.hpp"
#include "Storage.hpp"
diff --git a/wsd/AdminModel.cpp b/wsd/AdminModel.cpp
index 6de25e4..1099a0d 100644
--- a/wsd/AdminModel.cpp
+++ b/wsd/AdminModel.cpp
@@ -19,7 +19,7 @@
#include <Poco/StringTokenizer.h>
#include <Poco/URI.h>
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include <LOOLWebSocket.hpp>
#include "Log.hpp"
#include "Unit.hpp"
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 00a0a3f..cedbc5e 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -20,8 +20,8 @@
#include "Common.hpp"
#include "IoUtil.hpp"
-#include "LOOLProtocol.hpp"
-#include "LOOLSession.hpp"
+#include "Protocol.hpp"
+#include "Session.hpp"
#include "LOOLWSD.hpp"
#include "Log.hpp"
#include "PrisonerSession.hpp"
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index a8f2e51..bf484f4 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -10,7 +10,7 @@
#ifndef INCLUDED_CLIENTSSESSION_HPP
#define INCLUDED_CLIENTSSESSION_HPP
-#include "LOOLSession.hpp"
+#include "Session.hpp"
#include "MessageQueue.hpp"
#include <Poco/URI.h>
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index fcd4d7a..886cf98 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -22,7 +22,7 @@
#include "Admin.hpp"
#include "ClientSession.hpp"
#include "Exceptions.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include "LOOLWSD.hpp"
#include "Log.hpp"
#include "PrisonerSession.hpp"
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 5ca3fce..b03d59f 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -101,8 +101,8 @@
#include "FileServer.hpp"
#include "common/FileUtil.hpp"
#include "IoUtil.hpp"
-#include "LOOLProtocol.hpp"
-#include "LOOLSession.hpp"
+#include "Protocol.hpp"
+#include "Session.hpp"
#include <LOOLWebSocket.hpp>
#include "Log.hpp"
#include "PrisonerSession.hpp"
diff --git a/wsd/LOOLWebSocket.hpp b/wsd/LOOLWebSocket.hpp
index e10af2a..e744cf7 100644
--- a/wsd/LOOLWebSocket.hpp
+++ b/wsd/LOOLWebSocket.hpp
@@ -17,7 +17,7 @@
#include <Poco/Net/WebSocket.h>
#include <Common.hpp>
-#include <LOOLProtocol.hpp>
+#include <Protocol.hpp>
#include <Log.hpp>
/// WebSocket that is thread safe, and handles large frames transparently.
diff --git a/wsd/PrisonerSession.cpp b/wsd/PrisonerSession.cpp
index 28e4ac6..faf8232 100644
--- a/wsd/PrisonerSession.cpp
+++ b/wsd/PrisonerSession.cpp
@@ -17,8 +17,8 @@
#include <Poco/URIStreamOpener.h>
#include "Common.hpp"
-#include "LOOLProtocol.hpp"
-#include "LOOLSession.hpp"
+#include "Protocol.hpp"
+#include "Session.hpp"
#include "LOOLWSD.hpp"
#include "Log.hpp"
#include "ClientSession.hpp"
diff --git a/wsd/PrisonerSession.hpp b/wsd/PrisonerSession.hpp
index a52dfc8..1518ab4 100644
--- a/wsd/PrisonerSession.hpp
+++ b/wsd/PrisonerSession.hpp
@@ -10,7 +10,7 @@
#ifndef INCLUDED_PRISONERSESSION_HPP
#define INCLUDED_PRISONERSESSION_HPP
-#include "LOOLSession.hpp"
+#include "Session.hpp"
class DocumentBroker;
class ClientSession;
diff --git a/wsd/QueueHandler.hpp b/wsd/QueueHandler.hpp
index 3f330e6..445b91e 100644
--- a/wsd/QueueHandler.hpp
+++ b/wsd/QueueHandler.hpp
@@ -9,8 +9,8 @@
#include <Poco/Runnable.h>
-#include "LOOLProtocol.hpp"
-#include "LOOLSession.hpp"
+#include "Protocol.hpp"
+#include "Session.hpp"
#include "MessageQueue.hpp"
#include "Util.hpp"
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index 41d9bd0..0ce257f 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -33,7 +33,7 @@
#include "ClientSession.hpp"
#include "Common.hpp"
#include "common/FileUtil.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
#include "Unit.hpp"
#include "Util.hpp"
diff --git a/wsd/TileDesc.hpp b/wsd/TileDesc.hpp
index 85bc453..765341d 100644
--- a/wsd/TileDesc.hpp
+++ b/wsd/TileDesc.hpp
@@ -18,7 +18,7 @@
#include <Poco/StringTokenizer.h>
#include "Exceptions.hpp"
-#include "LOOLProtocol.hpp"
+#include "Protocol.hpp"
/// Tile Descriptor
/// Represents a tile's coordinates and dimensions.
commit cca657c8f2031ec88366c52f5e8e10c2e04129f9
Author: Michael Meeks <michael.me...@collabora.com>
Date: Thu Nov 24 14:52:34 2016 +0000
Apply the pre-branch rename script to re-organize the source.
diff --git a/loolwsd/.clang-tidy b/.clang-tidy
similarity index 100%
rename from loolwsd/.clang-tidy
rename to .clang-tidy
diff --git a/loolwsd/.gitignore b/.gitignore
similarity index 100%
rename from loolwsd/.gitignore
rename to .gitignore
diff --git a/loolwsd/AUTHORS b/AUTHORS
similarity index 100%
rename from loolwsd/AUTHORS
rename to AUTHORS
diff --git a/loolwsd/COPYING b/COPYING
similarity index 100%
rename from loolwsd/COPYING
rename to COPYING
diff --git a/loolwsd/ChangeLog b/ChangeLog
similarity index 100%
rename from loolwsd/ChangeLog
rename to ChangeLog
diff --git a/loolwsd/INSTALL b/INSTALL
similarity index 100%
rename from loolwsd/INSTALL
rename to INSTALL
diff --git a/loolwsd/Makefile.am b/Makefile.am
similarity index 100%
rename from loolwsd/Makefile.am
rename to Makefile.am
diff --git a/loolwsd/NEWS b/NEWS
similarity index 100%
rename from loolwsd/NEWS
rename to NEWS
diff --git a/loolwsd/PROBLEMS b/PROBLEMS
similarity index 100%
rename from loolwsd/PROBLEMS
rename to PROBLEMS
diff --git a/loolwsd/TODO b/TODO
similarity index 100%
rename from loolwsd/TODO
rename to TODO
diff --git a/loolwsd/autogen.sh b/autogen.sh
similarity index 100%
rename from loolwsd/autogen.sh
rename to autogen.sh
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
similarity index 100%
rename from loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
rename to bundled/include/LibreOfficeKit/LibreOfficeKit.h
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
similarity index 100%
rename from loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
rename to bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
similarity index 100%
rename from loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
rename to bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
b/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
similarity index 100%
rename from loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
rename to bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h
b/bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h
similarity index 100%
rename from loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h
rename to bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h
diff --git a/loolwsd/Common.hpp b/common/Common.hpp
similarity index 100%
rename from loolwsd/Common.hpp
rename to common/Common.hpp
diff --git a/loolwsd/common/FileUtil.cpp b/common/FileUtil.cpp
similarity index 100%
rename from loolwsd/common/FileUtil.cpp
rename to common/FileUtil.cpp
diff --git a/loolwsd/common/FileUtil.hpp b/common/FileUtil.hpp
similarity index 100%
rename from loolwsd/common/FileUtil.hpp
rename to common/FileUtil.hpp
diff --git a/loolwsd/IoUtil.cpp b/common/IoUtil.cpp
similarity index 100%
rename from loolwsd/IoUtil.cpp
rename to common/IoUtil.cpp
diff --git a/loolwsd/IoUtil.hpp b/common/IoUtil.hpp
similarity index 100%
rename from loolwsd/IoUtil.hpp
rename to common/IoUtil.hpp
diff --git a/loolwsd/Log.cpp b/common/Log.cpp
similarity index 100%
rename from loolwsd/Log.cpp
rename to common/Log.cpp
diff --git a/loolwsd/Log.hpp b/common/Log.hpp
similarity index 100%
rename from loolwsd/Log.hpp
rename to common/Log.hpp
diff --git a/loolwsd/MessageQueue.cpp b/common/MessageQueue.cpp
similarity index 100%
rename from loolwsd/MessageQueue.cpp
rename to common/MessageQueue.cpp
diff --git a/loolwsd/MessageQueue.hpp b/common/MessageQueue.hpp
similarity index 100%
rename from loolwsd/MessageQueue.hpp
rename to common/MessageQueue.hpp
diff --git a/loolwsd/Png.hpp b/common/Png.hpp
similarity index 100%
rename from loolwsd/Png.hpp
rename to common/Png.hpp
diff --git a/loolwsd/LOOLProtocol.cpp b/common/Protocol.cpp
similarity index 100%
rename from loolwsd/LOOLProtocol.cpp
rename to common/Protocol.cpp
diff --git a/loolwsd/LOOLProtocol.hpp b/common/Protocol.hpp
similarity index 100%
rename from loolwsd/LOOLProtocol.hpp
rename to common/Protocol.hpp
diff --git a/loolwsd/Rectangle.hpp b/common/Rectangle.hpp
similarity index 100%
rename from loolwsd/Rectangle.hpp
rename to common/Rectangle.hpp
diff --git a/loolwsd/LOOLSession.cpp b/common/Session.cpp
similarity index 100%
rename from loolwsd/LOOLSession.cpp
rename to common/Session.cpp
diff --git a/loolwsd/LOOLSession.hpp b/common/Session.hpp
similarity index 100%
rename from loolwsd/LOOLSession.hpp
rename to common/Session.hpp
diff --git a/loolwsd/common/SigUtil.cpp b/common/SigUtil.cpp
similarity index 100%
rename from loolwsd/common/SigUtil.cpp
rename to common/SigUtil.cpp
diff --git a/loolwsd/common/SigUtil.hpp b/common/SigUtil.hpp
similarity index 100%
rename from loolwsd/common/SigUtil.hpp
rename to common/SigUtil.hpp
diff --git a/loolwsd/Unit.cpp b/common/Unit.cpp
similarity index 100%
rename from loolwsd/Unit.cpp
rename to common/Unit.cpp
diff --git a/loolwsd/Unit.hpp b/common/Unit.hpp
similarity index 100%
rename from loolwsd/Unit.hpp
rename to common/Unit.hpp
diff --git a/loolwsd/UnitHTTP.cpp b/common/UnitHTTP.cpp
similarity index 100%
rename from loolwsd/UnitHTTP.cpp
rename to common/UnitHTTP.cpp
diff --git a/loolwsd/UnitHTTP.hpp b/common/UnitHTTP.hpp
similarity index 100%
rename from loolwsd/UnitHTTP.hpp
rename to common/UnitHTTP.hpp
diff --git a/loolwsd/Util.cpp b/common/Util.cpp
similarity index 100%
rename from loolwsd/Util.cpp
rename to common/Util.cpp
diff --git a/loolwsd/Util.hpp b/common/Util.hpp
similarity index 100%
rename from loolwsd/Util.hpp
rename to common/Util.hpp
diff --git a/loolwsd/security.h b/common/security.h
similarity index 100%
rename from loolwsd/security.h
rename to common/security.h
diff --git a/loolwsd/configure.ac b/configure.ac
similarity index 100%
rename from loolwsd/configure.ac
rename to configure.ac
diff --git a/loolwsd/debian/changelog b/debian/changelog
similarity index 100%
rename from loolwsd/debian/changelog
rename to debian/changelog
diff --git a/loolwsd/debian/compat b/debian/compat
similarity index 100%
rename from loolwsd/debian/compat
rename to debian/compat
diff --git a/loolwsd/debian/control b/debian/control
similarity index 100%
rename from loolwsd/debian/control
rename to debian/control
diff --git a/loolwsd/debian/copyright b/debian/copyright
similarity index 100%
rename from loolwsd/debian/copyright
rename to debian/copyright
diff --git a/loolwsd/debian/loolwsd.cron.d b/debian/loolwsd.cron.d
similarity index 100%
rename from loolwsd/debian/loolwsd.cron.d
rename to debian/loolwsd.cron.d
diff --git a/loolwsd/debian/loolwsd.postinst b/debian/loolwsd.postinst
similarity index 100%
rename from loolwsd/debian/loolwsd.postinst
rename to debian/loolwsd.postinst
diff --git a/loolwsd/debian/loolwsd.preinst b/debian/loolwsd.preinst
similarity index 100%
rename from loolwsd/debian/loolwsd.preinst
rename to debian/loolwsd.preinst
diff --git a/loolwsd/debian/rules b/debian/rules
similarity index 100%
rename from loolwsd/debian/rules
rename to debian/rules
diff --git a/loolwsd/debian/source/format b/debian/source/format
similarity index 100%
rename from loolwsd/debian/source/format
rename to debian/source/format
diff --git a/loolwsd/discovery.xml b/discovery.xml
similarity index 100%
rename from loolwsd/discovery.xml
rename to discovery.xml
diff --git a/loolwsd/etc/ca-chain.cert.pem b/etc/ca-chain.cert.pem
similarity index 100%
rename from loolwsd/etc/ca-chain.cert.pem
rename to etc/ca-chain.cert.pem
diff --git a/loolwsd/etc/cert.pem b/etc/cert.pem
similarity index 100%
rename from loolwsd/etc/cert.pem
rename to etc/cert.pem
diff --git a/loolwsd/etc/key.pem b/etc/key.pem
similarity index 100%
rename from loolwsd/etc/key.pem
rename to etc/key.pem
diff --git a/loolwsd/favicon.ico b/favicon.ico
similarity index 100%
rename from loolwsd/favicon.ico
rename to favicon.ico
diff --git a/loolwsd/ChildSession.cpp b/kit/ChildSession.cpp
similarity index 100%
rename from loolwsd/ChildSession.cpp
rename to kit/ChildSession.cpp
diff --git a/loolwsd/ChildSession.hpp b/kit/ChildSession.hpp
similarity index 100%
rename from loolwsd/ChildSession.hpp
rename to kit/ChildSession.hpp
diff --git a/loolwsd/LOOLForKit.cpp b/kit/ForKit.cpp
similarity index 100%
rename from loolwsd/LOOLForKit.cpp
rename to kit/ForKit.cpp
diff --git a/loolwsd/LOOLKit.cpp b/kit/Kit.cpp
similarity index 100%
rename from loolwsd/LOOLKit.cpp
rename to kit/Kit.cpp
diff --git a/loolwsd/LOOLKit.hpp b/kit/Kit.hpp
similarity index 100%
rename from loolwsd/LOOLKit.hpp
rename to kit/Kit.hpp
diff --git a/loolwsd/LOKitHelper.hpp b/kit/KitHelper.hpp
similarity index 100%
rename from loolwsd/LOKitHelper.hpp
rename to kit/KitHelper.hpp
diff --git a/loolwsd/loolstat b/loolstat
similarity index 100%
rename from loolwsd/loolstat
rename to loolstat
diff --git a/loolwsd/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
similarity index 100%
rename from loolwsd/loolwsd-systemplate-setup
rename to loolwsd-systemplate-setup
diff --git a/loolwsd/loolwsd.service b/loolwsd.service
similarity index 100%
rename from loolwsd/loolwsd.service
rename to loolwsd.service
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd.spec.in
similarity index 100%
rename from loolwsd/loolwsd.spec.in
rename to loolwsd.spec.in
diff --git a/loolwsd/loolwsd.xml.in b/loolwsd.xml.in
similarity index 100%
rename from loolwsd/loolwsd.xml.in
rename to loolwsd.xml.in
diff --git a/loolwsd/maketarballfordeb.sh.in b/maketarballfordeb.sh.in
similarity index 100%
rename from loolwsd/maketarballfordeb.sh.in
rename to maketarballfordeb.sh.in
diff --git a/rename.sh b/rename.sh
index 03de7f6..2c5c8f1 100755
--- a/rename.sh
+++ b/rename.sh
@@ -33,7 +33,6 @@ git mv wsd/LOOLSession.cpp common/Session.cpp
git mv wsd/LOOLSession.hpp common/Session.hpp
git mv wsd/security.h common/security.h
-git mv wsd/LibreOfficeKit.hpp kit
git mv wsd/ChildSession.cpp kit
git mv wsd/ChildSession.hpp kit
git mv wsd/LOOLForKit.cpp kit/ForKit.cpp
diff --git a/loolwsd/robots.txt b/robots.txt
similarity index 100%
rename from loolwsd/robots.txt
rename to robots.txt
diff --git a/loolwsd/sysconfig.loolwsd b/sysconfig.loolwsd
similarity index 100%
rename from loolwsd/sysconfig.loolwsd
rename to sysconfig.loolwsd
diff --git a/loolwsd/test/.gitignore b/test/.gitignore
similarity index 100%
rename from loolwsd/test/.gitignore
rename to test/.gitignore
diff --git a/loolwsd/test/Makefile.am b/test/Makefile.am
similarity index 100%
rename from loolwsd/test/Makefile.am
rename to test/Makefile.am
diff --git a/loolwsd/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
similarity index 100%
rename from loolwsd/test/TileCacheTests.cpp
rename to test/TileCacheTests.cpp
diff --git a/loolwsd/test/TileQueueTests.cpp b/test/TileQueueTests.cpp
similarity index 100%
rename from loolwsd/test/TileQueueTests.cpp
rename to test/TileQueueTests.cpp
diff --git a/loolwsd/test/UnitAdmin.cpp b/test/UnitAdmin.cpp
similarity index 100%
rename from loolwsd/test/UnitAdmin.cpp
rename to test/UnitAdmin.cpp
diff --git a/loolwsd/test/UnitFonts.cpp b/test/UnitFonts.cpp
similarity index 100%
rename from loolwsd/test/UnitFonts.cpp
rename to test/UnitFonts.cpp
diff --git a/loolwsd/test/UnitFuzz.cpp b/test/UnitFuzz.cpp
similarity index 100%
rename from loolwsd/test/UnitFuzz.cpp
rename to test/UnitFuzz.cpp
diff --git a/loolwsd/test/UnitPrefork.cpp b/test/UnitPrefork.cpp
similarity index 100%
rename from loolwsd/test/UnitPrefork.cpp
rename to test/UnitPrefork.cpp
diff --git a/loolwsd/test/UnitRequests.cpp b/test/UnitRequests.cpp
similarity index 100%
rename from loolwsd/test/UnitRequests.cpp
rename to test/UnitRequests.cpp
diff --git a/loolwsd/test/UnitStorage.cpp b/test/UnitStorage.cpp
similarity index 100%
rename from loolwsd/test/UnitStorage.cpp
rename to test/UnitStorage.cpp
diff --git a/loolwsd/test/UnitTileCache.cpp b/test/UnitTileCache.cpp
similarity index 100%
rename from loolwsd/test/UnitTileCache.cpp
rename to test/UnitTileCache.cpp
diff --git a/loolwsd/test/UnitTimeout.cpp b/test/UnitTimeout.cpp
similarity index 100%
rename from loolwsd/test/UnitTimeout.cpp
rename to test/UnitTimeout.cpp
diff --git a/loolwsd/test/WhiteBoxTests.cpp b/test/WhiteBoxTests.cpp
similarity index 100%
rename from loolwsd/test/WhiteBoxTests.cpp
rename to test/WhiteBoxTests.cpp
diff --git a/loolwsd/test/countloolkits.hpp b/test/countloolkits.hpp
similarity index 100%
rename from loolwsd/test/countloolkits.hpp
rename to test/countloolkits.hpp
diff --git a/loolwsd/test/data/Example.odt b/test/data/Example.odt
similarity index 100%
rename from loolwsd/test/data/Example.odt
rename to test/data/Example.odt
diff --git a/loolwsd/test/data/calc_render.xls b/test/data/calc_render.xls
similarity index 100%
rename from loolwsd/test/data/calc_render.xls
rename to test/data/calc_render.xls
diff --git a/loolwsd/test/data/calc_render_0_512x512.3840,0.7680x7680.png
b/test/data/calc_render_0_512x512.3840,0.7680x7680.png
similarity index 100%
rename from loolwsd/test/data/calc_render_0_512x512.3840,0.7680x7680.png
rename to test/data/calc_render_0_512x512.3840,0.7680x7680.png
diff --git a/loolwsd/test/data/empty.odg b/test/data/empty.odg
similarity index 100%
rename from loolwsd/test/data/empty.odg
rename to test/data/empty.odg
diff --git a/loolwsd/test/data/empty.odp b/test/data/empty.odp
similarity index 100%
rename from loolwsd/test/data/empty.odp
rename to test/data/empty.odp
diff --git a/loolwsd/test/data/empty.ods b/test/data/empty.ods
similarity index 100%
rename from loolwsd/test/data/empty.ods
rename to test/data/empty.ods
diff --git a/loolwsd/test/data/empty.odt b/test/data/empty.odt
similarity index 100%
rename from loolwsd/test/data/empty.odt
rename to test/data/empty.odt
diff --git a/loolwsd/test/data/graphicviewselection.odp
b/test/data/graphicviewselection.odp
similarity index 100%
rename from loolwsd/test/data/graphicviewselection.odp
rename to test/data/graphicviewselection.odp
diff --git a/loolwsd/test/data/graphicviewselection.ods
b/test/data/graphicviewselection.ods
similarity index 100%
rename from loolwsd/test/data/graphicviewselection.ods
rename to test/data/graphicviewselection.ods
diff --git a/loolwsd/test/data/graphicviewselection.odt
b/test/data/graphicviewselection.odt
similarity index 100%
rename from loolwsd/test/data/graphicviewselection.odt
rename to test/data/graphicviewselection.odt
diff --git a/loolwsd/test/data/hello.odt b/test/data/hello.odt
similarity index 100%
rename from loolwsd/test/data/hello.odt
rename to test/data/hello.odt
diff --git a/loolwsd/test/data/hello.txt b/test/data/hello.txt
similarity index 100%
rename from loolwsd/test/data/hello.txt
rename to test/data/hello.txt
diff --git a/loolwsd/test/data/hide-whitespace.odt
b/test/data/hide-whitespace.odt
similarity index 100%
rename from loolwsd/test/data/hide-whitespace.odt
rename to test/data/hide-whitespace.odt
diff --git a/loolwsd/test/data/insert-delete.odp b/test/data/insert-delete.odp
similarity index 100%
rename from loolwsd/test/data/insert-delete.odp
rename to test/data/insert-delete.odp
diff --git a/loolwsd/test/data/load12.ods b/test/data/load12.ods
similarity index 100%
rename from loolwsd/test/data/load12.ods
rename to test/data/load12.ods
diff --git a/loolwsd/test/data/password-protected.ods
b/test/data/password-protected.ods
similarity index 100%
rename from loolwsd/test/data/password-protected.ods
rename to test/data/password-protected.ods
diff --git a/loolwsd/test/data/paste.html b/test/data/paste.html
similarity index 100%
rename from loolwsd/test/data/paste.html
rename to test/data/paste.html
diff --git a/loolwsd/test/data/setclientpart.odp b/test/data/setclientpart.odp
similarity index 100%
rename from loolwsd/test/data/setclientpart.odp
rename to test/data/setclientpart.odp
diff --git a/loolwsd/test/data/setclientpart.ods b/test/data/setclientpart.ods
similarity index 100%
rename from loolwsd/test/data/setclientpart.ods
rename to test/data/setclientpart.ods
diff --git a/loolwsd/test/data/shape.ods b/test/data/shape.ods
similarity index 100%
rename from loolwsd/test/data/shape.ods
rename to test/data/shape.ods
diff --git a/loolwsd/test/data/timeline.xlsx b/test/data/timeline.xlsx
similarity index 100%
rename from loolwsd/test/data/timeline.xlsx
rename to test/data/timeline.xlsx
diff --git a/loolwsd/test/data/viewcursor.odp b/test/data/viewcursor.odp
similarity index 100%
rename from loolwsd/test/data/viewcursor.odp
rename to test/data/viewcursor.odp
diff --git a/loolwsd/test/data/with_comment.odt b/test/data/with_comment.odt
similarity index 100%
rename from loolwsd/test/data/with_comment.odt
rename to test/data/with_comment.odt
diff --git a/loolwsd/test/helpers.hpp b/test/helpers.hpp
similarity index 100%
rename from loolwsd/test/helpers.hpp
rename to test/helpers.hpp
diff --git a/loolwsd/test/httpcrashtest.cpp b/test/httpcrashtest.cpp
similarity index 100%
rename from loolwsd/test/httpcrashtest.cpp
rename to test/httpcrashtest.cpp
diff --git a/loolwsd/test/httpwserror.cpp b/test/httpwserror.cpp
similarity index 100%
rename from loolwsd/test/httpwserror.cpp
rename to test/httpwserror.cpp
diff --git a/loolwsd/test/httpwstest.cpp b/test/httpwstest.cpp
similarity index 100%
rename from loolwsd/test/httpwstest.cpp
rename to test/httpwstest.cpp
diff --git a/loolwsd/test/integration-http-server.cpp
b/test/integration-http-server.cpp
similarity index 100%
rename from loolwsd/test/integration-http-server.cpp
rename to test/integration-http-server.cpp
diff --git a/loolwsd/test/run_unit.sh.in b/test/run_unit.sh.in
similarity index 100%
rename from loolwsd/test/run_unit.sh.in
rename to test/run_unit.sh.in
diff --git a/loolwsd/test/test.cpp b/test/test.cpp
similarity index 100%
rename from loolwsd/test/test.cpp
rename to test/test.cpp
diff --git a/loolwsd/Connect.cpp b/tools/Connect.cpp
similarity index 100%
rename from loolwsd/Connect.cpp
rename to tools/Connect.cpp
diff --git a/loolwsd/LOKitClient.cpp b/tools/KitClient.cpp
similarity index 100%
rename from loolwsd/LOKitClient.cpp
rename to tools/KitClient.cpp
diff --git a/loolwsd/LOOLStress.cpp b/tools/Stress.cpp
similarity index 100%
rename from loolwsd/LOOLStress.cpp
rename to tools/Stress.cpp
diff --git a/loolwsd/LOOLTool.cpp b/tools/Tool.cpp
similarity index 100%
rename from loolwsd/LOOLTool.cpp
rename to tools/Tool.cpp
diff --git a/loolwsd/loolmap.c b/tools/map.c
similarity index 100%
rename from loolwsd/loolmap.c
rename to tools/map.c
diff --git a/loolwsd/loolmount.c b/tools/mount.c
similarity index 100%
rename from loolwsd/loolmount.c
rename to tools/mount.c
diff --git a/loolwsd/Admin.cpp b/wsd/Admin.cpp
similarity index 100%
rename from loolwsd/Admin.cpp
rename to wsd/Admin.cpp
diff --git a/loolwsd/Admin.hpp b/wsd/Admin.hpp
similarity index 100%
rename from loolwsd/Admin.hpp
rename to wsd/Admin.hpp
diff --git a/loolwsd/AdminModel.cpp b/wsd/AdminModel.cpp
similarity index 100%
rename from loolwsd/AdminModel.cpp
rename to wsd/AdminModel.cpp
diff --git a/loolwsd/AdminModel.hpp b/wsd/AdminModel.hpp
similarity index 100%
rename from loolwsd/AdminModel.hpp
rename to wsd/AdminModel.hpp
diff --git a/loolwsd/Auth.cpp b/wsd/Auth.cpp
similarity index 100%
rename from loolwsd/Auth.cpp
rename to wsd/Auth.cpp
diff --git a/loolwsd/Auth.hpp b/wsd/Auth.hpp
similarity index 100%
rename from loolwsd/Auth.hpp
rename to wsd/Auth.hpp
diff --git a/loolwsd/ClientSession.cpp b/wsd/ClientSession.cpp
similarity index 100%
rename from loolwsd/ClientSession.cpp
rename to wsd/ClientSession.cpp
diff --git a/loolwsd/ClientSession.hpp b/wsd/ClientSession.hpp
similarity index 100%
rename from loolwsd/ClientSession.hpp
rename to wsd/ClientSession.hpp
diff --git a/loolwsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
similarity index 100%
rename from loolwsd/DocumentBroker.cpp
rename to wsd/DocumentBroker.cpp
diff --git a/loolwsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
similarity index 100%
rename from loolwsd/DocumentBroker.hpp
rename to wsd/DocumentBroker.hpp
diff --git a/loolwsd/Exceptions.hpp b/wsd/Exceptions.hpp
similarity index 100%
rename from loolwsd/Exceptions.hpp
rename to wsd/Exceptions.hpp
diff --git a/loolwsd/FileServer.cpp b/wsd/FileServer.cpp
similarity index 100%
rename from loolwsd/FileServer.cpp
rename to wsd/FileServer.cpp
diff --git a/loolwsd/FileServer.hpp b/wsd/FileServer.hpp
similarity index 100%
rename from loolwsd/FileServer.hpp
rename to wsd/FileServer.hpp
diff --git a/loolwsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
similarity index 100%
rename from loolwsd/LOOLWSD.cpp
rename to wsd/LOOLWSD.cpp
diff --git a/loolwsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
similarity index 100%
rename from loolwsd/LOOLWSD.hpp
rename to wsd/LOOLWSD.hpp
diff --git a/loolwsd/LOOLWebSocket.hpp b/wsd/LOOLWebSocket.hpp
similarity index 100%
rename from loolwsd/LOOLWebSocket.hpp
rename to wsd/LOOLWebSocket.hpp
diff --git a/loolwsd/PrisonerSession.cpp b/wsd/PrisonerSession.cpp
similarity index 100%
rename from loolwsd/PrisonerSession.cpp
rename to wsd/PrisonerSession.cpp
diff --git a/loolwsd/PrisonerSession.hpp b/wsd/PrisonerSession.hpp
similarity index 100%
rename from loolwsd/PrisonerSession.hpp
rename to wsd/PrisonerSession.hpp
diff --git a/loolwsd/QueueHandler.hpp b/wsd/QueueHandler.hpp
similarity index 100%
rename from loolwsd/QueueHandler.hpp
rename to wsd/QueueHandler.hpp
diff --git a/loolwsd/README b/wsd/README
similarity index 100%
rename from loolwsd/README
rename to wsd/README
diff --git a/loolwsd/README.vars b/wsd/README.vars
similarity index 100%
rename from loolwsd/README.vars
rename to wsd/README.vars
diff --git a/loolwsd/Storage.cpp b/wsd/Storage.cpp
similarity index 100%
rename from loolwsd/Storage.cpp
rename to wsd/Storage.cpp
diff --git a/loolwsd/Storage.hpp b/wsd/Storage.hpp
similarity index 100%
rename from loolwsd/Storage.hpp
rename to wsd/Storage.hpp
diff --git a/loolwsd/TileCache.cpp b/wsd/TileCache.cpp
similarity index 100%
rename from loolwsd/TileCache.cpp
rename to wsd/TileCache.cpp
diff --git a/loolwsd/TileCache.hpp b/wsd/TileCache.hpp
similarity index 100%
rename from loolwsd/TileCache.hpp
rename to wsd/TileCache.hpp
diff --git a/loolwsd/TileDesc.hpp b/wsd/TileDesc.hpp
similarity index 100%
rename from loolwsd/TileDesc.hpp
rename to wsd/TileDesc.hpp
diff --git a/loolwsd/TraceFile.hpp b/wsd/TraceFile.hpp
similarity index 100%
rename from loolwsd/TraceFile.hpp
rename to wsd/TraceFile.hpp
diff --git a/loolwsd/UserMessages.hpp b/wsd/UserMessages.hpp
similarity index 100%
rename from loolwsd/UserMessages.hpp
rename to wsd/UserMessages.hpp
diff --git a/loolwsd/lint-discovery.py b/wsd/lint-discovery.py
similarity index 100%
rename from loolwsd/lint-discovery.py
rename to wsd/lint-discovery.py
diff --git a/loolwsd/protocol.txt b/wsd/protocol.txt
similarity index 100%
rename from loolwsd/protocol.txt
rename to wsd/protocol.txt
diff --git a/loolwsd/reference.txt b/wsd/reference.txt
similarity index 100%
rename from loolwsd/reference.txt
rename to wsd/reference.txt
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
