From 6b9c0bb57b65343df31fd68d178821a22afd0fe2 Mon Sep 17 00:00:00 2001 From: Basheeruddin Ahmed Date: Mon, 4 Aug 2014 17:18:27 -0700 Subject: [PATCH] Created sal-clustering-commons and moved sal-protobuff-encoding files to sal-clustering-commons updated sal-distributed-datastore pom with the above change removed sal-clustering-commons as part of distribution as it is embedded currently as part of distributed-datastore Note - after this is merged we need to move out the .proto from akka-raft to sal-clustering-commons and add dependency of sal-akka-raft on sal-clustering-commons and embed the same rebased Change-Id: I7d4ac51628cef96ffb16acfcfd596dfd3129e0fa Signed-off-by: Basheeruddin Ahmed --- opendaylight/commons/opendaylight/pom.xml | 5 +++++ opendaylight/distribution/opendaylight/pom.xml | 1 - opendaylight/md-sal/pom.xml | 4 ++-- .../README-FIRST | 0 .../pom.xml | 2 +- .../run.sh | 2 +- .../datastore/node/NodeToNormalizedNodeBuilder.java | 0 .../cluster/datastore/node/NodeValueCodec.java | 0 .../datastore/node/NormalizedNodeToNodeCodec.java | 0 .../node/NormalizedNodeToProtocolBufferNode.java | 0 .../node/utils/AugmentationIdentifierGenerator.java | 0 .../datastore/node/utils/NodeIdentifierFactory.java | 0 .../datastore/node/utils/NodeIdentifierGenerator.java | 0 .../utils/NodeIdentifierWithPredicatesGenerator.java | 0 .../node/utils/NodeIdentifierWithValueGenerator.java | 0 .../datastore/node/utils/NormalizedNodeGetter.java | 0 .../datastore/node/utils/NormalizedNodeNavigator.java | 0 .../datastore/node/utils/NormalizedNodePrinter.java | 0 .../datastore/node/utils/NormalizedNodeVisitor.java | 0 .../cluster/datastore/node/utils/PathUtils.java | 0 .../cluster/datastore/node/utils/QNameFactory.java | 0 .../cluster/datastore/util/EncoderDecoderUtil.java | 0 .../datastore/util/InstanceIdentifierUtils.java | 0 .../controller/mdsal/CompositeModificationPayload.java | 10 ---------- .../cohort3pc/ThreePhaseCommitCohortMessages.java | 10 ---------- .../messages/common/NormalizedNodeMessages.java | 10 ---------- .../messages/common/SimpleNormalizedNodeMessage.java | 10 ---------- .../notification/DataChangeListenerMessages.java | 10 ---------- .../messages/persistent/PersistentMessages.java | 10 ---------- .../registration/ListenerRegistrationMessages.java | 10 ---------- .../protobuff/messages/shard/ShardManagerMessages.java | 10 ---------- .../transaction/ShardTransactionChainMessages.java | 10 ---------- .../messages/transaction/ShardTransactionMessages.java | 10 ---------- .../src/main/resources/Cohort.proto | 0 .../src/main/resources/Common.proto | 0 .../main/resources/CompositeModificationPayload.proto | 0 .../src/main/resources/DataChangeListener.proto | 0 .../src/main/resources/ListenerRegistration.proto | 0 .../src/main/resources/Persistent.proto | 0 .../src/main/resources/ShardManager.proto | 0 .../src/main/resources/ShardTransaction.proto | 0 .../src/main/resources/ShardTransactionChain.proto | 0 .../src/main/resources/SimpleNormalizedNode.proto | 0 .../datastore/node/NormalizedNodeToNodeCodecTest.java | 0 .../node/utils/NodeIdentifierFactoryTest.java | 0 .../datastore/util/InstanceIdentifierUtilsTest.java | 0 .../datastore/util/NormalizedNodeXmlConverterTest.java | 0 .../controller/cluster/datastore/util/TestModel.java | 0 .../protobuff/messages/AbstractMessagesTest.java | 0 .../cohort3pc/ThreePhaseCommitCohortMessagesTest.java | 0 .../messages/common/NormalizedNodeMessagesTest.java | 0 .../notification/DataChangeListenerMessagesTest.java | 0 .../messages/persistent/PersistentMessagesTest.java | 0 .../registration/ListenerRegistrationMessagesTest.java | 0 .../messages/shard/ShardManagerMessagesTest.java | 0 .../transaction/ShardTransactionChainMessagesTest.java | 0 .../transaction/ShardTransactionMessagesTest.java | 0 .../src/test/resources/application.conf | 0 .../src/test/resources/augment_choice.xml | 0 .../src/test/resources/augment_choice.yang | 0 .../src/test/resources/odl-datastore-augmentation.yang | 0 .../resources/odl-datastore-test-notification.yang | 0 .../src/test/resources/odl-datastore-test.yang | 0 .../src/test/resources/simple_xml_with_attributes.xml | 0 .../src/test/resources/test.yang | 0 .../DataChangeListenerMessagesData | 0 .../ListenerRegistrationMessagesData | 0 .../NormalizedNodeMessagesTestData | 0 .../PersistentMessagesTestData | 0 .../ShardManagerMessagesTestData | 0 .../ShardTransactionChainMessagesTestData | 0 .../ShardTransactionMessagesTestData | 0 .../ThreePhaseCommitCohortMessagesTestData | 0 .../version-compatibility-serialized-data/readme.txt | 0 opendaylight/md-sal/sal-distributed-datastore/pom.xml | 4 ++-- 75 files changed, 11 insertions(+), 107 deletions(-) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/README-FIRST (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/pom.xml (98%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/run.sh (93%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeToNormalizedNodeBuilder.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeValueCodec.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodec.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToProtocolBufferNode.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/AugmentationIdentifierGenerator.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierFactory.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierGenerator.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithPredicatesGenerator.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithValueGenerator.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeGetter.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodePrinter.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeVisitor.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/PathUtils.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/QNameFactory.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/util/EncoderDecoderUtil.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtils.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/mdsal/CompositeModificationPayload.java (90%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/protobuff/messages/cohort3pc/ThreePhaseCommitCohortMessages.java (99%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessages.java (99%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/protobuff/messages/common/SimpleNormalizedNodeMessage.java (98%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessages.java (99%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/protobuff/messages/persistent/PersistentMessages.java (99%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessages.java (99%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessages.java (99%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessages.java (99%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java (99%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/resources/Cohort.proto (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/resources/Common.proto (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/resources/CompositeModificationPayload.proto (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/resources/DataChangeListener.proto (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/resources/ListenerRegistration.proto (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/resources/Persistent.proto (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/resources/ShardManager.proto (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/resources/ShardTransaction.proto (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/resources/ShardTransactionChain.proto (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/main/resources/SimpleNormalizedNode.proto (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodecTest.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierFactoryTest.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtilsTest.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/cluster/datastore/util/NormalizedNodeXmlConverterTest.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/protobuff/messages/AbstractMessagesTest.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/protobuff/messages/cohort3pc/ThreePhaseCommitCohortMessagesTest.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessagesTest.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessagesTest.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/protobuff/messages/persistent/PersistentMessagesTest.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessagesTest.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessagesTest.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessagesTest.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessagesTest.java (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/application.conf (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/augment_choice.xml (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/augment_choice.yang (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/odl-datastore-augmentation.yang (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/odl-datastore-test-notification.yang (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/odl-datastore-test.yang (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/simple_xml_with_attributes.xml (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/test.yang (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/version-compatibility-serialized-data/DataChangeListenerMessagesData (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/version-compatibility-serialized-data/ListenerRegistrationMessagesData (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/version-compatibility-serialized-data/NormalizedNodeMessagesTestData (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/version-compatibility-serialized-data/PersistentMessagesTestData (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/version-compatibility-serialized-data/ShardManagerMessagesTestData (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/version-compatibility-serialized-data/ShardTransactionChainMessagesTestData (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/version-compatibility-serialized-data/ShardTransactionMessagesTestData (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/version-compatibility-serialized-data/ThreePhaseCommitCohortMessagesTestData (100%) rename opendaylight/md-sal/{sal-protocolbuffer-encoding => sal-clustering-commons}/src/test/resources/version-compatibility-serialized-data/readme.txt (100%) diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index ff8735a518..e3f0c6b1d5 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -1288,6 +1288,11 @@ sal-distributed-datastore ${mdsal.version} + + org.opendaylight.controller + sal-clustering-commons + ${mdsal.version} + org.opendaylight.controller diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml index f8796e0ae4..b02835e845 100644 --- a/opendaylight/distribution/opendaylight/pom.xml +++ b/opendaylight/distribution/opendaylight/pom.xml @@ -1300,7 +1300,6 @@ org.opendaylight.controller sal-distributed-datastore - diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 02fbde8f18..fd828dc05a 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -66,8 +66,8 @@ sal-inmemory-datastore - - sal-protocolbuffer-encoding + + sal-clustering-commons sal-distributed-datastore diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/README-FIRST b/opendaylight/md-sal/sal-clustering-commons/README-FIRST similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/README-FIRST rename to opendaylight/md-sal/sal-clustering-commons/README-FIRST diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml similarity index 98% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/pom.xml rename to opendaylight/md-sal/sal-clustering-commons/pom.xml index 28e629a92c..6db4d3a094 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/pom.xml +++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml @@ -8,7 +8,7 @@ 1.1-SNAPSHOT - sal-protocolbuffer-encoding + sal-clustering-commons bundle diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/run.sh b/opendaylight/md-sal/sal-clustering-commons/run.sh similarity index 93% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/run.sh rename to opendaylight/md-sal/sal-clustering-commons/run.sh index f0907db664..d3d0324fa0 100755 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/run.sh +++ b/opendaylight/md-sal/sal-clustering-commons/run.sh @@ -30,7 +30,7 @@ # org.opendaylight.controller.protobuff.messages to properly exclude from sonar. ######################################################################################################## -protoc --proto_path=src/main/resources --java_out=src/main/java src/main/resources/*.proto +protoc --proto_path=src/main/resources --proto_path=../sal-akka-raft/src/main/resources --java_out=src/main/java src/main/resources/*.proto echo "Done generating Java source files." diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeToNormalizedNodeBuilder.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeToNormalizedNodeBuilder.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeToNormalizedNodeBuilder.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeToNormalizedNodeBuilder.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeValueCodec.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeValueCodec.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeValueCodec.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeValueCodec.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodec.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodec.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodec.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodec.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToProtocolBufferNode.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToProtocolBufferNode.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToProtocolBufferNode.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToProtocolBufferNode.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/AugmentationIdentifierGenerator.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/AugmentationIdentifierGenerator.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/AugmentationIdentifierGenerator.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/AugmentationIdentifierGenerator.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierFactory.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierFactory.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierFactory.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierFactory.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierGenerator.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierGenerator.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierGenerator.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierGenerator.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithPredicatesGenerator.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithPredicatesGenerator.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithPredicatesGenerator.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithPredicatesGenerator.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithValueGenerator.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithValueGenerator.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithValueGenerator.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierWithValueGenerator.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeGetter.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeGetter.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeGetter.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeGetter.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodePrinter.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodePrinter.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodePrinter.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodePrinter.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeVisitor.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeVisitor.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeVisitor.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeVisitor.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/PathUtils.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/PathUtils.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/PathUtils.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/PathUtils.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/QNameFactory.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/QNameFactory.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/QNameFactory.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/QNameFactory.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/util/EncoderDecoderUtil.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/util/EncoderDecoderUtil.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/util/EncoderDecoderUtil.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/util/EncoderDecoderUtil.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtils.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtils.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtils.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtils.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/mdsal/CompositeModificationPayload.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/mdsal/CompositeModificationPayload.java similarity index 90% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/mdsal/CompositeModificationPayload.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/mdsal/CompositeModificationPayload.java index 99f4751875..87b246bd7e 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/mdsal/CompositeModificationPayload.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/mdsal/CompositeModificationPayload.java @@ -1,13 +1,3 @@ -/* - * - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - */ - // Generated by the protocol buffer compiler. DO NOT EDIT! // source: CompositeModificationPayload.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/cohort3pc/ThreePhaseCommitCohortMessages.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/cohort3pc/ThreePhaseCommitCohortMessages.java similarity index 99% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/cohort3pc/ThreePhaseCommitCohortMessages.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/cohort3pc/ThreePhaseCommitCohortMessages.java index 49cb1ead9c..22a93c0e10 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/cohort3pc/ThreePhaseCommitCohortMessages.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/cohort3pc/ThreePhaseCommitCohortMessages.java @@ -1,13 +1,3 @@ -/* - * - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - */ - // Generated by the protocol buffer compiler. DO NOT EDIT! // source: Cohort.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessages.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessages.java similarity index 99% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessages.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessages.java index f88b66bcd3..35c2940be3 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessages.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessages.java @@ -1,13 +1,3 @@ -/* - * - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - */ - // Generated by the protocol buffer compiler. DO NOT EDIT! // source: Common.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/common/SimpleNormalizedNodeMessage.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/common/SimpleNormalizedNodeMessage.java similarity index 98% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/common/SimpleNormalizedNodeMessage.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/common/SimpleNormalizedNodeMessage.java index 7cee40df7a..67ab472d0c 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/common/SimpleNormalizedNodeMessage.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/common/SimpleNormalizedNodeMessage.java @@ -1,13 +1,3 @@ -/* - * - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - */ - // Generated by the protocol buffer compiler. DO NOT EDIT! // source: SimpleNormalizedNode.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessages.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessages.java similarity index 99% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessages.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessages.java index 1a98112073..384b389f92 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessages.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessages.java @@ -1,13 +1,3 @@ -/* - * - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - */ - // Generated by the protocol buffer compiler. DO NOT EDIT! // source: DataChangeListener.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/persistent/PersistentMessages.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/persistent/PersistentMessages.java similarity index 99% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/persistent/PersistentMessages.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/persistent/PersistentMessages.java index 088630aa32..d354348da8 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/persistent/PersistentMessages.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/persistent/PersistentMessages.java @@ -1,13 +1,3 @@ -/* - * - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - */ - // Generated by the protocol buffer compiler. DO NOT EDIT! // source: Persistent.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessages.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessages.java similarity index 99% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessages.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessages.java index 0f439d8c7c..77cbd4da46 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessages.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessages.java @@ -1,13 +1,3 @@ -/* - * - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - */ - // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ListenerRegistration.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessages.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessages.java similarity index 99% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessages.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessages.java index 7141863591..2324dfc2a2 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessages.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessages.java @@ -1,13 +1,3 @@ -/* - * - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - */ - // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ShardManager.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessages.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessages.java similarity index 99% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessages.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessages.java index 68bf325336..63dd5e7081 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessages.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessages.java @@ -1,13 +1,3 @@ -/* - * - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - */ - // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ShardTransactionChain.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java similarity index 99% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java index 52411f322b..7ce3b586b4 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java @@ -1,13 +1,3 @@ -/* - * - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - */ - // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ShardTransaction.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/Cohort.proto b/opendaylight/md-sal/sal-clustering-commons/src/main/resources/Cohort.proto similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/Cohort.proto rename to opendaylight/md-sal/sal-clustering-commons/src/main/resources/Cohort.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/Common.proto b/opendaylight/md-sal/sal-clustering-commons/src/main/resources/Common.proto similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/Common.proto rename to opendaylight/md-sal/sal-clustering-commons/src/main/resources/Common.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/CompositeModificationPayload.proto b/opendaylight/md-sal/sal-clustering-commons/src/main/resources/CompositeModificationPayload.proto similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/CompositeModificationPayload.proto rename to opendaylight/md-sal/sal-clustering-commons/src/main/resources/CompositeModificationPayload.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/DataChangeListener.proto b/opendaylight/md-sal/sal-clustering-commons/src/main/resources/DataChangeListener.proto similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/DataChangeListener.proto rename to opendaylight/md-sal/sal-clustering-commons/src/main/resources/DataChangeListener.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ListenerRegistration.proto b/opendaylight/md-sal/sal-clustering-commons/src/main/resources/ListenerRegistration.proto similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ListenerRegistration.proto rename to opendaylight/md-sal/sal-clustering-commons/src/main/resources/ListenerRegistration.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/Persistent.proto b/opendaylight/md-sal/sal-clustering-commons/src/main/resources/Persistent.proto similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/Persistent.proto rename to opendaylight/md-sal/sal-clustering-commons/src/main/resources/Persistent.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardManager.proto b/opendaylight/md-sal/sal-clustering-commons/src/main/resources/ShardManager.proto similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardManager.proto rename to opendaylight/md-sal/sal-clustering-commons/src/main/resources/ShardManager.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransaction.proto b/opendaylight/md-sal/sal-clustering-commons/src/main/resources/ShardTransaction.proto similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransaction.proto rename to opendaylight/md-sal/sal-clustering-commons/src/main/resources/ShardTransaction.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransactionChain.proto b/opendaylight/md-sal/sal-clustering-commons/src/main/resources/ShardTransactionChain.proto similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransactionChain.proto rename to opendaylight/md-sal/sal-clustering-commons/src/main/resources/ShardTransactionChain.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/SimpleNormalizedNode.proto b/opendaylight/md-sal/sal-clustering-commons/src/main/resources/SimpleNormalizedNode.proto similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/SimpleNormalizedNode.proto rename to opendaylight/md-sal/sal-clustering-commons/src/main/resources/SimpleNormalizedNode.proto diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodecTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodecTest.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodecTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToNodeCodecTest.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierFactoryTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierFactoryTest.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierFactoryTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/NodeIdentifierFactoryTest.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtilsTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtilsTest.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtilsTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/InstanceIdentifierUtilsTest.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/util/NormalizedNodeXmlConverterTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/NormalizedNodeXmlConverterTest.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/util/NormalizedNodeXmlConverterTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/NormalizedNodeXmlConverterTest.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/AbstractMessagesTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/AbstractMessagesTest.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/AbstractMessagesTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/AbstractMessagesTest.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/cohort3pc/ThreePhaseCommitCohortMessagesTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/cohort3pc/ThreePhaseCommitCohortMessagesTest.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/cohort3pc/ThreePhaseCommitCohortMessagesTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/cohort3pc/ThreePhaseCommitCohortMessagesTest.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessagesTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessagesTest.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessagesTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/common/NormalizedNodeMessagesTest.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessagesTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessagesTest.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessagesTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessagesTest.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/persistent/PersistentMessagesTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/persistent/PersistentMessagesTest.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/persistent/PersistentMessagesTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/persistent/PersistentMessagesTest.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessagesTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessagesTest.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessagesTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessagesTest.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessagesTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessagesTest.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessagesTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessagesTest.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessagesTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessagesTest.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessagesTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessagesTest.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessagesTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessagesTest.java similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessagesTest.java rename to opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessagesTest.java diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/application.conf b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/application.conf similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/application.conf rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/application.conf diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/augment_choice.xml b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/augment_choice.xml similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/augment_choice.xml rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/augment_choice.xml diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/augment_choice.yang b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/augment_choice.yang similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/augment_choice.yang rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/augment_choice.yang diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/odl-datastore-augmentation.yang b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/odl-datastore-augmentation.yang similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/odl-datastore-augmentation.yang rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/odl-datastore-augmentation.yang diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/odl-datastore-test-notification.yang b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/odl-datastore-test-notification.yang similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/odl-datastore-test-notification.yang rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/odl-datastore-test-notification.yang diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/odl-datastore-test.yang b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/odl-datastore-test.yang similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/odl-datastore-test.yang rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/odl-datastore-test.yang diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/simple_xml_with_attributes.xml b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/simple_xml_with_attributes.xml similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/simple_xml_with_attributes.xml rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/simple_xml_with_attributes.xml diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/test.yang b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/test.yang similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/test.yang rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/test.yang diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/DataChangeListenerMessagesData b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/DataChangeListenerMessagesData similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/DataChangeListenerMessagesData rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/DataChangeListenerMessagesData diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/ListenerRegistrationMessagesData b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/ListenerRegistrationMessagesData similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/ListenerRegistrationMessagesData rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/ListenerRegistrationMessagesData diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/NormalizedNodeMessagesTestData b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/NormalizedNodeMessagesTestData similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/NormalizedNodeMessagesTestData rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/NormalizedNodeMessagesTestData diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/PersistentMessagesTestData b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/PersistentMessagesTestData similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/PersistentMessagesTestData rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/PersistentMessagesTestData diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/ShardManagerMessagesTestData b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/ShardManagerMessagesTestData similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/ShardManagerMessagesTestData rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/ShardManagerMessagesTestData diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/ShardTransactionChainMessagesTestData b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/ShardTransactionChainMessagesTestData similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/ShardTransactionChainMessagesTestData rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/ShardTransactionChainMessagesTestData diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/ShardTransactionMessagesTestData b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/ShardTransactionMessagesTestData similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/ShardTransactionMessagesTestData rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/ShardTransactionMessagesTestData diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/ThreePhaseCommitCohortMessagesTestData b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/ThreePhaseCommitCohortMessagesTestData similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/ThreePhaseCommitCohortMessagesTestData rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/ThreePhaseCommitCohortMessagesTestData diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/readme.txt b/opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/readme.txt similarity index 100% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/resources/version-compatibility-serialized-data/readme.txt rename to opendaylight/md-sal/sal-clustering-commons/src/test/resources/version-compatibility-serialized-data/readme.txt diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml index 94c895dab3..848d425bf9 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml @@ -120,7 +120,7 @@ org.opendaylight.controller - sal-protocolbuffer-encoding + sal-clustering-commons 1.1-SNAPSHOT @@ -165,7 +165,7 @@ !*snappy;!org.jboss.*;* - sal-protocolbuffer-encoding; + sal-clustering-commons; sal-akka-raft; !sal*; !*config-api*; -- 2.36.6