summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--project2/basics/caches/memoryCache.cpp10
-rw-r--r--project2/cgi/cgiContentNegotiate.cpp10
-rw-r--r--project2/common/variables/config.cpp8
-rw-r--r--project2/files/presenterCache.cpp6
-rw-r--r--project2/ice/iceDataSource.cpp4
-rw-r--r--project2/mail/sendmailTask.h1
-rw-r--r--project2/sql/rdbmsDataSource.cpp4
-rw-r--r--project2/sql/rdbmsDataSource.h2
-rw-r--r--project2/sql/sqlCache.cpp6
-rw-r--r--project2/xml/xmlScriptParser.cpp4
10 files changed, 27 insertions, 28 deletions
diff --git a/project2/basics/caches/memoryCache.cpp b/project2/basics/caches/memoryCache.cpp
index 0f3ddf6..8aaa019 100644
--- a/project2/basics/caches/memoryCache.cpp
+++ b/project2/basics/caches/memoryCache.cpp
@@ -138,14 +138,14 @@ class MemoryCache : public RowSetCache {
CachedRowSetPtr cur;
- friend class CustomMemoryCacheLoader;
+ friend class CustomMemoryCacheFactory;
static time_t CacheLife;
static CacheStore Store;
};
time_t MemoryCache::CacheLife;
MemoryCache::CacheStore MemoryCache::Store;
-class CustomMemoryCacheLoader : public RowSetCacheFactory::For<MemoryCache>, public LifeCycle {
+class CustomMemoryCacheFactory : public RowSetCacheFactory::For<MemoryCache>, public LifeCycle {
public:
void onPeriodic() override {
typedef MemoryCache::CacheStore::index<MemoryCache::IndexByTime>::type::iterator iter;
@@ -156,10 +156,10 @@ class CustomMemoryCacheLoader : public RowSetCacheFactory::For<MemoryCache>, pub
INITOPTIONS;
};
-NAMEDPLUGIN("memorycache", CustomMemoryCacheLoader, RowSetCacheFactory);
+NAMEDPLUGIN("memorycache", CustomMemoryCacheFactory, RowSetCacheFactory);
-DECLARE_OPTIONS(CustomMemoryCacheLoader, "Memory Cache options")
+DECLARE_OPTIONS(CustomMemoryCacheFactory, "Memory Cache options")
("cache.memory.life", Options::value(&MemoryCache::CacheLife, 3600),
"The age of cache entries after which they are removed (seconds)")
-END_OPTIONS(CustomMemoryCacheLoader);
+END_OPTIONS(CustomMemoryCacheFactory);
diff --git a/project2/cgi/cgiContentNegotiate.cpp b/project2/cgi/cgiContentNegotiate.cpp
index 929159f..0d1bbaf 100644
--- a/project2/cgi/cgiContentNegotiate.cpp
+++ b/project2/cgi/cgiContentNegotiate.cpp
@@ -3,7 +3,7 @@
#include <boost/tokenizer.hpp>
#include <boost/bind.hpp>
-class ContentNegotiateLoader : public PresenterFactory {
+class ContentNegotiateFactory : public PresenterFactory {
public:
MultiRowSetPresenter * create(const ScriptNodePtr & s, const ObjectSource & os, ExecContext * const & ec) const
{
@@ -44,14 +44,14 @@ class ContentNegotiateLoader : public PresenterFactory {
bool cacheable() const { return false; }
};
-ContentNegotiateLoader::MappedTypes ContentNegotiateLoader::mappedTypes;
+ContentNegotiateFactory::MappedTypes ContentNegotiateFactory::mappedTypes;
-NAMEDPLUGIN("contentnegotiate", ContentNegotiateLoader, PresenterFactory);
+NAMEDPLUGIN("contentnegotiate", ContentNegotiateFactory, PresenterFactory);
-DECLARE_OPTIONS(ContentNegotiateLoader, "Content negotiation options")
+DECLARE_OPTIONS(ContentNegotiateFactory, "Content negotiation options")
("cgi.contentnegotiation.mappedtype", Options::functions(
[](const VariableType & v) { mappedTypes.push_back(new MappedType(v)); },
boost::bind(&MappedTypes::clear, &mappedTypes)),
"mimetype=presenter list of types to negotiate")
-END_OPTIONS(ContentNegotiateLoader)
+END_OPTIONS(ContentNegotiateFactory)
diff --git a/project2/common/variables/config.cpp b/project2/common/variables/config.cpp
index 1696f43..9ac3dd0 100644
--- a/project2/common/variables/config.cpp
+++ b/project2/common/variables/config.cpp
@@ -32,7 +32,7 @@ class VariableConfig : public VariableImplDyn {
const Glib::ustring name;
};
-class VariableConfigLoader : public VariableFactory::For<VariableConfig> {
+class VariableConfigFactory : public VariableFactory::For<VariableConfig> {
public:
class AppSettings : public Options::Option {
public:
@@ -68,14 +68,14 @@ class VariableConfigLoader : public VariableFactory::For<VariableConfig> {
return "Load settings into the client application";
}
};
- VariableConfigLoader() :
+ VariableConfigFactory() :
opts(new Options("Variables - ModConfig options"))
{
(*opts)(new AppSettings());
AdHoc::PluginManager::getDefault()->add<Options>(opts, typeid(AppSettings).name(), __FILE__, __LINE__);
}
- ~VariableConfigLoader()
+ ~VariableConfigFactory()
{
AdHoc::PluginManager::getDefault()->remove<Options>(typeid(AppSettings).name());
}
@@ -88,5 +88,5 @@ class VariableConfigLoader : public VariableFactory::For<VariableConfig> {
Options * opts;
};
-NAMEDPLUGIN("config", VariableConfigLoader, VariableFactory);
+NAMEDPLUGIN("config", VariableConfigFactory, VariableFactory);
diff --git a/project2/files/presenterCache.cpp b/project2/files/presenterCache.cpp
index 4066058..9651c20 100644
--- a/project2/files/presenterCache.cpp
+++ b/project2/files/presenterCache.cpp
@@ -228,7 +228,7 @@ class FilePresenterCache : public PresenterCache {
static std::string FileName;
static std::string Provider;
static time_t CacheLife;
- friend class FilePresenterCacheLoader;
+ friend class FilePresenterCacheFactory;
};
FilePresenterCache::OpenCaches FilePresenterCache::openCaches;
boost::filesystem::path FilePresenterCache::Store;
@@ -247,9 +247,9 @@ DECLARE_OPTIONS(FilePresenterCache, "File Presenter Cache options")
"The name of the component used to provide a unique request ID")
END_OPTIONS(FilePresenterCache)
-class FilePresenterCacheLoader : public LifeCycle {
+class FilePresenterCacheFactory : public LifeCycle {
public:
- FilePresenterCacheLoader()
+ FilePresenterCacheFactory()
{
gcry_check_version(GCRYPT_VERSION);
}
diff --git a/project2/ice/iceDataSource.cpp b/project2/ice/iceDataSource.cpp
index 8c15173..cce2dd8 100644
--- a/project2/ice/iceDataSource.cpp
+++ b/project2/ice/iceDataSource.cpp
@@ -44,12 +44,12 @@ IceDataSource::ClearSlice()
libs.clear();
}
-class IceDataSourceLoader : public DataSourceFactory::For<IceDataSource>, public LifeCycle {
+class IceDataSourceFactory : public DataSourceFactory::For<IceDataSource>, public LifeCycle {
public:
void onConfigLoad() override {
IceBase::FinaliseLoad(IceDataSource::libs);
}
};
-NAMEDPLUGIN("icedatasource", IceDataSourceLoader, DataSourceFactory);
+NAMEDPLUGIN("icedatasource", IceDataSourceFactory, DataSourceFactory);
diff --git a/project2/mail/sendmailTask.h b/project2/mail/sendmailTask.h
index 035fe2b..e09b871 100644
--- a/project2/mail/sendmailTask.h
+++ b/project2/mail/sendmailTask.h
@@ -49,7 +49,6 @@ class SendMailTask : public Task {
PresenterPtr createDefaultPresenter(ScriptNodePtr n) const;
// Configurables
- friend class CustomSendMailTaskLoader;
friend class TransformWritableContentToEmail;
static std::string defaultMailServer;
static std::string defaultMailEncoding;
diff --git a/project2/sql/rdbmsDataSource.cpp b/project2/sql/rdbmsDataSource.cpp
index aa5bee4..46e97a8 100644
--- a/project2/sql/rdbmsDataSource.cpp
+++ b/project2/sql/rdbmsDataSource.cpp
@@ -7,8 +7,8 @@
#define LOCK(l) std::lock_guard<std::mutex> _lock##l(l)
-/// Specialized ElementLoader for instances of RdbmsDataSource; handles persistent DB connections
-class RdbmsDataSourceLoader : public LifeCycle {
+/// Life cycle component for handling closure of persistent DB connections
+class RdbmsDataSourceFactory : public LifeCycle {
public:
void onIdle() override
{
diff --git a/project2/sql/rdbmsDataSource.h b/project2/sql/rdbmsDataSource.h
index 4b7763f..979cec6 100644
--- a/project2/sql/rdbmsDataSource.h
+++ b/project2/sql/rdbmsDataSource.h
@@ -94,7 +94,7 @@ class RdbmsDataSource : public DataSource {
typedef std::set<ChangedDSN> ChangedDSNs;
static ChangedDSNs changedDSNs;
- friend class RdbmsDataSourceLoader;
+ friend class RdbmsDataSourceFactory;
};
#endif
diff --git a/project2/sql/sqlCache.cpp b/project2/sql/sqlCache.cpp
index 24a6b80..d20a8fc 100644
--- a/project2/sql/sqlCache.cpp
+++ b/project2/sql/sqlCache.cpp
@@ -253,7 +253,7 @@ class SqlCache : public RowSetCache {
INITOPTIONS;
private:
- friend class CustomSqlCacheLoader;
+ friend class CustomSqlCacheFactory;
const RdbmsDataSource * db;
static std::string DataSource;
static std::string HeaderTable;
@@ -264,7 +264,7 @@ std::string SqlCache::DataSource;
std::string SqlCache::HeaderTable;
time_t SqlCache::CacheLife;
-class CustomSqlCacheLoader : public RowSetCacheFactory::For<SqlCache>, public LifeCycle {
+class CustomSqlCacheFactory : public RowSetCacheFactory::For<SqlCache>, public LifeCycle {
public:
void onIdle() override
{
@@ -284,7 +284,7 @@ class CustomSqlCacheLoader : public RowSetCacheFactory::For<SqlCache>, public Li
}
}
};
-NAMEDPLUGIN("sqlcache", CustomSqlCacheLoader, RowSetCacheFactory);
+NAMEDPLUGIN("sqlcache", CustomSqlCacheFactory, RowSetCacheFactory);
DECLARE_OPTIONS(SqlCache, "SQL Cache options")
("cache.sql.dataSource", Options::value(&DataSource),
diff --git a/project2/xml/xmlScriptParser.cpp b/project2/xml/xmlScriptParser.cpp
index c86f8c0..33b464e 100644
--- a/project2/xml/xmlScriptParser.cpp
+++ b/project2/xml/xmlScriptParser.cpp
@@ -90,7 +90,7 @@ XmlScriptParser::isCurrent() const
return true;
}
-class XmlScriptReaderLoader : public ScriptReaderFactory {
+class XmlScriptReaderFactory : public ScriptReaderFactory {
public:
XmlScriptParser * create(const std::string & group, const std::string & name) const {
boost::filesystem::path script(boost::filesystem::path(group) / (name + ".xml"));
@@ -248,5 +248,5 @@ XmlScriptNode::composeWithCallbacks(const LiteralCallback & lcb, const NodeCallb
}
}
-NAMEDPLUGIN("xmlScriptReader", XmlScriptReaderLoader, ScriptReaderFactory);
+NAMEDPLUGIN("xmlScriptReader", XmlScriptReaderFactory, ScriptReaderFactory);
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 12:18:00 +0000