aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/server/apache/log.hxx (renamed from web/apache/log.hxx)10
-rw-r--r--web/server/apache/request.cxx (renamed from web/apache/request.cxx)6
-rw-r--r--web/server/apache/request.hxx (renamed from web/apache/request.hxx)14
-rw-r--r--web/server/apache/request.ixx (renamed from web/apache/request.ixx)2
-rw-r--r--web/server/apache/service.cxx (renamed from web/apache/service.cxx)8
-rw-r--r--web/server/apache/service.hxx (renamed from web/apache/service.hxx)16
-rw-r--r--web/server/apache/service.txx (renamed from web/apache/service.txx)2
-rw-r--r--web/server/apache/stream.hxx (renamed from web/apache/stream.hxx)10
-rw-r--r--web/server/buildfile (renamed from web/buildfile)7
-rw-r--r--web/server/mime-url-encoding.cxx (renamed from web/mime-url-encoding.cxx)4
-rw-r--r--web/server/mime-url-encoding.hxx (renamed from web/mime-url-encoding.hxx)8
-rw-r--r--web/server/module.hxx (renamed from web/module.hxx)8
-rw-r--r--web/version.hxx.in11
-rw-r--r--web/xhtml/.gitignore (renamed from web/.gitignore)0
-rw-r--r--web/xhtml/buildfile10
-rw-r--r--web/xhtml/fragment.cxx (renamed from web/xhtml-fragment.cxx)6
-rw-r--r--web/xhtml/fragment.hxx (renamed from web/xhtml-fragment.hxx)2
-rw-r--r--web/xhtml/serialization.hxx (renamed from web/xhtml.hxx)10
-rw-r--r--web/xhtml/version.hxx.in11
19 files changed, 76 insertions, 69 deletions
diff --git a/web/apache/log.hxx b/web/server/apache/log.hxx
index 6609190..f7738ef 100644
--- a/web/apache/log.hxx
+++ b/web/server/apache/log.hxx
@@ -1,8 +1,8 @@
-// file : web/apache/log.hxx -*- C++ -*-
+// file : web/server/apache/log.hxx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
-#ifndef WEB_APACHE_LOG_HXX
-#define WEB_APACHE_LOG_HXX
+#ifndef WEB_SERVER_APACHE_LOG_HXX
+#define WEB_SERVER_APACHE_LOG_HXX
#include <httpd.h> // request_rec, server_rec
#include <http_log.h>
@@ -11,7 +11,7 @@
#include <cstdint> // uint64_t
#include <algorithm> // min()
-#include <web/module.hxx>
+#include <web/server/module.hxx>
namespace web
{
@@ -77,4 +77,4 @@ namespace web
}
}
-#endif // WEB_APACHE_LOG_HXX
+#endif // WEB_SERVER_APACHE_LOG_HXX
diff --git a/web/apache/request.cxx b/web/server/apache/request.cxx
index 4722b7f..a413081 100644
--- a/web/apache/request.cxx
+++ b/web/server/apache/request.cxx
@@ -1,7 +1,7 @@
-// file : web/apache/request.cxx -*- C++ -*-
+// file : web/server/apache/request.cxx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
-#include <web/apache/request.hxx>
+#include <web/server/apache/request.hxx>
#include <apr.h> // APR_SIZE_MAX
#include <apr_errno.h> // apr_status_t, APR_SUCCESS, APR_E*, apr_strerror()
@@ -38,7 +38,7 @@
#include <libbutl/optional.mxx>
#include <libbutl/timestamp.mxx>
-#include <web/mime-url-encoding.hxx>
+#include <web/server/mime-url-encoding.hxx>
using namespace std;
using namespace butl;
diff --git a/web/apache/request.hxx b/web/server/apache/request.hxx
index 793a09d..bc105ec 100644
--- a/web/apache/request.hxx
+++ b/web/server/apache/request.hxx
@@ -1,8 +1,8 @@
-// file : web/apache/request.hxx -*- C++ -*-
+// file : web/server/apache/request.hxx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
-#ifndef WEB_APACHE_REQUEST_HXX
-#define WEB_APACHE_REQUEST_HXX
+#ifndef WEB_SERVER_APACHE_REQUEST_HXX
+#define WEB_SERVER_APACHE_REQUEST_HXX
#include <httpd.h> // request_rec, HTTP_*, OK, M_POST
@@ -14,8 +14,8 @@
#include <ostream>
#include <streambuf>
-#include <web/module.hxx>
-#include <web/apache/stream.hxx>
+#include <web/server/module.hxx>
+#include <web/server/apache/stream.hxx>
namespace web
{
@@ -228,6 +228,6 @@ namespace web
}
}
-#include <web/apache/request.ixx>
+#include <web/server/apache/request.ixx>
-#endif // WEB_APACHE_REQUEST_HXX
+#endif // WEB_SERVER_APACHE_REQUEST_HXX
diff --git a/web/apache/request.ixx b/web/server/apache/request.ixx
index 3a1c01a..119fd2e 100644
--- a/web/apache/request.ixx
+++ b/web/server/apache/request.ixx
@@ -1,4 +1,4 @@
-// file : web/apache/request.ixx -*- C++ -*-
+// file : web/server/apache/request.ixx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
#include <http_protocol.h> // ap_*()
diff --git a/web/apache/service.cxx b/web/server/apache/service.cxx
index 1eeb65e..9fb23da 100644
--- a/web/apache/service.cxx
+++ b/web/server/apache/service.cxx
@@ -1,7 +1,7 @@
-// file : web/apache/service.cxx -*- C++ -*-
+// file : web/server/apache/service.cxx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
-#include <web/apache/service.hxx>
+#include <web/server/apache/service.hxx>
#include <apr_pools.h> // apr_palloc()
@@ -18,8 +18,8 @@
#include <libbutl/utility.mxx> // function_cast()
#include <libbutl/optional.mxx>
-#include <web/module.hxx>
-#include <web/apache/log.hxx>
+#include <web/server/module.hxx>
+#include <web/server/apache/log.hxx>
using namespace std;
using namespace butl;
diff --git a/web/apache/service.hxx b/web/server/apache/service.hxx
index aaf006e..ad54d2c 100644
--- a/web/apache/service.hxx
+++ b/web/server/apache/service.hxx
@@ -1,8 +1,8 @@
-// file : web/apache/service.hxx -*- C++ -*-
+// file : web/server/apache/service.hxx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
-#ifndef WEB_APACHE_SERVICE_HXX
-#define WEB_APACHE_SERVICE_HXX
+#ifndef WEB_SERVER_APACHE_SERVICE_HXX
+#define WEB_SERVER_APACHE_SERVICE_HXX
#include <apr_pools.h> // apr_pool_t
#include <apr_hooks.h> // APR_HOOK_*
@@ -15,9 +15,9 @@
#include <string>
#include <cassert>
-#include <web/module.hxx>
-#include <web/apache/log.hxx>
-#include <web/apache/request.hxx>
+#include <web/server/module.hxx>
+#include <web/server/apache/log.hxx>
+#include <web/server/apache/request.hxx>
namespace web
{
@@ -328,6 +328,6 @@ namespace web
}
}
-#include <web/apache/service.txx>
+#include <web/server/apache/service.txx>
-#endif // WEB_APACHE_SERVICE_HXX
+#endif // WEB_SERVER_APACHE_SERVICE_HXX
diff --git a/web/apache/service.txx b/web/server/apache/service.txx
index bda8e10..1b16d0b 100644
--- a/web/apache/service.txx
+++ b/web/server/apache/service.txx
@@ -1,4 +1,4 @@
-// file : web/apache/service.txx -*- C++ -*-
+// file : web/server/apache/service.txx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
#include <httpd.h> // APEXIT_CHILDSICK
diff --git a/web/apache/stream.hxx b/web/server/apache/stream.hxx
index ed0018e..77145af 100644
--- a/web/apache/stream.hxx
+++ b/web/server/apache/stream.hxx
@@ -1,8 +1,8 @@
-// file : web/apache/stream.hxx -*- C++ -*-
+// file : web/server/apache/stream.hxx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
-#ifndef WEB_APACHE_STREAM_HXX
-#define WEB_APACHE_STREAM_HXX
+#ifndef WEB_SERVER_APACHE_STREAM_HXX
+#define WEB_SERVER_APACHE_STREAM_HXX
#include <httpd.h> // request_rec, HTTP_*
#include <http_protocol.h> // ap_*()
@@ -13,7 +13,7 @@
#include <streambuf>
#include <algorithm> // min(), max()
-#include <web/module.hxx> // invalid_request
+#include <web/server/module.hxx> // invalid_request
namespace web
{
@@ -145,4 +145,4 @@ namespace web
}
}
-#endif // WEB_APACHE_STREAM_HXX
+#endif // WEB_SERVER_APACHE_STREAM_HXX
diff --git a/web/buildfile b/web/server/buildfile
index 0ca6cf6..26de70f 100644
--- a/web/buildfile
+++ b/web/server/buildfile
@@ -1,4 +1,4 @@
-# file : web/buildfile
+# file : web/server/buildfile
# license : MIT; see accompanying LICENSE file
# This is currently part of the brep apache module but lives in a separate
@@ -8,11 +8,8 @@
#
import libs = libapr1%lib{apr-1}
import libs += libapreq2%lib{apreq2}
-import libs += libstudxml%lib{studxml}
import libs += libbutl%lib{butl}
-libus{web}: {hxx ixx txx cxx}{** -version} {hxx}{version} $libs
-
-hxx{version}: in{version} $src_root/manifest
+libus{web-server}: {hxx ixx txx cxx}{**} $libs
{hxx ixx txx}{*}: install = false
diff --git a/web/mime-url-encoding.cxx b/web/server/mime-url-encoding.cxx
index e202f08..fd1e4e8 100644
--- a/web/mime-url-encoding.cxx
+++ b/web/server/mime-url-encoding.cxx
@@ -1,7 +1,7 @@
-// file : web/mime-url-encoding.cxx -*- C++ -*-
+// file : web/server/mime-url-encoding.cxx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
-#include <web/mime-url-encoding.hxx>
+#include <web/server/mime-url-encoding.hxx>
#include <string>
#include <iterator> // back_inserter
diff --git a/web/mime-url-encoding.hxx b/web/server/mime-url-encoding.hxx
index b9d2a76..34172a4 100644
--- a/web/mime-url-encoding.hxx
+++ b/web/server/mime-url-encoding.hxx
@@ -1,8 +1,8 @@
-// file : web/mime-url-encoding.hxx -*- C++ -*-
+// file : web/server/mime-url-encoding.hxx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
-#ifndef WEB_MIME_URL_ENCODING_HXX
-#define WEB_MIME_URL_ENCODING_HXX
+#ifndef WEB_SERVER_MIME_URL_ENCODING_HXX
+#define WEB_SERVER_MIME_URL_ENCODING_HXX
#include <string>
@@ -29,4 +29,4 @@ namespace web
bool query = true);
}
-#endif // WEB_MIME_URL_ENCODING_HXX
+#endif // WEB_SERVER_MIME_URL_ENCODING_HXX
diff --git a/web/module.hxx b/web/server/module.hxx
index 5e9959e..beda73c 100644
--- a/web/module.hxx
+++ b/web/server/module.hxx
@@ -1,8 +1,8 @@
-// file : web/module.hxx -*- C++ -*-
+// file : web/server/module.hxx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
-#ifndef WEB_MODULE_HXX
-#define WEB_MODULE_HXX
+#ifndef WEB_SERVER_MODULE_HXX
+#define WEB_SERVER_MODULE_HXX
#include <map>
#include <string>
@@ -296,4 +296,4 @@ namespace web
};
}
-#endif // WEB_MODULE_HXX
+#endif // WEB_SERVER_MODULE_HXX
diff --git a/web/version.hxx.in b/web/version.hxx.in
deleted file mode 100644
index ba51d44..0000000
--- a/web/version.hxx.in
+++ /dev/null
@@ -1,11 +0,0 @@
-// file : web/version.hxx.in -*- C++ -*-
-// license : MIT; see accompanying LICENSE file
-
-#ifndef WEB_VERSION_HXX_IN
-#define WEB_VERSION_HXX_IN
-
-#include <libstudxml/version.hxx>
-
-$libstudxml.check(LIBSTUDXML_VERSION, LIBSTUDXML_SNAPSHOT)$
-
-#endif // WEB_VERSION_HXX_IN
diff --git a/web/.gitignore b/web/xhtml/.gitignore
index 426db9e..426db9e 100644
--- a/web/.gitignore
+++ b/web/xhtml/.gitignore
diff --git a/web/xhtml/buildfile b/web/xhtml/buildfile
new file mode 100644
index 0000000..06dd34c
--- /dev/null
+++ b/web/xhtml/buildfile
@@ -0,0 +1,10 @@
+# file : web/xhtml/buildfile
+# license : MIT; see accompanying LICENSE file
+
+import libs = libstudxml%lib{studxml}
+
+./: {libue libus}{xhtml}: {hxx ixx txx cxx}{** -version} {hxx}{version} $libs
+
+hxx{version}: in{version} $src_root/manifest
+
+{hxx ixx txx}{*}: install = false
diff --git a/web/xhtml-fragment.cxx b/web/xhtml/fragment.cxx
index dbe0f0f..843db82 100644
--- a/web/xhtml-fragment.cxx
+++ b/web/xhtml/fragment.cxx
@@ -1,7 +1,7 @@
-// file : web/xhtml-fragment.cxx -*- C++ -*-
+// file : web/xhtml/fragment.cxx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
-#include <web/xhtml-fragment.hxx>
+#include <web/xhtml/fragment.hxx>
#include <string>
#include <cassert>
@@ -9,7 +9,7 @@
#include <libstudxml/parser.hxx>
#include <libstudxml/serializer.hxx>
-#include <web/xhtml.hxx>
+#include <web/xhtml/serialization.hxx>
using namespace std;
using namespace xml;
diff --git a/web/xhtml-fragment.hxx b/web/xhtml/fragment.hxx
index 832d9eb..eab4335 100644
--- a/web/xhtml-fragment.hxx
+++ b/web/xhtml/fragment.hxx
@@ -1,4 +1,4 @@
-// file : web/xhtml-fragment.hxx -*- C++ -*-
+// file : web/xhtml/fragment.hxx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
#ifndef WEB_XHTML_FRAGMENT_HXX
diff --git a/web/xhtml.hxx b/web/xhtml/serialization.hxx
index 727ad5f..03e72ff 100644
--- a/web/xhtml.hxx
+++ b/web/xhtml/serialization.hxx
@@ -1,12 +1,12 @@
-// file : web/xhtml.hxx -*- C++ -*-
+// file : web/xhtml/serialization.hxx -*- C++ -*-
// license : MIT; see accompanying LICENSE file
-#ifndef WEB_XHTML_HXX
-#define WEB_XHTML_HXX
+#ifndef WEB_XHTML_SERIALIZATION_HXX
+#define WEB_XHTML_SERIALIZATION_HXX
#include <libstudxml/serializer.hxx>
-#include <web/version.hxx>
+#include <web/xhtml/version.hxx>
namespace web
{
@@ -355,4 +355,4 @@ namespace web
}
}
-#endif // WEB_XHTML_HXX
+#endif // WEB_XHTML_SERIALIZATION_HXX
diff --git a/web/xhtml/version.hxx.in b/web/xhtml/version.hxx.in
new file mode 100644
index 0000000..fe3e4e5
--- /dev/null
+++ b/web/xhtml/version.hxx.in
@@ -0,0 +1,11 @@
+// file : web/xhtml/version.hxx.in -*- C++ -*-
+// license : MIT; see accompanying LICENSE file
+
+#ifndef WEB_XHTML_VERSION_HXX_IN
+#define WEB_XHTML_VERSION_HXX_IN
+
+#include <libstudxml/version.hxx>
+
+$libstudxml.check(LIBSTUDXML_VERSION, LIBSTUDXML_SNAPSHOT)$
+
+#endif // WEB_XHTML_VERSION_HXX_IN
generated by cgit v1.1 at 2024-11-05 19:59:47 +0000