From 348f34800b91e88f2ef5c6aafc10ff3fc0bec80d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 3 Jan 2023 10:23:20 +0100 Subject: [PATCH] Move netconf{-client,impl,util} to protocol/ These three artifacts are the API and client and server implementations -- make sure we keep them in protocol/. Change-Id: Iba32fb7533c5f1214bcb43a57cb06d2ccc2920df Signed-off-by: Robert Varga --- netconf/pom.xml | 3 --- {netconf => protocol}/netconf-client/pom.xml | 0 .../netconf/client/AbstractClientChannelInitializer.java | 0 .../opendaylight/netconf/client/NetconfClientDispatcher.java | 0 .../netconf/client/NetconfClientDispatcherImpl.java | 0 .../org/opendaylight/netconf/client/NetconfClientSession.java | 0 .../netconf/client/NetconfClientSessionListener.java | 0 .../netconf/client/NetconfClientSessionNegotiator.java | 0 .../netconf/client/NetconfClientSessionNegotiatorFactory.java | 0 .../netconf/client/SimpleNetconfClientSessionListener.java | 0 .../netconf/client/SshClientChannelInitializer.java | 0 .../org/opendaylight/netconf/client/SslHandlerFactory.java | 0 .../netconf/client/TcpClientChannelInitializer.java | 0 .../netconf/client/TlsClientChannelInitializer.java | 0 .../netconf/client/conf/NetconfClientConfiguration.java | 0 .../netconf/client/conf/NetconfClientConfigurationBuilder.java | 0 .../client/conf/NetconfReconnectingClientConfiguration.java | 0 .../conf/NetconfReconnectingClientConfigurationBuilder.java | 0 .../netconf/client/NetconfClientConfigurationTest.java | 0 .../netconf/client/NetconfClientDispatcherImplTest.java | 0 .../client/NetconfClientSessionNegotiatorFactoryTest.java | 0 .../netconf/client/NetconfClientSessionNegotiatorTest.java | 0 .../opendaylight/netconf/client/NetconfClientSessionTest.java | 0 .../client/NetconfReconnectingClientConfigurationTest.java | 0 .../netconf/client/SimpleNetconfClientSessionListenerTest.java | 0 .../netconf/client/SshClientChannelInitializerTest.java | 0 .../netconf/client/TcpClientChannelInitializerTest.java | 0 .../org/opendaylight/netconf/client/TestingNetconfClient.java | 0 .../netconf/client/TlsClientChannelInitializerTest.java | 0 .../netconf-client/src/test/resources/get_schema.xml | 0 .../netconf-client/src/test/resources/helloMessage1.xml | 0 .../netconf-client/src/test/resources/helloMessage2.xml | 0 .../netconf-client/src/test/resources/helloMessage3.xml | 0 {netconf => protocol}/netconf-impl/pom.xml | 0 .../opendaylight/netconf/impl/NetconfServerDispatcherImpl.java | 0 .../org/opendaylight/netconf/impl/NetconfServerSession.java | 0 .../netconf/impl/NetconfServerSessionListener.java | 0 .../netconf/impl/NetconfServerSessionNegotiator.java | 0 .../netconf/impl/NetconfServerSessionNegotiatorFactory.java | 0 .../impl/NetconfServerSessionNegotiatorFactoryBuilder.java | 0 .../org/opendaylight/netconf/impl/SendErrorExceptionUtil.java | 0 .../opendaylight/netconf/impl/ServerChannelInitializer.java | 0 .../java/org/opendaylight/netconf/impl/SessionIdProvider.java | 0 .../netconf/impl/mapping/operations/DefaultCloseSession.java | 0 .../impl/mapping/operations/DefaultNetconfOperation.java | 0 .../netconf/impl/mapping/operations/DefaultStartExi.java | 0 .../netconf/impl/mapping/operations/DefaultStopExi.java | 0 .../impl/osgi/AggregatedNetconfOperationServiceFactory.java | 0 .../netconf/impl/osgi/NetconfCapabilityMonitoringService.java | 0 .../netconf/impl/osgi/NetconfMonitoringServiceImpl.java | 0 .../opendaylight/netconf/impl/osgi/NetconfOperationRouter.java | 0 .../netconf/impl/osgi/NetconfOperationRouterImpl.java | 0 .../netconf/impl/osgi/NetconfSessionMonitoringService.java | 0 .../netconf/impl/util/DeserializerExceptionHandler.java | 0 .../netconf-impl/src/main/yang/odl-netconf-monitoring.yang | 0 .../opendaylight/netconf/impl/AdditionalHeaderParserTest.java | 0 .../org/opendaylight/netconf/impl/ConcurrentClientsTest.java | 0 .../org/opendaylight/netconf/impl/ExiEncodeDecodeTest.java | 0 .../java/org/opendaylight/netconf/impl/MessageParserTest.java | 0 .../opendaylight/netconf/impl/NetconfDispatcherImplTest.java | 0 .../netconf/impl/NetconfServerSessionListenerTest.java | 0 .../netconf/impl/NetconfServerSessionNegotiatorTest.java | 0 .../opendaylight/netconf/impl/NetconfServerSessionTest.java | 0 .../opendaylight/netconf/impl/SendErrorExceptionUtilTest.java | 0 .../impl/mapping/operations/DefaultCloseSessionTest.java | 0 .../netconf/impl/mapping/operations/DefaultStopExiTest.java | 0 .../osgi/AggregatedNetconfOperationServiceFactoryTest.java | 0 .../impl/osgi/NetconfCapabilityMonitoringServiceTest.java | 0 .../netconf/impl/osgi/NetconfOperationRouterImplTest.java | 0 .../netconf/impl/osgi/NetconfSessionMonitoringServiceTest.java | 0 .../netconf/impl/util/DeserializerExceptionHandlerTest.java | 0 .../netconf-impl/src/test/resources/messages/rpc.xml | 0 .../netconf-impl/src/test/resources/messages/rpc_ns.xml | 0 {netconf => protocol}/netconf-util/pom.xml | 0 .../org/opendaylight/netconf/util/AnyXmlNamespaceContext.java | 0 .../main/java/org/opendaylight/netconf/util/CloseableUtil.java | 0 .../opendaylight/netconf/util/EmptyListXmlMetadataWriter.java | 0 .../java/org/opendaylight/netconf/util/EmptyListXmlWriter.java | 0 .../org/opendaylight/netconf/util/NetconfConfiguration.java | 0 .../opendaylight/netconf/util/NetconfConfigurationHolder.java | 0 .../opendaylight/netconf/util/NetconfConfigurationImpl.java | 0 .../main/java/org/opendaylight/netconf/util/NetconfUtil.java | 0 .../src/main/java/org/opendaylight/netconf/util/PathNode.java | 0 .../opendaylight/netconf/util/ProxyEffectiveModelContext.java | 0 .../org/opendaylight/netconf/util/ProxyMountPointContext.java | 0 .../java/org/opendaylight/netconf/util/StreamingContext.java | 0 .../netconf/util/mapping/AbstractLastNetconfOperation.java | 0 .../netconf/util/mapping/AbstractNetconfOperation.java | 0 .../util/mapping/AbstractSingletonNetconfOperation.java | 0 .../opendaylight/netconf/util/messages/FramingMechanism.java | 0 .../opendaylight/netconf/util/messages/NetconfMessageUtil.java | 0 .../org/opendaylight/netconf/util/messages/SubtreeFilter.java | 0 .../netconf/util/xml/HardcodedNamespaceResolver.java | 0 .../java/org/opendaylight/netconf/util/xml/XMLNetconfUtil.java | 0 .../netconf-util/src/main/resources/netconf.cfg | 0 .../controller/netconf/util/messages/server_error.xml | 0 .../netconf-util/src/main/resources/rfc4741.xsd | 0 {netconf => protocol}/netconf-util/src/main/resources/xml.xsd | 0 .../java/org/opendaylight/netconf/util/CloseableUtilTest.java | 0 .../java/org/opendaylight/netconf/util/NetconfUtilTest.java | 0 .../netconf/util/mapping/AbstractLastNetconfOperationTest.java | 0 .../netconf/util/mapping/AbstractNetconfOperationTest.java | 0 .../util/mapping/AbstractSingletonNetconfOperationTest.java | 0 .../netconf/util/messages/NetconfMessageUtilTest.java | 0 .../netconf/util/messages/SubtreeFilterNotificationTest.java | 0 .../netconf/util/messages/SubtreeFilterRpcTest.java | 0 .../netconf/util/test/NetconfXmlUnitRecursiveQualifier.java | 0 .../java/org/opendaylight/netconf/util/test/XmlFileLoader.java | 0 .../java/org/opendaylight/netconf/util/test/XmlUnitUtil.java | 0 .../netconf/util/xml/HardcodedNamespaceResolverTest.java | 0 .../org/opendaylight/netconf/util/xml/XMLNetconfUtilTest.java | 0 .../src/test/resources/netconfMessages/client_hello.xml | 0 .../src/test/resources/netconfMessages/close-session.xml | 0 .../src/test/resources/netconfMessages/closeSession.xml | 0 .../netconf-util/src/test/resources/netconfMessages/commit.xml | 0 .../testClientSendsRpcReply_expectedResponse.xml | 0 .../communicationError/testClientSendsRpcReply_request.xml | 0 .../testRpcWithoutMessageId_expectedResponse.xml | 0 .../communicationError/testRpcWithoutMessageId_request.xml | 0 .../conflictingversion/conflictingVersionResponse.xml | 0 .../src/test/resources/netconfMessages/copy-config.xml | 0 .../databaseInteraction/client_get_request_ConfigRegistry.xml | 0 .../databaseInteraction/confg_subsystem_expected_reply.xml | 0 .../src/test/resources/netconfMessages/discardChanges.xml | 0 .../edit-config-delete-container-node-candidate.xml | 0 .../netconfMessages/edit-config-delete-leaf-node-candidate.xml | 0 .../netconfMessages/edit-config-test-module-running.xml | 0 .../test/resources/netconfMessages/edit-config-test-module.xml | 0 .../src/test/resources/netconfMessages/editConfig.xml | 0 .../resources/netconfMessages/editConfig_addServiceName.xml | 0 .../netconfMessages/editConfig_addServiceNameOnTest.xml | 0 .../resources/netconfMessages/editConfig_expectedResult.xml | 0 .../test/resources/netconfMessages/editConfig_identities.xml | 0 .../netconfMessages/editConfig_identities_inner_replace.xml | 0 .../netconfMessages/editConfig_merge_multiple-deps1.xml | 0 .../netconfMessages/editConfig_merge_multiple-deps2.xml | 0 .../netconfMessages/editConfig_merge_threadfactory.xml | 0 .../resources/netconfMessages/editConfig_merge_yang-test.xml | 0 .../src/test/resources/netconfMessages/editConfig_none.xml | 0 .../src/test/resources/netconfMessages/editConfig_remove.xml | 0 .../netconfMessages/editConfig_removeServiceNameOnTest.xml | 0 .../netconfMessages/editConfig_removeUnknownInstance.xml | 0 .../resources/netconfMessages/editConfig_replace_default.xml | 0 .../netconfMessages/editConfig_replace_default_ex.xml | 0 .../resources/netconfMessages/editConfig_replace_module.xml | 0 .../resources/netconfMessages/editConfig_replace_module_ex.xml | 0 .../test/resources/netconfMessages/editConfig_setUnions.xml | 0 .../src/test/resources/netconfMessages/edit_config.xml | 0 .../resources/netconfMessages/get-config-fields-request.xml | 0 .../netconfMessages/get-config-with-multiple-subtrees.xml | 0 .../src/test/resources/netconfMessages/get-fields-request.xml | 0 .../netconfMessages/get-with-multiple-root-subtrees.xml | 0 .../resources/netconfMessages/get-with-multiple-subtrees.xml | 0 .../netconf-util/src/test/resources/netconfMessages/get.xml | 0 .../src/test/resources/netconfMessages/getConfig.xml | 0 .../resources/netconfMessages/getConfig_candidate-filter.xml | 0 .../src/test/resources/netconfMessages/getConfig_candidate.xml | 0 .../test/resources/netconfMessages/get_schema-no-version.xml | 0 .../src/test/resources/netconfMessages/get_schema.xml | 0 .../netconfMessages/handshake/client_hello_with_session_id.xml | 0 .../handshake/client_hello_with_wrong_namespace.xml | 0 .../src/test/resources/netconfMessages/lock-running.xml | 0 .../netconf-util/src/test/resources/netconfMessages/lock.xml | 0 .../netconfMessages/mount/editConfig_merge_threadfactory.xml | 0 .../src/test/resources/netconfMessages/mount/mount12002.xml | 0 .../src/test/resources/netconfMessages/mount/mount12003.xml | 0 .../src/test/resources/netconfMessages/mount/unmount12002.xml | 0 .../namespaces/editConfig_differentNamespaceTO.xml | 0 .../namespaces/editConfig_sameAttrDifferentNamespaces.xml | 0 .../namespaces/editConfig_sameAttrDifferentNamespacesList.xml | 0 .../namespaces/editConfig_typeNameConfigAttributeMatching.xml | 0 .../src/test/resources/netconfMessages/rpc-reply_get.xml | 0 .../src/test/resources/netconfMessages/rpc-reply_ok.xml | 0 .../src/test/resources/netconfMessages/rpcInner.xml | 0 .../src/test/resources/netconfMessages/rpcInnerInner.xml | 0 .../resources/netconfMessages/rpcInnerInner_complex_output.xml | 0 .../src/test/resources/netconfMessages/startExi.xml | 0 .../src/test/resources/netconfMessages/stopExi.xml | 0 .../test/resources/netconfMessages/threadpool-edit-config.xml | 0 .../src/test/resources/netconfMessages/unlock-running.xml | 0 .../netconf-util/src/test/resources/netconfMessages/unlock.xml | 0 .../netconfMessages/unrecognised/editConfig_unrecognised1.xml | 0 .../netconfMessages/unrecognised/editConfig_unrecognised2.xml | 0 .../netconfMessages/unrecognised/editConfig_unrecognised3.xml | 0 .../netconfMessages/unrecognised/editConfig_unrecognised4.xml | 0 .../netconfMessages/unrecognised/editConfig_unrecognised5.xml | 0 .../netconfMessages/unrecognised/editConfig_unrecognised6.xml | 0 .../netconfMessages/unrecognised/editConfig_unrecognised7.xml | 0 .../netconfMessages/unrecognised/editConfig_unrecognised8.xml | 0 .../src/test/resources/netconfMessages/validate-running.xml | 0 .../src/test/resources/netconfMessages/validate.xml | 0 .../netconf-util/src/test/resources/sessions.xml | 0 .../src/test/resources/subtree/notification/0/filter.xml | 0 .../src/test/resources/subtree/notification/0/post-filter.xml | 0 .../src/test/resources/subtree/notification/0/pre-filter.xml | 0 .../src/test/resources/subtree/notification/1/filter.xml | 0 .../src/test/resources/subtree/notification/1/post-filter.xml | 0 .../src/test/resources/subtree/notification/1/pre-filter.xml | 0 .../src/test/resources/subtree/notification/2/filter.xml | 0 .../src/test/resources/subtree/notification/2/post-filter.xml | 0 .../src/test/resources/subtree/notification/2/pre-filter.xml | 0 .../src/test/resources/subtree/notification/3/filter.xml | 0 .../src/test/resources/subtree/notification/3/post-filter.xml | 0 .../src/test/resources/subtree/notification/3/pre-filter.xml | 0 .../src/test/resources/subtree/notification/4/filter.xml | 0 .../src/test/resources/subtree/notification/4/post-filter.xml | 0 .../src/test/resources/subtree/notification/4/pre-filter.xml | 0 .../src/test/resources/subtree/rpc/0/post-filter.xml | 0 .../src/test/resources/subtree/rpc/0/pre-filter.xml | 0 .../netconf-util/src/test/resources/subtree/rpc/0/request.xml | 0 .../src/test/resources/subtree/rpc/1/post-filter.xml | 0 .../src/test/resources/subtree/rpc/1/pre-filter.xml | 0 .../netconf-util/src/test/resources/subtree/rpc/1/request.xml | 0 .../src/test/resources/subtree/rpc/10/post-filter.xml | 0 .../src/test/resources/subtree/rpc/10/pre-filter.xml | 0 .../netconf-util/src/test/resources/subtree/rpc/10/request.xml | 0 .../src/test/resources/subtree/rpc/2/post-filter.xml | 0 .../src/test/resources/subtree/rpc/2/pre-filter.xml | 0 .../netconf-util/src/test/resources/subtree/rpc/2/request.xml | 0 .../src/test/resources/subtree/rpc/3/post-filter.xml | 0 .../src/test/resources/subtree/rpc/3/pre-filter.xml | 0 .../netconf-util/src/test/resources/subtree/rpc/3/request.xml | 0 .../src/test/resources/subtree/rpc/4/post-filter.xml | 0 .../src/test/resources/subtree/rpc/4/pre-filter.xml | 0 .../netconf-util/src/test/resources/subtree/rpc/4/request.xml | 0 .../src/test/resources/subtree/rpc/5/post-filter.xml | 0 .../src/test/resources/subtree/rpc/5/pre-filter.xml | 0 .../netconf-util/src/test/resources/subtree/rpc/5/request.xml | 0 .../src/test/resources/subtree/rpc/6/post-filter.xml | 0 .../src/test/resources/subtree/rpc/6/pre-filter.xml | 0 .../netconf-util/src/test/resources/subtree/rpc/6/request.xml | 0 .../src/test/resources/subtree/rpc/7/post-filter.xml | 0 .../src/test/resources/subtree/rpc/7/pre-filter.xml | 0 .../netconf-util/src/test/resources/subtree/rpc/7/request.xml | 0 .../src/test/resources/subtree/rpc/8/post-filter.xml | 0 .../src/test/resources/subtree/rpc/8/pre-filter.xml | 0 .../netconf-util/src/test/resources/subtree/rpc/8/request.xml | 0 .../src/test/resources/subtree/rpc/9/post-filter.xml | 0 .../src/test/resources/subtree/rpc/9/pre-filter.xml | 0 .../netconf-util/src/test/resources/subtree/rpc/9/request.xml | 0 protocol/pom.xml | 3 +++ 241 files changed, 3 insertions(+), 3 deletions(-) rename {netconf => protocol}/netconf-client/pom.xml (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/AbstractClientChannelInitializer.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientDispatcher.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientDispatcherImpl.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSession.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionListener.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiator.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactory.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/SshClientChannelInitializer.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/SslHandlerFactory.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/TcpClientChannelInitializer.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/TlsClientChannelInitializer.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfigurationBuilder.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfiguration.java (100%) rename {netconf => protocol}/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfigurationBuilder.java (100%) rename {netconf => protocol}/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientConfigurationTest.java (100%) rename {netconf => protocol}/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientDispatcherImplTest.java (100%) rename {netconf => protocol}/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactoryTest.java (100%) rename {netconf => protocol}/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java (100%) rename {netconf => protocol}/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionTest.java (100%) rename {netconf => protocol}/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfReconnectingClientConfigurationTest.java (100%) rename {netconf => protocol}/netconf-client/src/test/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListenerTest.java (100%) rename {netconf => protocol}/netconf-client/src/test/java/org/opendaylight/netconf/client/SshClientChannelInitializerTest.java (100%) rename {netconf => protocol}/netconf-client/src/test/java/org/opendaylight/netconf/client/TcpClientChannelInitializerTest.java (100%) rename {netconf => protocol}/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java (100%) rename {netconf => protocol}/netconf-client/src/test/java/org/opendaylight/netconf/client/TlsClientChannelInitializerTest.java (100%) rename {netconf => protocol}/netconf-client/src/test/resources/get_schema.xml (100%) rename {netconf => protocol}/netconf-client/src/test/resources/helloMessage1.xml (100%) rename {netconf => protocol}/netconf-client/src/test/resources/helloMessage2.xml (100%) rename {netconf => protocol}/netconf-client/src/test/resources/helloMessage3.xml (100%) rename {netconf => protocol}/netconf-impl/pom.xml (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerDispatcherImpl.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionListener.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiator.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactory.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactoryBuilder.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SendErrorExceptionUtil.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/ServerChannelInitializer.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SessionIdProvider.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultNetconfOperation.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStartExi.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExi.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactory.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfMonitoringServiceImpl.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouter.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImpl.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringService.java (100%) rename {netconf => protocol}/netconf-impl/src/main/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandler.java (100%) rename {netconf => protocol}/netconf-impl/src/main/yang/odl-netconf-monitoring.yang (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/AdditionalHeaderParserTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ConcurrentClientsTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ExiEncodeDecodeTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/MessageParserTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfDispatcherImplTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionListenerTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/SendErrorExceptionUtilTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSessionTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExiTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactoryTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImplTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringServiceTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandlerTest.java (100%) rename {netconf => protocol}/netconf-impl/src/test/resources/messages/rpc.xml (100%) rename {netconf => protocol}/netconf-impl/src/test/resources/messages/rpc_ns.xml (100%) rename {netconf => protocol}/netconf-util/pom.xml (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/AnyXmlNamespaceContext.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/CloseableUtil.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/EmptyListXmlMetadataWriter.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/EmptyListXmlWriter.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfiguration.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfigurationHolder.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfigurationImpl.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfUtil.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/PathNode.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/ProxyEffectiveModelContext.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/ProxyMountPointContext.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/StreamingContext.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperation.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperation.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/FramingMechanism.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/NetconfMessageUtil.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/xml/HardcodedNamespaceResolver.java (100%) rename {netconf => protocol}/netconf-util/src/main/java/org/opendaylight/netconf/util/xml/XMLNetconfUtil.java (100%) rename {netconf => protocol}/netconf-util/src/main/resources/netconf.cfg (100%) rename {netconf => protocol}/netconf-util/src/main/resources/org/opendaylight/controller/netconf/util/messages/server_error.xml (100%) rename {netconf => protocol}/netconf-util/src/main/resources/rfc4741.xsd (100%) rename {netconf => protocol}/netconf-util/src/main/resources/xml.xsd (100%) rename {netconf => protocol}/netconf-util/src/test/java/org/opendaylight/netconf/util/CloseableUtilTest.java (100%) rename {netconf => protocol}/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfUtilTest.java (100%) rename {netconf => protocol}/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperationTest.java (100%) rename {netconf => protocol}/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperationTest.java (100%) rename {netconf => protocol}/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperationTest.java (100%) rename {netconf => protocol}/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/NetconfMessageUtilTest.java (100%) rename {netconf => protocol}/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterNotificationTest.java (100%) rename {netconf => protocol}/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterRpcTest.java (100%) rename {netconf => protocol}/netconf-util/src/test/java/org/opendaylight/netconf/util/test/NetconfXmlUnitRecursiveQualifier.java (100%) rename {netconf => protocol}/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlFileLoader.java (100%) rename {netconf => protocol}/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlUnitUtil.java (100%) rename {netconf => protocol}/netconf-util/src/test/java/org/opendaylight/netconf/util/xml/HardcodedNamespaceResolverTest.java (100%) rename {netconf => protocol}/netconf-util/src/test/java/org/opendaylight/netconf/util/xml/XMLNetconfUtilTest.java (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/client_hello.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/close-session.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/closeSession.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/commit.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_expectedResponse.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_expectedResponse.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/conflictingversion/conflictingVersionResponse.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/copy-config.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/databaseInteraction/client_get_request_ConfigRegistry.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/databaseInteraction/confg_subsystem_expected_reply.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/discardChanges.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/edit-config-delete-container-node-candidate.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/edit-config-delete-leaf-node-candidate.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/edit-config-test-module-running.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/edit-config-test-module.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceName.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceNameOnTest.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_expectedResult.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_identities.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_identities_inner_replace.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps1.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps2.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_merge_threadfactory.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_merge_yang-test.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_none.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_remove.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_removeServiceNameOnTest.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_removeUnknownInstance.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default_ex.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module_ex.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/editConfig_setUnions.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/edit_config.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/get-config-fields-request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/get-config-with-multiple-subtrees.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/get-fields-request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/get-with-multiple-root-subtrees.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/get-with-multiple-subtrees.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/get.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/getConfig.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/getConfig_candidate-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/getConfig_candidate.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/get_schema-no-version.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/get_schema.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_session_id.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_wrong_namespace.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/lock-running.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/lock.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/mount/editConfig_merge_threadfactory.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/mount/mount12002.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/mount/mount12003.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/mount/unmount12002.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_differentNamespaceTO.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespaces.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespacesList.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_typeNameConfigAttributeMatching.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/rpc-reply_get.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/rpc-reply_ok.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/rpcInner.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/rpcInnerInner.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/rpcInnerInner_complex_output.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/startExi.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/stopExi.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/threadpool-edit-config.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/unlock-running.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/unlock.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised1.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised2.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised3.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised4.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised5.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised6.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised7.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised8.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/validate-running.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/netconfMessages/validate.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/sessions.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/0/filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/0/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/0/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/1/filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/1/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/1/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/2/filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/2/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/2/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/3/filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/3/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/3/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/4/filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/4/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/notification/4/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/0/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/0/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/0/request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/1/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/1/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/1/request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/10/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/10/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/10/request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/2/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/2/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/2/request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/3/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/3/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/3/request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/4/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/4/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/4/request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/5/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/5/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/5/request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/6/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/6/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/6/request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/7/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/7/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/7/request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/8/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/8/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/8/request.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/9/post-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/9/pre-filter.xml (100%) rename {netconf => protocol}/netconf-util/src/test/resources/subtree/rpc/9/request.xml (100%) diff --git a/netconf/pom.xml b/netconf/pom.xml index f93629f5a5..32d2c45f8a 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -30,7 +30,6 @@ netconf-config - netconf-impl mdsal-netconf-ssh mdsal-netconf-tcp mdsal-netconf-connector @@ -38,10 +37,8 @@ mdsal-netconf-notification mdsal-netconf-yang-library mdsal-netconf-impl - netconf-util netconf-netty-util netconf-mapping-api - netconf-client netconf-auth aaa-authn-odl-plugin netconf-notifications-api diff --git a/netconf/netconf-client/pom.xml b/protocol/netconf-client/pom.xml similarity index 100% rename from netconf/netconf-client/pom.xml rename to protocol/netconf-client/pom.xml diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/AbstractClientChannelInitializer.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/AbstractClientChannelInitializer.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/AbstractClientChannelInitializer.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/AbstractClientChannelInitializer.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientDispatcher.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientDispatcher.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientDispatcher.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientDispatcher.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientDispatcherImpl.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientDispatcherImpl.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientDispatcherImpl.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientDispatcherImpl.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSession.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSession.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSession.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSession.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionListener.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionListener.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionListener.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionListener.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiator.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiator.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiator.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiator.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactory.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactory.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactory.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactory.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SshClientChannelInitializer.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/SshClientChannelInitializer.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SshClientChannelInitializer.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/SshClientChannelInitializer.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SslHandlerFactory.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/SslHandlerFactory.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/SslHandlerFactory.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/SslHandlerFactory.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/TcpClientChannelInitializer.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/TcpClientChannelInitializer.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/TcpClientChannelInitializer.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/TcpClientChannelInitializer.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/TlsClientChannelInitializer.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/TlsClientChannelInitializer.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/TlsClientChannelInitializer.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/TlsClientChannelInitializer.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfigurationBuilder.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfigurationBuilder.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfigurationBuilder.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfigurationBuilder.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfiguration.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfiguration.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfiguration.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfiguration.java diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfigurationBuilder.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfigurationBuilder.java similarity index 100% rename from netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfigurationBuilder.java rename to protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfigurationBuilder.java diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientConfigurationTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientConfigurationTest.java similarity index 100% rename from netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientConfigurationTest.java rename to protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientConfigurationTest.java diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientDispatcherImplTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientDispatcherImplTest.java similarity index 100% rename from netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientDispatcherImplTest.java rename to protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientDispatcherImplTest.java diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactoryTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactoryTest.java similarity index 100% rename from netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactoryTest.java rename to protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactoryTest.java diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java similarity index 100% rename from netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java rename to protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionTest.java similarity index 100% rename from netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionTest.java rename to protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionTest.java diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfReconnectingClientConfigurationTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfReconnectingClientConfigurationTest.java similarity index 100% rename from netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfReconnectingClientConfigurationTest.java rename to protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfReconnectingClientConfigurationTest.java diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListenerTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListenerTest.java similarity index 100% rename from netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListenerTest.java rename to protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListenerTest.java diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/SshClientChannelInitializerTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/SshClientChannelInitializerTest.java similarity index 100% rename from netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/SshClientChannelInitializerTest.java rename to protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/SshClientChannelInitializerTest.java diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TcpClientChannelInitializerTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/TcpClientChannelInitializerTest.java similarity index 100% rename from netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TcpClientChannelInitializerTest.java rename to protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/TcpClientChannelInitializerTest.java diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java similarity index 100% rename from netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java rename to protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TlsClientChannelInitializerTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/TlsClientChannelInitializerTest.java similarity index 100% rename from netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/TlsClientChannelInitializerTest.java rename to protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/TlsClientChannelInitializerTest.java diff --git a/netconf/netconf-client/src/test/resources/get_schema.xml b/protocol/netconf-client/src/test/resources/get_schema.xml similarity index 100% rename from netconf/netconf-client/src/test/resources/get_schema.xml rename to protocol/netconf-client/src/test/resources/get_schema.xml diff --git a/netconf/netconf-client/src/test/resources/helloMessage1.xml b/protocol/netconf-client/src/test/resources/helloMessage1.xml similarity index 100% rename from netconf/netconf-client/src/test/resources/helloMessage1.xml rename to protocol/netconf-client/src/test/resources/helloMessage1.xml diff --git a/netconf/netconf-client/src/test/resources/helloMessage2.xml b/protocol/netconf-client/src/test/resources/helloMessage2.xml similarity index 100% rename from netconf/netconf-client/src/test/resources/helloMessage2.xml rename to protocol/netconf-client/src/test/resources/helloMessage2.xml diff --git a/netconf/netconf-client/src/test/resources/helloMessage3.xml b/protocol/netconf-client/src/test/resources/helloMessage3.xml similarity index 100% rename from netconf/netconf-client/src/test/resources/helloMessage3.xml rename to protocol/netconf-client/src/test/resources/helloMessage3.xml diff --git a/netconf/netconf-impl/pom.xml b/protocol/netconf-impl/pom.xml similarity index 100% rename from netconf/netconf-impl/pom.xml rename to protocol/netconf-impl/pom.xml diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerDispatcherImpl.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerDispatcherImpl.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerDispatcherImpl.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerDispatcherImpl.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionListener.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionListener.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionListener.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionListener.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiator.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiator.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiator.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiator.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactory.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactory.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactory.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactory.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactoryBuilder.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactoryBuilder.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactoryBuilder.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactoryBuilder.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SendErrorExceptionUtil.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SendErrorExceptionUtil.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SendErrorExceptionUtil.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SendErrorExceptionUtil.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/ServerChannelInitializer.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/ServerChannelInitializer.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/ServerChannelInitializer.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/ServerChannelInitializer.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SessionIdProvider.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SessionIdProvider.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SessionIdProvider.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/SessionIdProvider.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSession.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultNetconfOperation.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultNetconfOperation.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultNetconfOperation.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultNetconfOperation.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStartExi.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStartExi.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStartExi.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStartExi.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExi.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExi.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExi.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExi.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactory.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactory.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactory.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactory.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfMonitoringServiceImpl.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfMonitoringServiceImpl.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfMonitoringServiceImpl.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfMonitoringServiceImpl.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouter.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouter.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouter.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouter.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImpl.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImpl.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImpl.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImpl.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringService.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringService.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringService.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringService.java diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandler.java b/protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandler.java similarity index 100% rename from netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandler.java rename to protocol/netconf-impl/src/main/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandler.java diff --git a/netconf/netconf-impl/src/main/yang/odl-netconf-monitoring.yang b/protocol/netconf-impl/src/main/yang/odl-netconf-monitoring.yang similarity index 100% rename from netconf/netconf-impl/src/main/yang/odl-netconf-monitoring.yang rename to protocol/netconf-impl/src/main/yang/odl-netconf-monitoring.yang diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/AdditionalHeaderParserTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/AdditionalHeaderParserTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/AdditionalHeaderParserTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/AdditionalHeaderParserTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ConcurrentClientsTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ConcurrentClientsTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ConcurrentClientsTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ConcurrentClientsTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ExiEncodeDecodeTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ExiEncodeDecodeTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ExiEncodeDecodeTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ExiEncodeDecodeTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/MessageParserTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/MessageParserTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/MessageParserTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/MessageParserTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfDispatcherImplTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfDispatcherImplTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfDispatcherImplTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfDispatcherImplTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionListenerTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionListenerTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionListenerTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionListenerTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/SendErrorExceptionUtilTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/SendErrorExceptionUtilTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/SendErrorExceptionUtilTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/SendErrorExceptionUtilTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSessionTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSessionTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSessionTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultCloseSessionTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExiTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExiTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExiTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/mapping/operations/DefaultStopExiTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactoryTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactoryTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactoryTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/AggregatedNetconfOperationServiceFactoryTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringServiceTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImplTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImplTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImplTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfOperationRouterImplTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringServiceTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringServiceTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringServiceTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/osgi/NetconfSessionMonitoringServiceTest.java diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandlerTest.java b/protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandlerTest.java similarity index 100% rename from netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandlerTest.java rename to protocol/netconf-impl/src/test/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandlerTest.java diff --git a/netconf/netconf-impl/src/test/resources/messages/rpc.xml b/protocol/netconf-impl/src/test/resources/messages/rpc.xml similarity index 100% rename from netconf/netconf-impl/src/test/resources/messages/rpc.xml rename to protocol/netconf-impl/src/test/resources/messages/rpc.xml diff --git a/netconf/netconf-impl/src/test/resources/messages/rpc_ns.xml b/protocol/netconf-impl/src/test/resources/messages/rpc_ns.xml similarity index 100% rename from netconf/netconf-impl/src/test/resources/messages/rpc_ns.xml rename to protocol/netconf-impl/src/test/resources/messages/rpc_ns.xml diff --git a/netconf/netconf-util/pom.xml b/protocol/netconf-util/pom.xml similarity index 100% rename from netconf/netconf-util/pom.xml rename to protocol/netconf-util/pom.xml diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/AnyXmlNamespaceContext.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/AnyXmlNamespaceContext.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/AnyXmlNamespaceContext.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/AnyXmlNamespaceContext.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/CloseableUtil.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/CloseableUtil.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/CloseableUtil.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/CloseableUtil.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/EmptyListXmlMetadataWriter.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/EmptyListXmlMetadataWriter.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/EmptyListXmlMetadataWriter.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/EmptyListXmlMetadataWriter.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/EmptyListXmlWriter.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/EmptyListXmlWriter.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/EmptyListXmlWriter.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/EmptyListXmlWriter.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfiguration.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfiguration.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfiguration.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfiguration.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfigurationHolder.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfigurationHolder.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfigurationHolder.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfigurationHolder.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfigurationImpl.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfigurationImpl.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfigurationImpl.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfConfigurationImpl.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfUtil.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfUtil.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfUtil.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/NetconfUtil.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/PathNode.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/PathNode.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/PathNode.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/PathNode.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/ProxyEffectiveModelContext.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/ProxyEffectiveModelContext.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/ProxyEffectiveModelContext.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/ProxyEffectiveModelContext.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/ProxyMountPointContext.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/ProxyMountPointContext.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/ProxyMountPointContext.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/ProxyMountPointContext.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/StreamingContext.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/StreamingContext.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/StreamingContext.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/StreamingContext.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperation.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperation.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperation.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperation.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperation.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperation.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperation.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperation.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/FramingMechanism.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/FramingMechanism.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/FramingMechanism.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/FramingMechanism.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/NetconfMessageUtil.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/NetconfMessageUtil.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/NetconfMessageUtil.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/NetconfMessageUtil.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/xml/HardcodedNamespaceResolver.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/xml/HardcodedNamespaceResolver.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/xml/HardcodedNamespaceResolver.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/xml/HardcodedNamespaceResolver.java diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/xml/XMLNetconfUtil.java b/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/xml/XMLNetconfUtil.java similarity index 100% rename from netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/xml/XMLNetconfUtil.java rename to protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/xml/XMLNetconfUtil.java diff --git a/netconf/netconf-util/src/main/resources/netconf.cfg b/protocol/netconf-util/src/main/resources/netconf.cfg similarity index 100% rename from netconf/netconf-util/src/main/resources/netconf.cfg rename to protocol/netconf-util/src/main/resources/netconf.cfg diff --git a/netconf/netconf-util/src/main/resources/org/opendaylight/controller/netconf/util/messages/server_error.xml b/protocol/netconf-util/src/main/resources/org/opendaylight/controller/netconf/util/messages/server_error.xml similarity index 100% rename from netconf/netconf-util/src/main/resources/org/opendaylight/controller/netconf/util/messages/server_error.xml rename to protocol/netconf-util/src/main/resources/org/opendaylight/controller/netconf/util/messages/server_error.xml diff --git a/netconf/netconf-util/src/main/resources/rfc4741.xsd b/protocol/netconf-util/src/main/resources/rfc4741.xsd similarity index 100% rename from netconf/netconf-util/src/main/resources/rfc4741.xsd rename to protocol/netconf-util/src/main/resources/rfc4741.xsd diff --git a/netconf/netconf-util/src/main/resources/xml.xsd b/protocol/netconf-util/src/main/resources/xml.xsd similarity index 100% rename from netconf/netconf-util/src/main/resources/xml.xsd rename to protocol/netconf-util/src/main/resources/xml.xsd diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/CloseableUtilTest.java b/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/CloseableUtilTest.java similarity index 100% rename from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/CloseableUtilTest.java rename to protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/CloseableUtilTest.java diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfUtilTest.java b/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfUtilTest.java similarity index 100% rename from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfUtilTest.java rename to protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfUtilTest.java diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperationTest.java b/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperationTest.java similarity index 100% rename from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperationTest.java rename to protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperationTest.java diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperationTest.java b/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperationTest.java similarity index 100% rename from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperationTest.java rename to protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperationTest.java diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperationTest.java b/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperationTest.java similarity index 100% rename from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperationTest.java rename to protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperationTest.java diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/NetconfMessageUtilTest.java b/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/NetconfMessageUtilTest.java similarity index 100% rename from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/NetconfMessageUtilTest.java rename to protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/NetconfMessageUtilTest.java diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterNotificationTest.java b/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterNotificationTest.java similarity index 100% rename from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterNotificationTest.java rename to protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterNotificationTest.java diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterRpcTest.java b/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterRpcTest.java similarity index 100% rename from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterRpcTest.java rename to protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterRpcTest.java diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/test/NetconfXmlUnitRecursiveQualifier.java b/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/NetconfXmlUnitRecursiveQualifier.java similarity index 100% rename from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/test/NetconfXmlUnitRecursiveQualifier.java rename to protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/NetconfXmlUnitRecursiveQualifier.java diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlFileLoader.java b/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlFileLoader.java similarity index 100% rename from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlFileLoader.java rename to protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlFileLoader.java diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlUnitUtil.java b/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlUnitUtil.java similarity index 100% rename from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlUnitUtil.java rename to protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlUnitUtil.java diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/xml/HardcodedNamespaceResolverTest.java b/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/xml/HardcodedNamespaceResolverTest.java similarity index 100% rename from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/xml/HardcodedNamespaceResolverTest.java rename to protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/xml/HardcodedNamespaceResolverTest.java diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/xml/XMLNetconfUtilTest.java b/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/xml/XMLNetconfUtilTest.java similarity index 100% rename from netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/xml/XMLNetconfUtilTest.java rename to protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/xml/XMLNetconfUtilTest.java diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/client_hello.xml b/protocol/netconf-util/src/test/resources/netconfMessages/client_hello.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/client_hello.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/client_hello.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/close-session.xml b/protocol/netconf-util/src/test/resources/netconfMessages/close-session.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/close-session.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/close-session.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/closeSession.xml b/protocol/netconf-util/src/test/resources/netconfMessages/closeSession.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/closeSession.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/closeSession.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/commit.xml b/protocol/netconf-util/src/test/resources/netconfMessages/commit.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/commit.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/commit.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_expectedResponse.xml b/protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_expectedResponse.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_expectedResponse.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_expectedResponse.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_request.xml b/protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_request.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_request.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_expectedResponse.xml b/protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_expectedResponse.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_expectedResponse.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_expectedResponse.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_request.xml b/protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_request.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_request.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/conflictingversion/conflictingVersionResponse.xml b/protocol/netconf-util/src/test/resources/netconfMessages/conflictingversion/conflictingVersionResponse.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/conflictingversion/conflictingVersionResponse.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/conflictingversion/conflictingVersionResponse.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/copy-config.xml b/protocol/netconf-util/src/test/resources/netconfMessages/copy-config.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/copy-config.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/copy-config.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/databaseInteraction/client_get_request_ConfigRegistry.xml b/protocol/netconf-util/src/test/resources/netconfMessages/databaseInteraction/client_get_request_ConfigRegistry.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/databaseInteraction/client_get_request_ConfigRegistry.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/databaseInteraction/client_get_request_ConfigRegistry.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/databaseInteraction/confg_subsystem_expected_reply.xml b/protocol/netconf-util/src/test/resources/netconfMessages/databaseInteraction/confg_subsystem_expected_reply.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/databaseInteraction/confg_subsystem_expected_reply.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/databaseInteraction/confg_subsystem_expected_reply.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/discardChanges.xml b/protocol/netconf-util/src/test/resources/netconfMessages/discardChanges.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/discardChanges.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/discardChanges.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/edit-config-delete-container-node-candidate.xml b/protocol/netconf-util/src/test/resources/netconfMessages/edit-config-delete-container-node-candidate.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/edit-config-delete-container-node-candidate.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/edit-config-delete-container-node-candidate.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/edit-config-delete-leaf-node-candidate.xml b/protocol/netconf-util/src/test/resources/netconfMessages/edit-config-delete-leaf-node-candidate.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/edit-config-delete-leaf-node-candidate.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/edit-config-delete-leaf-node-candidate.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/edit-config-test-module-running.xml b/protocol/netconf-util/src/test/resources/netconfMessages/edit-config-test-module-running.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/edit-config-test-module-running.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/edit-config-test-module-running.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/edit-config-test-module.xml b/protocol/netconf-util/src/test/resources/netconfMessages/edit-config-test-module.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/edit-config-test-module.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/edit-config-test-module.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceName.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceName.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceName.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceName.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceNameOnTest.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceNameOnTest.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceNameOnTest.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceNameOnTest.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_expectedResult.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_expectedResult.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_expectedResult.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_expectedResult.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_identities.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_identities.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_identities.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_identities.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_identities_inner_replace.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_identities_inner_replace.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_identities_inner_replace.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_identities_inner_replace.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps1.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps1.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps1.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps1.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps2.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps2.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps2.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps2.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_merge_threadfactory.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_threadfactory.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_merge_threadfactory.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_threadfactory.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_merge_yang-test.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_yang-test.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_merge_yang-test.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_yang-test.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_none.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_none.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_none.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_none.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_remove.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_remove.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_remove.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_remove.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_removeServiceNameOnTest.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_removeServiceNameOnTest.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_removeServiceNameOnTest.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_removeServiceNameOnTest.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_removeUnknownInstance.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_removeUnknownInstance.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_removeUnknownInstance.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_removeUnknownInstance.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default_ex.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default_ex.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default_ex.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default_ex.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module_ex.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module_ex.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module_ex.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module_ex.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/editConfig_setUnions.xml b/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_setUnions.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/editConfig_setUnions.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/editConfig_setUnions.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/edit_config.xml b/protocol/netconf-util/src/test/resources/netconfMessages/edit_config.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/edit_config.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/edit_config.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/get-config-fields-request.xml b/protocol/netconf-util/src/test/resources/netconfMessages/get-config-fields-request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/get-config-fields-request.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/get-config-fields-request.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/get-config-with-multiple-subtrees.xml b/protocol/netconf-util/src/test/resources/netconfMessages/get-config-with-multiple-subtrees.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/get-config-with-multiple-subtrees.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/get-config-with-multiple-subtrees.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/get-fields-request.xml b/protocol/netconf-util/src/test/resources/netconfMessages/get-fields-request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/get-fields-request.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/get-fields-request.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/get-with-multiple-root-subtrees.xml b/protocol/netconf-util/src/test/resources/netconfMessages/get-with-multiple-root-subtrees.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/get-with-multiple-root-subtrees.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/get-with-multiple-root-subtrees.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/get-with-multiple-subtrees.xml b/protocol/netconf-util/src/test/resources/netconfMessages/get-with-multiple-subtrees.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/get-with-multiple-subtrees.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/get-with-multiple-subtrees.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/get.xml b/protocol/netconf-util/src/test/resources/netconfMessages/get.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/get.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/get.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/getConfig.xml b/protocol/netconf-util/src/test/resources/netconfMessages/getConfig.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/getConfig.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/getConfig.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/getConfig_candidate-filter.xml b/protocol/netconf-util/src/test/resources/netconfMessages/getConfig_candidate-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/getConfig_candidate-filter.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/getConfig_candidate-filter.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/getConfig_candidate.xml b/protocol/netconf-util/src/test/resources/netconfMessages/getConfig_candidate.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/getConfig_candidate.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/getConfig_candidate.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/get_schema-no-version.xml b/protocol/netconf-util/src/test/resources/netconfMessages/get_schema-no-version.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/get_schema-no-version.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/get_schema-no-version.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/get_schema.xml b/protocol/netconf-util/src/test/resources/netconfMessages/get_schema.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/get_schema.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/get_schema.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_session_id.xml b/protocol/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_session_id.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_session_id.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_session_id.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_wrong_namespace.xml b/protocol/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_wrong_namespace.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_wrong_namespace.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_wrong_namespace.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/lock-running.xml b/protocol/netconf-util/src/test/resources/netconfMessages/lock-running.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/lock-running.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/lock-running.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/lock.xml b/protocol/netconf-util/src/test/resources/netconfMessages/lock.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/lock.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/lock.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/mount/editConfig_merge_threadfactory.xml b/protocol/netconf-util/src/test/resources/netconfMessages/mount/editConfig_merge_threadfactory.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/mount/editConfig_merge_threadfactory.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/mount/editConfig_merge_threadfactory.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/mount/mount12002.xml b/protocol/netconf-util/src/test/resources/netconfMessages/mount/mount12002.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/mount/mount12002.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/mount/mount12002.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/mount/mount12003.xml b/protocol/netconf-util/src/test/resources/netconfMessages/mount/mount12003.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/mount/mount12003.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/mount/mount12003.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/mount/unmount12002.xml b/protocol/netconf-util/src/test/resources/netconfMessages/mount/unmount12002.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/mount/unmount12002.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/mount/unmount12002.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_differentNamespaceTO.xml b/protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_differentNamespaceTO.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_differentNamespaceTO.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_differentNamespaceTO.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespaces.xml b/protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespaces.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespaces.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespaces.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespacesList.xml b/protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespacesList.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespacesList.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespacesList.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_typeNameConfigAttributeMatching.xml b/protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_typeNameConfigAttributeMatching.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_typeNameConfigAttributeMatching.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_typeNameConfigAttributeMatching.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/rpc-reply_get.xml b/protocol/netconf-util/src/test/resources/netconfMessages/rpc-reply_get.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/rpc-reply_get.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/rpc-reply_get.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/rpc-reply_ok.xml b/protocol/netconf-util/src/test/resources/netconfMessages/rpc-reply_ok.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/rpc-reply_ok.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/rpc-reply_ok.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/rpcInner.xml b/protocol/netconf-util/src/test/resources/netconfMessages/rpcInner.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/rpcInner.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/rpcInner.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/rpcInnerInner.xml b/protocol/netconf-util/src/test/resources/netconfMessages/rpcInnerInner.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/rpcInnerInner.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/rpcInnerInner.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/rpcInnerInner_complex_output.xml b/protocol/netconf-util/src/test/resources/netconfMessages/rpcInnerInner_complex_output.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/rpcInnerInner_complex_output.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/rpcInnerInner_complex_output.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/startExi.xml b/protocol/netconf-util/src/test/resources/netconfMessages/startExi.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/startExi.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/startExi.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/stopExi.xml b/protocol/netconf-util/src/test/resources/netconfMessages/stopExi.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/stopExi.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/stopExi.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/threadpool-edit-config.xml b/protocol/netconf-util/src/test/resources/netconfMessages/threadpool-edit-config.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/threadpool-edit-config.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/threadpool-edit-config.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/unlock-running.xml b/protocol/netconf-util/src/test/resources/netconfMessages/unlock-running.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/unlock-running.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/unlock-running.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/unlock.xml b/protocol/netconf-util/src/test/resources/netconfMessages/unlock.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/unlock.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/unlock.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised1.xml b/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised1.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised1.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised1.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised2.xml b/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised2.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised2.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised2.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised3.xml b/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised3.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised3.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised3.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised4.xml b/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised4.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised4.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised4.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised5.xml b/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised5.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised5.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised5.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised6.xml b/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised6.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised6.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised6.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised7.xml b/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised7.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised7.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised7.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised8.xml b/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised8.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised8.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised8.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/validate-running.xml b/protocol/netconf-util/src/test/resources/netconfMessages/validate-running.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/validate-running.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/validate-running.xml diff --git a/netconf/netconf-util/src/test/resources/netconfMessages/validate.xml b/protocol/netconf-util/src/test/resources/netconfMessages/validate.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/netconfMessages/validate.xml rename to protocol/netconf-util/src/test/resources/netconfMessages/validate.xml diff --git a/netconf/netconf-util/src/test/resources/sessions.xml b/protocol/netconf-util/src/test/resources/sessions.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/sessions.xml rename to protocol/netconf-util/src/test/resources/sessions.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/0/filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/0/filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/0/filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/0/filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/0/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/0/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/0/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/0/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/0/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/0/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/0/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/0/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/1/filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/1/filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/1/filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/1/filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/1/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/1/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/1/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/1/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/1/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/1/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/1/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/1/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/2/filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/2/filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/2/filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/2/filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/2/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/2/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/2/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/2/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/2/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/2/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/2/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/2/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/3/filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/3/filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/3/filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/3/filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/3/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/3/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/3/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/3/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/3/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/3/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/3/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/3/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/4/filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/4/filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/4/filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/4/filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/4/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/4/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/4/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/4/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/notification/4/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/notification/4/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/notification/4/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/notification/4/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/0/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/0/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/0/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/0/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/0/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/0/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/0/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/0/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/0/request.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/0/request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/0/request.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/0/request.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/1/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/1/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/1/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/1/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/1/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/1/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/1/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/1/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/1/request.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/1/request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/1/request.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/1/request.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/10/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/10/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/10/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/10/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/10/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/10/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/10/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/10/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/10/request.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/10/request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/10/request.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/10/request.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/2/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/2/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/2/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/2/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/2/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/2/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/2/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/2/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/2/request.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/2/request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/2/request.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/2/request.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/3/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/3/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/3/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/3/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/3/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/3/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/3/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/3/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/3/request.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/3/request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/3/request.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/3/request.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/4/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/4/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/4/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/4/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/4/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/4/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/4/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/4/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/4/request.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/4/request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/4/request.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/4/request.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/5/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/5/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/5/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/5/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/5/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/5/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/5/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/5/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/5/request.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/5/request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/5/request.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/5/request.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/6/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/6/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/6/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/6/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/6/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/6/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/6/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/6/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/6/request.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/6/request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/6/request.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/6/request.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/7/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/7/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/7/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/7/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/7/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/7/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/7/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/7/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/7/request.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/7/request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/7/request.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/7/request.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/8/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/8/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/8/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/8/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/8/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/8/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/8/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/8/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/8/request.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/8/request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/8/request.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/8/request.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/9/post-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/9/post-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/9/post-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/9/post-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/9/pre-filter.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/9/pre-filter.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/9/pre-filter.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/9/pre-filter.xml diff --git a/netconf/netconf-util/src/test/resources/subtree/rpc/9/request.xml b/protocol/netconf-util/src/test/resources/subtree/rpc/9/request.xml similarity index 100% rename from netconf/netconf-util/src/test/resources/subtree/rpc/9/request.xml rename to protocol/netconf-util/src/test/resources/subtree/rpc/9/request.xml diff --git a/protocol/pom.xml b/protocol/pom.xml index 69414c12a9..5223d44ace 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -30,5 +30,8 @@ netconf-api + netconf-client + netconf-impl + netconf-util -- 2.36.6