diff options
| author |   vasraz <vasyl.razinkov@est.tech> | 2019-11-14 11:24:56 +0000 |
|---|---|---|
| committer | vasraz <vasyl.razinkov@est.tech> | 2019-11-18 09:56:55 +0000 |
| commit | 134bed676f01745969408d522ca9ac6c482ba549 (patch) | |
| tree | 03454c5d7f899ed67653c590ad190cac4a78718f | |
| parent | f5bde6a64eaaa32fd4cfebfd7589c066962c7ddf (diff) | |
Move jTosca contents to sdc-tosca
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I5c47a8fd7d4ff295149d1d9b29aea71ae56cbcd4
Issue-ID: SDC-2457
| -rw-r--r-- | docs/index.rst | 8 | ||||
| -rw-r--r-- | jtosca/.gitignore | 20 | ||||
| -rw-r--r-- | jtosca/pom.xml | 481 | ||||
| -rw-r--r-- | pom.xml | 533 | ||||
| -rw-r--r-- | sdc-tosca/pom.xml | 220 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/ConformanceLevel.java (renamed from src/main/java/org/onap/sdc/tosca/parser/api/ConformanceLevel.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/IEntityDetails.java (renamed from src/main/java/org/onap/sdc/tosca/parser/api/IEntityDetails.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java (renamed from src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/Version.java (renamed from src/main/java/org/onap/sdc/tosca/parser/api/Version.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/Configuration.java (renamed from src/main/java/org/onap/sdc/tosca/parser/config/Configuration.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ConfigurationManager.java (renamed from src/main/java/org/onap/sdc/tosca/parser/config/ConfigurationManager.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ErrorConfiguration.java (renamed from src/main/java/org/onap/sdc/tosca/parser/config/ErrorConfiguration.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ErrorInfo.java (renamed from src/main/java/org/onap/sdc/tosca/parser/config/ErrorInfo.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/JToscaValidationIssueInfo.java (renamed from src/main/java/org/onap/sdc/tosca/parser/config/JToscaValidationIssueInfo.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/JtoscaValidationIssueConfiguration.java (renamed from src/main/java/org/onap/sdc/tosca/parser/config/JtoscaValidationIssueConfiguration.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/SdcToscaParserErrors.java (renamed from src/main/java/org/onap/sdc/tosca/parser/config/SdcToscaParserErrors.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetails.java (renamed from src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetails.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactory.java (renamed from src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactory.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java (renamed from src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/NodeTemplateEntityDetails.java (renamed from src/main/java/org/onap/sdc/tosca/parser/elements/NodeTemplateEntityDetails.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/PolicyEntityDetails.java (renamed from src/main/java/org/onap/sdc/tosca/parser/elements/PolicyEntityDetails.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/AllEntitiesQuery.java (renamed from src/main/java/org/onap/sdc/tosca/parser/elements/queries/AllEntitiesQuery.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java (renamed from src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/GroupEntityQuery.java (renamed from src/main/java/org/onap/sdc/tosca/parser/elements/queries/GroupEntityQuery.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java (renamed from src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java (renamed from src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQuery.java (renamed from src/main/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQuery.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/EntityTemplateType.java (renamed from src/main/java/org/onap/sdc/tosca/parser/enums/EntityTemplateType.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/FilterType.java (renamed from src/main/java/org/onap/sdc/tosca/parser/enums/FilterType.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/JToscaValidationIssueType.java (renamed from src/main/java/org/onap/sdc/tosca/parser/enums/JToscaValidationIssueType.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/PropertySchemaType.java (renamed from src/main/java/org/onap/sdc/tosca/parser/enums/PropertySchemaType.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/SdcTypes.java (renamed from src/main/java/org/onap/sdc/tosca/parser/enums/SdcTypes.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/exceptions/SdcToscaParserException.java (renamed from src/main/java/org/onap/sdc/tosca/parser/exceptions/SdcToscaParserException.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java (renamed from src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java (renamed from src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java (renamed from src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcToscaParserFactory.java (renamed from src/main/java/org/onap/sdc/tosca/parser/impl/SdcToscaParserFactory.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/GeneralUtility.java (renamed from src/main/java/org/onap/sdc/tosca/parser/utils/GeneralUtility.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/PropertyUtils.java (renamed from src/main/java/org/onap/sdc/tosca/parser/utils/PropertyUtils.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/SdcToscaUtility.java (renamed from src/main/java/org/onap/sdc/tosca/parser/utils/SdcToscaUtility.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/YamlToObjectConverter.java (renamed from src/main/java/org/onap/sdc/tosca/parser/utils/YamlToObjectConverter.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/resources/config/configuration.yaml (renamed from src/main/resources/config/configuration.yaml) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/resources/config/error-configuration.yaml (renamed from src/main/resources/config/error-configuration.yaml) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/main/resources/config/jtosca-validation-issue-configuration.yaml (renamed from src/main/resources/config/jtosca-validation-issue-configuration.yaml) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/CapReqWithSameNamesTest.java (renamed from src/test/java/org/onap/sdc/impl/CapReqWithSameNamesTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/GetEntityPortMirroringTest.java (renamed from src/test/java/org/onap/sdc/impl/GetEntityPortMirroringTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/GetEntityTest.java (renamed from src/test/java/org/onap/sdc/impl/GetEntityTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/MyTest.java (renamed from src/test/java/org/onap/sdc/impl/MyTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java (renamed from src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserConfigurationTest.java (renamed from src/test/java/org/onap/sdc/impl/ToscaParserConfigurationTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserDataTypeTest.java (renamed from src/test/java/org/onap/sdc/impl/ToscaParserDataTypeTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java (renamed from src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserGeneralUtilTest.java (renamed from src/test/java/org/onap/sdc/impl/ToscaParserGeneralUtilTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserGroupTest.java (renamed from src/test/java/org/onap/sdc/impl/ToscaParserGroupTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java (renamed from src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserMetadataTest.java (renamed from src/test/java/org/onap/sdc/impl/ToscaParserMetadataTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java (renamed from src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserPolicyTest.java (renamed from src/test/java/org/onap/sdc/impl/ToscaParserPolicyTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserReqAndCapTest.java (renamed from src/test/java/org/onap/sdc/impl/ToscaParserReqAndCapTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserServiceInputTest.java (renamed from src/test/java/org/onap/sdc/impl/ToscaParserServiceInputTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserSubsMappingsTest.java (renamed from src/test/java/org/onap/sdc/impl/ToscaParserSubsMappingsTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserValidationIssueTest.java (renamed from src/test/java/org/onap/sdc/impl/ToscaParserValidationIssueTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java (renamed from src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java (renamed from src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java (renamed from src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/impl/ToscaParserNodeTemplateMockTest.java (renamed from src/test/java/org/onap/sdc/tosca/parser/impl/ToscaParserNodeTemplateMockTest.java) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/resources/config/configuration.yaml (renamed from src/test/resources/config/configuration.yaml) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/resources/config/error-configuration-test.yaml (renamed from src/test/resources/config/error-configuration-test.yaml) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/resources/config/error-configuration.yaml (renamed from src/test/resources/config/error-configuration.yaml) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/resources/config/jtosca-validation-issue-configuration-test.yaml (renamed from src/test/resources/config/jtosca-validation-issue-configuration-test.yaml) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/resources/config/jtosca-validation-issue-configuration.yaml (renamed from src/test/resources/config/jtosca-validation-issue-configuration.yaml) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/csar-invalid-zip.zip (renamed from src/test/resources/csars/csar-invalid-zip.zip) | 0 | ||||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/dataTypes-test-service.csar (renamed from src/test/resources/csars/dataTypes-test-service.csar) | bin | 46307 -> 46307 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/resource-Policy-csar.csar (renamed from src/test/resources/csars/resource-Policy-csar.csar) | bin | 27745 -> 27745 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/resource-Sirovinputannotation-csar.csar (renamed from src/test/resources/csars/resource-Sirovinputannotation-csar.csar) | bin | 76718 -> 76718 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/resource-Vdbe-csar.csar (renamed from src/test/resources/csars/resource-Vdbe-csar.csar) | bin | 68234 -> 68234 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar (renamed from src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar) | bin | 117439 -> 117439 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-AlService-csar.csar (renamed from src/test/resources/csars/service-AlService-csar.csar) | bin | 37560 -> 37560 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-CgnatFwVnfNc-csar.csar (renamed from src/test/resources/csars/service-CgnatFwVnfNc-csar.csar) | bin | 78463 -> 78463 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-CrTestService-csar.csar (renamed from src/test/resources/csars/service-CrTestService-csar.csar) | bin | 32794 -> 32794 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-CxSvc-csar.csar (renamed from src/test/resources/csars/service-CxSvc-csar.csar) | bin | 77970 -> 77970 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-Groupstest-csar.csar (renamed from src/test/resources/csars/service-Groupstest-csar.csar) | bin | 174819 -> 174819 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-Ipassignservice-csar.csar (renamed from src/test/resources/csars/service-Ipassignservice-csar.csar) | bin | 52208 -> 52208 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-JennnyVepdgPortMirroringTest-csar.csar (renamed from src/test/resources/csars/service-JennnyVepdgPortMirroringTest-csar.csar) | bin | 144308 -> 144308 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.csar (renamed from src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.csar) | bin | 146387 -> 146387 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar (renamed from src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar) | bin | 60223 -> 60223 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-Nfod2images-csar.csar (renamed from src/test/resources/csars/service-Nfod2images-csar.csar) | bin | 43477 -> 43477 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-NfodService-csar.csar (renamed from src/test/resources/csars/service-NfodService-csar.csar) | bin | 38938 -> 38938 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-Oren1-csar-4.csar (renamed from src/test/resources/csars/service-Oren1-csar-4.csar) | bin | 31574 -> 31574 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-PortMirroring.csar (renamed from src/test/resources/csars/service-PortMirroring.csar) | bin | 55584 -> 55584 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar (renamed from src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar) | bin | 39954 -> 39954 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar (renamed from src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar) | bin | 39892 -> 39892 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar.csar (renamed from src/test/resources/csars/service-ServiceFdnt-csar.csar) | bin | 40171 -> 40171 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-ServiceFdnt-test-csar.csar (renamed from src/test/resources/csars/service-ServiceFdnt-test-csar.csar) | bin | 39938 -> 39938 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar (renamed from src/test/resources/csars/service-ServiceFdnt-with-get-input.csar) | bin | 45490 -> 45490 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar (renamed from src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar) | bin | 77409 -> 77409 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-Servicetosca9-csar.csar (renamed from src/test/resources/csars/service-Servicetosca9-csar.csar) | bin | 32297 -> 32297 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-VdbePx-csar.csar (renamed from src/test/resources/csars/service-VdbePx-csar.csar) | bin | 39145 -> 39145 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-VdbeSrv-csar.csar (renamed from src/test/resources/csars/service-VdbeSrv-csar.csar) | bin | 74393 -> 74393 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-VlanD2dSrv-csar.csar (renamed from src/test/resources/csars/service-VlanD2dSrv-csar.csar) | bin | 74505 -> 74505 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-consolidated-props-csar.csar (renamed from src/test/resources/csars/service-consolidated-props-csar.csar) | bin | 320210 -> 320210 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-entry-definition-not-defined.csar (renamed from src/test/resources/csars/service-entry-definition-not-defined.csar) | bin | 45157 -> 45157 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-invalid-conformence-level.csar (renamed from src/test/resources/csars/service-invalid-conformence-level.csar) | bin | 45194 -> 45194 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-invalid-input-args.csar (renamed from src/test/resources/csars/service-invalid-input-args.csar) | bin | 105516 -> 105516 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-invalid-yaml-content-meta.csar (renamed from src/test/resources/csars/service-invalid-yaml-content-meta.csar) | bin | 45198 -> 45198 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-max-conformence-level.csar (renamed from src/test/resources/csars/service-max-conformence-level.csar) | bin | 45194 -> 45194 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-missing-csar-meta-file.csar (renamed from src/test/resources/csars/service-missing-csar-meta-file.csar) | bin | 45132 -> 45132 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-missing-entry-definition.csar (renamed from src/test/resources/csars/service-missing-entry-definition.csar) | bin | 42668 -> 42668 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-missing-meta-file.csar (renamed from src/test/resources/csars/service-missing-meta-file.csar) | bin | 44893 -> 44893 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-nested-vfc-csar.csar (renamed from src/test/resources/csars/service-nested-vfc-csar.csar) | bin | 46662 -> 46662 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-resolve-get-input-csar.csar (renamed from src/test/resources/csars/service-resolve-get-input-csar.csar) | bin | 52513 -> 52513 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-resolve-get-input-csar_QA.csar (renamed from src/test/resources/csars/service-resolve-get-input-csar_QA.csar) | bin | 52459 -> 52459 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-sunny-flow.csar (renamed from src/test/resources/csars/service-sunny-flow.csar) | bin | 45324 -> 45324 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/csars/service-sunny-flow2.csar (renamed from src/test/resources/csars/service-sunny-flow2.csar) | bin | 45259 -> 45259 bytes | |||
| -rw-r--r-- | sdc-tosca/src/test/resources/log4j.properties (renamed from src/test/resources/log4j.properties) | 0 |
115 files changed, 670 insertions, 592 deletions
diff --git a/docs/index.rst b/docs/index.rst deleted file mode 100644 index 833e1aa..0000000 --- a/docs/index.rst +++ /dev/null @@ -1,8 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. - -TODO Add files to toctree and delete this header ------------------------------------------------- -.. toctree:: - :maxdepth: 1 - - diff --git a/jtosca/.gitignore b/jtosca/.gitignore new file mode 100644 index 0000000..59bfdd1 --- /dev/null +++ b/jtosca/.gitignore @@ -0,0 +1,20 @@ +# Eclipse +.classpath +.project +.settings/ + +# Maven +log/ +target/ + +# Package Files # +*.jar +*.war +*.ear + +# Other +*.class +*.orig +.idea/* +/bin/ +*.iml diff --git a/jtosca/pom.xml b/jtosca/pom.xml index 8e02299..da019af 100644 --- a/jtosca/pom.xml +++ b/jtosca/pom.xml @@ -1,284 +1,201 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.onap.sdc.jtosca</groupId> - <artifactId>jtosca</artifactId> - <version>1.6.0-SNAPSHOT</version> - <name>sdc-jtosca</name> - - <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>2.0.0</version> - <relativePath/> - </parent> - - <properties> - - <!-- ==================== --> - <!-- Generic properties --> - <!-- ==================== --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - <!-- ==================== --> - <!-- Versions --> - <hamcrest.version>2.1</hamcrest.version> - <!-- ==================== --> - <!-- Global project version --> - - <!-- Dependencies projects version --> - <!--<sonar.skipDesign>true</sonar.skipDesign>--> - <!--<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>--> - <sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath> - <nexus.proxy>https://nexus.onap.org</nexus.proxy> - <sitePath>/content/sites/site/org/onap/sdc/jtosca/${project.version}</sitePath> - <snapshots.path>snapshots</snapshots.path> - <releases.path>releases</releases.path> - <!-- Sonar properties --> - <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding> - <sonar.skipDesign>true</sonar.skipDesign> - <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir> - <sonar.sources>.</sonar.sources> - <sonar.exclusions>**/scripts/**/*</sonar.exclusions> - <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions> - <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions> - <sonar.branch>${project.version}</sonar.branch> - - </properties> - - <dependencies> - <!-- YAML parser --> - <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - <version>1.14</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.25</version> - </dependency> - - <!-- <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.1.2</version> <scope>test</scope> </dependency> --> - - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest</artifactId> - <version>${hamcrest.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> - <version>${hamcrest.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.opencsv</groupId> - <artifactId>opencsv</artifactId> - <version>3.10</version> - <scope>test</scope> - </dependency> - - <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-io --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-io</artifactId> - <version>1.3.2</version> - </dependency> - - <dependency> - <groupId>org.reflections</groupId> - <artifactId>reflections</artifactId> - <version>0.9.11</version> - <exclusions> - <exclusion> <!-- declare the exclusion here --> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <scope>compile</scope> - <version>25.1-jre</version> - </dependency> - - </dependencies> - - <reporting> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - <configuration> - <failOnError>false</failOnError> - <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> - <docletArtifact> - <groupId>org.umlgraph</groupId> - <artifactId>umlgraph</artifactId> - <version>5.6</version> - </docletArtifact> - <additionalparam>-views</additionalparam> - <useStandardDocletOptions>true</useStandardDocletOptions> - </configuration> - </plugin> - </plugins> - </reporting> - - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> - <configuration> - <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> - <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.4</version> - <dependencies> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>2.10</version> - </dependency> - </dependencies> - </plugin> - - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.8</version> - <executions> - <!-- Unit-Tests --> - <execution> - <id>prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <destFile>${sonar.jacoco.reportPath}</destFile> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - <inherited>true</inherited> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> - <configuration/> - </plugin> - <!-- Test --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> - <configuration> - <includes> - <include>*/*</include> - </includes> - </configuration> - </plugin> - <plugin> - <groupId>org.sonarsource.scanner.maven</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>3.0.2</version> - </plugin> - <plugin> - <groupId>com.github.sylvainlaurent.maven</groupId> - <artifactId>yaml-json-validator-maven-plugin</artifactId> - <version>1.0.1</version> - <executions> - <execution> - <id>validate</id> - <phase>validate</phase> - <goals> - <goal>validate</goal> - </goals> - <configuration> - <validationSets> - <validationSet> - <includes> - <include>src/main/resources/**/*.y*ml</include> - <include>src/test/resources/**/*.y*ml</include> - </includes> - </validationSet> - <validationSet> - <includes> - <include>src/main/resources/**/*.json</include> - <include>src/test/resources/**/*.json</include> - </includes> - </validationSet> - </validationSets> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <repositories> - <repository> - <id>central</id> - <name>Official Maven repository</name> - <url>http://repo2.maven.org/maven2/</url> - </repository> - <repository> - <id>onap-releases</id> - <name>Release Repository</name> - <url>${nexus.proxy}/content/repositories/releases/</url> - </repository> - <repository> - <id>onap-snapshots</id> - <name>Snapshots Repository</name> - <url>${nexus.proxy}/content/repositories/snapshots/</url> - </repository> - </repositories> - - <distributionManagement> - <repository> - <id>onap-releases</id> - <name>Release Repository</name> - <url>${nexus.proxy}/content/repositories/${releases.path}/</url> - </repository> - <snapshotRepository> - <id>onap-snapshots</id> - <name>Snapshot Repository</name> - <url>${nexus.proxy}/content/repositories/${snapshots.path}/</url> - </snapshotRepository> - <site> - <id>onap-site</id> - <url>dav:${nexus.proxy}${sitePath}</url> - </site> - </distributionManagement> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <artifactId>jtosca</artifactId> + <name>sdc-jtosca</name> + <packaging>jar</packaging> + + <parent> + <groupId>org.onap.sdc.sdc-tosca</groupId> + <artifactId>sdc-tosca-jtosca</artifactId> + <version>1.6.5-SNAPSHOT</version> + </parent> + + <dependencies> + <dependency> + <groupId>org.reflections</groupId> + <artifactId>reflections</artifactId> + <version>0.9.11</version> + </dependency> + + <!-- TEST --> + <dependency> + <groupId>com.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>3.10</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + <version>${hamcrest.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <reporting> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.4</version> + <configuration> + <failOnError>false</failOnError> + <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> + <docletArtifact> + <groupId>org.umlgraph</groupId> + <artifactId>umlgraph</artifactId> + <version>5.6</version> + </docletArtifact> + <additionalparam>-views</additionalparam> + <useStandardDocletOptions>true</useStandardDocletOptions> + </configuration> + </plugin> + </plugins> + </reporting> + + <build> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> + <configuration> + <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> + <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.4</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>2.10</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.8</version> + <executions> + <!-- Unit-Tests --> + <execution> + <id>prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <destFile>${sonar.jacoco.reportPath}</destFile> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.5.1</version> + <inherited>true</inherited> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.3</version> + <configuration/> + </plugin> + <!-- Test --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.19.1</version> + <configuration> + <includes> + <include>*/*</include> + </includes> + </configuration> + </plugin> + <plugin> + <groupId>org.sonarsource.scanner.maven</groupId> + <artifactId>sonar-maven-plugin</artifactId> + <version>3.0.2</version> + </plugin> + <plugin> + <groupId>com.github.sylvainlaurent.maven</groupId> + <artifactId>yaml-json-validator-maven-plugin</artifactId> + <version>1.0.1</version> + <executions> + <execution> + <id>validate</id> + <phase>validate</phase> + <goals> + <goal>validate</goal> + </goals> + <configuration> + <validationSets> + <validationSet> + <includes> + <include>src/main/resources/**/*.y*ml</include> + <include>src/test/resources/**/*.y*ml</include> + </includes> + </validationSet> + <validationSet> + <includes> + <include>src/main/resources/**/*.json</include> + <include>src/test/resources/**/*.json</include> + </includes> + </validationSet> + </validationSets> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <repositories> + <repository> + <id>central</id> + <name>Official Maven repository</name> + <url>http://repo2.maven.org/maven2/</url> + </repository> + <repository> + <id>onap-releases</id> + <name>Release Repository</name> + <url>${nexus.proxy}/content/repositories/releases/</url> + </repository> + <repository> + <id>onap-snapshots</id> + <name>Snapshots Repository</name> + <url>${nexus.proxy}/content/repositories/snapshots/</url> + </repository> + </repositories> + + <distributionManagement> + <repository> + <id>onap-releases</id> + <name>Release Repository</name> + <url>${nexus.proxy}/content/repositories/${releases.path}/</url> + </repository> + <snapshotRepository> + <id>onap-snapshots</id> + <name>Snapshot Repository</name> + <url>${nexus.proxy}/content/repositories/${snapshots.path}/</url> + </snapshotRepository> + <site> + <id>onap-site</id> + <url>dav:${nexus.proxy}${sitePath}</url> + </site> + </distributionManagement> </project> @@ -1,327 +1,256 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.onap.sdc.sdc-tosca</groupId> - <artifactId>sdc-tosca</artifactId> - <name>sdc-sdc-tosca</name> - <description>SDC Tosca Parser JAR file for use by consumers</description> - <version>1.6.5-SNAPSHOT</version> - <packaging>jar</packaging> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>2.0.0</version> - <relativePath/> - </parent> + <groupId>org.onap.sdc.sdc-tosca</groupId> + <artifactId>sdc-tosca-jtosca</artifactId> + <name>sdc-tosca-jtosca</name> + <description>SDC Tosca Parser JAR file for use by consumers</description> + <version>1.6.5-SNAPSHOT</version> + <packaging>pom</packaging> - <properties> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>2.0.0</version> + <relativePath/> + </parent> - <!-- ==================== --> - <!-- Generic properties --> - <!-- ==================== --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <modules> + <module>sdc-tosca</module> + <module>jtosca</module> + </modules> - <!-- ==================== --> - <!-- Versions --> - <!-- ==================== --> - <!-- Global project version --> + <properties> - <!-- Dependencies projects version --> - <!--<sonar.skipDesign>true</sonar.skipDesign>--> - <!--<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>--> - <sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath> - <nexus.proxy>https://nexus.onap.org</nexus.proxy> - <sitePath>/content/sites/site/org/onap/sdc/sdc-tosca/${project.version}</sitePath> - <snapshots.path>snapshots</snapshots.path> - <releases.path>releases</releases.path> - <!-- Sonar properties --> - <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding> - <sonar.skipDesign>true</sonar.skipDesign> - <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir> - <sonar.sources>.</sonar.sources> - <sonar.exclusions>**/scripts/**/*</sonar.exclusions> - <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions> - <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions> - <sonar.branch>${project.version}</sonar.branch> + <!-- ==================== --> + <!-- Generic properties --> + <!-- ==================== --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + <!-- ==================== --> + <!-- Versions --> + <hamcrest.version>2.1</hamcrest.version> + <!-- ==================== --> + <!-- Global project version --> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>compile</scope> - <version>1.7.10</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - <version>1.7.10</version> - </dependency> + <!-- Dependencies projects version --> + <!--<sonar.skipDesign>true</sonar.skipDesign>--> + <!--<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>--> + <sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath> + <nexus.proxy>https://nexus.onap.org</nexus.proxy> + <sitePath>/content/sites/site/org/onap/sdc/sdc-tosca/${project.version}</sitePath> + <snapshots.path>snapshots</snapshots.path> + <releases.path>releases</releases.path> + <!-- Sonar properties --> + <sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding> + <sonar.skipDesign>true</sonar.skipDesign> + <sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir> + <sonar.sources>.</sonar.sources> + <sonar.exclusions>**/scripts/**/*</sonar.exclusions> + <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions> + <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java + </sonar.inclusions> + <sonar.branch>${project.version}</sonar.branch> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>2.3.1</version> - <scope>compile</scope> - </dependency> + </properties> - <dependency> - <groupId>org.functionaljava</groupId> - <artifactId>functionaljava</artifactId> - <version>4.2</version> - <scope>compile</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.25</version> + </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.5</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> - <!-- YAML parser --> - <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - <version>1.14</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <scope>compile</scope> + <version>25.1-jre</version> + </dependency> - <!-- Apache Commons --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.5</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>21.0</version> - <scope>compile</scope> - </dependency> - <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind --> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>2.9.9</version> - </dependency> + <!-- YAML parser --> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.14</version> + <scope>compile</scope> + </dependency> - <!-- jtosca Tosca Parser --> - <dependency> - <groupId>org.onap.sdc.jtosca</groupId> - <artifactId>jtosca</artifactId> - <version>1.6.0</version> - </dependency> + </dependencies> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.4</version> + <configuration> + <failOnError>false</failOnError> + <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> + <docletArtifact> + <groupId>org.umlgraph</groupId> + <artifactId>umlgraph</artifactId> + <version>5.6</version> + </docletArtifact> + <additionalparam>-views</additionalparam> + <useStandardDocletOptions>true</useStandardDocletOptions> + </configuration> + </plugin> + </plugins> + </reporting> - <!-- TEST --> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <scope>test</scope> - <version>9.4.18.v20190429</version> - </dependency> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.4</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>2.10</version> + </dependency> + </dependencies> + </plugin> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <version>9.4.18.v20190429</version> - <scope>test</scope> - </dependency> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> + <configuration> + <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> + <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression> + </configuration> + </plugin> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>6.11</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - <configuration> - <failOnError>false</failOnError> - <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> - <docletArtifact> - <groupId>org.umlgraph</groupId> - <artifactId>umlgraph</artifactId> - <version>5.6</version> - </docletArtifact> - <additionalparam>-views</additionalparam> - <useStandardDocletOptions>true</useStandardDocletOptions> - </configuration> - </plugin> - </plugins> - </reporting> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.4</version> - <dependencies> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>2.10</version> - </dependency> - </dependencies> - </plugin> - - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> - <configuration> - <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> - <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression> - </configuration> - </plugin> - - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.8</version> - <executions> - <!-- Unit-Tests --> - <execution> - <id>prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.8</version> + <executions> + <!-- Unit-Tests --> + <execution> + <id>prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> <destFile>${sonar.jacoco.reportPath}</destFile> - </configuration> - </execution> - </executions> - </plugin> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - <inherited>true</inherited> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> - <configuration /> - </plugin> - <!-- Test --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> - <configuration> - <argLine>${argLine} -Xmx2048m</argLine> - <includes> - <include>**/ToscaParser***Test.class</include> - </includes> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.5.1</version> + <inherited>true</inherited> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.3</version> + <configuration/> + </plugin> + <!-- Test --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.19.1</version> + <configuration> + <argLine>${argLine} -Xmx2048m</argLine> + <includes> + <include>**/ToscaParser***Test.class</include> + </includes> + </configuration> + </plugin> - <plugin> - <groupId>org.sonarsource.scanner.maven</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>3.0.2</version> - </plugin> + <plugin> + <groupId>org.sonarsource.scanner.maven</groupId> + <artifactId>sonar-maven-plugin</artifactId> + <version>3.0.2</version> + </plugin> - <plugin> - <groupId>com.github.sylvainlaurent.maven</groupId> - <artifactId>yaml-json-validator-maven-plugin</artifactId> - <version>1.0.1</version> - <executions> - <execution> - <id>validate</id> - <phase>validate</phase> - <goals> - <goal>validate</goal> - </goals> - <configuration> - <validationSets> - <validationSet> - <includes> - <include>src/main/resources/**/*.y*ml</include> - <include>src/test/resources/**/*.y*ml</include> - </includes> - </validationSet> - <validationSet> - <includes> - <include>src/main/resources/**/*.json</include> - <include>src/test/resources/**/*.json</include> - </includes> - </validationSet> - </validationSets> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <plugin> + <groupId>com.github.sylvainlaurent.maven</groupId> + <artifactId>yaml-json-validator-maven-plugin</artifactId> + <version>1.0.1</version> + <executions> + <execution> + <id>validate</id> + <phase>validate</phase> + <goals> + <goal>validate</goal> + </goals> + <configuration> + <validationSets> + <validationSet> + <includes> + <include>src/main/resources/**/*.y*ml</include> + <include>src/test/resources/**/*.y*ml</include> + </includes> + </validationSet> + <validationSet> + <includes> + <include>src/main/resources/**/*.json</include> + <include>src/test/resources/**/*.json</include> + </includes> + </validationSet> + </validationSets> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - <repositories> - <repository> - <id>central</id> - <name>Official Maven repository</name> - <url>http://repo2.maven.org/maven2/</url> - </repository> - <repository> - <id>ecomp-releases</id> - <name>Release Repository</name> - <url>${nexus.proxy}/content/repositories/releases/</url> - </repository> - <repository> - <id>ecomp-snapshots</id> - <name>Snapshots Repository</name> - <url>${nexus.proxy}/content/repositories/snapshots/</url> - </repository> - </repositories> + <repositories> + <repository> + <id>central</id> + <name>Official Maven repository</name> + <url>http://repo2.maven.org/maven2/</url> + </repository> + <repository> + <id>ecomp-releases</id> + <name>Release Repository</name> + <url>${nexus.proxy}/content/repositories/releases/</url> + </repository> + <repository> + <id>ecomp-snapshots</id> + <name>Snapshots Repository</name> + <url>${nexus.proxy}/content/repositories/snapshots/</url> + </repository> + </repositories> - <distributionManagement> - <repository> - <id>ecomp-releases</id> - <name>Release Repository</name> - <url>${nexus.proxy}/content/repositories/${releases.path}/</url> - </repository> - <snapshotRepository> - <id>ecomp-snapshots</id> - <name>Snapshot Repository</name> - <url>${nexus.proxy}/content/repositories/${snapshots.path}/</url> - </snapshotRepository> - <site> - <id>ecomp-site</id> - <url>dav:${nexus.proxy}${sitePath}</url> - </site> - </distributionManagement> + <distributionManagement> + <repository> + <id>ecomp-releases</id> + <name>Release Repository</name> + <url>${nexus.proxy}/content/repositories/${releases.path}/</url> + </repository> + <snapshotRepository> + <id>ecomp-snapshots</id> + <name>Snapshot Repository</name> + <url>${nexus.proxy}/content/repositories/${snapshots.path}/</url> + </snapshotRepository> + <site> + <id>ecomp-site</id> + <url>dav:${nexus.proxy}${sitePath}</url> + </site> + </distributionManagement> </project> diff --git a/sdc-tosca/pom.xml b/sdc-tosca/pom.xml new file mode 100644 index 0000000..6044090 --- /dev/null +++ b/sdc-tosca/pom.xml @@ -0,0 +1,220 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <artifactId>sdc-tosca</artifactId> + <name>sdc-tosca</name> + <description>SDC Tosca Parser JAR file for use by consumers</description> + <packaging>jar</packaging> + + <parent> + <groupId>org.onap.sdc.sdc-tosca</groupId> + <artifactId>sdc-tosca-jtosca</artifactId> + <version>1.6.5-SNAPSHOT</version> + </parent> + + <dependencies> + <!-- jtosca Tosca Parser --> + <dependency> + <groupId>org.onap.sdc.sdc-tosca</groupId> + <artifactId>jtosca</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.9.9</version> + </dependency> + + <!-- Apache Commons --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.5</version> + <scope>compile</scope> + </dependency> + + <!-- TEST --> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.10.19</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.11</version> + <scope>test</scope> + </dependency> + </dependencies> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.4</version> + <configuration> + <failOnError>false</failOnError> + <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> + <docletArtifact> + <groupId>org.umlgraph</groupId> + <artifactId>umlgraph</artifactId> + <version>5.6</version> + </docletArtifact> + <additionalparam>-views</additionalparam> + <useStandardDocletOptions>true</useStandardDocletOptions> + </configuration> + </plugin> + </plugins> + </reporting> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.4</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>2.10</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> + <configuration> + <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> + <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression> + </configuration> + </plugin> + + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.8</version> + <executions> + <!-- Unit-Tests --> + <execution> + <id>prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <destFile>target/jacoco.exec</destFile> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.5.1</version> + <inherited>true</inherited> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.3</version> + <configuration/> + </plugin> + <!-- Test --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.19.1</version> + <configuration> + <argLine>${argLine} -Xmx2048m</argLine> + <includes> + <include>**/ToscaParser***Test.class</include> + </includes> + </configuration> + </plugin> + + <plugin> + <groupId>org.sonarsource.scanner.maven</groupId> + <artifactId>sonar-maven-plugin</artifactId> + <version>3.0.2</version> + </plugin> + + <plugin> + <groupId>com.github.sylvainlaurent.maven</groupId> + <artifactId>yaml-json-validator-maven-plugin</artifactId> + <version>1.0.1</version> + <executions> + <execution> + <id>validate</id> + <phase>validate</phase> + <goals> + <goal>validate</goal> + </goals> + <configuration> + <validationSets> + <validationSet> + <includes> + <include>src/main/resources/**/*.y*ml</include> + <include>src/test/resources/**/*.y*ml</include> + </includes> + </validationSet> + <validationSet> + <includes> + <include>src/main/resources/**/*.json</include> + <include>src/test/resources/**/*.json</include> + </includes> + </validationSet> + </validationSets> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <repositories> + <repository> + <id>central</id> + <name>Official Maven repository</name> + <url>http://repo2.maven.org/maven2/</url> + </repository> + <repository> + <id>ecomp-releases</id> + <name>Release Repository</name> + <url>${nexus.proxy}/content/repositories/releases/</url> + </repository> + <repository> + <id>ecomp-snapshots</id> + <name>Snapshots Repository</name> + <url>${nexus.proxy}/content/repositories/snapshots/</url> + </repository> + </repositories> + + <distributionManagement> + <repository> + <id>ecomp-releases</id> + <name>Release Repository</name> + <url>${nexus.proxy}/content/repositories/${releases.path}/</url> + </repository> + <snapshotRepository> + <id>ecomp-snapshots</id> + <name>Snapshot Repository</name> + <url>${nexus.proxy}/content/repositories/${snapshots.path}/</url> + </snapshotRepository> + <site> + <id>ecomp-site</id> + <url>dav:${nexus.proxy}${sitePath}</url> + </site> + </distributionManagement> +</project> diff --git a/src/main/java/org/onap/sdc/tosca/parser/api/ConformanceLevel.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/ConformanceLevel.java index 4124690..4124690 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/api/ConformanceLevel.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/ConformanceLevel.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/api/IEntityDetails.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/IEntityDetails.java index b69a8b3..b69a8b3 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/api/IEntityDetails.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/IEntityDetails.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java index e4e8f3c..e4e8f3c 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/ISdcCsarHelper.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/api/Version.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/Version.java index 439c7bd..439c7bd 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/api/Version.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/api/Version.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/Configuration.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/Configuration.java index 6c49f29..6c49f29 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/config/Configuration.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/Configuration.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/ConfigurationManager.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ConfigurationManager.java index 6ad728e..6ad728e 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/config/ConfigurationManager.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ConfigurationManager.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/ErrorConfiguration.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ErrorConfiguration.java index 1b1f2e2..1b1f2e2 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/config/ErrorConfiguration.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ErrorConfiguration.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/ErrorInfo.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ErrorInfo.java index 52a92c4..52a92c4 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/config/ErrorInfo.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/ErrorInfo.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/JToscaValidationIssueInfo.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/JToscaValidationIssueInfo.java index 2f9bb09..2f9bb09 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/config/JToscaValidationIssueInfo.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/JToscaValidationIssueInfo.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/JtoscaValidationIssueConfiguration.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/JtoscaValidationIssueConfiguration.java index 55912e6..55912e6 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/config/JtoscaValidationIssueConfiguration.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/JtoscaValidationIssueConfiguration.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/config/SdcToscaParserErrors.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/SdcToscaParserErrors.java index c6375a5..c6375a5 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/config/SdcToscaParserErrors.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/config/SdcToscaParserErrors.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetails.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetails.java index 6054ac9..6054ac9 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetails.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetails.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactory.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactory.java index d56891e..d56891e 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactory.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactory.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java index 664fe42..664fe42 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/GroupEntityDetails.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/NodeTemplateEntityDetails.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/NodeTemplateEntityDetails.java index 3b7aa99..3b7aa99 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/elements/NodeTemplateEntityDetails.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/NodeTemplateEntityDetails.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/PolicyEntityDetails.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/PolicyEntityDetails.java index 91577b9..91577b9 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/elements/PolicyEntityDetails.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/PolicyEntityDetails.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/AllEntitiesQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/AllEntitiesQuery.java index d0585fa..d0585fa 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/AllEntitiesQuery.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/AllEntitiesQuery.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java index e3af94f..e3af94f 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/EntityQuery.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/GroupEntityQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/GroupEntityQuery.java index dba16d3..dba16d3 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/GroupEntityQuery.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/GroupEntityQuery.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java index 30784e7..30784e7 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/NodeTemplateEntityQuery.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java index f93505d..f93505d 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/PolicyEntityQuery.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQuery.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQuery.java index 99dd7fd..99dd7fd 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQuery.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQuery.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/enums/EntityTemplateType.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/EntityTemplateType.java index b35a997..b35a997 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/enums/EntityTemplateType.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/EntityTemplateType.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/enums/FilterType.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/FilterType.java index 028242f..028242f 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/enums/FilterType.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/FilterType.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/enums/JToscaValidationIssueType.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/JToscaValidationIssueType.java index 0247ef8..0247ef8 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/enums/JToscaValidationIssueType.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/JToscaValidationIssueType.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/enums/PropertySchemaType.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/PropertySchemaType.java index 656f3ce..656f3ce 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/enums/PropertySchemaType.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/PropertySchemaType.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/enums/SdcTypes.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/SdcTypes.java index e1339f9..e1339f9 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/enums/SdcTypes.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/enums/SdcTypes.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/exceptions/SdcToscaParserException.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/exceptions/SdcToscaParserException.java index e163295..e163295 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/exceptions/SdcToscaParserException.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/exceptions/SdcToscaParserException.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java index 6fd5ce5..6fd5ce5 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/QueryProcessor.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java index 95530f0..95530f0 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcCsarHelperImpl.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java index 0884281..0884281 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcPropertyNames.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/impl/SdcToscaParserFactory.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcToscaParserFactory.java index e24a231..e24a231 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/impl/SdcToscaParserFactory.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/impl/SdcToscaParserFactory.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/utils/GeneralUtility.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/GeneralUtility.java index 02995a2..02995a2 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/utils/GeneralUtility.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/GeneralUtility.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/utils/PropertyUtils.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/PropertyUtils.java index e150d75..e150d75 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/utils/PropertyUtils.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/PropertyUtils.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/utils/SdcToscaUtility.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/SdcToscaUtility.java index ff3a31c..ff3a31c 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/utils/SdcToscaUtility.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/SdcToscaUtility.java diff --git a/src/main/java/org/onap/sdc/tosca/parser/utils/YamlToObjectConverter.java b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/YamlToObjectConverter.java index 86ecb9f..86ecb9f 100644 --- a/src/main/java/org/onap/sdc/tosca/parser/utils/YamlToObjectConverter.java +++ b/sdc-tosca/src/main/java/org/onap/sdc/tosca/parser/utils/YamlToObjectConverter.java diff --git a/src/main/resources/config/configuration.yaml b/sdc-tosca/src/main/resources/config/configuration.yaml index 4a620c3..4a620c3 100644 --- a/src/main/resources/config/configuration.yaml +++ b/sdc-tosca/src/main/resources/config/configuration.yaml diff --git a/src/main/resources/config/error-configuration.yaml b/sdc-tosca/src/main/resources/config/error-configuration.yaml index ff9c6ed..ff9c6ed 100644 --- a/src/main/resources/config/error-configuration.yaml +++ b/sdc-tosca/src/main/resources/config/error-configuration.yaml diff --git a/src/main/resources/config/jtosca-validation-issue-configuration.yaml b/sdc-tosca/src/main/resources/config/jtosca-validation-issue-configuration.yaml index 85861b5..85861b5 100644 --- a/src/main/resources/config/jtosca-validation-issue-configuration.yaml +++ b/sdc-tosca/src/main/resources/config/jtosca-validation-issue-configuration.yaml diff --git a/src/test/java/org/onap/sdc/impl/CapReqWithSameNamesTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/CapReqWithSameNamesTest.java index 4203293..4203293 100644 --- a/src/test/java/org/onap/sdc/impl/CapReqWithSameNamesTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/CapReqWithSameNamesTest.java diff --git a/src/test/java/org/onap/sdc/impl/GetEntityPortMirroringTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/GetEntityPortMirroringTest.java index 33e130e..33e130e 100644 --- a/src/test/java/org/onap/sdc/impl/GetEntityPortMirroringTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/GetEntityPortMirroringTest.java diff --git a/src/test/java/org/onap/sdc/impl/GetEntityTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/GetEntityTest.java index e741cea..e741cea 100644 --- a/src/test/java/org/onap/sdc/impl/GetEntityTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/GetEntityTest.java diff --git a/src/test/java/org/onap/sdc/impl/MyTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/MyTest.java index a1dcf5b..a1dcf5b 100644 --- a/src/test/java/org/onap/sdc/impl/MyTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/MyTest.java diff --git a/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java index 0dfe2df..0dfe2df 100644 --- a/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserConfigurationTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserConfigurationTest.java index 30f85e8..30f85e8 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserConfigurationTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserConfigurationTest.java diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserDataTypeTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserDataTypeTest.java index aed9445..aed9445 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserDataTypeTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserDataTypeTest.java diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java index 6c88494..6c88494 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserGeneralUtilTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserGeneralUtilTest.java index c242d85..c242d85 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserGeneralUtilTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserGeneralUtilTest.java diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserGroupTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserGroupTest.java index dc79bb1..dc79bb1 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserGroupTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserGroupTest.java diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java index a22fd11..a22fd11 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserInterfaceTest.java diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserMetadataTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserMetadataTest.java index 2acd5a4..2acd5a4 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserMetadataTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserMetadataTest.java diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java index 1a36506..1a36506 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserPolicyTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserPolicyTest.java index ea5212a..ea5212a 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserPolicyTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserPolicyTest.java diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserReqAndCapTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserReqAndCapTest.java index 7d4aaf3..7d4aaf3 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserReqAndCapTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserReqAndCapTest.java diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserServiceInputTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserServiceInputTest.java index d6bbc93..d6bbc93 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserServiceInputTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserServiceInputTest.java diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserSubsMappingsTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserSubsMappingsTest.java index c9ad332..c9ad332 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserSubsMappingsTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserSubsMappingsTest.java diff --git a/src/test/java/org/onap/sdc/impl/ToscaParserValidationIssueTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserValidationIssueTest.java index e74643f..e74643f 100644 --- a/src/test/java/org/onap/sdc/impl/ToscaParserValidationIssueTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserValidationIssueTest.java diff --git a/src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java index f33e1a7..f33e1a7 100644 --- a/src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/EntityDetailsFactoryTest.java diff --git a/src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java index a9af7d9..a9af7d9 100644 --- a/src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/EntityQueryTest.java diff --git a/src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java index 68c4329..68c4329 100644 --- a/src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/elements/queries/TopologyTemplateQueryTest.java diff --git a/src/test/java/org/onap/sdc/tosca/parser/impl/ToscaParserNodeTemplateMockTest.java b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/impl/ToscaParserNodeTemplateMockTest.java index 76b1735..76b1735 100644 --- a/src/test/java/org/onap/sdc/tosca/parser/impl/ToscaParserNodeTemplateMockTest.java +++ b/sdc-tosca/src/test/java/org/onap/sdc/tosca/parser/impl/ToscaParserNodeTemplateMockTest.java diff --git a/src/test/resources/config/configuration.yaml b/sdc-tosca/src/test/resources/config/configuration.yaml index f070c1d..f070c1d 100644 --- a/src/test/resources/config/configuration.yaml +++ b/sdc-tosca/src/test/resources/config/configuration.yaml diff --git a/src/test/resources/config/error-configuration-test.yaml b/sdc-tosca/src/test/resources/config/error-configuration-test.yaml index de603c6..de603c6 100644 --- a/src/test/resources/config/error-configuration-test.yaml +++ b/sdc-tosca/src/test/resources/config/error-configuration-test.yaml diff --git a/src/test/resources/config/error-configuration.yaml b/sdc-tosca/src/test/resources/config/error-configuration.yaml index 296c681..296c681 100644 --- a/src/test/resources/config/error-configuration.yaml +++ b/sdc-tosca/src/test/resources/config/error-configuration.yaml diff --git a/src/test/resources/config/jtosca-validation-issue-configuration-test.yaml b/sdc-tosca/src/test/resources/config/jtosca-validation-issue-configuration-test.yaml index 1378ca7..1378ca7 100644 --- a/src/test/resources/config/jtosca-validation-issue-configuration-test.yaml +++ b/sdc-tosca/src/test/resources/config/jtosca-validation-issue-configuration-test.yaml diff --git a/src/test/resources/config/jtosca-validation-issue-configuration.yaml b/sdc-tosca/src/test/resources/config/jtosca-validation-issue-configuration.yaml index 3f62953..3f62953 100644 --- a/src/test/resources/config/jtosca-validation-issue-configuration.yaml +++ b/sdc-tosca/src/test/resources/config/jtosca-validation-issue-configuration.yaml diff --git a/src/test/resources/csars/csar-invalid-zip.zip b/sdc-tosca/src/test/resources/csars/csar-invalid-zip.zip index 04de055..04de055 100644 --- a/src/test/resources/csars/csar-invalid-zip.zip +++ b/sdc-tosca/src/test/resources/csars/csar-invalid-zip.zip diff --git a/src/test/resources/csars/dataTypes-test-service.csar b/sdc-tosca/src/test/resources/csars/dataTypes-test-service.csar Binary files differindex b4de177..b4de177 100644 --- a/src/test/resources/csars/dataTypes-test-service.csar +++ b/sdc-tosca/src/test/resources/csars/dataTypes-test-service.csar diff --git a/src/test/resources/csars/resource-Policy-csar.csar b/sdc-tosca/src/test/resources/csars/resource-Policy-csar.csar Binary files differindex 67cc528..67cc528 100644 --- a/src/test/resources/csars/resource-Policy-csar.csar +++ b/sdc-tosca/src/test/resources/csars/resource-Policy-csar.csar diff --git a/src/test/resources/csars/resource-Sirovinputannotation-csar.csar b/sdc-tosca/src/test/resources/csars/resource-Sirovinputannotation-csar.csar Binary files differindex 984e052..984e052 100644 --- a/src/test/resources/csars/resource-Sirovinputannotation-csar.csar +++ b/sdc-tosca/src/test/resources/csars/resource-Sirovinputannotation-csar.csar diff --git a/src/test/resources/csars/resource-Vdbe-csar.csar b/sdc-tosca/src/test/resources/csars/resource-Vdbe-csar.csar Binary files differindex 0705852..0705852 100644 --- a/src/test/resources/csars/resource-Vdbe-csar.csar +++ b/sdc-tosca/src/test/resources/csars/resource-Vdbe-csar.csar diff --git a/src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar b/sdc-tosca/src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar Binary files differindex 28aa6f4..28aa6f4 100644 --- a/src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-AdiodVmxVpeBvService-csar.csar diff --git a/src/test/resources/csars/service-AlService-csar.csar b/sdc-tosca/src/test/resources/csars/service-AlService-csar.csar Binary files differindex 653b80d..653b80d 100644 --- a/src/test/resources/csars/service-AlService-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-AlService-csar.csar diff --git a/src/test/resources/csars/service-CgnatFwVnfNc-csar.csar b/sdc-tosca/src/test/resources/csars/service-CgnatFwVnfNc-csar.csar Binary files differindex 60c2589..60c2589 100644 --- a/src/test/resources/csars/service-CgnatFwVnfNc-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-CgnatFwVnfNc-csar.csar diff --git a/src/test/resources/csars/service-CrTestService-csar.csar b/sdc-tosca/src/test/resources/csars/service-CrTestService-csar.csar Binary files differindex 445fd2b..445fd2b 100644 --- a/src/test/resources/csars/service-CrTestService-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-CrTestService-csar.csar diff --git a/src/test/resources/csars/service-CxSvc-csar.csar b/sdc-tosca/src/test/resources/csars/service-CxSvc-csar.csar Binary files differindex ad77cc4..ad77cc4 100644 --- a/src/test/resources/csars/service-CxSvc-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-CxSvc-csar.csar diff --git a/src/test/resources/csars/service-Groupstest-csar.csar b/sdc-tosca/src/test/resources/csars/service-Groupstest-csar.csar Binary files differindex 1d48da0..1d48da0 100644 --- a/src/test/resources/csars/service-Groupstest-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-Groupstest-csar.csar diff --git a/src/test/resources/csars/service-Ipassignservice-csar.csar b/sdc-tosca/src/test/resources/csars/service-Ipassignservice-csar.csar Binary files differindex 007b96a..007b96a 100644 --- a/src/test/resources/csars/service-Ipassignservice-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-Ipassignservice-csar.csar diff --git a/src/test/resources/csars/service-JennnyVepdgPortMirroringTest-csar.csar b/sdc-tosca/src/test/resources/csars/service-JennnyVepdgPortMirroringTest-csar.csar Binary files differindex 7e8ebb3..7e8ebb3 100644 --- a/src/test/resources/csars/service-JennnyVepdgPortMirroringTest-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-JennnyVepdgPortMirroringTest-csar.csar diff --git a/src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.csar b/sdc-tosca/src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.csar Binary files differindex be550f9..be550f9 100644 --- a/src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.csar diff --git a/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar b/sdc-tosca/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar Binary files differindex aabf83c..aabf83c 100644 --- a/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-NetworkCloudVnfServiceMock-csar.csar diff --git a/src/test/resources/csars/service-Nfod2images-csar.csar b/sdc-tosca/src/test/resources/csars/service-Nfod2images-csar.csar Binary files differindex c735033..c735033 100644 --- a/src/test/resources/csars/service-Nfod2images-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-Nfod2images-csar.csar diff --git a/src/test/resources/csars/service-NfodService-csar.csar b/sdc-tosca/src/test/resources/csars/service-NfodService-csar.csar Binary files differindex 329076a..329076a 100644 --- a/src/test/resources/csars/service-NfodService-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-NfodService-csar.csar diff --git a/src/test/resources/csars/service-Oren1-csar-4.csar b/sdc-tosca/src/test/resources/csars/service-Oren1-csar-4.csar Binary files differindex 1e1f738..1e1f738 100644 --- a/src/test/resources/csars/service-Oren1-csar-4.csar +++ b/sdc-tosca/src/test/resources/csars/service-Oren1-csar-4.csar diff --git a/src/test/resources/csars/service-PortMirroring.csar b/sdc-tosca/src/test/resources/csars/service-PortMirroring.csar Binary files differindex c3a44a0..c3a44a0 100644 --- a/src/test/resources/csars/service-PortMirroring.csar +++ b/sdc-tosca/src/test/resources/csars/service-PortMirroring.csar diff --git a/src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar Binary files differindex c35baf5..c35baf5 100644 --- a/src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar +++ b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar diff --git a/src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar Binary files differindex f3b3a46..f3b3a46 100644 --- a/src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar +++ b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar diff --git a/src/test/resources/csars/service-ServiceFdnt-csar.csar b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar.csar Binary files differindex 983dc9b..983dc9b 100644 --- a/src/test/resources/csars/service-ServiceFdnt-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-csar.csar diff --git a/src/test/resources/csars/service-ServiceFdnt-test-csar.csar b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-test-csar.csar Binary files differindex 5a364cd..5a364cd 100644 --- a/src/test/resources/csars/service-ServiceFdnt-test-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-test-csar.csar diff --git a/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar Binary files differindex c5a277b..c5a277b 100644 --- a/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar +++ b/sdc-tosca/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar diff --git a/src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar b/sdc-tosca/src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar Binary files differindex 9afc278..9afc278 100644 --- a/src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-ServiceForToscaParserTests-csar.csar diff --git a/src/test/resources/csars/service-Servicetosca9-csar.csar b/sdc-tosca/src/test/resources/csars/service-Servicetosca9-csar.csar Binary files differindex 0627cfc..0627cfc 100644 --- a/src/test/resources/csars/service-Servicetosca9-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-Servicetosca9-csar.csar diff --git a/src/test/resources/csars/service-VdbePx-csar.csar b/sdc-tosca/src/test/resources/csars/service-VdbePx-csar.csar Binary files differindex 3032768..3032768 100644 --- a/src/test/resources/csars/service-VdbePx-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-VdbePx-csar.csar diff --git a/src/test/resources/csars/service-VdbeSrv-csar.csar b/sdc-tosca/src/test/resources/csars/service-VdbeSrv-csar.csar Binary files differindex f911753..f911753 100644 --- a/src/test/resources/csars/service-VdbeSrv-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-VdbeSrv-csar.csar diff --git a/src/test/resources/csars/service-VlanD2dSrv-csar.csar b/sdc-tosca/src/test/resources/csars/service-VlanD2dSrv-csar.csar Binary files differindex efec4c0..efec4c0 100644 --- a/src/test/resources/csars/service-VlanD2dSrv-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-VlanD2dSrv-csar.csar diff --git a/src/test/resources/csars/service-consolidated-props-csar.csar b/sdc-tosca/src/test/resources/csars/service-consolidated-props-csar.csar Binary files differindex 4a3fde6..4a3fde6 100644 --- a/src/test/resources/csars/service-consolidated-props-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-consolidated-props-csar.csar diff --git a/src/test/resources/csars/service-entry-definition-not-defined.csar b/sdc-tosca/src/test/resources/csars/service-entry-definition-not-defined.csar Binary files differindex 47e65b6..47e65b6 100644 --- a/src/test/resources/csars/service-entry-definition-not-defined.csar +++ b/sdc-tosca/src/test/resources/csars/service-entry-definition-not-defined.csar diff --git a/src/test/resources/csars/service-invalid-conformence-level.csar b/sdc-tosca/src/test/resources/csars/service-invalid-conformence-level.csar Binary files differindex 12621f0..12621f0 100644 --- a/src/test/resources/csars/service-invalid-conformence-level.csar +++ b/sdc-tosca/src/test/resources/csars/service-invalid-conformence-level.csar diff --git a/src/test/resources/csars/service-invalid-input-args.csar b/sdc-tosca/src/test/resources/csars/service-invalid-input-args.csar Binary files differindex 38a670f..38a670f 100644 --- a/src/test/resources/csars/service-invalid-input-args.csar +++ b/sdc-tosca/src/test/resources/csars/service-invalid-input-args.csar diff --git a/src/test/resources/csars/service-invalid-yaml-content-meta.csar b/sdc-tosca/src/test/resources/csars/service-invalid-yaml-content-meta.csar Binary files differindex f77af6f..f77af6f 100644 --- a/src/test/resources/csars/service-invalid-yaml-content-meta.csar +++ b/sdc-tosca/src/test/resources/csars/service-invalid-yaml-content-meta.csar diff --git a/src/test/resources/csars/service-max-conformence-level.csar b/sdc-tosca/src/test/resources/csars/service-max-conformence-level.csar Binary files differindex 0cbb872..0cbb872 100644 --- a/src/test/resources/csars/service-max-conformence-level.csar +++ b/sdc-tosca/src/test/resources/csars/service-max-conformence-level.csar diff --git a/src/test/resources/csars/service-missing-csar-meta-file.csar b/sdc-tosca/src/test/resources/csars/service-missing-csar-meta-file.csar Binary files differindex 7c75314..7c75314 100644 --- a/src/test/resources/csars/service-missing-csar-meta-file.csar +++ b/sdc-tosca/src/test/resources/csars/service-missing-csar-meta-file.csar diff --git a/src/test/resources/csars/service-missing-entry-definition.csar b/sdc-tosca/src/test/resources/csars/service-missing-entry-definition.csar Binary files differindex 8fd1962..8fd1962 100644 --- a/src/test/resources/csars/service-missing-entry-definition.csar +++ b/sdc-tosca/src/test/resources/csars/service-missing-entry-definition.csar diff --git a/src/test/resources/csars/service-missing-meta-file.csar b/sdc-tosca/src/test/resources/csars/service-missing-meta-file.csar Binary files differindex 79348db..79348db 100644 --- a/src/test/resources/csars/service-missing-meta-file.csar +++ b/sdc-tosca/src/test/resources/csars/service-missing-meta-file.csar diff --git a/src/test/resources/csars/service-nested-vfc-csar.csar b/sdc-tosca/src/test/resources/csars/service-nested-vfc-csar.csar Binary files differindex 5ee0802..5ee0802 100644 --- a/src/test/resources/csars/service-nested-vfc-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-nested-vfc-csar.csar diff --git a/src/test/resources/csars/service-resolve-get-input-csar.csar b/sdc-tosca/src/test/resources/csars/service-resolve-get-input-csar.csar Binary files differindex d793229..d793229 100644 --- a/src/test/resources/csars/service-resolve-get-input-csar.csar +++ b/sdc-tosca/src/test/resources/csars/service-resolve-get-input-csar.csar diff --git a/src/test/resources/csars/service-resolve-get-input-csar_QA.csar b/sdc-tosca/src/test/resources/csars/service-resolve-get-input-csar_QA.csar Binary files differindex a290ff1..a290ff1 100644 --- a/src/test/resources/csars/service-resolve-get-input-csar_QA.csar +++ b/sdc-tosca/src/test/resources/csars/service-resolve-get-input-csar_QA.csar diff --git a/src/test/resources/csars/service-sunny-flow.csar b/sdc-tosca/src/test/resources/csars/service-sunny-flow.csar Binary files differindex 92ae19d..92ae19d 100644 --- a/src/test/resources/csars/service-sunny-flow.csar +++ b/sdc-tosca/src/test/resources/csars/service-sunny-flow.csar diff --git a/src/test/resources/csars/service-sunny-flow2.csar b/sdc-tosca/src/test/resources/csars/service-sunny-flow2.csar Binary files differindex 0a8af02..0a8af02 100644 --- a/src/test/resources/csars/service-sunny-flow2.csar +++ b/sdc-tosca/src/test/resources/csars/service-sunny-flow2.csar diff --git a/src/test/resources/log4j.properties b/sdc-tosca/src/test/resources/log4j.properties index c18c3da..c18c3da 100644 --- a/src/test/resources/log4j.properties +++ b/sdc-tosca/src/test/resources/log4j.properties |