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

Fixing global EWF compilation

Browse Source
This commit is contained in:
Jocelyn Fiat
2013-01-31 16:20:38 +01:00
parent ce469b6ede
commit a5c9329ada
8 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
draft/application/cms/cms-safe.ecf
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="cms" library_target="cms" uuid="0D24AE3C-61DA-4E81-8DCF-90C2E65FB669">
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="cms" uuid="0D24AE3C-61DA-4E81-8DCF-90C2E65FB669" library_target="cms">
<target name="cms">
<root class="WEB_CMS" feature="make_and_launch"/>
<root all_classes="true"/>
<file_rule>
<exclude>/EIFGENs$</exclude>
<exclude>/CVS$</exclude>
@@ -10,9 +10,8 @@
<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
</option>
<setting name="concurrency" value="thread"/>
<setting name="exception_trace" value="true"/>
<setting name="concurrency" value="thread"/>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="default_nino" location="..\..\..\library\server\wsf\default\nino-safe.ecf"/>
<library name="encoder" location="..\..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
@@ -24,7 +23,6 @@
<library name="uuid" location="$ISE_LIBRARY\library\uuid\uuid-safe.ecf"/>
<library name="wsf" location="..\..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
<library name="wsf_session" location="..\..\..\library\server\wsf\wsf_session-safe.ecf" readonly="false"/>
<cluster name="src" location=".\src\" recursive="true">
</cluster>
<cluster name="src" location=".\src\" recursive="true"/>
</target>
</system>

2
draft/application/cms/cms.ecf
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="cms" library_target="cms" uuid="0D24AE3C-61DA-4E81-8DCF-90C2E65FB669">
<target name="cms">
<root class="WEB_CMS" feature="make_and_launch"/>
<root all_classes="true"/>
<file_rule>
<exclude>/EIFGENs$</exclude>
<exclude>/CVS$</exclude>

4
draft/application/cms/src/kernel/cms_css.e
View File

@@ -49,13 +49,13 @@ feature -- Conversion
if not s_selectors.is_empty then
s_selectors.append_character (',')
end
s_selectors.append (cs.item)
s_selectors.append (cs.item.string)
end
if not s_selectors.is_empty then
a_target.append (s_selectors)
a_target.append_character (' ')
a_target.append_character ('{')
a_target.append (c.item.style)
c.item.style.append_text_to (a_target)
a_target.append_character ('}')
a_target.append_character ('%N')
end

4
draft/application/cms/src/modules/user/user_login_cms_execution.e
View File

@@ -17,9 +17,7 @@ feature -- Status
valid_credential (u,p: READABLE_STRING_32): BOOLEAN
do
if attached service.storage.user_by_name (u) as l_user then
Result := attached l_user.encoded_password as l_pass and then l_pass.same_string (service.storage.encoded_password (p))
end
Result := service.storage.is_valid_credential (u, p)
end
feature -- Execution