Simplify CMS_SERVICE initialization, and CMS server (launcher).

Renamed "layout" lib as "app_env" with APPLICATION_ENVIRONMENT interface. applied changed to callers. Added CMS_THEME.has_region (a_name): BOOLEAN to know if a region is declared in a defined theme.
2015-04-29 23:01:42 +02:00
parent 0eb2b70d0f
commit 6ff7a6493c
34 changed files with 214 additions and 154 deletions
--- a/library/app_env/Readme.md
+++ b/library/app_env/Readme.md
@@ -0,0 +1,13 @@
+Application Environment Library
+===============================
+
+Define a generic application environment to be re-used by different applications.
+
+site/
+	  doc/
+	  logs/
+      www/
+      	  assets
+      	  template
+      	  theme
+      config/  
--- a/library/app_env/app_env-safe.ecf
+++ b/library/app_env/app_env-safe.ecf
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="app_env" uuid="7AE9E48B-5A15-43F8-B99A-04F4185DED6B" library_target="app_env">
+	<description>Application Environment (layout, configuration, logger, database, ...)</description>
+	<target name="app_env">
+		<root all_classes="true"/>
+		<option warning="true" void_safety="all">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
+		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging-safe.ecf"/>
+		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
+		<cluster name="src" location=".\src\" recursive="true">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>
--- a/library/app_env/app_env.ecf
+++ b/library/app_env/app_env.ecf
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="app_env" uuid="7AE9E48B-5A15-43F8-B99A-04F4185DED6B" library_target="app_env">
+	<description>Application Environment (layout, configuration, logger, database, ...)</description>
+	<target name="app_env">
+		<root all_classes="true"/>
+		<option warning="true" void_safety="none">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
+		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging.ecf"/>
+		<library name="thread" location="$ISE_LIBRARY\library\thread\thread.ecf"/>
+		<cluster name="src" location=".\src\" recursive="true">
+			<file_rule>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>
--- a/library/app_env/license.lic
+++ b/library/app_env/license.lic
--- a/library/app_env/src/application_environment.e
+++ b/library/app_env/src/application_environment.e
@@ -1,6 +1,6 @@
 note
 	description: "[
-			Application layout
+			Application environment (layout, ...)
 			Related to file system locations such as 
 				- configuration locations
 				- application
@@ -15,7 +15,7 @@ note
 	revision: "$Revision: 96584 $"

 class
-	APPLICATION_LAYOUT
+	APPLICATION_ENVIRONMENT

 inherit
 	SHARED_EXECUTION_ENVIRONMENT
--- a/library/app_env/src/application_layout.e
+++ b/library/app_env/src/application_layout.e
@@ -0,0 +1,23 @@
+note
+	description: "See {APPLICATION_ENVIRONMENT}."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	APPLICATION_LAYOUT
+
+obsolete
+	"Use APPLICATION_ENVIRONMENT [April/2015]"
+
+inherit
+	APPLICATION_ENVIRONMENT
+
+create
+	make_default,
+	make_with_path,
+	make_with_directory_name
+
+note
+	copyright: "2011-2015, Javier Velilla, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end
--- a/library/app_env/src/configuration/application_json_configuration_helper.e
+++ b/library/app_env/src/configuration/application_json_configuration_helper.e
--- a/library/app_env/src/configuration/database_configuration.e
+++ b/library/app_env/src/configuration/database_configuration.e
--- a/library/app_env/src/configuration/logger_configuration.e
+++ b/library/app_env/src/configuration/logger_configuration.e
--- a/library/app_env/src/error/basic_error_handler.e
+++ b/library/app_env/src/error/basic_error_handler.e
--- a/library/app_env/src/error/shared_error.e
+++ b/library/app_env/src/error/shared_error.e
--- a/library/app_env/src/logger/logger.e
+++ b/library/app_env/src/logger/logger.e
@@ -21,6 +21,7 @@ inherit

 create
 	make,
+	make_with_environment,
 	make_with_layout

 feature {NONE} -- Initialization
@@ -31,16 +32,24 @@ feature {NONE} -- Initialization
 			create log.make
 		end

-	make_with_layout (app: APPLICATION_LAYOUT)
-			-- Initialize a logger object with an application layout `app'.
+	make_with_environment (app: APPLICATION_ENVIRONMENT)
+			-- Initialize a logger object with an application environment `app'.
 		do
 			make
-			apply_layout (app)
+			apply_environment (app)
+		end
+
+	make_with_layout (app: APPLICATION_ENVIRONMENT)
+			-- Initialize a logger object with an application layout `app'.
+		obsolete
+			"Use make_with_environment"
+		do
+			make_with_environment (app)
 		end

 feature -- Change

-	apply_layout (app: APPLICATION_LAYOUT)
+	apply_environment (app: APPLICATION_ENVIRONMENT)
 		do
 			initialize_logger (app, log)
 		end
@@ -89,7 +98,7 @@ feature -- Logging

 feature {NONE} -- Implementation

-	initialize_logger (app: APPLICATION_LAYOUT; a_log: like log)
+	initialize_logger (app: APPLICATION_ENVIRONMENT; a_log: like log)
 		local
 			l_log_writer_file: LOG_ROLLING_WRITER_FILE
 			l_log_writer: LOG_WRITER
--- a/library/app_env/src/logger/logging_facility.e
+++ b/library/app_env/src/logger/logging_facility.e
--- a/library/app_env/src/logger/shared_logger.e
+++ b/library/app_env/src/logger/shared_logger.e
@@ -98,11 +98,11 @@ feature {NONE} -- Logger: separate implementation

 feature {NONE} -- Implementation

-	initialize_logger (app: APPLICATION_LAYOUT)
+	initialize_logger (app: APPLICATION_ENVIRONMENT)
 		local
 			l_logger: LOGGER
 		do
-			create l_logger.make_with_layout (app)
+			create l_logger.make_with_environment (app)
 			set_logger_to (l_logger, logger_cell)
 		end

--- a/library/layout/Readme.md
+++ b/library/layout/Readme.md
@@ -1,13 +0,0 @@
-Layout Library
-==============
-
-Define a generic layout to be re-used by different applications.
-
-site/
-	  doc/
-	  logs/
-      www/
-      	  assets
-      	  template
-      	  theme
-      config/  
--- a/library/layout/layout-safe.ecf
+++ b/library/layout/layout-safe.ecf
@@ -1,21 +1,3 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="layout" uuid="7AE9E48B-5A15-43F8-B99A-04F4185DED6B" library_target="layout">
-	<target name="layout">
-		<root all_classes="true"/>
-		<option warning="true" void_safety="all">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
-		</option>
-		<setting name="console_application" value="true"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
-		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging-safe.ecf"/>
-		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
-		<cluster name="src" location=".\src\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
-		</cluster>
-	</target>
-</system>
+<redirection xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" uuid="7AE9E48B-5A15-43F8-B99A-04F4185DED6B" location="..\app_env\app_env-safe.ecf">
+</redirection>
--- a/library/layout/layout.ecf
+++ b/library/layout/layout.ecf
@@ -1,21 +1,3 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="layout" uuid="7AE9E48B-5A15-43F8-B99A-04F4185DED6B" library_target="layout">
-	<target name="layout">
-		<root all_classes="true"/>
-		<option warning="true" void_safety="none">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
-		</option>
-		<setting name="console_application" value="true"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
-		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
-		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging.ecf"/>
-		<library name="thread" location="$ISE_LIBRARY\library\thread\thread.ecf"/>
-		<cluster name="src" location=".\src\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
-		</cluster>
-	</target>
-</system>
+<redirection xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" uuid="7AE9E48B-5A15-43F8-B99A-04F4185DED6B" location="..\app_env\app_env.ecf">
+</redirection>
--- a/library/persistence/mysql/persistence_mysql-safe.ecf
+++ b/library/persistence/mysql/persistence_mysql-safe.ecf
@@ -8,11 +8,11 @@
 		<setting name="console_application" value="true"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="cms" location="..\..\..\cms-safe.ecf" readonly="false"/>
+		<library name="cms_app_env" location="..\..\app_env\app_env-safe.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
-		<library name="layout" location="..\..\layout\layout-safe.ecf"/>
 		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging-safe.ecf"/>
 		<library name="model" location="..\..\model\cms_model-safe.ecf"/>
 		<library name="mysql" location="$ISE_LIBRARY\library\store\dbms\rdbms\mysql\mysql-safe.ecf"/>
--- a/library/persistence/mysql/src/cms_storage_mysql_builder.e
+++ b/library/persistence/mysql/src/cms_storage_mysql_builder.e
@@ -28,7 +28,7 @@ feature -- Factory
 		local
 			conn: DATABASE_CONNECTION
 		do
-			if attached (create {APPLICATION_JSON_CONFIGURATION_HELPER}).new_database_configuration (a_setup.layout.application_config_path) as l_database_config then
+			if attached (create {APPLICATION_JSON_CONFIGURATION_HELPER}).new_database_configuration (a_setup.environment.application_config_path) as l_database_config then
 				create {DATABASE_CONNECTION_MYSQL} conn.login_with_connection_string (l_database_config.connection_string)
 				if conn.is_connected then
 					create Result.make (conn)
--- a/library/persistence/sqlite/persistence_sqlite-safe.ecf
+++ b/library/persistence/sqlite/persistence_sqlite-safe.ecf
@@ -8,11 +8,11 @@
 		<setting name="console_application" value="true"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="cms" location="..\..\..\cms-safe.ecf"/>
+		<library name="cms_app_env" location="..\..\app_env\app_env-safe.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
-		<library name="layout" location="..\..\layout\layout-safe.ecf"/>
 		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging-safe.ecf"/>
 		<library name="model" location="..\..\model\cms_model-safe.ecf"/>
 		<library name="odbc" location="$ISE_LIBRARY\library\store\dbms\rdbms\odbc\odbc-safe.ecf"/>
--- a/library/persistence/sqlite/src/cms_storage_sqlite_builder.e
+++ b/library/persistence/sqlite/src/cms_storage_sqlite_builder.e
@@ -28,7 +28,7 @@ feature -- Factory
 		local
 			s: STRING
 		do
-			if attached (create {APPLICATION_JSON_CONFIGURATION_HELPER}).new_database_configuration (a_setup.layout.application_config_path) as l_database_config then
+			if attached (create {APPLICATION_JSON_CONFIGURATION_HELPER}).new_database_configuration (a_setup.environment.application_config_path) as l_database_config then
 				s := "Driver=SQLite3 ODBC Driver;Database="
 				if attached l_database_config.database_name as db_name then
 					s.append (db_name)
@@ -50,7 +50,7 @@ feature -- Factory
 			r: CMS_USER_ROLE
 		do
 				-- Schema
-			a_storage.sql_execute_file_script (a_setup.layout.path.extended ("scripts").extended ("core.sql"))
+			a_storage.sql_execute_file_script (a_setup.environment.path.extended ("scripts").extended ("core.sql"))

 				-- Data	
 				-- Users