mirrors/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace Nino by Standalone whenever it is relevant.

Browse Source
This commit is contained in:
Jocelyn FIAT
2016-10-08 01:02:12 +02:00
parent b4fd04ad9f
commit 56819d6793
58 changed files with 288 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/estudio_wizard/rootdir/resources/${APP_NAME}.ecf
View File

@@ -18,7 +18,6 @@
{if condition="$WIZ.connectors.use_cgi ~ $WIZ_YES"}<library name="cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\cgi-safe.ecf"/>{/if}
{if condition="$WIZ.connectors.use_libfcgi ~ $WIZ_YES"}<library name="libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\libfcgi-safe.ecf"/>{/if}
{if condition="$WIZ.connectors.use_standalone ~ $WIZ_YES"}<library name="standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\standalone-safe.ecf"/>{/if}
{if condition="$WIZ.connectors.use_nino ~ $WIZ_YES"}<library name="nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\nino-safe.ecf"/>{/if}
<cluster name="launcher" location=".\launcher\" recursive="true">
<cluster name="any_launcher" location="$|any"/>
</cluster>
@@ -35,16 +34,6 @@
</cluster>
<cluster name="src" location=".\src\" recursive="true"/>
</target>{/if}
{if condition="$WIZ.connectors.use_nino ~ $WIZ_YES"}
<target name="{$WIZ.project.name/}_nino" extends="common">
<root class="{$APP_ROOT/}" feature="make_and_launch"/>
<setting name="concurrency" value="none"/>
<library name="default_nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\nino-safe.ecf"/>
<cluster name="launcher" location=".\launcher\">
<cluster name="default_launcher" location="$|default"/>
</cluster>
<cluster name="src" location=".\src\" recursive="true"/>
</target>{/if}
{if condition="$WIZ.connectors.use_cgi ~ $WIZ_YES"}
<target name="{$WIZ.project.name/}_cgi" extends="common">
<root class="{$APP_ROOT/}" feature="make_and_launch"/>

2
tools/estudio_wizard/rootdir/resources/ewf.ini
View File

@@ -1,4 +1,4 @@
# For nino connector, use port {$WIZ.standalone_connector.port/}
# For Standalone connector, use port {$WIZ.standalone_connector.port/}
port={$WIZ.standalone_connector.port/}
#verbose=true

18
tools/estudio_wizard/rootdir/resources/launcher/any/application_launcher_i.e
View File

@@ -31,7 +31,7 @@ feature -- Execution
-- Choose a default -> standalone
create {WSF_STANDALONE_SERVICE_LAUNCHER} launcher.make_and_launch (opts){/literal}{/if}
{if condition="$WIZ.connectors.use_standalone ~ $WIZ_YES"}{literal}
elseif is_nino_launcher_id (l_id) then
elseif is_standalone_launcher_id (l_id) then
create {WSF_STANDALONE_SERVICE_LAUNCHER} launcher.make_and_launch (opts){/literal}{/if}
{if condition="$WIZ.connectors.use_libfcgi ~ $WIZ_YES"}{literal}
elseif is_libfcgi_launcher_id (l_id) then
@@ -39,9 +39,9 @@ feature -- Execution
{if condition="$WIZ.connectors.use_cgi ~ $WIZ_YES"}{literal}
elseif is_cgi_launcher_id (l_id) then
create {WSF_CGI_SERVICE_LAUNCHER} launcher.make_and_launch (opts){/literal}{/if}
{if condition="$WIZ.connectors.use_nino ~ $WIZ_YES"}{literal}
elseif is_nino_launcher_id (l_id) then
create {WSF_NINO_SERVICE_LAUNCHER} launcher.make_and_launch (opts){/literal}{/if}
{if condition="$WIZ.connectors.use_standalone ~ $WIZ_YES"}{literal}
elseif is_standalone_launcher_id (l_id) then
create {WSF_STANDALONE_SERVICE_LAUNCHER} launcher.make_and_launch (opts){/literal}{/if}
{literal}
else
io.error.put_string ("Application launcher not found!%N")
@@ -52,7 +52,7 @@ feature -- Execution
launcher_id: detachable READABLE_STRING_GENERAL
-- Launcher id based on the executable extension name if any.
-- This can be redefine to customize for your application.
--| ex: nino, cgi, libfcgi or Void.
--| ex: standalone, cgi, libfcgi or Void.
do
if attached (create {PATH}.make_from_string (execution_environment.arguments.command_name)).extension as ext then
Result := ext
@@ -62,17 +62,11 @@ feature -- Execution
feature -- Status report
{/literal}
{if condition="$WIZ.connectors.use_standalone ~ $WIZ_YES"}
is_nino_launcher_id (a_id: READABLE_STRING_GENERAL): BOOLEAN
is_standalone_launcher_id (a_id: READABLE_STRING_GENERAL): BOOLEAN
do
Result := a_id.is_case_insensitive ("standalone")
end{/if}
{if condition="$WIZ.connectors.use_nino ~ $WIZ_YES"}
is_nino_launcher_id (a_id: READABLE_STRING_GENERAL): BOOLEAN
do
Result := a_id.is_case_insensitive ("nino")
end{/if}
{if condition="$WIZ.connectors.use_cgi ~ $WIZ_YES"}
is_cgi_launcher_id (a_id: READABLE_STRING_GENERAL): BOOLEAN
do

11
tools/estudio_wizard/src/ewf_wizard.e
View File

@@ -84,12 +84,10 @@ Web application runs on top of connectors
Select connectors you want to support:
]")
Result.add_boolean_question ("Standalone", "use_standalone", "Using the standalone Eiffel Web server")
Result.add_boolean_question ("Nino", "use_nino", "Using the Eiffel Web nino server")
Result.add_boolean_question ("CGI", "use_cgi", "Require a httpd server")
Result.add_boolean_question ("libFCGI", "use_libfcgi", "Require a httpd server")
Result.data.force ("yes", "use_standalone")
Result.data.force ("no", "use_nino")
Result.data.force ("yes", "use_cgi")
Result.data.force ("yes", "use_libfcgi")
end
@@ -97,7 +95,7 @@ Select connectors you want to support:
standalone_connector_page: WIZARD_PAGE
once
Result := new_page ("standalone_connector")
Result.set_title ("Standalone (or nino) connector")
Result.set_title ("Standalone connector")
Result.set_subtitle ("Set options .")
Result.add_integer_question ("Port number", "port", "It happens port 80 is already taken, thus choose another one.")
Result.add_boolean_question ("Verbose", "verbose", "Verbose output")
@@ -175,12 +173,6 @@ Use the filter component:
end
sv.append ("standalone")
end
if connectors_page.boolean_field_value ("use_nino") then
if not sv.is_empty then
sv.append (", ")
end
sv.append ("nino")
end
if connectors_page.boolean_field_value ("use_cgi") then
if not sv.is_empty then
sv.append (", ")
@@ -221,7 +213,6 @@ feature -- Events
elseif a_current_page = connectors_page then
if
connectors_page.boolean_field_value ("use_standalone")
or connectors_page.boolean_field_value ("use_nino")
then
Result := standalone_connector_page
else