Changeset 3337

Timestamp:

01/30/10 16:21:14 (7 weeks ago)

Author:

mgray

Message:

Implemented logic in installApplications() to load database configuration into DatabaseConnections? objects.

Location:

Enterprise/branches/0075_TR_SCRIPTING/AppServer/src

Files:

• ApplicationServer.cpp (modified) (6 diffs)
• ApplicationServer.hpp (modified) (2 diffs)

Enterprise/branches/0075_TR_SCRIPTING/AppServer/src/ApplicationServer.cpp

@@ -481 +481 @@
         :       public Zen::Plugins::I_ConfigurationElement::I_ConfigurationElementVisitor
         {
+        class DatabaseVisitor
+        :   public Zen::Plugins::I_ConfigurationElement::I_ConfigurationElementVisitor
+        {
+            typedef std::map<std::string, std::string>      config_type;
+
+            class DBConfigVisitor
+            :   public Zen::Plugins::I_ConfigurationElement::I_ConfigurationElementVisitor
+            {
+            public:
+                virtual void begin() {}
+
+                virtual void visit(const Zen::Plugins::I_ConfigurationElement& _element)
+                {
+                    m_config[_element.getAttribute("name")] = _element.getAttribute("value");
+                }
+
+                virtual void end() {}
+
+                DBConfigVisitor(config_type& _config)
+                :   m_config(_config)
+                {
+                }
+
+            private:
+                config_type&    m_config;
+
+            };  // class DBConfigVisitor
+
+        public:
+            virtual void begin() {}
+
+            virtual void visit(const Zen::Plugins::I_ConfigurationElement& _element)
+            {
+                config_type config;
+
+                DBConfigVisitor visitor(config);
+                _element.getChildren("config", visitor);
+
+                m_pAppServer->createDatabaseEntry(_element.getAttribute("name"), config);
+            }
+
+            virtual void end() {}
+
+            DatabaseVisitor(ApplicationServer* _pAppServer)
+            :   m_pAppServer(_pAppServer)
+            {
+            }
+
+        private:
+            ApplicationServer*        m_pAppServer;
+
+        };  // class DatabaseVisitor
         public:
                 virtual void begin() {}
@@ -489 +541 @@
                                 Zen::Enterprise::AppServer::I_ApplicationServerManager::getSingleton();
 
+            DatabaseVisitor visitor(m_pAppServer);
+            _element.getChildren("database", visitor);
+
                         Zen::Enterprise::AppServer::I_ApplicationServerManager::pApplicationService_type
                                 pApplicationService = manager.createApplicationService(*m_pAppServer, _element.getAttribute("type"));
@@ -501 +556 @@
                 virtual void end() {}
 
-        ConfigVisitor(I_ApplicationServer* _pAppServer)
+        ConfigVisitor(ApplicationServer* _pAppServer)
         :   m_pAppServer(_pAppServer)
         {
@@ -507 +562 @@
 
     private:
-        I_ApplicationServer*        m_pAppServer;
+        ApplicationServer*        m_pAppServer;
     };
 
@@ -824 +879 @@
     if( iter != m_databaseConnectionsMap.end() )
     {
-        return iter->second.getConnection(_threadId);
+        return iter->second->getConnection(_threadId);
     }
     else
@@ -923 +978 @@
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+void
+ApplicationServer::createDatabaseEntry(const std::string& _database, config_type& _config)
+{
+    DatabaseConnectionsMap_type::iterator iter = m_databaseConnectionsMap.find(_database);
+    if( iter == m_databaseConnectionsMap.end() )
+    {
+        typedef Zen::Memory::managed_ptr<Zen::Database::I_DatabaseService>  pDatabaseService_type;
+        pDatabaseService_type pDatabaseService = 
+            Zen::Database::I_DatabaseManager::getSingleton().createDatabaseService(
+                _database, 
+                _config
+            );
+
+        m_databaseConnectionsMap[_database] = new DatabaseConnections(pDatabaseService, _config);
+    }
+    else
+    {
+        // TODO Error?
+    }
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 }   // namespace AppServer
 }   // namespace Enterprise

Enterprise/branches/0075_TR_SCRIPTING/AppServer/src/ApplicationServer.hpp

@@ -114 +114 @@
 
     Threading::ThreadPool& getSharedThreadPool() { return m_sharedThreadPool; }
+
+    typedef std::map<std::string,std::string> config_type;
+    void createDatabaseEntry(const std::string& _database, config_type& _config);
     /// @}
 
@@ -201 +204 @@
     pMessageRegistry_type       m_pMessageRegistry_type;
 
-    typedef std::map<std::string, DatabaseConnections>  DatabaseConnectionsMap_type;
+    typedef std::map<std::string, DatabaseConnections*>  DatabaseConnectionsMap_type;
     DatabaseConnectionsMap_type m_databaseConnectionsMap;
     /// @}