From b109c218ab7db28fd1cbe62c808496dfdedad809 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 18 Jul 2018 11:23:20 +0100 Subject: [PATCH] Fix incorrect naming on context plugins This change fixes inconsistent naming on the context plugins in APEX. All plugins should fillow the naming convention of plugin-A.plugin-A.B.plugin.A.B.C and so on. Not following this convention breaks the APEX documentation build. Issue-ID: POLICY-954 Change-Id: I8aad4a28d143427e60017eaa119ee4f7ce9f5b3d Signed-off-by: liamfallon --- auth/pom.xml | 18 +++++------------- packages/apex-pdp-package-full/pom.xml | 20 ++++++++++---------- .../plugins-context-distribution-hazelcast}/pom.xml | 8 ++++---- .../hazelcast/HazelcastContextDistributor.java | 0 .../context/distribution/hazelcast/package-info.java | 0 .../main/resources/hazelcast/hazelcast.xml.sample | 0 .../hazelcast/HazelcastContextDistributorTest.java | 0 .../plugins-context-distribution-infinispan}/pom.xml | 8 ++++---- .../infinispan/InfinispanContextDistributor.java | 0 .../infinispan/InfinispanDistributorParameters.java | 0 .../distribution/infinispan/InfinispanManager.java | 0 .../distribution/infinispan/package-info.java | 0 .../main/resources/infinispan/infinispan.xml.sample | 0 .../infinispan/InfinispanContextDistributorTest.java | 0 .../pom.xml | 10 +++++----- .../plugins-context-locking-curator}/pom.xml | 6 +++--- .../context/locking/curator/CuratorLockFacade.java | 0 .../context/locking/curator/CuratorLockManager.java | 0 .../curator/CuratorLockManagerParameters.java | 0 .../curator/CuratorReentrantReadWriteLock.java | 0 .../context/locking/curator/package-info.java | 0 .../plugins-context-locking-hazelcast}/pom.xml | 16 ++++++++-------- .../context/locking/hazelcast/HazelcastLock.java | 0 .../locking/hazelcast/HazelcastLockManager.java | 0 .../context/locking/hazelcast/package-info.java | 0 .../pom.xml | 10 +++++----- .../pom.xml | 6 +++--- .../plugins-context-schema-avro}/pom.xml | 8 ++++---- .../context/schema/avro/AvroArrayObjectMapper.java | 0 .../context/schema/avro/AvroBytesObjectMapper.java | 0 .../context/schema/avro/AvroDirectObjectMapper.java | 0 .../context/schema/avro/AvroEnumObjectMapper.java | 0 .../context/schema/avro/AvroNullableMapper.java | 0 .../context/schema/avro/AvroObjectMapper.java | 0 .../context/schema/avro/AvroObjectMapperFactory.java | 0 .../context/schema/avro/AvroRecordObjectMapper.java | 0 .../context/schema/avro/AvroSchemaHelper.java | 0 .../schema/avro/AvroSchemaHelperParameters.java | 0 .../avro/AvroSchemaKeyTranslationUtilities.java | 0 .../context/schema/avro/AvroStringObjectMapper.java | 0 .../plugins/context/schema/avro/package-info.java | 0 .../context/schema/avro/TestAvroSchemaAAI.java | 0 .../context/schema/avro/TestAvroSchemaArray.java | 0 .../context/schema/avro/TestAvroSchemaEnum.java | 0 .../context/schema/avro/TestAvroSchemaFixed.java | 0 .../schema/avro/TestAvroSchemaHelperBadSchemas.java | 0 .../schema/avro/TestAvroSchemaHelperMarshal.java | 0 .../schema/avro/TestAvroSchemaHelperUnmarshal.java | 0 .../context/schema/avro/TestAvroSchemaMap.java | 0 .../context/schema/avro/TestAvroSchemaRecord.java | 0 .../context/schema/avro/TestAvroSchemaUnion.java | 0 .../context/schema/avro/TestHealthCheckSchema.java | 0 .../resources/avsc/AAIInventoryResponseItemType.avsc | 0 .../src/test/resources/avsc/ArrayExampleAddress.avsc | 0 .../src/test/resources/avsc/ArrayExampleLong.avsc | 0 .../src/test/resources/avsc/EnumSchema.avsc | 0 .../src/test/resources/avsc/FixedSchema.avsc | 0 .../src/test/resources/avsc/HealthCheckBodyType.avsc | 0 .../src/test/resources/avsc/MapExampleAddress.avsc | 0 .../avsc/MapExampleAddressInvalidFields.avsc | 0 .../src/test/resources/avsc/MapExampleLong.avsc | 0 .../src/test/resources/avsc/RecordExample.avsc | 0 .../resources/avsc/RecordExampleInvalidFields.avsc | 0 .../src/test/resources/avsc/RecordExampleVPN.avsc | 0 .../test/resources/avsc/RecordExampleVPNReuse.avsc | 0 .../src/test/resources/avsc/UnionExample.avsc | 0 .../src/test/resources/data/AAIResponse4Policy.json | 0 .../src/test/resources/data/AAIResponse4VNF.json | 0 .../src/test/resources/data/AAIResponseExample.json | 0 .../test/resources/data/ArrayExampleAddressFull.json | 0 .../test/resources/data/ArrayExampleAddressNull.json | 0 .../test/resources/data/ArrayExampleLongFull.json | 0 .../test/resources/data/ArrayExampleLongNull.json | 0 .../src/test/resources/data/EnumExampleBad0.json | 0 .../src/test/resources/data/EnumExampleBad1.json | 0 .../src/test/resources/data/EnumExampleHearts.json | 0 .../src/test/resources/data/EnumExampleNull.json | 0 .../src/test/resources/data/FixedExampleBad0.json | 0 .../src/test/resources/data/FixedExampleBad1.json | 0 .../src/test/resources/data/FixedExampleGood.json | 0 .../src/test/resources/data/FixedExampleNull.json | 0 .../src/test/resources/data/HealthCheckEvent.json | 0 .../test/resources/data/MapExampleAddressFull.json | 0 .../data/MapExampleAddressInvalidFields.json | 0 .../test/resources/data/MapExampleAddressNull.json | 0 .../src/test/resources/data/MapExampleLongFull.json | 0 .../src/test/resources/data/MapExampleLongNull.json | 0 .../src/test/resources/data/RecordExampleFull.json | 0 .../resources/data/RecordExampleInvalidFields.json | 0 .../src/test/resources/data/RecordExampleNull.json | 0 .../test/resources/data/RecordExampleVPNFull.json | 0 .../test/resources/data/UnionExampleAllFields.json | 0 .../test/resources/data/UnionExampleNullField.json | 0 .../resources/data/UnionExampleOptionalField.json | 0 .../src/test/resources/logback-test.xml | 0 .../pom.xml | 6 +++--- plugins/plugins-context/pom.xml | 10 +++++----- .../plugins-event-protocol-yaml/pom.xml | 6 ------ .../integration/integration-context-test/pom.xml | 18 +++++++++--------- .../integration/integration-uservice-test/pom.xml | 8 ++++---- .../performance/performance-benchmark-test/pom.xml | 6 +++--- .../performance/performance-context-metrics/pom.xml | 18 +++++++++--------- tools/model-generator/pom.xml | 6 +++--- 103 files changed, 87 insertions(+), 101 deletions(-) rename plugins/plugins-context/{context-distribution/context-distribution-hazelcast => plugins-context-distribution/plugins-context-distribution-hazelcast}/pom.xml (91%) rename plugins/plugins-context/{context-distribution/context-distribution-hazelcast => plugins-context-distribution/plugins-context-distribution-hazelcast}/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java (100%) rename plugins/plugins-context/{context-distribution/context-distribution-hazelcast => plugins-context-distribution/plugins-context-distribution-hazelcast}/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/package-info.java (100%) rename plugins/plugins-context/{context-distribution/context-distribution-hazelcast => plugins-context-distribution/plugins-context-distribution-hazelcast}/src/main/resources/hazelcast/hazelcast.xml.sample (100%) rename plugins/plugins-context/{context-distribution/context-distribution-hazelcast => plugins-context-distribution/plugins-context-distribution-hazelcast}/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java (100%) rename plugins/plugins-context/{context-distribution/context-distribution-infinispan => plugins-context-distribution/plugins-context-distribution-infinispan}/pom.xml (92%) rename plugins/plugins-context/{context-distribution/context-distribution-infinispan => plugins-context-distribution/plugins-context-distribution-infinispan}/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java (100%) rename plugins/plugins-context/{context-distribution/context-distribution-infinispan => plugins-context-distribution/plugins-context-distribution-infinispan}/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java (100%) rename plugins/plugins-context/{context-distribution/context-distribution-infinispan => plugins-context-distribution/plugins-context-distribution-infinispan}/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java (100%) rename plugins/plugins-context/{context-distribution/context-distribution-infinispan => plugins-context-distribution/plugins-context-distribution-infinispan}/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/package-info.java (100%) rename plugins/plugins-context/{context-distribution/context-distribution-infinispan => plugins-context-distribution/plugins-context-distribution-infinispan}/src/main/resources/infinispan/infinispan.xml.sample (100%) rename plugins/plugins-context/{context-distribution/context-distribution-infinispan => plugins-context-distribution/plugins-context-distribution-infinispan}/src/test/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributorTest.java (100%) rename plugins/plugins-context/{context-distribution => plugins-context-distribution}/pom.xml (83%) rename plugins/plugins-context/{context-locking/context-locking-curator => plugins-context-locking/plugins-context-locking-curator}/pom.xml (95%) rename plugins/plugins-context/{context-locking/context-locking-curator => plugins-context-locking/plugins-context-locking-curator}/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java (100%) rename plugins/plugins-context/{context-locking/context-locking-curator => plugins-context-locking/plugins-context-locking-curator}/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java (100%) rename plugins/plugins-context/{context-locking/context-locking-curator => plugins-context-locking/plugins-context-locking-curator}/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java (100%) rename plugins/plugins-context/{context-locking/context-locking-curator => plugins-context-locking/plugins-context-locking-curator}/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java (100%) rename plugins/plugins-context/{context-locking/context-locking-curator => plugins-context-locking/plugins-context-locking-curator}/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/package-info.java (100%) rename plugins/plugins-context/{context-locking/context-locking-hazelcast => plugins-context-locking/plugins-context-locking-hazelcast}/pom.xml (84%) rename plugins/plugins-context/{context-locking/context-locking-hazelcast => plugins-context-locking/plugins-context-locking-hazelcast}/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java (100%) rename plugins/plugins-context/{context-locking/context-locking-hazelcast => plugins-context-locking/plugins-context-locking-hazelcast}/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java (100%) rename plugins/plugins-context/{context-locking/context-locking-hazelcast => plugins-context-locking/plugins-context-locking-hazelcast}/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/package-info.java (100%) rename plugins/plugins-context/{context-locking => plugins-context-locking}/pom.xml (84%) rename plugins/plugins-context/{context-persistence => plugins-context-persistence}/pom.xml (89%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/pom.xml (92%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapper.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapperFactory.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperParameters.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/package-info.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaAAI.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaArray.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaEnum.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaFixed.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperBadSchemas.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperMarshal.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperUnmarshal.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaMap.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaRecord.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaUnion.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestHealthCheckSchema.java (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/AAIInventoryResponseItemType.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/ArrayExampleAddress.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/ArrayExampleLong.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/EnumSchema.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/FixedSchema.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/HealthCheckBodyType.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/MapExampleAddress.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/MapExampleAddressInvalidFields.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/MapExampleLong.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/RecordExample.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/RecordExampleInvalidFields.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/RecordExampleVPN.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/RecordExampleVPNReuse.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/avsc/UnionExample.avsc (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/AAIResponse4Policy.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/AAIResponse4VNF.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/AAIResponseExample.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/ArrayExampleAddressFull.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/ArrayExampleAddressNull.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/ArrayExampleLongFull.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/ArrayExampleLongNull.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/EnumExampleBad0.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/EnumExampleBad1.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/EnumExampleHearts.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/EnumExampleNull.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/FixedExampleBad0.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/FixedExampleBad1.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/FixedExampleGood.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/FixedExampleNull.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/HealthCheckEvent.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/MapExampleAddressFull.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/MapExampleAddressInvalidFields.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/MapExampleAddressNull.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/MapExampleLongFull.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/MapExampleLongNull.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/RecordExampleFull.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/RecordExampleInvalidFields.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/RecordExampleNull.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/RecordExampleVPNFull.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/UnionExampleAllFields.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/UnionExampleNullField.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/data/UnionExampleOptionalField.json (100%) rename plugins/plugins-context/{context-schema/context-schema-avro => plugins-context-schema/plugins-context-schema-avro}/src/test/resources/logback-test.xml (100%) rename plugins/plugins-context/{context-schema => plugins-context-schema}/pom.xml (88%) diff --git a/auth/pom.xml b/auth/pom.xml index 6fe1f078d..05562509f 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -33,16 +33,8 @@ ${project.artifactId} Policy, state, and task authoring for Apex. - - - apexDefault - - true - - - cli-editor - cli-codegen - - - - \ No newline at end of file + + cli-editor + cli-codegen + + diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml index 890f9f55e..2b05807e2 100644 --- a/packages/apex-pdp-package-full/pom.xml +++ b/packages/apex-pdp-package-full/pom.xml @@ -43,32 +43,32 @@ - org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution - context-distribution-hazelcast + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution + plugins-context-distribution-hazelcast ${project.version} - org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution - context-distribution-infinispan + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution + plugins-context-distribution-infinispan ${project.version} - org.onap.policy.apex-pdp.plugins.plugins-context.context-locking - context-locking-hazelcast + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking + plugins-context-locking-hazelcast ${project.version} - org.onap.policy.apex-pdp.plugins.plugins-context.context-locking - context-locking-curator + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking + plugins-context-locking-curator ${project.version} - org.onap.policy.apex-pdp.plugins.plugins-context.context-schema - context-schema-avro + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema + plugins-context-schema-avro ${project.version} diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml similarity index 91% rename from plugins/plugins-context/context-distribution/context-distribution-hazelcast/pom.xml rename to plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml index 71806c54f..e8fe62565 100644 --- a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/pom.xml +++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml @@ -21,12 +21,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution - context-distribution + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution + plugins-context-distribution 2.0.0-SNAPSHOT - context-distribution-hazelcast + plugins-context-distribution-hazelcast ${project.artifactId} [${project.parent.artifactId}] Plugin for distribution using Hazelcast @@ -43,4 +43,4 @@ test - \ No newline at end of file + diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java similarity index 100% rename from plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java rename to plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributor.java diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/package-info.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/package-info.java similarity index 100% rename from plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/package-info.java rename to plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/package-info.java diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/resources/hazelcast/hazelcast.xml.sample b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/resources/hazelcast/hazelcast.xml.sample similarity index 100% rename from plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/main/resources/hazelcast/hazelcast.xml.sample rename to plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/main/resources/hazelcast/hazelcast.xml.sample diff --git a/plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java similarity index 100% rename from plugins/plugins-context/context-distribution/context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java rename to plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/test/java/org/onap/policy/apex/plugins/context/distribution/hazelcast/HazelcastContextDistributorTest.java diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml similarity index 92% rename from plugins/plugins-context/context-distribution/context-distribution-infinispan/pom.xml rename to plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml index c6985a952..96ed6e85e 100644 --- a/plugins/plugins-context/context-distribution/context-distribution-infinispan/pom.xml +++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml @@ -21,12 +21,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution - context-distribution + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution + plugins-context-distribution 2.0.0-SNAPSHOT - context-distribution-infinispan + plugins-context-distribution-infinispan ${project.artifactId} [${project.parent.artifactId}] Plugin for distribution using Infinispan @@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java similarity index 100% rename from plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java rename to plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java similarity index 100% rename from plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java rename to plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanDistributorParameters.java diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java similarity index 100% rename from plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java rename to plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanManager.java diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/package-info.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/package-info.java similarity index 100% rename from plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/package-info.java rename to plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/package-info.java diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/resources/infinispan/infinispan.xml.sample b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/resources/infinispan/infinispan.xml.sample similarity index 100% rename from plugins/plugins-context/context-distribution/context-distribution-infinispan/src/main/resources/infinispan/infinispan.xml.sample rename to plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/resources/infinispan/infinispan.xml.sample diff --git a/plugins/plugins-context/context-distribution/context-distribution-infinispan/src/test/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributorTest.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/test/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributorTest.java similarity index 100% rename from plugins/plugins-context/context-distribution/context-distribution-infinispan/src/test/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributorTest.java rename to plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/test/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributorTest.java diff --git a/plugins/plugins-context/context-distribution/pom.xml b/plugins/plugins-context/plugins-context-distribution/pom.xml similarity index 83% rename from plugins/plugins-context/context-distribution/pom.xml rename to plugins/plugins-context/plugins-context-distribution/pom.xml index 94e769151..0433b33f6 100644 --- a/plugins/plugins-context/context-distribution/pom.xml +++ b/plugins/plugins-context/plugins-context-distribution/pom.xml @@ -27,15 +27,15 @@ 2.0.0-SNAPSHOT - org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution - context-distribution + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution + plugins-context-distribution pom ${project.artifactId} Plugins for 3pps that distribute context - context-distribution-hazelcast - context-distribution-infinispan + plugins-context-distribution-hazelcast + plugins-context-distribution-infinispan - \ No newline at end of file + diff --git a/plugins/plugins-context/context-locking/context-locking-curator/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml similarity index 95% rename from plugins/plugins-context/context-locking/context-locking-curator/pom.xml rename to plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml index 220bfbae6..cb5a03d24 100644 --- a/plugins/plugins-context/context-locking/context-locking-curator/pom.xml +++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml @@ -21,12 +21,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.onap.policy.apex-pdp.plugins.plugins-context.context-locking - context-locking + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking + plugins-context-locking 2.0.0-SNAPSHOT - context-locking-curator + plugins-context-locking-curator ${project.artifactId} [${project.parent.artifactId}] Plugin for locking using Curator diff --git a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java similarity index 100% rename from plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java rename to plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockFacade.java diff --git a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java similarity index 100% rename from plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java rename to plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManager.java diff --git a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java similarity index 100% rename from plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java rename to plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorLockManagerParameters.java diff --git a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java similarity index 100% rename from plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java rename to plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/CuratorReentrantReadWriteLock.java diff --git a/plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/package-info.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/package-info.java similarity index 100% rename from plugins/plugins-context/context-locking/context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/package-info.java rename to plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/main/java/org/onap/policy/apex/plugins/context/locking/curator/package-info.java diff --git a/plugins/plugins-context/context-locking/context-locking-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml similarity index 84% rename from plugins/plugins-context/context-locking/context-locking-hazelcast/pom.xml rename to plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml index 3e581ecad..e82aca52d 100644 --- a/plugins/plugins-context/context-locking/context-locking-hazelcast/pom.xml +++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml @@ -22,12 +22,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.onap.policy.apex-pdp.plugins.plugins-context.context-locking - context-locking + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking + plugins-context-locking 2.0.0-SNAPSHOT - context-locking-hazelcast + plugins-context-locking-hazelcast ${project.artifactId} [${project.parent.artifactId}] Plugin for locking using Hazelcast @@ -44,16 +44,16 @@ test - org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution - context-distribution-hazelcast + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution + plugins-context-distribution-hazelcast ${project.version} test - org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution - context-distribution-infinispan + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution + plugins-context-distribution-infinispan ${project.version} test - \ No newline at end of file + diff --git a/plugins/plugins-context/context-locking/context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java similarity index 100% rename from plugins/plugins-context/context-locking/context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java rename to plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLock.java diff --git a/plugins/plugins-context/context-locking/context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java similarity index 100% rename from plugins/plugins-context/context-locking/context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java rename to plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/HazelcastLockManager.java diff --git a/plugins/plugins-context/context-locking/context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/package-info.java b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/package-info.java similarity index 100% rename from plugins/plugins-context/context-locking/context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/package-info.java rename to plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/main/java/org/onap/policy/apex/plugins/context/locking/hazelcast/package-info.java diff --git a/plugins/plugins-context/context-locking/pom.xml b/plugins/plugins-context/plugins-context-locking/pom.xml similarity index 84% rename from plugins/plugins-context/context-locking/pom.xml rename to plugins/plugins-context/plugins-context-locking/pom.xml index a25eb927d..58027218c 100644 --- a/plugins/plugins-context/context-locking/pom.xml +++ b/plugins/plugins-context/plugins-context-locking/pom.xml @@ -26,14 +26,14 @@ 2.0.0-SNAPSHOT - org.onap.policy.apex-pdp.plugins.plugins-context.context-locking - context-locking + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking + plugins-context-locking pom ${project.artifactId} Plugins for 3pps that lock context - context-locking-curator - context-locking-hazelcast + plugins-context-locking-curator + plugins-context-locking-hazelcast - \ No newline at end of file + diff --git a/plugins/plugins-context/context-persistence/pom.xml b/plugins/plugins-context/plugins-context-persistence/pom.xml similarity index 89% rename from plugins/plugins-context/context-persistence/pom.xml rename to plugins/plugins-context/plugins-context-persistence/pom.xml index ae56b887c..e791f6155 100644 --- a/plugins/plugins-context/context-persistence/pom.xml +++ b/plugins/plugins-context/plugins-context-persistence/pom.xml @@ -26,10 +26,10 @@ 2.0.0-SNAPSHOT - org.onap.policy.apex-pdp.plugins.plugins-context.context-persistence - context-persistence + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-persistence + plugins-context-persistence pom ${project.artifactId} Plugins for 3pps that persist context - \ No newline at end of file + diff --git a/plugins/plugins-context/context-schema/context-schema-avro/pom.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml similarity index 92% rename from plugins/plugins-context/context-schema/context-schema-avro/pom.xml rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml index 37268676b..89152eeb5 100644 --- a/plugins/plugins-context/context-schema/context-schema-avro/pom.xml +++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml @@ -21,12 +21,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.onap.policy.apex-pdp.plugins.plugins-context.context-schema - context-schema + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema + plugins-context-schema 2.0.0-SNAPSHOT - context-schema-avro + plugins-context-schema-avro ${project.artifactId} [${project.parent.artifactId}] Plugin for schemas using Avro @@ -43,4 +43,4 @@ test - \ No newline at end of file + diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroArrayObjectMapper.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroBytesObjectMapper.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroDirectObjectMapper.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroEnumObjectMapper.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroNullableMapper.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapper.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapper.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapper.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapperFactory.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapperFactory.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapperFactory.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroObjectMapperFactory.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroRecordObjectMapper.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelper.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperParameters.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperParameters.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperParameters.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaHelperParameters.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroSchemaKeyTranslationUtilities.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/AvroStringObjectMapper.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/package-info.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/package-info.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/package-info.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/main/java/org/onap/policy/apex/plugins/context/schema/avro/package-info.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaAAI.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaAAI.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaAAI.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaAAI.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaArray.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaArray.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaArray.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaArray.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaEnum.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaEnum.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaEnum.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaEnum.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaFixed.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaFixed.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaFixed.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaFixed.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperBadSchemas.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperBadSchemas.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperBadSchemas.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperBadSchemas.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperMarshal.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperMarshal.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperMarshal.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperMarshal.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperUnmarshal.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperUnmarshal.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperUnmarshal.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaHelperUnmarshal.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaMap.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaMap.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaMap.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaMap.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaRecord.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaRecord.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaRecord.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaRecord.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaUnion.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaUnion.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaUnion.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestAvroSchemaUnion.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestHealthCheckSchema.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestHealthCheckSchema.java similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestHealthCheckSchema.java rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/java/org/onap/policy/apex/plugins/context/schema/avro/TestHealthCheckSchema.java diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/AAIInventoryResponseItemType.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/AAIInventoryResponseItemType.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/AAIInventoryResponseItemType.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/AAIInventoryResponseItemType.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/ArrayExampleAddress.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleAddress.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/ArrayExampleAddress.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleAddress.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/ArrayExampleLong.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleLong.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/ArrayExampleLong.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/ArrayExampleLong.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/EnumSchema.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/EnumSchema.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/EnumSchema.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/EnumSchema.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/FixedSchema.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/FixedSchema.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/FixedSchema.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/FixedSchema.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/HealthCheckBodyType.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/HealthCheckBodyType.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/HealthCheckBodyType.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/HealthCheckBodyType.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/MapExampleAddress.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddress.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/MapExampleAddress.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddress.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/MapExampleAddressInvalidFields.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddressInvalidFields.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/MapExampleAddressInvalidFields.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleAddressInvalidFields.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/MapExampleLong.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleLong.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/MapExampleLong.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/MapExampleLong.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExample.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExample.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExample.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExample.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExampleInvalidFields.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleInvalidFields.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExampleInvalidFields.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleInvalidFields.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExampleVPN.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPN.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExampleVPN.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPN.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExampleVPNReuse.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPNReuse.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/RecordExampleVPNReuse.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/RecordExampleVPNReuse.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/UnionExample.avsc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/UnionExample.avsc similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/avsc/UnionExample.avsc rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/avsc/UnionExample.avsc diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/AAIResponse4Policy.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4Policy.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/AAIResponse4Policy.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4Policy.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/AAIResponse4VNF.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4VNF.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/AAIResponse4VNF.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponse4VNF.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/AAIResponseExample.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponseExample.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/AAIResponseExample.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/AAIResponseExample.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleAddressFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleAddressFull.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleAddressFull.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleAddressFull.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleAddressNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleAddressNull.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleAddressNull.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleAddressNull.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleLongFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleLongFull.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleLongFull.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleLongFull.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleLongNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleLongNull.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/ArrayExampleLongNull.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/ArrayExampleLongNull.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleBad0.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleBad0.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleBad0.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleBad0.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleBad1.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleBad1.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleBad1.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleBad1.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleHearts.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleHearts.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleHearts.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleHearts.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleNull.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/EnumExampleNull.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/EnumExampleNull.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleBad0.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleBad0.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleBad0.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleBad0.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleBad1.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleBad1.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleBad1.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleBad1.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleGood.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleGood.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleGood.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleGood.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleNull.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/FixedExampleNull.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/FixedExampleNull.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/HealthCheckEvent.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/HealthCheckEvent.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/HealthCheckEvent.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/HealthCheckEvent.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleAddressFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressFull.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleAddressFull.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressFull.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleAddressInvalidFields.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressInvalidFields.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleAddressInvalidFields.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressInvalidFields.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleAddressNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressNull.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleAddressNull.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleAddressNull.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleLongFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleLongFull.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleLongFull.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleLongFull.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleLongNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleLongNull.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/MapExampleLongNull.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/MapExampleLongNull.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleFull.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleFull.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleFull.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleInvalidFields.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleInvalidFields.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleInvalidFields.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleInvalidFields.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleNull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleNull.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleNull.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleNull.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleVPNFull.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleVPNFull.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/RecordExampleVPNFull.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/RecordExampleVPNFull.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/UnionExampleAllFields.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleAllFields.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/UnionExampleAllFields.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleAllFields.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/UnionExampleNullField.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleNullField.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/UnionExampleNullField.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleNullField.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/UnionExampleOptionalField.json b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleOptionalField.json similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/data/UnionExampleOptionalField.json rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/data/UnionExampleOptionalField.json diff --git a/plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/logback-test.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/logback-test.xml similarity index 100% rename from plugins/plugins-context/context-schema/context-schema-avro/src/test/resources/logback-test.xml rename to plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/test/resources/logback-test.xml diff --git a/plugins/plugins-context/context-schema/pom.xml b/plugins/plugins-context/plugins-context-schema/pom.xml similarity index 88% rename from plugins/plugins-context/context-schema/pom.xml rename to plugins/plugins-context/plugins-context-schema/pom.xml index d60cb5570..f515c2015 100644 --- a/plugins/plugins-context/context-schema/pom.xml +++ b/plugins/plugins-context/plugins-context-schema/pom.xml @@ -26,13 +26,13 @@ 2.0.0-SNAPSHOT - org.onap.policy.apex-pdp.plugins.plugins-context.context-schema - context-schema + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema + plugins-context-schema pom ${project.artifactId} Plugins for 3pps that handle context schemas - context-schema-avro + plugins-context-schema-avro diff --git a/plugins/plugins-context/pom.xml b/plugins/plugins-context/pom.xml index 8e3c72870..d3d2963e6 100644 --- a/plugins/plugins-context/pom.xml +++ b/plugins/plugins-context/pom.xml @@ -42,10 +42,10 @@ - context-schema - context-distribution - context-locking - context-persistence + plugins-context-schema + plugins-context-distribution + plugins-context-locking + plugins-context-persistence - \ No newline at end of file + diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml index c44b09fd6..b40aab498 100644 --- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml +++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml @@ -40,11 +40,5 @@ snakeyaml 1.21 - - org.onap.policy.apex-pdp.plugins.plugins-context.context-schema - context-schema-avro - ${project.version} - test - diff --git a/testsuites/integration/integration-context-test/pom.xml b/testsuites/integration/integration-context-test/pom.xml index 8c62339f2..6454a8cd5 100644 --- a/testsuites/integration/integration-context-test/pom.xml +++ b/testsuites/integration/integration-context-test/pom.xml @@ -40,18 +40,18 @@ test - org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution - context-distribution-hazelcast + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution + plugins-context-distribution-hazelcast ${project.version} - org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution - context-distribution-infinispan + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution + plugins-context-distribution-infinispan ${project.version} - org.onap.policy.apex-pdp.plugins.plugins-context.context-locking - context-locking-curator + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking + plugins-context-locking-curator ${project.version} @@ -61,8 +61,8 @@ - org.onap.policy.apex-pdp.plugins.plugins-context.context-locking - context-locking-hazelcast + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking + plugins-context-locking-hazelcast ${project.version} @@ -85,4 +85,4 @@ - \ No newline at end of file + diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml index 8fbafb604..427f70f27 100644 --- a/testsuites/integration/integration-uservice-test/pom.xml +++ b/testsuites/integration/integration-uservice-test/pom.xml @@ -53,8 +53,8 @@ test - org.onap.policy.apex-pdp.plugins.plugins-context.context-schema - context-schema-avro + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema + plugins-context-schema-avro ${project.version} test @@ -71,8 +71,8 @@ test - org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution - context-distribution-infinispan + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution + plugins-context-distribution-infinispan ${project.version} test diff --git a/testsuites/performance/performance-benchmark-test/pom.xml b/testsuites/performance/performance-benchmark-test/pom.xml index 118fe115c..938884762 100644 --- a/testsuites/performance/performance-benchmark-test/pom.xml +++ b/testsuites/performance/performance-benchmark-test/pom.xml @@ -72,8 +72,8 @@ test - org.onap.policy.apex-pdp.plugins.plugins-context.context-schema - context-schema-avro + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema + plugins-context-schema-avro ${project.version} test @@ -96,4 +96,4 @@ - \ No newline at end of file + diff --git a/testsuites/performance/performance-context-metrics/pom.xml b/testsuites/performance/performance-context-metrics/pom.xml index 4f6eabf56..830e6ad54 100644 --- a/testsuites/performance/performance-context-metrics/pom.xml +++ b/testsuites/performance/performance-context-metrics/pom.xml @@ -43,23 +43,23 @@ ${project.version} - org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution - context-distribution-hazelcast + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution + plugins-context-distribution-hazelcast ${project.version} - org.onap.policy.apex-pdp.plugins.plugins-context.context-distribution - context-distribution-infinispan + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution + plugins-context-distribution-infinispan ${project.version} - org.onap.policy.apex-pdp.plugins.plugins-context.context-locking - context-locking-curator + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking + plugins-context-locking-curator ${project.version} - org.onap.policy.apex-pdp.plugins.plugins-context.context-locking - context-locking-hazelcast + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking + plugins-context-locking-hazelcast ${project.version} @@ -69,4 +69,4 @@ test - \ No newline at end of file + diff --git a/tools/model-generator/pom.xml b/tools/model-generator/pom.xml index 2cdc7c20f..5da446c77 100644 --- a/tools/model-generator/pom.xml +++ b/tools/model-generator/pom.xml @@ -47,8 +47,8 @@ ${project.version} - org.onap.policy.apex-pdp.plugins.plugins-context.context-schema - context-schema-avro + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema + plugins-context-schema-avro ${project.version} @@ -57,4 +57,4 @@ ${project.version} - \ No newline at end of file + -- 2.16.6