From 5c1f875f69e35248aa4115c429bd962160beeef4 Mon Sep 17 00:00:00 2001 From: Martin Vitez Date: Tue, 6 Aug 2013 09:20:14 +0200 Subject: [PATCH] Updated yangtools version to 0.5.6-SNAPSHOT. Moved all yang-* modules under yang directory. Updated poms. Fixed bug in yang uses processing. Change-Id: I4b65a92d4e827bf05aa95ef234394c0eed49c0a9 Signed-off-by: Martin Vitez --- code-generator/binding-generator-api/pom.xml | 6 +- code-generator/binding-generator-impl/pom.xml | 12 +- code-generator/binding-generator-spi/pom.xml | 6 +- code-generator/binding-generator-util/pom.xml | 6 +- .../binding-java-api-generator/pom.xml | 10 +- code-generator/binding-model-api/pom.xml | 4 +- .../maven-sal-api-gen-plugin/pom.xml | 12 +- code-generator/pom.xml | 44 +++--- .../samples/maven-code-gen-sample/pom.xml | 10 +- .../samples/modeling-sample/pom.xml | 10 +- model/ietf/ietf-inet-types/pom.xml | 4 +- model/ietf/ietf-yang-types/pom.xml | 4 +- model/ietf/pom.xml | 4 +- model/model-openflow/pom.xml | 6 +- model/model-topology-bgp/pom.xml | 6 +- model/model-topology/pom.xml | 6 +- model/pom.xml | 17 ++- pom.xml | 71 +-------- yang/pom.xml | 139 ++++++++++++++++++ {src => yang/src}/site/site.xml | 0 {yang-binding => yang/yang-binding}/pom.xml | 4 +- .../yangtools/yang/binding/Augmentable.java | 0 .../yangtools/yang/binding/Augmentation.java | 0 .../yangtools/yang/binding/BaseIdentity.java | 0 .../yangtools/yang/binding/DataObject.java | 0 .../yangtools/yang/binding/DataRoot.java | 0 .../yang/binding/InstanceIdentifier.java | 0 .../yangtools/yang/binding/Notification.java | 0 .../yang/binding/NotificationListener.java | 0 .../yangtools/yang/binding/RpcService.java | 0 .../yangtools/yang/binding/package-info.java | 0 {yang-common => yang/yang-common}/pom.xml | 4 +- .../yangtools/yang/common/QName.java | 0 .../yangtools/yang/common/RpcError.java | 0 .../yangtools/yang/common/RpcResult.java | 0 {yang-data-api => yang/yang-data-api}/pom.xml | 4 +- .../yang/data/api/CompositeNode.java | 0 .../yangtools/yang/data/api/ModifyAction.java | 0 .../yang/data/api/MutableCompositeNode.java | 0 .../yangtools/yang/data/api/MutableNode.java | 0 .../yang/data/api/MutableSimpleNode.java | 0 .../yangtools/yang/data/api/Node.java | 0 .../yang/data/api/NodeModification.java | 0 .../data/api/NodeModificationBuilder.java | 0 .../yangtools/yang/data/api/SimpleNode.java | 0 .../yang-data-impl}/pom.xml | 4 +- .../yang/data/impl/AbstractNodeTO.java | 0 .../impl/CompositeNodeModificationTOImpl.java | 0 .../yang/data/impl/CompositeNodeTOImpl.java | 0 .../yang/data/impl/LazyNodeToNodeMap.java | 0 .../data/impl/MutableCompositeNodeTOImpl.java | 0 .../data/impl/MutableSimpleNodeTOImpl.java | 0 .../yangtools/yang/data/impl/NodeFactory.java | 0 .../impl/NodeModificationBuilderImpl.java | 0 .../yangtools/yang/data/impl/NodeUtils.java | 0 .../impl/SimpleNodeModificationTOImpl.java | 0 .../yang/data/impl/SimpleNodeTOImpl.java | 0 .../impl/IgnoreWhiteCharsDiffListener.java | 0 .../yang/data/impl/LazyNodeToNodeMapTest.java | 0 .../yang/data/impl/MemoryConsumption.java | 0 .../yang/data/impl/MyNodeBuilder.java | 0 .../yang/data/impl/NodeFactoryTest.java | 0 .../yangtools/yang/data/impl/NodeHelper.java | 0 .../impl/NodeModificationBuilderImplTest.java | 0 .../yang/data/impl/NodeUtilsTest.java | 0 .../src/test/resources/MyXmlGenerator.groovy | 0 .../src/test/resources/config01.xml | 0 .../src/test/resources/config02.xml | 0 .../src/test/resources/controller-network.xsd | 0 .../test/resources/controller-network.yang | 0 .../resources/ietf-inet-types@2010-09-24.xsd | 0 .../resources/ietf-inet-types@2010-09-24.yang | 0 .../src/test/resources/log4j-test.xml | 0 .../yang/data/impl/config02-shadow.xml | 0 .../yangtools/yang/data/impl/config02.groovy | 0 .../yang/data/impl/config02g-shadow.xml | 0 .../yang/data/impl/mutableNodesConfig.xml | 0 .../yang-data-util}/pom.xml | 4 +- .../yang/data/util/AbstractContainerNode.java | 0 .../yang/data/util/AbstractNode.java | 0 .../yangtools/yang/data/util/Nodes.java | 0 {yang-ext => yang/yang-ext}/pom.xml | 8 +- .../yang-ext}/src/main/yang/yang-ext.yang | 0 .../yang-maven-plugin-it}/.gitignore | 0 .../yang-maven-plugin-it}/pom.xml | 4 +- .../plugin/it/YangToSourcesPluginTestIT.java | 0 .../test/resources/AdditionalConfig/pom.xml | 8 +- .../src/test/resources/Correct/pom.xml | 8 +- .../src/test/resources/GenerateTest1/pom.xml | 6 +- .../src/main/resources/testfile1.yang | 0 .../src/main/resources/testfile2.yang | 0 .../src/main/resources/testfile3.yang | 0 .../src/test/resources/GenerateTest2/pom.xml | 10 +- .../resources/GenerateTest2/yang/private.yang | 0 .../src/test/resources/Generator/pom.xml | 6 +- .../test/resources/MissingYangInDep/pom.xml | 7 +- .../MissingYangInDep/yang/private.yang | 0 .../src/test/resources/NoGenerators/pom.xml | 6 +- .../src/test/resources/NoOutputDir/pom.xml | 6 +- .../src/test/resources/NoYangFiles/pom.xml | 6 +- .../test/resources/UnknownGenerator/pom.xml | 6 +- .../test/resources/YangRootNotExist/pom.xml | 4 +- .../src/test/resources/files/testfile1.yang | 0 .../src/test/resources/files/testfile2.yang | 0 .../src/test/resources/files/testfile3.yang | 0 .../yang-maven-plugin-spi}/pom.xml | 4 +- .../yang2sources/spi/CodeGenerator.java | 0 .../spi/CodeGeneratorTestImpl.java | 0 .../yang-maven-plugin}/pom.xml | 4 +- .../yang2sources/plugin/ConfigArg.java | 0 .../yangtools/yang2sources/plugin/Util.java | 0 .../plugin/YangToSourcesMojo.java | 0 .../plugin/YangToSourcesProcessor.java | 0 .../plugin/GenerateSourcesTest.java | 0 .../yang2sources/plugin/UtilTest.java | 0 .../src/test/resources/yang/mock.yang | 0 .../yang-model-api}/pom.xml | 4 +- .../yang/model/api/AnyXmlSchemaNode.java | 0 .../yang/model/api/AugmentationSchema.java | 0 .../yang/model/api/AugmentationTarget.java | 0 .../yang/model/api/ChoiceCaseNode.java | 0 .../yangtools/yang/model/api/ChoiceNode.java | 0 .../yang/model/api/ConstraintDefinition.java | 0 .../model/api/ConstraintMetaDefinition.java | 0 .../yang/model/api/ContainerSchemaNode.java | 0 .../yang/model/api/DataNodeContainer.java | 0 .../yang/model/api/DataSchemaNode.java | 0 .../yangtools/yang/model/api/Deviation.java | 0 .../yang/model/api/ExtensionDefinition.java | 0 .../yang/model/api/FeatureDefinition.java | 0 .../yang/model/api/GroupingDefinition.java | 0 .../yang/model/api/IdentitySchemaNode.java | 0 .../yang/model/api/LeafListSchemaNode.java | 0 .../yang/model/api/LeafSchemaNode.java | 0 .../yang/model/api/ListSchemaNode.java | 0 .../yangtools/yang/model/api/Module.java | 0 .../yang/model/api/ModuleImport.java | 0 .../yang/model/api/MustDefinition.java | 0 .../model/api/NotificationDefinition.java | 0 .../yang/model/api/RevisionAwareXPath.java | 0 .../yang/model/api/RpcDefinition.java | 0 .../yang/model/api/SchemaContext.java | 0 .../yangtools/yang/model/api/SchemaNode.java | 0 .../yangtools/yang/model/api/SchemaPath.java | 0 .../yangtools/yang/model/api/Status.java | 0 .../yang/model/api/TypeDefinition.java | 0 .../yang/model/api/UnknownSchemaNode.java | 0 .../yangtools/yang/model/api/UsesNode.java | 0 .../yang/model/api/package-info.java | 0 .../model/api/type/BinaryTypeDefinition.java | 0 .../model/api/type/BitsTypeDefinition.java | 0 .../model/api/type/BooleanTypeDefinition.java | 0 .../model/api/type/DecimalTypeDefinition.java | 0 .../model/api/type/EmptyTypeDefinition.java | 0 .../model/api/type/EnumTypeDefinition.java | 0 .../api/type/IdentityTypeDefinition.java | 0 .../api/type/IdentityrefTypeDefinition.java | 0 .../InstanceIdentifierTypeDefinition.java | 0 .../model/api/type/IntegerTypeDefinition.java | 0 .../model/api/type/LeafrefTypeDefinition.java | 0 .../yang/model/api/type/LengthConstraint.java | 0 .../model/api/type/PatternConstraint.java | 0 .../yang/model/api/type/RangeConstraint.java | 0 .../model/api/type/StringTypeDefinition.java | 0 .../model/api/type/UnionTypeDefinition.java | 0 .../model/api/type/UnknownTypeDefinition.java | 0 .../type/UnsignedIntegerTypeDefinition.java | 0 .../yang-model-util}/pom.xml | 4 +- .../model/util/AbstractSignedInteger.java | 0 .../model/util/AbstractUnsignedInteger.java | 0 .../yang/model/util/BaseConstraints.java | 0 .../yangtools/yang/model/util/BaseTypes.java | 0 .../yangtools/yang/model/util/BinaryType.java | 0 .../yangtools/yang/model/util/BitsType.java | 0 .../yang/model/util/BooleanType.java | 0 .../yang/model/util/DataNodeIterator.java | 0 .../yangtools/yang/model/util/Decimal64.java | 0 .../yangtools/yang/model/util/EmptyType.java | 0 .../yang/model/util/EnumerationType.java | 0 .../yang/model/util/ExtendedType.java | 0 .../yang/model/util/IdentityrefType.java | 0 .../yang/model/util/InstanceIdentifier.java | 0 .../yangtools/yang/model/util/Int16.java | 0 .../yangtools/yang/model/util/Int32.java | 0 .../yangtools/yang/model/util/Int64.java | 0 .../yangtools/yang/model/util/Int8.java | 0 .../yangtools/yang/model/util/Leafref.java | 0 .../model/util/RevisionAwareXPathImpl.java | 0 .../yang/model/util/SchemaContextUtil.java | 0 .../yangtools/yang/model/util/StringType.java | 0 .../yangtools/yang/model/util/Uint16.java | 0 .../yangtools/yang/model/util/Uint32.java | 0 .../yangtools/yang/model/util/Uint64.java | 0 .../yangtools/yang/model/util/Uint8.java | 0 .../yangtools/yang/model/util/UnionType.java | 0 .../yang/model/util/UnknownType.java | 0 .../yang/model/util/YangTypesConverter.java | 0 .../yang-parser-api}/pom.xml | 4 +- .../model/parser/api/YangModelParser.java | 0 .../yang/model/parser/api/package-info.java | 0 .../yang-parser-impl}/pom.xml | 4 +- .../src/main/antlr/YangLexer.g4 | 0 .../src/main/antlr/YangParser.g4 | 0 .../parser/builder/api/AbstractBuilder.java | 0 .../api/AbstractDataNodeContainerBuilder.java | 0 .../api/AbstractSchemaNodeBuilder.java | 0 .../builder/api/AbstractTypeAwareBuilder.java | 0 .../api/AugmentationSchemaBuilder.java | 0 .../api/AugmentationTargetBuilder.java | 0 .../yang/parser/builder/api/Builder.java | 0 .../builder/api/DataNodeContainerBuilder.java | 0 .../builder/api/DataSchemaNodeBuilder.java | 0 .../parser/builder/api/GroupingBuilder.java | 0 .../parser/builder/api/GroupingMember.java | 0 .../parser/builder/api/SchemaNodeBuilder.java | 0 .../parser/builder/api/TypeAwareBuilder.java | 0 .../builder/api/TypeDefinitionBuilder.java | 0 .../parser/builder/api/UsesNodeBuilder.java | 0 .../parser/builder/impl/AnyXmlBuilder.java | 0 .../impl/AugmentationSchemaBuilderImpl.java | 9 +- .../parser/builder/impl/ChoiceBuilder.java | 0 .../builder/impl/ChoiceCaseBuilder.java | 0 .../builder/impl/ConstraintsBuilder.java | 0 .../impl/ContainerSchemaNodeBuilder.java | 0 .../parser/builder/impl/DeviationBuilder.java | 0 .../parser/builder/impl/ExtensionBuilder.java | 0 .../parser/builder/impl/FeatureBuilder.java | 0 .../builder/impl/GroupingBuilderImpl.java | 0 .../impl/IdentitySchemaNodeBuilder.java | 0 .../builder/impl/IdentityrefTypeBuilder.java | 0 .../impl/LeafListSchemaNodeBuilder.java | 0 .../builder/impl/LeafSchemaNodeBuilder.java | 0 .../builder/impl/ListSchemaNodeBuilder.java | 0 .../parser/builder/impl/ModuleBuilder.java | 0 .../builder/impl/NotificationBuilder.java | 0 .../builder/impl/RpcDefinitionBuilder.java | 0 .../impl/TypeDefinitionBuilderImpl.java | 0 .../parser/builder/impl/UnionTypeBuilder.java | 0 .../impl/UnknownSchemaNodeBuilder.java | 0 .../builder/impl/UsesNodeBuilderImpl.java | 0 .../yang/parser/impl/SchemaContextImpl.java | 0 .../yang/parser/impl/YangErrorListener.java | 0 .../yang/parser/impl/YangParserImpl.java | 9 +- .../parser/impl/YangParserListenerImpl.java | 0 .../yangtools/yang/parser/util/BitImpl.java | 0 .../yang/parser/util/Comparators.java | 0 .../parser/util/ModuleDependencySort.java | 0 .../yang/parser/util/MustDefinitionImpl.java | 0 .../yang/parser/util/ParserListenerUtils.java | 0 .../yang/parser/util/ParserUtils.java | 0 .../yang/parser/util/RefineHolder.java | 0 .../yang/parser/util/RefineUtils.java | 0 .../yang/parser/util/TopologicalSort.java | 0 .../yang/parser/util/TypeConstraints.java | 0 .../yangtools/yang/parser/util/TypeUtils.java | 0 .../parser/util/UnknownBoundaryNumber.java | 0 .../yang/parser/util/YangParseException.java | 0 .../parser/util/YangValidationException.java | 0 .../yang/validator/BasicValidations.java | 0 .../yang/validator/ValidationUtil.java | 0 .../YangModelBasicValidationListener.java | 0 .../validator/YangModelBasicValidator.java | 0 .../yang/parser/impl/AugmentTest.java | 0 .../yang/parser/impl/GroupingTest.java | 0 .../yangtools/yang/parser/impl/TestUtils.java | 0 .../yang/parser/impl/TypesResolutionTest.java | 0 .../parser/impl/YangParserNegativeTest.java | 0 .../parser/impl/YangParserSimpleTest.java | 0 .../yang/parser/impl/YangParserTest.java | 0 .../impl/YangParserWithContextTest.java | 0 .../parser/util/ModuleDependencySortTest.java | 0 .../yang/parser/util/TopologicalSortTest.java | 0 .../YangModelValidationListTest.java | 0 .../YangModelValidationModuleTest.java | 0 .../YangModelValidationSubModuleTest.java | 0 .../validator/YangModelValidationTest.java | 0 .../resources/context-augment-test/test1.yang | 0 .../resources/context-augment-test/test2.yang | 0 .../resources/context-augment-test/test3.yang | 0 .../resources/context-augment-test/test4.yang | 0 .../context-test/deviation-test.yang | 0 .../test/resources/context-test/test1.yang | 0 .../test/resources/context-test/test2.yang | 0 .../test/resources/context-test/test3.yang | 0 .../src/test/resources/model/custom.yang | 0 .../src/test/resources/model/nodes.yang | 0 .../src/test/resources/model/types.yang | 0 .../negative-scenario/duplicity/augment0.yang | 0 .../negative-scenario/duplicity/augment1.yang | 0 .../negative-scenario/duplicity/augment2.yang | 0 .../duplicity/container-leaf.yang | 0 .../duplicity/container-list.yang | 0 .../duplicity/container.yang | 0 .../negative-scenario/duplicity/identity.yang | 0 .../negative-scenario/duplicity/typedef.yang | 0 .../negative-scenario/testfile0.yang | 0 .../negative-scenario/testfile1.yang | 0 .../negative-scenario/testfile2.yang | 0 .../negative-scenario/testfile3.yang | 0 .../negative-scenario/testfile4.yang | 0 .../negative-scenario/testfile5.yang | 0 .../negative-scenario/testfile6.yang | 0 .../resources/simple-test/cascade-uses.yang | 0 .../resources/simple-test/simple-nodes.yang | 0 .../types/custom-types-test@2012-4-4.yang | 0 .../types/iana-afn-safi@2012-06-04.yang | 0 .../types/iana-if-type@2012-06-05.yang | 0 .../types/iana-timezones@2012-07-09.yang | 0 .../types/ietf-inet-types@2010-09-24.yang | 0 .../types/ietf-yang-types@2010-09-24.yang | 0 310 files changed, 299 insertions(+), 225 deletions(-) create mode 100644 yang/pom.xml rename {src => yang/src}/site/site.xml (100%) rename {yang-binding => yang/yang-binding}/pom.xml (82%) rename {yang-binding => yang/yang-binding}/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java (100%) rename {yang-binding => yang/yang-binding}/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java (100%) rename {yang-binding => yang/yang-binding}/src/main/java/org/opendaylight/yangtools/yang/binding/BaseIdentity.java (100%) rename {yang-binding => yang/yang-binding}/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java (100%) rename {yang-binding => yang/yang-binding}/src/main/java/org/opendaylight/yangtools/yang/binding/DataRoot.java (100%) rename {yang-binding => yang/yang-binding}/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java (100%) rename {yang-binding => yang/yang-binding}/src/main/java/org/opendaylight/yangtools/yang/binding/Notification.java (100%) rename {yang-binding => yang/yang-binding}/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java (100%) rename {yang-binding => yang/yang-binding}/src/main/java/org/opendaylight/yangtools/yang/binding/RpcService.java (100%) rename {yang-binding => yang/yang-binding}/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java (100%) rename {yang-common => yang/yang-common}/pom.xml (85%) rename {yang-common => yang/yang-common}/src/main/java/org/opendaylight/yangtools/yang/common/QName.java (100%) rename {yang-common => yang/yang-common}/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java (100%) rename {yang-common => yang/yang-common}/src/main/java/org/opendaylight/yangtools/yang/common/RpcResult.java (100%) rename {yang-data-api => yang/yang-data-api}/pom.xml (86%) rename {yang-data-api => yang/yang-data-api}/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java (100%) rename {yang-data-api => yang/yang-data-api}/src/main/java/org/opendaylight/yangtools/yang/data/api/ModifyAction.java (100%) rename {yang-data-api => yang/yang-data-api}/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java (100%) rename {yang-data-api => yang/yang-data-api}/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java (100%) rename {yang-data-api => yang/yang-data-api}/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java (100%) rename {yang-data-api => yang/yang-data-api}/src/main/java/org/opendaylight/yangtools/yang/data/api/Node.java (100%) rename {yang-data-api => yang/yang-data-api}/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModification.java (100%) rename {yang-data-api => yang/yang-data-api}/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java (100%) rename {yang-data-api => yang/yang-data-api}/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java (100%) rename {yang-data-impl => yang/yang-data-impl}/pom.xml (94%) rename {yang-data-impl => yang/yang-data-impl}/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/java/org/opendaylight/yangtools/yang/data/impl/IgnoreWhiteCharsDiffListener.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/java/org/opendaylight/yangtools/yang/data/impl/MemoryConsumption.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/resources/MyXmlGenerator.groovy (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/resources/config01.xml (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/resources/config02.xml (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/resources/controller-network.xsd (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/resources/controller-network.yang (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/resources/ietf-inet-types@2010-09-24.xsd (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/resources/ietf-inet-types@2010-09-24.yang (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/resources/log4j-test.xml (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02-shadow.xml (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02.groovy (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02g-shadow.xml (100%) rename {yang-data-impl => yang/yang-data-impl}/src/test/resources/org/opendaylight/yangtools/yang/data/impl/mutableNodesConfig.xml (100%) rename {yang-data-util => yang/yang-data-util}/pom.xml (86%) rename {yang-data-util => yang/yang-data-util}/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java (100%) rename {yang-data-util => yang/yang-data-util}/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java (100%) rename {yang-data-util => yang/yang-data-util}/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java (100%) rename {yang-ext => yang/yang-ext}/pom.xml (95%) rename {yang-ext => yang/yang-ext}/src/main/yang/yang-ext.yang (100%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/.gitignore (100%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/pom.xml (93%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java (100%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/AdditionalConfig/pom.xml (93%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/Correct/pom.xml (91%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/GenerateTest1/pom.xml (92%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/GenerateTest1/src/main/resources/testfile1.yang (100%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/GenerateTest1/src/main/resources/testfile2.yang (100%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/GenerateTest1/src/main/resources/testfile3.yang (100%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/GenerateTest2/pom.xml (90%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/GenerateTest2/yang/private.yang (100%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/Generator/pom.xml (93%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/MissingYangInDep/pom.xml (94%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/MissingYangInDep/yang/private.yang (100%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/NoGenerators/pom.xml (93%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/NoOutputDir/pom.xml (92%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/NoYangFiles/pom.xml (92%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/UnknownGenerator/pom.xml (94%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/YangRootNotExist/pom.xml (94%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/files/testfile1.yang (100%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/files/testfile2.yang (100%) rename {yang-maven-plugin-it => yang/yang-maven-plugin-it}/src/test/resources/files/testfile3.yang (100%) rename {yang-maven-plugin-spi => yang/yang-maven-plugin-spi}/pom.xml (94%) rename {yang-maven-plugin-spi => yang/yang-maven-plugin-spi}/src/main/java/org/opendaylight/yangtools/yang2sources/spi/CodeGenerator.java (100%) rename {yang-maven-plugin-spi => yang/yang-maven-plugin-spi}/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java (100%) rename {yang-maven-plugin => yang/yang-maven-plugin}/pom.xml (97%) rename {yang-maven-plugin => yang/yang-maven-plugin}/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java (100%) rename {yang-maven-plugin => yang/yang-maven-plugin}/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java (100%) rename {yang-maven-plugin => yang/yang-maven-plugin}/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java (100%) rename {yang-maven-plugin => yang/yang-maven-plugin}/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java (100%) rename {yang-maven-plugin => yang/yang-maven-plugin}/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java (100%) rename {yang-maven-plugin => yang/yang-maven-plugin}/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java (100%) rename {yang-maven-plugin => yang/yang-maven-plugin}/src/test/resources/yang/mock.yang (100%) rename {yang-model-api => yang/yang-model-api}/pom.xml (86%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchema.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java (100%) rename {yang-model-api => yang/yang-model-api}/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java (100%) rename {yang-model-util => yang/yang-model-util}/pom.xml (86%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java (100%) rename {yang-model-util => yang/yang-model-util}/src/main/java/org/opendaylight/yangtools/yang/model/util/YangTypesConverter.java (100%) rename {yang-parser-api => yang/yang-parser-api}/pom.xml (88%) rename {yang-parser-api => yang/yang-parser-api}/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangModelParser.java (100%) rename {yang-parser-api => yang/yang-parser-api}/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/pom.xml (95%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/antlr/YangLexer.g4 (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/antlr/YangParser.g4 (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java (98%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangErrorListener.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java (99%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/MustDefinitionImpl.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineHolder.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSort.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeUtils.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/UnknownBoundaryNumber.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangParseException.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangValidationException.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidator.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserNegativeTest.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/context-augment-test/test1.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/context-augment-test/test2.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/context-augment-test/test3.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/context-augment-test/test4.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/context-test/deviation-test.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/context-test/test1.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/context-test/test2.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/context-test/test3.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/model/custom.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/model/nodes.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/model/types.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/duplicity/augment0.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/duplicity/augment1.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/duplicity/augment2.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/duplicity/container-leaf.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/duplicity/container-list.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/duplicity/container.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/duplicity/identity.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/duplicity/typedef.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/testfile0.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/testfile1.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/testfile2.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/testfile3.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/testfile4.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/testfile5.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/negative-scenario/testfile6.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/simple-test/cascade-uses.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/simple-test/simple-nodes.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/types/custom-types-test@2012-4-4.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/types/iana-afn-safi@2012-06-04.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/types/iana-if-type@2012-06-05.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/types/iana-timezones@2012-07-09.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/types/ietf-inet-types@2010-09-24.yang (100%) rename {yang-parser-impl => yang/yang-parser-impl}/src/test/resources/types/ietf-yang-types@2010-09-24.yang (100%) diff --git a/code-generator/binding-generator-api/pom.xml b/code-generator/binding-generator-api/pom.xml index 544942be82..695fccfc86 100644 --- a/code-generator/binding-generator-api/pom.xml +++ b/code-generator/binding-generator-api/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.controller + org.opendaylight.yangtools binding-generator - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT 4.0.0 @@ -12,7 +12,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools binding-model-api diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml index cbecf02846..2bee8052e0 100644 --- a/code-generator/binding-generator-impl/pom.xml +++ b/code-generator/binding-generator-impl/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.controller + org.opendaylight.yangtools binding-generator - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT 4.0.0 @@ -12,20 +12,20 @@ - org.opendaylight.controller + org.opendaylight.yangtools binding-generator-util org.opendaylight.yangtools yang-parser-impl - ${yangtools.version} + ${yang.version} - org.opendaylight.controller + org.opendaylight.yangtools binding-generator-api - org.opendaylight.controller + org.opendaylight.yangtools binding-generator-spi diff --git a/code-generator/binding-generator-spi/pom.xml b/code-generator/binding-generator-spi/pom.xml index b011da3785..01a82ffb9f 100644 --- a/code-generator/binding-generator-spi/pom.xml +++ b/code-generator/binding-generator-spi/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.controller + org.opendaylight.yangtools binding-generator - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT 4.0.0 @@ -12,7 +12,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools binding-model-api diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml index c707151cdc..8e3c71a8c2 100644 --- a/code-generator/binding-generator-util/pom.xml +++ b/code-generator/binding-generator-util/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.controller + org.opendaylight.yangtools binding-generator - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT 4.0.0 @@ -12,7 +12,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools binding-model-api diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml index afc16f676d..2e71966a1b 100644 --- a/code-generator/binding-java-api-generator/pom.xml +++ b/code-generator/binding-java-api-generator/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.controller + org.opendaylight.yangtools binding-generator - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT 4.0.0 @@ -46,16 +46,16 @@ - org.opendaylight.controller + org.opendaylight.yangtools binding-model-api - org.opendaylight.controller + org.opendaylight.yangtools binding-generator-impl test - org.opendaylight.controller + org.opendaylight.yangtools binding-generator-util diff --git a/code-generator/binding-model-api/pom.xml b/code-generator/binding-model-api/pom.xml index 48e1b4d385..3345151971 100644 --- a/code-generator/binding-model-api/pom.xml +++ b/code-generator/binding-model-api/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.controller + org.opendaylight.yangtools binding-generator - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT 4.0.0 diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml index 11ed764d90..224baf8623 100644 --- a/code-generator/maven-sal-api-gen-plugin/pom.xml +++ b/code-generator/maven-sal-api-gen-plugin/pom.xml @@ -3,8 +3,8 @@ binding-generator - org.opendaylight.controller - 0.5.5-SNAPSHOT + org.opendaylight.yangtools + 0.5.6-SNAPSHOT 4.0.0 @@ -16,19 +16,19 @@ yang-maven-plugin-spi - org.opendaylight.controller + org.opendaylight.yangtools binding-model-api - org.opendaylight.controller + org.opendaylight.yangtools binding-generator-api - org.opendaylight.controller + org.opendaylight.yangtools binding-generator-impl - org.opendaylight.controller + org.opendaylight.yangtools binding-java-api-generator diff --git a/code-generator/pom.xml b/code-generator/pom.xml index c0edbdd94a..1fc0a38d2d 100644 --- a/code-generator/pom.xml +++ b/code-generator/pom.xml @@ -2,22 +2,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.controller - yang-prototype + org.opendaylight.yangtools + yangtools 0.5-SNAPSHOT 4.0.0 - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT binding-generator pom ${project.artifactId} ${project.artifactId} - - UTF-8 - - binding-model-api binding-generator-api @@ -31,90 +27,90 @@ - org.opendaylight.controller + org.opendaylight.yangtools binding-model-api ${project.version} - org.opendaylight.controller + org.opendaylight.yangtools binding-generator-api ${project.version} - org.opendaylight.controller + org.opendaylight.yangtools binding-generator-spi ${project.version} - org.opendaylight.controller + org.opendaylight.yangtools binding-generator-util ${project.version} - org.opendaylight.controller + org.opendaylight.yangtools binding-generator-impl ${project.version} - org.opendaylight.controller + org.opendaylight.yangtools binding-java-api-generator ${project.version} - org.opendaylight.controller + org.opendaylight.yangtools maven-sal-api-gen-plugin ${project.version} org.opendaylight.yangtools yang-common - ${yangtools.version} + ${yang.version} org.opendaylight.yangtools yang-data-api - ${yangtools.version} + ${yang.version} org.opendaylight.yangtools yang-data-util - ${yangtools.version} + ${yang.version} org.opendaylight.yangtools yang-model-api - ${yangtools.version} + ${yang.version} org.opendaylight.yangtools yang-model-util - ${yangtools.version} + ${yang.version} org.opendaylight.yangtools yang-binding - ${yangtools.version} + ${yang.version} org.opendaylight.yangtools yang-model-parser-api - ${yangtools.version} + ${yang.version} org.opendaylight.yangtools yang-model-parser-impl - ${yangtools.version} + ${yang.version} org.opendaylight.yangtools yang-maven-plugin - ${yangtools.version} + ${yang.version} org.opendaylight.yangtools yang-maven-plugin-spi - ${yangtools.version} + ${yang.version} diff --git a/code-generator/samples/maven-code-gen-sample/pom.xml b/code-generator/samples/maven-code-gen-sample/pom.xml index a5714439c9..01546945a5 100644 --- a/code-generator/samples/maven-code-gen-sample/pom.xml +++ b/code-generator/samples/maven-code-gen-sample/pom.xml @@ -3,8 +3,8 @@ 4.0.0 binding-generator - org.opendaylight.controller - 0.5.5-SNAPSHOT + org.opendaylight.yangtools + 0.5.6-SNAPSHOT maven-code-gen-sample @@ -13,7 +13,7 @@ org.opendaylight.yangtools yang-maven-plugin - ${yangtools.version} + ${yang.version} @@ -38,9 +38,9 @@ - org.opendaylight.controller + org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT jar diff --git a/code-generator/samples/modeling-sample/pom.xml b/code-generator/samples/modeling-sample/pom.xml index 6d895390a6..742ac4ec06 100644 --- a/code-generator/samples/modeling-sample/pom.xml +++ b/code-generator/samples/modeling-sample/pom.xml @@ -3,8 +3,8 @@ 4.0.0 binding-generator - org.opendaylight.controller - 0.5.5-SNAPSHOT + org.opendaylight.yangtools + 0.5.6-SNAPSHOT modeling-sample @@ -13,7 +13,7 @@ org.opendaylight.yangtools yang-maven-plugin - ${yangtools.version} + ${yang.version} @@ -38,9 +38,9 @@ - org.opendaylight.controller + org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT jar diff --git a/model/ietf/ietf-inet-types/pom.xml b/model/ietf/ietf-inet-types/pom.xml index 06d1189aa0..e2bac1a86d 100644 --- a/model/ietf/ietf-inet-types/pom.xml +++ b/model/ietf/ietf-inet-types/pom.xml @@ -3,8 +3,8 @@ model-ietf - org.opendaylight.controller - 0.5-SNAPSHOT + org.opendaylight.yangtools + 0.5.1-SNAPSHOT 4.0.0 diff --git a/model/ietf/ietf-yang-types/pom.xml b/model/ietf/ietf-yang-types/pom.xml index 1ad4e4a78e..6222c39eb9 100644 --- a/model/ietf/ietf-yang-types/pom.xml +++ b/model/ietf/ietf-yang-types/pom.xml @@ -3,8 +3,8 @@ model-ietf - org.opendaylight.controller - 0.5-SNAPSHOT + org.opendaylight.yangtools + 0.5.1-SNAPSHOT 4.0.0 diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml index a5b87b03ea..995dfbddc6 100644 --- a/model/ietf/pom.xml +++ b/model/ietf/pom.xml @@ -3,8 +3,8 @@ model-parent - org.opendaylight.controller - 0.5-SNAPSHOT + org.opendaylight.yangtools + 0.5.1-SNAPSHOT 4.0.0 diff --git a/model/model-openflow/pom.xml b/model/model-openflow/pom.xml index 76337cdfeb..63513ba0f4 100644 --- a/model/model-openflow/pom.xml +++ b/model/model-openflow/pom.xml @@ -3,8 +3,8 @@ 4.0.0 model-parent - org.opendaylight.controller - 0.5-SNAPSHOT + org.opendaylight.yangtools + 0.5.1-SNAPSHOT model-openflow - \ No newline at end of file + diff --git a/model/model-topology-bgp/pom.xml b/model/model-topology-bgp/pom.xml index f3b6ad9767..764a10de7e 100644 --- a/model/model-topology-bgp/pom.xml +++ b/model/model-topology-bgp/pom.xml @@ -3,8 +3,8 @@ 4.0.0 model-parent - org.opendaylight.controller - 0.5-SNAPSHOT + org.opendaylight.yangtools + 0.5.1-SNAPSHOT model-topology-bgp - \ No newline at end of file + diff --git a/model/model-topology/pom.xml b/model/model-topology/pom.xml index f1c32350cc..8098023444 100644 --- a/model/model-topology/pom.xml +++ b/model/model-topology/pom.xml @@ -3,8 +3,8 @@ model-parent - org.opendaylight.controller - 0.5-SNAPSHOT + org.opendaylight.yangtools + 0.5.1-SNAPSHOT 4.0.0 @@ -12,7 +12,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools ietf-inet-types 2010.09.24-SNAPSHOT diff --git a/model/pom.xml b/model/pom.xml index 1bbc2f6c77..06fa951eb6 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -2,13 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - yang-prototype - org.opendaylight.controller + org.opendaylight.yangtools + yangtools 0.5-SNAPSHOT 4.0.0 model-parent + 0.5.1-SNAPSHOT pom ${project.artifactId} ${project.artifactId} @@ -25,7 +26,7 @@ org.opendaylight.yangtools yang-maven-plugin - ${yangtools.version} + ${yang.version} @@ -49,9 +50,9 @@ - org.opendaylight.controller + org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT jar @@ -89,7 +90,7 @@ - org.opendaylight.controller + org.opendaylight.yangtools yang-maven-plugin @@ -119,12 +120,12 @@ org.opendaylight.yangtools yang-binding - ${yangtools.version} + ${yang.version} org.opendaylight.yangtools yang-common - ${yangtools.version} + ${yang.version} diff --git a/pom.xml b/pom.xml index b482b419cf..d11ab703ab 100644 --- a/pom.xml +++ b/pom.xml @@ -4,84 +4,24 @@ 4.0.0 yangtools org.opendaylight.yangtools - 0.5.5-SNAPSHOT + 0.5-SNAPSHOT pom UTF-8 1.7.2 http://nexus.opendaylight.org/content + 0.5.6-SNAPSHOT - yang-binding - yang-common - yang-data-api - yang-data-util - yang-data-impl - yang-ext - yang-model-api - yang-maven-plugin - yang-maven-plugin-it - yang-maven-plugin-spi - yang-model-util - yang-parser-api - yang-parser-impl + code-generator + model + yang - - org.opendaylight.yangtools - yang-common - ${project.version} - - - org.opendaylight.yangtools - yang-data-api - ${project.version} - - - org.opendaylight.yangtools - yang-data-util - ${project.version} - - - org.opendaylight.yangtools - yang-model-api - ${project.version} - - - org.opendaylight.yangtools - yang-model-util - ${project.version} - - - org.opendaylight.yangtools - yang-binding - ${project.version} - - - org.opendaylight.yangtools - yang-parser-api - ${project.version} - - - org.opendaylight.yangtools - yang-parser-impl - - ${project.version} - - - org.opendaylight.yangtools - yang-maven-plugin - ${project.version} - - - org.opendaylight.yangtools - yang-maven-plugin-spi - ${project.version} - junit junit @@ -166,3 +106,4 @@ + diff --git a/yang/pom.xml b/yang/pom.xml new file mode 100644 index 0000000000..36b21f9aa8 --- /dev/null +++ b/yang/pom.xml @@ -0,0 +1,139 @@ + + + + org.opendaylight.yangtools + yangtools + 0.5-SNAPSHOT + + + 4.0.0 + yang + 0.5.6-SNAPSHOT + pom + + + yang-binding + yang-common + yang-data-api + yang-data-util + yang-data-impl + yang-ext + yang-model-api + yang-maven-plugin + yang-maven-plugin-it + yang-maven-plugin-spi + yang-model-util + yang-parser-api + yang-parser-impl + + + + + + org.opendaylight.yangtools + yang-common + ${project.version} + + + org.opendaylight.yangtools + yang-data-api + ${project.version} + + + org.opendaylight.yangtools + yang-data-util + ${project.version} + + + org.opendaylight.yangtools + yang-model-api + ${project.version} + + + org.opendaylight.yangtools + yang-model-util + ${project.version} + + + org.opendaylight.yangtools + yang-binding + ${project.version} + + + org.opendaylight.yangtools + yang-parser-api + ${project.version} + + + org.opendaylight.yangtools + yang-parser-impl + + ${project.version} + + + org.opendaylight.yangtools + yang-maven-plugin + ${project.version} + + + org.opendaylight.yangtools + yang-maven-plugin-spi + ${project.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0 + true + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + maven + + + + + aggregate + + site + + + + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.4.0 + + Max + Low + site + + + + org.codehaus.mojo + jdepend-maven-plugin + 2.0-beta-2 + + + + + + diff --git a/src/site/site.xml b/yang/src/site/site.xml similarity index 100% rename from src/site/site.xml rename to yang/src/site/site.xml diff --git a/yang-binding/pom.xml b/yang/yang-binding/pom.xml similarity index 82% rename from yang-binding/pom.xml rename to yang/yang-binding/pom.xml index 0e11780204..bc13ac7210 100644 --- a/yang-binding/pom.xml +++ b/yang/yang-binding/pom.xml @@ -3,8 +3,8 @@ org.opendaylight.yangtools - yangtools - 0.5.5-SNAPSHOT + yang + 0.5.6-SNAPSHOT 4.0.0 diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java similarity index 100% rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentable.java diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java similarity index 100% rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Augmentation.java diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BaseIdentity.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BaseIdentity.java similarity index 100% rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BaseIdentity.java rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BaseIdentity.java diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java similarity index 100% rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataObject.java diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataRoot.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataRoot.java similarity index 100% rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataRoot.java rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/DataRoot.java diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java similarity index 100% rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Notification.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Notification.java similarity index 100% rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Notification.java rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Notification.java diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java similarity index 100% rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/NotificationListener.java diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/RpcService.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/RpcService.java similarity index 100% rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/RpcService.java rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/RpcService.java diff --git a/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java similarity index 100% rename from yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java rename to yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java diff --git a/yang-common/pom.xml b/yang/yang-common/pom.xml similarity index 85% rename from yang-common/pom.xml rename to yang/yang-common/pom.xml index 3db082c88d..0ce18ccd7c 100644 --- a/yang-common/pom.xml +++ b/yang/yang-common/pom.xml @@ -3,8 +3,8 @@ org.opendaylight.yangtools - yangtools - 0.5.5-SNAPSHOT + yang + 0.5.6-SNAPSHOT 4.0.0 diff --git a/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java similarity index 100% rename from yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java rename to yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java diff --git a/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java similarity index 100% rename from yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java rename to yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java diff --git a/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResult.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResult.java similarity index 100% rename from yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResult.java rename to yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResult.java diff --git a/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml similarity index 86% rename from yang-data-api/pom.xml rename to yang/yang-data-api/pom.xml index 7430189c8f..b6433b4c56 100644 --- a/yang-data-api/pom.xml +++ b/yang/yang-data-api/pom.xml @@ -3,8 +3,8 @@ org.opendaylight.yangtools - yangtools - 0.5.5-SNAPSHOT + yang + 0.5.6-SNAPSHOT 4.0.0 diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java similarity index 100% rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/CompositeNode.java diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/ModifyAction.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/ModifyAction.java similarity index 100% rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/ModifyAction.java rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/ModifyAction.java diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java similarity index 100% rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableCompositeNode.java diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java similarity index 100% rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableNode.java diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java similarity index 100% rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/MutableSimpleNode.java diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/Node.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/Node.java similarity index 100% rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/Node.java rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/Node.java diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModification.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModification.java similarity index 100% rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModification.java rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModification.java diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java similarity index 100% rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NodeModificationBuilder.java diff --git a/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java similarity index 100% rename from yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java rename to yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/SimpleNode.java diff --git a/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml similarity index 94% rename from yang-data-impl/pom.xml rename to yang/yang-data-impl/pom.xml index 0cab689384..afdf56381b 100644 --- a/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -3,8 +3,8 @@ org.opendaylight.yangtools - yangtools - 0.5.5-SNAPSHOT + yang + 0.5.6-SNAPSHOT 4.0.0 diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java similarity index 100% rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java similarity index 100% rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeModificationTOImpl.java diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java similarity index 100% rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/CompositeNodeTOImpl.java diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java similarity index 100% rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMap.java diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java similarity index 100% rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableCompositeNodeTOImpl.java diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java similarity index 100% rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/MutableSimpleNodeTOImpl.java diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java similarity index 100% rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeFactory.java diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java similarity index 100% rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImpl.java diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java similarity index 100% rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/NodeUtils.java diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java similarity index 100% rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeModificationTOImpl.java diff --git a/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java similarity index 100% rename from yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java rename to yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/IgnoreWhiteCharsDiffListener.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/IgnoreWhiteCharsDiffListener.java similarity index 100% rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/IgnoreWhiteCharsDiffListener.java rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/IgnoreWhiteCharsDiffListener.java diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java similarity index 100% rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/LazyNodeToNodeMapTest.java diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MemoryConsumption.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MemoryConsumption.java similarity index 100% rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MemoryConsumption.java rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MemoryConsumption.java diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java similarity index 100% rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/MyNodeBuilder.java diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java similarity index 100% rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeFactoryTest.java diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java similarity index 100% rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java similarity index 100% rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java diff --git a/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java similarity index 100% rename from yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeUtilsTest.java diff --git a/yang-data-impl/src/test/resources/MyXmlGenerator.groovy b/yang/yang-data-impl/src/test/resources/MyXmlGenerator.groovy similarity index 100% rename from yang-data-impl/src/test/resources/MyXmlGenerator.groovy rename to yang/yang-data-impl/src/test/resources/MyXmlGenerator.groovy diff --git a/yang-data-impl/src/test/resources/config01.xml b/yang/yang-data-impl/src/test/resources/config01.xml similarity index 100% rename from yang-data-impl/src/test/resources/config01.xml rename to yang/yang-data-impl/src/test/resources/config01.xml diff --git a/yang-data-impl/src/test/resources/config02.xml b/yang/yang-data-impl/src/test/resources/config02.xml similarity index 100% rename from yang-data-impl/src/test/resources/config02.xml rename to yang/yang-data-impl/src/test/resources/config02.xml diff --git a/yang-data-impl/src/test/resources/controller-network.xsd b/yang/yang-data-impl/src/test/resources/controller-network.xsd similarity index 100% rename from yang-data-impl/src/test/resources/controller-network.xsd rename to yang/yang-data-impl/src/test/resources/controller-network.xsd diff --git a/yang-data-impl/src/test/resources/controller-network.yang b/yang/yang-data-impl/src/test/resources/controller-network.yang similarity index 100% rename from yang-data-impl/src/test/resources/controller-network.yang rename to yang/yang-data-impl/src/test/resources/controller-network.yang diff --git a/yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.xsd b/yang/yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.xsd similarity index 100% rename from yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.xsd rename to yang/yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.xsd diff --git a/yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.yang b/yang/yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.yang similarity index 100% rename from yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.yang rename to yang/yang-data-impl/src/test/resources/ietf-inet-types@2010-09-24.yang diff --git a/yang-data-impl/src/test/resources/log4j-test.xml b/yang/yang-data-impl/src/test/resources/log4j-test.xml similarity index 100% rename from yang-data-impl/src/test/resources/log4j-test.xml rename to yang/yang-data-impl/src/test/resources/log4j-test.xml diff --git a/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02-shadow.xml b/yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02-shadow.xml similarity index 100% rename from yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02-shadow.xml rename to yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02-shadow.xml diff --git a/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02.groovy b/yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02.groovy similarity index 100% rename from yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02.groovy rename to yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02.groovy diff --git a/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02g-shadow.xml b/yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02g-shadow.xml similarity index 100% rename from yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02g-shadow.xml rename to yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/config02g-shadow.xml diff --git a/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/mutableNodesConfig.xml b/yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/mutableNodesConfig.xml similarity index 100% rename from yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/mutableNodesConfig.xml rename to yang/yang-data-impl/src/test/resources/org/opendaylight/yangtools/yang/data/impl/mutableNodesConfig.xml diff --git a/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml similarity index 86% rename from yang-data-util/pom.xml rename to yang/yang-data-util/pom.xml index c306d7eebd..7cd0d94458 100644 --- a/yang-data-util/pom.xml +++ b/yang/yang-data-util/pom.xml @@ -3,8 +3,8 @@ org.opendaylight.yangtools - yangtools - 0.5.5-SNAPSHOT + yang + 0.5.6-SNAPSHOT 4.0.0 diff --git a/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java similarity index 100% rename from yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java rename to yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractContainerNode.java diff --git a/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java similarity index 100% rename from yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java rename to yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractNode.java diff --git a/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java similarity index 100% rename from yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java rename to yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/Nodes.java diff --git a/yang-ext/pom.xml b/yang/yang-ext/pom.xml similarity index 95% rename from yang-ext/pom.xml rename to yang/yang-ext/pom.xml index 647efd79e2..8021be8d84 100644 --- a/yang-ext/pom.xml +++ b/yang/yang-ext/pom.xml @@ -3,8 +3,8 @@ org.opendaylight.yangtools - yangtools - 0.5.5-SNAPSHOT + yang + 0.5.6-SNAPSHOT 4.0.0 @@ -18,7 +18,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.5-SNAPSHOT + ${yang.version} @@ -74,7 +74,7 @@ yang-maven-plugin - [0.5.5,) + [0.5.6,) diff --git a/yang-ext/src/main/yang/yang-ext.yang b/yang/yang-ext/src/main/yang/yang-ext.yang similarity index 100% rename from yang-ext/src/main/yang/yang-ext.yang rename to yang/yang-ext/src/main/yang/yang-ext.yang diff --git a/yang-maven-plugin-it/.gitignore b/yang/yang-maven-plugin-it/.gitignore similarity index 100% rename from yang-maven-plugin-it/.gitignore rename to yang/yang-maven-plugin-it/.gitignore diff --git a/yang-maven-plugin-it/pom.xml b/yang/yang-maven-plugin-it/pom.xml similarity index 93% rename from yang-maven-plugin-it/pom.xml rename to yang/yang-maven-plugin-it/pom.xml index 85d6419aae..67727f7c98 100644 --- a/yang-maven-plugin-it/pom.xml +++ b/yang/yang-maven-plugin-it/pom.xml @@ -3,8 +3,8 @@ org.opendaylight.yangtools - yangtools - 0.5.5-SNAPSHOT + yang + 0.5.6-SNAPSHOT 4.0.0 diff --git a/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java b/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java similarity index 100% rename from yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java rename to yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java diff --git a/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml similarity index 93% rename from yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml rename to yang/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml index 0e54326fb2..d4ffd3739f 100644 --- a/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/AdditionalConfig/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.opendaylight.yangtools - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT @@ -19,7 +19,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT @@ -56,7 +56,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/Correct/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/Correct/pom.xml similarity index 91% rename from yang-maven-plugin-it/src/test/resources/Correct/pom.xml rename to yang/yang-maven-plugin-it/src/test/resources/Correct/pom.xml index ec4d1b34f0..9d33b13723 100644 --- a/yang-maven-plugin-it/src/test/resources/Correct/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/Correct/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.opendaylight.yangtools - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT @@ -19,7 +19,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT @@ -43,7 +43,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml similarity index 92% rename from yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml rename to yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml index 2eab92c864..8370846fdb 100644 --- a/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/pom.xml @@ -4,14 +4,14 @@ org.opendaylight.yangtools generator-test1 - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT org.opendaylight.yangtools yang-maven-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT @@ -35,7 +35,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile1.yang b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile1.yang similarity index 100% rename from yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile1.yang rename to yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile1.yang diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile2.yang b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile2.yang similarity index 100% rename from yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile2.yang rename to yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile2.yang diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile3.yang b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile3.yang similarity index 100% rename from yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile3.yang rename to yang/yang-maven-plugin-it/src/test/resources/GenerateTest1/src/main/resources/testfile3.yang diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml similarity index 90% rename from yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml rename to yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml index 0ab278048c..8a4077578b 100644 --- a/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opendaylight.yangtools - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT generator-test2 @@ -11,9 +11,9 @@ org.opendaylight.yangtools generator-test1 - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT system - ${project.basedir}/../GenerateTest1/target/generator-test1-0.5.5-SNAPSHOT.jar + ${project.basedir}/../GenerateTest1/target/generator-test1-0.5.6-SNAPSHOT.jar @@ -22,7 +22,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT @@ -49,7 +49,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/GenerateTest2/yang/private.yang b/yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/yang/private.yang similarity index 100% rename from yang-maven-plugin-it/src/test/resources/GenerateTest2/yang/private.yang rename to yang/yang-maven-plugin-it/src/test/resources/GenerateTest2/yang/private.yang diff --git a/yang-maven-plugin-it/src/test/resources/Generator/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/Generator/pom.xml similarity index 93% rename from yang-maven-plugin-it/src/test/resources/Generator/pom.xml rename to yang/yang-maven-plugin-it/src/test/resources/Generator/pom.xml index b66968cfc7..8ab82e6b67 100644 --- a/yang-maven-plugin-it/src/test/resources/Generator/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/Generator/pom.xml @@ -4,7 +4,7 @@ binding-generator org.opendaylight.yangtools - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test @@ -13,7 +13,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT @@ -40,7 +40,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml similarity index 94% rename from yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml rename to yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml index eba42be8d2..0a5ee371bf 100644 --- a/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/pom.xml @@ -3,16 +3,15 @@ 4.0.0 org.opendaylight.yangtools - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT generator-test2 - org.opendaylight.yangtools yang-maven-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT @@ -49,7 +48,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/MissingYangInDep/yang/private.yang b/yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/yang/private.yang similarity index 100% rename from yang-maven-plugin-it/src/test/resources/MissingYangInDep/yang/private.yang rename to yang/yang-maven-plugin-it/src/test/resources/MissingYangInDep/yang/private.yang diff --git a/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml similarity index 93% rename from yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml rename to yang/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml index 4df740d7df..0756c370e9 100644 --- a/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/NoGenerators/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opendaylight.yangtools - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test @@ -11,7 +11,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT @@ -39,7 +39,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml similarity index 92% rename from yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml rename to yang/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml index 96f1247c45..e080e73b52 100644 --- a/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/NoOutputDir/pom.xml @@ -4,14 +4,14 @@ org.opendaylight.yangtools test - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT org.opendaylight.yangtools yang-maven-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT @@ -35,7 +35,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml similarity index 92% rename from yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml rename to yang/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml index 150d2e830c..4bb875b1f2 100644 --- a/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/NoYangFiles/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opendaylight.yangtools - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test @@ -11,7 +11,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT @@ -38,7 +38,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml similarity index 94% rename from yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml rename to yang/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml index 0762f5c992..3b80af703a 100644 --- a/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/UnknownGenerator/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opendaylight.yangtools - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test @@ -12,7 +12,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT @@ -47,7 +47,7 @@ org.opendaylight.yangtools yang-maven-plugin-spi - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test-jar diff --git a/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml b/yang/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml similarity index 94% rename from yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml rename to yang/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml index 57368b077b..2b97b0c161 100644 --- a/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml +++ b/yang/yang-maven-plugin-it/src/test/resources/YangRootNotExist/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opendaylight.yangtools - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT test @@ -12,7 +12,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT diff --git a/yang-maven-plugin-it/src/test/resources/files/testfile1.yang b/yang/yang-maven-plugin-it/src/test/resources/files/testfile1.yang similarity index 100% rename from yang-maven-plugin-it/src/test/resources/files/testfile1.yang rename to yang/yang-maven-plugin-it/src/test/resources/files/testfile1.yang diff --git a/yang-maven-plugin-it/src/test/resources/files/testfile2.yang b/yang/yang-maven-plugin-it/src/test/resources/files/testfile2.yang similarity index 100% rename from yang-maven-plugin-it/src/test/resources/files/testfile2.yang rename to yang/yang-maven-plugin-it/src/test/resources/files/testfile2.yang diff --git a/yang-maven-plugin-it/src/test/resources/files/testfile3.yang b/yang/yang-maven-plugin-it/src/test/resources/files/testfile3.yang similarity index 100% rename from yang-maven-plugin-it/src/test/resources/files/testfile3.yang rename to yang/yang-maven-plugin-it/src/test/resources/files/testfile3.yang diff --git a/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml similarity index 94% rename from yang-maven-plugin-spi/pom.xml rename to yang/yang-maven-plugin-spi/pom.xml index db23337125..80a0e2f79f 100644 --- a/yang-maven-plugin-spi/pom.xml +++ b/yang/yang-maven-plugin-spi/pom.xml @@ -3,8 +3,8 @@ org.opendaylight.yangtools - yangtools - 0.5.5-SNAPSHOT + yang + 0.5.6-SNAPSHOT 4.0.0 diff --git a/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/CodeGenerator.java b/yang/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/CodeGenerator.java similarity index 100% rename from yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/CodeGenerator.java rename to yang/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/CodeGenerator.java diff --git a/yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java b/yang/yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java similarity index 100% rename from yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java rename to yang/yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java diff --git a/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml similarity index 97% rename from yang-maven-plugin/pom.xml rename to yang/yang-maven-plugin/pom.xml index 1ab0c91b77..687681dcb7 100644 --- a/yang-maven-plugin/pom.xml +++ b/yang/yang-maven-plugin/pom.xml @@ -3,8 +3,8 @@ org.opendaylight.yangtools - yangtools - 0.5.5-SNAPSHOT + yang + 0.5.6-SNAPSHOT 4.0.0 diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java similarity index 100% rename from yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java rename to yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java similarity index 100% rename from yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java rename to yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java similarity index 100% rename from yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java rename to yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java diff --git a/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java similarity index 100% rename from yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java rename to yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java diff --git a/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java similarity index 100% rename from yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java rename to yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java diff --git a/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java similarity index 100% rename from yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java rename to yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java diff --git a/yang-maven-plugin/src/test/resources/yang/mock.yang b/yang/yang-maven-plugin/src/test/resources/yang/mock.yang similarity index 100% rename from yang-maven-plugin/src/test/resources/yang/mock.yang rename to yang/yang-maven-plugin/src/test/resources/yang/mock.yang diff --git a/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml similarity index 86% rename from yang-model-api/pom.xml rename to yang/yang-model-api/pom.xml index d402534aab..3b05b73bdc 100644 --- a/yang-model-api/pom.xml +++ b/yang/yang-model-api/pom.xml @@ -3,8 +3,8 @@ org.opendaylight.yangtools - yangtools - 0.5.5-SNAPSHOT + yang + 0.5.6-SNAPSHOT 4.0.0 diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchema.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchema.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchema.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchema.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java diff --git a/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java similarity index 100% rename from yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java rename to yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java diff --git a/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml similarity index 86% rename from yang-model-util/pom.xml rename to yang/yang-model-util/pom.xml index f7edc4fafe..07fe859dce 100644 --- a/yang-model-util/pom.xml +++ b/yang/yang-model-util/pom.xml @@ -3,8 +3,8 @@ org.opendaylight.yangtools - yangtools - 0.5.5-SNAPSHOT + yang + 0.5.6-SNAPSHOT 4.0.0 diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSignedInteger.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseConstraints.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BinaryType.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BitsType.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BooleanType.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DataNodeIterator.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Decimal64.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EmptyType.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/IdentityrefType.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/InstanceIdentifier.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int32.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int64.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int8.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Leafref.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/RevisionAwareXPathImpl.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/StringType.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint16.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint32.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint64.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Uint8.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnionType.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnknownType.java diff --git a/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/YangTypesConverter.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/YangTypesConverter.java similarity index 100% rename from yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/YangTypesConverter.java rename to yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/YangTypesConverter.java diff --git a/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml similarity index 88% rename from yang-parser-api/pom.xml rename to yang/yang-parser-api/pom.xml index 221704d7cd..72ee1797e2 100644 --- a/yang-parser-api/pom.xml +++ b/yang/yang-parser-api/pom.xml @@ -3,8 +3,8 @@ org.opendaylight.yangtools - yangtools - 0.5.5-SNAPSHOT + yang + 0.5.6-SNAPSHOT 4.0.0 diff --git a/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangModelParser.java b/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangModelParser.java similarity index 100% rename from yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangModelParser.java rename to yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangModelParser.java diff --git a/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java b/yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java similarity index 100% rename from yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java rename to yang/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java diff --git a/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml similarity index 95% rename from yang-parser-impl/pom.xml rename to yang/yang-parser-impl/pom.xml index ef46888190..b8f2df1c1b 100644 --- a/yang-parser-impl/pom.xml +++ b/yang/yang-parser-impl/pom.xml @@ -3,8 +3,8 @@ org.opendaylight.yangtools - yangtools - 0.5.5-SNAPSHOT + yang + 0.5.6-SNAPSHOT 4.0.0 diff --git a/yang-parser-impl/src/main/antlr/YangLexer.g4 b/yang/yang-parser-impl/src/main/antlr/YangLexer.g4 similarity index 100% rename from yang-parser-impl/src/main/antlr/YangLexer.g4 rename to yang/yang-parser-impl/src/main/antlr/YangLexer.g4 diff --git a/yang-parser-impl/src/main/antlr/YangParser.g4 b/yang/yang-parser-impl/src/main/antlr/YangParser.g4 similarity index 100% rename from yang-parser-impl/src/main/antlr/YangParser.g4 rename to yang/yang-parser-impl/src/main/antlr/YangParser.g4 diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java similarity index 98% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java index b4d2fa7773..2cc67615c6 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java @@ -54,6 +54,8 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain private final Set usesNodes = new HashSet(); private boolean resolved; + private final static SchemaPath path = new SchemaPath(Collections. emptyList(), true); + AugmentationSchemaBuilderImpl(final String moduleName, final int line, final String augmentTargetStr) { super(moduleName, line, null); this.augmentTargetStr = augmentTargetStr; @@ -82,19 +84,16 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain usesNodes.add(usesBuilder); } - /** - * Always returns null. - */ @Override public SchemaPath getPath() { - return null; + return path; } @Override public AugmentationSchema build() { if (!built) { // process uses - for(UsesNodeBuilder use : usesNodes) { + for (UsesNodeBuilder use : usesNodes) { addedChildNodes.addAll(use.getTargetChildren()); addedUnknownNodes.addAll(use.getTargetUnknownNodes()); } diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangErrorListener.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangErrorListener.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangErrorListener.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangErrorListener.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java similarity index 99% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java index 5dfbe8bf60..98fdc57f71 100644 --- a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java @@ -806,11 +806,10 @@ public final class YangParserImpl implements YangModelParser { URI namespace = null; Date revision = null; String prefix = null; - if (parent instanceof ModuleBuilder) { - ModuleBuilder m = (ModuleBuilder) parent; - namespace = m.getNamespace(); - revision = m.getRevision(); - prefix = m.getPrefix(); + if (parent instanceof ModuleBuilder || parent instanceof AugmentationSchemaBuilder) { + namespace = module.getNamespace(); + revision = module.getRevision(); + prefix = module.getPrefix(); } else { QName parentQName = parent.getQName(); namespace = parentQName.getNamespace(); diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/MustDefinitionImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/MustDefinitionImpl.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/MustDefinitionImpl.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/MustDefinitionImpl.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineHolder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineHolder.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineHolder.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineHolder.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSort.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSort.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSort.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSort.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeUtils.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeUtils.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeUtils.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/UnknownBoundaryNumber.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/UnknownBoundaryNumber.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/UnknownBoundaryNumber.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/UnknownBoundaryNumber.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangParseException.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangParseException.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangParseException.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangParseException.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangValidationException.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangValidationException.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangValidationException.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangValidationException.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java diff --git a/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidator.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidator.java similarity index 100% rename from yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidator.java rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidator.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserNegativeTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserNegativeTest.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserNegativeTest.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserNegativeTest.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserSimpleTest.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java diff --git a/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java similarity index 100% rename from yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java diff --git a/yang-parser-impl/src/test/resources/context-augment-test/test1.yang b/yang/yang-parser-impl/src/test/resources/context-augment-test/test1.yang similarity index 100% rename from yang-parser-impl/src/test/resources/context-augment-test/test1.yang rename to yang/yang-parser-impl/src/test/resources/context-augment-test/test1.yang diff --git a/yang-parser-impl/src/test/resources/context-augment-test/test2.yang b/yang/yang-parser-impl/src/test/resources/context-augment-test/test2.yang similarity index 100% rename from yang-parser-impl/src/test/resources/context-augment-test/test2.yang rename to yang/yang-parser-impl/src/test/resources/context-augment-test/test2.yang diff --git a/yang-parser-impl/src/test/resources/context-augment-test/test3.yang b/yang/yang-parser-impl/src/test/resources/context-augment-test/test3.yang similarity index 100% rename from yang-parser-impl/src/test/resources/context-augment-test/test3.yang rename to yang/yang-parser-impl/src/test/resources/context-augment-test/test3.yang diff --git a/yang-parser-impl/src/test/resources/context-augment-test/test4.yang b/yang/yang-parser-impl/src/test/resources/context-augment-test/test4.yang similarity index 100% rename from yang-parser-impl/src/test/resources/context-augment-test/test4.yang rename to yang/yang-parser-impl/src/test/resources/context-augment-test/test4.yang diff --git a/yang-parser-impl/src/test/resources/context-test/deviation-test.yang b/yang/yang-parser-impl/src/test/resources/context-test/deviation-test.yang similarity index 100% rename from yang-parser-impl/src/test/resources/context-test/deviation-test.yang rename to yang/yang-parser-impl/src/test/resources/context-test/deviation-test.yang diff --git a/yang-parser-impl/src/test/resources/context-test/test1.yang b/yang/yang-parser-impl/src/test/resources/context-test/test1.yang similarity index 100% rename from yang-parser-impl/src/test/resources/context-test/test1.yang rename to yang/yang-parser-impl/src/test/resources/context-test/test1.yang diff --git a/yang-parser-impl/src/test/resources/context-test/test2.yang b/yang/yang-parser-impl/src/test/resources/context-test/test2.yang similarity index 100% rename from yang-parser-impl/src/test/resources/context-test/test2.yang rename to yang/yang-parser-impl/src/test/resources/context-test/test2.yang diff --git a/yang-parser-impl/src/test/resources/context-test/test3.yang b/yang/yang-parser-impl/src/test/resources/context-test/test3.yang similarity index 100% rename from yang-parser-impl/src/test/resources/context-test/test3.yang rename to yang/yang-parser-impl/src/test/resources/context-test/test3.yang diff --git a/yang-parser-impl/src/test/resources/model/custom.yang b/yang/yang-parser-impl/src/test/resources/model/custom.yang similarity index 100% rename from yang-parser-impl/src/test/resources/model/custom.yang rename to yang/yang-parser-impl/src/test/resources/model/custom.yang diff --git a/yang-parser-impl/src/test/resources/model/nodes.yang b/yang/yang-parser-impl/src/test/resources/model/nodes.yang similarity index 100% rename from yang-parser-impl/src/test/resources/model/nodes.yang rename to yang/yang-parser-impl/src/test/resources/model/nodes.yang diff --git a/yang-parser-impl/src/test/resources/model/types.yang b/yang/yang-parser-impl/src/test/resources/model/types.yang similarity index 100% rename from yang-parser-impl/src/test/resources/model/types.yang rename to yang/yang-parser-impl/src/test/resources/model/types.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment0.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment0.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment0.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment0.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment1.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment1.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment1.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment1.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment2.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment2.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment2.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment2.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-leaf.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-leaf.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-leaf.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-leaf.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-list.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-list.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-list.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container-list.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/container.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/container.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/identity.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/identity.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/identity.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/identity.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/duplicity/typedef.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/typedef.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/duplicity/typedef.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/typedef.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile0.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile0.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/testfile0.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile0.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile1.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile1.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/testfile1.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile1.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile2.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile2.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/testfile2.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile2.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile3.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile3.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/testfile3.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile3.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile4.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile4.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/testfile4.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile4.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile5.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile5.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/testfile5.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile5.yang diff --git a/yang-parser-impl/src/test/resources/negative-scenario/testfile6.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/testfile6.yang similarity index 100% rename from yang-parser-impl/src/test/resources/negative-scenario/testfile6.yang rename to yang/yang-parser-impl/src/test/resources/negative-scenario/testfile6.yang diff --git a/yang-parser-impl/src/test/resources/simple-test/cascade-uses.yang b/yang/yang-parser-impl/src/test/resources/simple-test/cascade-uses.yang similarity index 100% rename from yang-parser-impl/src/test/resources/simple-test/cascade-uses.yang rename to yang/yang-parser-impl/src/test/resources/simple-test/cascade-uses.yang diff --git a/yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang b/yang/yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang similarity index 100% rename from yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang rename to yang/yang-parser-impl/src/test/resources/simple-test/simple-nodes.yang diff --git a/yang-parser-impl/src/test/resources/types/custom-types-test@2012-4-4.yang b/yang/yang-parser-impl/src/test/resources/types/custom-types-test@2012-4-4.yang similarity index 100% rename from yang-parser-impl/src/test/resources/types/custom-types-test@2012-4-4.yang rename to yang/yang-parser-impl/src/test/resources/types/custom-types-test@2012-4-4.yang diff --git a/yang-parser-impl/src/test/resources/types/iana-afn-safi@2012-06-04.yang b/yang/yang-parser-impl/src/test/resources/types/iana-afn-safi@2012-06-04.yang similarity index 100% rename from yang-parser-impl/src/test/resources/types/iana-afn-safi@2012-06-04.yang rename to yang/yang-parser-impl/src/test/resources/types/iana-afn-safi@2012-06-04.yang diff --git a/yang-parser-impl/src/test/resources/types/iana-if-type@2012-06-05.yang b/yang/yang-parser-impl/src/test/resources/types/iana-if-type@2012-06-05.yang similarity index 100% rename from yang-parser-impl/src/test/resources/types/iana-if-type@2012-06-05.yang rename to yang/yang-parser-impl/src/test/resources/types/iana-if-type@2012-06-05.yang diff --git a/yang-parser-impl/src/test/resources/types/iana-timezones@2012-07-09.yang b/yang/yang-parser-impl/src/test/resources/types/iana-timezones@2012-07-09.yang similarity index 100% rename from yang-parser-impl/src/test/resources/types/iana-timezones@2012-07-09.yang rename to yang/yang-parser-impl/src/test/resources/types/iana-timezones@2012-07-09.yang diff --git a/yang-parser-impl/src/test/resources/types/ietf-inet-types@2010-09-24.yang b/yang/yang-parser-impl/src/test/resources/types/ietf-inet-types@2010-09-24.yang similarity index 100% rename from yang-parser-impl/src/test/resources/types/ietf-inet-types@2010-09-24.yang rename to yang/yang-parser-impl/src/test/resources/types/ietf-inet-types@2010-09-24.yang diff --git a/yang-parser-impl/src/test/resources/types/ietf-yang-types@2010-09-24.yang b/yang/yang-parser-impl/src/test/resources/types/ietf-yang-types@2010-09-24.yang similarity index 100% rename from yang-parser-impl/src/test/resources/types/ietf-yang-types@2010-09-24.yang rename to yang/yang-parser-impl/src/test/resources/types/ietf-yang-types@2010-09-24.yang -- 2.36.6