Collapse apex-pdp maven model submodules 51/127051/3
authorliamfallon <liam.fallon@est.tech>
Thu, 10 Feb 2022 12:06:25 +0000 (12:06 +0000)
committerliamfallon <liam.fallon@est.tech>
Thu, 10 Feb 2022 13:48:15 +0000 (13:48 +0000)
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 <liam.fallon@est.tech>
225 files changed:
auth/cli-codegen/pom.xml
auth/cli-editor/pom.xml
context/context-management/pom.xml
core/core-engine/pom.xml
core/core-protocols/pom.xml
examples/examples-aadm/pom.xml
examples/examples-adaptive/pom.xml
examples/examples-myfirstpolicy/pom.xml
examples/examples-pcvs/pom.xml
model/basic-model/pom.xml [deleted file]
model/basic-model/src/main/resources/doc/JDBCPropertiesExamples.txt [deleted file]
model/basic-model/src/test/resources/logback-test.xml [deleted file]
model/context-model/pom.xml [deleted file]
model/engine-model/pom.xml [deleted file]
model/engine-model/src/test/resources/logback-test.xml [deleted file]
model/event-model/pom.xml [deleted file]
model/event-model/src/test/resources/logback-test.xml [deleted file]
model/model-api/pom.xml [deleted file]
model/model-api/src/test/resources/logback-test.xml [deleted file]
model/policy-model/pom.xml [deleted file]
model/policy-model/src/test/resources/logback-test.xml [deleted file]
model/pom.xml
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexConceptException.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexConceptException.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexException.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexException.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexRuntimeException.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/ApexRuntimeException.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxArtifactKey.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConcept.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetter.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetter.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImpl.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKey.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfo.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInformation.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUse.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKey.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxToscaPolicyProcessingStatus.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxToscaPolicyProcessingStatus.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationMessage.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxValidationResult.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCreator.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCreator.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonMapAdapter.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelCustomGsonRefereceKeyAdapter.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelException.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelException.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriter.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReader.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaver.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriter.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriter.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/handling/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/ModelService.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/service/package-info.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/service/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModel.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModelCreator.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/TestApexModelCreator.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/basicmodel/test/package-info.java [moved from model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/test/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java [moved from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbum.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java [moved from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextAlbums.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java [moved from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextModel.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java [moved from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchema.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java [moved from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/AxContextSchemas.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java [moved from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/concepts/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java [moved from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparer.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java [moved from model/context-model/src/main/java/org/onap/policy/apex/model/contextmodel/handling/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java [moved from model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineModel.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java [moved from model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineState.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java [moved from model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/AxEngineStats.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java [moved from model/engine-model/src/main/java/org/onap/policy/apex/model/enginemodel/concepts/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java [moved from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvent.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java [moved from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEventModel.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java [moved from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxEvents.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java [moved from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxField.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java [moved from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxInputField.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java [moved from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/AxOutputField.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java [moved from model/event-model/src/main/java/org/onap/policy/apex/model/eventmodel/concepts/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexApiResult.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/ApexEditorApi.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexEditorApi.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModel.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/ApexModelFactory.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ApexModelImpl.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbum.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbum.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextSchemaFacade.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRef.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/CreatePolicyStateTaskRef.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/EventFacade.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/KeyInformationFacade.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelFacade.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ModelHandlerFacade.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/PolicyFacade.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/TaskFacade.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/impl/package-info.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/modelapi/package-info.java [moved from model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogic.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogicReader.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxLogicReader.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicies.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicy.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxPolicyModel.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateFinalizerLogic.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateOutput.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateParamsBuilder.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskOutputType.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTaskReference.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxStateTree.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskLogic.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskParameter.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTaskSelectionLogic.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTasks.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyException.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyException.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyRuntimeException.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/PolicyRuntimeException.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyser.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalysisResult.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyComparer.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyComparer.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparer.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMerger.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMerger.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitter.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/policymodel/handling/package-info.java [moved from model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java [moved from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java [moved from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryDeleteShutdownHook.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java [moved from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java [moved from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java [moved from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java [moved from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java [moved from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java [moved from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java [moved from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java [moved from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/json/JsonHandler.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/utilities/json/package-info.java [moved from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/json/package-info.java with 100% similarity]
model/src/main/java/org/onap/policy/apex/model/utilities/package-info.java [moved from model/utilities/src/main/java/org/onap/policy/apex/model/utilities/package-info.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxConceptGetterImplTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyInfoTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxKeyUseTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/AxReferenceKeyTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/DummyEntity.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ExceptionsTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/concepts/ValidationTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelExceptionTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelFileWriterTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelReaderTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelSaverTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelStringWriterTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/ApexModelWriterTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyApexBasicModelCreator.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/DummyAxModelWithReferences.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelConceptsTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexBasicModelTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator0.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator0.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator1.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator2.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportApexModelCreator2.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportBasicModelTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/handling/SupportConceptGetterTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java [moved from model/basic-model/src/test/java/org/onap/policy/apex/model/basicmodel/service/ModelServiceTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java [moved from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java [moved from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java [moved from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java [moved from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java [moved from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java [moved from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModelCreator.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparisonFactory.java [moved from model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparisonFactory.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java [moved from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineModelTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java [moved from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/concepts/EngineStatsTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java [moved from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java [moved from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java [moved from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java [moved from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java [moved from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java [moved from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java [moved from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java [moved from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java [moved from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java [moved from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java [moved from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java [moved from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java [moved from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java [moved from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java [moved from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java [moved from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java [moved from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java [moved from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/RealModelTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/DummyLogicReader.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/ExceptionsTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/LogicTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PoliciesTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/PolicyModelTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateOutputTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTaskReferenceTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/StateTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TaskParameterTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/concepts/TasksTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/ApexPolicyModelTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyAnalyserTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReaderTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelComparerTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelMergerTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/PolicyModelSplitterTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/SupportApexPolicyModelCreator.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java [moved from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java [moved from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java [moved from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/utilities/KeyComparerTest.java [moved from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/KeyComparerTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java [moved from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/KeyedMapComparerTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java [moved from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java [moved from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java with 100% similarity]
model/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java [moved from model/utilities/src/test/java/org/onap/policy/apex/model/utilities/json/JsonHandlerTest.java with 100% similarity]
model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt [moved from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseKeys.txt with 100% similarity]
model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt [moved from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentTerseValues.txt with 100% similarity]
model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt [moved from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseKeys.txt with 100% similarity]
model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt [moved from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonDifferentVerboseValues.txt with 100% similarity]
model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt [moved from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalTerse.txt with 100% similarity]
model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt [moved from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseKeys.txt with 100% similarity]
model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt [moved from model/policy-model/src/test/resources/checkFiles/PolicyModelComparisonIdenticalVerboseValues.txt with 100% similarity]
model/src/test/resources/logback-test.xml [moved from model/context-model/src/test/resources/logback-test.xml with 100% similarity]
model/src/test/resources/models/PolicyModel.json [moved from model/model-api/src/test/resources/models/PolicyModel.json with 100% similarity]
model/src/test/resources/models/PolicyModel.junk [moved from model/model-api/src/test/resources/models/PolicyModel.junk with 100% similarity]
model/src/test/resources/models/RealPolicyModel.json [moved from model/model-api/src/test/resources/models/RealPolicyModel.json with 100% similarity]
model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic [moved from model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic with 100% similarity]
model/src/test/resources/testdir/testfile.xml [moved from model/utilities/src/test/resources/testdir/testfile.xml with 100% similarity]
model/utilities/pom.xml [deleted file]
plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
services/services-engine/pom.xml
testsuites/integration/integration-common/pom.xml
tools/model-generator/pom.xml

index 4917491..2773a77 100644 (file)
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>model-api</artifactId>
+            <artifactId>model</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
index fd8404b..e01025b 100644 (file)
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>model-api</artifactId>
+            <artifactId>model</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
index 0c6495a..0a026ea 100644 (file)
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>context-model</artifactId>
+            <artifactId>model</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
index 890b33c..597da29 100644 (file)
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>policy-model</artifactId>
+            <artifactId>model</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
index 631edf1..2110ace 100644 (file)
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>basic-model</artifactId>
+            <artifactId>model</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
index 3447c4d..5e8ba05 100644 (file)
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>policy-model</artifactId>
+            <artifactId>model</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
index f8bee87..158710a 100644 (file)
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>policy-model</artifactId>
+            <artifactId>model</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
index ea13297..68dc69a 100644 (file)
@@ -43,7 +43,7 @@
   <dependencies>
     <dependency>
       <groupId>org.onap.policy.apex-pdp.model</groupId>
-      <artifactId>policy-model</artifactId>
+      <artifactId>model</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
index 191e687..b3af036 100644 (file)
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>policy-model</artifactId>
+            <artifactId>model</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml
deleted file mode 100644 (file)
index 45d9978..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (c) 2020,2022 Nordix Foundation.
-  ================================================================================
-  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=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.apex-pdp.model</groupId>
-        <artifactId>model</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>basic-model</artifactId>
-    <name>${project.artifactId}</name>
-    <description>Basic Models used and model handling in Apex</description>
-    <properties>
-        <sonar.exclusions>
-            **/package-info.java,
-            **/TestApexModel.java,
-            **/TestApexModelCreator.java
-        </sonar.exclusions>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.common</groupId>
-            <artifactId>utils</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>utilities</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>${version.javax.bind}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
-            <artifactId>jaxb-runtime</artifactId>
-            <version>${version.javax.bind}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
-            <version>${version.javax.json}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
-            <version>${version.javax.json}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
\ 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 (file)
index 6e105a6..0000000
+++ /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 (file)
index c52f2de..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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=========================================================
--->
-
-<configuration>
-
-    <contextName>Apex</contextName>
-    <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
-    <property name="LOG_DIR" value="${java.io.tmpdir}/apex_logging/" />
-
-    <!-- USE FOR STD OUT ONLY -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-    <logger name="org.infinispan" level="INFO" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <logger name="org.apache.zookeeper.ClientCnxn" level="OFF" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${LOG_DIR}/apex.log</file>
-        <encoder>
-            <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
-                %logger{26} - %msg %n %ex{full}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="CTXT_FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${LOG_DIR}/apex_ctxt.log</file>
-        <encoder>
-            <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
-                %logger{26} - %msg %n %ex{full}</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.onap.policy.apex.core.context.impl.monitoring" level="INFO" additivity="false">
-        <appender-ref ref="CTXT_FILE" />
-    </logger>
-
-    <logger name="org.onap.policy.apex.core.context" level="INFO" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-</configuration>
diff --git a/model/context-model/pom.xml b/model/context-model/pom.xml
deleted file mode 100644 (file)
index f208081..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2016-2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2022 Nordix Foundation.
-  ================================================================================
-  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=========================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.onap.policy.apex-pdp.model</groupId>
-        <artifactId>model</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>context-model</artifactId>
-    <name>${project.artifactId}</name>
-    <description>Context Models used in Apex</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>basic-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/model/engine-model/pom.xml b/model/engine-model/pom.xml
deleted file mode 100644 (file)
index 9db1b20..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2022 Bell Canada.
-   Modifications Copyright (C) 2022 Nordix Foundation.
-  ================================================================================
-  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=========================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.onap.policy.apex-pdp.model</groupId>
-        <artifactId>model</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>engine-model</artifactId>
-    <name>${project.artifactId}</name>
-    <description>Engine Models used in Apex</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>policy-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.prometheus</groupId>
-            <artifactId>simpleclient</artifactId>
-        </dependency>
-    </dependencies>
-</project>
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 (file)
index c52f2de..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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=========================================================
--->
-
-<configuration>
-
-    <contextName>Apex</contextName>
-    <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
-    <property name="LOG_DIR" value="${java.io.tmpdir}/apex_logging/" />
-
-    <!-- USE FOR STD OUT ONLY -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-    <logger name="org.infinispan" level="INFO" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <logger name="org.apache.zookeeper.ClientCnxn" level="OFF" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${LOG_DIR}/apex.log</file>
-        <encoder>
-            <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
-                %logger{26} - %msg %n %ex{full}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="CTXT_FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${LOG_DIR}/apex_ctxt.log</file>
-        <encoder>
-            <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
-                %logger{26} - %msg %n %ex{full}</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.onap.policy.apex.core.context.impl.monitoring" level="INFO" additivity="false">
-        <appender-ref ref="CTXT_FILE" />
-    </logger>
-
-    <logger name="org.onap.policy.apex.core.context" level="INFO" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-</configuration>
diff --git a/model/event-model/pom.xml b/model/event-model/pom.xml
deleted file mode 100644 (file)
index 813ebb8..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2022 Nordix Foundation.
-  ================================================================================
-  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=========================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.onap.policy.apex-pdp.model</groupId>
-        <artifactId>model</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>event-model</artifactId>
-    <name>${project.artifactId}</name>
-    <description>Event Models used in Apex</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>context-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
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 (file)
index 2aff4c2..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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=========================================================
--->
-
-<configuration>
-
-    <contextName>Apex</contextName>
-    <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
-    <property name="LOG_DIR" value="${java.io.tmpdir}/apex_logging/" />
-
-    <!-- USE FOR STD OUT ONLY -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-    <logger name="org.infinispan" level="INFO" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <logger name="org.apache.zookeeper.ClientCnxn" level="OFF" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <logger name="org.onap.policy.apex.core" level="INFO" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${LOG_DIR}/apex.log</file>
-        <encoder>
-            <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
-                %logger{26} - %msg %n %ex{full}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="CTXT_FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${LOG_DIR}/apex_ctxt.log</file>
-        <encoder>
-            <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
-                %logger{26} - %msg %n %ex{full}</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.onap.policy.apex.core.context.impl.monitoring" level="INFO" additivity="false">
-        <appender-ref ref="CTXT_FILE" />
-    </logger>
-
-    <logger name="org.onap.policy.apex.core.context" level="INFO" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-</configuration>
diff --git a/model/model-api/pom.xml b/model/model-api/pom.xml
deleted file mode 100644 (file)
index 98c727e..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 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=========================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.onap.policy.apex-pdp.model</groupId>
-        <artifactId>model</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>model-api</artifactId>
-    <name>${project.artifactId}</name>
-    <description>APIs for editing Apex models</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.common</groupId>
-            <artifactId>utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>policy-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
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 (file)
index 2aff4c2..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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=========================================================
--->
-
-<configuration>
-
-    <contextName>Apex</contextName>
-    <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
-    <property name="LOG_DIR" value="${java.io.tmpdir}/apex_logging/" />
-
-    <!-- USE FOR STD OUT ONLY -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-    <logger name="org.infinispan" level="INFO" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <logger name="org.apache.zookeeper.ClientCnxn" level="OFF" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <logger name="org.onap.policy.apex.core" level="INFO" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${LOG_DIR}/apex.log</file>
-        <encoder>
-            <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
-                %logger{26} - %msg %n %ex{full}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="CTXT_FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${LOG_DIR}/apex_ctxt.log</file>
-        <encoder>
-            <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
-                %logger{26} - %msg %n %ex{full}</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.onap.policy.apex.core.context.impl.monitoring" level="INFO" additivity="false">
-        <appender-ref ref="CTXT_FILE" />
-    </logger>
-
-    <logger name="org.onap.policy.apex.core.context" level="INFO" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-</configuration>
diff --git a/model/policy-model/pom.xml b/model/policy-model/pom.xml
deleted file mode 100644 (file)
index cde0fa8..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2022 Nordix Foundation.
-  ================================================================================
-  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=========================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.onap.policy.apex-pdp.model</groupId>
-        <artifactId>model</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>policy-model</artifactId>
-    <name>${project.artifactId}</name>
-    <description>Policy Models used in Apex</description>
-
-    <dependencies>
-         <dependency>
-            <groupId>org.onap.policy.common</groupId>
-            <artifactId>utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>context-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>event-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
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 (file)
index 2aff4c2..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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=========================================================
--->
-
-<configuration>
-
-    <contextName>Apex</contextName>
-    <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
-    <property name="LOG_DIR" value="${java.io.tmpdir}/apex_logging/" />
-
-    <!-- USE FOR STD OUT ONLY -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-    <logger name="org.infinispan" level="INFO" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <logger name="org.apache.zookeeper.ClientCnxn" level="OFF" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <logger name="org.onap.policy.apex.core" level="INFO" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${LOG_DIR}/apex.log</file>
-        <encoder>
-            <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
-                %logger{26} - %msg %n %ex{full}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="CTXT_FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${LOG_DIR}/apex_ctxt.log</file>
-        <encoder>
-            <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
-                %logger{26} - %msg %n %ex{full}</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.onap.policy.apex.core.context.impl.monitoring" level="INFO" additivity="false">
-        <appender-ref ref="CTXT_FILE" />
-    </logger>
-
-    <logger name="org.onap.policy.apex.core.context" level="INFO" additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-</configuration>
index f358e59..a21ae66 100644 (file)
 
     <groupId>org.onap.policy.apex-pdp.model</groupId>
     <artifactId>model</artifactId>
-    <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
     <description>The model for Apex, it comtains definitions of all Apex concepts and also has handling for Apex models.</description>
 
-    <modules>
-        <module>utilities</module>
-        <module>basic-model</module>
-        <module>context-model</module>
-        <module>event-model</module>
-        <module>policy-model</module>
-        <module>engine-model</module>
-        <module>model-api</module>
-    </modules>
-
     <dependencies>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>utils</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>simpleclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+            <version>4.8-1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
diff --git a/model/utilities/pom.xml b/model/utilities/pom.xml
deleted file mode 100644 (file)
index 05c0852..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2020 Nordix Foundation.
-  ================================================================================
-  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=========================================================
--->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.onap.policy.apex-pdp.model</groupId>
-        <artifactId>model</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
-    </parent>
-    <artifactId>utilities</artifactId>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.common</groupId>
-            <artifactId>utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr4-runtime</artifactId>
-            <version>4.8-1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-        </dependency>
-    </dependencies>
-</project>
index 137f75f..01105f8 100644 (file)
@@ -44,9 +44,8 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>policy-model</artifactId>
+            <artifactId>model</artifactId>
             <version>${project.version}</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>
index bd527c6..e31b09a 100644 (file)
             </resource>
         </resources>
     </build>
-</project>
\ No newline at end of file
+</project>
index ad438d7..54736f8 100644 (file)
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>policy-model</artifactId>
+            <artifactId>model</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
index 951bd76..3e3db95 100644 (file)
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>model-api</artifactId>
+            <artifactId>model</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             </build>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>