Skip to content

Commit 82bf9a4

Browse files
committed
Converted ecf files to 1-16-0, to use a single ecf file for all variants (void-safe, non-void-safe, ...). Keep *-safe.ecf as redirection to avoid breaking existing -safe.ecf projects.
1 parent af3698b commit 82bf9a4

File tree

97 files changed

+1173
-1170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1173
-1170
lines changed

cms-safe.ecf

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,3 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
2-
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-17-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-17-0 http://www.eiffel.com/developers/xml/configuration-1-17-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
3-
<target name="cms">
4-
<root all_classes="true"/>
5-
<file_rule>
6-
<exclude>/.svn$</exclude>
7-
<exclude>/CVS$</exclude>
8-
<exclude>/EIFGENs$</exclude>
9-
</file_rule>
10-
<option warning="true">
11-
</option>
12-
<capability>
13-
<concurrency support="scoop" use="scoop"/>
14-
<void_safety support="all" use="all"/>
15-
</capability>
16-
<mapping old_name="CMS_LAYOUT" new_name="CMS_ENVIRONMENT"/>
17-
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
18-
<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
19-
<library name="cms_app_env" location=".\library\app_env\app_env-safe.ecf"/>
20-
<library name="cms_config" location=".\library\configuration\config-safe.ecf"/>
21-
<library name="cms_model" location=".\library\model\cms_model-safe.ecf" readonly="false"/>
22-
<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
23-
<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf" readonly="false"/>
24-
<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
25-
<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
26-
<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\web\authentication\http_authorization\http_authorization-safe.ecf"/>
27-
<library name="i18n" location="$ISE_LIBRARY\library\i18n\i18n-safe.ecf"/>
28-
<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
29-
<library name="kmp_matcher" location="$ISE_LIBRARY\library\text\regexp\kmp_matcher\kmp_matcher-safe.ecf"/>
30-
<library name="microdata" location="$ISE_LIBRARY\contrib\library\text\parser\microdata\microdata.ecf"/>
31-
<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
32-
<library name="notification_mailer" location="$ISE_LIBRARY\contrib\library\runtime\process\notification_email\notification_email-safe.ecf"/>
33-
<library name="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty-safe.ecf" readonly="false"/>
34-
<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter-safe.ecf"/>
35-
<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
36-
<library name="uri_template" location="$ISE_LIBRARY\contrib\library\text\parser\uri_template\uri_template-safe.ecf"/>
37-
<library name="uuid" location="$ISE_LIBRARY\library\uuid\uuid-safe.ecf"/>
38-
<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
39-
<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
40-
<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html-safe.ecf" readonly="false"/>
41-
<cluster name="src" location=".\src\" recursive="true"/>
42-
</target>
43-
</system>
2+
<redirection xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" message="Obsolete: use cms.ecf !" location="cms.ecf">
3+
</redirection>

cms.ecf

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
2-
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
3-
<description>ROC CMS library</description>
2+
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
43
<target name="cms">
54
<root all_classes="true"/>
65
<file_rule>
76
<exclude>/.svn$</exclude>
87
<exclude>/CVS$</exclude>
98
<exclude>/EIFGENs$</exclude>
109
</file_rule>
11-
<option warning="true" void_safety="none">
10+
<option warning="true">
1211
</option>
12+
<capability>
13+
<concurrency support="scoop" use="scoop"/>
14+
<void_safety support="all" use="all"/>
15+
</capability>
1316
<mapping old_name="CMS_LAYOUT" new_name="CMS_ENVIRONMENT"/>
1417
<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
1518
<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,3 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
2-
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="masquerade_auth" uuid="73DA3649-BA18-426C-91CD-5892D52C811C" library_target="masquerade_auth">
3-
<target name="masquerade_auth">
4-
<root all_classes="true"/>
5-
<file_rule>
6-
<exclude>/EIFGENs$</exclude>
7-
<exclude>/CVS$</exclude>
8-
<exclude>/.svn$</exclude>
9-
</file_rule>
10-
<option warning="true">
11-
</option>
12-
<setting name="concurrency" value="scoop"/>
13-
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
14-
<library name="cms" location="..\..\cms-safe.ecf"/>
15-
<library name="cms_app_env" location="..\..\library\app_env\app_env-safe.ecf" readonly="false"/>
16-
<library name="cms_auth_module" location="..\..\modules\auth\auth-safe.ecf" readonly="false"/>
17-
<library name="cms_session_auth_module" location="..\..\modules\session_auth\cms_session_auth-safe.ecf" readonly="false"/>
18-
<library name="cms_model" location="..\..\library\model\cms_model-safe.ecf" readonly="false"/>
19-
<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
20-
<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
21-
<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
22-
<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
23-
<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\web\authentication\http_authorization\http_authorization-safe.ecf" readonly="false"/>
24-
<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
25-
<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
26-
<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
27-
<cluster name="src" location=".\" recursive="true"/>
28-
</target>
29-
</system>
2+
<redirection xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" uuid="73DA3649-BA18-426C-91CD-5892D52C811C" message="Obsolete: use masquerade_auth.ecf !" location="masquerade_auth.ecf">
3+
</redirection>
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="ISO-8859-1"?>
2+
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="masquerade_auth" uuid="73DA3649-BA18-426C-91CD-5892D52C811C" library_target="masquerade_auth">
3+
<target name="masquerade_auth">
4+
<root all_classes="true"/>
5+
<file_rule>
6+
<exclude>/.svn$</exclude>
7+
<exclude>/CVS$</exclude>
8+
<exclude>/EIFGENs$</exclude>
9+
</file_rule>
10+
<option warning="true">
11+
</option>
12+
<capability>
13+
<concurrency support="scoop" use="scoop"/>
14+
</capability>
15+
<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
16+
<library name="cms" location="..\..\cms.ecf"/>
17+
<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
18+
<library name="cms_auth_module" location="..\..\modules\auth\auth.ecf" readonly="false"/>
19+
<library name="cms_model" location="..\..\library\model\cms_model.ecf" readonly="false"/>
20+
<library name="cms_session_auth_module" location="..\..\modules\session_auth\cms_session_auth.ecf" readonly="false"/>
21+
<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto.ecf"/>
22+
<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
23+
<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
24+
<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
25+
<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\web\authentication\http_authorization\http_authorization.ecf" readonly="false"/>
26+
<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
27+
<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
28+
<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>
29+
<cluster name="src" location=".\" recursive="true"/>
30+
</target>
31+
</system>

0 commit comments

Comments
 (0)