diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ETSI_CR5852_union_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ETSI_CR5852_union_e.ttcn
index ce1febb301c7bcc7043e8213d4c5561f44e5c5cf..e2cb4ce091a7f3d39d1937b06f4c7a9c88fbf68f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ETSI_CR5852_union_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ETSI_CR5852_union_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: ETSI_CR5852_union_e.ttcn
+// File: ETSI_CR5852_union.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module ETSI_CR5852_union_e {
+module ETSI_CR5852_union {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/MyTypes_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/MyTypes_e.ttcn
index d08adc419cdbce74f8dd08f464f8e59ac8b481e5..650aaf3a4af3efa1770f185fd34211f5bd262f2b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/MyTypes_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/MyTypes_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: MyTypes_e.ttcn
+// File: MyTypes.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - module_typename_conversion_1.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "MyTypes_e" */
+// /* targetnamespace = "MyTypes" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace2_e.ttcn
index 88af9fd94251be11a70a3e4161df4fef8119a1a3..28927052e4ffbab1fce6d56fd9f6724e9fea63a4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace2_e.ttcn
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace2_e {
+module NoTargetNamespace2 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_CCAPI_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_CCAPI_e.ttcn
index d3aeb27e86d1c2f75108f4c2640cf23bd958a6eb..1b7c4b5ac8e20b5bda17c2231e705887da0fdd74 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_CCAPI_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_CCAPI_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: NoTargetNamespace_CCAPI_e.ttcn
+// File: NoTargetNamespace_CCAPI.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace_CCAPI_e {
+module NoTargetNamespace_CCAPI {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_JMdict_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_JMdict_e.ttcn
index 8355853633263ef0ab8e284fb04bdecd3ff7ba69..eda846c74daf343fea3d59efbd178e9a274ffddb 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_JMdict_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_JMdict_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: NoTargetNamespace_JMdict_e.ttcn
+// File: NoTargetNamespace_JMdict.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace_JMdict_e {
+module NoTargetNamespace_JMdict {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_PAP_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_PAP_e.ttcn
index 95de72794c0f898db8edd393de78a4af454d6f65..f4af989042d68d3ea499906eeab13ed2f2331c69 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_PAP_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_PAP_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: NoTargetNamespace_PAP_e.ttcn
+// File: NoTargetNamespace_PAP.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace_PAP_e {
+module NoTargetNamespace_PAP {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_RLP_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_RLP_e.ttcn
index 4d79075f331793666a3a6bb5f729801946519307..fc7a8aa952af4ad28778a33442504d88f229f187 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_RLP_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_RLP_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: NoTargetNamespace_RLP_e.ttcn
+// File: NoTargetNamespace_RLP.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace_RLP_e {
+module NoTargetNamespace_RLP {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_XML_RPC_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_XML_RPC_e.ttcn
index ebd4faf3e45ca7888316b4aee265ddd66145559e..618e8e926fed457f9b27b1c7a056d8f7943d53db 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_XML_RPC_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_XML_RPC_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: NoTargetNamespace_XML_RPC_e.ttcn
+// File: NoTargetNamespace_XML_RPC.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace_XML_RPC_e {
+module NoTargetNamespace_XML_RPC {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_e.ttcn
index 9bd2436779216f46a66bb87358122d2d1143705a..52009326a184a0daeabd0b8de11d847d031c4ebf 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/NoTargetNamespace_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: NoTargetNamespace_e.ttcn
+// File: NoTargetNamespace.ttcn
// Description:
// References:
// Rev:
@@ -39,7 +39,7 @@
////////////////////////////////////////////////////////////////////////////////
-module NoTargetNamespace_e {
+module NoTargetNamespace {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/XmlTest_imsike_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/XmlTest_imsike_e.ttcn
index 5cece66c535184764b8ab811cb1f5648f3d3a287..2ebba315bb3ebc7ae6c3d435f944b5f86d7f387e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/XmlTest_imsike_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/XmlTest_imsike_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: XmlTest_imsike_e.ttcn
+// File: XmlTest_imsike.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module XmlTest_imsike_e {
+module XmlTest_imsike {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/attribute_in_extension_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/attribute_in_extension_e.ttcn
index dd03df6442b9543638968e53e2797eb8b6bb64e2..214366a4f35adb3ead5567a7ab787c64233a35d0 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/attribute_in_extension_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/attribute_in_extension_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: attribute_in_extension_e.ttcn
+// File: attribute_in_extension.ttcn
// Description:
// References:
// Rev:
@@ -27,7 +27,7 @@
// Generated from file(s):
// - attribute_in_extension.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "attribute_in_extension_e" */
+// /* targetnamespace = "attribute_in_extension" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_example_org_ttcn_wildcards_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_example_org_ttcn_wildcards_e.ttcn
index 41138b1ce3127c01a3b9c0f8b96319b4281644a4..ed032faee9ac870444f506fdc52f942078be4009 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_example_org_ttcn_wildcards_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_example_org_ttcn_wildcards_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_ttcn_wildcards_e.ttcn
+// File: http_www_example_org_ttcn_wildcards.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - any_anyAttribute_e.xsd
+// - any_anyAttribute.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/ttcn/wildcards/e" */
+// /* targetnamespace = "http://www.example.org/ttcn/wildcards" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_XmlTest_org_po_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_XmlTest_org_po_e.ttcn
index 94b6f90ef6ddc6ad7ddc4f57f0f3d33668e75d18..fa15d212bd5a7b051dd7c58c2021ec20bc6b9015 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_XmlTest_org_po_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_XmlTest_org_po_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: http_www_XmlTest_org_po_e.ttcn
+// File: http_www_XmlTest_org_po.ttcn
// Description:
// References:
// Rev:
@@ -27,7 +27,7 @@
// Generated from file(s):
// - po.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "http://www.XmlTest.org/po/e" */
+// /* targetnamespace = "http://www.XmlTest.org/po" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_2001_XMLSchema_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_2001_XMLSchema_e.ttcn
index b0bef7f6a61b0608fa0c26fe3040ac6db476cf46..d64230432ef744e1f1b404abc3ec97a500317caf 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_2001_XMLSchema_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_2001_XMLSchema_e.ttcn
@@ -9,7 +9,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
//
-// File: http_www_example_org_2001_XMLSchema_e.ttcn
+// File: http_www_example_org_2001_XMLSchema.ttcn
// Description:
// References:
// Rev:
@@ -21,7 +21,7 @@
// Generated from file(s):
// - MyXMLSchema.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/2001/XMLSchema/e" */
+// /* targetnamespace = "http://www.example.org/2001/XMLSchema" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_complex_restriction_with_use_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_complex_restriction_with_use_e.ttcn
index b4f4def9cdcc30e438d707a5c69c074718647e9e..e81a64e40b9571db87d2c4323a703cfe91fe8d7a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_complex_restriction_with_use_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_complex_restriction_with_use_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_complex_restriction_with_use_e.ttcn
+// File: http_www_example_org_complex_restriction_with_use.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - complex_restriction_with_use.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/complex-restriction-with-use/e" */
+// /* targetnamespace = "http://www.example.org/complex-restriction-with-use" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_list_minmaxoccurs_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_list_minmaxoccurs_e.ttcn
index 60fe6571a77be7db81be9faf3d97742e284a79aa..93b6aa8677eb41d50e90012b38b0b7d641bdccd0 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_list_minmaxoccurs_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_list_minmaxoccurs_e.ttcn
@@ -1,7 +1,7 @@
-/*******************************************************************************
+/******************************************************************************
* Copyright (c) 2000-2016 Ericsson Telecom AB
*
-* XSD to TTCN-3 Translator version: CRL 113 200/6 R0A
+* XSD to TTCN-3 Translator
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -11,9 +11,9 @@
* Contributors:
* Szabo, Bence Janos
*
-*******************************************************************************/
+******************************************************************************/
//
-// File: http_www_example_org_list_minmaxoccurs_e.ttcn
+// File: http_www_example_org_list_minmaxoccurs.ttcn
// Description:
// References:
// Rev:
@@ -23,9 +23,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - listMinMaxOccurs_e.xsd
+// - listMinMaxOccurs.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/list/minmaxoccurs/e" */
+// /* targetnamespace = "http://www.example.org/list/minmaxoccurs" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -37,7 +37,7 @@
////////////////////////////////////////////////////////////////////////////////
-module http_www_example_org_list_minmaxoccurs_e {
+module http_www_example_org_list_minmaxoccurs {
import from XSD all;
@@ -298,6 +298,6 @@ with {
}
with {
encode "XML";
- variant "namespace as 'http://www.example.org/list/minmaxoccurs/e' prefix 'this'";
+ variant "namespace as 'http://www.example.org/list/minmaxoccurs' prefix 'this'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv2_e.ttcn
index 623b1cda6aefe56edd793b14278300bba7940fa1..25d11199b1e4a48cc9c7217d9537e17a77ff9920 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv2_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_name_conv2_e.ttcn
+// File: http_www_example_org_name_conv2.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - name_conv_non_alphanumeric.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/name_conv2;;;;;;/e" */
+// /* targetnamespace = "http://www.example.org/name_conv2;;;;;;" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv3_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv3_e.ttcn
index 4e0209dd342632e78f64317f39fdaf5439076bab..f74fb2f8ea2c5feea46e57c87e240b31e6c0aada 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv3_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_name_conv3_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_name_conv3_e.ttcn
+// File: http_www_example_org_name_conv3.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - name_conv_remove_seq_of_low_line.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://////////www.example.org/name_conv3////e" */
+// /* targetnamespace = "http://////////www.example.org/name_conv3///" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_nillable_in_nillable_extension_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_nillable_in_nillable_extension_e.ttcn
index 206fa813fb6cfcdd74557a3d05c3401fa4690603..89f3f9195798be1ec39c33b48bf63eb1cb03c3db 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_nillable_in_nillable_extension_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_nillable_in_nillable_extension_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_nillable_in_nillable_extension_e.ttcn
+// File: http_www_example_org_nillable_in_nillable_extension.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - nillable_in_nillable_extension.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/nillable/in/nillable/extension/e" */
+// /* targetnamespace = "http://www.example.org/nillable/in/nillable/extension" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_seq_embeds_seq_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_seq_embeds_seq_e.ttcn
index c7b0ec640b672865496e970c5a47dfa0135adc5c..1fc419ad24abf1c7ecb958435ee2448cd0b06162 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_seq_embeds_seq_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_seq_embeds_seq_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_seq_embeds_seq_e.ttcn
+// File: http_www_example_org_seq_embeds_seq.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - sequence_embeds_sequence_e.xsd
+// - sequence_embeds_sequence.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/seq-embeds-seq/e" */
+// /* targetnamespace = "http://www.example.org/seq-embeds-seq" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_ttcn_wildcards_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_ttcn_wildcards_e.ttcn
index c366d5c5917726c5c3a3de93252d9e82ca701e91..1e7aa6c03135432cfae29689faf6172d8380e75a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_ttcn_wildcards_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_ttcn_wildcards_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_ttcn_wildcards_e.ttcn
+// File: http_www_example_org_ttcn_wildcards.ttcn
// Description:
// References:
// Rev:
@@ -27,7 +27,7 @@
// Generated from file(s):
// - any_anyAttribute.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/ttcn/wildcards/e" */
+// /* targetnamespace = "http://www.example.org/ttcn/wildcards" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_wildcards_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_wildcards_e.ttcn
index a95fa1ef330ce5c5c0c5164b17e610c6fa871cfb..d22d43fb65a2a7eba8f4293dadfd0a49ad6fcea6 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_wildcards_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/http_www_example_org_wildcards_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: http_www_example_org_wildcards_e.ttcn
+// File: http_www_example_org_wildcards.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - anyattribute_optional.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "http://www.example.org/wildcards/e" */
+// /* targetnamespace = "http://www.example.org/wildcards" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_e.ttcn
index 33fbf5073c4c9f52326afa5a8de2605efab86f46..26d29c5a109d26b41e754bdb6e0bc0df56a0235e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: ietf_params_xml_ns_pidf_e.ttcn
+// File: ietf_params_xml_ns_pidf.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module ietf_params_xml_ns_pidf_e {
+module ietf_params_xml_ns_pidf {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_status_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_status_e.ttcn
index 154d736156230127127d02708afd982ed9377990..066bc616de408e36dd9d4b3bedaff01348f8682b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_status_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_pidf_status_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: ietf_params_xml_ns_pidf_status_e.ttcn
+// File: ietf_params_xml_ns_pidf_status.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module ietf_params_xml_ns_pidf_status_e {
+module ietf_params_xml_ns_pidf_status {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_resource_lists_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_resource_lists_e.ttcn
index 3a9dc0c7fb76781b386d8d160e9b2ac4ff40d486..421fcf3b6326dbc60f6066ea5eb129229ecb7415 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_resource_lists_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_resource_lists_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: ietf_params_xml_ns_resource_lists_e.ttcn
+// File: ietf_params_xml_ns_resource_lists.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module ietf_params_xml_ns_resource_lists_e {
+module ietf_params_xml_ns_resource_lists {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_rlmi_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_rlmi_e.ttcn
index a101185f189b0ea32b115d310c92c08660bf620f..13d36923b3752810330d2b36f7dd365364eaf063 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_rlmi_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/ietf_params_xml_ns_rlmi_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: ietf_params_xml_ns_rlmi_e.ttcn
+// File: ietf_params_xml_ns_rlmi.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module ietf_params_xml_ns_rlmi_e {
+module ietf_params_xml_ns_rlmi {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_1_e.ttcn
index a3d77df9b40b19b6a54c0265e347fa024ee235ca..73f48148beefd85c7dc3fe7e04f686d8b0912a31 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_1_e.ttcn
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - imported_module__e.xsd
+// - imported_module_.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "imported_module_1_e" */
+// /* targetnamespace = "imported_module_" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_e.ttcn
index ab35df0932db7525cd6f2cb592345a1e737a8151..ee1d25aa01a28b2e9b8c87a0a7cbe26af57415b0 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/imported_module_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: imported_module_e.ttcn
+// File: imported_module.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - imported_module.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "imported_module_e" */
+// /* targetnamespace = "imported_module" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/module_typename_conversion_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/module_typename_conversion_e.ttcn
index 4b018465000f63b2606d5c4633aa2ac22332838d..bac9b5aa3628e4b78f9321aa6c33e76b74d96a21 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/module_typename_conversion_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/module_typename_conversion_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: module_typename_conversion_e.ttcn
+// File: module_typename_conversion.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - module_typename_conversion.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "module_typename_conversion_e" */
+// /* targetnamespace = "module_typename_conversion" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/name_conversion_extension_attrib_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/name_conversion_extension_attrib_e.ttcn
index 3e5eb239b57d3cb4a2e48f84baed54185cbab6f9..cbfafde7cefa165afa2e1661d81d1d12c4696c3b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/name_conversion_extension_attrib_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/name_conversion_extension_attrib_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: name_conversion_extension_attrib_e.ttcn
+// File: name_conversion_extension_attrib.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - name_conversion_extension_attrib.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "name_conversion_extension_attrib/e" */
+// /* targetnamespace = "name_conversion_extension_attrib" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/nillable_annotations_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/nillable_annotations_e.ttcn
index 6bf359d5a3cf9510fbcb2badb428643de7da4db9..5340c061088cea1e7f546e658d2f920a6ed2e32b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/nillable_annotations_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/nillable_annotations_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: nillable_annotations_e.ttcn
+// File: nillable_annotations.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - nillable_annotations.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "nillable_annotations/e" */
+// /* targetnamespace = "nillable_annotations" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_1_e.ttcn
index fd5ac28a97682d7c9d08c9784c25b24494343153..078b06b1228a268802f004a71f283bb8f4dd1443 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_1_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: schemas_ericsson_com_cai3g1_1_e.ttcn
+// File: schemas_ericsson_com_cai3g1_1.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module schemas_ericsson_com_cai3g1_1_e {
+module schemas_ericsson_com_cai3g1_1 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_2_e.ttcn
index 3e528ba073fce95fc6ac82c72ccd4276c42779f4..2cd575be8487f010649497ec737073765b9da159 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_cai3g1_2_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: schemas_ericsson_com_cai3g1_2_e.ttcn
+// File: schemas_ericsson_com_cai3g1_2.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module schemas_ericsson_com_cai3g1_2_e {
+module schemas_ericsson_com_cai3g1_2 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_ma_HSS_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_ma_HSS_e.ttcn
index 266647a9b14ed0c05c50e20dcdd954392a0ab02b..d56e5a867511a2e3684d369f3210ce3176b23c2c 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_ma_HSS_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_ma_HSS_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: schemas_ericsson_com_ma_HSS_e.ttcn
+// File: schemas_ericsson_com_ma_HSS.ttcn
// Description:
// References:
// Rev:
@@ -43,7 +43,7 @@
////////////////////////////////////////////////////////////////////////////////
-module schemas_ericsson_com_ma_HSS_e {
+module schemas_ericsson_com_ma_HSS {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_bulkprovisioning_1_0_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_bulkprovisioning_1_0_e.ttcn
index 10042b1ad4b07856806bb0fcce610c6926060b4c..4215c6a1e282c5d4cffbb31187675652fdb11b8d 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_bulkprovisioning_1_0_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_bulkprovisioning_1_0_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: schemas_ericsson_com_upg_bulkprovisioning_1_0_e.ttcn
+// File: schemas_ericsson_com_upg_bulkprovisioning_1_0.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module schemas_ericsson_com_upg_bulkprovisioning_1_0_e {
+module schemas_ericsson_com_upg_bulkprovisioning_1_0 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_dm_hss_sh_4_1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_dm_hss_sh_4_1_e.ttcn
index 785dfa938adec08f6387b51c2009976f39c538aa..1707bbaa4e1be9e394186b8769de0dd5333f4853 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_dm_hss_sh_4_1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_dm_hss_sh_4_1_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: schemas_ericsson_com_upg_dm_hss_sh_4_1_e.ttcn
+// File: schemas_ericsson_com_upg_dm_hss_sh_4_1.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module schemas_ericsson_com_upg_dm_hss_sh_4_1_e {
+module schemas_ericsson_com_upg_dm_hss_sh_4_1 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_provisioning_1_0_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_provisioning_1_0_e.ttcn
index e5536af435a0e6bc23e40b8e7d6e3b7535d5b28e..c4c8d778266805098d7771ec5832369151bb061b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_provisioning_1_0_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/schemas_ericsson_com_upg_provisioning_1_0_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: schemas_ericsson_com_upg_provisioning_1_0_e.ttcn
+// File: schemas_ericsson_com_upg_provisioning_1_0.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module schemas_ericsson_com_upg_provisioning_1_0_e {
+module schemas_ericsson_com_upg_provisioning_1_0 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/tail_f_com_ns_confd_1_0_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/tail_f_com_ns_confd_1_0_e.ttcn
index 9ffbc13dd76f0d7b53b9eeb6f2d7a5d1c789d1c8..55d207b45f9aeabb77eccadca3c1873ff3b6d7fa 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/tail_f_com_ns_confd_1_0_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/tail_f_com_ns_confd_1_0_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: tail_f_com_ns_confd_1_0_e.ttcn
+// File: tail_f_com_ns_confd_1_0.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module tail_f_com_ns_confd_1_0_e {
+module tail_f_com_ns_confd_1_0 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/uri_etsi_org_ngn_params_xml_simservs_sci_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/uri_etsi_org_ngn_params_xml_simservs_sci_e.ttcn
index b387cbf1aca488bf5680428f1e87d1da48187eaa..7a925afa39c9082cf99e1e1c0717ffaa6f4d2d3b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/uri_etsi_org_ngn_params_xml_simservs_sci_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/uri_etsi_org_ngn_params_xml_simservs_sci_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: uri_etsi_org_ngn_params_xml_simservs_sci_e.ttcn
+// File: uri_etsi_org_ngn_params_xml_simservs_sci.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module uri_etsi_org_ngn_params_xml_simservs_sci_e {
+module uri_etsi_org_ngn_params_xml_simservs_sci {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/urn_ietf_params_xml_ns_conference_info_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/urn_ietf_params_xml_ns_conference_info_e.ttcn
index 0d3c0952d8b6c72fb7365f58cbb9b8119dfe1e51..10ed39d60ff5a7aabec8667914fd8dfe41d8399a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/urn_ietf_params_xml_ns_conference_info_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/urn_ietf_params_xml_ns_conference_info_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: urn_ietf_params_xml_ns_conference_info_e.ttcn
+// File: urn_ietf_params_xml_ns_conference_info.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module urn_ietf_params_xml_ns_conference_info_e {
+module urn_ietf_params_xml_ns_conference_info {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation2_e.ttcn
new file mode 100644
index 0000000000000000000000000000000000000000..ee3a6206f3dc76116813aa219e596c6a9b382dc1
--- /dev/null
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation2_e.ttcn
@@ -0,0 +1,82 @@
+/******************************************************************************
+* Copyright (c) 2000-2016 Ericsson Telecom AB
+*
+* XSD to TTCN-3 Translator
+*
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Balasko, Jeno
+* Lovassy, Arpad
+* Szabo, Bence Janos
+*
+******************************************************************************/
+//
+// File: www_XmlTest_org_annotation.ttcn
+// Description:
+// References:
+// Rev:
+// Prodnr:
+// Updated: Thu Sep 5 17:34:58 2015
+// Contact: http://ttcn.ericsson.se
+//
+////////////////////////////////////////////////////////////////////////////////
+// Generated from file(s):
+// - XmlTest_annotation.xsd
+// /* xml version = "1.0" encoding = "UTF-8" */
+// /* targetnamespace = "www.XmlTest.org/annotation" */
+// - XmlTest_annotation1.xsd
+// /* xml version = "1.0" encoding = "UTF-8" */
+// /* targetnamespace = "www.XmlTest.org/annotation" */
+////////////////////////////////////////////////////////////////////////////////
+// Modification header(s):
+//-----------------------------------------------------------------------------
+// Modified by:
+// Modification date:
+// Description:
+// Modification contact:
+//------------------------------------------------------------------------------
+////////////////////////////////////////////////////////////////////////////////
+
+
+module www_XmlTest_org_annotation2 {
+
+
+import from XSD all;
+
+
+/* This Schema defines a W3Schools note! */
+
+
+/* This comment is the documentation for MyInteger1! */
+type XSD.PositiveInteger MyInteger1
+with {
+ variant "element";
+};
+
+
+/* This comment is the documentation for MyInteger2!
+ More lines allowed? */
+/* This comment is the second documentation for MyInteger2!
+ More lines allowed? */
+/* This comment is the third documentation for MyInteger2!
+ More lines allowed! */
+type XSD.PositiveInteger MyInteger2
+with {
+ variant "element";
+};
+
+
+/* This Schema defines a W3Schools note! */
+
+
+}
+with {
+ encode "XML";
+ variant "namespace as 'www.XmlTest.org/annotation'";
+ variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
+ variant "attributeFormQualified";
+}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_c_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_c_e.ttcn
index ff20598546e488a2d9f7f1fd387444bfdeb7053c..41f3cda6e0313f370e30e7ff717524472f128305 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_c_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_c_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_annotation_c_e.ttcn
+// File: www_XmlTest_org_annotation.ttcn
// Description:
// References:
// Rev:
@@ -45,6 +45,8 @@ module www_XmlTest_org_annotation_c {
import from XSD all;
+
+
type XSD.PositiveInteger MyInteger1
with {
variant "element";
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e.ttcn
index f1363c02cf63ca08966934af6e4b2a2d51e4aa1e..1623092fbb48e5b0e588115d5aead0f0d87b6e55 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_annotation_e.ttcn
+// File: www_XmlTest_org_annotation.ttcn
// Description:
// References:
// Rev:
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e_e.ttcn
index 85ac765fbbd84032f396920a8a2153bc5ca45085..267807cf5cef5c33edcdc5249869758fc0e714a1 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_e_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_annotation_e_e.ttcn
+// File: www_XmlTest_org_annotation.ttcn
// Description:
// References:
// Rev:
@@ -37,7 +37,7 @@
//------------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_annotation_e_e {
+module www_XmlTest_org_annotation_e {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_t_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_t_e.ttcn
index 950a9ca892f7a5de6f39b90feceb3252a4a618bd..9f2b4f80cca0bdee9dcea68d50cfd4a31bc64c02 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_t_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_annotation_t_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_annotation_t_e.ttcn
+// File: www_XmlTest_org_annotation_t.ttcn
// Description:
// References:
// Rev:
@@ -27,7 +27,7 @@
// Generated from file(s):
// - XmlTest_annotation.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.XmlTest.org/annotation/e" */
+// /* targetnamespace = "www.XmlTest.org/annotation" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -38,7 +38,8 @@
//------------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_annotation_t_e {
+
+module www_XmlTest_org_annotation_t {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_boolean_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_boolean_e.ttcn
index d17d0d17ccd1d585b77690f94220d177a4fb855b..f22b51333175953efc68ca857c204238fe27f4f9 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_boolean_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_boolean_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_boolean_e.ttcn
+// File: www_XmlTest_org_boolean.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_boolean_e {
+module www_XmlTest_org_boolean {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex1_e.ttcn
index cd5113eb116768a927e3d3696e319840086a5eca..178056bb47b67bf3c6d571d3541c5f33ee26e9bb 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex1_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex1_e.ttcn
+// File: www_XmlTest_org_complex1.ttcn
// Description:
// References:
// Rev:
@@ -28,7 +28,7 @@
// Generated from file(s):
// - XmlTest_complex1.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.XmlTest.org/complex1/e" */
+// /* targetnamespace = "www.XmlTest.org/complex1" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex1_e {
+module www_XmlTest_org_complex1 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex2_e.ttcn
index 66fe704a2c1d6c0437a22b4f7b7fdaf98e2a6f79..a29e03b8fc9f39a5a3caf5667bafdf748566823f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex2_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex2_e.ttcn
+// File: www_XmlTest_org_complex2.ttcn
// Description:
// References:
// Rev:
@@ -28,7 +28,7 @@
// Generated from file(s):
// - XmlTest_complex2.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.XmlTest.org/complex2/e" */
+// /* targetnamespace = "www.XmlTest.org/complex2" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex2_e {
+module www_XmlTest_org_complex2 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_all_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_all_e.ttcn
index 4aedf45615ed05730df0b54e5c486b6fc38593ba..cb78f5b7c31fc96de23e4ea3c1f37d8e5a8a6ef0 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_all_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_all_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_all_e.ttcn
+// File: www_XmlTest_org_complex_all.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_all_e {
+module www_XmlTest_org_complex_all {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_any_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_any_e.ttcn
index af39147ef090ab50cc600990cb52b50b5dd50ca2..fd81873054605a35b1f6a7fecb4310198f4b384b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_any_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_any_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_any_e.ttcn
+// File: www_XmlTest_org_complex_any.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_any_e {
+module www_XmlTest_org_complex_any {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_choice_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_choice_e.ttcn
index e2f150cc5003fd4576186a63d6840421fccac5c9..1f429bed6f51f236e1345660702ffece9d4b24be 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_choice_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_choice_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_choice_e.ttcn
+// File: www_XmlTest_org_complex_choice.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_choice_e {
+module www_XmlTest_org_complex_choice {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_e.ttcn
index bc9f2b03218d5bfb970004b5a84d440d02873757..8ecd50887d056ec0ce289b0f25532030ee289fdb 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex1_e.ttcn
+// File: www_XmlTest_org_complex1.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex1_e {
+module www_XmlTest_org_complex1 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_extension_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_extension_e.ttcn
index 5a45127a9e565258143b462c06e2315c1fae18e8..f28c275cb195142878ecd49ad686169276388248 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_extension_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_extension_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_extension_e.ttcn
+// File: www_XmlTest_org_complex_extension.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_extension_e {
+module www_XmlTest_org_complex_extension {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_AB_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_AB_e.ttcn
index cdf0eab97d330c7a5197d0dc15a7c98eed1401d5..da8c7d7875635c5b03c7ff064247c6f7fb598861 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_AB_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_AB_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_import_AB_e.ttcn
+// File: www_XmlTest_org_complex_import_AB.ttcn
// Description:
// References:
// Rev:
@@ -40,16 +40,16 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_import_AB_e {
+module www_XmlTest_org_complex_import_AB {
import from XSD all;
-import from www_XmlTest_org_complex_import_A_e all;
+import from www_XmlTest_org_complex_import_A all;
-import from www_XmlTest_org_complex_import_B_e all;
+import from www_XmlTest_org_complex_import_B all;
/* This documentum tests based on
@@ -63,8 +63,8 @@ import from www_XmlTest_org_complex_import_B_e all;
type record PurchaseReportImport
{
- www_XmlTest_org_complex_import_A_e.MyType myTypeA,
- www_XmlTest_org_complex_import_B_e.MyType myTypeB
+ www_XmlTest_org_complex_import_A.MyType myTypeA,
+ www_XmlTest_org_complex_import_B.MyType myTypeB
}
with {
variant "name as uncapitalized";
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_A_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_A_e.ttcn
index 0838cdc929ae2dcb9a0478faa6557997708459bf..5c30a942cdaa85eb4bdd9a3145e5435e09f81fad 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_A_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_A_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_import_A_e.ttcn
+// File: www_XmlTest_org_complex_import_A.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_import_A_e {
+module www_XmlTest_org_complex_import_A {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_B_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_B_e.ttcn
index 08c83c0c467f883b62ff24004901816b622b08af..aa6af195a15f2e5d8ed823b8f30451681f5b77ad 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_B_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_B_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_import_B_e.ttcn
+// File: www_XmlTest_org_complex_import_B.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_import_B_e {
+module www_XmlTest_org_complex_import_B {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_e.ttcn
index a9afeb978af97d2ef1437c660949dd61d5052001..a0653df2245e3af4b9c41868ad82bc651b96383d 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_import_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_import_e.ttcn
+// File: www_XmlTest_org_complex_import.ttcn
// Description:
// References:
// Rev:
@@ -40,13 +40,13 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_import_e {
+module www_XmlTest_org_complex_import {
import from XSD all;
-import from www_XmlTest_org_complex_include_e all;
+import from www_XmlTest_org_complex_include all;
/* This documentum tests based on
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include1_e.ttcn
index 1e200e4836c8bc69d09f3698736142c602235f5d..7e091ffe4b1c46a8fde1fd4bf1612cbd7423066f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include1_e.ttcn
@@ -43,7 +43,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_include1_e {
+module www_XmlTest_org_complex_include1 {
import from XSD all;
@@ -80,6 +80,7 @@ with {
5.4 Importing Types
XML Schema Part 1: Structures Second Edition
...
+ ETSI ES 201 873-9 V4.1.2
This is the included schema with proper namespace */
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include2_e.ttcn
index dc7a9bb7b0aa819c4434efb8d5d1a26c1390b5e0..8c3e9b0fbce81f5974e25abdbcb40d8268d7c671 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include2_e.ttcn
@@ -17,7 +17,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_include_e.ttcn
+// File: www_XmlTest_org_complex_include.ttcn
// Description:
// References:
// Rev:
@@ -41,7 +41,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_include2_e {
+module www_XmlTest_org_complex_include2 {
import from XSD all;
@@ -96,7 +96,7 @@ with {
}
with {
encode "XML";
- variant "namespace as 'www.XmlTest.org/complex_include2' prefix 'r2'";
+ variant "namespace as 'www.XmlTest.org/complex_include' prefix 'r'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
variant "elementFormQualified";
}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include_e.ttcn
index 6327013c1d5189006f9dd644070fb9ed7ada6b87..e8ce5464dc06dee4f7fee85cace209f08b931e31 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_include_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_include_e.ttcn
+// File: www_XmlTest_org_complex_include.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_include_e {
+module www_XmlTest_org_complex_include {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn
index 1adc92d3db85636d03b7e55bd071edf364a1df38..8bd1dd2f6174728fe7932492072e84d74c618bf4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn
+// File: www_XmlTest_org_complex_minOccursMaxOccurs.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_minOccursMaxOccurs_e {
+module www_XmlTest_org_complex_minOccursMaxOccurs {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_mixed_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_mixed_e.ttcn
index 5f057c87b055e312effcf22056899652f11e46f1..3cd142511dfa8c8047ee1dc3ca760904be408044 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_mixed_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_mixed_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_mixed_e.ttcn
+// File: www_XmlTest_org_complex_mixed.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_mixed_e {
+module www_XmlTest_org_complex_mixed {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_restriction_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_restriction_e.ttcn
index 98a2698e7a26f4b48b93bef0b7c08d95cf75fc4a..c10e59975a754ca6b12a7d74a840ac2425ec0a07 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_restriction_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_restriction_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_restriction_e.ttcn
+// File: www_XmlTest_org_complex_restriction.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_restriction_e {
+module www_XmlTest_org_complex_restriction {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_simpleContent_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_simpleContent_e.ttcn
index 0ff0e0ce5cceb58caded1ff8c5287bd538960a5e..73d8547536ec0c3a00523b9659d4f23b575accbe 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_simpleContent_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_simpleContent_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_simpleContent_e.ttcn
+// File: www_XmlTest_org_complex_simpleContent.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_complex_simpleContent_e {
+module www_XmlTest_org_complex_simpleContent {
import from XSD all;
@@ -83,6 +83,6 @@ with {
}
with {
encode "XML";
- variant "namespace as 'www.XmlTest.org/complex_simpleContent_e' prefix 'ns35'";
+ variant "namespace as 'www.XmlTest.org/complex_simpleContent' prefix 'ns35'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_unique_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_unique_e.ttcn
index 2aa6e277122428d4061bec745692b20e385e7867..4b3eb8c0783389feaa2235b47afd3decfee852e6 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_unique_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_complex_unique_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_complex_unique_e.ttcn
+// File: www_XmlTest_org_complex_unique.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - XmlTest_complex_unique_e.xsd
+// - XmlTest_complex_unique.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.XmlTest.org/complex_unique/e" */
+// /* targetnamespace = "www.XmlTest.org/complex_unique" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_e.ttcn
index 1ad43dade5fc8c92c460d321c6d2629306e4c58f..9c7dd81ff8d654a53b57a7279b659349dc171578 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_decimal_e.ttcn
+// File: www_XmlTest_org_decimal.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_decimal_e {
+module www_XmlTest_org_decimal {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withEnum_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withEnum_e.ttcn
index 21b68f96125b32dc56d74411c4ec645b32304f4d..7c849682f9a5b0a43aeb00f8636e3333bc0f78d4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withEnum_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withEnum_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_decimal_withEnum_e.ttcn
+// File: www_XmlTest_org_decimal_withEnum.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_decimal_withEnum_e {
+module www_XmlTest_org_decimal_withEnum {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withLength_e.ttcn
index 5ca323ec805511abf8ffc1be4c08b4cae22837bc..d0455366495d79a83ca163bdab5ae26ac5ab9e07 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withLength_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_decimal_withLength_e.ttcn
+// File: www_XmlTest_org_decimal_withLength.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_decimal_withLength_e {
+module www_XmlTest_org_decimal_withLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxExclusive_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxExclusive_e.ttcn
index 7a3bbc3cbe86e34357c08a1da69eec7aa478bd9b..dc48329b51f2b0db96d51891de91940ad6ddeb9a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxExclusive_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxExclusive_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_decimal_withMinMaxExclusive_e.ttcn
+// File: www_XmlTest_org_decimal_withMinMaxExclusive.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_decimal_withMinMaxExclusive_e {
+module www_XmlTest_org_decimal_withMinMaxExclusive {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxInclusive_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxInclusive_e.ttcn
index 5cd648296944f008d34ce7febe6c3add24e5fb90..afe6ce0b7afb182dcbfe119842f50d171c64adc6 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxInclusive_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_decimal_withMinMaxInclusive_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_decimal_withMinMaxInclusive_e.ttcn
+// File: www_XmlTest_org_decimal_withMinMaxInclusive.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_decimal_withMinMaxInclusive_e {
+module www_XmlTest_org_decimal_withMinMaxInclusive {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_anyType_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_anyType_e.ttcn
index 49ba9cfff40c9f2774c085702c54d330d389051d..cde9c26d958eeed1b2ed190f592c834a683c419b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_anyType_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_anyType_e.ttcn
@@ -17,7 +17,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_element_anyType_e.ttcn
+// File: www_XmlTest_org_element_anyType.ttcn
// Description:
// References:
// Rev:
@@ -41,7 +41,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_element_anyType_e {
+module www_XmlTest_org_element_anyType {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_nameInheritance_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_nameInheritance_e.ttcn
index ab427c36f9a1ac831c6ae2456a07465ddd77f476..5acf43ec8285aa1f543806af764e175208825df9 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_nameInheritance_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_nameInheritance_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_element_nameInheritance_e.ttcn
+// File: www_XmlTest_org_element_nameInheritance.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_element_nameInheritance_e {
+module www_XmlTest_org_element_nameInheritance {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements3_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements3_e.ttcn
index 2ac103af7c95f500bc5d9b83145866a4390b3406..5b187708c6c65dd22322671d3e3ec16cfbba0e84 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements3_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements3_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_element_recordOfElements3_e.ttcn
+// File: www_XmlTest_org_element_recordOfElements3.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - XmlTest_element_recordOfElements3_e.xsd
+// - XmlTest_element_recordOfElements3.xsd
// /* xml version = "1.0" */
// /* targetnamespace = "www.XmlTest.org/element_recordOfElements3" */
////////////////////////////////////////////////////////////////////////////////
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_element_recordOfElements3_e {
+module www_XmlTest_org_element_recordOfElements3 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements4_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements4_e.ttcn
index da3091c0cab43cc1e459ae43d98e35e8b07fe2e4..7098e0e036f2b55ca7d17b33231784a1221008ff 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements4_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements4_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_element_recordOfElements4_e.ttcn
+// File: www_XmlTest_org_element_recordOfElements4.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_element_recordOfElements4_e {
+module www_XmlTest_org_element_recordOfElements4 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements5_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements5_e.ttcn
index 33faaedee9e500ff1e20c84a825b72bd89267704..0fbcc955bbd8d414c38f2e91f4db124099fa3520 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements5_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements5_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_element_recordOfElements5_e.ttcn
+// File: www_XmlTest_org_element_recordOfElements5.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - XmlTest_element_recordOfElements5_e.xsd
+// - XmlTest_element_recordOfElements5.xsd
// /* xml version = "1.0" */
// /* targetnamespace = "www.XmlTest.org/element_recordOfElements5" */
////////////////////////////////////////////////////////////////////////////////
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_element_recordOfElements5_e {
+module www_XmlTest_org_element_recordOfElements5 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements_e.ttcn
index 928191cb5b5ffa7fcb78293a287675e88c9ca3a9..8a08b002b0c8b33d22ee18e6b033cffb3e490d27 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_element_recordOfElements_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_element_recordOfElements_e.ttcn
+// File: www_XmlTest_org_element_recordOfElements.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - XmlTest_element_recordOfElements_e.xsd
+// - XmlTest_element_recordOfElements.xsd
// /* xml version = "1.0" */
// /* targetnamespace = "www.XmlTest.org/element_recordOfElements" */
////////////////////////////////////////////////////////////////////////////////
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_element_recordOfElements_e {
+module www_XmlTest_org_element_recordOfElements {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_empty_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_empty_e.ttcn
index 1d813aa25b82cdee829c847a19b72e3f2ff06fb3..6856270ac96b44274b490e82759c719d44cc3f55 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_empty_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_empty_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_empty_e.ttcn
+// File: www_XmlTest_org_empty.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_empty_e {
+module www_XmlTest_org_empty {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxExcl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxExcl_e.ttcn
index 846d296b9fb6e439e1e13d47ab1156a4ede4051d..5ea38644161eb60f0d7cc10560ca4e8bdf828d99 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxExcl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxExcl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMaxExcl_e.ttcn
+// File: www_XmlTest_org_integer_withMaxExcl.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMaxExcl_e {
+module www_XmlTest_org_integer_withMaxExcl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxIncl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxIncl_e.ttcn
index f583d5e9337d50ff857d18718263a99ad8a10aa7..f1a330d1c33e5940aedbfeb47e5f9d14ed7963da 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxIncl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MaxIncl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMaxIncl_e.ttcn
+// File: www_XmlTest_org_integer_withMaxIncl.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMaxIncl_e {
+module www_XmlTest_org_integer_withMaxIncl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinExcl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinExcl_e.ttcn
index aca1ddb53d51afbb5cf12c5a0feed3baf7052792..d5b056f99e283a651379a789e943c2a56e247413 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinExcl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinExcl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMinExcl_e.ttcn
+// File: www_XmlTest_org_integer_withMinExcl.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMinExcl_e {
+module www_XmlTest_org_integer_withMinExcl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinIncl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinIncl_e.ttcn
index ecc1d345fc297ca6176be599ff22ff1b375503ff..34c3c8571305d35dcf6e4840ac5237567097a0b8 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinIncl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_MinIncl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMinIncl_e.ttcn
+// File: www_XmlTest_org_integer_withMinIncl.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMinIncl_e {
+module www_XmlTest_org_integer_withMinIncl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_e.ttcn
index c45481248df79e5b83b2d1f68d991f88fc123b42..dee4b8f3f9ebe29ef7651e875300575a91d1386a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_e.ttcn
+// File: www_XmlTest_org_integer.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_e {
+module www_XmlTest_org_integer {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withEnum_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withEnum_e.ttcn
index ac0d663b566d6d4564be5311ea3d9b60c9d765a2..62107ed161f1a1ef4fbaba3cc1ca7858261785e9 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withEnum_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withEnum_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withEnum_e.ttcn
+// File: www_XmlTest_org_integer_withEnum.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withEnum_e {
+module www_XmlTest_org_integer_withEnum {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxExcl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxExcl_e.ttcn
index 481955996b75a3bcb6d1f03c2cc66ae92fed2bec..e96d73ce3586cf48e3eb4861970ae1da665771cf 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxExcl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxExcl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMaxExcl_e.ttcn
+// File: www_XmlTest_org_integer_withMaxExcl.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMaxExcl_e {
+module www_XmlTest_org_integer_withMaxExcl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxIncl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxIncl_e.ttcn
index 8295866144c57129001332af689930487e2c7a04..cfb5b07b6d7047fcb0b67ad99572a829c9280a98 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxIncl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMaxIncl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMaxIncl_e.ttcn
+// File: www_XmlTest_org_integer_withMaxIncl.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMaxIncl_e {
+module www_XmlTest_org_integer_withMaxIncl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinExcl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinExcl_e.ttcn
index 5c2d23e7992e494ef38d7dea0b110c007f4776c8..438d77508481964e222ed615bb69f14b343c6402 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinExcl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinExcl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMinExcl_e.ttcn
+// File: www_XmlTest_org_integer_withMinExcl.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMinExcl_e {
+module www_XmlTest_org_integer_withMinExcl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinIncl_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinIncl_e.ttcn
index 487734cb858ef71c55ec5110d072ebb2b3c2b1ae..badd966ed55a3068c42a80354c91e246f458da3c 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinIncl_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_integer_withMinIncl_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_integer_withMinIncl_e.ttcn
+// File: www_XmlTest_org_integer_withMinIncl.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_integer_withMinIncl_e {
+module www_XmlTest_org_integer_withMinIncl {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_e.ttcn
index c32e99a1d390b64b36ae82b151e14690197de7d2..68d2980e6102f4fea11404d13d5535a2dc5a2d88 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_list_e.ttcn
+// File: www_XmlTest_org_list.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_list_e {
+module www_XmlTest_org_list {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_integer_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_integer_e.ttcn
index 9441829d4fde3dfe2e40872ebc75e32709762d42..165d920b9338c1a74eaba3cb7fcf92b7bb89540d 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_integer_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_list_integer_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_list_integer_e.ttcn
+// File: www_XmlTest_org_list_integer.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_list_integer_e {
+module www_XmlTest_org_list_integer {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_simple_enum_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_simple_enum_e.ttcn
index e004d4215319513bf80791569d39f3d4d1ddcf18..5002d53f3d398ff847480689deb6109e55c50cea 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_simple_enum_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_simple_enum_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_simple_enum_e.ttcn
+// File: www_XmlTest_org_simple_enum.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_simple_enum_e {
+module www_XmlTest_org_simple_enum {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_e.ttcn
index b3776440326f16272bfc55cb3c1a5993ee056626..b90279acc04fcd0591e322e8d0bcb30adc37d0e1 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_string_e.ttcn
+// File: www_XmlTest_org_string.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_e {
+module www_XmlTest_org_string {
import from XSD all;
@@ -119,7 +119,7 @@ type XSD.String StringMax length(0 .. 7);
type XSD.String StringMinMax length(5 .. 7);
-type XSD.String Better_us_zipcode (pattern "[0-9]#5(-[0-9]#4)#(0,1)")
+type XSD.String Better_us_zipcode (pattern "[0-9]#(5)(-[0-9]#(4))#(0,1)")
with {
variant "name as 'better-us-zipcode'";
};
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyLength_e.ttcn
index 5190038e58a7377d907c48cd1d9b01ecd9734131..18587441b2bd959ac967dd40aec1ceaab4256011 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyLength_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withEmptyLength_e {
+module www_XmlTest_org_string_withEmptyLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMax_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMax_e.ttcn
index 41a2d1cc1254c4a868c970e276d7634983d1f46f..081886ccd00c97c8d82a2bb3d1000354548c5a95 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMax_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMax_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withEmptyMax_e {
+module www_XmlTest_org_string_withEmptyMax {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMin_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMin_e.ttcn
index 3b580051cad0dc091e8fa37fa5f8e39a24ee43d4..5ce2431d0471fd4b004959ccc398ebb2ce80ba9b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMin_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEmptyMin_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withEmptyMin_e {
+module www_XmlTest_org_string_withEmptyMin {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEnum_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEnum_e.ttcn
index aa5a8129ebefc665ef226ede393576d6aa91e911..4e3dca6f6b79c90cabe05630116ac4a70711821d 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEnum_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withEnum_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_string_withEnum_e.ttcn
+// File: www_XmlTest_org_string_withEnum.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withEnum_e {
+module www_XmlTest_org_string_withEnum {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFaultyMinMax_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFaultyMinMax_e.ttcn
index b1da9960126ec5c8d95035d64d4afb19923e0038..7e5dd43ef350db19e1724ef4a25088b64c741b68 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFaultyMinMax_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFaultyMinMax_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withFaultyMinMax_e {
+module www_XmlTest_org_string_withFaultyMinMax {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFixedLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFixedLength_e.ttcn
index ac7117ca5e3f010853fa910468eff5961c4c5819..77602934ea255feadbdb537c806f6edcac0061c9 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFixedLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFixedLength_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withFixedLength_e {
+module www_XmlTest_org_string_withFixedLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFloatLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFloatLength_e.ttcn
index a641f400087fa6c6053cab9c0796bcd97d1c0077..9816f9cf904be689ae1c449a3639f0e05e639980 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFloatLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withFloatLength_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withFloatLength_e {
+module www_XmlTest_org_string_withFloatLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withMinLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withMinLength_e.ttcn
index af8971b2c23cf205402a5c2b917f0ecadc592005..25a36aa4d3c91b0d491eb563a934c6d979efa489 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withMinLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withMinLength_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_string_withMinLength_e.ttcn
+// File: www_XmlTest_org_string_withMinLength.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withMinLength_e {
+module www_XmlTest_org_string_withMinLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeLength_e.ttcn
index c0d093658336103be7b4556a13a348479fbf2186..fc20a9d243b9fb4b515d605ea77a7acd1315e1de 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeLength_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withNegativeLength_e {
+module www_XmlTest_org_string_withNegativeLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeMin_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeMin_e.ttcn
index d8572854231f3ed09faf7f64a6ba9dde559ab686..4ab805a7fbfc89fce91091765f28e0c894d17267 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeMin_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withNegativeMin_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withNegativeMin_e {
+module www_XmlTest_org_string_withNegativeMin {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withOverDefinition_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withOverDefinition_e.ttcn
index 091078450d2358b77ed84a35696b5ef30a88be01..a6e43666a3226890156783370c331c6959a1f6b6 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withOverDefinition_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withOverDefinition_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withOverDefinition_e {
+module www_XmlTest_org_string_withOverDefinition {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosLength_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosLength_e.ttcn
index ddb2fa460531876c737a8910da54dd9375be1bf1..f11970786ca7266bf8ac716621ec16f33c2ff445 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosLength_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosLength_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_string_withPosLength_e.ttcn
+// File: www_XmlTest_org_string_withPosLength.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withPosLength_e {
+module www_XmlTest_org_string_withPosLength {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosMax_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosMax_e.ttcn
index fd87d601b51f66ddc8353571519fbe7af98387c6..accd6cb2333d780ba5f24726736ce68184a105ae 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosMax_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withPosMax_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_string_withPosMax_e.ttcn
+// File: www_XmlTest_org_string_withPosMax.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withPosMax_e {
+module www_XmlTest_org_string_withPosMax {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withTypeAndBase_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withTypeAndBase_e.ttcn
index 59821391defd2d41b96fd28ecb00b55f5d568a3f..24ba3965232b96f62c862d9f315e055ff1a099ec 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withTypeAndBase_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withTypeAndBase_e.ttcn
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withTypeAndBase_e {
+module www_XmlTest_org_string_withTypeAndBase {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withWhitespace_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withWhitespace_e.ttcn
index d36fe18c2f7723e5c89b8bffcf7ecf225f451365..9e49a92a72415ae3eece4c8071facd9c50d783dc 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withWhitespace_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_string_withWhitespace_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_string_withWhitespace_e.ttcn
+// File: www_XmlTest_org_string_withWhitespace.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_string_withWhitespace_e {
+module www_XmlTest_org_string_withWhitespace {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_e.ttcn
index 9180c487c1634b41e2990804bc15f78bc56e0f72..b4ef8cf764b49c723a69d127a94e666a4b8a7f0a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_time_e.ttcn
+// File: www_XmlTest_org_time.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_time_e {
+module www_XmlTest_org_time {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_withEnum_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_withEnum_e.ttcn
index 5baeedb0a78595026d2ea1f8013f3a599c8251c0..a9a83adecc98cf3919f9dabc7de5b46389dbf90d 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_withEnum_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_time_withEnum_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_time_withEnum_e.ttcn
+// File: www_XmlTest_org_time_withEnum.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_time_withEnum_e {
+module www_XmlTest_org_time_withEnum {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_union_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_union_e.ttcn
index 4faacee6a04728fca57cc25c019e552966c692b4..4d3f6058b6552ed8a84e42e4d4734155a8a29a2b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_union_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_XmlTest_org_union_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_XmlTest_org_union_e.ttcn
+// File: www_XmlTest_org_union.ttcn
// Description:
// References:
// Rev:
@@ -40,7 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_XmlTest_org_union_e {
+module www_XmlTest_org_union {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_common_v2_0_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_common_v2_0_e.ttcn
index 25fc900d28f6f83a07902ebf968131e440c443b4..5c95832911f5931342a6d69831cf382aeaf37a62 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_common_v2_0_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_common_v2_0_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_csapi_org_schema_parlayx_common_v2_0_e.ttcn
+// File: www_csapi_org_schema_parlayx_common_v2_0.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_csapi_org_schema_parlayx_common_v2_0_e {
+module www_csapi_org_schema_parlayx_common_v2_0 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local_e.ttcn
index 81b437c0f38637e5e2f957b789d7d044771e85bd..1bc5a87a436f21fe0a208a912bdd757c8f678161 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local_e.ttcn
+// File: www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local_e {
+module www_csapi_org_schema_parlayx_payment_amount_charging_v2_0_local {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local_e.ttcn
index b4453a2b239040b276988367b36f068c8a17fa63..e9318e7badc87bb1b02096a93c9be09f6caae4e5 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local_e.ttcn
+// File: www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local_e {
+module www_csapi_org_schema_parlayx_payment_reserve_amount_charging_v2_0_local {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local_e.ttcn
index 215db3064c01954100d45527cec5aa2a6377bad5..aa0906d04c842886d37c7d7643bd2e45bb4675e9 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local_e.ttcn
+// File: www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local_e {
+module www_csapi_org_schema_parlayx_payment_reserve_volume_charging_v2_0_local {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_v2_0_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_v2_0_e.ttcn
index 765e09e718b24725506442cf2eabf87c8308eab0..38eeb2b4fb1421a0da0850de78a537f8692d0454 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_v2_0_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_v2_0_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_csapi_org_schema_parlayx_payment_v2_0_e.ttcn
+// File: www_csapi_org_schema_parlayx_payment_v2_0.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_csapi_org_schema_parlayx_payment_v2_0_e {
+module www_csapi_org_schema_parlayx_payment_v2_0 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local_e.ttcn
index 6f7672c07f952cd340f9ddce4647b1e25eb0ce1b..9df3db32a4e1a18691a397865354766963491f5f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local_e.ttcn
+// File: www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local_e {
+module www_csapi_org_schema_parlayx_payment_volume_charging_v2_0_local {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933_e.ttcn
index ff1f94bcd0b9d81dcc32700cb48ea560641195ce..ab92d5d69b582a558ab6e6616368fdf1c305fb1d 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933_e.ttcn
+// File: www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933_e {
+module www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_HK84933 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_e.ttcn
index 5f88085abd763070c4f9c9382b15b5322182d20b..35442a40a3465910083cdc2bf13dba7267b9f5b5 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_e.ttcn
+// File: www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02_e {
+module www_ericsson_com_is_isco_IntegratedSite_R4L06_R4AB_1_02 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02_e.ttcn
index b22662cf1f99b966b7bf6982919c161f91c43c78..336b21229334996244de67bca1677b64d499cead 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02_e.ttcn
+// File: www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02_e {
+module www_ericsson_com_is_isco_IsTypes_R4L06_R4AB_1_02 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11_e.ttcn
index c762b6753a4951fa7598bbb1291deea3ca428736..2132fa5d2d73b14e3c537a1a23b73cc007defc59 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11_e.ttcn
+// File: www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11.ttcn
// Description:
// References:
// Rev:
@@ -34,7 +34,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11_e {
+module www_ericsson_com_is_isco_IsTypes_R4L06_R4AF11 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02_e.ttcn
index 279c15f7345c3673f0281b40fb75d513e6e50716..45614aa336ea2c79ea3a9d064f8898ff1f84b486 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02_e.ttcn
+// File: www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02_e {
+module www_ericsson_com_is_isco_MainSwitch_R4L06_R4AB_1_02 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Mgw_R9B27_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Mgw_R9B27_e.ttcn
index 299328491fc53af56288a40a6dba9ce9b3f296dc..c526281ba2ca094c47a695ce7cf43942c3786a35 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Mgw_R9B27_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Mgw_R9B27_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_Mgw_R9B27_e.ttcn
+// File: www_ericsson_com_is_isco_Mgw_R9B27.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_Mgw_R9B27_e {
+module www_ericsson_com_is_isco_Mgw_R9B27 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02_e.ttcn
index b98976b08f499307838cb26aa9d4cfab801704f9..42a56d5a778df5e8470aacf9f37a58c739bb2f89 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02_e.ttcn
+// File: www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02_e {
+module www_ericsson_com_is_isco_Misc_R4L06_R4AB_1_02 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Tgc_R6A48_R6H01_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Tgc_R6A48_R6H01_e.ttcn
index 5ab964453461336dad1bd9642933129d891047ae..ff26dbda1e97cf3a0278ee5f4d8031b89e87840e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Tgc_R6A48_R6H01_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_ericsson_com_is_isco_Tgc_R6A48_R6H01_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: www_ericsson_com_is_isco_Tgc_R6A48_R6H01_e.ttcn
+// File: www_ericsson_com_is_isco_Tgc_R6A48_R6H01.ttcn
// Description:
// References:
// Rev:
@@ -34,7 +34,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_ericsson_com_is_isco_Tgc_R6A48_R6H01_e {
+module www_ericsson_com_is_isco_Tgc_R6A48_R6H01 {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_all_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_all_e.ttcn
index 820622ee6c17c3bf3ce047229128cf4f6bf096b4..867ccb0edafc12e624c93334e56cf0f244ff0c97 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_all_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_all_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_all_e.ttcn
+// File: www_example_org_all.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - all.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/all/e" */
+// /* targetnamespace = "www.example.org/all" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattr_in_complex_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattr_in_complex_e.ttcn
index c3f45f6c9f3a6acbfa1fea3e28c8d440c1445db5..ba323b651c3ce08d918732dd4b56cbe2535a591b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattr_in_complex_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattr_in_complex_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_anyattr_in_complex_e.ttcn
+// File: www_example_org_anyattr_in_complex.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - anyattr_in_compex_e.xsd
+// - anyattr_in_complex.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/anyattr/in/complex/e" */
+// /* targetnamespace = "www.example.org/anyattr/in/complex" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattrib_single_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattrib_single_e.ttcn
index 59b3ee2cfd19a9debaad22f0abded0bd63b22595..2878eb53c1322f98b03d607ab15db7f34aed14ba 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattrib_single_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_anyattrib_single_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_anyattrib_single_e.ttcn
+// File: www_example_org_anyattrib_single.ttcn
// Description:
// References:
// Rev:
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_anyattrib_single_e {
+module www_example_org_anyattrib_single {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attr_ext_rest_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attr_ext_rest_e.ttcn
index c1fd9995fae8c1b190ca88e4f116c76fd0df1382..be375833f7206fc461db64ea9d2b9d2aeca8ae53 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attr_ext_rest_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attr_ext_rest_e.ttcn
@@ -24,7 +24,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - attrib_restriction_extension_e.xsd
+// - attrib_restriction_extension.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
// /* targetnamespace = "www.example.org/attr/ext/rest" */
////////////////////////////////////////////////////////////////////////////////
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_attr_ext_rest_e {
+module www_example_org_attr_ext_rest {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_enum_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_enum_e.ttcn
index 05da3b78a690d487fe8c005b2a70865f3ac5f80e..a2d6a4a6d326e05a3b78b52861bcec63230fa6bb 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_enum_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_enum_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_attrib_enum_e.ttcn
+// File: www_example_org_attrib_enum.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - attrib_enum_e.xsd
+// - attrib_enum.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/attrib/enum/e" */
+// /* targetnamespace = "www.example.org/attrib/enum" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_a_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_a_e.ttcn
index bd8706c9134a9e9023e3404eba842569f9621b8f..16afe87f5ed9bd2c1eb22316fe92e14b28311171 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_a_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_a_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_attrib_order_a_e.ttcn
+// File: www_example_org_attrib_order_a.ttcn
// Description:
// References:
// Rev:
@@ -47,7 +47,7 @@ import from XSD all;
import from www_example_org_attrib_order_b all;
-import from NoTargetNamespace2_e all;
+import from NoTargetNamespace2 all;
type XSD.String Local1 ("fixed")
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_b_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_b_e.ttcn
index f01b95c557d369648effeb89b14c6a577b8ebd2c..7201c6f023e88fca25ed0655a0c83ce29706f3a2 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_b_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attrib_order_b_e.ttcn
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - attrib_order_b_e.xsd
+// - attrib_order_b.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/attrib/order/b/e" */
+// /* targetnamespace = "www.example.org/attrib/order/b" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribgroup_ingroup_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribgroup_ingroup_e.ttcn
index 1b897242bed82f0d32be01663ca6348cf849fe00..b69ffd3955f42f3e4d5ec76319b01b4935384502 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribgroup_ingroup_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribgroup_ingroup_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_attribgroup_ingroup_e.ttcn
+// File: www_example_org_attribgroup_ingroup.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - attribgroup_ingroup_e.xsd
+// - attribgroup_ingroup.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/attribgroup/ingroup/e" */
+// /* targetnamespace = "www.example.org/attribgroup/ingroup" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribute_enumeration_variant_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribute_enumeration_variant_e.ttcn
index 98926086e8067d580db3c86bd0fb126246af5592..5eabeb98e6d444b38e59e85c91f4bf61f60a1341 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribute_enumeration_variant_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attribute_enumeration_variant_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_attribute_enumeration_variant_e.ttcn
+// File: www_example_org_attribute_enumeration_variant.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - attribute_enumeration_variant.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/attribute/enumeration/variant/e" */
+// /* targetnamespace = "www.example.org/attribute/enumeration/variant" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attributegroup_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attributegroup_e.ttcn
index fd112816b5376f961e054becdeee7c03c6cad671..78714c6d5090e3fa65e6ae824f1c9f6f78f2331f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attributegroup_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_attributegroup_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_attributegroup_e.ttcn
+// File: www_example_org_attributegroup.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - attributeGroup_e.xsd
+// - attributeGroup.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/attributegroup/e" */
+// /* targetnamespace = "www.example.org/attributegroup" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_boolean_variant_commented_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_boolean_variant_commented_e.ttcn
index c311a6a7a5ed737976afd3b08deff5be1ff4ac98..4f4066c8f7d7b7f5271a0ebea1d80a6defd5e759 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_boolean_variant_commented_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_boolean_variant_commented_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_boolean_variant_commented_e.ttcn
+// File: www_example_org_boolean_variant_commented.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - boolean_variant_commented.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/boolean/variant/commented/e" */
+// /* targetnamespace = "www.example.org/boolean/variant/commented" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_comment_placement_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_comment_placement_e.ttcn
index e73ff248128d017fc69d079715c90eb2a336c3b2..921e461742757711cfdf0350176fe3334490c766 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_comment_placement_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_comment_placement_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_comment_placement_e.ttcn
+// File: www_example_org_comment_placement.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - comment_placement.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/comment/placement/e" */
+// /* targetnamespace = "www.example.org/comment/placement" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_complex_nillable_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_complex_nillable_e.ttcn
index 14bb7310fa7e910cb56efe7e085c6584e8e133d6..058996722e1cfae5271a1e23ea42c316aef3151c 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_complex_nillable_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_complex_nillable_e.ttcn
@@ -26,7 +26,7 @@
// Generated from file(s):
// - complex_nillable.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/complex/nillable/e" */
+// /* targetnamespace = "www.example.org/complex/nillable" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_complex_nillable_e {
+module www_example_org_complex_nillable {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_decimal_fractiondigits_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_decimal_fractiondigits_e.ttcn
index d6b7347fd23e4881de566c6740394083bf2b5036..b52b3cb00d61ce353aba4a7fd96200c29c54e939 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_decimal_fractiondigits_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_decimal_fractiondigits_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_decimal_fractiondigits_e.ttcn
+// File: www_example_org_decimal_fractiondigits.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - decimal_fractiondigits.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/decimal/fractiondigits/e" */
+// /* targetnamespace = "www.example.org/decimal/fractiondigits" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_dont_generate_element_substitution_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_dont_generate_element_substitution_e.ttcn
index f1de3fa9a25e601a7eb435e7a6b87cfeea67e446..318c67fdb453d36d97c045cdbeaa681fd73a057f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_dont_generate_element_substitution_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_dont_generate_element_substitution_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_dont_generate_element_substitution_e.ttcn
+// File: www_example_org_dont_generate_element_substitution.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - dont_generate_element_substitution_e.xsd
+// - dont_generate_element_substitution.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/dont/generate/element/substitution/e" */
+// /* targetnamespace = "www.example.org/dont/generate/element/substitution" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_e.ttcn
index 2de064d7b4b2619d7ef9fccbfbdf48f8fe88e4cb..6ea1a030205dbad5aa22aa7654cec3d398d79b3b 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_e.ttcn
@@ -15,7 +15,7 @@
*
******************************************************************************/
//
-// File: www_example_org_e.ttcn
+// File: www_example_org.ttcn
// Description:
// References:
// Rev:
@@ -39,7 +39,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_e {
+module www_example_org {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_elements_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_elements_e.ttcn
index 4b3607fe3db7146ee34d657a8085608f303c4320..1196cd5783621dde709797fcc67ce49d44f895f4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_elements_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_elements_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_elements_e.ttcn
+// File: www_example_org_elements.ttcn
// Description:
// References:
// Rev:
@@ -24,7 +24,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - elements_e.xsd
+// - elements.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
// /* targetnamespace = "www.example.org/elements" */
////////////////////////////////////////////////////////////////////////////////
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enum_field_names_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enum_field_names_e.ttcn
index b6d6e27397576679816bcf3bb1efc835756990e9..bb5023b6554817b1e5d22c1e1a42b5472ccafaf2 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enum_field_names_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enum_field_names_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_enum_field_names_e.ttcn
+// File: www_example_org_enum_field_names.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - enum_field_names.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/enum/field/names/e" */
+// /* targetnamespace = "www.example.org/enum/field/names" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_remove_dup_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_remove_dup_e.ttcn
index 510a6c13fd51044800b76cdf386f8cb4416e79ea..9bf2cfa0d2cd5e813477d3bf38fa4688ec9acb62 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_remove_dup_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_remove_dup_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_enumeration_remove_dup_e.ttcn
+// File: www_example_org_enumeration_remove_dup.ttcn
// Description:
// References:
// Rev:
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_enumeration_remove_dup_e {
+module www_example_org_enumeration_remove_dup {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction3_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction3_e.ttcn
index c36a1d358fb4f680f0162e83685a69a2693b33f1..5e4229bf1c89fa12c6257ccd0c2048aa0a8007d4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction3_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction3_e.ttcn
@@ -1,7 +1,7 @@
-/*******************************************************************************
+/******************************************************************************
* Copyright (c) 2000-2016 Ericsson Telecom AB
*
-* XSD to TTCN-3 Translator version: CRL 113 200/5 R5A
+* XSD to TTCN-3 Translator
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -12,9 +12,9 @@
* Balasko, Jeno
* Szabo, Bence Janos
*
-*******************************************************************************/
+******************************************************************************/
//
-// File: www_example_org_enumeration_restriction3_e.ttcn
+// File: www_example_org_enumeration_restriction3.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - enumeration_restriction3_e.xsd
+// - enumeration_restriction3.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/enumeration_restriction3/e" */
+// /* targetnamespace = "www.example.org/enumeration_restriction3" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction_e.ttcn
index 06ca2ab077227240b8d9e6f7f4e98906f662335e..7b4d4157841ce61d4273378c409b40dacd1788bb 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_enumeration_restriction_e.ttcn
+// File: www_example_org_enumeration_restriction.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - enumeration_restriction.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/enumeration/restriction/e" */
+// /* targetnamespace = "www.example.org/enumeration/restriction" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_fixed_value_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_fixed_value_e.ttcn
index 92064c7668b1c34557fc9af07793d0c9826b4fb8..40f1fca2f15a590f43200a41c43aee5aa62dced3 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_fixed_value_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_fixed_value_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_fixed_value_e.ttcn
+// File: www_example_org_fixed_value.ttcn
// Description:
// References:
// Rev:
@@ -24,7 +24,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - a.xsd
+// - fixed_value.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
// /* targetnamespace = "www.example.org/fixed/value" */
////////////////////////////////////////////////////////////////////////////////
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_generate_element_substitution_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_generate_element_substitution_e.ttcn
index 5f88704807934ce3e7349f915b89d1c22d8a2138..e5f4a619e0fa9b812c27a7e7592f0a16ffe4ce24 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_generate_element_substitution_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_generate_element_substitution_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_generate_element_substitution_e.ttcn
+// File: www_example_org_generate_element_substitution.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - generate_element_substitution_e.xsd
+// - generate_element_substitution.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/generate/element/substitution/e" */
+// /* targetnamespace = "www.example.org/generate/element/substitution" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_id_attrib_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_id_attrib_e.ttcn
index dbffd83b6a3e634ea17d07320b38e125bf34063c..ffa9bd4ca80d4d5d25049ab66cd318a2bea878ab 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_id_attrib_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_id_attrib_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_id_attrib_e.ttcn
+// File: www_example_org_id_attrib.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - id_attrib.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/id_attrib/e" */
+// /* targetnamespace = "www.example.org/id_attrib" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_import_prefix_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_import_prefix_e.ttcn
index b06e2b9ce792dedb11d7f6747604580221ed3426..7c278956620238e148fa60b24de50b85006d9e35 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_import_prefix_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_import_prefix_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_import_prefix_e.ttcn
+// File: www_example_org_import_prefix.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - import_prefix_name.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/import/prefix/e" */
+// /* targetnamespace = "www.example.org/import/prefix" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_imported2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_imported2_e.ttcn
index 66033dee59bfa7756641a770f1c7fcf5398ff7b9..797bc052ad356c142626aa5fb67bcf56a58fbf13 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_imported2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_imported2_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_imported2_e.ttcn
+// File: www_example_org_imported2.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - imported2.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/imported2_e" */
+// /* targetnamespace = "www.example.org/imported2" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_including_module_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_including_module_e.ttcn
index a84927226dd5f6311324d70a39dc58c2ba337f37..71379d00293e13f89e575891ce347dd9cec15915 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_including_module_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_including_module_e.ttcn
@@ -9,7 +9,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
//
-// File: www_example_org_including_module_e.ttcn
+// File: www_example_org_including_module.ttcn
// Description:
// References:
// Rev:
@@ -19,9 +19,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - including_module_e.xsd
+// - including_module.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/including/module/e" */
+// /* targetnamespace = "www.example.org/including/module" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_complextype_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_complextype_e.ttcn
index c5beda92b3dd1ef896d95672d49a07523798b485..b350e37efd14308955832c1bee6221ddb3c62407 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_complextype_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_complextype_e.ttcn
@@ -1,7 +1,7 @@
-/*******************************************************************************
+/******************************************************************************
* Copyright (c) 2000-2016 Ericsson Telecom AB
*
-* XSD to TTCN-3 Translator version: CRL 113 200/5 R4C
+* XSD to TTCN-3 Translator
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,11 +9,11 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
-* Szabo Bence Janos
+* Szabo, Bence Janos
*
-*******************************************************************************/
+******************************************************************************/
//
-// File: www_example_org_list_complextype_e.ttcn
+// File: www_example_org_list_complextype.ttcn
// Description:
// References:
// Rev:
@@ -23,9 +23,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - list_complextype_e.xsd
+// - list_complextype.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/list/complextype/e" */
+// /* targetnamespace = "www.example.org/list/complextype" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_simpletype_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_simpletype_e.ttcn
index 33b2d499f23fb3dd522b9ea216a57cbdf8e2bcc4..b33c42ea058ac265dba987a5c64a0278c27fba08 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_simpletype_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_simpletype_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_list_simpletype_e.ttcn
+// File: www_example_org_list_simpletype.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - list_simpletype.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/list/simpletype/e" */
+// /* targetnamespace = "www.example.org/list/simpletype" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_long_extension_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_long_extension_e.ttcn
index 97ddad9f32675f6cf7ba0e942a250e486e685987..2f34934973bfc90068b99701a2fb655f2b8e3f4e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_long_extension_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_long_extension_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_long_extension_e.ttcn
+// File: www_example_org_long_extension.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - long_extension.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/long/extension_e" */
+// /* targetnamespace = "www.example.org/long/extension" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_name_conv_http_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_name_conv_http_e.ttcn
index e38ad222b810d46b5dea4f95d3d82bfdc6822efb..9ed4576b3a181c01a20a1ed0d7394babe76bac5e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_name_conv_http_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_name_conv_http_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_name_conv_http_e.ttcn
+// File: www_example_org_name_conv_http.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - name_conv_with_z.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/name_conv/http:///e" */
+// /* targetnamespace = "www.example.org/name_conv/http://" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_namespaceas_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_namespaceas_e.ttcn
index db2d49de60adbcef8b91313bc5888cbb55047d08..dd79d52ec04249ff051f4bae3b8a01cd8d6776ed 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_namespaceas_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_namespaceas_e.ttcn
@@ -26,7 +26,7 @@
// Generated from file(s):
// - namespaceas.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/namespaceas_e" */
+// /* targetnamespace = "www.example.org/namespaceas" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_namespaceas_e {
+module www_example_org_namespaceas {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_nillable_fixed_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_nillable_fixed_e.ttcn
index 843082fd9ffe84d3b466941c64ff65bcc5067c03..9acbcdcb964fa3df9b5725ca8048aa9724b59576 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_nillable_fixed_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_nillable_fixed_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_nillable_fixed_e.ttcn
+// File: www_example_org_nillable_fixed.ttcn
// Description:
// References:
// Rev:
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_nillable_fixed_e {
+module www_example_org_nillable_fixed {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_no_ns_connector_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_no_ns_connector_e.ttcn
index 0205dd159882e50b453fc14fb27f54af8c86fa6e..bec47e1e056f77541ba5d6497ede894c7e0eb690 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_no_ns_connector_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_no_ns_connector_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_no_ns_connector_e.ttcn
+// File: www_example_org_no_ns_connector.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - no_ns_connector_e.xsd
+// - no_ns_connector.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/no/ns/connector/e" */
+// /* targetnamespace = "www.example.org/no/ns/connector" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_not_a_number_minex_inf_maxex_inf_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_not_a_number_minex_inf_maxex_inf_e.ttcn
index 30af367459ff565f68a3f1e34f7d31da9fca2ebf..d2c66c046f1f1453a9080eefde48af455d8606d4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_not_a_number_minex_inf_maxex_inf_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_not_a_number_minex_inf_maxex_inf_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_not_a_number_minex_inf_maxex_inf_e.ttcn
+// File: www_example_org_not_a_number_minex_inf_maxex_inf.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - not_a_number_minex_inf_maxex_-inf.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/not_a_number/minex_inf/maxex_-inf/e" */
+// /* targetnamespace = "www.example.org/not_a_number/minex_inf/maxex_-inf" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_only_element_substitution_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_only_element_substitution_e.ttcn
index 7e1509a6477e5df4937e5638412585ade38e2e6c..5115d5af68fb6926da289ba5607c9272f3cc687a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_only_element_substitution_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_only_element_substitution_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_only_element_substitution_e.ttcn
+// File: www_example_org_only_element_substitution.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - only_element_substitution_e.xsd
+// - only_element_substitution.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/only/element/substitution/e" */
+// /* targetnamespace = "www.example.org/only/element/substitution" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref1_e.ttcn
index 808ba6a548242d542d5708ef15f722629b5177e2..ec3b02c378dbf7345f7c2296f9072ca308b7838d 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref1_e.ttcn
@@ -1,18 +1,19 @@
-/*******************************************************************************
+/******************************************************************************
* Copyright (c) 2000-2016 Ericsson Telecom AB
*
-* XSD to TTCN-3 Translator version: CRL 113 200/5 R5B01
+* XSD to TTCN-3 Translator
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
-
+*
* Contributors:
* Szabo, Bence Janos
-*******************************************************************************/
+*
+******************************************************************************/
//
-// File: www_example_org_pref1_e.ttcn
+// File: www_example_org_pref1.ttcn
// Description:
// References:
// Rev:
@@ -22,9 +23,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - www_example_org_perf1_e.xsd
+// - www_example_org_pref1.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/pref1/e" */
+// /* targetnamespace = "www.example.org/pref1" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -36,7 +37,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_pref1_e {
+module www_example_org_pref1 {
import from XSD all;
@@ -89,7 +90,7 @@ with {
}
with {
encode "XML";
- variant "namespace as 'www.example.org/pref1/e' prefix 'ns'";
+ variant "namespace as 'www.example.org/pref1' prefix 'ns'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
variant "elementFormQualified";
}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref2_e.ttcn
index 8681260da827aa6f0d6bf8d1d7702b7bc2631160..2637977511530e329892b3508d336cdd1004b66c 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref2_e.ttcn
@@ -1,18 +1,19 @@
-/*******************************************************************************
+/******************************************************************************
* Copyright (c) 2000-2016 Ericsson Telecom AB
*
-* XSD to TTCN-3 Translator version: CRL 113 200/5 R5B01
+* XSD to TTCN-3 Translator
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
-
+*
* Contributors:
* Szabo, Bence Janos
-*******************************************************************************/
+*
+******************************************************************************/
//
-// File: www_example_org_pref2_e.ttcn
+// File: www_example_org_pref2.ttcn
// Description:
// References:
// Rev:
@@ -22,9 +23,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - www_example_org_pref2_e.xsd
+// - www_example_org_pref2.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/pref2/e" */
+// /* targetnamespace = "www.example.org/pref2" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -63,6 +64,6 @@ type record MyType
}
with {
encode "XML";
- variant "namespace as 'www.example.org/pref2/e' prefix 'ns'";
+ variant "namespace as 'www.example.org/pref2' prefix 'ns'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref3_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref3_e.ttcn
index 8deff0c691e4a1f74b5c5a60a356dc8b2d82048e..1caefcf65de48bbb58c84d65eba317cc05472ade 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref3_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_pref3_e.ttcn
@@ -1,18 +1,19 @@
-/*******************************************************************************
+/******************************************************************************
* Copyright (c) 2000-2016 Ericsson Telecom AB
*
-* XSD to TTCN-3 Translator version: CRL 113 200/5 R5B01
+* XSD to TTCN-3 Translator
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
-
+*
* Contributors:
* Szabo, Bence Janos
-*******************************************************************************/
+*
+******************************************************************************/
//
-// File: www_example_org_pref3_e.ttcn
+// File: www_example_org_pref3.ttcn
// Description:
// References:
// Rev:
@@ -22,9 +23,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - www_example_org_pref3_e.xsd
+// - www_example_org_pref3.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/pref3/e" */
+// /* targetnamespace = "www.example.org/pref3" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -57,6 +58,6 @@ type record MyType
}
with {
encode "XML";
- variant "namespace as 'www.example.org/pref3/e' prefix 'ns'";
+ variant "namespace as 'www.example.org/pref3' prefix 'ns'";
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
}
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_qualified_element_attrib_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_qualified_element_attrib_e.ttcn
index 1df582b463b49fe4c6a5263a82270b95ebb417c4..d5bd2bbefbee683e80826a4e00f0950c05b30246 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_qualified_element_attrib_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_qualified_element_attrib_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_qualified_element_attrib_e.ttcn
+// File: www_example_org_qualified_element_attrib.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - qualified_element_attrib.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/qualified/element/attrib/e" */
+// /* targetnamespace = "www.example.org/qualified/element/attrib" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_self_recursion_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_self_recursion_e.ttcn
index 08a992f7f334a1ab8e420348187149daa8872b81..fc3067b22731a5be87442ddc648721afa1d8b1f3 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_self_recursion_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_self_recursion_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_self_recursion_e.ttcn
+// File: www_example_org_self_recursion.ttcn
// Description:
// References:
// Rev:
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_self_recursion_e {
+module www_example_org_self_recursion {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_enumeration_restriction_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_enumeration_restriction_e.ttcn
index b165a7013ef346e2814d881e548de2cce4254652..8bf407a2ff11580ee8eecc2db47886abb4d7b148 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_enumeration_restriction_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_enumeration_restriction_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_seq_enumeration_restriction_e.ttcn
+// File: www_example_org_seq_enumeration_restriction.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - enumeration_restriction2.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/seq/enumeration/restriction/e" */
+// /* targetnamespace = "www.example.org/seq/enumeration/restriction" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_group_reference_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_group_reference_e.ttcn
index d77275785b3fcdd6456e99363edc208f865b3bb3..bab507e41b647e826c060080429431f0552cea78 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_group_reference_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_seq_group_reference_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_seq_group_reference_e.ttcn
+// File: www_example_org_seq_group_reference.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - seq_group_reference.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/seq/group/reference/e" */
+// /* targetnamespace = "www.example.org/seq/group/reference" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_base_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_base_e.ttcn
index ab3aa14696c6fce4ec0734e92c89916a411212eb..3ec80dd160b3d82ca8ac6c6cdb3751f1a47ee1a7 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_base_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_base_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_simpletype_base_e.ttcn
+// File: www_example_org_simpletype_base.ttcn
// Description:
// References:
// Rev:
@@ -24,7 +24,7 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - simpletype_base_e.xsd
+// - simpletype_base.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
// /* targetnamespace = "www.example.org/simpletype/base" */
////////////////////////////////////////////////////////////////////////////////
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_ref_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_ref_e.ttcn
index f6e15b062db1753403365de9281fcad8e9df6df8..9db686aae3bed326e04ead5ffdacbeb1a14fcfa2 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_ref_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_ref_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_simpletype_ref_e.ttcn
+// File: www_example_org_simpletype_ref.ttcn
// Description:
// References:
// Rev:
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_simpletype_ref_e {
+module www_example_org_simpletype_ref {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_restrict_comp_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_restrict_comp_e.ttcn
index b88e58b94a66114348520110454c78b6ed6e1df9..fb1aed48f7c0db86a92ed1bdc582680a1ce08273 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_restrict_comp_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_simpletype_restrict_comp_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_simpletype_restrict_comp_e.ttcn
+// File: www_example_org_simpletype_restrict_comp.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - simpletype_restrict_comp.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/simpletype/restrict/comp/e" */
+// /* targetnamespace = "www.example.org/simpletype/restrict/comp" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_1_e.ttcn
index f8c7194bffc4dba454b97b1fc286ac05af9bbd39..b3667d997957ae9c58e4ee1a57ae98bd56399067 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_1_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_abstract_block_1_e.ttcn
+// File: www_example_org_substitutiongroup_abstract_block_1.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_abstract_block_1_e.xsd
+// - substitutiongroup_abstract_block_1.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/abstract/block/1/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/abstract/block/1" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_2_e.ttcn
index 4161aac16d4f43eb50db9f6afe41bee276874046..1c28c28af03cd049b0a71789a88cb4dffa22522c 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_abstract_block_2_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_abstract_block_2_e.ttcn
+// File: www_example_org_substitutiongroup_abstract_block_2.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_abstract_block_2_e.xsd
+// - substitutiongroup_abstract_block_2.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/abstract/block/2/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/abstract/block/2" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complex_without_element_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complex_without_element_e.ttcn
index f7ff9fda8f0e564def58e8ed78bd9c14c6540c44..0622c2c32af2112b1545a2e870396c64e3a3b1f0 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complex_without_element_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complex_without_element_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_complex_without_element_e.ttcn
+// File: www_example_org_substitutiongroup_complex_without_element.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_complex_without_element_e.xsd
+// - substitutiongroup_complex_without_element.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/complex/without/element/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/complex/without/element" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complextype_block_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complextype_block_e.ttcn
index efba7b3878904a32a0f465d8b622e1e322ecb962..aa73e6b3f6ac4d768483772052f47969b5c9ba9e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complextype_block_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_complextype_block_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_complextype_block_e.ttcn
+// File: www_example_org_substitutiongroup_complextype_block.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_complextype_block_e.xsd
+// - substitutiongroup_complextype_block.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/complextype/block/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/complextype/block" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_e.ttcn
index 4842dcb9a78c7fcb6eacef2486b1553ca0f16c14..07818727a6882402e919d902930059540413a4bb 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_e.ttcn
+// File: www_example_org_substitutiongroup.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_e.xsd
+// - substitutiongroup.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_long_extension_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_long_extension_e.ttcn
index 342e5174a83cb77e799bf8cac9b4194c1f9d3cf4..47fc37fbdbdcb23df32b9b5315e82c52736e46f4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_long_extension_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_long_extension_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_long_extension_e.ttcn
+// File: www_example_org_substitutiongroup_long_extension.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_long_extension_e.xsd
+// - substitutiongroup_long_extension.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/long/extension/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/long/extension" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_main_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_main_e.ttcn
index 3f72390e94f0013dd7fc5dfa98dbccfb6a9d5a2f..fe226afcae8a7e7ae5336c6a2906a8ef6ff52129 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_main_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_main_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_main_e.ttcn
+// File: www_example_org_substitutiongroup_main.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_main_e.xsd
+// - substitutiongroup_main.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/substitutiongroup/main/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/main" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_name_as_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_name_as_e.ttcn
index 4465bf84425782f202d252969cf7d38f0fd9633a..884372b770355153bd101d598ee25f9ff17d5e7a 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_name_as_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_name_as_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_name_as_e.ttcn
+// File: www_example_org_substitutiongroup_name_as.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_name_as_e.xsd
+// - substitutiongroup_name_as.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/name/as/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/name/as" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_ref_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_ref_e.ttcn
index e474c00c9771a3fb7843c001eb1dcb9c03ab5966..f2a55c4b8745e3b8bf104321ed68b36049d4c665 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_ref_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_ref_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_ref_e.ttcn
+// File: www_example_org_substitutiongroup_ref.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_ref_e.xsd
+// - substitutiongroup_ref.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/substitutiongroup/ref/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/ref" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_rename_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_rename_e.ttcn
index 4926c4dc3a8b59d05a2b6bd355ea2eb5fd58202c..d01fe4d7281fe122c5345541db39a6c14549fbd4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_rename_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_substitutiongroup_rename_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_substitutiongroup_rename_e.ttcn
+// File: www_example_org_substitutiongroup_rename.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - substitutiongroup_rename_e.xsd
+// - substitutiongroup_rename.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/substitutiongroup/rename/e" */
+// /* targetnamespace = "www.example.org/substitutiongroup/rename" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_attributegroup_nillable_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_attributegroup_nillable_e.ttcn
index 65762829fc09bd170bfd30a918e5ca740bc9d7bb..fc000c7e72ec77ed0760b623506ce4abf9ac82a5 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_attributegroup_nillable_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_attributegroup_nillable_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_attributegroup_nillable_e.ttcn
+// File: www_example_org_type_attributegroup_nillable.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - attributegroup_nillable.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/attributegroup/nillable/e" */
+// /* targetnamespace = "www.example.org/type/attributegroup/nillable" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_conversion_follow_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_conversion_follow_e.ttcn
index a3cd770fa003e513c33be35841cc89cec2326299..c860d9af0023acb10b61e7448bb9012568bbde2f 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_conversion_follow_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_conversion_follow_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_conversion_follow_e.ttcn
+// File: www_example_org_type_conversion_follow.ttcn
// Description:
// References:
// Rev:
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_type_conversion_follow_e {
+module www_example_org_type_conversion_follow {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_subs_with_elem_subs_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_subs_with_elem_subs_e.ttcn
index 899edf06842880ccb65fb424b8e65cdea0549e66..0554309a55112aa9da8d4cbae934945d62124136 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_subs_with_elem_subs_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_subs_with_elem_subs_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_subs_with_elem_subs_e.ttcn
+// File: www_example_org_type_subs_with_elem_subs.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_subs_with_elem_subs_e.xsd
+// - type_subs_with_elem_subs.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/type/subs/with/elem/subs/e" */
+// /* targetnamespace = "www.example.org/type/subs/with/elem/subs" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_abstract_block_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_abstract_block_e.ttcn
index 4605d0285295408f0e9b05974abafd3af0ecfba7..96424d20f02a6f1e5b369ad83d8ba91affa20587 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_abstract_block_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_abstract_block_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_abstract_block_e.ttcn
+// File: www_example_org_type_substitution_abstract_block.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_abstract_block_e.xsd
+// - type_substitution_abstract_block.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/abstract/block/e" */
+// /* targetnamespace = "www.example.org/type/substitution/abstract/block" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_builtintype_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_builtintype_e.ttcn
index 234a13bf823089cc4359df3b79123044e27a9fbd..e1540a04183e050a41cc42ad7dea819a2220ef89 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_builtintype_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_builtintype_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_builtintype_e.ttcn
+// File: www_example_org_type_substitution_builtintype.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_builtintype_e.xsd
+// - type_substitution_builtintype.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/type/substitution/builtintype/e" */
+// /* targetnamespace = "www.example.org/type/substitution/builtintype" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_chain_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_chain_e.ttcn
index a0ef5c968051e38a9af90e28f2bb881d4e37b36c..056be10e42a7a130b5fb80881ec8c8d4f7dfd730 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_chain_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_chain_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_chain_e.ttcn
+// File: www_example_org_type_substitution_chain.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_chain_e.xsd
+// - type_substitution_chain.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/chain/e" */
+// /* targetnamespace = "www.example.org/type/substitution/chain" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_complex_cascade_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_complex_cascade_e.ttcn
index ce23541a394ad466879d08702c34638b53b14e9c..106cbdff9c83668c14b2568d169a7414c40118e4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_complex_cascade_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_complex_cascade_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_complex_cascade_e.ttcn
+// File: www_example_org_type_substitution_complex_cascade.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_complex_cascade_e.xsd
+// - type_substitution_complex_cascade.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/complex/cascade/e" */
+// /* targetnamespace = "www.example.org/type/substitution/complex/cascade" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_e.ttcn
index f4f44d9d9cc17825248f322a441697f26b51a2cb..1a22e3157251b63dc2d9e5fbb072dcdeec53cb1e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_e.ttcn
+// File: www_example_org_type_substitution.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_e.xsd
+// - type_substitution.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/e" */
+// /* targetnamespace = "www.example.org/type/substitution" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod1_e.ttcn
index 8741e41364652b6280e7bd73fbbac86c424f986f..e6742e1c7bbb16ba7782c38f2a05c75e20f90a07 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod1_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_elem_in_ct_mod1_e.ttcn
+// File: www_example_org_type_substitution_elem_in_ct_mod1.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_elem_in_ct_mod1_e.xsd
+// - type_substitution_elem_in_ct_mod1.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/elem/in/ct/mod1/e" */
+// /* targetnamespace = "www.example.org/type/substitution/elem/in/ct/mod1" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod2_e.ttcn
index 4a0cbe72f2426479f89da46269c825ad05f13297..29413b061093f5c620df93dcc571473f87753e58 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_elem_in_ct_mod2_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_elem_in_ct_mod2_e.ttcn
+// File: www_example_org_type_substitution_elem_in_ct_mod2.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_elem_in_ct_mod2_e.xsd
+// - type_substitution_elem_in_ct_mod2.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/elem/in/ct/mod2/e" */
+// /* targetnamespace = "www.example.org/type/substitution/elem/in/ct/mod2" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod1_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod1_e.ttcn
index b27d6b02233c5404e2883e6cb11f79e1d172448b..24e28e90f87334e89787107025da0e42c50b16e2 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod1_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod1_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_mod1_e.ttcn
+// File: www_example_org_type_substitution_mod1.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_mod1_e.xsd
+// - type_substitution_mod1.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/mod1/e" */
+// /* targetnamespace = "www.example.org/type/substitution/mod1" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod2_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod2_e.ttcn
index a7b6c2f666481a96c31f959f702b4220e2a464c8..9208f1eda9d76b79e592eabb908109441913c391 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod2_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_mod2_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_mod2_e.ttcn
+// File: www_example_org_type_substitution_mod2.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_mod2_e.xsd
+// - type_substitution_mod2.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/type/substitution/mod2/e" */
+// /* targetnamespace = "www.example.org/type/substitution/mod2" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_rename_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_rename_e.ttcn
index bc670dbceb1a9cb6b9190a28bb940ea3362678c5..e014c568cd85b545eb4a8ec9a98df643f60c9ec3 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_rename_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_rename_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_rename_e.ttcn
+// File: www_example_org_type_substitution_rename.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_rename_e.xsd
+// - type_substitution_rename.xsd
// /* xml version = "1.0" */
-// /* targetnamespace = "www.example.org/type/substitution/rename/e" */
+// /* targetnamespace = "www.example.org/type/substitution/rename" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simple_cascade_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simple_cascade_e.ttcn
index 6c333e77f9157912e5d49a6a3c2b71f296ebb9bc..f5539a6064d2b441a2bacae0b5b99ee86886c486 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simple_cascade_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simple_cascade_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_simple_cascade_e.ttcn
+// File: www_example_org_type_substitution_simple_cascade.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_simple_cascade_e.xsd
+// - type_substitution_simple_cascade.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/simple/cascade/e" */
+// /* targetnamespace = "www.example.org/type/substitution/simple/cascade" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simpletype_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simpletype_e.ttcn
index 0663617fb45f707023254e4b681d082c09afe24b..1c82380a63509ce5146eba99a086027c85b01ead 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simpletype_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_type_substitution_simpletype_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_type_substitution_simpletype_e.ttcn
+// File: www_example_org_type_substitution_simpletype.ttcn
// Description:
// References:
// Rev:
@@ -24,9 +24,9 @@
//
////////////////////////////////////////////////////////////////////////////////
// Generated from file(s):
-// - type_substitution_simpletype_e.xsd
+// - type_substitution_simpletype.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/type/substitution/simpletype/e" */
+// /* targetnamespace = "www.example.org/type/substitution/simpletype" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_unqualified_element_attrib_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_unqualified_element_attrib_e.ttcn
index 8eca69bfee0476bc12ddbfd34e69cd80924aa5e2..cfc25d55bfeb6de7d3f2f03d70b59af7bc077eb0 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_unqualified_element_attrib_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_unqualified_element_attrib_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_unqualified_element_attrib_e.ttcn
+// File: www_example_org_unqualified_element_attrib.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - unqualified_element_attrib.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/unqualified/element/attrib/e" */
+// /* targetnamespace = "www.example.org/unqualified/element/attrib" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_xml_in_annotation_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_xml_in_annotation_e.ttcn
index 39a8eec5a0a2d1d2792b5be8c54dd89056d3847b..29c808659bd4c53269995d762878736199b1d625 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_xml_in_annotation_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_xml_in_annotation_e.ttcn
@@ -14,7 +14,7 @@
*
******************************************************************************/
//
-// File: www_example_org_xml_in_annotation_e.ttcn
+// File: www_example_org_xml_in_annotation.ttcn
// Description:
// References:
// Rev:
@@ -26,7 +26,7 @@
// Generated from file(s):
// - xml_in_annotation.xsd
// /* xml version = "1.0" encoding = "UTF-8" */
-// /* targetnamespace = "www.example.org/xml/in/annotation/e" */
+// /* targetnamespace = "www.example.org/xml/in/annotation" */
////////////////////////////////////////////////////////////////////////////////
// Modification header(s):
//-----------------------------------------------------------------------------
@@ -38,7 +38,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_example_org_xml_in_annotation_e {
+module www_example_org_xml_in_annotation {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_PIDF_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_PIDF_e.ttcn
index bed279597e9a99b9044e42b50c63425f3cc3a1c7..76e3cb37e15d706fabe75c4d670a0efad591d23e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_PIDF_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_PIDF_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_w3_org_XML_1998_namespace_PIDF_e.ttcn
+// File: www_w3_org_XML_1998_namespace_PIDF.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_w3_org_XML_1998_namespace_PIDF_e {
+module www_w3_org_XML_1998_namespace_PIDF {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_e.ttcn
index 1f77c69ed3ff5877dd926ddfd557ea0c1fcdd602..77e906e31042f3d65f4cb0e8d9f4043fd04f8d62 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_w3_org_XML_1998_namespace_e.ttcn
@@ -16,7 +16,7 @@
*
******************************************************************************/
//
-// File: www_w3_org_XML_1998_namespace_e.ttcn
+// File: www_w3_org_XML_1998_namespace.ttcn
// Description:
// References:
// Rev:
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////
-module www_w3_org_XML_1998_namespace_e {
+module www_w3_org_XML_1998_namespace {
import from XSD all;
diff --git a/regression_test/XML/XmlWorkflow/src/external.cc b/regression_test/XML/XmlWorkflow/src/external.cc
new file mode 100644
index 0000000000000000000000000000000000000000..29dcb395fda704b563811589945f66c5e80f47e1
--- /dev/null
+++ b/regression_test/XML/XmlWorkflow/src/external.cc
@@ -0,0 +1,34 @@
+/******************************************************************************
+ * Copyright (c) 2000-2016 Ericsson Telecom AB
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Szabo, Bence Janos
+ *
+ ******************************************************************************/
+#include <TTCN3.hh>
+#include <ctype.h>
+
+namespace xmlTest__Shell {
+
+// Count the lines which starts with a number
+INTEGER f__countDiffs(const CHARSTRING& diffoutput) {
+ INTEGER result = 0;
+ const char* c_diffoutput = (const char*)diffoutput;
+ if (isdigit(*c_diffoutput)) {
+ result = result + 1;
+ }
+ const char* pos = strchr(c_diffoutput, '\n');
+ while (pos != NULL) {
+ if ((pos + 1) != NULL && isdigit(*(pos + 1))) {
+ result = result + 1;
+ }
+ pos = strchr(pos + 1, '\n');
+ }
+ return result;
+}
+
+}
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest.prj b/regression_test/XML/XmlWorkflow/src/xmlTest.prj
index 56e1f649dff9aa1ec8fb40864a64deb88fa922c1..43684fcef17f00652a28896dc1f69ef5b06f1e71 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest.prj
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest.prj
@@ -311,6 +311,7 @@
<File path="../XmlTest_expectedTtcns/XmlTest_imsike_e.ttcn" />
<File path="../XmlTest_expectedTtcns/www_XmlTest_org_element_nameInheritance_e.ttcn" />
<File path="../XmlTest_expectedTtcns/www_XmlTest_org_annotation_e.ttcn" />
+ <File path="../XmlTest_expectedTtcns/www_XmlTest_org_annotation2_e.ttcn" />
<File path="../XmlTest_expectedTtcns/www_XmlTest_org_annotation_c_e.ttcn" />
<File path="../XmlTest_expectedTtcns/www_XmlTest_org_annotation_e_e.ttcn" />
<File path="../XmlTest_expectedTtcns/www_XmlTest_org_annotation_t_e.ttcn" />
@@ -420,6 +421,7 @@
<File path="xmlTest_Functions_element.ttcn" />
<File path="xmlTest_Functions_complex.ttcn" />
<File path="xmlTest_Functions_list.ttcn" />
+ <File path="external.cc" />
</File_Group>
<File_Group name="XmlTest_asn1s" />
<File_Group name="Tgc_temporary" >
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex.ttcn
index ea6371a6d8561f4b671dfee7d151034a60fd27d8..d59757791d40f6cc627da5d3cb2bf13b06e43928 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex.ttcn
@@ -15,15 +15,15 @@
module xmlTest_Functions_complex
{
-import from www_XmlTest_org_complex_simpleContent_e all;
-import from www_XmlTest_org_complex_mixed_e all;
-import from www_XmlTest_org_complex_choice_e all;
-import from www_XmlTest_org_complex_all_e all;
-import from www_XmlTest_org_complex_extension_e all;
-import from www_XmlTest_org_complex_restriction_e all;
-import from www_XmlTest_org_complex_include_e all;
-import from www_XmlTest_org_complex_import_e all;
-import from www_XmlTest_org_complex_any_e all;
+import from www_XmlTest_org_complex_simpleContent all;
+import from www_XmlTest_org_complex_mixed all;
+import from www_XmlTest_org_complex_choice all;
+import from www_XmlTest_org_complex_all all;
+import from www_XmlTest_org_complex_extension all;
+import from www_XmlTest_org_complex_restriction all;
+import from www_XmlTest_org_complex_include all;
+import from www_XmlTest_org_complex_import all;
+import from www_XmlTest_org_complex_any all;
//==============================================================================
// External functions
//==============================================================================
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex1.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex1.ttcn
index 40f9df521cb3e5ba7a4d0c9ca85d4a6e23259f0a..34e2805f4a82bcc67bd27bf6fd2b0182ee5f7c09 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex1.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex1.ttcn
@@ -14,7 +14,7 @@
module xmlTest_Functions_complex1
{
-import from www_XmlTest_org_complex1_e all;
+import from www_XmlTest_org_complex1 all;
external function f_enc_InternationalPrice(in InternationalPrice pdu, out octetstring stream)
with { extension "prototype(fast) encode(XER:XER_EXTENDED)" }
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex2.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex2.ttcn
index 413514e8cf7603758a2a8857e7f3e5582482fff2..d8a6730f51f643564e8d0ec447ef04cf35ad8086 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex2.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_complex2.ttcn
@@ -14,7 +14,7 @@
module xmlTest_Functions_complex2
{
-import from www_XmlTest_org_complex2_e all;
+import from www_XmlTest_org_complex2 all;
external function f_enc_InternationalPrice2(in InternationalPrice2 pdu, out octetstring stream)
with { extension "prototype(fast) encode(XER:XER_EXTENDED)" }
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_element.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_element.ttcn
index 04a84fa9e91563e1a362e6c35870b064740a7d1a..698320ce61aa0d62e77d3a1f767c3f6b0fd46a5d 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_element.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_element.ttcn
@@ -14,16 +14,16 @@
******************************************************************************/
module xmlTest_Functions_element
{
-import from www_XmlTest_org_element_anyType_e all;
-import from www_XmlTest_org_element_recordOfElements_e all;
-import from www_XmlTest_org_element_recordOfElements3_e all;
-import from www_XmlTest_org_element_recordOfElements4_e all;
-import from www_XmlTest_org_element_recordOfElements5_e all;
-import from www_XmlTest_org_element_nameInheritance_e all;
+import from www_XmlTest_org_element_anyType all;
+import from www_XmlTest_org_element_recordOfElements all;
+import from www_XmlTest_org_element_recordOfElements3 all;
+import from www_XmlTest_org_element_recordOfElements4 all;
+import from www_XmlTest_org_element_recordOfElements5 all;
+import from www_XmlTest_org_element_nameInheritance all;
import from www_ericsson_com_is_isco_Tgc_R6A48_R6H01 all;
import from www_example_org_substitutiongroup all;
import from www_example_org_type_substitution all;
-import from XmlTest_imsike_e all;
+import from XmlTest_imsike all;
import from xmlTest_Shell all;
//==============================================================================
// External functions
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_list.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_list.ttcn
index daa7ee6f76f46eb7e159ead77728fc7406782e35..4d12034d61c0139d8623e22719de758743d516e8 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_list.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_list.ttcn
@@ -14,7 +14,7 @@
module xmlTest_Functions_list
{
-import from www_XmlTest_org_list_e all;
+import from www_XmlTest_org_list all;
//==============================================================================
// External functions
//==============================================================================
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_string.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_string.ttcn
index 92a352678951724af45cbb828ae35a80b7674cee..545783be2efd6940cb2d70b1ad6b64b43d246597 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_string.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Functions_string.ttcn
@@ -14,9 +14,9 @@
module xmlTest_Functions_string
{
-import from www_XmlTest_org_string_e all;
-import from www_XmlTest_org_string_withEnum_e all;
-import from www_XmlTest_org_string_withWhitespace_e all;
+import from www_XmlTest_org_string all;
+import from www_XmlTest_org_string_withEnum all;
+import from www_XmlTest_org_string_withWhitespace all;
import from xmlTest_Shell all;
//==============================================================================
// External functions
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Shell.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Shell.ttcn
index c6bf0d9b08684e5423b831311b6f2d2483c475ca..cc91aeb47d43a75cbb371b3324d2b9e5526f99b8 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Shell.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Shell.ttcn
@@ -99,7 +99,8 @@ type component mtc_CT {}
// -p switch needed because it would overwrite the predefined XSD.ttcn and
// UsefulTtcn3types.ttcn file with each xsd2ttcn execution
-const charstring xsd2ttcn_command := "xsd2ttcn -p ";
+// -t switch needed to not generate timing information
+const charstring xsd2ttcn_command := "xsd2ttcn -p -t ";
const integer c_shell_successWithoutWarningAndError:=0;
const integer c_shell_success := 0;
@@ -108,57 +109,36 @@ const integer c_shell_error:=256;
const integer c_shell_error_noSuchFileOrDirectory:=512;
//Expected and accepted diffs:
-// Line "Copyright Ericsson AB 2013" - 4 diffs
-// Line "XSD to TTCN-3 Translator version:" - 4 diffs
-// Line "File" - 4 diffs
-// Line "Updated: " - 4 diffs
-// Line "module www_" - 4 diffs
-// Line "ETSI ES 201 873-9 V4.1.2" - 2 diffs ???? << Fix it !
-// Line "variant \"namespace as" - 4 diffs
-// Script counts the strings "\n" thus N different lines mean N-1 numOfDiff
-//Possible values:12+ 8+ 19,21,23,25 but 21 and 25 should be eliminated!
-
-const integer c_numOfDiff_header := 21+12;
-const integer c_numOfDiff_headerAndModuleName := 27+12;
-const integer c_numOfDiff_headerModNameAndNamespace := 31+12;
-const integer c_numOfDiff_headerModNameAndImport := 31+12;
+// Line "Copyright (c) 2000-2016" - 1 diff
+// Lines "Contributors: ... " - 1 diff
+// Line "Updated: " - 1 diff
+// Optional diff: Module name - 1 diff
-//=========================================================================
-// Templates
-//=========================================================================
+// In most cases this 3 diff will be present, but in some rare cases there
+// will be 4.
-// Insert templates here if applicable!
-// You can use the template skeleton!
+const integer c_numOfDiff := 3;
+const integer c_numOfDiff_ModName := 4;
-//=========================================================================
-// Altsteps
-//=========================================================================
+// When creating new testcases: Change the copyright header of the expected
+// ttcn just like in the other expected ttcns and write your name into a
+// contributors section just like in the other expected ttcns. In normal
+// case theese changes are required.
-// Insert altsteps here if applicable!
-// You can use the altstep skeleton!
-
-//=========================================================================
-// Functions
-//=========================================================================
//=========================================================================
-// f_countDelimiters
+// f_countDiffs
//=========================================================================
-function f_countDelimiters(in charstring pl_string, in charstring pl_delimiter, inout integer pl_counter) {
- pl_counter:=0;
- var integer pos:=0;
- var integer vl_size:=lengthof(pl_string);
- var integer vl_delimsize:=lengthof(pl_delimiter);
- while(pos<vl_size) {
- if( substr(pl_string,pos,vl_delimsize)==pl_delimiter) { pl_counter:=pl_counter+1}
- pos:=pos+1;
- }
-}//f_
+// Each difference starts with a newline and a number. This function
+// counts these.
+external function f_countDiffs(charstring diffoutput) return integer;
//=========================================================================
// f_compareFiles
//=========================================================================
-//pl_diffLimit: upper limit of acceptable diff lines. 4 means one acceptable difference
+// File comparison works with the following logic:
+// Command to execute: diff -w file1 file2
+// The result is passed to the f_countDiffs which counts the differences
function f_compareFiles(in charstring pl_file1, in charstring pl_file2, in integer pl_diffLimit) runs on xmlTest_CT {
var integer vl_expectedResult:=0
if(pl_diffLimit>0) { vl_expectedResult:=256; }
@@ -171,9 +151,9 @@ function f_compareFiles(in charstring pl_file1, in charstring pl_file2, in integ
}
else if(v_ASP_PResult.code==256) {
var integer vl_counter:=0;
- f_countDelimiters(v_ASP_PResult.stdout,"\n",vl_counter);
- log("Counted lines: ",vl_counter, " diffLimit: ", pl_diffLimit)
- if(vl_counter>pl_diffLimit) {
+ vl_counter := f_countDiffs(v_ASP_PResult.stdout);
+ log("Counted differences: ",vl_counter, " Expected differences: ", pl_diffLimit)
+ if(vl_counter!=pl_diffLimit) {
setverdict(fail);
}
} else { //e.g 512: No such file or directory
@@ -182,6 +162,23 @@ function f_compareFiles(in charstring pl_file1, in charstring pl_file2, in integ
}
}//f_
+//=========================================================================
+// Templates
+//=========================================================================
+
+// Insert templates here if applicable!
+// You can use the template skeleton!
+
+//=========================================================================
+// Altsteps
+//=========================================================================
+
+// Insert altsteps here if applicable!
+// You can use the altstep skeleton!
+
+//=========================================================================
+// Functions
+//=========================================================================
//********* SHELL Functions ***********************
diff --git a/regression_test/XML/XmlWorkflow/src/xmlTest_Testcases.ttcn b/regression_test/XML/XmlWorkflow/src/xmlTest_Testcases.ttcn
index eb5ac49310fcc394af9b3bd7368787c841c7dc4e..5e58d36723131fb8a7269dbb3a52d5ccfef46407 100644
--- a/regression_test/XML/XmlWorkflow/src/xmlTest_Testcases.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/xmlTest_Testcases.ttcn
@@ -35,12 +35,12 @@ import from PIPEasp_PortType all;
import from PIPEasp_Templates all;
import from xmlTest_Shell all;
-import from www_XmlTest_org_element_anyType_e all;
-import from www_XmlTest_org_complex_all_e all;
-import from www_XmlTest_org_complex_extension_e all;
-import from www_XmlTest_org_complex_restriction_e all;
-import from www_XmlTest_org_complex_import_e all;
-import from www_XmlTest_org_complex_any_e all;
+import from www_XmlTest_org_element_anyType all;
+import from www_XmlTest_org_complex_all all;
+import from www_XmlTest_org_complex_extension all;
+import from www_XmlTest_org_complex_restriction all;
+import from www_XmlTest_org_complex_import all;
+import from www_XmlTest_org_complex_any all;
import from xmlTest_Functions_string all;
import from xmlTest_Functions_complex1 all;
@@ -82,8 +82,6 @@ import from xmlTest_Functions_list all;
//Component Types
//=========================================================================
-type component xmlTest_CT extends Shell_CT {}
-
type component mtc_CT {}
//=========================================================================
// Constants
@@ -107,48 +105,6 @@ type component mtc_CT {}
// Functions
//=========================================================================
-//=========================================================================
-// f_countDelimiters
-//=========================================================================
-function f_countDelimiters(in charstring pl_string, in charstring pl_delimiter, inout integer pl_counter) {
- pl_counter:=0;
- var integer pos:=0;
- var integer vl_size:=lengthof(pl_string);
- var integer vl_delimsize:=lengthof(pl_delimiter);
- while(pos<vl_size) {
- if( substr(pl_string,pos,vl_delimsize)==pl_delimiter) { pl_counter:=pl_counter+1}
- pos:=pos+1;
- }
-}//f_
-
-//=========================================================================
-// f_compareFiles
-//=========================================================================
-//pl_diffLimit: upper limit of acceptable diff lines. 4 means one acceptable difference
-function f_compareFiles(in charstring pl_file1, in charstring pl_file2, in integer pl_diffLimit) runs on xmlTest_CT {
- var integer vl_expectedResult:=0
- if(pl_diffLimit>0) { vl_expectedResult:=256; }
- var boolean vl_success:=false;
- f_shell_command("diff -w " & pl_file1 & " " & pl_file2,"",vl_expectedResult,vl_success);
-
- if(v_ASP_PResult.code==0)
- {
- setverdict(pass);
- }
- else if(v_ASP_PResult.code==256) {
- var integer vl_counter:=0;
- f_countDelimiters(v_ASP_PResult.stdout,"\n",vl_counter);
- log("Counted lines: ",vl_counter, " diffLimit: ", pl_diffLimit)
- if(vl_counter>pl_diffLimit) {
- setverdict(fail);
- }
- } else { //e.g 512: No such file or directory
- log("Wrong result code: ",v_ASP_PResult.code, " Expected result code: ", vl_expectedResult)
- setverdict(fail);
- }
-}//f_
-
-
//=========================================================================
// Testcases
//=========================================================================
@@ -169,7 +125,7 @@ testcase tc_firstTrial() runs on xmlTest_CT
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_elements_e.ttcn","www_example_org_elements.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_elements_e.ttcn","www_example_org_elements.ttcn", c_numOfDiff);
}
}
@@ -181,7 +137,7 @@ testcase tc_secondTrial() runs on xmlTest_CT
if(getverdict==pass) {
f_compareFiles(
- "http_www_XmlTest_org_po_e.ttcn","http_www_XmlTest_org_po.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_XmlTest_org_po_e.ttcn","http_www_XmlTest_org_po.ttcn", c_numOfDiff);
}
}
testcase tc_empty() runs on xmlTest_CT
@@ -190,7 +146,7 @@ testcase tc_empty() runs on xmlTest_CT
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_empty_e.ttcn","www_XmlTest_org_empty.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_empty_e.ttcn","www_XmlTest_org_empty.ttcn", c_numOfDiff);
}
}
@@ -199,7 +155,7 @@ testcase tc_annotation() runs on xmlTest_CT
f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_annotation.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_annotation_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_annotation_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff);
}
}
@@ -220,7 +176,7 @@ testcase tc_xml_in_annotation() runs on xmlTest_CT
f_shellCommandWithVerdict(xsd2ttcn_command & " xml_in_annotation.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_xml_in_annotation_e.ttcn","www_example_org_xml_in_annotation.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_xml_in_annotation_e.ttcn","www_example_org_xml_in_annotation.ttcn", c_numOfDiff);
}
}
@@ -253,7 +209,7 @@ testcase tc_options_c() runs on xmlTest_CT
{
f_shellCommandWithVerdict(xsd2ttcn_command & " -c XmlTest_annotation.xsd","",c_shell_successWithWarning );
if(getverdict==pass) {
- f_compareFiles("www_XmlTest_org_annotation_c_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ f_compareFiles("www_XmlTest_org_annotation_c_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_ModName);
}
}
@@ -262,7 +218,7 @@ testcase tc_options_e() runs on xmlTest_CT
{
f_shellCommandWithVerdict(xsd2ttcn_command & " -e XmlTest_annotation.xsd","",c_shell_successWithWarning );
if(getverdict==pass) {
- f_compareFiles("www_XmlTest_org_annotation_e_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ f_compareFiles("www_XmlTest_org_annotation_e_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_ModName);
}
}
@@ -271,7 +227,7 @@ testcase tc_options_f() runs on xmlTest_CT
{
f_shellCommandWithVerdict(xsd2ttcn_command & " -f XmlTest_files1.txt","",c_shell_successWithWarning );
if(getverdict==pass) {
- f_compareFiles("www_XmlTest_org_annotation_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ f_compareFiles("www_XmlTest_org_annotation2_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_ModName);
}
}
@@ -280,13 +236,13 @@ testcase tc_options_g() runs on xmlTest_CT
f_shellCommandWithVerdict(xsd2ttcn_command & " -g dont_generate_element_substitution.xsd","",c_shell_successWithoutWarningAndError );
if(getverdict==pass) {
f_compareFiles("www_example_org_dont_generate_element_substitution_e.ttcn",
- "www_example_org_dont_generate_element_substitution.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_dont_generate_element_substitution.ttcn", c_numOfDiff);
}
f_shellCommandWithVerdict(xsd2ttcn_command & " generate_element_substitution.xsd","",c_shell_successWithoutWarningAndError );
if(getverdict==pass) {
f_compareFiles("www_example_org_generate_element_substitution_e.ttcn",
- "www_example_org_generate_element_substitution.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_generate_element_substitution.ttcn", c_numOfDiff);
}
}
@@ -336,7 +292,7 @@ testcase tc_options_t() runs on xmlTest_CT
{
f_shellCommandWithVerdict(xsd2ttcn_command & " -t XmlTest_annotation.xsd","",c_shell_successWithWarning );
if(getverdict==pass) {
- f_compareFiles("www_XmlTest_org_annotation_t_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_headerAndModuleName);
+ f_compareFiles("www_XmlTest_org_annotation_t_e.ttcn","www_XmlTest_org_annotation.ttcn", c_numOfDiff_ModName);
}
}
@@ -399,7 +355,7 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " all.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_all_e.ttcn","www_example_org_all.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_all_e.ttcn","www_example_org_all.ttcn", c_numOfDiff);
}
}
@@ -415,7 +371,7 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
- "http_www_example_org_ttcn_wildcards_e.ttcn","http_www_example_org_ttcn_wildcards.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_ttcn_wildcards_e.ttcn","http_www_example_org_ttcn_wildcards.ttcn", c_numOfDiff);
}
}
@@ -427,7 +383,7 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " HQ73011.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "urn_ietf_params_xml_ns_conference_info_e.ttcn","urn_ietf_params_xml_ns_conference_info.ttcn", c_numOfDiff_headerAndModuleName);
+ "urn_ietf_params_xml_ns_conference_info_e.ttcn","urn_ietf_params_xml_ns_conference_info.ttcn", c_numOfDiff);
}
}
@@ -436,7 +392,7 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " anyattribute_optional.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "http_www_example_org_wildcards_e.ttcn","http_www_example_org_wildcards.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_wildcards_e.ttcn","http_www_example_org_wildcards.ttcn", c_numOfDiff);
}
}
@@ -445,7 +401,7 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " anyattrib_single.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_anyattrib_single_e.ttcn","www_example_org_anyattrib_single.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_anyattrib_single_e.ttcn","www_example_org_anyattrib_single.ttcn", c_numOfDiff);
}
}
@@ -454,7 +410,7 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " anyattr_in_complex.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_anyattr_in_complex_e.ttcn","www_example_org_anyattr_in_complex.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_anyattr_in_complex_e.ttcn","www_example_org_anyattr_in_complex.ttcn", c_numOfDiff);
}
}
@@ -466,7 +422,7 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_attributegroup_e.ttcn","www_example_org_attributegroup.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_attributegroup_e.ttcn","www_example_org_attributegroup.ttcn", c_numOfDiff);
}
}
@@ -481,7 +437,7 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " id_attrib.xsd","",c_shell_successWithWarning);
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_id_attrib_e.ttcn", "www_example_org_id_attrib.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_id_attrib_e.ttcn", "www_example_org_id_attrib.ttcn", c_numOfDiff);
}
}
@@ -490,12 +446,12 @@ group Testcases_basedOnTtcnStandard9 {
f_shellCommandWithVerdict(xsd2ttcn_command & " attrib_order_a.xsd attrib_order_b.xsd attrib_order_c.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_attrib_order_a_e.ttcn", "www_example_org_attrib_order_a.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_attrib_order_a_e.ttcn", "www_example_org_attrib_order_a.ttcn", c_numOfDiff+1); // +1: imported module
}
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_attrib_order_b_e.ttcn", "www_example_org_attrib_order_b.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_attrib_order_b_e.ttcn", "www_example_org_attrib_order_b.ttcn", c_numOfDiff);
}
}
@@ -505,7 +461,7 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
"http_www_example_org_name_conv2_e.ttcn",
- "http_www_example_org_name_conv2.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_name_conv2.ttcn", c_numOfDiff);
}
}
@@ -514,12 +470,12 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
- "imported_module_e.ttcn","imported_module.ttcn", c_numOfDiff_headerAndModuleName);
+ "imported_module_e.ttcn","imported_module.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
- "imported_module_1_e.ttcn","imported_module_1.ttcn", c_numOfDiff_headerAndModuleName);
+ "imported_module_1_e.ttcn","imported_module_1.ttcn", c_numOfDiff);
}
}//tc_
@@ -528,12 +484,12 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
- "module_typename_conversion_e.ttcn","module_typename_conversion.ttcn", c_numOfDiff_headerAndModuleName);
+ "module_typename_conversion_e.ttcn","module_typename_conversion.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
- "MyTypes_e.ttcn","MyTypes.ttcn", c_numOfDiff_headerAndModuleName);
+ "MyTypes_e.ttcn","MyTypes.ttcn", c_numOfDiff);
}
}//tc_
@@ -544,7 +500,7 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
"http_www_example_org_name_conv3_e.ttcn",
- "http_www_example_org_name_conv3.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_name_conv3.ttcn", c_numOfDiff);
}
}
@@ -554,7 +510,7 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_name_conv_http_e.ttcn",
- "www_example_org_name_conv_http.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_name_conv_http.ttcn", c_numOfDiff);
}
}
@@ -564,7 +520,7 @@ group Testcases_basedOnTtcnStandard9 {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_comment_placement_e.ttcn",
- "www_example_org_comment_placement.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_comment_placement.ttcn", c_numOfDiff);
}
}
@@ -587,7 +543,7 @@ group StringTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string.ttcn",
- "www_XmlTest_org_string_e.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_string_e.ttcn", c_numOfDiff);
}
////////////////////////////////////////////
//
@@ -606,7 +562,7 @@ group StringTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string_withWhitespace.ttcn",
- "www_XmlTest_org_string_withWhitespace_e.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_string_withWhitespace_e.ttcn", c_numOfDiff);
}
f_encDecTest_StringWhiteSpaceP();
f_encDecTest_StringWhiteSpaceR();
@@ -620,7 +576,7 @@ group StringTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string_withEnum.ttcn",
- "www_XmlTest_org_string_withEnum_e.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_string_withEnum_e.ttcn", c_numOfDiff);
}
f_encDecTest_StringEnum();
}
@@ -640,7 +596,7 @@ group StringTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string_withPosLength.ttcn",
- "www_XmlTest_org_string_withPosLength_e.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_string_withPosLength_e.ttcn", c_numOfDiff);
}
}
@@ -667,7 +623,7 @@ group StringTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_fixed_value.ttcn",
- "www_example_org_fixed_value_e.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_fixed_value_e.ttcn", c_numOfDiff);
}
}
@@ -685,7 +641,7 @@ group StringTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_string_withMinLength.ttcn",
- "www_XmlTest_org_string_withMinLength_e.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_string_withMinLength_e.ttcn", c_numOfDiff);
}
}
@@ -708,7 +664,7 @@ group StringTest {
f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_string_withPosMax.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_string_withPosMax_e.ttcn","www_XmlTest_org_string_withPosMax.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_string_withPosMax_e.ttcn","www_XmlTest_org_string_withPosMax.ttcn", c_numOfDiff);
}
}
@@ -745,7 +701,7 @@ group StringTest {
// f_shellCommandWithVerdict(xsd2ttcn_command & " regex_square_brackets.xsd","",c_shell_successWithoutWarningAndError);
// if(getverdict==pass) {
// f_compareFiles(
- // "www_example_org_regex_square_brackets_e.ttcn","www_example_org_regex_square_brackets.ttcn", c_numOfDiff_headerAndModuleName);
+ // "www_example_org_regex_square_brackets_e.ttcn","www_example_org_regex_square_brackets.ttcn", c_numOfDiff);
// }
//}
}//StringTest
@@ -760,7 +716,7 @@ group BooleanTest {
f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_boolean.xsd","",c_shell_successWithoutWarningAndError)
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_boolean_e.ttcn","www_XmlTest_org_boolean.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_boolean_e.ttcn","www_XmlTest_org_boolean.ttcn", c_numOfDiff);
}
}
@@ -769,7 +725,7 @@ group BooleanTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_boolean_variant_commented_e.ttcn",
- "www_example_org_boolean_variant_commented.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_boolean_variant_commented.ttcn", c_numOfDiff);
}
}
}//BooleanTest
@@ -786,7 +742,7 @@ group DecimalTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_decimal_e.ttcn",
- "www_XmlTest_org_decimal.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_decimal.ttcn", c_numOfDiff);
}
}
@@ -796,7 +752,7 @@ group DecimalTest {
// if(getverdict==pass) {
// f_compareFiles(
// "www_XmlTest_org_decimal_withLength_e.ttcn",
- // "www_XmlTest_org_decimal_withLength.ttcn", c_numOfDiff_headerAndModuleName);
+ // "www_XmlTest_org_decimal_withLength.ttcn", c_numOfDiff);
// }
// }
@@ -808,7 +764,7 @@ group DecimalTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_decimal_withMinMaxInclusive_e.ttcn",
- "www_XmlTest_org_decimal_withMinMaxInclusive.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_decimal_withMinMaxInclusive.ttcn", c_numOfDiff);
}
}//tc_
@@ -819,7 +775,7 @@ group DecimalTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_decimal_withMinMaxExclusive_e.ttcn",
- "www_XmlTest_org_decimal_withMinMaxExclusive.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_decimal_withMinMaxExclusive.ttcn", c_numOfDiff);
}
}//tc_
@@ -830,7 +786,7 @@ group DecimalTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_decimal_withEnum_e.ttcn",
- "www_XmlTest_org_decimal_withEnum.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_decimal_withEnum.ttcn", c_numOfDiff);
}
}
@@ -840,7 +796,7 @@ group DecimalTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_decimal_fractiondigits_e.ttcn",
- "www_example_org_decimal_fractiondigits.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_decimal_fractiondigits.ttcn", c_numOfDiff);
}
}
}//DecimalTest
@@ -857,7 +813,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_integer_e.ttcn",
- "www_XmlTest_org_integer.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_integer.ttcn", c_numOfDiff);
}
}//tc_
@@ -878,7 +834,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_integer_withEnum_e.ttcn","www_XmlTest_org_integer_withEnum.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_integer_withEnum_e.ttcn","www_XmlTest_org_integer_withEnum.ttcn", c_numOfDiff);
}
}//tc_
@@ -889,7 +845,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_integer_withMinIncl_e.ttcn",
- "www_XmlTest_org_integer_withMinIncl.ttcn",c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_integer_withMinIncl.ttcn",c_numOfDiff);
}
}//tc_
@@ -899,7 +855,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_integer_withMaxIncl_e.ttcn","www_XmlTest_org_integer_withMaxIncl.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_integer_withMaxIncl_e.ttcn","www_XmlTest_org_integer_withMaxIncl.ttcn", c_numOfDiff);
}
}//tc_
@@ -910,7 +866,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_integer_withMinExcl_e.ttcn",
- "www_XmlTest_org_integer_withMinExcl.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_integer_withMinExcl.ttcn", c_numOfDiff);
}
}//tc_
@@ -920,7 +876,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_integer_withMaxExcl_e.ttcn","www_XmlTest_org_integer_withMaxExcl.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_integer_withMaxExcl_e.ttcn","www_XmlTest_org_integer_withMaxExcl.ttcn", c_numOfDiff);
}
}//tc_
@@ -934,7 +890,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_not_a_number_minex_inf_maxex_inf_e.ttcn",
- "www_example_org_not_a_number_minex_inf_maxex_inf.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_not_a_number_minex_inf_maxex_inf.ttcn", c_numOfDiff);
}
}//tc_
@@ -945,7 +901,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_simple_enum_e.ttcn","www_XmlTest_org_simple_enum.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_simple_enum_e.ttcn","www_XmlTest_org_simple_enum.ttcn", c_numOfDiff);
}
}//tc_
@@ -956,7 +912,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_simpletype_restrict_comp_e.ttcn","www_example_org_simpletype_restrict_comp.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_simpletype_restrict_comp_e.ttcn","www_example_org_simpletype_restrict_comp.ttcn", c_numOfDiff);
}
}//tc_
@@ -967,7 +923,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_simpletype_ref_e.ttcn","www_example_org_simpletype_ref.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_simpletype_ref_e.ttcn","www_example_org_simpletype_ref.ttcn", c_numOfDiff);
}
}//tc_
@@ -978,7 +934,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_simpletype_base_e.ttcn","www_example_org_simpletype_base.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_simpletype_base_e.ttcn","www_example_org_simpletype_base.ttcn", c_numOfDiff);
}
}//tc_
@@ -990,7 +946,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_enum_field_names_e.ttcn","www_example_org_enum_field_names.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_enum_field_names_e.ttcn","www_example_org_enum_field_names.ttcn", c_numOfDiff);
}
}//tc_
@@ -1001,7 +957,7 @@ group IntegerTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_attribute_enumeration_variant_e.ttcn","www_example_org_attribute_enumeration_variant.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_attribute_enumeration_variant_e.ttcn","www_example_org_attribute_enumeration_variant.ttcn", c_numOfDiff);
}
}//tc_
@@ -1018,7 +974,7 @@ group TimeTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_time_e.ttcn","www_XmlTest_org_time.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_time_e.ttcn","www_XmlTest_org_time.ttcn", c_numOfDiff);
}
}//tc_
@@ -1028,7 +984,7 @@ group TimeTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_time_withEnum_e.ttcn","www_XmlTest_org_time_withEnum.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_time_withEnum_e.ttcn","www_XmlTest_org_time_withEnum.ttcn", c_numOfDiff);
}
}//tc_
}//TimeTest
@@ -1041,7 +997,7 @@ group ListTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_list_e.ttcn","www_XmlTest_org_list.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_list_e.ttcn","www_XmlTest_org_list.ttcn", c_numOfDiff);
}
// restrictions:length, minLength, maxLength, pattern, and enumeration.
@@ -1057,7 +1013,7 @@ group ListTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_list_integer_e.ttcn","www_XmlTest_org_list_integer.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_list_integer_e.ttcn","www_XmlTest_org_list_integer.ttcn", c_numOfDiff);
}
}//tc_
@@ -1068,7 +1024,7 @@ group ListTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_list_simpletype_e.ttcn","www_example_org_list_simpletype.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_list_simpletype_e.ttcn","www_example_org_list_simpletype.ttcn", c_numOfDiff);
}
}//tc_
@@ -1079,7 +1035,7 @@ group ListTest {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_list_complextype_e.ttcn","www_example_org_list_complextype.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_list_complextype_e.ttcn","www_example_org_list_complextype.ttcn", c_numOfDiff);
}
}//tc_
@@ -1090,7 +1046,7 @@ group ListTest {
if(getverdict==pass) {
f_compareFiles(
- "http_www_example_org_list_minmaxoccurs_e.ttcn","http_www_example_org_list_minmaxoccurs.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_list_minmaxoccurs_e.ttcn","http_www_example_org_list_minmaxoccurs.ttcn", c_numOfDiff);
}
}//tc_
@@ -1104,7 +1060,7 @@ group UnionTest {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_union_e.ttcn","www_XmlTest_org_union.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_union_e.ttcn","www_XmlTest_org_union.ttcn", c_numOfDiff);
}
}//tc_
@@ -1114,7 +1070,7 @@ group UnionTest {
if(getverdict==pass) {
f_compareFiles(
- "ETSI_CR5852_union_e.ttcn","ETSI_CR5852_union.ttcn", c_numOfDiff_headerAndModuleName);
+ "ETSI_CR5852_union_e.ttcn","ETSI_CR5852_union.ttcn", c_numOfDiff);
}
}
@@ -1125,7 +1081,7 @@ group UnionTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_enumeration_restriction_e.ttcn",
- "www_example_org_enumeration_restriction.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_enumeration_restriction.ttcn", c_numOfDiff);
}
}
@@ -1136,7 +1092,7 @@ group UnionTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_seq_enumeration_restriction_e.ttcn",
- "www_example_org_seq_enumeration_restriction.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_seq_enumeration_restriction.ttcn", c_numOfDiff);
}
}
@@ -1147,7 +1103,7 @@ group UnionTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_enumeration_restriction3_e.ttcn",
- "www_example_org_enumeration_restriction3.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_enumeration_restriction3.ttcn", c_numOfDiff);
}
}
@@ -1159,7 +1115,7 @@ group UnionTest {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_enumeration_remove_dup_e.ttcn",
- "www_example_org_enumeration_remove_dup.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_enumeration_remove_dup.ttcn", c_numOfDiff);
}
}
@@ -1175,7 +1131,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex1_e.ttcn","www_XmlTest_org_complex1.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_complex1_e.ttcn","www_XmlTest_org_complex1.ttcn", c_numOfDiff);
f_encDecTest_InternationalPrice();
}
}//tc_
@@ -1187,7 +1143,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex2_e.ttcn","www_XmlTest_org_complex2.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_complex2_e.ttcn","www_XmlTest_org_complex2.ttcn", c_numOfDiff);
}
f_encDecTest_InternationalPrice2(); //TR: HL24977 -solved -Primer, 2.5.3 Empty Content
f_encDecTest_InternationalPrice3();
@@ -1200,7 +1156,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_simpleContent_e.ttcn","www_XmlTest_org_complex_simpleContent.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_complex_simpleContent_e.ttcn","www_XmlTest_org_complex_simpleContent.ttcn", c_numOfDiff);
f_encDecTest_ComplexTypeWithSimpleContent1();
f_encDecTest_ComplexTypeWithSimpleContent2();
f_encDecTest_ComplexTypeWithSimpleContent2_neg();
@@ -1213,9 +1169,9 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_namespaceas_e.ttcn","www_example_org_namespaceas.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_namespaceas_e.ttcn","www_example_org_namespaceas.ttcn", c_numOfDiff);
f_compareFiles(
- "www_example_org_imported2_e.ttcn","www_example_org_imported2.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_imported2_e.ttcn","www_example_org_imported2.ttcn", c_numOfDiff);
}
}//tc_
@@ -1225,7 +1181,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_mixed_e.ttcn","www_XmlTest_org_complex_mixed.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_mixed_e.ttcn","www_XmlTest_org_complex_mixed.ttcn", c_numOfDiff);
}
}//tc_
@@ -1235,7 +1191,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_seq_group_reference_e.ttcn","www_example_org_seq_group_reference.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_seq_group_reference_e.ttcn","www_example_org_seq_group_reference.ttcn", c_numOfDiff);
}
}//tc_
@@ -1250,7 +1206,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "http_www_example_org_seq_embeds_seq_e.ttcn","http_www_example_org_seq_embeds_seq.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "http_www_example_org_seq_embeds_seq_e.ttcn","http_www_example_org_seq_embeds_seq.ttcn", c_numOfDiff);
f_encDecTest_InternationalPrice();
}
}//tc_
@@ -1261,7 +1217,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_choice_e.ttcn","www_XmlTest_org_complex_choice.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_choice_e.ttcn","www_XmlTest_org_complex_choice.ttcn", c_numOfDiff);
}
}//tc_
@@ -1285,7 +1241,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_all_e.ttcn","www_XmlTest_org_complex_all.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_all_e.ttcn","www_XmlTest_org_complex_all.ttcn", c_numOfDiff);
}
}//tc_
@@ -1465,7 +1421,7 @@ group ComplexType {
f_shellCommandWithVerdict(xsd2ttcn_command & " XmlTest_complex_minOccursMaxOccurs.xsd","",c_shell_successWithoutWarningAndError);
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn","www_XmlTest_org_complex_minOccursMaxOccurs.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_minOccursMaxOccurs_e.ttcn","www_XmlTest_org_complex_minOccursMaxOccurs.ttcn", c_numOfDiff);
}
}
@@ -1475,7 +1431,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_extension_e.ttcn","www_XmlTest_org_complex_extension.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_extension_e.ttcn","www_XmlTest_org_complex_extension.ttcn", c_numOfDiff);
}
}//tc_
@@ -1484,7 +1440,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "name_conversion_extension_attrib_e.ttcn","name_conversion_extension_attrib.ttcn", c_numOfDiff_headerAndModuleName);
+ "name_conversion_extension_attrib_e.ttcn","name_conversion_extension_attrib.ttcn", c_numOfDiff);
}
}//tc_
@@ -1493,7 +1449,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_long_extension_e.ttcn","www_example_org_long_extension.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_long_extension_e.ttcn","www_example_org_long_extension.ttcn", c_numOfDiff);
}
}//tc_
@@ -1502,7 +1458,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_self_recursion_e.ttcn","www_example_org_self_recursion.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_self_recursion_e.ttcn","www_example_org_self_recursion.ttcn", c_numOfDiff);
}
}//tc_
@@ -1511,7 +1467,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_type_conversion_follow_e.ttcn","www_example_org_type_conversion_follow.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_type_conversion_follow_e.ttcn","www_example_org_type_conversion_follow.ttcn", c_numOfDiff);
}
}//tc_
@@ -1520,7 +1476,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "attribute_in_extension_e.ttcn","attribute_in_extension.ttcn", c_numOfDiff_headerAndModuleName);
+ "attribute_in_extension_e.ttcn","attribute_in_extension.ttcn", c_numOfDiff);
}
}//tc_
@@ -1529,7 +1485,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_attr_ext_rest_e.ttcn","www_example_org_attr_ext_rest.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_attr_ext_rest_e.ttcn","www_example_org_attr_ext_rest.ttcn", c_numOfDiff);
}
}//tc_
@@ -1538,7 +1494,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_attrib_enum_e.ttcn","www_example_org_attrib_enum.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_attrib_enum_e.ttcn","www_example_org_attrib_enum.ttcn", c_numOfDiff);
}
}//tc_
@@ -1563,7 +1519,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_restriction_e.ttcn","www_XmlTest_org_complex_restriction.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_restriction_e.ttcn","www_XmlTest_org_complex_restriction.ttcn", c_numOfDiff);
}
}//tc_
@@ -1573,7 +1529,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
"http_www_example_org_complex_restriction_with_use_e.ttcn",
- "http_www_example_org_complex_restriction_with_use.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_complex_restriction_with_use.ttcn", c_numOfDiff);
}
}//tc_
@@ -1583,7 +1539,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_complex_nillable_e.ttcn",
- "www_example_org_complex_nillable.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_complex_nillable.ttcn", c_numOfDiff);
}
}//tc_
@@ -1594,7 +1550,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_nillable_fixed_e.ttcn",
- "www_example_org_nillable_fixed.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_nillable_fixed.ttcn", c_numOfDiff);
}
}//tc_
@@ -1604,7 +1560,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
"www_example_org_no_ns_connector_e.ttcn",
- "www_example_org_no_ns_connector.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_no_ns_connector.ttcn", c_numOfDiff);
}
}//tc_
@@ -1614,7 +1570,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
"http_www_example_org_2001_XMLSchema_e.ttcn",
- "http_www_example_org_2001_XMLSchema.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "http_www_example_org_2001_XMLSchema.ttcn", c_numOfDiff);
}
}//tc_
@@ -1644,7 +1600,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
"www_XmlTest_org_complex_unique_e.ttcn",
- "www_XmlTest_org_complex_unique.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_complex_unique.ttcn", c_numOfDiff);
}
}//tc_
@@ -1654,7 +1610,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_include1_e.ttcn","www_XmlTest_org_complex_include.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_include1_e.ttcn","www_XmlTest_org_complex_include.ttcn", c_numOfDiff_ModName);
}
}//tc_
@@ -1667,7 +1623,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_including_module_e.ttcn","www_example_org_including_module.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_including_module_e.ttcn","www_example_org_including_module.ttcn", c_numOfDiff);
}
}//tc_
@@ -1688,10 +1644,10 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_import_e.ttcn","www_XmlTest_org_complex_import.ttcn", c_numOfDiff_headerModNameAndImport);
+ "www_XmlTest_org_complex_import_e.ttcn","www_XmlTest_org_complex_import.ttcn", c_numOfDiff);
f_compareFiles(
- "www_XmlTest_org_complex_include2_e.ttcn","www_XmlTest_org_complex_include.ttcn", c_numOfDiff_headerModNameAndImport);
+ "www_XmlTest_org_complex_include2_e.ttcn","www_XmlTest_org_complex_include.ttcn", c_numOfDiff_ModName);
}
}//tc_
@@ -1705,10 +1661,10 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_import_e.ttcn","www_XmlTest_org_complex_import.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_complex_import_e.ttcn","www_XmlTest_org_complex_import.ttcn", c_numOfDiff);
f_compareFiles(
- "www_XmlTest_org_complex_include2_e.ttcn","www_XmlTest_org_complex_include.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_complex_include2_e.ttcn","www_XmlTest_org_complex_include.ttcn", c_numOfDiff_ModName);
}
}//tc_
@@ -1730,7 +1686,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_import_e.ttcn","www_XmlTest_org_complex_import.ttcn", c_numOfDiff_headerModNameAndNamespace+4);
+ "www_XmlTest_org_complex_import_e.ttcn","www_XmlTest_org_complex_import.ttcn", c_numOfDiff+1); // +1 because of tc_complex_import_pos2_converter
}
}//tc_
@@ -1786,11 +1742,11 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_import_A_e.ttcn","www_XmlTest_org_complex_import_A.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_import_A_e.ttcn","www_XmlTest_org_complex_import_A.ttcn", c_numOfDiff);
f_compareFiles(
- "www_XmlTest_org_complex_import_B_e.ttcn","www_XmlTest_org_complex_import_B.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_import_B_e.ttcn","www_XmlTest_org_complex_import_B.ttcn", c_numOfDiff);
f_compareFiles(
- "www_XmlTest_org_complex_import_AB_e.ttcn","www_XmlTest_org_complex_import_AB.ttcn", 10+c_numOfDiff_headerModNameAndImport);
+ "www_XmlTest_org_complex_import_AB_e.ttcn","www_XmlTest_org_complex_import_AB.ttcn", c_numOfDiff);
}
}//tc_
@@ -1810,7 +1766,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_complex_any_e.ttcn","www_XmlTest_org_complex_any.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_complex_any_e.ttcn","www_XmlTest_org_complex_any.ttcn", c_numOfDiff);
}
}//tc_
@@ -1819,7 +1775,7 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_import_prefix_e.ttcn","www_example_org_import_prefix.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_import_prefix_e.ttcn","www_example_org_import_prefix.ttcn", c_numOfDiff);
}
}//tc_
@@ -1828,15 +1784,15 @@ group ComplexType {
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_pref1_e.ttcn","www_example_org_pref1.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_pref1_e.ttcn","www_example_org_pref1.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_pref2_e.ttcn","www_example_org_pref2.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_pref2_e.ttcn","www_example_org_pref2.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_pref3_e.ttcn","www_example_org_pref3.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_pref3_e.ttcn","www_example_org_pref3.ttcn", c_numOfDiff);
}
}//tc_
@@ -1906,7 +1862,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_element_anyType_e.ttcn","www_XmlTest_org_element_anyType.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_XmlTest_org_element_anyType_e.ttcn","www_XmlTest_org_element_anyType.ttcn", c_numOfDiff);
}
}//tc_
@@ -1916,7 +1872,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_qualified_element_attrib_e.ttcn","www_example_org_qualified_element_attrib.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_qualified_element_attrib_e.ttcn","www_example_org_qualified_element_attrib.ttcn", c_numOfDiff);
}
}//tc_
@@ -1926,7 +1882,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_unqualified_element_attrib_e.ttcn","www_example_org_unqualified_element_attrib.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_unqualified_element_attrib_e.ttcn","www_example_org_unqualified_element_attrib.ttcn", c_numOfDiff);
}
}//tc_
@@ -2050,7 +2006,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_element_recordOfElements_e.ttcn","www_XmlTest_org_element_recordOfElements.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_element_recordOfElements_e.ttcn","www_XmlTest_org_element_recordOfElements.ttcn", c_numOfDiff);
}
}//tc_
@@ -2074,7 +2030,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_element_recordOfElements_e.ttcn","www_XmlTest_org_element_recordOfElements.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_element_recordOfElements_e.ttcn","www_XmlTest_org_element_recordOfElements.ttcn", c_numOfDiff);
f_encDecTest_PersonInfo1_defaultElement();
}
}//tc_
@@ -2086,7 +2042,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_element_recordOfElements4_e.ttcn","www_XmlTest_org_element_recordOfElements4.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_element_recordOfElements4_e.ttcn","www_XmlTest_org_element_recordOfElements4.ttcn", c_numOfDiff);
f_encDecTest_PersonInfo4();
}
}//tc_
@@ -2098,7 +2054,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_element_recordOfElements3_e.ttcn","www_XmlTest_org_element_recordOfElements3.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_element_recordOfElements3_e.ttcn","www_XmlTest_org_element_recordOfElements3.ttcn", c_numOfDiff);
}
}//tc_
@@ -2115,7 +2071,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_XmlTest_org_element_recordOfElements5_e.ttcn","www_XmlTest_org_element_recordOfElements5.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_XmlTest_org_element_recordOfElements5_e.ttcn","www_XmlTest_org_element_recordOfElements5.ttcn", c_numOfDiff);
}
}//tc_
@@ -2131,7 +2087,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_substitutiongroup_e.ttcn","www_example_org_substitutiongroup.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_e.ttcn","www_example_org_substitutiongroup.ttcn", c_numOfDiff);
}
}//tc_
@@ -2142,7 +2098,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "www_example_org_substitutiongroup_name_as_e.ttcn","www_example_org_substitutiongroup_name_as.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_name_as_e.ttcn","www_example_org_substitutiongroup_name_as.ttcn", c_numOfDiff);
}
}//tc_
@@ -2154,7 +2110,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_abstract_block_1_e.ttcn",
- "www_example_org_substitutiongroup_abstract_block_1.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_abstract_block_1.ttcn", c_numOfDiff);
}
}//tc_
@@ -2166,7 +2122,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_abstract_block_2_e.ttcn",
- "www_example_org_substitutiongroup_abstract_block_2.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_abstract_block_2.ttcn", c_numOfDiff);
}
}//tc_
@@ -2178,7 +2134,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_complex_without_element_e.ttcn",
- "www_example_org_substitutiongroup_complex_without_element.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_complex_without_element.ttcn", c_numOfDiff);
}
}//tc_
@@ -2190,7 +2146,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_complex_without_element_e.ttcn",
- "www_example_org_substitutiongroup_complex_without_element.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_complex_without_element.ttcn", c_numOfDiff);
}
}//tc_
@@ -2202,7 +2158,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_complextype_block_e.ttcn",
- "www_example_org_substitutiongroup_complextype_block.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_complextype_block.ttcn", c_numOfDiff);
}
}//tc_
@@ -2228,13 +2184,13 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_ref_e.ttcn",
- "www_example_org_substitutiongroup_ref.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_ref.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_main_e.ttcn",
- "www_example_org_substitutiongroup_main.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_main.ttcn", c_numOfDiff);
}
}//tc_
@@ -2246,7 +2202,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_substitutiongroup_rename_e.ttcn",
- "www_example_org_substitutiongroup_rename.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_substitutiongroup_rename.ttcn", c_numOfDiff);
}
}//tc_
@@ -2263,7 +2219,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_e.ttcn",
- "www_example_org_type_substitution.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution.ttcn", c_numOfDiff);
}
}//tc_
@@ -2281,7 +2237,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_chain_e.ttcn",
- "www_example_org_type_substitution_chain.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_chain.ttcn", c_numOfDiff);
}
}//tc_
@@ -2293,7 +2249,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_abstract_block_e.ttcn",
- "www_example_org_type_substitution_abstract_block.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_abstract_block.ttcn", c_numOfDiff);
}
}//tc_
@@ -2305,13 +2261,13 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_mod1_e.ttcn",
- "www_example_org_type_substitution_mod1.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_mod1.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_mod2_e.ttcn",
- "www_example_org_type_substitution_mod2.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_mod2.ttcn", c_numOfDiff);
}
}//tc_
@@ -2323,7 +2279,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_simpletype_e.ttcn",
- "www_example_org_type_substitution_simpletype.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_simpletype.ttcn", c_numOfDiff);
}
}//tc_
@@ -2335,7 +2291,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_subs_with_elem_subs_e.ttcn",
- "www_example_org_type_subs_with_elem_subs.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_subs_with_elem_subs.ttcn", c_numOfDiff);
}
}//tc_
@@ -2347,13 +2303,13 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_elem_in_ct_mod1_e.ttcn",
- "www_example_org_type_substitution_elem_in_ct_mod1.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_elem_in_ct_mod1.ttcn", c_numOfDiff);
}
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_elem_in_ct_mod2_e.ttcn",
- "www_example_org_type_substitution_elem_in_ct_mod2.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_elem_in_ct_mod2.ttcn", c_numOfDiff);
}
}//tc_
@@ -2365,7 +2321,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_only_element_substitution_e.ttcn",
- "www_example_org_only_element_substitution.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_only_element_substitution.ttcn", c_numOfDiff);
}
}//tc_
@@ -2377,7 +2333,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_builtintype_e.ttcn",
- "www_example_org_type_substitution_builtintype.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_builtintype.ttcn", c_numOfDiff);
}
}//tc_
@@ -2389,7 +2345,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_rename_e.ttcn",
- "www_example_org_type_substitution_rename.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_rename.ttcn", c_numOfDiff);
}
}//tc_
@@ -2401,7 +2357,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_complex_cascade_e.ttcn",
- "www_example_org_type_substitution_complex_cascade.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_complex_cascade.ttcn", c_numOfDiff);
}
}//tc_
@@ -2413,7 +2369,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_substitution_simple_cascade_e.ttcn",
- "www_example_org_type_substitution_simple_cascade.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_type_substitution_simple_cascade.ttcn", c_numOfDiff);
}
}//tc_
@@ -2455,7 +2411,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "XmlTest_imsike_e.ttcn","XmlTest_imsike.ttcn", c_numOfDiff_headerAndModuleName);
+ "XmlTest_imsike_e.ttcn","XmlTest_imsike.ttcn", c_numOfDiff);
}
}//tc_
@@ -2464,7 +2420,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
- "nillable_annotations_e.ttcn","nillable_annotations.ttcn", c_numOfDiff_headerAndModuleName);
+ "nillable_annotations_e.ttcn","nillable_annotations.ttcn", c_numOfDiff);
}
}//tc_
@@ -2474,7 +2430,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"http_www_example_org_nillable_in_nillable_extension_e.ttcn",
- "http_www_example_org_nillable_in_nillable_extension.ttcn", c_numOfDiff_headerAndModuleName);
+ "http_www_example_org_nillable_in_nillable_extension.ttcn", c_numOfDiff);
}
}//tc_
@@ -2484,7 +2440,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_type_attributegroup_nillable_e.ttcn",
- "www_example_org_type_attributegroup_nillable.ttcn", c_numOfDiff_headerAndModuleName);
+ "www_example_org_type_attributegroup_nillable.ttcn", c_numOfDiff);
}
}//tc_
@@ -2494,7 +2450,7 @@ group Elements{
if(getverdict==pass) {
f_compareFiles(
"www_example_org_attribgroup_ingroup_e.ttcn",
- "www_example_org_attribgroup_ingroup.ttcn", c_numOfDiff_headerModNameAndNamespace);
+ "www_example_org_attribgroup_ingroup.ttcn", c_numOfDiff);
}
}//tc_
@@ -2533,7 +2489,10 @@ group Elements{
//=========================================================================
// Control
//=========================================================================
-
+// When creating new testcases: Change the copyright header of the expected
+// ttcn just like in the other expected ttcns and write your name into a
+// contributors section just like in the other expected ttcns. In normal
+// case theese changes are required.
control {
execute(tc_versionTest());//Passed
execute(tc_xsd2ttcn_versionTest());//Passed
diff --git a/xsdconvert/ComplexType.cc b/xsdconvert/ComplexType.cc
index 7ebe8bc44a289ee8ef24f70f6e1bf7f583d1febe..221f65b905206c40c7cdba5a45d7f147c477136e 100644
--- a/xsdconvert/ComplexType.cc
+++ b/xsdconvert/ComplexType.cc
@@ -2012,6 +2012,12 @@ void ComplexType::resolveComplexTypeExtension() {
void ComplexType::resolveComplexTypeRestriction() {
if (mode == restrictionMode && cmode == CT_complextype_mode && !outside_reference.empty()) {
ComplexType * ct = (ComplexType*) TTCN3ModuleInventory::getInstance().lookup(this, want_CT);
+ if (ct == NULL) {
+ printError(module->getSchemaname(), name.convertedValue,
+ "Reference for a non-defined type: " + getReference().repr());
+ TTCN3ModuleInventory::getInstance().incrNumErrors();
+ return;
+ }
if(ct->getXsdtype() != n_NOTSET){
if (ct->resolved == No) {
ct->referenceResolving();
@@ -2026,7 +2032,7 @@ void ComplexType::resolveComplexTypeRestriction() {
List<ComplexType*>::iterator field2 = ct->complexfields.begin();
for (; field2; field2 = field2->Next) {
if (field->Data->getName().convertedValue == field2->Data->getName().convertedValue &&
- field->Data->getType().convertedValue == field2->Data->getType().convertedValue &&
+ field->Data->getType().convertedValue.getValueWithoutPrefix(':') == field2->Data->getType().convertedValue.getValueWithoutPrefix(':') &&
field->Data->complexfields.size() <= field2->Data->complexfields.size() &&
hasMatchingFields(field->Data->complexfields, field2->Data->complexfields)) {
// TODO: better algorithm to find matching fields