aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2019-11-07 11:33:01 -0800
committerJessica Wagantall <jwagantall@linuxfoundation.org>2019-11-07 11:33:29 -0800
commit2a3357829783d850d230d8b85b9e1c15effe1a38 (patch)
tree8ab9b83f976d79bdeb0c87b8b879b5d62d4ce129
parent527fe8bdac1f1c7c59738c598996dc8c842a22e3 (diff)
Migrate jtosca contents
Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
-rw-r--r--jtosca/.gitreview (renamed from .gitreview)0
-rw-r--r--jtosca/INFO.yaml (renamed from INFO.yaml)0
-rw-r--r--jtosca/LICENSE.TXT (renamed from LICENSE.TXT)0
-rw-r--r--jtosca/README.md (renamed from README.md)0
-rw-r--r--jtosca/checkstyle-suppressions.xml (renamed from checkstyle-suppressions.xml)0
-rw-r--r--jtosca/docs/index.rst (renamed from docs/index.rst)0
-rw-r--r--jtosca/pom.xml (renamed from pom.xml)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/CapabilityAssignment.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/CapabilityAssignment.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/CapabilityAssignments.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/CapabilityAssignments.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/DataEntity.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/DataEntity.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/EntityTemplate.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/EntityTemplate.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/Group.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/Group.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/ImportsLoader.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/ImportsLoader.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/NodeTemplate.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/NodeTemplate.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/Policy.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/Policy.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/Property.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/Property.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/RelationshipTemplate.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/RelationshipTemplate.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/Repository.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/Repository.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/RequirementAssignment.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/RequirementAssignment.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/RequirementAssignments.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/RequirementAssignments.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/SubstitutionMappings.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/SubstitutionMappings.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/TopologyTemplate.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/TopologyTemplate.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/ToscaGraph.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/ToscaGraph.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/Triggers.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/Triggers.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/UnsupportedType.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/UnsupportedType.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/common/JToscaException.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/common/JToscaException.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/common/JToscaValidationIssue.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/common/JToscaValidationIssue.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/common/TOSCAException.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/common/TOSCAException.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/common/ValidationIssueCollector.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/common/ValidationIssueCollector.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ArtifactTypeDef.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/ArtifactTypeDef.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/AttributeDef.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/AttributeDef.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/CapabilityTypeDef.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/CapabilityTypeDef.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/DataType.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/DataType.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/EntityType.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/EntityType.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/GroupType.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/GroupType.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/InterfacesDef.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/InterfacesDef.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/Metadata.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/Metadata.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/NodeType.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/NodeType.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/PolicyType.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/PolicyType.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/PortSpec.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/PortSpec.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/PropertyDef.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/PropertyDef.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/RelationshipType.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/RelationshipType.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnit.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnit.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitFrequency.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitFrequency.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitSize.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitSize.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitTime.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitTime.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/StatefulEntityType.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/StatefulEntityType.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/TypeValidation.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/TypeValidation.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Constraint.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Constraint.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Equal.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Equal.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterOrEqual.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterOrEqual.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterThan.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterThan.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/InRange.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/InRange.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Length.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Length.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/LessOrEqual.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/LessOrEqual.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/LessThan.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/LessThan.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/MaxLength.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/MaxLength.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/MinLength.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/MinLength.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Pattern.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Pattern.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Schema.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Schema.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/ValidValues.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/ValidValues.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/enums/FileSize.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/enums/FileSize.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/enums/ToscaElementNames.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/elements/enums/ToscaElementNames.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/extensions/ExtTools.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/extensions/ExtTools.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/Concat.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/functions/Concat.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/Function.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/functions/Function.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/GetAttribute.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/functions/GetAttribute.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/GetInput.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/functions/GetInput.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/GetOperationOutput.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/functions/GetOperationOutput.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/GetProperty.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/functions/GetProperty.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/Token.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/functions/Token.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/parameters/Annotation.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/parameters/Annotation.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/parameters/Input.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/parameters/Input.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/parameters/Output.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/parameters/Output.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/prereq/CSAR.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/prereq/CSAR.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/CopyUtils.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/utils/CopyUtils.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/DumpUtils.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/utils/DumpUtils.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/JToscaErrorCodes.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/utils/JToscaErrorCodes.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/TOSCAVersionProperty.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/utils/TOSCAVersionProperty.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/ThreadLocalsHolder.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/utils/ThreadLocalsHolder.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/UrlUtils.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/utils/UrlUtils.java)0
-rw-r--r--jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/ValidateUtils.java (renamed from src/main/java/org/onap/sdc/toscaparser/api/utils/ValidateUtils.java)0
-rw-r--r--jtosca/src/main/resources/TOSCA_definition_1_0.yaml (renamed from src/main/resources/TOSCA_definition_1_0.yaml)0
-rw-r--r--jtosca/src/main/resources/extensions/TOSCA_simple_yaml_definition_1_0_0/TOSCA_simple_yaml_definition_1_0_0.py (renamed from src/main/resources/extensions/TOSCA_simple_yaml_definition_1_0_0/TOSCA_simple_yaml_definition_1_0_0.py)0
-rw-r--r--jtosca/src/main/resources/extensions/TOSCA_simple_yaml_definition_1_0_0/TOSCA_simple_yaml_definition_1_0_0.yaml (renamed from src/main/resources/extensions/TOSCA_simple_yaml_definition_1_0_0/TOSCA_simple_yaml_definition_1_0_0.yaml)0
-rw-r--r--jtosca/src/main/resources/extensions/nfv/TOSCA_nfv_definition_1_0.yaml (renamed from src/main/resources/extensions/nfv/TOSCA_nfv_definition_1_0.yaml)0
-rw-r--r--jtosca/src/main/resources/extensions/nfv/nfv.py (renamed from src/main/resources/extensions/nfv/nfv.py)0
-rw-r--r--jtosca/src/test/java/org/onap/sdc/toscaparser/api/GetValidationIssues.java (renamed from src/test/java/org/onap/sdc/toscaparser/api/GetValidationIssues.java)0
-rw-r--r--jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaImportTest.java (renamed from src/test/java/org/onap/sdc/toscaparser/api/JToscaImportTest.java)0
-rw-r--r--jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaMetadataParse.java (renamed from src/test/java/org/onap/sdc/toscaparser/api/JToscaMetadataParse.java)0
-rw-r--r--jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/CalculatePropertyByPathTest.java (renamed from src/test/java/org/onap/sdc/toscaparser/api/elements/CalculatePropertyByPathTest.java)0
-rw-r--r--jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/EntityTypeTest.java (renamed from src/test/java/org/onap/sdc/toscaparser/api/elements/EntityTypeTest.java)0
-rw-r--r--jtosca/src/test/java/org/onap/sdc/toscaparser/api/functions/GetInputTest.java (renamed from src/test/java/org/onap/sdc/toscaparser/api/functions/GetInputTest.java)0
-rw-r--r--jtosca/src/test/resources/csars/csar_hello_world.csar (renamed from src/test/resources/csars/csar_hello_world.csar)bin936 -> 936 bytes
-rw-r--r--jtosca/src/test/resources/csars/dataTypes-test-service.csar (renamed from src/test/resources/csars/dataTypes-test-service.csar)bin46307 -> 46307 bytes
-rw-r--r--jtosca/src/test/resources/csars/emptyCsar.csar (renamed from src/test/resources/csars/emptyCsar.csar)bin22 -> 22 bytes
-rw-r--r--jtosca/src/test/resources/csars/listed_input.csar (renamed from src/test/resources/csars/listed_input.csar)bin46229 -> 46229 bytes
-rw-r--r--jtosca/src/test/resources/csars/listed_input_ng.csar (renamed from src/test/resources/csars/listed_input_ng.csar)bin46232 -> 46232 bytes
-rw-r--r--jtosca/src/test/resources/csars/resource-Spgw-csar-ZTE.csar (renamed from src/test/resources/csars/resource-Spgw-csar-ZTE.csar)bin31639 -> 31639 bytes
-rw-r--r--jtosca/src/test/resources/csars/sdc-onboarding_csar.csar (renamed from src/test/resources/csars/sdc-onboarding_csar.csar)bin79654 -> 79654 bytes
-rw-r--r--jtosca/src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar (renamed from src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar)bin117439 -> 117439 bytes
-rw-r--r--jtosca/src/test/resources/csars/service-JennyVtsbcKarunaSvc-csar.csar (renamed from src/test/resources/csars/service-JennyVtsbcKarunaSvc-csar.csar)bin145576 -> 145576 bytes
-rw-r--r--jtosca/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar (renamed from src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar)bin60223 -> 60223 bytes
-rw-r--r--jtosca/src/test/resources/csars/tmpCSAR_Huawei_vSPGW_fixed.csar (renamed from src/test/resources/csars/tmpCSAR_Huawei_vSPGW_fixed.csar)bin45116 -> 45116 bytes
-rw-r--r--jtosca/src/test/resources/csars/tmpCSAR_Huawei_vSPGW_without_required_inputs.csar (renamed from src/test/resources/csars/tmpCSAR_Huawei_vSPGW_without_required_inputs.csar)bin43627 -> 43627 bytes
-rw-r--r--jtosca/version.properties (renamed from version.properties)0
107 files changed, 0 insertions, 0 deletions
diff --git a/.gitreview b/jtosca/.gitreview
index 369108b..369108b 100644
--- a/.gitreview
+++ b/jtosca/.gitreview
diff --git a/INFO.yaml b/jtosca/INFO.yaml
index 3d21b87..3d21b87 100644
--- a/INFO.yaml
+++ b/jtosca/INFO.yaml
diff --git a/LICENSE.TXT b/jtosca/LICENSE.TXT
index f479f8a..f479f8a 100644
--- a/LICENSE.TXT
+++ b/jtosca/LICENSE.TXT
diff --git a/README.md b/jtosca/README.md
index a3a150f..a3a150f 100644
--- a/README.md
+++ b/jtosca/README.md
diff --git a/checkstyle-suppressions.xml b/jtosca/checkstyle-suppressions.xml
index 2920ca2..2920ca2 100644
--- a/checkstyle-suppressions.xml
+++ b/jtosca/checkstyle-suppressions.xml
diff --git a/docs/index.rst b/jtosca/docs/index.rst
index 833e1aa..833e1aa 100644
--- a/docs/index.rst
+++ b/jtosca/docs/index.rst
diff --git a/pom.xml b/jtosca/pom.xml
index 8e02299..8e02299 100644
--- a/pom.xml
+++ b/jtosca/pom.xml
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/CapabilityAssignment.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/CapabilityAssignment.java
index bb7b47d..bb7b47d 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/CapabilityAssignment.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/CapabilityAssignment.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/CapabilityAssignments.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/CapabilityAssignments.java
index 28ada96..28ada96 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/CapabilityAssignments.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/CapabilityAssignments.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/DataEntity.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/DataEntity.java
index e95fe72..e95fe72 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/DataEntity.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/DataEntity.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/EntityTemplate.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/EntityTemplate.java
index 93bfe2b..93bfe2b 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/EntityTemplate.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/EntityTemplate.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/Group.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/Group.java
index 0591d9a..0591d9a 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/Group.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/Group.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/ImportsLoader.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/ImportsLoader.java
index 019adb3..019adb3 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/ImportsLoader.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/ImportsLoader.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/NodeTemplate.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/NodeTemplate.java
index 4fabe38..4fabe38 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/NodeTemplate.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/NodeTemplate.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/Policy.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/Policy.java
index ca8ac55..ca8ac55 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/Policy.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/Policy.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/Property.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/Property.java
index e20bd2f..e20bd2f 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/Property.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/Property.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/RelationshipTemplate.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/RelationshipTemplate.java
index d1a1383..d1a1383 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/RelationshipTemplate.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/RelationshipTemplate.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/Repository.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/Repository.java
index ee5e5bc..ee5e5bc 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/Repository.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/Repository.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/RequirementAssignment.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/RequirementAssignment.java
index 227b2a9..227b2a9 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/RequirementAssignment.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/RequirementAssignment.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/RequirementAssignments.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/RequirementAssignments.java
index 2ba6230..2ba6230 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/RequirementAssignments.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/RequirementAssignments.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/SubstitutionMappings.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/SubstitutionMappings.java
index a622a9a..a622a9a 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/SubstitutionMappings.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/SubstitutionMappings.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/TopologyTemplate.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/TopologyTemplate.java
index efc6948..efc6948 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/TopologyTemplate.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/TopologyTemplate.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/ToscaGraph.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/ToscaGraph.java
index 1706cdc..1706cdc 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/ToscaGraph.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/ToscaGraph.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java
index ddb8ddb..ddb8ddb 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/Triggers.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/Triggers.java
index c78978f..c78978f 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/Triggers.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/Triggers.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/UnsupportedType.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/UnsupportedType.java
index f2bb650..f2bb650 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/UnsupportedType.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/UnsupportedType.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/common/JToscaException.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/common/JToscaException.java
index 56416c6..56416c6 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/common/JToscaException.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/common/JToscaException.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/common/JToscaValidationIssue.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/common/JToscaValidationIssue.java
index cd5cbc5..cd5cbc5 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/common/JToscaValidationIssue.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/common/JToscaValidationIssue.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/common/TOSCAException.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/common/TOSCAException.java
index c109ffd..c109ffd 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/common/TOSCAException.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/common/TOSCAException.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/common/ValidationIssueCollector.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/common/ValidationIssueCollector.java
index 71c0401..71c0401 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/common/ValidationIssueCollector.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/common/ValidationIssueCollector.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/ArtifactTypeDef.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ArtifactTypeDef.java
index 9cf8c6c..9cf8c6c 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/ArtifactTypeDef.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ArtifactTypeDef.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/AttributeDef.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/AttributeDef.java
index e4a30f1..e4a30f1 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/AttributeDef.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/AttributeDef.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/CapabilityTypeDef.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/CapabilityTypeDef.java
index e3c24b3..e3c24b3 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/CapabilityTypeDef.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/CapabilityTypeDef.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/DataType.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/DataType.java
index d8cf460..d8cf460 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/DataType.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/DataType.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/EntityType.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/EntityType.java
index efc6ac9..efc6ac9 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/EntityType.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/EntityType.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/GroupType.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/GroupType.java
index db6f2b7..db6f2b7 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/GroupType.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/GroupType.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/InterfacesDef.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/InterfacesDef.java
index 2862a11..2862a11 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/InterfacesDef.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/InterfacesDef.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/Metadata.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/Metadata.java
index f3de49e..f3de49e 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/Metadata.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/Metadata.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/NodeType.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/NodeType.java
index c251be9..c251be9 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/NodeType.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/NodeType.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/PolicyType.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/PolicyType.java
index b227a31..b227a31 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/PolicyType.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/PolicyType.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/PortSpec.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/PortSpec.java
index 01fb9fc..01fb9fc 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/PortSpec.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/PortSpec.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/PropertyDef.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/PropertyDef.java
index 484d17e..484d17e 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/PropertyDef.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/PropertyDef.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/RelationshipType.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/RelationshipType.java
index 4c39ec2..4c39ec2 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/RelationshipType.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/RelationshipType.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnit.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnit.java
index 1eaa8a0..1eaa8a0 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnit.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnit.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitFrequency.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitFrequency.java
index ed10da9..ed10da9 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitFrequency.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitFrequency.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitSize.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitSize.java
index 78687a1..78687a1 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitSize.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitSize.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitTime.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitTime.java
index 8d2c13e..8d2c13e 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitTime.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitTime.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/StatefulEntityType.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/StatefulEntityType.java
index b710dda..b710dda 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/StatefulEntityType.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/StatefulEntityType.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/TypeValidation.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/TypeValidation.java
index 18dd5ca..18dd5ca 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/TypeValidation.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/TypeValidation.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Constraint.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Constraint.java
index dd77659..dd77659 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Constraint.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Constraint.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Equal.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Equal.java
index f480099..f480099 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Equal.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Equal.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterOrEqual.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterOrEqual.java
index 0cb8f36..0cb8f36 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterOrEqual.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterOrEqual.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterThan.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterThan.java
index b501907..b501907 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterThan.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterThan.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/InRange.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/InRange.java
index 4edf021..4edf021 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/InRange.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/InRange.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Length.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Length.java
index 7988cb8..7988cb8 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Length.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Length.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/LessOrEqual.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/LessOrEqual.java
index 37a4afc..37a4afc 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/LessOrEqual.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/LessOrEqual.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/LessThan.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/LessThan.java
index 952861d..952861d 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/LessThan.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/LessThan.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/MaxLength.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/MaxLength.java
index 9068b65..9068b65 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/MaxLength.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/MaxLength.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/MinLength.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/MinLength.java
index eb1d870..eb1d870 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/MinLength.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/MinLength.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Pattern.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Pattern.java
index 913e922..913e922 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Pattern.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Pattern.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Schema.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Schema.java
index 15ec597..15ec597 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Schema.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/Schema.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/ValidValues.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/ValidValues.java
index c3a192d..c3a192d 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/ValidValues.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/ValidValues.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/enums/FileSize.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/enums/FileSize.java
index b07f7fa..b07f7fa 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/enums/FileSize.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/enums/FileSize.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/enums/ToscaElementNames.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/enums/ToscaElementNames.java
index ac0d837..ac0d837 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/enums/ToscaElementNames.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/elements/enums/ToscaElementNames.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/extensions/ExtTools.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/extensions/ExtTools.java
index 5fbfca0..5fbfca0 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/extensions/ExtTools.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/extensions/ExtTools.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/functions/Concat.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/Concat.java
index 4ebeba9..4ebeba9 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/functions/Concat.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/Concat.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/functions/Function.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/Function.java
index 711a7ca..711a7ca 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/functions/Function.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/Function.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/functions/GetAttribute.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/GetAttribute.java
index 564d410..564d410 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/functions/GetAttribute.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/GetAttribute.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/functions/GetInput.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/GetInput.java
index ee5be17..ee5be17 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/functions/GetInput.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/GetInput.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/functions/GetOperationOutput.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/GetOperationOutput.java
index 06a28d6..06a28d6 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/functions/GetOperationOutput.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/GetOperationOutput.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/functions/GetProperty.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/GetProperty.java
index 90e0a8e..90e0a8e 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/functions/GetProperty.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/GetProperty.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/functions/Token.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/Token.java
index 240ce85..240ce85 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/functions/Token.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/functions/Token.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/parameters/Annotation.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/parameters/Annotation.java
index a34ebb5..a34ebb5 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/parameters/Annotation.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/parameters/Annotation.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/parameters/Input.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/parameters/Input.java
index 5d3ecb4..5d3ecb4 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/parameters/Input.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/parameters/Input.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/parameters/Output.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/parameters/Output.java
index 8ef82b3..8ef82b3 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/parameters/Output.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/parameters/Output.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/prereq/CSAR.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/prereq/CSAR.java
index 4ada267..4ada267 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/prereq/CSAR.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/prereq/CSAR.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/utils/CopyUtils.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/CopyUtils.java
index 237b738..237b738 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/utils/CopyUtils.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/CopyUtils.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/utils/DumpUtils.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/DumpUtils.java
index 158a3e1..158a3e1 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/utils/DumpUtils.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/DumpUtils.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/utils/JToscaErrorCodes.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/JToscaErrorCodes.java
index 3849ce0..3849ce0 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/utils/JToscaErrorCodes.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/JToscaErrorCodes.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/utils/TOSCAVersionProperty.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/TOSCAVersionProperty.java
index a753d62..a753d62 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/utils/TOSCAVersionProperty.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/TOSCAVersionProperty.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/utils/ThreadLocalsHolder.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/ThreadLocalsHolder.java
index 4c4581b..4c4581b 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/utils/ThreadLocalsHolder.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/ThreadLocalsHolder.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/utils/UrlUtils.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/UrlUtils.java
index d081d91..d081d91 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/utils/UrlUtils.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/UrlUtils.java
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/utils/ValidateUtils.java b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/ValidateUtils.java
index b90d882..b90d882 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/utils/ValidateUtils.java
+++ b/jtosca/src/main/java/org/onap/sdc/toscaparser/api/utils/ValidateUtils.java
diff --git a/src/main/resources/TOSCA_definition_1_0.yaml b/jtosca/src/main/resources/TOSCA_definition_1_0.yaml
index d80ed17..d80ed17 100644
--- a/src/main/resources/TOSCA_definition_1_0.yaml
+++ b/jtosca/src/main/resources/TOSCA_definition_1_0.yaml
diff --git a/src/main/resources/extensions/TOSCA_simple_yaml_definition_1_0_0/TOSCA_simple_yaml_definition_1_0_0.py b/jtosca/src/main/resources/extensions/TOSCA_simple_yaml_definition_1_0_0/TOSCA_simple_yaml_definition_1_0_0.py
index a5bda4a..a5bda4a 100644
--- a/src/main/resources/extensions/TOSCA_simple_yaml_definition_1_0_0/TOSCA_simple_yaml_definition_1_0_0.py
+++ b/jtosca/src/main/resources/extensions/TOSCA_simple_yaml_definition_1_0_0/TOSCA_simple_yaml_definition_1_0_0.py
diff --git a/src/main/resources/extensions/TOSCA_simple_yaml_definition_1_0_0/TOSCA_simple_yaml_definition_1_0_0.yaml b/jtosca/src/main/resources/extensions/TOSCA_simple_yaml_definition_1_0_0/TOSCA_simple_yaml_definition_1_0_0.yaml
index c645e27..c645e27 100644
--- a/src/main/resources/extensions/TOSCA_simple_yaml_definition_1_0_0/TOSCA_simple_yaml_definition_1_0_0.yaml
+++ b/jtosca/src/main/resources/extensions/TOSCA_simple_yaml_definition_1_0_0/TOSCA_simple_yaml_definition_1_0_0.yaml
diff --git a/src/main/resources/extensions/nfv/TOSCA_nfv_definition_1_0.yaml b/jtosca/src/main/resources/extensions/nfv/TOSCA_nfv_definition_1_0.yaml
index 8b08837..8b08837 100644
--- a/src/main/resources/extensions/nfv/TOSCA_nfv_definition_1_0.yaml
+++ b/jtosca/src/main/resources/extensions/nfv/TOSCA_nfv_definition_1_0.yaml
diff --git a/src/main/resources/extensions/nfv/nfv.py b/jtosca/src/main/resources/extensions/nfv/nfv.py
index 0c7c2b9..0c7c2b9 100644
--- a/src/main/resources/extensions/nfv/nfv.py
+++ b/jtosca/src/main/resources/extensions/nfv/nfv.py
diff --git a/src/test/java/org/onap/sdc/toscaparser/api/GetValidationIssues.java b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/GetValidationIssues.java
index 140a6e9..140a6e9 100644
--- a/src/test/java/org/onap/sdc/toscaparser/api/GetValidationIssues.java
+++ b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/GetValidationIssues.java
diff --git a/src/test/java/org/onap/sdc/toscaparser/api/JToscaImportTest.java b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaImportTest.java
index 5876ac7..5876ac7 100644
--- a/src/test/java/org/onap/sdc/toscaparser/api/JToscaImportTest.java
+++ b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaImportTest.java
diff --git a/src/test/java/org/onap/sdc/toscaparser/api/JToscaMetadataParse.java b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaMetadataParse.java
index 2ec41b2..2ec41b2 100644
--- a/src/test/java/org/onap/sdc/toscaparser/api/JToscaMetadataParse.java
+++ b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/JToscaMetadataParse.java
diff --git a/src/test/java/org/onap/sdc/toscaparser/api/elements/CalculatePropertyByPathTest.java b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/CalculatePropertyByPathTest.java
index fd84d6e..fd84d6e 100644
--- a/src/test/java/org/onap/sdc/toscaparser/api/elements/CalculatePropertyByPathTest.java
+++ b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/CalculatePropertyByPathTest.java
diff --git a/src/test/java/org/onap/sdc/toscaparser/api/elements/EntityTypeTest.java b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/EntityTypeTest.java
index d65de28..d65de28 100644
--- a/src/test/java/org/onap/sdc/toscaparser/api/elements/EntityTypeTest.java
+++ b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/elements/EntityTypeTest.java
diff --git a/src/test/java/org/onap/sdc/toscaparser/api/functions/GetInputTest.java b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/functions/GetInputTest.java
index 98e5102..98e5102 100644
--- a/src/test/java/org/onap/sdc/toscaparser/api/functions/GetInputTest.java
+++ b/jtosca/src/test/java/org/onap/sdc/toscaparser/api/functions/GetInputTest.java
diff --git a/src/test/resources/csars/csar_hello_world.csar b/jtosca/src/test/resources/csars/csar_hello_world.csar
index 43ffbbc..43ffbbc 100644
--- a/src/test/resources/csars/csar_hello_world.csar
+++ b/jtosca/src/test/resources/csars/csar_hello_world.csar
Binary files differ
diff --git a/src/test/resources/csars/dataTypes-test-service.csar b/jtosca/src/test/resources/csars/dataTypes-test-service.csar
index b4de177..b4de177 100644
--- a/src/test/resources/csars/dataTypes-test-service.csar
+++ b/jtosca/src/test/resources/csars/dataTypes-test-service.csar
Binary files differ
diff --git a/src/test/resources/csars/emptyCsar.csar b/jtosca/src/test/resources/csars/emptyCsar.csar
index 15cb0ec..15cb0ec 100644
--- a/src/test/resources/csars/emptyCsar.csar
+++ b/jtosca/src/test/resources/csars/emptyCsar.csar
Binary files differ
diff --git a/src/test/resources/csars/listed_input.csar b/jtosca/src/test/resources/csars/listed_input.csar
index 445b91a..445b91a 100644
--- a/src/test/resources/csars/listed_input.csar
+++ b/jtosca/src/test/resources/csars/listed_input.csar
Binary files differ
diff --git a/src/test/resources/csars/listed_input_ng.csar b/jtosca/src/test/resources/csars/listed_input_ng.csar
index 6b3402e..6b3402e 100644
--- a/src/test/resources/csars/listed_input_ng.csar
+++ b/jtosca/src/test/resources/csars/listed_input_ng.csar
Binary files differ
diff --git a/src/test/resources/csars/resource-Spgw-csar-ZTE.csar b/jtosca/src/test/resources/csars/resource-Spgw-csar-ZTE.csar
index 58c3ddd..58c3ddd 100644
--- a/src/test/resources/csars/resource-Spgw-csar-ZTE.csar
+++ b/jtosca/src/test/resources/csars/resource-Spgw-csar-ZTE.csar
Binary files differ
diff --git a/src/test/resources/csars/sdc-onboarding_csar.csar b/jtosca/src/test/resources/csars/sdc-onboarding_csar.csar
index f12605d..f12605d 100644
--- a/src/test/resources/csars/sdc-onboarding_csar.csar
+++ b/jtosca/src/test/resources/csars/sdc-onboarding_csar.csar
Binary files differ
diff --git a/src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar b/jtosca/src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar
index 28aa6f4..28aa6f4 100644
--- a/src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar
+++ b/jtosca/src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar
Binary files differ
diff --git a/src/test/resources/csars/service-JennyVtsbcKarunaSvc-csar.csar b/jtosca/src/test/resources/csars/service-JennyVtsbcKarunaSvc-csar.csar
index ee01780..ee01780 100644
--- a/src/test/resources/csars/service-JennyVtsbcKarunaSvc-csar.csar
+++ b/jtosca/src/test/resources/csars/service-JennyVtsbcKarunaSvc-csar.csar
Binary files differ
diff --git a/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar b/jtosca/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar
index aabf83c..aabf83c 100644
--- a/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar
+++ b/jtosca/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar
Binary files differ
diff --git a/src/test/resources/csars/tmpCSAR_Huawei_vSPGW_fixed.csar b/jtosca/src/test/resources/csars/tmpCSAR_Huawei_vSPGW_fixed.csar
index 9dc29c7..9dc29c7 100644
--- a/src/test/resources/csars/tmpCSAR_Huawei_vSPGW_fixed.csar
+++ b/jtosca/src/test/resources/csars/tmpCSAR_Huawei_vSPGW_fixed.csar
Binary files differ
diff --git a/src/test/resources/csars/tmpCSAR_Huawei_vSPGW_without_required_inputs.csar b/jtosca/src/test/resources/csars/tmpCSAR_Huawei_vSPGW_without_required_inputs.csar
index 194fabb..194fabb 100644
--- a/src/test/resources/csars/tmpCSAR_Huawei_vSPGW_without_required_inputs.csar
+++ b/jtosca/src/test/resources/csars/tmpCSAR_Huawei_vSPGW_without_required_inputs.csar
Binary files differ
diff --git a/version.properties b/jtosca/version.properties
index 0f0fb2b..0f0fb2b 100644
--- a/version.properties
+++ b/jtosca/version.properties