diff options
| -rw-r--r-- | brep/buildfile | 42 | ||||
| -rw-r--r-- | brep/database (renamed from brep/shared-database) | 8 | ||||
| -rw-r--r-- | brep/database.cxx (renamed from brep/shared-database.cxx) | 6 | ||||
| -rw-r--r-- | brep/mod-package-details (renamed from brep/package-details) | 8 | ||||
| -rw-r--r-- | brep/mod-package-details.cxx (renamed from brep/package-details.cxx) | 6 | ||||
| -rw-r--r-- | brep/mod-package-search (renamed from brep/package-search) | 8 | ||||
| -rw-r--r-- | brep/mod-package-search.cxx (renamed from brep/package-search.cxx) | 6 | ||||
| -rw-r--r-- | brep/mod-package-version-details (renamed from brep/package-version-details) | 8 | ||||
| -rw-r--r-- | brep/mod-package-version-details.cxx (renamed from brep/package-version-details.cxx) | 6 | ||||
| -rw-r--r-- | brep/mod-repository-details (renamed from brep/repository-details) | 8 | ||||
| -rw-r--r-- | brep/mod-repository-details.cxx (renamed from brep/repository-details.cxx) | 6 | ||||
| -rw-r--r-- | brep/mod-repository-root (renamed from brep/repository-root) | 8 | ||||
| -rw-r--r-- | brep/mod-repository-root.cxx (renamed from brep/repository-root.cxx) | 12 | ||||
| -rw-r--r-- | brep/services.cxx | 2 |
14 files changed, 67 insertions, 67 deletions
diff --git a/brep/buildfile b/brep/buildfile index 80949fe..42fe3b5 100644 --- a/brep/buildfile +++ b/brep/buildfile @@ -38,27 +38,27 @@ install.include = $install.include/brep import libs += libstudxml%lib{studxml} gen = {hxx ixx cxx}{ options } -src = \ - {hxx cxx}{ diagnostics } \ - {hxx cxx}{ module } \ - {hxx }{ options-types } \ - {hxx cxx}{ package-details } \ - {hxx cxx}{ package-search } \ - {hxx cxx}{ package-version-details } \ - {hxx cxx}{ page } \ - {hxx cxx}{ repository-details } \ - {hxx cxx}{ repository-root } \ - { cxx}{ services } \ - {hxx cxx}{ shared-database } \ - {hxx cxx}{ types-parsers } \ - {hxx }{ wrapper-traits } \ - ../web/{hxx cxx}{ mime-url-encoding } \ - ../web/{hxx }{ module } \ - ../web/{hxx }{ xhtml } \ -../web/apache/{hxx }{ log } \ -../web/apache/{hxx ixx cxx}{ request } \ -../web/apache/{hxx txx cxx}{ service } \ -../web/apache/{hxx }{ stream } \ +src = \ + {hxx cxx}{ diagnostics } \ + {hxx cxx}{ module } \ + {hxx }{ options-types } \ + {hxx cxx}{ mod-package-details } \ + {hxx cxx}{ mod-package-search } \ + {hxx cxx}{ mod-package-version-details } \ + {hxx cxx}{ page } \ + {hxx cxx}{ mod-repository-details } \ + {hxx cxx}{ mod-repository-root } \ + { cxx}{ services } \ + {hxx cxx}{ database } \ + {hxx cxx}{ types-parsers } \ + {hxx }{ wrapper-traits } \ + ../web/{hxx cxx}{ mime-url-encoding } \ + ../web/{hxx }{ module } \ + ../web/{hxx }{ xhtml } \ +../web/apache/{hxx }{ log } \ +../web/apache/{hxx ixx cxx}{ request } \ +../web/apache/{hxx txx cxx}{ service } \ +../web/apache/{hxx }{ stream } mod{brep}: $src $gen lib{brep} $libs diff --git a/brep/shared-database b/brep/database index b445cc1..6fdfe0b 100644 --- a/brep/shared-database +++ b/brep/database @@ -1,9 +1,9 @@ -// file : brep/shared-database -*- C++ -*- +// file : brep/database -*- C++ -*- // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BREP_SHARED_DATABASE -#define BREP_SHARED_DATABASE +#ifndef BREP_DATABASE +#define BREP_DATABASE #include <odb/forward.hxx> // database @@ -22,4 +22,4 @@ namespace brep shared_database (const options::db&); } -#endif // BREP_SHARED_DATABASE +#endif // BREP_DATABASE diff --git a/brep/shared-database.cxx b/brep/database.cxx index 1389dab..4b7494e 100644 --- a/brep/shared-database.cxx +++ b/brep/database.cxx @@ -1,8 +1,8 @@ -// file : brep/shared-database.cxx -*- C++ -*- +// file : brep/database.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <brep/shared-database> +#include <brep/database> #include <stdexcept> // runtime_error @@ -30,7 +30,7 @@ namespace brep o.db_name () != d->db () || o.db_host () != d->host () || o.db_port () != d->port ()) - throw std::runtime_error ("shared database host/port mismatch"); + throw std::runtime_error ("shared database options mismatch"); return d; } diff --git a/brep/package-details b/brep/mod-package-details index 6766797..e6603f3 100644 --- a/brep/package-details +++ b/brep/mod-package-details @@ -1,9 +1,9 @@ -// file : brep/package-details -*- C++ -*- +// file : brep/mod-package-details -*- C++ -*- // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BREP_PACKAGE_DETAILS -#define BREP_PACKAGE_DETAILS +#ifndef BREP_MOD_PACKAGE_DETAILS +#define BREP_MOD_PACKAGE_DETAILS #include <odb/forward.hxx> // database @@ -33,4 +33,4 @@ namespace brep }; } -#endif // BREP_PACKAGE_DETAILS +#endif // BREP_MOD_PACKAGE_DETAILS diff --git a/brep/package-details.cxx b/brep/mod-package-details.cxx index a10f668..ba6387e 100644 --- a/brep/package-details.cxx +++ b/brep/mod-package-details.cxx @@ -1,8 +1,8 @@ -// file : brep/package-details.cxx -*- C++ -*- +// file : brep/mod-package-details.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <brep/package-details> +#include <brep/mod-package-details> #include <xml/serializer> @@ -20,8 +20,8 @@ #include <brep/page> #include <brep/options> #include <brep/package> +#include <brep/database> #include <brep/package-odb> -#include <brep/shared-database> using namespace odb::core; using namespace brep::cli; diff --git a/brep/package-search b/brep/mod-package-search index 63ec6e0..c86d0b5 100644 --- a/brep/package-search +++ b/brep/mod-package-search @@ -1,9 +1,9 @@ -// file : brep/package-search -*- C++ -*- +// file : brep/mod-package-search -*- C++ -*- // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BREP_PACKAGE_SEARCH -#define BREP_PACKAGE_SEARCH +#ifndef BREP_MOD_PACKAGE_SEARCH +#define BREP_MOD_PACKAGE_SEARCH #include <odb/forward.hxx> // database @@ -33,4 +33,4 @@ namespace brep }; } -#endif // BREP_PACKAGE_SEARCH +#endif // BREP_MOD_PACKAGE_SEARCH diff --git a/brep/package-search.cxx b/brep/mod-package-search.cxx index 0e093b9..6d7bdd6 100644 --- a/brep/package-search.cxx +++ b/brep/mod-package-search.cxx @@ -1,8 +1,8 @@ -// file : brep/package-search.cxx -*- C++ -*- +// file : brep/mod-package-search.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <brep/package-search> +#include <brep/mod-package-search> #include <xml/serializer> @@ -20,8 +20,8 @@ #include <brep/page> #include <brep/options> #include <brep/package> +#include <brep/database> #include <brep/package-odb> -#include <brep/shared-database> using namespace odb::core; using namespace brep::cli; diff --git a/brep/package-version-details b/brep/mod-package-version-details index 8057097..48bf453 100644 --- a/brep/package-version-details +++ b/brep/mod-package-version-details @@ -1,9 +1,9 @@ -// file : brep/package-version-details -*- C++ -*- +// file : brep/mod-package-version-details -*- C++ -*- // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BREP_PACKAGE_VERSION_DETAILS -#define BREP_PACKAGE_VERSION_DETAILS +#ifndef BREP_MOD_PACKAGE_VERSION_DETAILS +#define BREP_MOD_PACKAGE_VERSION_DETAILS #include <odb/forward.hxx> // database @@ -36,4 +36,4 @@ namespace brep }; } -#endif // BREP_PACKAGE_VERSION_DETAILS +#endif // BREP_MOD_PACKAGE_VERSION_DETAILS diff --git a/brep/package-version-details.cxx b/brep/mod-package-version-details.cxx index 0300b88..54f8f19 100644 --- a/brep/package-version-details.cxx +++ b/brep/mod-package-version-details.cxx @@ -1,8 +1,8 @@ -// file : brep/package-version-details.cxx -*- C++ -*- +// file : brep/mod-package-version-details.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <brep/package-version-details> +#include <brep/mod-package-version-details> #include <stdexcept> // invalid_argument @@ -22,8 +22,8 @@ #include <brep/page> #include <brep/options> #include <brep/package> +#include <brep/database> #include <brep/package-odb> -#include <brep/shared-database> using namespace std; using namespace odb::core; diff --git a/brep/repository-details b/brep/mod-repository-details index 7efc6a6..71df39b 100644 --- a/brep/repository-details +++ b/brep/mod-repository-details @@ -1,9 +1,9 @@ -// file : brep/repository-details -*- C++ -*- +// file : brep/mod-repository-details -*- C++ -*- // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BREP_REPOSITORY_DETAILS -#define BREP_REPOSITORY_DETAILS +#ifndef BREP_MOD_REPOSITORY_DETAILS +#define BREP_MOD_REPOSITORY_DETAILS #include <odb/forward.hxx> // database @@ -33,4 +33,4 @@ namespace brep }; } -#endif // BREP_REPOSITORY_DETAILS +#endif // BREP_MOD_REPOSITORY_DETAILS diff --git a/brep/repository-details.cxx b/brep/mod-repository-details.cxx index 0d71ac8..a1a0fa5 100644 --- a/brep/repository-details.cxx +++ b/brep/mod-repository-details.cxx @@ -1,8 +1,8 @@ -// file : brep/repository-details.cxx -*- C++ -*- +// file : brep/mod-repository-details.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <brep/repository-details> +#include <brep/mod-repository-details> #include <xml/serializer> @@ -19,8 +19,8 @@ #include <brep/page> #include <brep/options> #include <brep/package> +#include <brep/database> #include <brep/package-odb> -#include <brep/shared-database> using namespace odb::core; using namespace brep::cli; diff --git a/brep/repository-root b/brep/mod-repository-root index 006f163..9030ee8 100644 --- a/brep/repository-root +++ b/brep/mod-repository-root @@ -1,9 +1,9 @@ -// file : brep/repository-root -*- C++ -*- +// file : brep/mod-repository-root -*- C++ -*- // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#ifndef BREP_REPOSITORY_ROOT -#define BREP_REPOSITORY_ROOT +#ifndef BREP_MOD_REPOSITORY_ROOT +#define BREP_MOD_REPOSITORY_ROOT #include <brep/types> @@ -50,4 +50,4 @@ namespace brep }; } -#endif // BREP_REPOSITORY_ROOT +#endif // BREP_MOD_REPOSITORY_ROOT diff --git a/brep/repository-root.cxx b/brep/mod-repository-root.cxx index 5711109..695a5c7 100644 --- a/brep/repository-root.cxx +++ b/brep/mod-repository-root.cxx @@ -1,8 +1,8 @@ -// file : brep/repository-root.cxx -*- C++ -*- +// file : brep/mod-repository-root.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2015 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <brep/repository-root> +#include <brep/mod-repository-root> #include <sstream> @@ -14,10 +14,10 @@ #include <brep/module> #include <brep/options> -#include <brep/package-search> -#include <brep/package-details> -#include <brep/repository-details> -#include <brep/package-version-details> +#include <brep/mod-package-search> +#include <brep/mod-package-details> +#include <brep/mod-repository-details> +#include <brep/mod-package-version-details> using namespace std; using namespace brep::cli; diff --git a/brep/services.cxx b/brep/services.cxx index dcac22c..b600717 100644 --- a/brep/services.cxx +++ b/brep/services.cxx @@ -6,7 +6,7 @@ #include <web/apache/service> -#include <brep/repository-root> +#include <brep/mod-repository-root> static brep::repository_root mod; web::apache::service AP_MODULE_DECLARE_DATA brep_module ("brep", mod); |