A batch of fixes:

 - #1993 WebSockets 'Compressed bit must be 0 if no negotiated deflate-frame extension' message
 - #1988 WPushButton user-provided style class is lost when a setLink() occurs after initial render
 - #1987 WPushButton user-provided style class is lost when a setLink() occurs after initial render
 - #1984 QueryModel addColumn
 - #1981 WPaintedWidget setInline(true) does not display as linline in IE9 and IE10
 - #1977 Inconsistent wt_config.xml.in comment/setting UA-Compatible
 - #1964 WBorderLayout Documentation - Enum Namespace is Wrong

Author: Koen Deforche

examples/blog/BlogRSSFeed.C

@@ -18,24 +18,24 @@
 
 namespace dbo = Wt::Dbo;
 
-BlogRSSFeed::BlogRSSFeed(const std::string& sqliteDb,
+BlogRSSFeed::BlogRSSFeed(dbo::SqlConnectionPool& connectionPool,
 			 const std::string& title,
 			 const std::string& url,
 			 const std::string& description)
-  : session_(new BlogSession(sqliteDb)),
+  : connectionPool_(connectionPool),
     title_(title),
     url_(url),
     description_(description)
 { }
 
 BlogRSSFeed::~BlogRSSFeed()
-{
-  delete session_;
-}
+{ }
 
 void BlogRSSFeed::handleRequest(const Wt::Http::Request &request,
 				Wt::Http::Response &response)
 {
+  BlogSession session(connectionPool_);
+
   response.setMimeType("application/rss+xml");
 
   std::string url = url_;
@@ -59,9 +59,9 @@ void BlogRSSFeed::handleRequest(const Wt::Http::Request &request,
     "    <description>" << Wt::Utils::htmlEncode(description_)
 		 << "</description>\n";
 
-  dbo::Transaction t(*session_);
+  dbo::Transaction t(session);
 
-  Posts posts = session_->find<Post>
+  Posts posts = session.find<Post>
     ("where state = ? "
      "order by date desc "
      "limit 10").bind(Post::Published);

examples/blog/BlogRSSFeed.h

@@ -14,7 +14,7 @@ class BlogSession;
 class BlogRSSFeed : public Wt::WResource
 {
 public:
-  BlogRSSFeed(const std::string& sqliteDb,
+  BlogRSSFeed(Wt::Dbo::SqlConnectionPool& connectionPool,
 	      const std::string& title,
 	      const std::string& url,
 	      const std::string& description);
@@ -25,8 +25,7 @@ class BlogRSSFeed : public Wt::WResource
 			     Wt::Http::Response &response);
 
 private:
-  BlogSession *session_;
-
+  Wt::Dbo::SqlConnectionPool& connectionPool_;
   std::string title_, url_, description_;
 };
 

examples/blog/blog.C

@@ -6,6 +6,7 @@
 #include <Wt/WApplication>
 #include <Wt/WContainerWidget>
 #include <Wt/WServer>
+#include <Wt/Dbo/SqlConnectionPool>
 
 #include "model/BlogSession.h"
 #include "model/Token.h"
@@ -24,18 +25,18 @@ static const char *BlogUrl = "/blog";
 class BlogApplication : public WApplication
 {
 public:
-  BlogApplication(const WEnvironment& env) 
+  BlogApplication(const WEnvironment& env, Wt::Dbo::SqlConnectionPool& blogDb) 
     : WApplication(env)
   {
-    root()->addWidget(new BlogView("/",
-      WApplication::appRoot() + "blog.db", FeedUrl));
+    root()->addWidget(new BlogView("/", blogDb, FeedUrl));
     useStyleSheet("css/blogexample.css");
   }
 };
 
-WApplication *createApplication(const WEnvironment& env)
+WApplication *createApplication(const WEnvironment& env,
+				Wt::Dbo::SqlConnectionPool *blogDb)
 {
-  return new BlogApplication(env);
+  return new BlogApplication(env, *blogDb);
 }
 
 int main(int argc, char **argv)
@@ -47,13 +48,16 @@ int main(int argc, char **argv)
 
     BlogSession::configureAuth();
 
-    BlogRSSFeed rssFeed(server.appRoot() + "blog.db", "Wt blog example",
-      "", "It's just an example.");
+    Wt::Dbo::SqlConnectionPool *blogDb
+      = BlogSession::createConnectionPool(server.appRoot() + "blog.db");
+
+    BlogRSSFeed rssFeed(*blogDb, "Wt blog example", "", "It's just an example.");
 
     server.addResource(&rssFeed, FeedUrl);
     //When the blog application is deployed in ISAPI on the path "/blog"
     //the resources (css+images) are not fetched correctly
-    server.addEntryPoint(Application, createApplication, BlogUrl);    
+    server.addEntryPoint(Application,
+			 boost::bind(&createApplication, _1, blogDb), BlogUrl);    
 
     std::cerr << "\n\n -- Warning: Example is deployed at '"
       << BlogUrl << "'\n\n";
@@ -62,6 +66,8 @@ int main(int argc, char **argv)
       WServer::waitForShutdown();
       server.stop();
     }
+
+    delete blogDb;
   } catch (WServer::Exception& e) {
     std::cerr << e.what() << std::endl;
   } catch (std::exception &e) {

examples/blog/model/BlogSession.C

@@ -12,13 +12,15 @@
 #include "User.h"
 #include "../asciidoc/asciidoc.h"
 
-#include "Wt/Auth/AuthService"
-#include "Wt/Auth/HashFunction"
-#include "Wt/Auth/Identity"
-#include "Wt/Auth/PasswordService"
-#include "Wt/Auth/PasswordStrengthValidator"
-#include "Wt/Auth/PasswordVerifier"
-#include "Wt/Auth/GoogleService"
+#include <Wt/Auth/AuthService>
+#include <Wt/Auth/HashFunction>
+#include <Wt/Auth/Identity>
+#include <Wt/Auth/PasswordService>
+#include <Wt/Auth/PasswordStrengthValidator>
+#include <Wt/Auth/PasswordVerifier>
+#include <Wt/Auth/GoogleService>
+
+#include <Wt/Dbo/FixedSqlConnectionPool>
 
 #ifndef WIN32
 #include <unistd.h>
@@ -96,15 +98,22 @@ void BlogSession::configureAuth()
     blogOAuth.push_back(new Auth::GoogleService(blogAuth));
 }
 
-BlogSession::BlogSession(const std::string& sqliteDb)
-  : connection_(sqliteDb),
-    users_(*this)
+dbo::SqlConnectionPool *BlogSession::createConnectionPool(const std::string& sqliteDb)
 {
-  connection_.setProperty("show-queries", "true");
-  connection_.setDateTimeStorage(Wt::Dbo::SqlDateTime,
+  dbo::backend::Sqlite3 *connection = new dbo::backend::Sqlite3(sqliteDb);
+
+  connection->setProperty("show-queries", "true");
+  connection->setDateTimeStorage(Wt::Dbo::SqlDateTime,
 				 Wt::Dbo::backend::Sqlite3::PseudoISO8601AsText);
 
-  setConnection(connection_);
+  return new dbo::FixedSqlConnectionPool(connection, 10);
+}
+
+BlogSession::BlogSession(dbo::SqlConnectionPool& connectionPool)
+  : connectionPool_(connectionPool),
+    users_(*this)
+{
+  setConnectionPool(connectionPool_);
 
   mapClass<Comment>("comment");
   mapClass<Post>("post");

examples/blog/model/BlogSession.h

@@ -33,7 +33,7 @@ class BlogSession : public dbo::Session
 public:
   static void configureAuth();
 
-  BlogSession(const std::string& sqliteDb);
+  BlogSession(dbo::SqlConnectionPool& connectionPool);
 
   dbo::ptr<User> user() const;
 
@@ -46,8 +46,10 @@ class BlogSession : public dbo::Session
   Wt::Auth::PasswordService *passwordAuth() const;
   const std::vector<const Wt::Auth::OAuthService *>& oAuth() const;
 
+  static dbo::SqlConnectionPool *createConnectionPool(const std::string& sqlite3);
+
 private:
-  dbo::backend::Sqlite3 connection_;
+  dbo::SqlConnectionPool& connectionPool_;
   BlogUserDatabase users_;
   Wt::Auth::Login login_;
 

examples/blog/view/BlogView.C

@@ -42,11 +42,11 @@ namespace dbo = Wt::Dbo;
 class BlogImpl : public WContainerWidget
 {
 public:
-  BlogImpl(const std::string& basePath, const std::string& sqliteDb,
+  BlogImpl(const std::string& basePath, dbo::SqlConnectionPool& connectionPool,
 	   const std::string& rssFeedUrl, BlogView *blogView)
     : basePath_(basePath),
       rssFeedUrl_(rssFeedUrl),
-      session_(sqliteDb),
+      session_(connectionPool),
       blogView_(blogView),
       panel_(0),
       authorPanel_(0),
@@ -456,12 +456,12 @@ private:
   }
 };
 
-BlogView::BlogView(const std::string& basePath, const std::string& sqliteDb,
+BlogView::BlogView(const std::string& basePath, dbo::SqlConnectionPool& db,
 		   const std::string& rssFeedUrl, WContainerWidget *parent)
   : WCompositeWidget(parent),
     userChanged_(this)
 {
-  impl_ = new BlogImpl(basePath, sqliteDb, rssFeedUrl, this);
+  impl_ = new BlogImpl(basePath, db, rssFeedUrl, this);
   setImplementation(impl_);
 }
 

examples/blog/view/BlogView.h

@@ -18,7 +18,7 @@ class BlogImpl;
 class BlogView : public Wt::WCompositeWidget
 {
 public:
-  BlogView(const std::string& basePath, const std::string& sqliteDb,
+  BlogView(const std::string& basePath, Wt::Dbo::SqlConnectionPool& db,
 	   const std::string& rssFeedUrl, Wt::WContainerWidget *parent = 0);
 
   void setInternalBasePath(const std::string& basePath);

examples/wt-homepage/Home.C

@@ -35,10 +35,13 @@ Home::~Home()
 {
 }
 
-Home::Home(const WEnvironment& env, const std::string& title,
-	   const std::string& resourceBundle, const std::string& cssPath)
+Home::Home(const WEnvironment& env,
+	   Wt::Dbo::SqlConnectionPool& blogDb,
+	   const std::string& title, const std::string& resourceBundle,
+	   const std::string& cssPath)
   : WApplication(env),
     releases_(0),
+    blogDb_(blogDb),
     homePage_(0),
     sourceViewer_(0)
 {
@@ -257,7 +260,7 @@ WWidget *Home::blog()
   const Lang& l = languages[language_];
   std::string langPath = l.path_;
   BlogView *blog = new BlogView(langPath + "blog/",
-				appRoot() + "blog.db", "/wt/blog/feed/");
+				blogDb_, "/wt/blog/feed/");
   blog->setObjectName("blog");
 
   if (!blog->user().empty())

examples/wt-homepage/Home.h

@@ -67,7 +67,7 @@ DeferredWidget<Function> *deferCreate(Function f)
 class Home : public WApplication
 {
 public:
-  Home(const WEnvironment& env,
+  Home(const WEnvironment& env, Wt::Dbo::SqlConnectionPool& blogDb,
        const std::string& title,
        const std::string& resourceBundle, const std::string& cssPath);
 
@@ -95,6 +95,7 @@ class Home : public WApplication
   void readReleases(WTable *releaseTable);
 
 private:
+  Wt::Dbo::SqlConnectionPool& blogDb_;
   WWidget *homePage_;
   WWidget *sourceViewer_;
 

examples/wt-homepage/JWtHome.C

@@ -24,10 +24,10 @@
 
 #include "ExampleSourceViewer.h"
 
-JWtHome::JWtHome(const WEnvironment& env)
-  : Home(env, 
-      "JWt, Java Web Toolkit",
-      "jwt-home", "css/jwt")
+JWtHome::JWtHome(const WEnvironment& env, Wt::Dbo::SqlConnectionPool& blogDb)
+  : Home(env, blogDb,
+	 "JWt, Java Web Toolkit",
+	 "jwt-home", "css/jwt")
 {
   addLanguage(Lang("en", "/", "en", "English"));
 
@@ -154,7 +154,8 @@ WWidget *JWtHome::wrapView(WWidget *(JWtHome::*createWidget)())
   return makeStaticModel(boost::bind(createWidget, this));
 }
 
-WApplication *createJWtHomeApplication(const WEnvironment& env)
+WApplication *createJWtHomeApplication(const WEnvironment& env, 
+				       Wt::Dbo::SqlConnectionPool *blogDb)
 {
-  return new JWtHome(env);
+  return new JWtHome(env, *blogDb);
 }