From 8534756d13531ffec9c2d7b2ffe0a53ee1d3aaef Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 10 Feb 2022 12:06:25 +0000 Subject: [PATCH] Collapse apex-pdp maven model submodules This review collapses all the code in six podel submodules into a single model module. There are no code changes, just files moved around. This change reduces the complexity of the code structure and speeds up the build. Issue-ID: POLICY-1820 Change-Id: Ifb644e8ec85ae6d0987378f4616fbc8a8858a9a8 Signed-off-by: liamfallon --- auth/cli-codegen/pom.xml | 2 +- auth/cli-editor/pom.xml | 2 +- context/context-management/pom.xml | 2 +- core/core-engine/pom.xml | 2 +- core/core-protocols/pom.xml | 2 +- examples/examples-aadm/pom.xml | 2 +- examples/examples-adaptive/pom.xml | 2 +- examples/examples-myfirstpolicy/pom.xml | 2 +- examples/examples-pcvs/pom.xml | 2 +- model/basic-model/pom.xml | 83 ---------------------- .../main/resources/doc/JDBCPropertiesExamples.txt | 35 --------- .../src/test/resources/logback-test.xml | 70 ------------------ model/context-model/pom.xml | 40 ----------- model/engine-model/pom.xml | 45 ------------ .../src/test/resources/logback-test.xml | 70 ------------------ model/event-model/pom.xml | 40 ----------- .../src/test/resources/logback-test.xml | 74 ------------------- model/model-api/pom.xml | 43 ----------- .../model-api/src/test/resources/logback-test.xml | 74 ------------------- model/policy-model/pom.xml | 54 -------------- .../src/test/resources/logback-test.xml | 74 ------------------- model/pom.xml | 40 ++++++++--- .../basicmodel/concepts/ApexConceptException.java | 0 .../model/basicmodel/concepts/ApexException.java | 0 .../basicmodel/concepts/ApexRuntimeException.java | 0 .../model/basicmodel/concepts/AxArtifactKey.java | 0 .../apex/model/basicmodel/concepts/AxConcept.java | 0 .../model/basicmodel/concepts/AxConceptGetter.java | 0 .../basicmodel/concepts/AxConceptGetterImpl.java | 0 .../apex/model/basicmodel/concepts/AxKey.java | 0 .../apex/model/basicmodel/concepts/AxKeyInfo.java | 0 .../basicmodel/concepts/AxKeyInformation.java | 0 .../apex/model/basicmodel/concepts/AxKeyUse.java | 0 .../apex/model/basicmodel/concepts/AxModel.java | 0 .../model/basicmodel/concepts/AxReferenceKey.java | 0 .../concepts/AxToscaPolicyProcessingStatus.java | 0 .../basicmodel/concepts/AxValidationMessage.java | 0 .../basicmodel/concepts/AxValidationResult.java | 0 .../model/basicmodel/concepts/package-info.java | 0 .../basicmodel/handling/ApexModelCreator.java | 0 .../handling/ApexModelCustomGsonMapAdapter.java | 0 .../ApexModelCustomGsonRefereceKeyAdapter.java | 0 .../basicmodel/handling/ApexModelException.java | 0 .../basicmodel/handling/ApexModelFileWriter.java | 0 .../model/basicmodel/handling/ApexModelReader.java | 0 .../model/basicmodel/handling/ApexModelSaver.java | 0 .../basicmodel/handling/ApexModelStringWriter.java | 0 .../model/basicmodel/handling/ApexModelWriter.java | 0 .../model/basicmodel/handling/package-info.java | 0 .../policy/apex/model/basicmodel/package-info.java | 0 .../model/basicmodel/service/ModelService.java | 0 .../model/basicmodel/service/package-info.java | 0 .../apex/model/basicmodel/test/TestApexModel.java | 0 .../basicmodel/test/TestApexModelCreator.java | 0 .../apex/model/basicmodel/test/package-info.java | 0 .../contextmodel/concepts/AxContextAlbum.java | 0 .../contextmodel/concepts/AxContextAlbums.java | 0 .../contextmodel/concepts/AxContextModel.java | 0 .../contextmodel/concepts/AxContextSchema.java | 0 .../contextmodel/concepts/AxContextSchemas.java | 0 .../model/contextmodel/concepts/package-info.java | 0 .../contextmodel/handling/ContextComparer.java | 0 .../model/contextmodel/handling/package-info.java | 0 .../model/enginemodel/concepts/AxEngineModel.java | 0 .../model/enginemodel/concepts/AxEngineState.java | 0 .../model/enginemodel/concepts/AxEngineStats.java | 0 .../model/enginemodel/concepts/package-info.java | 0 .../apex/model/eventmodel/concepts/AxEvent.java | 0 .../model/eventmodel/concepts/AxEventModel.java | 0 .../apex/model/eventmodel/concepts/AxEvents.java | 0 .../apex/model/eventmodel/concepts/AxField.java | 0 .../model/eventmodel/concepts/AxInputField.java | 0 .../model/eventmodel/concepts/AxOutputField.java | 0 .../model/eventmodel/concepts/package-info.java | 0 .../policy/apex/model/modelapi/ApexApiResult.java | 0 .../policy/apex/model/modelapi/ApexEditorApi.java | 0 .../onap/policy/apex/model/modelapi/ApexModel.java | 0 .../apex/model/modelapi/ApexModelFactory.java | 0 .../apex/model/modelapi/impl/ApexModelImpl.java | 0 .../apex/model/modelapi/impl/ContextAlbum.java | 0 .../model/modelapi/impl/ContextAlbumFacade.java | 0 .../model/modelapi/impl/ContextSchemaFacade.java | 0 .../modelapi/impl/CreatePolicyStateTaskRef.java | 0 .../apex/model/modelapi/impl/EventFacade.java | 0 .../model/modelapi/impl/KeyInformationFacade.java | 0 .../apex/model/modelapi/impl/ModelFacade.java | 0 .../model/modelapi/impl/ModelHandlerFacade.java | 0 .../apex/model/modelapi/impl/PolicyFacade.java | 0 .../apex/model/modelapi/impl/TaskFacade.java | 0 .../apex/model/modelapi/impl/package-info.java | 0 .../policy/apex/model/modelapi/package-info.java | 0 .../apex/model/policymodel/concepts/AxLogic.java | 0 .../model/policymodel/concepts/AxLogicReader.java | 0 .../model/policymodel/concepts/AxPolicies.java | 0 .../apex/model/policymodel/concepts/AxPolicy.java | 0 .../model/policymodel/concepts/AxPolicyModel.java | 0 .../apex/model/policymodel/concepts/AxState.java | 0 .../concepts/AxStateFinalizerLogic.java | 0 .../model/policymodel/concepts/AxStateOutput.java | 0 .../policymodel/concepts/AxStateParamsBuilder.java | 0 .../concepts/AxStateTaskOutputType.java | 0 .../policymodel/concepts/AxStateTaskReference.java | 0 .../model/policymodel/concepts/AxStateTree.java | 0 .../apex/model/policymodel/concepts/AxTask.java | 0 .../model/policymodel/concepts/AxTaskLogic.java | 0 .../policymodel/concepts/AxTaskParameter.java | 0 .../policymodel/concepts/AxTaskSelectionLogic.java | 0 .../apex/model/policymodel/concepts/AxTasks.java | 0 .../policymodel/concepts/PolicyException.java | 0 .../concepts/PolicyRuntimeException.java | 0 .../model/policymodel/concepts/package-info.java | 0 .../model/policymodel/handling/PolicyAnalyser.java | 0 .../policymodel/handling/PolicyAnalysisResult.java | 0 .../model/policymodel/handling/PolicyComparer.java | 0 .../policymodel/handling/PolicyLogicReader.java | 0 .../policymodel/handling/PolicyModelComparer.java | 0 .../policymodel/handling/PolicyModelMerger.java | 0 .../policymodel/handling/PolicyModelSplitter.java | 0 .../model/policymodel/handling/package-info.java | 0 .../apex/model/utilities/CollectionUtils.java | 0 .../utilities/DirectoryDeleteShutdownHook.java | 0 .../apex/model/utilities/DirectoryUtils.java | 0 .../policy/apex/model/utilities/TreeMapUtils.java | 0 .../model/utilities/comparison/KeyComparer.java | 0 .../model/utilities/comparison/KeyDifference.java | 0 .../utilities/comparison/KeyedMapComparer.java | 0 .../utilities/comparison/KeyedMapDifference.java | 0 .../model/utilities/comparison/package-info.java | 0 .../apex/model/utilities/json/JsonHandler.java | 0 .../apex/model/utilities/json/package-info.java | 0 .../policy/apex/model/utilities/package-info.java | 0 .../concepts/AxConceptGetterImplTest.java | 0 .../model/basicmodel/concepts/AxKeyInfoTest.java | 0 .../apex/model/basicmodel/concepts/AxKeyTest.java | 0 .../model/basicmodel/concepts/AxKeyUseTest.java | 0 .../basicmodel/concepts/AxReferenceKeyTest.java | 0 .../model/basicmodel/concepts/DummyEntity.java | 0 .../model/basicmodel/concepts/ExceptionsTest.java | 0 .../model/basicmodel/concepts/ValidationTest.java | 0 .../handling/ApexModelExceptionTest.java | 0 .../handling/ApexModelFileWriterTest.java | 0 .../basicmodel/handling/ApexModelReaderTest.java | 0 .../basicmodel/handling/ApexModelSaverTest.java | 0 .../handling/ApexModelStringWriterTest.java | 0 .../basicmodel/handling/ApexModelWriterTest.java | 0 .../handling/DummyApexBasicModelCreator.java | 0 .../handling/DummyAxModelWithReferences.java | 0 .../SupportApexBasicModelConceptsTest.java | 0 .../handling/SupportApexBasicModelTest.java | 0 .../handling/SupportApexModelCreator0.java | 0 .../handling/SupportApexModelCreator1.java | 0 .../handling/SupportApexModelCreator2.java | 0 .../basicmodel/handling/SupportBasicModelTest.java | 0 .../handling/SupportConceptGetterTest.java | 0 .../model/basicmodel/service/ModelServiceTest.java | 0 .../contextmodel/concepts/ContextAlbumsTest.java | 0 .../contextmodel/concepts/ContextModelTest.java | 0 .../contextmodel/concepts/ContextSchemasTest.java | 0 .../handling/ApexContextModelTest.java | 0 .../handling/ContextComparisonTest.java | 0 .../handling/TestApexContextModelCreator.java | 0 .../handling/TestContextComparisonFactory.java | 0 .../enginemodel/concepts/EngineModelTest.java | 0 .../enginemodel/concepts/EngineStatsTest.java | 0 .../enginemodel/handling/ApexEngineModelTest.java | 0 .../handling/DummyTestApexEngineModelCreator.java | 0 .../model/eventmodel/concepts/EventModelTest.java | 0 .../apex/model/eventmodel/concepts/EventsTest.java | 0 .../apex/model/eventmodel/concepts/FieldTest.java | 0 .../eventmodel/handling/ApexEventModelTest.java | 0 .../handling/DummyTestApexEventModelCreator.java | 0 .../apex/model/modelapi/ApexApiResultTest.java | 0 .../modelapi/ApexEditorApiContextAlbumTest.java | 0 .../modelapi/ApexEditorApiContextSchemaTest.java | 0 .../model/modelapi/ApexEditorApiEventTest.java | 0 .../model/modelapi/ApexEditorApiKeyInfoTest.java | 0 .../model/modelapi/ApexEditorApiPolicyTest.java | 0 .../apex/model/modelapi/ApexEditorApiTaskTest.java | 0 .../apex/model/modelapi/ApexModelApiTest.java | 0 .../apex/model/modelapi/ModelFacadeTest.java | 0 .../model/modelapi/ModelHandlerFacadeTest.java | 0 .../policy/apex/model/modelapi/RealModelTest.java | 0 .../policymodel/concepts/DummyLogicReader.java | 0 .../model/policymodel/concepts/ExceptionsTest.java | 0 .../apex/model/policymodel/concepts/LogicTest.java | 0 .../model/policymodel/concepts/PoliciesTest.java | 0 .../policymodel/concepts/PolicyModelTest.java | 0 .../policymodel/concepts/StateOutputTest.java | 0 .../concepts/StateTaskReferenceTest.java | 0 .../apex/model/policymodel/concepts/StateTest.java | 0 .../policymodel/concepts/TaskParameterTest.java | 0 .../apex/model/policymodel/concepts/TasksTest.java | 0 .../policymodel/handling/ApexPolicyModelTest.java | 0 .../policymodel/handling/PolicyAnalyserTest.java | 0 .../handling/PolicyLogicReaderTest.java | 0 .../handling/PolicyModelComparerTest.java | 0 .../handling/PolicyModelMergerTest.java | 0 .../handling/PolicyModelSplitterTest.java | 0 .../handling/SupportApexPolicyModelCreator.java | 0 .../utils/SupportPolicyModelValidator.java | 0 .../model/utilities/CollectionUtilitiesTest.java | 0 .../apex/model/utilities/DirectoryUtilsTest.java | 0 .../apex/model/utilities/KeyComparerTest.java | 0 .../apex/model/utilities/KeyedMapComparerTest.java | 0 .../apex/model/utilities/TextFileUtilsTest.java | 0 .../apex/model/utilities/TreeMapUtilsTest.java | 0 .../apex/model/utilities/json/JsonHandlerTest.java | 0 .../PolicyModelComparisonDifferentTerseKeys.txt | 0 .../PolicyModelComparisonDifferentTerseValues.txt | 0 .../PolicyModelComparisonDifferentVerboseKeys.txt | 0 ...PolicyModelComparisonDifferentVerboseValues.txt | 0 .../PolicyModelComparisonIdenticalTerse.txt | 0 .../PolicyModelComparisonIdenticalVerboseKeys.txt | 0 ...PolicyModelComparisonIdenticalVerboseValues.txt | 0 .../src/test/resources/logback-test.xml | 0 .../src/test/resources/models/PolicyModel.json | 0 .../src/test/resources/models/PolicyModel.junk | 0 .../src/test/resources/models/RealPolicyModel.json | 0 ...ogicParentLocalNameLogicInstanceName.funkylogic | 0 .../src/test/resources/testdir/testfile.xml | 0 model/utilities/pom.xml | 49 ------------- .../plugins-context-schema-avro/pom.xml | 3 +- services/services-engine/pom.xml | 2 +- testsuites/integration/integration-common/pom.xml | 2 +- tools/model-generator/pom.xml | 4 +- 225 files changed, 43 insertions(+), 777 deletions(-) delete mode 100644 model/basic-model/pom.xml delete mode 100644 model/basic-model/src/main/resources/doc/JDBCPropertiesExamples.txt delete mode 100644 model/basic-model/src/test/resources/logback-test.xml delete mode 100644 model/context-model/pom.xml delete mode 100644 model/engine-model/pom.xml delete mode 100644 model/engine-model/src/test/resources/logback-test.xml delete mode 100644 model/event-model/pom.xml delete mode 100644 model/event-model/src/test/resources/logback-test.xml delete mode 100644 model/model-api/pom.xml delete mode 100644 model/model-api/src/test/resources/logback-test.xml delete mode 100644 model/policy-model/pom.xml delete mode 100644 model/policy-model/src/test/resources/logback-test.xml rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexConceptException.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexException.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexRuntimeException.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetter.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxToscaPolicyProcessingStatus.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCreator.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelException.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/service/package-info.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModelCreator.java (100%) rename model/{basic-model => }/src/main/java/org/onap/policy/apex/model/basicmodel/test/package-info.java (100%) rename model/{context-model => }/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java (100%) rename model/{context-model => }/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java (100%) rename model/{context-model => }/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java (100%) rename model/{context-model => }/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java (100%) rename model/{context-model => }/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java (100%) rename model/{context-model => }/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java (100%) rename model/{context-model => }/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java (100%) rename model/{context-model => }/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java (100%) rename model/{engine-model => }/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java (100%) rename model/{engine-model => }/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java (100%) rename model/{engine-model => }/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java (100%) rename model/{engine-model => }/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java (100%) rename model/{event-model => }/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java (100%) rename model/{event-model => }/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java (100%) rename model/{event-model => }/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java (100%) rename model/{event-model => }/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java (100%) rename model/{event-model => }/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java (100%) rename model/{event-model => }/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java (100%) rename model/{event-model => }/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/ApexEditorApi.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbum.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRef.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/impl/package-info.java (100%) rename model/{model-api => }/src/main/java/org/onap/policy/apex/model/modelapi/package-info.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogicReader.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyException.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyRuntimeException.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyComparer.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMerger.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java (100%) rename model/{policy-model => }/src/main/java/org/onap/policy/apex/model/policymodel/handling/package-info.java (100%) rename model/{utilities => }/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java (100%) rename model/{utilities => }/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java (100%) rename model/{utilities => }/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java (100%) rename model/{utilities => }/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java (100%) rename model/{utilities => }/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java (100%) rename model/{utilities => }/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java (100%) rename model/{utilities => }/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java (100%) rename model/{utilities => }/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java (100%) rename model/{utilities => }/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java (100%) rename model/{utilities => }/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java (100%) rename model/{utilities => }/src/main/java/org/onap/policy/apex/model/utilities/json/package-info.java (100%) rename model/{utilities => }/src/main/java/org/onap/policy/apex/model/utilities/package-info.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator0.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator2.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java (100%) rename model/{basic-model => }/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java (100%) rename model/{context-model => }/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java (100%) rename model/{context-model => }/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java (100%) rename model/{context-model => }/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java (100%) rename model/{context-model => }/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java (100%) rename model/{context-model => }/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java (100%) rename model/{context-model => }/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java (100%) rename model/{context-model => }/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparisonFactory.java (100%) rename model/{engine-model => }/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java (100%) rename model/{engine-model => }/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java (100%) rename model/{engine-model => }/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java (100%) rename model/{engine-model => }/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java (100%) rename model/{event-model => }/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java (100%) rename model/{event-model => }/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java (100%) rename model/{event-model => }/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java (100%) rename model/{event-model => }/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java (100%) rename model/{event-model => }/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java (100%) rename model/{model-api => }/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java (100%) rename model/{model-api => }/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java (100%) rename model/{model-api => }/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java (100%) rename model/{model-api => }/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java (100%) rename model/{model-api => }/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java (100%) rename model/{model-api => }/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java (100%) rename model/{model-api => }/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java (100%) rename model/{model-api => }/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java (100%) rename model/{model-api => }/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java (100%) rename model/{model-api => }/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java (100%) rename model/{model-api => }/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java (100%) rename model/{policy-model => }/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java (100%) rename model/{utilities => }/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java (100%) rename model/{utilities => }/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java (100%) rename model/{utilities => }/src/test/java/org/onap/policy/apex/model/utilities/KeyComparerTest.java (100%) rename model/{utilities => }/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java (100%) rename model/{utilities => }/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java (100%) rename model/{utilities => }/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java (100%) rename model/{utilities => }/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java (100%) rename model/{policy-model => }/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt (100%) rename model/{policy-model => }/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt (100%) rename model/{policy-model => }/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt (100%) rename model/{policy-model => }/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt (100%) rename model/{policy-model => }/src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt (100%) rename model/{policy-model => }/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt (100%) rename model/{policy-model => }/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt (100%) rename model/{context-model => }/src/test/resources/logback-test.xml (100%) rename model/{model-api => }/src/test/resources/models/PolicyModel.json (100%) rename model/{model-api => }/src/test/resources/models/PolicyModel.junk (100%) rename model/{model-api => }/src/test/resources/models/RealPolicyModel.json (100%) rename model/{policy-model => }/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic (100%) rename model/{utilities => }/src/test/resources/testdir/testfile.xml (100%) delete mode 100644 model/utilities/pom.xml diff --git a/auth/cli-codegen/pom.xml b/auth/cli-codegen/pom.xml index 491749158..2773a7729 100644 --- a/auth/cli-codegen/pom.xml +++ b/auth/cli-codegen/pom.xml @@ -39,7 +39,7 @@ org.onap.policy.apex-pdp.model - model-api + model ${project.version} test diff --git a/auth/cli-editor/pom.xml b/auth/cli-editor/pom.xml index fd8404be2..e01025bbd 100644 --- a/auth/cli-editor/pom.xml +++ b/auth/cli-editor/pom.xml @@ -38,7 +38,7 @@ org.onap.policy.apex-pdp.model - model-api + model ${project.version} diff --git a/context/context-management/pom.xml b/context/context-management/pom.xml index 0c6495a5e..0a026eae0 100644 --- a/context/context-management/pom.xml +++ b/context/context-management/pom.xml @@ -36,7 +36,7 @@ org.onap.policy.apex-pdp.model - context-model + model ${project.version} diff --git a/core/core-engine/pom.xml b/core/core-engine/pom.xml index 890b33c9b..597da2991 100644 --- a/core/core-engine/pom.xml +++ b/core/core-engine/pom.xml @@ -36,7 +36,7 @@ org.onap.policy.apex-pdp.model - policy-model + model ${project.version} diff --git a/core/core-protocols/pom.xml b/core/core-protocols/pom.xml index 631edf1a1..2110acede 100644 --- a/core/core-protocols/pom.xml +++ b/core/core-protocols/pom.xml @@ -32,7 +32,7 @@ org.onap.policy.apex-pdp.model - basic-model + model ${project.version} diff --git a/examples/examples-aadm/pom.xml b/examples/examples-aadm/pom.xml index 3447c4d86..5e8ba05f9 100644 --- a/examples/examples-aadm/pom.xml +++ b/examples/examples-aadm/pom.xml @@ -32,7 +32,7 @@ org.onap.policy.apex-pdp.model - policy-model + model ${project.version} diff --git a/examples/examples-adaptive/pom.xml b/examples/examples-adaptive/pom.xml index f8bee8745..158710a52 100644 --- a/examples/examples-adaptive/pom.xml +++ b/examples/examples-adaptive/pom.xml @@ -32,7 +32,7 @@ org.onap.policy.apex-pdp.model - policy-model + model ${project.version} diff --git a/examples/examples-myfirstpolicy/pom.xml b/examples/examples-myfirstpolicy/pom.xml index ea13297dd..68dc69a86 100644 --- a/examples/examples-myfirstpolicy/pom.xml +++ b/examples/examples-myfirstpolicy/pom.xml @@ -43,7 +43,7 @@ org.onap.policy.apex-pdp.model - policy-model + model ${project.version} diff --git a/examples/examples-pcvs/pom.xml b/examples/examples-pcvs/pom.xml index 191e68779..b3af036ba 100644 --- a/examples/examples-pcvs/pom.xml +++ b/examples/examples-pcvs/pom.xml @@ -44,7 +44,7 @@ org.onap.policy.apex-pdp.model - policy-model + model ${project.version} diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml deleted file mode 100644 index 45d9978cf..000000000 --- a/model/basic-model/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - 4.0.0 - - - org.onap.policy.apex-pdp.model - model - 2.7.1-SNAPSHOT - - - basic-model - ${project.artifactId} - Basic Models used and model handling in Apex - - - **/package-info.java, - **/TestApexModel.java, - **/TestApexModelCreator.java - - - - - - org.onap.policy.common - utils - - - javax.xml.bind - jaxb-api - - - - - org.onap.policy.apex-pdp.model - utilities - ${project.version} - - - javax.xml.bind - jaxb-api - ${version.javax.bind} - - - org.glassfish.jaxb - jaxb-runtime - ${version.javax.bind} - - - org.glassfish - javax.json - ${version.javax.json} - - - javax.json - javax.json-api - ${version.javax.json} - - - org.mockito - mockito-all - test - - - \ No newline at end of file diff --git a/model/basic-model/src/main/resources/doc/JDBCPropertiesExamples.txt b/model/basic-model/src/main/resources/doc/JDBCPropertiesExamples.txt deleted file mode 100644 index 6e105a68d..000000000 --- a/model/basic-model/src/main/resources/doc/JDBCPropertiesExamples.txt +++ /dev/null @@ -1,35 +0,0 @@ -#------------------------------------------------------------------------------- -# ============LICENSE_START======================================================= -# Copyright (C) 2016-2018 Ericsson. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -#------------------------------------------------------------------------------- - -Properties jdbcProperties = new Properties(); -jdbcProperties.put("javax.persistence.jdbc.url", "jdbc:postgresql://localhost:5432/apex_test"); -jdbcProperties.put("eclipselink.ddl-generation", "drop-and-create-tables"); - -Properties jdbcProperties = new Properties(); -jdbcProperties.put("javax.persistence.jdbc.url", "jdbc:postgresql://localhost:5432/apex_test"); -jdbcProperties.put("hibernate.hbm2ddl.auto", "create-drop"); - -Properties jdbcProperties = new Properties(); -jdbcProperties.put("javax.persistence.jdbc.url", "jdbc:postgresql://localhost:5432/apex"); -jdbcProperties.put("eclipselink.ddl-generation", "create-or-extend-tables"); - -Properties jdbcProperties = new Properties(); -jdbcProperties.put("javax.persistence.jdbc.url", "jdbc:postgresql://localhost:5432/apex"); -jdbcProperties.put("hibernate.hbm2ddl.auto", "update"); diff --git a/model/basic-model/src/test/resources/logback-test.xml b/model/basic-model/src/test/resources/logback-test.xml deleted file mode 100644 index c52f2ded6..000000000 --- a/model/basic-model/src/test/resources/logback-test.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - Apex - - - - - - - %d %contextName [%t] %level %logger{36} - %msg%n - - - - - - - - - - - - - - - - - ${LOG_DIR}/apex.log - - %d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full} - - - - - ${LOG_DIR}/apex_ctxt.log - - %d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full} - - - - - - - - - - - diff --git a/model/context-model/pom.xml b/model/context-model/pom.xml deleted file mode 100644 index f20808186..000000000 --- a/model/context-model/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - 4.0.0 - - org.onap.policy.apex-pdp.model - model - 2.7.1-SNAPSHOT - - - context-model - ${project.artifactId} - Context Models used in Apex - - - - org.onap.policy.apex-pdp.model - basic-model - ${project.version} - - - diff --git a/model/engine-model/pom.xml b/model/engine-model/pom.xml deleted file mode 100644 index 9db1b2053..000000000 --- a/model/engine-model/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - - org.onap.policy.apex-pdp.model - model - 2.7.1-SNAPSHOT - - - engine-model - ${project.artifactId} - Engine Models used in Apex - - - - org.onap.policy.apex-pdp.model - policy-model - ${project.version} - - - io.prometheus - simpleclient - - - diff --git a/model/engine-model/src/test/resources/logback-test.xml b/model/engine-model/src/test/resources/logback-test.xml deleted file mode 100644 index c52f2ded6..000000000 --- a/model/engine-model/src/test/resources/logback-test.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - Apex - - - - - - - %d %contextName [%t] %level %logger{36} - %msg%n - - - - - - - - - - - - - - - - - ${LOG_DIR}/apex.log - - %d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full} - - - - - ${LOG_DIR}/apex_ctxt.log - - %d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full} - - - - - - - - - - - diff --git a/model/event-model/pom.xml b/model/event-model/pom.xml deleted file mode 100644 index 813ebb8bb..000000000 --- a/model/event-model/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - 4.0.0 - - org.onap.policy.apex-pdp.model - model - 2.7.1-SNAPSHOT - - - event-model - ${project.artifactId} - Event Models used in Apex - - - - org.onap.policy.apex-pdp.model - context-model - ${project.version} - - - diff --git a/model/event-model/src/test/resources/logback-test.xml b/model/event-model/src/test/resources/logback-test.xml deleted file mode 100644 index 2aff4c2e9..000000000 --- a/model/event-model/src/test/resources/logback-test.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - Apex - - - - - - - %d %contextName [%t] %level %logger{36} - %msg%n - - - - - - - - - - - - - - - - - - - - - ${LOG_DIR}/apex.log - - %d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full} - - - - - ${LOG_DIR}/apex_ctxt.log - - %d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full} - - - - - - - - - - - diff --git a/model/model-api/pom.xml b/model/model-api/pom.xml deleted file mode 100644 index 98c727ef5..000000000 --- a/model/model-api/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - 4.0.0 - - org.onap.policy.apex-pdp.model - model - 2.7.1-SNAPSHOT - - - model-api - ${project.artifactId} - APIs for editing Apex models - - - - org.onap.policy.common - utils - - - ${project.groupId} - policy-model - ${project.version} - - - diff --git a/model/model-api/src/test/resources/logback-test.xml b/model/model-api/src/test/resources/logback-test.xml deleted file mode 100644 index 2aff4c2e9..000000000 --- a/model/model-api/src/test/resources/logback-test.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - Apex - - - - - - - %d %contextName [%t] %level %logger{36} - %msg%n - - - - - - - - - - - - - - - - - - - - - ${LOG_DIR}/apex.log - - %d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full} - - - - - ${LOG_DIR}/apex_ctxt.log - - %d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full} - - - - - - - - - - - diff --git a/model/policy-model/pom.xml b/model/policy-model/pom.xml deleted file mode 100644 index cde0fa83c..000000000 --- a/model/policy-model/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 4.0.0 - - org.onap.policy.apex-pdp.model - model - 2.7.1-SNAPSHOT - - - policy-model - ${project.artifactId} - Policy Models used in Apex - - - - org.onap.policy.common - utils - - - org.onap.policy.apex-pdp.model - context-model - ${project.version} - - - org.onap.policy.apex-pdp.model - event-model - ${project.version} - - - org.assertj - assertj-core - test - - - diff --git a/model/policy-model/src/test/resources/logback-test.xml b/model/policy-model/src/test/resources/logback-test.xml deleted file mode 100644 index 2aff4c2e9..000000000 --- a/model/policy-model/src/test/resources/logback-test.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - Apex - - - - - - - %d %contextName [%t] %level %logger{36} - %msg%n - - - - - - - - - - - - - - - - - - - - - ${LOG_DIR}/apex.log - - %d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full} - - - - - ${LOG_DIR}/apex_ctxt.log - - %d %-5relative [procId=${processId}] [%thread] %-5level - %logger{26} - %msg %n %ex{full} - - - - - - - - - - - diff --git a/model/pom.xml b/model/pom.xml index f358e5907..a21ae66ae 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -27,22 +27,40 @@ org.onap.policy.apex-pdp.model model - pom ${project.artifactId} The model for Apex, it comtains definitions of all Apex concepts and also has handling for Apex models. - - utilities - basic-model - context-model - event-model - policy-model - engine-model - model-api - - + + org.onap.policy.common + utils + + + javax.xml.bind + jaxb-api + + + + + io.prometheus + simpleclient + + + org.antlr + antlr4-runtime + 4.8-1 + + + org.mockito + mockito-all + test + + + org.assertj + assertj-core + test + com.h2database h2 diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexConceptException.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexConceptException.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexConceptException.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexConceptException.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexException.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexException.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexException.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexException.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexRuntimeException.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexRuntimeException.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexRuntimeException.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexRuntimeException.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetter.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetter.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetter.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetter.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxToscaPolicyProcessingStatus.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxToscaPolicyProcessingStatus.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxToscaPolicyProcessingStatus.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxToscaPolicyProcessingStatus.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCreator.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCreator.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCreator.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCreator.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelException.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelException.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelException.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelException.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/package-info.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/service/package-info.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/service/package-info.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModelCreator.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModelCreator.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModelCreator.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModelCreator.java diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/package-info.java b/model/src/main/java/org/onap/policy/apex/model/basicmodel/test/package-info.java similarity index 100% rename from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/basicmodel/test/package-info.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java similarity index 100% rename from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java rename to model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java similarity index 100% rename from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java rename to model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java similarity index 100% rename from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java rename to model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java similarity index 100% rename from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java rename to model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java similarity index 100% rename from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java rename to model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java similarity index 100% rename from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java similarity index 100% rename from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java rename to model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java diff --git a/model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java b/model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java similarity index 100% rename from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java diff --git a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java b/model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java similarity index 100% rename from model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java rename to model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java diff --git a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java b/model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java similarity index 100% rename from model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java rename to model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java diff --git a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java b/model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java similarity index 100% rename from model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java rename to model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java diff --git a/model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java b/model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java similarity index 100% rename from model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java similarity index 100% rename from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java rename to model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java similarity index 100% rename from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java rename to model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java similarity index 100% rename from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java rename to model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java similarity index 100% rename from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java rename to model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java similarity index 100% rename from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java rename to model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java similarity index 100% rename from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java rename to model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java diff --git a/model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java b/model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java similarity index 100% rename from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexEditorApi.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/ApexEditorApi.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexEditorApi.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/ApexEditorApi.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbum.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbum.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbum.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbum.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRef.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRef.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRef.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRef.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/package-info.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/impl/package-info.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/impl/package-info.java diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/package-info.java b/model/src/main/java/org/onap/policy/apex/model/modelapi/package-info.java similarity index 100% rename from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/modelapi/package-info.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogicReader.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogicReader.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogicReader.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogicReader.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyException.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyException.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyException.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyException.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyRuntimeException.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyRuntimeException.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyRuntimeException.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyRuntimeException.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyComparer.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyComparer.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyComparer.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyComparer.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMerger.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMerger.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMerger.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMerger.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/package-info.java b/model/src/main/java/org/onap/policy/apex/model/policymodel/handling/package-info.java similarity index 100% rename from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/policymodel/handling/package-info.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java b/model/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java similarity index 100% rename from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java rename to model/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java b/model/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java similarity index 100% rename from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java rename to model/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java b/model/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java similarity index 100% rename from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java rename to model/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java b/model/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java similarity index 100% rename from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java rename to model/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java similarity index 100% rename from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java rename to model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java similarity index 100% rename from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java rename to model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java similarity index 100% rename from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java rename to model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java similarity index 100% rename from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java rename to model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java b/model/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java similarity index 100% rename from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java b/model/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java similarity index 100% rename from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java rename to model/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/json/package-info.java b/model/src/main/java/org/onap/policy/apex/model/utilities/json/package-info.java similarity index 100% rename from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/json/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/utilities/json/package-info.java diff --git a/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/package-info.java b/model/src/main/java/org/onap/policy/apex/model/utilities/package-info.java similarity index 100% rename from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/package-info.java rename to model/src/main/java/org/onap/policy/apex/model/utilities/package-info.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator0.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator0.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator0.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator0.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator2.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator2.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator2.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator2.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java diff --git a/model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java b/model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java similarity index 100% rename from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java rename to model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java similarity index 100% rename from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java rename to model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java similarity index 100% rename from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java rename to model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java similarity index 100% rename from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java rename to model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java similarity index 100% rename from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java rename to model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java similarity index 100% rename from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java rename to model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java similarity index 100% rename from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java rename to model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparisonFactory.java b/model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparisonFactory.java similarity index 100% rename from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparisonFactory.java rename to model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparisonFactory.java diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java b/model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java similarity index 100% rename from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java rename to model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java b/model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java similarity index 100% rename from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java rename to model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java b/model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java similarity index 100% rename from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java rename to model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java b/model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java similarity index 100% rename from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java rename to model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java b/model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java similarity index 100% rename from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java rename to model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java b/model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java similarity index 100% rename from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java rename to model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java b/model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java similarity index 100% rename from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java rename to model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java b/model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java similarity index 100% rename from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java rename to model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java b/model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java similarity index 100% rename from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java rename to model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java similarity index 100% rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java rename to model/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java similarity index 100% rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java rename to model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java similarity index 100% rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java rename to model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java similarity index 100% rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java rename to model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java similarity index 100% rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java rename to model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java similarity index 100% rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java rename to model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java similarity index 100% rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java rename to model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java similarity index 100% rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java rename to model/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java similarity index 100% rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java rename to model/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java similarity index 100% rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java rename to model/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java b/model/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java similarity index 100% rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java rename to model/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java b/model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java similarity index 100% rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java rename to model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java similarity index 100% rename from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java rename to model/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java similarity index 100% rename from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java rename to model/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/KeyComparerTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/KeyComparerTest.java similarity index 100% rename from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/KeyComparerTest.java rename to model/src/test/java/org/onap/policy/apex/model/utilities/KeyComparerTest.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java similarity index 100% rename from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java rename to model/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java similarity index 100% rename from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java rename to model/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java similarity index 100% rename from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java rename to model/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java diff --git a/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java b/model/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java similarity index 100% rename from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java rename to model/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt similarity index 100% rename from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt rename to model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt similarity index 100% rename from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt rename to model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt similarity index 100% rename from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt rename to model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt similarity index 100% rename from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt rename to model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt similarity index 100% rename from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt rename to model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt similarity index 100% rename from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt rename to model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt diff --git a/model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt b/model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt similarity index 100% rename from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt rename to model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt diff --git a/model/context-model/src/test/resources/logback-test.xml b/model/src/test/resources/logback-test.xml similarity index 100% rename from model/context-model/src/test/resources/logback-test.xml rename to model/src/test/resources/logback-test.xml diff --git a/model/model-api/src/test/resources/models/PolicyModel.json b/model/src/test/resources/models/PolicyModel.json similarity index 100% rename from model/model-api/src/test/resources/models/PolicyModel.json rename to model/src/test/resources/models/PolicyModel.json diff --git a/model/model-api/src/test/resources/models/PolicyModel.junk b/model/src/test/resources/models/PolicyModel.junk similarity index 100% rename from model/model-api/src/test/resources/models/PolicyModel.junk rename to model/src/test/resources/models/PolicyModel.junk diff --git a/model/model-api/src/test/resources/models/RealPolicyModel.json b/model/src/test/resources/models/RealPolicyModel.json similarity index 100% rename from model/model-api/src/test/resources/models/RealPolicyModel.json rename to model/src/test/resources/models/RealPolicyModel.json diff --git a/model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic b/model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic similarity index 100% rename from model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic rename to model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic diff --git a/model/utilities/src/test/resources/testdir/testfile.xml b/model/src/test/resources/testdir/testfile.xml similarity index 100% rename from model/utilities/src/test/resources/testdir/testfile.xml rename to model/src/test/resources/testdir/testfile.xml diff --git a/model/utilities/pom.xml b/model/utilities/pom.xml deleted file mode 100644 index 05c08523c..000000000 --- a/model/utilities/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - 4.0.0 - - org.onap.policy.apex-pdp.model - model - 2.7.1-SNAPSHOT - - utilities - - - - - org.onap.policy.common - utils - - - org.antlr - antlr4-runtime - 4.8-1 - - - com.google.code.gson - gson - - - diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml index 137f75f23..01105f85d 100644 --- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml @@ -44,9 +44,8 @@ org.onap.policy.apex-pdp.model - policy-model + model ${project.version} - test diff --git a/services/services-engine/pom.xml b/services/services-engine/pom.xml index bd527c69d..e31b09aa7 100644 --- a/services/services-engine/pom.xml +++ b/services/services-engine/pom.xml @@ -107,4 +107,4 @@ - \ No newline at end of file + diff --git a/testsuites/integration/integration-common/pom.xml b/testsuites/integration/integration-common/pom.xml index ad438d7ae..54736f8b1 100644 --- a/testsuites/integration/integration-common/pom.xml +++ b/testsuites/integration/integration-common/pom.xml @@ -40,7 +40,7 @@ org.onap.policy.apex-pdp.model - policy-model + model ${project.version} diff --git a/tools/model-generator/pom.xml b/tools/model-generator/pom.xml index 951bd7614..3e3db953b 100644 --- a/tools/model-generator/pom.xml +++ b/tools/model-generator/pom.xml @@ -38,7 +38,7 @@ org.onap.policy.apex-pdp.model - model-api + model ${project.version} @@ -179,4 +179,4 @@ - \ No newline at end of file + -- 2.16.6