Replaced package names from org.opendaylight.controller to org.opendaylight.yangtools... 32/732/4
authorMartin Vitez <mvitez@cisco.com>
Mon, 29 Jul 2013 11:30:06 +0000 (13:30 +0200)
committerMartin Vitez <mvitez@cisco.com>
Mon, 29 Jul 2013 14:34:49 +0000 (16:34 +0200)
Change-Id: Ie07ccb5d41c37874a3c4551e7a584e3cf34caa51
Signed-off-by: Martin Vitez <mvitez@cisco.com>
177 files changed:
pom.xml
yang-binding/pom.xml
yang-common/pom.xml
yang-data-api/pom.xml
yang-data-impl/pom.xml
yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeModificationBuilderImpl.java
yang-data-impl/src/main/java/org/opendaylight/controller/yang/data/impl/NodeUtils.java
yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeHelper.java
yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeModificationBuilderImplTest.java
yang-data-impl/src/test/java/org/opendaylight/controller/yang/data/impl/NodeUtilsTest.java
yang-data-util/pom.xml
yang-ext/pom.xml
yang-maven-plugin-it/pom.xml
yang-maven-plugin-spi/pom.xml
yang-maven-plugin-spi/src/main/java/org/opendaylight/controller/yang2sources/spi/CodeGenerator.java
yang-maven-plugin-spi/src/test/java/org/opendaylight/controller/yang2sources/spi/CodeGeneratorTestImpl.java
yang-maven-plugin/pom.xml
yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/Util.java
yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesMojo.java
yang-maven-plugin/src/main/java/org/opendaylight/controller/yang2sources/plugin/YangToSourcesProcessor.java
yang-maven-plugin/src/test/java/org/opendaylight/controller/yang2sources/plugin/GenerateSourcesTest.java
yang-model-api/pom.xml
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/AnyXmlSchemaNode.java with 91% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchema.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/AugmentationSchema.java with 94% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/AugmentationTarget.java with 90% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ChoiceCaseNode.java with 88% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ChoiceNode.java with 96% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ConstraintDefinition.java with 88% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ConstraintMetaDefinition.java with 86% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ContainerSchemaNode.java with 91% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/DataNodeContainer.java with 93% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/DataSchemaNode.java with 93% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/Deviation.java with 93% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ExtensionDefinition.java with 94% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/FeatureDefinition.java with 89% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/GroupingDefinition.java with 92% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/IdentitySchemaNode.java with 92% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/LeafListSchemaNode.java with 91% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/LeafSchemaNode.java with 89% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ListSchemaNode.java with 92% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/Module.java with 93% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ModuleImport.java with 90% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/MustDefinition.java with 86% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/NotificationDefinition.java with 88% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/RevisionAwareXPath.java with 92% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/RpcDefinition.java with 93% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/SchemaContext.java with 93% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/SchemaNode.java with 91% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/SchemaPath.java with 93% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/Status.java with 91% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/TypeDefinition.java with 87% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/UnknownSchemaNode.java with 90% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/UsesNode.java with 93% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/package-info.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/package-info.java with 99% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/BinaryTypeDefinition.java with 89% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/BitsTypeDefinition.java with 80% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/BooleanTypeDefinition.java with 76% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/DecimalTypeDefinition.java with 88% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/EmptyTypeDefinition.java with 76% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/EnumTypeDefinition.java with 84% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/IdentityTypeDefinition.java with 80% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/IdentityrefTypeDefinition.java with 78% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/InstanceIdentifierTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/InstanceIdentifierTypeDefinition.java with 72% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/IntegerTypeDefinition.java with 91% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/LeafrefTypeDefinition.java with 70% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/LengthConstraint.java with 92% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/PatternConstraint.java with 76% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/RangeConstraint.java with 90% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/StringTypeDefinition.java with 80% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/UnionTypeDefinition.java with 79% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/UnknownTypeDefinition.java with 84% similarity]
yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java [moved from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/UnsignedIntegerTypeDefinition.java with 80% similarity]
yang-model-util/pom.xml
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractSignedInteger.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/AbstractUnsignedInteger.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BaseConstraints.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BaseTypes.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BinaryType.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BitsType.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/BooleanType.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/DataNodeIterator.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Decimal64.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/EmptyType.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/EnumerationType.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/ExtendedType.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/IdentityrefType.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/InstanceIdentifier.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int16.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int32.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int64.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Int8.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Leafref.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/RevisionAwareXPathImpl.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/SchemaContextUtil.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/StringType.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint16.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint32.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint64.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/Uint8.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/UnionType.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/UnknownType.java
yang-model-util/src/main/java/org/opendaylight/controller/yang/model/util/YangTypesConverter.java
yang-parser-api/pom.xml
yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangModelParser.java [moved from yang-parser-api/src/main/java/org/opendaylight/controller/yang/model/parser/api/YangModelParser.java with 94% similarity]
yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java [moved from yang-parser-api/src/main/java/org/opendaylight/controller/yang/model/parser/api/package-info.java with 84% similarity]
yang-parser-impl/pom.xml
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/AbstractBuilder.java with 88% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java with 92% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/AbstractSchemaNodeBuilder.java with 85% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/AbstractTypeAwareBuilder.java with 91% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationSchemaBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/AugmentationSchemaBuilder.java with 77% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AugmentationTargetBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/AugmentationTargetBuilder.java with 94% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/Builder.java with 92% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/DataNodeContainerBuilder.java with 90% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/DataSchemaNodeBuilder.java with 85% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/GroupingBuilder.java with 85% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/GroupingMember.java with 92% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/SchemaNodeBuilder.java with 83% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/TypeAwareBuilder.java with 88% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/TypeDefinitionBuilder.java with 71% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/UsesNodeBuilder.java with 80% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/AnyXmlBuilder.java with 92% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java with 90% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ChoiceBuilder.java with 92% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ChoiceCaseBuilder.java with 89% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ConstraintsBuilder.java with 94% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ContainerSchemaNodeBuilder.java with 92% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/DeviationBuilder.java with 90% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ExtensionBuilder.java with 92% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/FeatureBuilder.java with 91% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/GroupingBuilderImpl.java with 91% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/IdentitySchemaNodeBuilder.java with 92% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/IdentityrefTypeBuilder.java with 88% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/LeafListSchemaNodeBuilder.java with 93% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/LeafSchemaNodeBuilder.java with 93% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ListSchemaNodeBuilder.java with 92% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ModuleBuilder.java with 95% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/NotificationBuilder.java with 89% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/RpcDefinitionBuilder.java with 91% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/TypeDefinitionBuilderImpl.java with 88% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UnionTypeBuilder.java with 88% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UnknownSchemaNodeBuilder.java with 93% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java with 88% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/impl/SchemaContextImpl.java with 85% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangErrorListener.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/impl/YangErrorListener.java with 94% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/impl/YangParserImpl.java with 94% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/impl/YangParserListenerImpl.java with 95% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/BitImpl.java with 89% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/Comparators.java with 90% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/ModuleDependencySort.java with 95% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/MustDefinitionImpl.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/MustDefinitionImpl.java with 93% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/ParserListenerUtils.java with 97% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/ParserUtils.java with 91% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineHolder.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/RefineHolder.java with 96% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/RefineUtils.java with 90% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSort.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/TopologicalSort.java with 98% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/TypeConstraints.java with 98% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/UnknownBoundaryNumber.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/UnknownBoundaryNumber.java with 94% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangParseException.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/YangParseException.java with 95% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangValidationException.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/YangValidationException.java with 93% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/validator/BasicValidations.java with 98% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/validator/ValidationUtil.java with 94% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/validator/YangModelBasicValidationListener.java with 98% similarity]
yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidator.java [moved from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/validator/YangModelBasicValidator.java with 91% similarity]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java [moved from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/AugmentTest.java with 95% similarity]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java [moved from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/GroupingTest.java with 93% similarity]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java [moved from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/TestUtils.java with 91% similarity]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java [moved from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/TypesResolutionTest.java with 94% similarity]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserNegativeTest.java [moved from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/YangParserNegativeTest.java with 97% similarity]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java [moved from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/YangParserTest.java with 95% similarity]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java [moved from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/YangParserWithContextTest.java with 93% similarity]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java [moved from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/util/ModuleDependencySortTest.java with 93% similarity]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java [moved from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/util/TopologicalSortTest.java with 90% similarity]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java [moved from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/validator/YangModelValidationListTest.java with 97% similarity]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java [moved from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/validator/YangModelValidationModuleTest.java with 98% similarity]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java [moved from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/validator/YangModelValidationSubModuleTest.java with 95% similarity]
yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java [moved from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/validator/YangModelValidationTest.java with 97% similarity]

diff --git a/pom.xml b/pom.xml
index e9aa18fca6220134f2670f52fe5ee1232ebc806a..089fc274202043df9732a2349044b0f27ec41625 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>yang-parent</artifactId>
+    <artifactId>yangtools</artifactId>
     <groupId>org.opendaylight.yang</groupId>
     <version>0.5.4-SNAPSHOT</version>
     <packaging>pom</packaging>
index c8cc2af7150bfc758edeb2c9e7cfe920e451047c..a1fb6e3cec870d67a956401afef7f917c4abf14b 100644 (file)
@@ -3,7 +3,7 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yang</groupId>\r
-        <artifactId>yang-parent</artifactId>\r
+        <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
 \r
index 7f505861c3d325da15db4563b1a9cad0292ea120..d30e71be233ec8f3aef13a6668dbdbdf0dd7a1bd 100644 (file)
@@ -3,7 +3,7 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yang</groupId>\r
-        <artifactId>yang-parent</artifactId>\r
+        <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
 \r
index 833b51470f251b69ce1f956176ba818e13a78e18..7dafc26d1d1444911106c4ac5ddc25d7789eed50 100644 (file)
@@ -3,7 +3,7 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yang</groupId>\r
-        <artifactId>yang-parent</artifactId>\r
+        <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
 \r
index 0350a272a9feea2d07c49707e99f2449dd74a530..eb5a12c1476bcd8d02452936fc2a93f610d0f1cb 100644 (file)
@@ -3,7 +3,7 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yang</groupId>\r
-        <artifactId>yang-parent</artifactId>\r
+        <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
 \r
index 2ab2dd84b4e804778a53ff6678e95254c9451570..c9d39348a47ef4e8dd7c1210d54fec1917559631 100644 (file)
@@ -20,22 +20,22 @@ import org.opendaylight.controller.yang.data.api.MutableNode;
 import org.opendaylight.controller.yang.data.api.MutableSimpleNode;\r
 import org.opendaylight.controller.yang.data.api.Node;\r
 import org.opendaylight.controller.yang.data.api.NodeModificationBuilder;\r
-import org.opendaylight.controller.yang.model.api.ListSchemaNode;\r
-import org.opendaylight.controller.yang.model.api.SchemaContext;\r
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;\r
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;\r
 \r
 /**\r
  * @author michal.rehak\r
  *\r
  */\r
 public class NodeModificationBuilderImpl implements NodeModificationBuilder {\r
-    \r
+\r
     private SchemaContext context;\r
-    \r
+\r
     private Set<MutableNode<?>> changeLog;\r
     private LazyNodeToNodeMap originalToMutable;\r
 \r
     /**\r
-     * @param originalTreeRootNode \r
+     * @param originalTreeRootNode\r
      * @param context\r
      */\r
     public NodeModificationBuilderImpl(CompositeNode originalTreeRootNode, SchemaContext context) {\r
@@ -46,7 +46,7 @@ public class NodeModificationBuilderImpl implements NodeModificationBuilder {
 \r
     /**\r
      * @param modNode\r
-     * @param action \r
+     * @param action\r
      */\r
     private void addModificationToLog(MutableNode<?> modNode, ModifyAction action) {\r
         modNode.setModifyAction(action);\r
@@ -58,18 +58,18 @@ public class NodeModificationBuilderImpl implements NodeModificationBuilder {
         NodeUtils.fixParentRelation(newNode);\r
         addModificationToLog(newNode, ModifyAction.CREATE);\r
     }\r
-    \r
+\r
     @Override\r
     public void addNode(MutableCompositeNode newNode) {\r
         NodeUtils.fixParentRelation(newNode);\r
         addModificationToLog(newNode, ModifyAction.CREATE);\r
     }\r
-    \r
+\r
     @Override\r
     public void replaceNode(MutableSimpleNode<?> replacementNode) {\r
         addModificationToLog(replacementNode, ModifyAction.REPLACE);\r
     }\r
-    \r
+\r
     @Override\r
     public void replaceNode(MutableCompositeNode replacementNode) {\r
         addModificationToLog(replacementNode, ModifyAction.REPLACE);\r
@@ -79,7 +79,7 @@ public class NodeModificationBuilderImpl implements NodeModificationBuilder {
     public void deleteNode(MutableCompositeNode deadNode) {\r
         addModificationToLog(deadNode, ModifyAction.DELETE);\r
     }\r
-    \r
+\r
     @Override\r
     public void deleteNode(MutableSimpleNode<?> deadNode) {\r
         addModificationToLog(deadNode, ModifyAction.DELETE);\r
@@ -89,12 +89,12 @@ public class NodeModificationBuilderImpl implements NodeModificationBuilder {
     public void removeNode(MutableSimpleNode<?> deadNode) {\r
         addModificationToLog(deadNode, ModifyAction.REMOVE);\r
     }\r
-    \r
+\r
     @Override\r
     public void removeNode(MutableCompositeNode deadNode) {\r
         addModificationToLog(deadNode, ModifyAction.REMOVE);\r
     }\r
-    \r
+\r
     @Override\r
     public void mergeNode(MutableCompositeNode alteredNode) {\r
         addModificationToLog(alteredNode, ModifyAction.MERGE);\r
@@ -106,12 +106,12 @@ public class NodeModificationBuilderImpl implements NodeModificationBuilder {
     @Override\r
     public CompositeNode buildDiffTree() {\r
         Set<Node<?>> wanted = new HashSet<>();\r
-        \r
+\r
         // walk changeLog, collect all required nodes\r
         for (MutableNode<?> mutant : changeLog) {\r
             wanted.addAll(collectSelfAndAllParents(mutant));\r
         }\r
-        \r
+\r
         // walk wanted and add relevant keys\r
         Map<String, ListSchemaNode>  mapOfLists = NodeUtils.buildMapOfListNodes(context);\r
         for (Node<?> outlaw : wanted) {\r
@@ -132,7 +132,7 @@ public class NodeModificationBuilderImpl implements NodeModificationBuilder {
                 }\r
             }\r
         }\r
-        \r
+\r
         return originalToMutable.getMutableRoot();\r
     }\r
 \r
index 513cf06a68b43610f83823f58a3fa0ef5eff8510..39033523c127d2075cf3e9cd5df7654047c667b5 100644 (file)
@@ -30,10 +30,10 @@ import org.opendaylight.controller.yang.data.api.ModifyAction;
 import org.opendaylight.controller.yang.data.api.Node;\r
 import org.opendaylight.controller.yang.data.api.NodeModification;\r
 import org.opendaylight.controller.yang.data.api.SimpleNode;\r
-import org.opendaylight.controller.yang.model.api.DataNodeContainer;\r
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;\r
-import org.opendaylight.controller.yang.model.api.ListSchemaNode;\r
-import org.opendaylight.controller.yang.model.api.SchemaContext;\r
+import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;\r
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;\r
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;\r
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 import org.w3c.dom.Element;\r
@@ -47,14 +47,14 @@ import com.google.common.collect.Lists;
  *\r
  */\r
 public abstract class NodeUtils {\r
-    \r
+\r
     private static final Logger LOG = LoggerFactory.getLogger(NodeUtils.class);\r
-    \r
+\r
     /**\r
-     * \r
+     *\r
      */\r
     private static final String USER_KEY_NODE = "node";\r
-    \r
+\r
     /**\r
      * @param node\r
      * @return node path up till root node\r
@@ -66,14 +66,14 @@ public abstract class NodeUtils {
             breadCrumbs.insertElementAt(tmpNode.getNodeType().getLocalName(), 0);\r
             tmpNode = tmpNode.getParent();\r
         }\r
-        \r
+\r
         return Joiner.on(".").join(breadCrumbs);\r
     }\r
 \r
-    \r
+\r
     /**\r
      * @param treeRootNode\r
-     * @return dom tree, containing same node structure, yang nodes are associated \r
+     * @return dom tree, containing same node structure, yang nodes are associated\r
      * to dom nodes as user data\r
      */\r
     public static org.w3c.dom.Document buildShadowDomTree(CompositeNode treeRootNode) {
@@ -86,17 +86,17 @@ public abstract class NodeUtils {
             LOG.error("documentBuilder problem", e);\r
             return null;\r
         }\r
-        \r
-        \r
+\r
+\r
         Stack<SimpleEntry<org.w3c.dom.Node, Node<?>>> jobQueue = new Stack<>();\r
         jobQueue.push(new SimpleEntry<org.w3c.dom.Node, Node<?>>(doc, treeRootNode));\r
-        \r
+\r
         while (!jobQueue.isEmpty()) {\r
             SimpleEntry<org.w3c.dom.Node, Node<?>> job = jobQueue.pop();\r
             org.w3c.dom.Node jointPlace = job.getKey();\r
             Node<?> item = job.getValue();\r
             QName nodeType = item.getNodeType();\r
-            Element itemEl = doc.createElementNS(nodeType.getNamespace().toString(), \r
+            Element itemEl = doc.createElementNS(nodeType.getNamespace().toString(),\r
                     item.getNodeType().getLocalName());\r
             itemEl.setUserData(USER_KEY_NODE, item, null);\r
             if (item instanceof SimpleNode<?>) {\r
@@ -110,19 +110,19 @@ public abstract class NodeUtils {
                     itemEl.setAttribute("modifyAction", modificationAction.toString());\r
                 }\r
             }\r
-            \r
+\r
             jointPlace.appendChild(itemEl);\r
-            \r
+\r
             if (item instanceof CompositeNode) {\r
                 for (Node<?> child : ((CompositeNode) item).getChildren()) {\r
                     jobQueue.push(new SimpleEntry<org.w3c.dom.Node, Node<?>>(itemEl, child));\r
                 }\r
             }\r
         }\r
-        \r
+\r
         return doc;\r
     }\r
-    \r
+\r
     /**\r
      * @param doc\r
      * @param xpathEx\r
@@ -130,27 +130,27 @@ public abstract class NodeUtils {
      * @throws XPathExpressionException\r
      */\r
     @SuppressWarnings("unchecked")\r
-    public static <T> T findNodeByXpath(org.w3c.dom.Document doc, String xpathEx) \r
+    public static <T> T findNodeByXpath(org.w3c.dom.Document doc, String xpathEx)\r
             throws XPathExpressionException {\r
         T userNode = null;\r
         XPathFactory xPathfactory = XPathFactory.newInstance();\r
         XPath xpath = xPathfactory.newXPath();\r
         XPathExpression expr = xpath.compile(xpathEx);\r
-        \r
+\r
         org.w3c.dom.Node result = (org.w3c.dom.Node) expr.evaluate(doc, XPathConstants.NODE);\r
         if (result != null) {\r
             userNode = (T) result.getUserData(USER_KEY_NODE);\r
-        } \r
-        \r
+        }\r
+\r
         return userNode;\r
     }\r
 \r
 \r
     /**\r
      * build NodeMap, where key = qName; value = node\r
-     * \r
+     *\r
      * @param value\r
-     * @return map of children, where key = qName and value is list of children groupped by qName  \r
+     * @return map of children, where key = qName and value is list of children groupped by qName\r
      */\r
     public static Map<QName, List<Node<?>>> buildNodeMap(List<Node<?>> value) {\r
         Map<QName, List<Node<?>>> nodeMapTmp = new HashMap<>();\r
@@ -177,24 +177,24 @@ public abstract class NodeUtils {
     public static Map<String, ListSchemaNode> buildMapOfListNodes(\r
             SchemaContext context) {\r
         Map<String, ListSchemaNode> mapOfLists = new HashMap<>();\r
-        \r
+\r
         Stack<DataSchemaNode> jobQueue = new Stack<>();\r
         jobQueue.addAll(context.getDataDefinitions());\r
-        \r
+\r
         while (!jobQueue.isEmpty()) {\r
             DataSchemaNode dataSchema = jobQueue.pop();\r
             if (dataSchema instanceof ListSchemaNode) {\r
                 mapOfLists.put(schemaPathToPath(dataSchema.getPath().getPath()), (ListSchemaNode) dataSchema);\r
             }\r
-            \r
+\r
             if (dataSchema instanceof DataNodeContainer) {\r
                 jobQueue.addAll(((DataNodeContainer) dataSchema).getChildNodes());\r
             }\r
         }\r
-        \r
+\r
         return mapOfLists;\r
     }\r
-    \r
+\r
     /**\r
      * @param path\r
      * @return\r
@@ -219,7 +219,7 @@ public abstract class NodeUtils {
             }\r
         }\r
     }\r
-    \r
+\r
     /**\r
      * crawl all children of given node and assign it as their parent\r
      * @param parentNode\r
@@ -238,7 +238,7 @@ public abstract class NodeUtils {
     /**\r
      * @param keys\r
      * @param dataMap\r
-     * @return list of values of map, found by given keys \r
+     * @return list of values of map, found by given keys\r
      */\r
     public static <T, K> List<K> collectMapValues(List<T> keys,\r
             Map<T, K> dataMap) {\r
@@ -246,10 +246,10 @@ public abstract class NodeUtils {
         for (T key : keys) {\r
             valueSubList.add(dataMap.get(key));\r
         }\r
-        \r
+\r
         return valueSubList;\r
     }\r
-    \r
+\r
     /**\r
      * @param nodes\r
      * @return list of children in list of appropriate type\r
index a7e7d2f74cbddf91807a3fddcf400e4b0235298e..8fec8817fc1249bf15639ddc63a88af62250f5c9 100644 (file)
@@ -36,10 +36,10 @@ import org.junit.Assert;
 import org.opendaylight.controller.yang.common.QName;\r
 import org.opendaylight.controller.yang.data.api.CompositeNode;\r
 import org.opendaylight.controller.yang.data.api.Node;\r
-import org.opendaylight.controller.yang.model.api.Module;\r
-import org.opendaylight.controller.yang.model.api.SchemaContext;\r
-import org.opendaylight.controller.yang.model.parser.api.YangModelParser;\r
-import org.opendaylight.controller.yang.parser.impl.YangParserImpl;\r
+import org.opendaylight.yangtools.yang.model.api.Module;\r
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;\r
+import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser;\r
+import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 import org.w3c.dom.Document;\r
@@ -50,11 +50,11 @@ import org.xml.sax.SAXException;
  *\r
  */\r
 public abstract class NodeHelper {\r
-    \r
+\r
     private static final Logger LOG = LoggerFactory.getLogger(NodeHelper.class);\r
-    \r
+\r
     /** xml source of example network configuration */\r
-    public static final String NETWORK_XML = \r
+    public static final String NETWORK_XML =\r
       "<network xmlns=\"urn:opendaylight:controller:network\">\n" +\r
       //"<network>\n" +\r
       "    <topologies>\n" +\r
@@ -131,7 +131,7 @@ public abstract class NodeHelper {
     /**\r
      * @param domTree\r
      * @param out\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     public static void dumpDoc(Document domTree, PrintStream out) throws Exception {\r
       TransformerFactory transformerFact = TransformerFactory.newInstance();\r
@@ -145,156 +145,156 @@ public abstract class NodeHelper {
       String xmlString = result.getWriter().toString();\r
       out.println(xmlString);\r
     }\r
-    \r
+\r
     /**\r
      * @param qName\r
      * @return example tree, see {@link #NETWORK_XML}\r
      */\r
     public static CompositeNode buildTestConfigTree(QName qName) {\r
-        List<Node<?>> value = new ArrayList<Node<?>>(); \r
+        List<Node<?>> value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "element-id"), null, "ntElementId_09"));\r
         CompositeNode ntElementNode1 = NodeFactory.createImmutableCompositeNode(new QName(qName, "network-element"), null, value);\r
         assignParentToChildren(ntElementNode1);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "element-id"), null, "ntElementId_10"));\r
         CompositeNode ntElementNode2 = NodeFactory.createImmutableCompositeNode(new QName(qName, "network-element"), null, value);\r
         assignParentToChildren(ntElementNode2);\r
-        \r
+\r
         value = new ArrayList<Node<?>>();\r
         value.add(ntElementNode1);\r
         value.add(ntElementNode2);\r
         CompositeNode ntElementsNode = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "network-elements"), null, value);\r
         assignParentToChildren(ntElementsNode);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "dest-node"), null, "nodeId_07"));\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "dest-tp"), null, "tpId_08"));\r
         CompositeNode destination = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "destination"), null, value);\r
         assignParentToChildren(destination);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "source-node"), null, "nodeId_05"));\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "source-tp"), null, "tpId_06"));\r
         CompositeNode source = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "source"), null, value);\r
         assignParentToChildren(source);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "link-id"), null, "linkId_04"));\r
         value.add(source);\r
         value.add(destination);\r
         CompositeNode link1 = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "link"), null, value);\r
         assignParentToChildren(link1);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "dest-node"), null, "nodeId_14"));\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "dest-tp"), null, "tpId_15"));\r
         destination = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "destination"), null, value);\r
         assignParentToChildren(destination);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "source-node"), null, "nodeId_12"));\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "source-tp"), null, "tpId_13"));\r
         source = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "source"), null, value);\r
         assignParentToChildren(source);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "link-id"), null, "linkId_11"));\r
         value.add(source);\r
         value.add(destination);\r
         CompositeNode link2 = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "link"), null, value);\r
         assignParentToChildren(link2);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(link1);\r
         value.add(link2);\r
         CompositeNode links = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "links"), null, value);\r
         assignParentToChildren(links);\r
-        \r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "tp-id"), null, "tpId_03"));\r
         CompositeNode terminationPointNode1 = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "termination-point"), null, value);\r
         assignParentToChildren(terminationPointNode1);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(terminationPointNode1);\r
         CompositeNode terminationPointsNode = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "termination-points"), null, value);\r
         assignParentToChildren(terminationPointsNode);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "node-id"), null, "nodeId_02"));\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "supporting-ne"), null, "networkId_02"));\r
         value.add(terminationPointsNode);\r
         CompositeNode node1Node = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "node"), null, value);\r
         assignParentToChildren(node1Node);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "tp-id"), null, "tpId_18"));\r
         terminationPointNode1 = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "termination-point"), null, value);\r
         assignParentToChildren(terminationPointNode1);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(terminationPointNode1);\r
         terminationPointsNode = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "termination-points"), null, value);\r
         assignParentToChildren(terminationPointsNode);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "node-id"), null, "nodeId_16"));\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "supporting-ne"), null, "networkId_17"));\r
         value.add(terminationPointsNode);\r
         CompositeNode node2Node = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "node"), null, value);\r
         assignParentToChildren(node2Node);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "tp-id"), null, "tpId_18"));\r
         terminationPointNode1 = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "termination-point"), null, value);\r
         assignParentToChildren(terminationPointNode1);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "tp-id"), null, "tpId_19"));\r
         CompositeNode terminationPointNode2 = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "termination-point"), null, value);\r
         assignParentToChildren(terminationPointNode2);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(terminationPointNode1);\r
         value.add(terminationPointNode2);\r
         terminationPointsNode = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "termination-points"), null, value);\r
         assignParentToChildren(terminationPointsNode);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "node-id"), null, "nodeId_19"));\r
         value.add(NodeFactory.createImmutableSimpleNode(new QName(qName, "supporting-ne"), null, "networkId_20"));\r
         value.add(terminationPointsNode);\r
         CompositeNode node3Node = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "node"), null, value);\r
         assignParentToChildren(node3Node);\r
-        \r
-        value = new ArrayList<Node<?>>(); \r
+\r
+        value = new ArrayList<Node<?>>();\r
         value.add(node1Node);\r
         value.add(node2Node);\r
         value.add(node3Node);\r
         CompositeNode nodesNode = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "nodes"), null, value);\r
         assignParentToChildren(nodesNode);\r
-        \r
+\r
         value = new ArrayList<Node<?>>();\r
         value.add(links);\r
         value.add(nodesNode);\r
@@ -302,20 +302,20 @@ public abstract class NodeHelper {
         CompositeNode topology = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "topology"), null, value);\r
         assignParentToChildren(topology);\r
-        \r
+\r
         value = new ArrayList<Node<?>>();\r
         value.add(topology);\r
         CompositeNode topologies = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "topologies"), null, value);\r
         assignParentToChildren(topologies);\r
-        \r
+\r
         value = new ArrayList<Node<?>>();\r
         value.add(topologies);\r
         value.add(ntElementsNode);\r
         CompositeNode network = NodeFactory.createImmutableCompositeNode(\r
                 new QName(qName, "network"), null, value);\r
         assignParentToChildren(network);\r
-        \r
+\r
         return network;\r
     }\r
 \r
@@ -342,9 +342,9 @@ public abstract class NodeHelper {
                 .parseYangModelsFromStreams(yangInputStreams);\r
         return yParser.resolveSchemaContext(modules);\r
     }\r
-    \r
+\r
     /**\r
-     * @param scriptName \r
+     * @param scriptName\r
      * @return tree root\r
      * @throws Exception\r
      */\r
@@ -361,10 +361,10 @@ public abstract class NodeHelper {
        LOG.debug("xmlGen = " + xmlGen);\r
        Method getter = xmlGen.getClass().getDeclaredMethod("getBuilder", new Class[0]);\r
        MyNodeBuilder builder = (MyNodeBuilder) getter.invoke(xmlGen, new Object[0]);\r
-       \r
+\r
        return builder.getRootNode();\r
     }\r
-    \r
+\r
     /**\r
      * @param pattern , e.g.: <pre>"//{0}:network/{1}:xx[text() = 'sss']"</pre>\r
      * @param nsArg , e.g.: <pre>{"uri:ns1", "uri:ns2"}</pre>\r
@@ -379,14 +379,14 @@ public abstract class NodeHelper {
             // add ':' into pattern after placeholders\r
             patternNs = patternNs.replaceAll("(\\{[0-9]+\\})", "$1:");\r
         }\r
-        \r
+\r
         return MessageFormat.format(patternNs, ns);\r
     }\r
 \r
     /**\r
      * @param tree\r
-     * @param xmlFile \r
-     * @param clazz \r
+     * @param xmlFile\r
+     * @param clazz\r
      * @throws Exception\r
      * @throws SAXException\r
      * @throws IOException\r
@@ -396,11 +396,11 @@ public abstract class NodeHelper {
         ByteArrayOutputStream actualRaw = new ByteArrayOutputStream();\r
         dumpDoc(tree, new PrintStream(actualRaw));\r
         Reader actualReader = new InputStreamReader(new ByteArrayInputStream(actualRaw.toByteArray()));\r
-        \r
+\r
         Reader expectedReader = new InputStreamReader(clazz.getResourceAsStream(xmlFile));\r
         Diff myDiff = new Diff(expectedReader, actualReader);\r
         myDiff.overrideDifferenceListener(new IgnoreWhiteCharsDiffListener());\r
-        \r
+\r
         boolean similar = myDiff.similar();\r
         if (! similar) {\r
             System.out.println(new String(actualRaw.toByteArray()));\r
index 5f4e482bcac59783398388a915a174d223eacc1b..47c090cbd5fac207e93ea350ec64248535b7aa07 100644 (file)
@@ -20,17 +20,17 @@ import org.opendaylight.controller.yang.data.api.MutableCompositeNode;
 import org.opendaylight.controller.yang.data.api.MutableSimpleNode;\r
 import org.opendaylight.controller.yang.data.api.Node;\r
 import org.opendaylight.controller.yang.data.api.SimpleNode;\r
-import org.opendaylight.controller.yang.model.api.SchemaContext;\r
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 import org.w3c.dom.Document;\r
 \r
 /**\r
  * @author michal.rehak\r
- * \r
+ *\r
  */\r
 public class NodeModificationBuilderImplTest {\r
-    \r
+\r
     private static final Logger LOG = LoggerFactory\r
             .getLogger(NodeModificationBuilderImplTest.class);\r
 \r
@@ -47,14 +47,14 @@ public class NodeModificationBuilderImplTest {
     private void dumpResult() throws Exception {\r
         CompositeNode diffTree = nodeModificationBuilder.buildDiffTree();\r
         CompositeNode diffTreeImmutable = NodeFactory.copyDeepAsImmutable(diffTree, null);\r
-        \r
+\r
         Document diffShadow = NodeUtils.buildShadowDomTree(diffTreeImmutable);\r
         NodeHelper.dumpDoc(diffShadow, System.out);\r
     }\r
 \r
     /**\r
      * prepare schemaContext\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Before\r
     public void setUp() throws Exception {\r
@@ -62,10 +62,10 @@ public class NodeModificationBuilderImplTest {
 \r
         ns = "urn:opendaylight:controller:network";\r
         qName = new QName(\r
-                new URI(ns), \r
+                new URI(ns),\r
                 new Date(1369000800000L), "topos");\r
         network = NodeHelper.buildTestConfigTree(qName);\r
-        \r
+\r
         nodeModificationBuilder = new NodeModificationBuilderImpl(network, schemaCtx);\r
     }\r
 \r
@@ -76,13 +76,13 @@ public class NodeModificationBuilderImplTest {
      */\r
     @Test\r
     public void testGetMutableEquivalent() {\r
-        MutableCompositeNode rootMutable = (MutableCompositeNode) \r
+        MutableCompositeNode rootMutable = (MutableCompositeNode)\r
                 nodeModificationBuilder.getMutableEquivalent(network);\r
-        \r
+\r
         CompositeNode topologies = network.getCompositesByName("topologies").iterator().next();\r
         Node<?> mutableEquivalent = nodeModificationBuilder.getMutableEquivalent(topologies);\r
         CompositeNode topologiesMutable = rootMutable.getCompositesByName("topologies").iterator().next();\r
-        \r
+\r
         Assert.assertSame(topologiesMutable, mutableEquivalent);\r
     }\r
 \r
@@ -90,52 +90,52 @@ public class NodeModificationBuilderImplTest {
      * Test method for\r
      * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}\r
      * .\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testBuildDiffTreeAddSimple() throws Exception {\r
         LOG.debug("testBuildDiffTreeAddSimple");\r
         Document networkShadow = NodeUtils.buildShadowDomTree(network);\r
-        CompositeNode needle = NodeUtils.findNodeByXpath(networkShadow, \r
+        CompositeNode needle = NodeUtils.findNodeByXpath(networkShadow,\r
                 NodeHelper.AddNamespaceToPattern(\r
                 "//{0}node[{0}node-id='nodeId_19']//{0}termination-point[2]", ns));\r
-        \r
-        MutableCompositeNode mutableParent = (MutableCompositeNode) \r
+\r
+        MutableCompositeNode mutableParent = (MutableCompositeNode)\r
                 nodeModificationBuilder.getMutableEquivalent(needle);\r
-        \r
+\r
         MutableSimpleNode<String> newMutable = NodeFactory.createMutableSimpleNode(\r
                 new QName(needle.getNodeType(), "anySubNode"), mutableParent, "42", null, null);\r
-        \r
+\r
         nodeModificationBuilder.addNode(newMutable);\r
         dumpResult();\r
     }\r
-    \r
+\r
     /**\r
      * Test method for\r
      * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}\r
      * .\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testBuildDiffTreeAddComposite() throws Exception {\r
         LOG.debug("testBuildDiffTreeAddComposite");\r
         Document networkShadow = NodeUtils.buildShadowDomTree(network);\r
-        CompositeNode needle = NodeUtils.findNodeByXpath(networkShadow, \r
+        CompositeNode needle = NodeUtils.findNodeByXpath(networkShadow,\r
                 NodeHelper.AddNamespaceToPattern(\r
                 "//{0}node[{0}node-id='nodeId_19']//{0}termination-point[2]", ns));\r
-        \r
-        MutableCompositeNode mutableParent = (MutableCompositeNode) \r
+\r
+        MutableCompositeNode mutableParent = (MutableCompositeNode)\r
                 nodeModificationBuilder.getMutableEquivalent(needle);\r
-        \r
+\r
         MutableSimpleNode<String> newMutable = NodeFactory.createMutableSimpleNode(\r
                 new QName(needle.getNodeType(), "anySubNode"), null, "42", null, null);\r
-        \r
+\r
         MutableCompositeNode newMutableCom = NodeFactory.createMutableCompositeNode(\r
-                new QName(needle.getNodeType(), "anySubNode"), mutableParent, \r
+                new QName(needle.getNodeType(), "anySubNode"), mutableParent,\r
                 NodeUtils.buildChildrenList(newMutable), null, null);\r
         NodeUtils.fixChildrenRelation(newMutableCom);\r
         newMutableCom.init();\r
-        \r
+\r
         nodeModificationBuilder.addNode(newMutableCom);\r
         dumpResult();\r
     }\r
@@ -144,20 +144,20 @@ public class NodeModificationBuilderImplTest {
      * Test method for\r
      * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}\r
      * .\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testBuildDiffTreeDeleteComposite() throws Exception {\r
         LOG.debug("testBuildDiffTreeDeleteComposite");\r
         Document networkShadow = NodeUtils.buildShadowDomTree(network);\r
-        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow, \r
+        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow,\r
                 NodeHelper.AddNamespaceToPattern(\r
                 "//{0}node[{0}node-id='nodeId_19']//{0}termination-point[2]/{0}tp-id", ns));\r
 \r
         @SuppressWarnings("unchecked")\r
-        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>) \r
+        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>)\r
                 nodeModificationBuilder.getMutableEquivalent(needle);\r
-        \r
+\r
         nodeModificationBuilder.deleteNode(mutableNeedle.getParent().asMutable());\r
         dumpResult();\r
     }\r
@@ -166,20 +166,20 @@ public class NodeModificationBuilderImplTest {
      * Test method for\r
      * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}\r
      * .\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testBuildDiffTreeDeleteSimple() throws Exception {\r
         LOG.debug("testBuildDiffTreeDeleteSimple");\r
         Document networkShadow = NodeUtils.buildShadowDomTree(network);\r
-        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow, \r
+        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow,\r
                 NodeHelper.AddNamespaceToPattern(\r
                 "//{0}node[{0}node-id='nodeId_19']//{0}termination-point[2]/{0}tp-id", ns));\r
-        \r
+\r
         @SuppressWarnings("unchecked")\r
-        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>) \r
+        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>)\r
                 nodeModificationBuilder.getMutableEquivalent(needle);\r
-        \r
+\r
         nodeModificationBuilder.deleteNode(mutableNeedle);\r
         dumpResult();\r
     }\r
@@ -188,20 +188,20 @@ public class NodeModificationBuilderImplTest {
      * Test method for\r
      * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}\r
      * .\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testBuildDiffTreeMerge() throws Exception {\r
         LOG.debug("testBuildDiffTreeMerge");\r
         Document networkShadow = NodeUtils.buildShadowDomTree(network);\r
-        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow, \r
+        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow,\r
                 NodeHelper.AddNamespaceToPattern(\r
                 "//{0}node[{0}node-id='nodeId_19']//{0}termination-point[2]/{0}tp-id", ns));\r
-        \r
+\r
         @SuppressWarnings("unchecked")\r
-        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>) \r
+        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>)\r
                 nodeModificationBuilder.getMutableEquivalent(needle);\r
-        \r
+\r
         mutableNeedle.setValue("tpId_18x");\r
         nodeModificationBuilder.mergeNode(mutableNeedle.getParent().asMutable());\r
         dumpResult();\r
@@ -211,20 +211,20 @@ public class NodeModificationBuilderImplTest {
      * Test method for\r
      * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}\r
      * .\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testBuildDiffTreeRemoveComposite() throws Exception {\r
         LOG.debug("testBuildDiffTreeRemoveComposite");\r
         Document networkShadow = NodeUtils.buildShadowDomTree(network);\r
-        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow, \r
+        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow,\r
                 NodeHelper.AddNamespaceToPattern(\r
                 "//{0}node[{0}node-id='nodeId_19']//{0}termination-point[2]/{0}tp-id", ns));\r
-        \r
+\r
         @SuppressWarnings("unchecked")\r
-        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>) \r
+        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>)\r
                 nodeModificationBuilder.getMutableEquivalent(needle);\r
-        \r
+\r
         nodeModificationBuilder.removeNode(mutableNeedle.getParent().asMutable());\r
         dumpResult();\r
     }\r
@@ -233,20 +233,20 @@ public class NodeModificationBuilderImplTest {
      * Test method for\r
      * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}\r
      * .\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testBuildDiffTreeRemoveSimple() throws Exception {\r
         LOG.debug("testBuildDiffTreeRemoveSimple");\r
         Document networkShadow = NodeUtils.buildShadowDomTree(network);\r
-        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow, \r
+        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow,\r
                 NodeHelper.AddNamespaceToPattern(\r
                 "//{0}node[{0}node-id='nodeId_19']//{0}termination-point[2]/{0}tp-id", ns));\r
-        \r
+\r
         @SuppressWarnings("unchecked")\r
-        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>) \r
+        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>)\r
                 nodeModificationBuilder.getMutableEquivalent(needle);\r
-        \r
+\r
         nodeModificationBuilder.removeNode(mutableNeedle);\r
         dumpResult();\r
     }\r
@@ -255,20 +255,20 @@ public class NodeModificationBuilderImplTest {
      * Test method for\r
      * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}\r
      * .\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testBuildDiffTreeReplaceComposite() throws Exception {\r
         LOG.debug("testBuildDiffTreeReplaceComposite");\r
         Document networkShadow = NodeUtils.buildShadowDomTree(network);\r
-        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow, \r
+        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow,\r
                 NodeHelper.AddNamespaceToPattern(\r
                 "//{0}node[{0}node-id='nodeId_19']//{0}termination-point[2]/{0}tp-id", ns));\r
-        \r
+\r
         @SuppressWarnings("unchecked")\r
-        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>) \r
+        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>)\r
                 nodeModificationBuilder.getMutableEquivalent(needle);\r
-        \r
+\r
         mutableNeedle.setValue("tpId_18x");\r
         nodeModificationBuilder.replaceNode(mutableNeedle.getParent().asMutable());\r
         dumpResult();\r
@@ -278,20 +278,20 @@ public class NodeModificationBuilderImplTest {
      * Test method for\r
      * {@link org.opendaylight.controller.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}\r
      * .\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testBuildDiffTreeReplaceSimple() throws Exception {\r
         LOG.debug("testBuildDiffTreeReplaceSimple");\r
         Document networkShadow = NodeUtils.buildShadowDomTree(network);\r
-        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow, \r
+        SimpleNode<?> needle = NodeUtils.findNodeByXpath(networkShadow,\r
                 NodeHelper.AddNamespaceToPattern(\r
                 "//{0}node[{0}node-id='nodeId_19']//{0}termination-point[2]/{0}tp-id", ns));\r
-        \r
+\r
         @SuppressWarnings("unchecked")\r
-        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>) \r
+        MutableSimpleNode<String> mutableNeedle = (MutableSimpleNode<String>)\r
                 nodeModificationBuilder.getMutableEquivalent(needle);\r
-        \r
+\r
         mutableNeedle.setValue("tpId_18x");\r
         nodeModificationBuilder.replaceNode(mutableNeedle);\r
         dumpResult();\r
index 16d736a35fb6073564a4828df3c23763fcde2a78..ab4b6bf645d38ca46583433a635d0b5fcb671b71 100644 (file)
@@ -21,8 +21,8 @@ import org.opendaylight.controller.yang.common.QName;
 import org.opendaylight.controller.yang.data.api.CompositeNode;\r
 import org.opendaylight.controller.yang.data.api.Node;\r
 import org.opendaylight.controller.yang.data.api.SimpleNode;\r
-import org.opendaylight.controller.yang.model.api.ListSchemaNode;\r
-import org.opendaylight.controller.yang.model.api.SchemaContext;\r
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;\r
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 import org.w3c.dom.Document;\r
@@ -32,10 +32,10 @@ import org.w3c.dom.Document;
  *\r
  */\r
 public class NodeUtilsTest {\r
-    \r
+\r
     private static final Logger LOG = LoggerFactory\r
             .getLogger(NodeUtilsTest.class);\r
-    \r
+\r
     private QName qName;\r
     private CompositeNode network;\r
 \r
@@ -49,14 +49,14 @@ public class NodeUtilsTest {
     public void setUp() throws Exception {\r
         ns = "urn:ietf:params:xml:ns:netconf:base:1.0";\r
         qName = new QName(\r
-                new URI(ns), \r
+                new URI(ns),\r
                 new Date(42), "yang-data-impl-mutableTest");\r
         network = NodeHelper.buildTestConfigTree(qName);\r
     }\r
 \r
     /**\r
      * Test method for {@link org.opendaylight.controller.yang.data.impl.NodeUtils#buildPath(org.opendaylight.controller.yang.data.api.Node)}.\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testBuildPath() throws Exception {\r
@@ -64,45 +64,45 @@ public class NodeUtilsTest {
             .getCompositesByName("topology").iterator().next()\r
             .getSimpleNodesByName("topology-id").iterator().next();\r
         String breadCrumbs = NodeUtils.buildPath(needle);\r
-        \r
+\r
         Assert.assertEquals("network.topologies.topology.topology-id", breadCrumbs);\r
     }\r
 \r
     /**\r
      * Test method for {@link org.opendaylight.controller.yang.data.impl.NodeUtils#buildShadowDomTree(org.opendaylight.controller.yang.data.api.CompositeNode)}.\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testBuildShadowDomTree() throws Exception {\r
         MemoryConsumption mc = new MemoryConsumption();\r
         mc.startObserving();\r
-        \r
+\r
         Document networkShadow = NodeUtils.buildShadowDomTree(network);\r
-        \r
+\r
         LOG.debug("After dom built: "+mc.finishObserving());\r
         NodeHelper.compareXmlTree(networkShadow, "./config02-shadow.xml", getClass());\r
     }\r
 \r
     /**\r
      * Test method for {@link org.opendaylight.controller.yang.data.impl.NodeUtils#findNodeByXpath(org.w3c.dom.Document, java.lang.String)}.\r
-     * @throws Exception \r
+     * @throws Exception\r
      */\r
     @Test\r
     public void testFindNodeByXpath() throws Exception {\r
         Document networkShadow = NodeUtils.buildShadowDomTree(network);\r
         MemoryConsumption mc = new MemoryConsumption();\r
         mc.startObserving();\r
-        \r
-        SimpleNode<String> needle = NodeUtils.findNodeByXpath(networkShadow, \r
+\r
+        SimpleNode<String> needle = NodeUtils.findNodeByXpath(networkShadow,\r
                 NodeHelper.AddNamespaceToPattern(\r
                         "//{0}node[{0}node-id='nodeId_19']//{0}termination-point[2]/{0}tp-id", ns));\r
-        \r
+\r
         LOG.debug("After xpath executed: "+mc.finishObserving());\r
-        \r
+\r
         Assert.assertNotNull(needle);\r
         Assert.assertEquals("tpId_18", needle.getValue());\r
     }\r
-    \r
+\r
     /**\r
      * Test method for {@link org.opendaylight.controller.yang.data.impl.NodeUtils#buildNodeMap(java.util.List)}.\r
      */\r
@@ -110,11 +110,11 @@ public class NodeUtilsTest {
     public void testBuildNodeMap() {\r
         CompositeNode topology = network.getCompositesByName("topologies").iterator().next()\r
             .getCompositesByName("topology").iterator().next();\r
-        \r
+\r
         Map<QName, List<Node<?>>> nodeMap = NodeUtils.buildNodeMap(topology.getChildren());\r
         Assert.assertEquals(3, nodeMap.size());\r
     }\r
-    \r
+\r
     /**\r
      * Test method for {@link org.opendaylight.controller.yang.data.impl.NodeUtils#buildMapOfListNodes(org.opendaylight.controller.yang.model.api.SchemaContext)}.\r
      */\r
@@ -127,8 +127,8 @@ public class NodeUtilsTest {
 \r
     /**\r
      * Test method for {@link org.opendaylight.controller.yang.data.impl.NodeUtils#buildMapOfListNodes(org.opendaylight.controller.yang.model.api.SchemaContext)}.\r
-     * @throws Exception \r
-     * @throws IOException \r
+     * @throws Exception\r
+     * @throws IOException\r
      */\r
     @Test\r
     public void testLoadConfigByGroovy() throws IOException, Exception {\r
@@ -140,26 +140,26 @@ public class NodeUtilsTest {
             LOG.error(e.getMessage());\r
             throw e;\r
         }\r
-       \r
+\r
        NodeHelper.compareXmlTree(shadowTree, "./config02g-shadow.xml", getClass());\r
     }\r
 \r
     private static void checkFamilyBinding(CompositeNode treeRoot) throws Exception {\r
         Stack<CompositeNode> jobQueue = new Stack<>();\r
         jobQueue.push(treeRoot);\r
-        \r
+\r
         while (!jobQueue.isEmpty()) {\r
             CompositeNode job = jobQueue.pop();\r
             for (Node<?> child : job.getChildren()) {\r
                 if (child instanceof CompositeNode) {\r
                     jobQueue.push((CompositeNode) child);\r
                 }\r
-                \r
+\r
                 if (job != child.getParent()) {\r
                     throw new Exception("binding mismatch occured: \nPARENT["+job+"]\n CHILD[" + child+"]\n  +->  "+child.getParent());\r
                 }\r
             }\r
         }\r
     }\r
-    \r
+\r
 }\r
index e85bb5e13408799c7ab897709aac71b868e29df2..c4e0c53a335bebeb104f70cf3fdd8cf325cf2633 100644 (file)
@@ -3,7 +3,7 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yang</groupId>\r
-        <artifactId>yang-parent</artifactId>\r
+        <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
 \r
index 4b1dc23979544c1993f9a5b8c62372f150b273a1..1becb19ba1692558d9778ce8fa3614bfeb9901af 100644 (file)
@@ -3,7 +3,7 @@
 
     <parent>
         <groupId>org.opendaylight.yang</groupId>
-        <artifactId>yang-parent</artifactId>
+        <artifactId>yangtools</artifactId>
         <version>0.5.4-SNAPSHOT</version>
     </parent>
 
index 7fe0b7615958ad58eda5c70699b0c3339ee518e4..5210553cced5f9568bca381651d5a1ec0b563a32 100644 (file)
@@ -3,7 +3,7 @@
 
     <parent>
         <groupId>org.opendaylight.yang</groupId>
-        <artifactId>yang-parent</artifactId>
+        <artifactId>yangtools</artifactId>
         <version>0.5.4-SNAPSHOT</version>
     </parent>
 
index 8d96bc20c5a0c36cff3f45e4cfbec789ebe7929b..8d6ddb95089112d5b76dfbae5ae677b919c6502c 100644 (file)
@@ -3,7 +3,7 @@
 
     <parent>
         <groupId>org.opendaylight.yang</groupId>
-        <artifactId>yang-parent</artifactId>
+        <artifactId>yangtools</artifactId>
         <version>0.5.4-SNAPSHOT</version>
     </parent>
 
index 3042160a2a3178e523b485b3bcddd470db6f6589..c454a262c43db8650e8bf4b4c7b710877e8295ed 100644 (file)
@@ -15,8 +15,8 @@ import java.util.Set;
 
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 /**
  * Classes implementing this interface can be submitted to maven-yang-plugin's
index 3103042f9970c4d2d24ab606f709322f8daa85e4..82fb1d213c50ec2a68340ea04e68f686d7cb5cf5 100644 (file)
@@ -14,8 +14,8 @@ import java.util.Set;
 
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 public class CodeGeneratorTestImpl implements CodeGenerator {
 
index 2c1787f1ac829900bbbe1f0f3329ed84b04a3a24..abb5eeff1c01f4d8851245f0bdb54c141221101c 100644 (file)
@@ -3,7 +3,7 @@
 
     <parent>
         <groupId>org.opendaylight.yang</groupId>
-        <artifactId>yang-parent</artifactId>
+        <artifactId>yangtools</artifactId>
         <version>0.5.4-SNAPSHOT</version>
     </parent>
 
index e3b0b31215bef2a6deac7457d152d19ec81d1115..ce7929f930364f0a3d8bc02c731b3205ccc4b25d 100644 (file)
@@ -28,8 +28,8 @@ import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
index 6e43b306cd44d82b1cdcaa32b5b54c976fc41a71..27fb6b836f677b6df50d9ddd562173c84128fad7 100644 (file)
@@ -20,9 +20,9 @@ import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
 import org.opendaylight.controller.yang2sources.plugin.ConfigArg.CodeGeneratorArg;
 import org.opendaylight.controller.yang2sources.spi.CodeGenerator;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 import com.google.common.annotations.VisibleForTesting;
 
index b781d72311e19a8a9372ce49c64fa9e254ef9827..39770788c308cf8081b0115049c8d86758cd088d 100644 (file)
@@ -25,13 +25,13 @@ import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.FileUtils;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
-import org.opendaylight.controller.yang.parser.impl.YangParserImpl;
 import org.opendaylight.controller.yang2sources.plugin.ConfigArg.CodeGeneratorArg;
 import org.opendaylight.controller.yang2sources.plugin.Util.ContextHolder;
 import org.opendaylight.controller.yang2sources.plugin.Util.YangsInZipsResult;
 import org.opendaylight.controller.yang2sources.spi.CodeGenerator;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
index 14e9d34b2aeec672c4f3ff15b26ec2a57b8bd5d0..5c3155e32b6b5f794b8161645f3ec6d14d8da7bb 100644 (file)
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.controller.yang2sources.plugin;
 
-import static org.hamcrest.core.Is.*;
+import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.*;
-import static org.junit.matchers.JUnitMatchers.*;
-import static org.mockito.Matchers.*;
+import static org.junit.matchers.JUnitMatchers.containsString;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import java.io.File;
@@ -26,11 +26,11 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
 import org.opendaylight.controller.yang2sources.plugin.ConfigArg.CodeGeneratorArg;
 import org.opendaylight.controller.yang2sources.plugin.YangToSourcesProcessor.YangProvider;
 import org.opendaylight.controller.yang2sources.spi.CodeGenerator;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 import com.google.common.collect.Lists;
 
index 8ec56d77572281a4c57ff57e2e4f7c42346eb8a9..ed86c2859820a397204089f49bfbdbbedabc22e5 100644 (file)
@@ -3,7 +3,7 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yang</groupId>\r
-        <artifactId>yang-parent</artifactId>\r
+        <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
 \r
similarity index 91%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/AnyXmlSchemaNode.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AnyXmlSchemaNode.java
index 02aaf9ca4a6d189cbbf3a026df8b4465a6a541ba..0e03b23b87333aea405cca602d8b2fdfd27d920d 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 /**\r
  * The "anyxml" interface defines an interior node in the schema tree. It takes\r
@@ -16,8 +16,8 @@ package org.opendaylight.controller.yang.model.api;
  * This interface was modeled according to definition in <a\r
  * href="https://tools.ietf.org/html/rfc6020#section-7.10">[RFC-6020] The anyxml\r
  * Statement</a>\r
- * \r
- * \r
+ *\r
+ *\r
  */\r
 public interface AnyXmlSchemaNode extends DataSchemaNode {\r
 \r
similarity index 94%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/AugmentationSchema.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchema.java
index ae0f72cfe8538b6b294b0a4c5ebaf011a8c84bb4..22b952ce3667583fa9001918ce32822b1b9c58d8 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 import java.util.List;\r
 \r
similarity index 90%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/AugmentationTarget.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationTarget.java
index 7e29c6210d93ad475c2e3d58f8ab2dd524e030e3..0d6aaf92579b9a387df711de801b5405978dcb0d 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 import java.util.Set;\r
 \r
similarity index 88%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ChoiceCaseNode.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceCaseNode.java
index 2421e122088ef59fd1c3aed1f9171969d810ade8..5017c1d7c1027c055df41aa60c7df9c6d2627616 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 /**\r
  * The ChoiceCaseNode interface is used to define branches of the ChoiceNode.\r
similarity index 96%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ChoiceNode.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ChoiceNode.java
index 140ef84c6c04f9b35a1f6d79d81f944c9355f891..a411580c22f1daa93a169f3412d8d9895b23d3dd 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api;
+package org.opendaylight.yangtools.yang.model.api;
 
 import org.opendaylight.controller.yang.common.QName;
 
similarity index 88%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ConstraintDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintDefinition.java
index a48e6afdef936988fa7d5a465380e184c42069e0..349a2ba1e6b8f096b14c27806ae3ab66bc89eaba 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 import java.util.Set;\r
 \r
similarity index 86%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ConstraintMetaDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ConstraintMetaDefinition.java
index 50f41d918d884c0efceaf2a5631a8c3fa232bf79..060fe2b089110997fced678874091fda917e802a 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 public interface ConstraintMetaDefinition {\r
 \r
similarity index 91%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ContainerSchemaNode.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ContainerSchemaNode.java
index f60fc160d8bea95ba16a61873a53379939a200f7..024d0d9848c0a0e6d7c4c20568c157e0cc9c47de 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 /**\r
  * The ContainerSchemaNode is used to define an interior data node in the schema\r
similarity index 93%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/DataNodeContainer.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataNodeContainer.java
index b636a320d4c474cffcc8cb4788a18e6a15195682..8e6d7898b5220cb21a2546a7d325bb8efb834b5f 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 import java.util.Set;\r
 \r
similarity index 93%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/DataSchemaNode.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/DataSchemaNode.java
index 87cdbfd0a6ae6b47c28f502e66d26669e475b693..7e9b1e8a879858fa971b7b6eb496ee47f03ca28c 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 public interface DataSchemaNode extends SchemaNode {\r
 \r
similarity index 93%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/Deviation.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java
index ec224fa0f10e2ddac4aa5ae47530261eacb50f70..8c3391bd2156a470dd2c3dcc48fcf426bf4c0e1c 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 import java.util.List;\r
 \r
similarity index 94%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ExtensionDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ExtensionDefinition.java
index 8b2ed8679b075f1ade596a50a07556e02137ffd9..2317011b8a27eef9fc41edefc558a78ad0fb4d30 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 public interface ExtensionDefinition extends SchemaNode {\r
 \r
similarity index 89%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/FeatureDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/FeatureDefinition.java
index a6d6331aae75b259108ee8f00f1bff66083268c5..2bfa554aeaa44a85a4123c16e476575489daf1b0 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 /**\r
  * Interface describing YANG 'feature' statement.\r
similarity index 92%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/GroupingDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/GroupingDefinition.java
index 648eacfccf71b4c58676708060763a922839bbb1..ab5a9fb49f4606b4d622c71ad8bbdc490e50817d 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 /**\r
  * Interface describing YANG 'grouping' statement.\r
similarity index 92%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/IdentitySchemaNode.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/IdentitySchemaNode.java
index 7e08238c04888d1d38c966f74620a95548bfb2c9..bd93d7d4807a2f24ccd56cd9121707f3da96ae6f 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 /**\r
  * Interface describing YANG 'identity' statement.\r
similarity index 91%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/LeafListSchemaNode.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafListSchemaNode.java
index 8780322e52fa691fc34919fff44fcfbd52a36407..58f81d920eb551a3687f0553039e237419ac860c 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 /**\r
  * Interface describing YANG 'leaf-list' statement.\r
similarity index 89%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/LeafSchemaNode.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/LeafSchemaNode.java
index e3dd0ecd22f37bc6369a417590d7ae66d5c20d6b..db930d218280a9c308a146585340b82ac6a8ca1b 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 /**\r
  * Interface describing YANG 'leaf' statement.\r
similarity index 92%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ListSchemaNode.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ListSchemaNode.java
index 3a812bd35e537cf32777b01a4c82949c61753da7..c9a475a7304c3888d4e6a82e0d6756ff3e76f220 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 import java.util.List;\r
 \r
similarity index 93%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/Module.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Module.java
index a38d48817b1b1d4b6ecf35d4bc1bf425248ddd29..b1b03a4dd85bf4b7741dd8a8ad156aa6321661c5 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 import java.net.URI;\r
 import java.util.Date;\r
similarity index 90%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/ModuleImport.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java
index 431479858914755b1c3a347bf31f8f79b7ae4415..eceb2fa6bce2ab85b807c13f6828043c243ebf52 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 import java.util.Date;\r
 \r
similarity index 86%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/MustDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/MustDefinition.java
index 42dc39264b6aa9eb730809bad946c3fbc80a84ca..c6b9b223868196775290357fd6b2c7bd93d40ff4 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 public interface MustDefinition extends ConstraintMetaDefinition {\r
 \r
similarity index 88%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/NotificationDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/NotificationDefinition.java
index b3e06777c5e8a7fe4ddc748f9cbeeeed9f2d88eb..c73aa0a80b23fa98ba77164a73d5362c6c683d88 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 /**\r
  * Interface describing YANG 'notification' statement. The notification\r
similarity index 92%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/RevisionAwareXPath.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RevisionAwareXPath.java
index a3364d625f4fd194bd45ad2b297a63b15c75e3ea..6a98cd0012b35f2b6c42ede16d62e55b8b070319 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 public interface RevisionAwareXPath {\r
     \r
similarity index 93%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/RpcDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/RpcDefinition.java
index 5ce453dd38887c092c2ee369b238de4aa243df9b..4be0490586d805cf21fc380dd4c639c3de29634a 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 import java.util.Set;\r
 \r
similarity index 93%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/SchemaContext.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaContext.java
index e449dfaea0e8e6a13f704635bf0f1d6e33639fcd..a40bf2bd0ab201e5476ac24043e06bc4bc84d7e8 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api;
+package org.opendaylight.yangtools.yang.model.api;
 
 import java.net.URI;
 import java.util.Date;
similarity index 91%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/SchemaNode.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaNode.java
index 94ccd5dde6d2de1318e4071588fa06a475303f20..ebd29633273e887bdc86dd9c726fc45e1add7441 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 import java.util.List;\r
 \r
similarity index 93%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/SchemaPath.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java
index 6e198bef21b3df7f4b7d2065374484d22149cc33..e7000e3b2ca96310aac225f8971080ac6b8c7682 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 import java.util.ArrayList;\r
 import java.util.Collections;\r
similarity index 91%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/Status.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Status.java
index 39aa0c847283a5ba6f628b1a3f23d3a64ab71720..bc36ef002fb96545cff6f18eb7fe12d32900c1d0 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 /**\r
  * Enum describing YANG 'status' statement. If no status is specified, the\r
similarity index 87%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/TypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/TypeDefinition.java
index 71b5d193dfc92d32f4070bd74990cd33d4819b0a..4ff709e1e4ba06a9f28e45d627b6bedbaecb7837 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 \r
 public interface TypeDefinition<T extends TypeDefinition<?>> extends SchemaNode {\r
similarity index 90%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/UnknownSchemaNode.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UnknownSchemaNode.java
index 8e03113a599389f1f329f3a6e5488a851a34505f..f8dfd8beeab3d9e8f9a8db45ae2e7476e346ac14 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api;
+package org.opendaylight.yangtools.yang.model.api;
 
 import org.opendaylight.controller.yang.common.QName;
 
similarity index 93%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/UsesNode.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/UsesNode.java
index 1920f9859c55e68825677decfe92f4bd9a2a0469..b1ec2578f6688658edcf8f7959129812c5ddbe1d 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api;\r
+package org.opendaylight.yangtools.yang.model.api;\r
 \r
 import java.util.Map;\r
 import java.util.Set;\r
similarity index 89%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/BinaryTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BinaryTypeDefinition.java
index 59d5b4d4d74c1418e0daf24975fcf1565be1b5b6..27856a42c5787eb31ad339aaa344ff3ed846fcd3 100644 (file)
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 /**
  * The binary built-in type represents any binary data, i.e., a sequence of
@@ -20,22 +20,22 @@ import org.opendaylight.controller.yang.model.api.TypeDefinition;
  * 4</a>). <br>
  * The canonical form of a binary value follows the rules in <a
  * href="https://tools.ietf.org/html/rfc4648">[RFC4648]</a>.
- * 
+ *
  * <br>
  * <br>
  * This interface was modeled according to definition in <a
  * href="https://tools.ietf.org/html/rfc6020#section-9.8">[RFC-6020] The binary
  * Built-In Type</a>
- * 
+ *
  */
 public interface BinaryTypeDefinition extends
         TypeDefinition<BinaryTypeDefinition> {
 
     /**
      * Returns List of number of octets that binary value contains.
-     * 
+     *
      * @return List of number of octets that binary value contains.
-     * 
+     *
      * @see LengthConstraint
      */
     public List<LengthConstraint> getLengthConstraints();
similarity index 80%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/BitsTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BitsTypeDefinition.java
index e00b1a8e827305e23bca86c5a8154075ef1220c1..115ab1355771c1b0a1e6e36d9bb713f6ea9abe47 100644 (file)
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.SchemaNode;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public interface BitsTypeDefinition extends TypeDefinition<BitsTypeDefinition> {
 
@@ -20,7 +20,7 @@ public interface BitsTypeDefinition extends TypeDefinition<BitsTypeDefinition> {
         /**
          * The position value MUST be in the range 0 to 4294967295, and it MUST
          * be unique within the bits type.
-         * 
+         *
          * @return The position value of bit in range from 0 to 4294967295.
          */
         public Long getPosition();
similarity index 76%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/BooleanTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/BooleanTypeDefinition.java
index cf3beff47f964e156dddeee743c48f2611448d0d..d64d9da7533bf0055c0cec960e221e2aae998f45 100644 (file)
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public interface BooleanTypeDefinition extends
         TypeDefinition<BooleanTypeDefinition> {
similarity index 88%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/DecimalTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/DecimalTypeDefinition.java
index 068d4a977c74f883f601007b2643cdf0cb068cfb..7e2692939ec088017f8cd8d4c633aec79c04e608 100644 (file)
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public interface DecimalTypeDefinition extends TypeDefinition<DecimalTypeDefinition> {
 
similarity index 76%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/EmptyTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EmptyTypeDefinition.java
index 0fcfb1d0c928b8bf1016839926e407d7bc51d043..badd4e04a89364c70bb1d6c70f0a61ea533ad002 100644 (file)
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public interface EmptyTypeDefinition extends
         TypeDefinition<EmptyTypeDefinition> {
similarity index 84%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/EnumTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/EnumTypeDefinition.java
index ddca1960d6dc997f92cb579d7f4deea63a608ca3..c52523f14554bbd09e8e23e14c9f1ab37be13f92 100644 (file)
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.SchemaNode;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public interface EnumTypeDefinition extends TypeDefinition<EnumTypeDefinition> {
 
@@ -20,7 +20,7 @@ public interface EnumTypeDefinition extends TypeDefinition<EnumTypeDefinition> {
 
         /**
          * The name to specify each assigned name of an enumeration type.
-         * 
+         *
          * @return name of each assigned name of an enumeration type.
          */
         public String getName();
@@ -30,7 +30,7 @@ public interface EnumTypeDefinition extends TypeDefinition<EnumTypeDefinition> {
          * integer value with the assigned name for the enum. This integer value
          * MUST be in the range -2147483648 to 2147483647, and it MUST be unique
          * within the enumeration type.
-         * 
+         *
          * @return integer value assigned to enumeration
          */
         public Integer getValue();
similarity index 80%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/IdentityTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityTypeDefinition.java
index 86f524e689f0275cfc9508dfbe7e779492ad9091..9380ebf9802137ea1325a3827b7001498427a96b 100644 (file)
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public interface IdentityTypeDefinition extends
         TypeDefinition<IdentityTypeDefinition> {
similarity index 78%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/IdentityrefTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IdentityrefTypeDefinition.java
index e2297d65aaad2a5ecdca915982e7510cb51cad8e..0c32f71d6e354701f62bda6e81a894d7f8a6b628 100644 (file)
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.model.api.type;\r
+package org.opendaylight.yangtools.yang.model.api.type;\r
 \r
 import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.model.api.TypeDefinition;\r
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;\r
 \r
 public interface IdentityrefTypeDefinition extends\r
         TypeDefinition<IdentityrefTypeDefinition> {\r
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
-import org.opendaylight.controller.yang.model.api.RevisionAwareXPath;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public interface InstanceIdentifierTypeDefinition extends
         TypeDefinition<InstanceIdentifierTypeDefinition> {
similarity index 91%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/IntegerTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/IntegerTypeDefinition.java
index 887575ded05859e0f5adf0c4b76ec8e03c0ee3a0..03e29c5e04cdd04286640bad55cbbbde9b233afd 100644 (file)
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 /**
  * IntegerTypeDefinition is interface which represents SIGNED Integer values
@@ -24,7 +24,7 @@ import org.opendaylight.controller.yang.model.api.TypeDefinition;
  * <li>int64 represents integer values between -9223372036854775808 and
  * 9223372036854775807, inclusively.</li>
  * </ul>
- * 
+ *
  * The Integer Built-In Types are defined in <a
  * href="https://tools.ietf.org/html/rfc6020#section-9.2"> [RFC-6020]</a>
  */
@@ -33,7 +33,7 @@ public interface IntegerTypeDefinition extends
 
     /**
      * Returns Range Constraints defined for given Integer Type.
-     * 
+     *
      * @return Range Constraints defined for given Integer Type.
      */
     List<RangeConstraint> getRangeStatements();
similarity index 70%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/LeafrefTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LeafrefTypeDefinition.java
index 10c7bad7c19495704cf073503ddf640e6d66b30d..de0db28e926c32f80465eaa1b9513f3735bfb136 100644 (file)
@@ -5,10 +5,10 @@
   * terms of the Eclipse Public License v1.0 which accompanies this distribution,
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
-import org.opendaylight.controller.yang.model.api.RevisionAwareXPath;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public interface LeafrefTypeDefinition extends
         TypeDefinition<LeafrefTypeDefinition> {
similarity index 92%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/LengthConstraint.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/LengthConstraint.java
index 3d259a54a3ed48cac16a6816eed879360bb88585..b7d64aa8e2b903ffe328f3d1e52a61e3a86465bd 100644 (file)
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
-import org.opendaylight.controller.yang.model.api.ConstraintMetaDefinition;
+import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition;
 
 /**
  * The Lenght Constraint value consists of an explicit value, or a lower bound
similarity index 76%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/PatternConstraint.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/PatternConstraint.java
index 9716d36d681bf492c9fb6115341e0610645cf17d..d793b24ee0f0aae3800c9fd39cc63974dd85c93c 100644 (file)
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
-import org.opendaylight.controller.yang.model.api.ConstraintMetaDefinition;
+import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition;
 
 public interface PatternConstraint extends ConstraintMetaDefinition {
 
similarity index 90%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/RangeConstraint.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/RangeConstraint.java
index 396a66d84ef5a1812e4585ec08d8708a866f531c..0c4b1d49d66f4f674cc060e58c47ddf72b318cbf 100644 (file)
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
-import org.opendaylight.controller.yang.model.api.ConstraintMetaDefinition;
+import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition;
 
 /**
  * The Range Constraint interface is used to restrict integer and decimal
@@ -31,14 +31,14 @@ public interface RangeConstraint extends ConstraintMetaDefinition {
 
     /**
      * Returns the length-restricting lower bound value.
-     * 
+     *
      * @return the length-restricting lower bound value.
      */
     Number getMin();
 
     /**
      * Returns the length-restricting upper bound value.
-     * 
+     *
      * @return the length-restricting upper bound value.
      */
     Number getMax();
similarity index 80%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/StringTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/StringTypeDefinition.java
index 5fa717ce83cf123a949aac1786a7c18c9e46ee9a..c12499eb6be0c2f32193f34298461a1157320e9d 100644 (file)
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public interface StringTypeDefinition extends
         TypeDefinition<StringTypeDefinition> {
similarity index 79%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/UnionTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnionTypeDefinition.java
index e16d445d4abf7bffa3719a560c4efd60cfa500a9..98f5eac4a8255c21bcd8aa2e0889cab601aa79d7 100644 (file)
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public interface UnionTypeDefinition extends
         TypeDefinition<UnionTypeDefinition> {
similarity index 84%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/UnknownTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnknownTypeDefinition.java
index efcd1d6d95e0b8a441d2cf95bd93abc90d1b747f..0bbc5916f00b7d996b73204f43ae1bb84d788ee0 100644 (file)
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public interface UnknownTypeDefinition extends
         TypeDefinition<UnknownTypeDefinition> {
similarity index 80%
rename from yang-model-api/src/main/java/org/opendaylight/controller/yang/model/api/type/UnsignedIntegerTypeDefinition.java
rename to yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/type/UnsignedIntegerTypeDefinition.java
index 38b697cdd6a77d021a3e57b129c8ad213a236626..d40fe0c1596e627d54a987fada97ad50424b9937 100644 (file)
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.api.type;
+package org.opendaylight.yangtools.yang.model.api.type;
 
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public interface UnsignedIntegerTypeDefinition extends
         TypeDefinition<UnsignedIntegerTypeDefinition> {
index 96ef02bce208fb22885b334ff445eea9a4b36024..bc08b8afd74e145e2dc0f13a3c8de100c6f71dbf 100644 (file)
@@ -3,7 +3,7 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yang</groupId>\r
-        <artifactId>yang-parent</artifactId>\r
+        <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
 \r
index baefbf40fe97d413a377a25fc9ba5ebe4e159d94..62fb5d441cfedb9f634fad961cff2d15bcae901a 100644 (file)
@@ -12,11 +12,11 @@ import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.IntegerTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 
 /**
  * The Abstract Integer class defines implementation of IntegerTypeDefinition
index a56697e97a49e6327074e2dfc614eb8c5dcd64a3..38513899ea8737f671244fbff86db1f256af2d78 100644 (file)
@@ -8,11 +8,11 @@ import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
-import org.opendaylight.controller.yang.model.api.type.UnsignedIntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
 
 /**
  * The Abstract Integer class defines implementation of IntegerTypeDefinition
index 23a2d5f8ca3f661a2090806ccc60ac270a63f9b1..b728e3fc618b021c4b61d3dc46dbb06306d44634 100644 (file)
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.controller.yang.model.util;
 
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
-import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 
 public final class BaseConstraints {
 
index 3f5d3ed6cca3689586fd886e09089b78e4cfb7a4..946f007fcc8e9b3a36cf79c24069e39e3887dabc 100644 (file)
@@ -13,7 +13,7 @@ import java.util.Date;
 import java.util.List;\r
 \r
 import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.model.api.SchemaPath;\r
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
 \r
 public final class BaseTypes {\r
 \r
index ea09b65b5daa1382847faff9a4429eadee79d5fd..ab383d078067d185092d8a8e22e42c857724dc1b 100644 (file)
@@ -12,11 +12,11 @@ import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.BinaryTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 
 /**
  * The <code>default</code> implementation of Binary Type Definition interface.
index 60b5a43bf4c9d82b55809f9742e97472d84490e9..5d82e536138cc13ef837af5d6ac61cecf81c83fd 100644 (file)
@@ -11,10 +11,10 @@ import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.BitsTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
 
 /**
  * The <code>default</code> implementation of Bits Type Definition interface.
index 04b2dc90d1ac66f507926d0e9edff0c51b63f682..5f584f8cde535b6747fe4f95d91bb1459e9c7d1e 100644 (file)
@@ -11,10 +11,10 @@ import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.BooleanTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition;
 
 /**
  * The <code>default</code> implementation of Boolean Type Definition interface.
index d55f84923c4fd6dae5cf8bf58b08c18ba9f433f0..fbf5c41a760d069e208787b7cb4295775cb890b3 100644 (file)
@@ -12,7 +12,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.opendaylight.controller.yang.model.api.*;
+import org.opendaylight.yangtools.yang.model.api.*;
 
 public class DataNodeIterator implements Iterator<DataSchemaNode> {
 
index 1387da9b1cf5ead763a14d21b8b3d784ecc6ceb5..86b770ad17a0707e04605a1e60a4f4024a0e210d 100644 (file)
@@ -13,11 +13,11 @@ import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.DecimalTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 
 /**
  * The <code>default</code> implementation of Decimal Type Definition interface.
index 0e542bc019f3e5fa043fc8fe769bf5457df9d6ea..afb043b2317e1293ee8b9b6d72c4b83ccef527cf 100644 (file)
@@ -11,10 +11,10 @@ import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.EmptyTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition;
 
 public final class EmptyType implements EmptyTypeDefinition {
     private final QName name = BaseTypes.constructQName("empty");
index de7ee3060347df9337479de99db162c554da0bf8..767b91a13dd080c9073b99dc315d6e9664f83990 100644 (file)
@@ -11,10 +11,10 @@ import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.EnumTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
 
 /**
  * The <code>default</code> implementation of Enumertaion Type Definition interface.
index 6070c1c6ac563cc230dd7c9ddac921cfb9344911..6bcfdf71bd531c60d576cc8e0b5ae9d5c8359649 100644 (file)
@@ -13,13 +13,13 @@ import java.util.Date;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
-import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 
 public class ExtendedType implements TypeDefinition<TypeDefinition<?>> {
 
index 30f0013d240e7e713882eba614efd4d0cd467091..03cde1a50a95fef7070ca89f7a41ef2d0adfa5a2 100644 (file)
@@ -11,10 +11,10 @@ import java.util.Collections;
 import java.util.List;\r
 \r
 import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.model.api.SchemaPath;\r
-import org.opendaylight.controller.yang.model.api.Status;\r
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;\r
-import org.opendaylight.controller.yang.model.api.type.IdentityrefTypeDefinition;\r
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
+import org.opendaylight.yangtools.yang.model.api.Status;\r
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;\r
+import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition;\r
 \r
 /**\r
  * The <code>default</code> implementation of Identityref Type Definition interface.\r
index 05dffc62d132c6c987d8b2d7fab2c65f68477f63..3b97cda23e9edc901e77a0a3490c97306bffb47e 100644 (file)
@@ -11,11 +11,11 @@ import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.RevisionAwareXPath;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.InstanceIdentifierTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefinition;
 
 /**
  * The <code>default</code> implementation of Instance Identifier Type
index 829cd140b18a04740e26ba75b4ab5c851e514866..60b93ff9ab1c12bb49ecd905084fbbaa0273534b 100644 (file)
@@ -8,8 +8,8 @@
 package org.opendaylight.controller.yang.model.util;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.type.IntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
 
 /**
  * Implementation of Yang int16 built-in type. <br>
index 025448262e713a43f26356205f83fa107cc5e636..dff380045b97121954b7a4bc181af8597fab6125 100644 (file)
@@ -8,8 +8,8 @@
 package org.opendaylight.controller.yang.model.util;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.type.IntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
 
 /**
  * Implementation of Yang int32 built-in type. <br>
index d51dcc7a8136912cf83188bd0d2c61becddfbb79..30decdc44c4bc0fccb511e1d17a31e27ee55200e 100644 (file)
@@ -8,8 +8,8 @@
 package org.opendaylight.controller.yang.model.util;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.type.IntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
 
 /**
  * Implementation of Yang int64 built-in type. <br>
index 9f205955492a767ca10e43f4f4aa5979ff1f879f..5d7ab6871e506be547a59fddbcce3ac9d9e9bf14 100644 (file)
@@ -8,8 +8,8 @@
 package org.opendaylight.controller.yang.model.util;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.type.IntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
 
 /**
  * Implementation of Yang int8 built-in type. <br>
index bd42903184b68a472bf93caa670fe752f1d0c34e..42cc96c13dad4f5ba2f1417fcc0172fb577fb672 100644 (file)
@@ -11,11 +11,11 @@ import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.RevisionAwareXPath;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.LeafrefTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition;
 
 /**
  * The <code>default</code> implementation of Instance Leafref Type Definition
index d9b54c4dc78ba1827f723c7443016081b9cdfd18..59abe6699debad1b8d01e036e380f88fd7111696 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.controller.yang.model.util;
 
-import org.opendaylight.controller.yang.model.api.RevisionAwareXPath;
+import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
 
 /**
  * The <code>default</code> implementation of Instance Rewision Aware XPath interface.
index 44ef804e2c0c9dd9bb10223d9bf6fafaaf5b49c3..72fd11250e97ff21f175b20e16b38049e7cb05e5 100644 (file)
@@ -14,7 +14,7 @@ import java.util.Queue;
 import java.util.Set;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.*;
+import org.opendaylight.yangtools.yang.model.api.*;
 
 public final class SchemaContextUtil {
 
index b430e801dd1be3093a3110605795117de3680e33..7fb391e88d1486a15af186d7af3c92cb549dca5f 100644 (file)
@@ -12,12 +12,12 @@ import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
-import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
-import org.opendaylight.controller.yang.model.api.type.StringTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
 
 /**
  * The <code>default</code> implementation of String Type Definition interface.
index 6cae33b8f5ae67614f6479b032de10a949f70ead..c76c8edb217db8d3b38be9c058b99f637f7b1015 100644 (file)
@@ -8,8 +8,8 @@
 package org.opendaylight.controller.yang.model.util;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.type.UnsignedIntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
 
 /**
  * Implementation of Yang uint32 built-in type. <br>
index 2a06a603e88c0a559a4d90a0470a282831d83005..6c8817f5994b4d79f42d16a2db0bbc253ddb7509 100644 (file)
@@ -8,8 +8,8 @@
 package org.opendaylight.controller.yang.model.util;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.type.UnsignedIntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
 
 /**
  * Implementation of Yang uint32 built-in type. <br>
index e95a6232dbb0102e48db2a9e721c106bc87fe98a..66e0ccaa61adb2146d9c1cecc290809c999782a6 100644 (file)
@@ -10,8 +10,8 @@ package org.opendaylight.controller.yang.model.util;
 import java.math.BigInteger;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.type.UnsignedIntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
 
 /**
  * Implementation of Yang uint64 built-in type. <br>
index 85e7aab15553104d3d79674e1389ea19381ade75..4f2cbad0b93017d9ab11c0916b064a7943fe581f 100644 (file)
@@ -8,8 +8,8 @@
 package org.opendaylight.controller.yang.model.util;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.type.UnsignedIntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
 
 /**
  * Implementation of Yang uint8 built-in type. <br>
index f68cb191dc0cab382f88a5df791b46edae6153e6..c6f88dbc31ce626843dec2b561bb7d767393096f 100644 (file)
@@ -11,11 +11,11 @@ import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.UnionTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
 
 public final class UnionType implements UnionTypeDefinition {
 
index 52d1c2cf7c5893c640ad3b93246d20f57eb66ac4..110ddb8148e8cef4ebb0e6ed56e63fa0c6610f2f 100644 (file)
@@ -11,13 +11,13 @@ import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
-import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
-import org.opendaylight.controller.yang.model.api.type.UnknownTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.UnknownTypeDefinition;
 
 public class UnknownType implements UnknownTypeDefinition {
 
index 76d53d5b38b872bd2558be82f340e37b4717ea01..5d1c8b34476f1774593a5666a611bffb0dd54a17 100644 (file)
@@ -15,8 +15,8 @@ import java.util.List;
 import java.util.Set;\r
 \r
 import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.model.api.SchemaPath;\r
-import org.opendaylight.controller.yang.model.api.TypeDefinition;\r
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;\r
 \r
 public final class YangTypesConverter {\r
     private static final Set<String> baseYangTypes = new HashSet<String>();\r
index 178a4caef05b70660b741d5db19f422ee8d48feb..afe200cd4345e579d4ddc775b4975d6fd6d5a4de 100644 (file)
@@ -3,7 +3,7 @@
 
     <parent>
         <groupId>org.opendaylight.yang</groupId>
-        <artifactId>yang-parent</artifactId>
+        <artifactId>yangtools</artifactId>
         <version>0.5.4-SNAPSHOT</version>
     </parent>
 
similarity index 94%
rename from yang-parser-api/src/main/java/org/opendaylight/controller/yang/model/parser/api/YangModelParser.java
rename to yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/YangModelParser.java
index 142f199af42e02979d443537b35880912887975d..820c976c130f32c45fc48ba7eb4ffc156f069b08 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.parser.api;
+package org.opendaylight.yangtools.yang.model.parser.api;
 
 import java.io.File;
 import java.io.InputStream;
@@ -13,9 +13,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
-import org.opendaylight.controller.yang.model.api.type.UnknownTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.type.UnknownTypeDefinition;
 
 /**
  * Yang Model Parser interface is designed for parsing yang models and convert
similarity index 84%
rename from yang-parser-api/src/main/java/org/opendaylight/controller/yang/model/parser/api/package-info.java
rename to yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/model/parser/api/package-info.java
index 2e8a029f85cbd89ea4ee68f968e8283351be234a..f9f08cc7439dbdc76b6f166db6a5549c0482596e 100644 (file)
@@ -5,4 +5,4 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.model.parser.api;
\ No newline at end of file
+package org.opendaylight.yangtools.yang.model.parser.api;
\ No newline at end of file
index 20a1ec2c133291d9694ac0b6bf6f0f35a5af515b..17f54a22f8cf5603f826c9c7255f8439758b82b9 100644 (file)
@@ -3,7 +3,7 @@
 \r
     <parent>\r
         <groupId>org.opendaylight.yang</groupId>\r
-        <artifactId>yang-parent</artifactId>\r
+        <artifactId>yangtools</artifactId>\r
         <version>0.5.4-SNAPSHOT</version>\r
     </parent>\r
 \r
similarity index 88%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/AbstractBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractBuilder.java
index 786a7ec2453076b396446d4667055c2e8423bfc3..2fd454c1f0be2b7f96d0bc439d04de38c67ceb46 100644 (file)
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.api;
+package org.opendaylight.yangtools.yang.parser.builder.api;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
 
 /**
  * Basic implementation of Builder.
@@ -5,16 +5,16 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.api;
+package org.opendaylight.yangtools.yang.parser.builder.api;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 /**
  * Basic implementation of DataNodeContainerBuilder.
@@ -5,14 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.parser.builder.api;\r
+package org.opendaylight.yangtools.yang.parser.builder.api;\r
 \r
 import java.util.List;\r
 \r
 import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.model.api.SchemaPath;\r
-import org.opendaylight.controller.yang.model.api.Status;\r
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;\r
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
+import org.opendaylight.yangtools.yang.model.api.Status;\r
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;\r
 \r
 /**\r
  * Basic implementation of SchemaNodeBuilder.\r
similarity index 91%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/AbstractTypeAwareBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractTypeAwareBuilder.java
index 23ded94c4039a6de64a5e797184daf67e1d0d2d3..365f7c5c6b2af4e8800eb4e7e5c25d247ec3ab68 100644 (file)
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.api;
+package org.opendaylight.yangtools.yang.parser.builder.api;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 /**
  * Basic implementation for TypeAwareBuilder builders.
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.api;
+package org.opendaylight.yangtools.yang.parser.builder.api;
 
-import org.opendaylight.controller.yang.model.api.AugmentationSchema;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
 
 /**
  * Interface for builders of 'augment' statement.
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.api;
+package org.opendaylight.yangtools.yang.parser.builder.api;
 
 /**
  * Interface for builders of those nodes, which can be augmentation targets.
similarity index 92%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/Builder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/Builder.java
index b849f20d2fb5c4da004ab11be3c6fa334aba0731..2ae0ad5531498834d8424f2bb9136c4bc9eadcea 100644 (file)
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.api;
+package org.opendaylight.yangtools.yang.parser.builder.api;
 
 import java.util.List;
 
-import org.opendaylight.controller.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
 
 /**
  * Parent interface for all builder interfaces.
similarity index 90%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/DataNodeContainerBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataNodeContainerBuilder.java
index 7a5f80de9cd62546f3e72d8550a94bcecd0d8e40..150c276a3ee76c76fcacf64c7df7c2012bf9b43f 100644 (file)
@@ -5,14 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.api;
+package org.opendaylight.yangtools.yang.parser.builder.api;
 
 import java.util.Set;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 /**
  * Interface for all yang data-node containers [augment, case, container,
similarity index 85%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/DataSchemaNodeBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/DataSchemaNodeBuilder.java
index a21775068d53eb4252b151da9cc461be0d0c38c8..b0c086593dbecb368af7cdca1cfab6b5c6f46dec 100644 (file)
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.api;
+package org.opendaylight.yangtools.yang.parser.builder.api;
 
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.parser.builder.impl.ConstraintsBuilder;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ConstraintsBuilder;
 
 /**
  * Interface for all yang data-schema nodes [anyxml, case, container, grouping,
similarity index 85%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/GroupingBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingBuilder.java
index 74ee330c2eddc10322c6bf7b885c6b9bd89891fd..787763f467318701ab884e5035a5de0a1ec1ea53 100644 (file)
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.api;
+package org.opendaylight.yangtools.yang.parser.builder.api;
 
 import java.util.Set;
 
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
 
 /**
  * Interface for builders of 'grouping' statement.
similarity index 92%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/GroupingMember.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/GroupingMember.java
index c074f60a10d801ffb23e2009f7240c2d2410fbd6..3e2eea30e3e068ff6b495b370be6d747c286f416 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.api;
+package org.opendaylight.yangtools.yang.parser.builder.api;
 
 /**
  * Marker interface for nodes which can be defined in grouping statement.
similarity index 83%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/SchemaNodeBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/SchemaNodeBuilder.java
index 13c96d3a22768bafcf2c12ae8d68ddfad6b52f66..8debaf4c2fb8050c82c00b8086d58d41f7c4b169 100644 (file)
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.parser.builder.api;\r
+package org.opendaylight.yangtools.yang.parser.builder.api;\r
 \r
 import org.opendaylight.controller.yang.common.QName;\r
-import org.opendaylight.controller.yang.model.api.SchemaNode;\r
-import org.opendaylight.controller.yang.model.api.SchemaPath;\r
-import org.opendaylight.controller.yang.model.api.Status;\r
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;\r
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
+import org.opendaylight.yangtools.yang.model.api.Status;\r
 \r
 /**\r
  * Interface for all builders of SchemaNode nodes.\r
similarity index 88%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/TypeAwareBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeAwareBuilder.java
index 8b2e669f98753f02d4212d48797440e6ffc57856..0db47b755ed861fb30e045f5e2e5ffcfd80f4854 100644 (file)
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.api;
+package org.opendaylight.yangtools.yang.parser.builder.api;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 /**
  * Builders of all nodes, which can have 'type' statement must implement this
similarity index 71%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/TypeDefinitionBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/TypeDefinitionBuilder.java
index 87c7b3c836e564c0b6bde2e46276010e1ba21942..78799a6bcc3b38c218c633279b27681bffbfd570 100644 (file)
@@ -5,15 +5,15 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.parser.builder.api;\r
+package org.opendaylight.yangtools.yang.parser.builder.api;\r
 \r
 import java.util.List;\r
 \r
-import org.opendaylight.controller.yang.model.api.TypeDefinition;\r
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;\r
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;\r
-import org.opendaylight.controller.yang.model.api.type.PatternConstraint;\r
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;\r
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;\r
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;\r
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;\r
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;\r
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;\r
 \r
 /**\r
  * Interface for builders of 'typedef' statement.\r
similarity index 80%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/api/UsesNodeBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/UsesNodeBuilder.java
index 626f0f460748d57d8958366171eff5289b51e4a7..33efa6062707c2377ecfaf65fe7765b2aec0ae3e 100644 (file)
@@ -5,14 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.api;
+package org.opendaylight.yangtools.yang.parser.builder.api;
 
 import java.util.List;
 import java.util.Set;
 
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.UsesNode;
-import org.opendaylight.controller.yang.parser.util.RefineHolder;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
+import org.opendaylight.yangtools.yang.parser.util.RefineHolder;
 
 /**
  * Interface for builders of 'uses' statement.
similarity index 92%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/AnyXmlBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AnyXmlBuilder.java
index 6b6063cc953a1063758e7a4f1ed7bd304cd20dd7..3762175b60215f8f05ac821dae549f6e7f5b6671 100644 (file)
@@ -5,22 +5,22 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.AnyXmlSchemaNode;
-import org.opendaylight.controller.yang.model.api.ConstraintDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingMember;
-import org.opendaylight.controller.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingMember;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
 
 public final class AnyXmlBuilder extends AbstractSchemaNodeBuilder implements DataSchemaNodeBuilder, GroupingMember {
     private boolean built;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,25 +17,25 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.AugmentationSchema;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.RevisionAwareXPath;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.UsesNode;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
 import org.opendaylight.controller.yang.model.util.RevisionAwareXPathImpl;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
-import org.opendaylight.controller.yang.parser.util.ParserListenerUtils;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.parser.util.ParserListenerUtils;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContainerBuilder implements
         AugmentationSchemaBuilder {
similarity index 92%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ChoiceBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java
index 291554c8488a9fcb451535bbbe2d67e2b1a85481..766404d8e79a329e50682930a12933e2821166e5 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -15,21 +15,21 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.AugmentationSchema;
-import org.opendaylight.controller.yang.model.api.ChoiceCaseNode;
-import org.opendaylight.controller.yang.model.api.ChoiceNode;
-import org.opendaylight.controller.yang.model.api.ConstraintDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationTargetBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingMember;
-import org.opendaylight.controller.yang.parser.util.Comparators;
-import org.opendaylight.controller.yang.parser.util.ParserUtils;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
+import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
+import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationTargetBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingMember;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.parser.util.ParserUtils;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements DataSchemaNodeBuilder,
         AugmentationTargetBuilder, GroupingMember {
similarity index 89%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ChoiceCaseBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceCaseBuilder.java
index c5282bc0eafd314449612108742f607bc7347f86..bd2c2f381b644f24b04fabff65fb1938b193b3b1 100644 (file)
@@ -1,4 +1,4 @@
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -9,24 +9,24 @@ import java.util.Set;
 import java.util.TreeMap;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.AugmentationSchema;
-import org.opendaylight.controller.yang.model.api.ChoiceCaseNode;
-import org.opendaylight.controller.yang.model.api.ConstraintDefinition;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.UsesNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationTargetBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
+import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationTargetBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder implements DataSchemaNodeBuilder,
         AugmentationTargetBuilder {
similarity index 94%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ConstraintsBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ConstraintsBuilder.java
index b2f1dff3a52dacc93e80b54e613c611cd3f787ff..e72b62ed333ead3cf4ab6273804ce2081712c273 100644 (file)
@@ -5,19 +5,19 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.opendaylight.controller.yang.model.api.ConstraintDefinition;
-import org.opendaylight.controller.yang.model.api.MustDefinition;
-import org.opendaylight.controller.yang.model.api.RevisionAwareXPath;
+import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
+import org.opendaylight.yangtools.yang.model.api.MustDefinition;
+import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
 import org.opendaylight.controller.yang.model.util.RevisionAwareXPathImpl;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractBuilder;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractBuilder;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 public final class ConstraintsBuilder extends AbstractBuilder {
     private final ConstraintDefinitionImpl instance;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,26 +17,26 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.AugmentationSchema;
-import org.opendaylight.controller.yang.model.api.ConstraintDefinition;
-import org.opendaylight.controller.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.UsesNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationTargetBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingMember;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationTargetBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingMember;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 public final class ContainerSchemaNodeBuilder extends AbstractDataNodeContainerBuilder implements
         AugmentationTargetBuilder, DataSchemaNodeBuilder, GroupingMember {
similarity index 90%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/DeviationBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/DeviationBuilder.java
index 3bc9879de7213cf919394490098e678bf6b22d22..2595af1e7673c304e3fe4b7cdd3ad858231eab95 100644 (file)
@@ -5,20 +5,20 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.Deviation;
-import org.opendaylight.controller.yang.model.api.Deviation.Deviate;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
-import org.opendaylight.controller.yang.parser.util.ParserListenerUtils;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.model.api.Deviation;
+import org.opendaylight.yangtools.yang.model.api.Deviation.Deviate;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.parser.util.ParserListenerUtils;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 public final class DeviationBuilder extends AbstractBuilder {
     private final String targetPathStr;
similarity index 92%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ExtensionBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ExtensionBuilder.java
index 93a34e1050052b9f6e2dab726d89ba9ca42ddd54..564268baf375ce5aa2be6bacc1228591b01f2625 100644 (file)
@@ -5,19 +5,19 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.ExtensionDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
 
 public final class ExtensionBuilder extends AbstractSchemaNodeBuilder {
     private boolean isBuilt;
similarity index 91%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/FeatureBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/FeatureBuilder.java
index dd3fd11e925246f23373c3490f04cf2260fbd068..0b50f102a25587cd8f5f6e53f79ce67b06bfabb5 100644 (file)
@@ -5,19 +5,19 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.FeatureDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.model.api.FeatureDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
 
 public final class FeatureBuilder extends AbstractSchemaNodeBuilder {
     private boolean isBuilt;
similarity index 91%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/GroupingBuilderImpl.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingBuilderImpl.java
index 8a8f1211cb474c3894852d566abd6197a34b13f5..4791eb6ba41d600da23f33b71628d01ea1193311 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,20 +17,20 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.UsesNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 public final class GroupingBuilderImpl extends AbstractDataNodeContainerBuilder implements GroupingBuilder {
     private boolean isBuilt;
@@ -5,19 +5,19 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.IdentitySchemaNode;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
 
 public final class IdentitySchemaNodeBuilder extends AbstractSchemaNodeBuilder {
     private boolean isBuilt;
similarity index 88%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/IdentityrefTypeBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java
index ca6002930e8bbf7df185cacb3c1674493d4550e0..9b324a5a6f887f8034988eb6aaa74560257a466d 100644 (file)
@@ -5,23 +5,23 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
-import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 import org.opendaylight.controller.yang.model.util.IdentityrefType;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractTypeAwareBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractTypeAwareBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 /**
  * Builder for YANG union type. User can add type to this union as
@@ -5,23 +5,23 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.ConstraintDefinition;
-import org.opendaylight.controller.yang.model.api.LeafListSchemaNode;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractTypeAwareBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingMember;
-import org.opendaylight.controller.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
+import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractTypeAwareBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingMember;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
 
 public final class LeafListSchemaNodeBuilder extends AbstractTypeAwareBuilder implements DataSchemaNodeBuilder,
         GroupingMember {
similarity index 93%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/LeafSchemaNodeBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/LeafSchemaNodeBuilder.java
index 5c1da11afa29af161628a8374324076c85e66eed..aca4e9de9f83a65d7bd0d0f3bd9a07089348d9b2 100644 (file)
@@ -5,23 +5,23 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.ConstraintDefinition;
-import org.opendaylight.controller.yang.model.api.LeafSchemaNode;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractTypeAwareBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingMember;
-import org.opendaylight.controller.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractTypeAwareBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingMember;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
 
 public final class LeafSchemaNodeBuilder extends AbstractTypeAwareBuilder implements DataSchemaNodeBuilder,
         GroupingMember {
similarity index 92%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ListSchemaNodeBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ListSchemaNodeBuilder.java
index 5e369d08263909913a10db0458dd739fa0449ebe..81987d78b201236452ef5ad59eee50319ee07d02 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,26 +17,26 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.AugmentationSchema;
-import org.opendaylight.controller.yang.model.api.ConstraintDefinition;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.ListSchemaNode;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.UsesNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationTargetBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingMember;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationTargetBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingMember;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 public final class ListSchemaNodeBuilder extends AbstractDataNodeContainerBuilder implements DataSchemaNodeBuilder,
         AugmentationTargetBuilder, GroupingMember {
similarity index 95%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ModuleBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java
index 80fe524fed3bc906fc94e8c103fcf199e15d696d..6ceef764736e890149e2d9618b3b5425db4c2bf9 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -21,34 +21,34 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.AugmentationSchema;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.Deviation;
-import org.opendaylight.controller.yang.model.api.ExtensionDefinition;
-import org.opendaylight.controller.yang.model.api.FeatureDefinition;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.IdentitySchemaNode;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.ModuleImport;
-import org.opendaylight.controller.yang.model.api.NotificationDefinition;
-import org.opendaylight.controller.yang.model.api.RpcDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.UsesNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.Builder;
-import org.opendaylight.controller.yang.parser.builder.api.DataNodeContainerBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.SchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeAwareBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
-import org.opendaylight.controller.yang.parser.util.RefineHolder;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Deviation;
+import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition;
+import org.opendaylight.yangtools.yang.model.api.FeatureDefinition;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.ModuleImport;
+import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
+import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.Builder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataNodeContainerBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeAwareBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.parser.util.RefineHolder;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 /**
  * Builder of Module object. If this module is dependent on external
similarity index 89%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/NotificationBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/NotificationBuilder.java
index eab1cffcebadadc80b09cae88ffa7a1edb11899a..4a32c1b53f60ec9a3231e0f29420eedb29c2522d 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,24 +17,24 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.AugmentationSchema;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.NotificationDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.UsesNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationTargetBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.SchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationTargetBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
 
 public final class NotificationBuilder extends AbstractDataNodeContainerBuilder implements SchemaNodeBuilder,
         AugmentationTargetBuilder {
similarity index 91%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/RpcDefinitionBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RpcDefinitionBuilder.java
index 53190d0bb6df4ec6b83b57623404674c59a34060..ff30884d1b0068656fd1c474cf2f764f199ef181 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -15,17 +15,17 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.RpcDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
 
 public final class RpcDefinitionBuilder extends AbstractSchemaNodeBuilder {
     private boolean isBuilt;
@@ -5,26 +5,26 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
-import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 import org.opendaylight.controller.yang.model.util.ExtendedType;
 import org.opendaylight.controller.yang.model.util.UnknownType;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractTypeAwareBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractTypeAwareBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 public final class TypeDefinitionBuilderImpl extends AbstractTypeAwareBuilder implements TypeDefinitionBuilder {
     private SchemaPath schemaPath;
similarity index 88%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UnionTypeBuilder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java
index 6c57c25b988949587a68a878b9357fbd290f2a73..1569e98c0a4f1f92fe0bb3176497618f6c2b7aac 100644 (file)
@@ -5,23 +5,23 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
-import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 import org.opendaylight.controller.yang.model.util.UnionType;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractTypeAwareBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractTypeAwareBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 /**
  * Builder for YANG union type. User can add type to this union as
@@ -5,18 +5,18 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.builder.impl;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.util.Comparators;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
 
 public final class UnknownSchemaNodeBuilder extends AbstractSchemaNodeBuilder {
     private boolean isBuilt;
similarity index 88%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java
index ee07e8be4603ac99d14f68f2c0fbaf33abc97db6..404c01910b37e64598ba1eac28a97d2909059451 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
-package org.opendaylight.controller.yang.parser.builder.impl;\r
+package org.opendaylight.yangtools.yang.parser.builder.impl;\r
 \r
 import java.util.ArrayList;\r
 import java.util.Collections;\r
@@ -15,19 +15,19 @@ import java.util.List;
 import java.util.Map;\r
 import java.util.Set;\r
 \r
-import org.opendaylight.controller.yang.model.api.AugmentationSchema;\r
-import org.opendaylight.controller.yang.model.api.SchemaNode;\r
-import org.opendaylight.controller.yang.model.api.SchemaPath;\r
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;\r
-import org.opendaylight.controller.yang.model.api.UsesNode;\r
-import org.opendaylight.controller.yang.parser.builder.api.AbstractBuilder;\r
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder;\r
-import org.opendaylight.controller.yang.parser.builder.api.Builder;\r
-import org.opendaylight.controller.yang.parser.builder.api.DataNodeContainerBuilder;\r
-import org.opendaylight.controller.yang.parser.builder.api.SchemaNodeBuilder;\r
-import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;\r
-import org.opendaylight.controller.yang.parser.util.RefineHolder;\r
-import org.opendaylight.controller.yang.parser.util.YangParseException;\r
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;\r
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;\r
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;\r
+import org.opendaylight.yangtools.yang.model.api.UsesNode;\r
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractBuilder;\r
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;\r
+import org.opendaylight.yangtools.yang.parser.builder.api.Builder;\r
+import org.opendaylight.yangtools.yang.parser.builder.api.DataNodeContainerBuilder;\r
+import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder;\r
+import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;\r
+import org.opendaylight.yangtools.yang.parser.util.RefineHolder;\r
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;\r
 \r
 public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNodeBuilder {\r
     private boolean isBuilt;\r
similarity index 85%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/impl/SchemaContextImpl.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java
index 611d2ce1bd3119f0c29f7294dbfe2468dd2081b1..3eb87a9214e24bd84b7e51061f6e29e82aba4a87 100644 (file)
@@ -5,19 +5,19 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.impl;
+package org.opendaylight.yangtools.yang.parser.impl;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.ExtensionDefinition;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.NotificationDefinition;
-import org.opendaylight.controller.yang.model.api.RpcDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
+import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 final class SchemaContextImpl implements SchemaContext {
     private final Set<Module> modules;
similarity index 94%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/impl/YangErrorListener.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangErrorListener.java
index 2725162d0aa128c5ef59135aefb80eab9215f827..d21b51c4c921062288a1f0c4144214f73215b31b 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.impl;
+package org.opendaylight.yangtools.yang.parser.impl;
 
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.RecognitionException;
similarity index 94%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/impl/YangParserImpl.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java
index 065d270f0923c2f2a2afa66710e093b2279cc082..c5f1870b350efe47a09b0e4daca169b184304e34 100644 (file)
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.impl;
+package org.opendaylight.yangtools.yang.parser.impl;
 
-import static org.opendaylight.controller.yang.parser.util.ParserUtils.*;
+import static org.opendaylight.yangtools.yang.parser.util.ParserUtils.*;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -37,60 +37,60 @@ import org.antlr.v4.runtime.tree.ParseTreeWalker;
 import org.opendaylight.controller.antlrv4.code.gen.YangLexer;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser;
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.AnyXmlSchemaNode;
-import org.opendaylight.controller.yang.model.api.ChoiceNode;
-import org.opendaylight.controller.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.controller.yang.model.api.DataNodeContainer;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.IdentitySchemaNode;
-import org.opendaylight.controller.yang.model.api.LeafListSchemaNode;
-import org.opendaylight.controller.yang.model.api.LeafSchemaNode;
-import org.opendaylight.controller.yang.model.api.ListSchemaNode;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
-import org.opendaylight.controller.yang.model.api.SchemaNode;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.UsesNode;
-import org.opendaylight.controller.yang.model.parser.api.YangModelParser;
+import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
+import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
 import org.opendaylight.controller.yang.model.util.ExtendedType;
 import org.opendaylight.controller.yang.model.util.IdentityrefType;
 import org.opendaylight.controller.yang.model.util.UnknownType;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.Builder;
-import org.opendaylight.controller.yang.parser.builder.api.DataNodeContainerBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingMember;
-import org.opendaylight.controller.yang.parser.builder.api.SchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeAwareBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.AnyXmlBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ChoiceBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ContainerSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.DeviationBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.GroupingBuilderImpl;
-import org.opendaylight.controller.yang.parser.builder.impl.IdentitySchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.IdentityrefTypeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.LeafListSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.LeafSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ListSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ModuleBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.RpcDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.TypeDefinitionBuilderImpl;
-import org.opendaylight.controller.yang.parser.builder.impl.UnionTypeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.UsesNodeBuilderImpl;
-import org.opendaylight.controller.yang.parser.builder.impl.UsesNodeBuilderImpl.UsesNodeImpl;
-import org.opendaylight.controller.yang.parser.util.ModuleDependencySort;
-import org.opendaylight.controller.yang.parser.util.RefineHolder;
-import org.opendaylight.controller.yang.parser.util.RefineUtils;
-import org.opendaylight.controller.yang.parser.util.TypeConstraints;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
-import org.opendaylight.controller.yang.validator.YangModelBasicValidator;
+import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.Builder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataNodeContainerBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingMember;
+import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeAwareBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.AnyXmlBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ChoiceBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ContainerSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.DeviationBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.GroupingBuilderImpl;
+import org.opendaylight.yangtools.yang.parser.builder.impl.IdentitySchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.IdentityrefTypeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.LeafListSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.LeafSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ListSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.RpcDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.TypeDefinitionBuilderImpl;
+import org.opendaylight.yangtools.yang.parser.builder.impl.UnionTypeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.UsesNodeBuilderImpl;
+import org.opendaylight.yangtools.yang.parser.builder.impl.UsesNodeBuilderImpl.UsesNodeImpl;
+import org.opendaylight.yangtools.yang.parser.util.ModuleDependencySort;
+import org.opendaylight.yangtools.yang.parser.util.RefineHolder;
+import org.opendaylight.yangtools.yang.parser.util.RefineUtils;
+import org.opendaylight.yangtools.yang.parser.util.TypeConstraints;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.validator.YangModelBasicValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
similarity index 95%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/impl/YangParserListenerImpl.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java
index b6944d1a70c11620a7915b27a9d402af298594cf..c6086ee884654eb85522aa5c7604712d2907b9d6 100644 (file)
@@ -5,9 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.impl;
+package org.opendaylight.yangtools.yang.parser.impl;
 
-import static org.opendaylight.controller.yang.parser.util.ParserListenerUtils.*;
+import static org.opendaylight.yangtools.yang.parser.util.ParserListenerUtils.*;
 
 import java.net.URI;
 import java.text.DateFormat;
@@ -50,30 +50,30 @@ import org.opendaylight.controller.antlrv4.code.gen.YangParser.Units_stmtContext
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.When_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yang_version_stmtContext;
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.controller.yang.model.util.YangTypesConverter;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.AnyXmlBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ChoiceBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ChoiceCaseBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ContainerSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.DeviationBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ExtensionBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.FeatureBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.IdentitySchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.LeafListSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.LeafSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ListSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ModuleBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.NotificationBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.RpcDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.UnionTypeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.util.RefineHolder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.AnyXmlBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ChoiceBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ChoiceCaseBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ContainerSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.DeviationBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ExtensionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.FeatureBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.IdentitySchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.LeafListSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.LeafSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ListSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.NotificationBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.RpcDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.UnionTypeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.RefineHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
similarity index 89%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/BitImpl.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/BitImpl.java
index c6bbc6557e92752a5b95b799759a27d7374d1348..5cdb6c39180eb4aac652c6a9ab9c43a06784cf7f 100644 (file)
@@ -5,17 +5,17 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
 import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.BitsTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.BitsTypeDefinition.Bit;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit;
 
 final class BitImpl implements BitsTypeDefinition.Bit {
     private final Long position;
similarity index 90%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/Comparators.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/Comparators.java
index ea87eec4e9f3642cb8e88ce62b330a812870a98b..9cf0c62421665d4835a89d8fc4e2daf3fb427c9f 100644 (file)
@@ -5,12 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
 import java.util.Comparator;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 
 public class Comparators {
 
similarity index 95%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/ModuleDependencySort.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java
index aea94097148da8899c28cb525c814f5a2424d2c9..4f4c26a60426e17d8ab381c47af1ab9e6f194532 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -15,13 +15,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.ModuleImport;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
-import org.opendaylight.controller.yang.parser.builder.impl.ModuleBuilder;
-import org.opendaylight.controller.yang.parser.impl.YangParserListenerImpl;
-import org.opendaylight.controller.yang.parser.util.TopologicalSort.Node;
-import org.opendaylight.controller.yang.parser.util.TopologicalSort.NodeImpl;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.ModuleImport;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder;
+import org.opendaylight.yangtools.yang.parser.impl.YangParserListenerImpl;
+import org.opendaylight.yangtools.yang.parser.util.TopologicalSort.Node;
+import org.opendaylight.yangtools.yang.parser.util.TopologicalSort.NodeImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
similarity index 93%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/MustDefinitionImpl.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/MustDefinitionImpl.java
index 977b3fffcdf78a11d9b89bb3d82043bf344fbd7a..c1cb4a51d7d5337884524a0bde3a5a3e247e9847 100644 (file)
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
-import org.opendaylight.controller.yang.model.api.MustDefinition;
-import org.opendaylight.controller.yang.model.api.RevisionAwareXPath;
+import org.opendaylight.yangtools.yang.model.api.MustDefinition;
+import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
 
 final class MustDefinitionImpl implements MustDefinition {
     private final String mustStr;
similarity index 97%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/ParserListenerUtils.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserListenerUtils.java
index d2ca3a7695b57d9a3298d1c651fc83e01b0ef113..ca057d4e322b2bba03e39c628b201e7b3dadd843 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/eplv10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -71,23 +71,23 @@ import org.opendaylight.controller.antlrv4.code.gen.YangParser.When_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yin_element_argContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yin_element_stmtContext;
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.MustDefinition;
-import org.opendaylight.controller.yang.model.api.RevisionAwareXPath;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.BinaryTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.BitsTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.BitsTypeDefinition.Bit;
-import org.opendaylight.controller.yang.model.api.type.EnumTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.EnumTypeDefinition.EnumPair;
-import org.opendaylight.controller.yang.model.api.type.IntegerTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
-import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
-import org.opendaylight.controller.yang.model.api.type.StringTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.UnsignedIntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.MustDefinition;
+import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit;
+import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair;
+import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
 import org.opendaylight.controller.yang.model.util.BaseConstraints;
 import org.opendaylight.controller.yang.model.util.BaseTypes;
 import org.opendaylight.controller.yang.model.util.BinaryType;
@@ -108,14 +108,14 @@ import org.opendaylight.controller.yang.model.util.Uint32;
 import org.opendaylight.controller.yang.model.util.Uint64;
 import org.opendaylight.controller.yang.model.util.Uint8;
 import org.opendaylight.controller.yang.model.util.UnknownType;
-import org.opendaylight.controller.yang.parser.builder.api.Builder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.SchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ChoiceBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ChoiceCaseBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ConstraintsBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.UnionTypeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.Builder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ChoiceBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ChoiceCaseBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ConstraintsBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.UnionTypeBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
similarity index 91%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/ParserUtils.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java
index 4fc58b3d9881e46c4d66e9b8ef3237ad09aa8514..3164ed8263bced89b4dfe34948e7f3456e34d5a5 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -16,43 +16,43 @@ import java.util.Set;
 import java.util.TreeMap;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.AnyXmlSchemaNode;
-import org.opendaylight.controller.yang.model.api.ChoiceNode;
-import org.opendaylight.controller.yang.model.api.ConstraintDefinition;
-import org.opendaylight.controller.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.controller.yang.model.api.DataNodeContainer;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.LeafListSchemaNode;
-import org.opendaylight.controller.yang.model.api.LeafSchemaNode;
-import org.opendaylight.controller.yang.model.api.ListSchemaNode;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.ModuleImport;
-import org.opendaylight.controller.yang.model.api.MustDefinition;
-import org.opendaylight.controller.yang.model.api.NotificationDefinition;
-import org.opendaylight.controller.yang.model.api.RevisionAwareXPath;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
-import org.opendaylight.controller.yang.model.api.SchemaNode;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.BinaryTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.BitsTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.BooleanTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.DecimalTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.EmptyTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.EnumTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.EnumTypeDefinition.EnumPair;
-import org.opendaylight.controller.yang.model.api.type.IdentityrefTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.InstanceIdentifierTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.IntegerTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.LeafrefTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
-import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
-import org.opendaylight.controller.yang.model.api.type.StringTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.UnionTypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.UnsignedIntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
+import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.ModuleImport;
+import org.opendaylight.yangtools.yang.model.api.MustDefinition;
+import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
+import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair;
+import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
 import org.opendaylight.controller.yang.model.util.BinaryType;
 import org.opendaylight.controller.yang.model.util.BitsType;
 import org.opendaylight.controller.yang.model.util.BooleanType;
@@ -74,38 +74,38 @@ import org.opendaylight.controller.yang.model.util.Uint64;
 import org.opendaylight.controller.yang.model.util.Uint8;
 import org.opendaylight.controller.yang.model.util.UnionType;
 import org.opendaylight.controller.yang.model.util.UnknownType;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.AugmentationTargetBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.Builder;
-import org.opendaylight.controller.yang.parser.builder.api.DataNodeContainerBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingMember;
-import org.opendaylight.controller.yang.parser.builder.api.SchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeAwareBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.AnyXmlBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ChoiceBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ChoiceBuilder.ChoiceNodeImpl;
-import org.opendaylight.controller.yang.parser.builder.impl.ChoiceCaseBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ChoiceCaseBuilder.ChoiceCaseNodeImpl;
-import org.opendaylight.controller.yang.parser.builder.impl.ConstraintsBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ContainerSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ContainerSchemaNodeBuilder.ContainerSchemaNodeImpl;
-import org.opendaylight.controller.yang.parser.builder.impl.GroupingBuilderImpl;
-import org.opendaylight.controller.yang.parser.builder.impl.IdentityrefTypeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.LeafListSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.LeafSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ListSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ListSchemaNodeBuilder.ListSchemaNodeImpl;
-import org.opendaylight.controller.yang.parser.builder.impl.ModuleBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.NotificationBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.NotificationBuilder.NotificationDefinitionImpl;
-import org.opendaylight.controller.yang.parser.builder.impl.RpcDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.TypeDefinitionBuilderImpl;
-import org.opendaylight.controller.yang.parser.builder.impl.UnionTypeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationTargetBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.Builder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataNodeContainerBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingMember;
+import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeAwareBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.AnyXmlBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ChoiceBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ChoiceBuilder.ChoiceNodeImpl;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ChoiceCaseBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ChoiceCaseBuilder.ChoiceCaseNodeImpl;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ConstraintsBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ContainerSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ContainerSchemaNodeBuilder.ContainerSchemaNodeImpl;
+import org.opendaylight.yangtools.yang.parser.builder.impl.GroupingBuilderImpl;
+import org.opendaylight.yangtools.yang.parser.builder.impl.IdentityrefTypeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.LeafListSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.LeafSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ListSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ListSchemaNodeBuilder.ListSchemaNodeImpl;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.NotificationBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.NotificationBuilder.NotificationDefinitionImpl;
+import org.opendaylight.yangtools.yang.parser.builder.impl.RpcDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.TypeDefinitionBuilderImpl;
+import org.opendaylight.yangtools.yang.parser.builder.impl.UnionTypeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
 
 public final class ParserUtils {
 
similarity index 96%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/RefineHolder.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineHolder.java
index 9e57d80aa9fe60991a2b2644e4244bc9b7ca8424..7f462920ca8f71f6b8cae746a7cb55f0354eac74 100644 (file)
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
-import org.opendaylight.controller.yang.model.api.MustDefinition;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractBuilder;
+import org.opendaylight.yangtools.yang.model.api.MustDefinition;
+import org.opendaylight.yangtools.yang.parser.builder.api.AbstractBuilder;
 
 public final class RefineHolder extends AbstractBuilder {
     private final String name;
similarity index 90%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/RefineUtils.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/RefineUtils.java
index 11d00cc05c7c59de00c9513ef22877d1bbc56d80..5432fa6a0d1c26e2aa1a44efd3a653b7ee1ef914 100644 (file)
@@ -5,37 +5,37 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
-import static org.opendaylight.controller.yang.parser.util.ParserUtils.*;
+import static org.opendaylight.yangtools.yang.parser.util.ParserUtils.*;
 
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.AnyXmlSchemaNode;
-import org.opendaylight.controller.yang.model.api.ChoiceNode;
-import org.opendaylight.controller.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.LeafListSchemaNode;
-import org.opendaylight.controller.yang.model.api.LeafSchemaNode;
-import org.opendaylight.controller.yang.model.api.ListSchemaNode;
-import org.opendaylight.controller.yang.model.api.MustDefinition;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.MustDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.controller.yang.model.util.ExtendedType;
-import org.opendaylight.controller.yang.parser.builder.api.Builder;
-import org.opendaylight.controller.yang.parser.builder.api.GroupingBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.SchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.AnyXmlBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ChoiceBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ContainerSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.GroupingBuilderImpl;
-import org.opendaylight.controller.yang.parser.builder.impl.LeafListSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.LeafSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.ListSchemaNodeBuilder;
-import org.opendaylight.controller.yang.parser.builder.impl.TypeDefinitionBuilderImpl;
-import org.opendaylight.controller.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.Builder;
+import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.AnyXmlBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ChoiceBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ContainerSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.GroupingBuilderImpl;
+import org.opendaylight.yangtools.yang.parser.builder.impl.LeafListSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.LeafSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ListSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.TypeDefinitionBuilderImpl;
+import org.opendaylight.yangtools.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
 
 /**
  * Utility class with helper methods to perform operations tied to refine
similarity index 98%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/TopologicalSort.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSort.java
index 2ea289a0f70913e9f82f4d361397e0050835d3d5..bb41743ef978a8a79b2886ed0e5cc95c133dcbbf 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
 import java.util.List;
 import java.util.Set;
similarity index 98%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/TypeConstraints.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TypeConstraints.java
index 08422c839242e079dcf49392b3eb049a6cd54b04..bb1d1ed6052796f923b96795466ef032e713f493 100644 (file)
@@ -5,15 +5,15 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
-import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 import org.opendaylight.controller.yang.model.util.BaseConstraints;
 
 /**
similarity index 94%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/UnknownBoundaryNumber.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/UnknownBoundaryNumber.java
index c095bba48455d46c9b0b90265fd66dea24bc1070..9b580a9b56e92594ce30738e0e1552f18039446b 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
 /**
  * Marker object representing special 'min' or 'max' values in YANG.
similarity index 95%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/YangParseException.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangParseException.java
index 6939261a5701477676092acc5c2a4f8416ea8e98..0ec354b017650275db212612b987150d408d31e2 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/eplv10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
 public class YangParseException extends RuntimeException {
     private static final long serialVersionUID = 1239548963471793178L;
similarity index 93%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/YangValidationException.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/YangValidationException.java
index 070692612ec9017f92de6bb4bcc7a7322316fccf..265d16c56986cf8d5e3fd874546f5c9b98a6a72a 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
 /**
  * Unchecked exception thrown if yang definition is not valid according to
similarity index 98%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/validator/BasicValidations.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/BasicValidations.java
index 762b9109101b6fbbb86277e71aea054f4fa47816..1d69a9a6ac7e715d46390dbe7e20b493711e8d8d 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/eplv10.html
  */
-package org.opendaylight.controller.yang.validator;
+package org.opendaylight.yangtools.yang.validator;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -18,8 +18,8 @@ import java.util.regex.Pattern;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yang_version_stmtContext;
-import org.opendaylight.controller.yang.parser.impl.YangParserListenerImpl;
-import org.opendaylight.controller.yang.parser.util.YangValidationException;
+import org.opendaylight.yangtools.yang.parser.impl.YangParserListenerImpl;
+import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
 import com.google.common.collect.Sets;
 
similarity index 94%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/validator/ValidationUtil.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/ValidationUtil.java
index cb5af9f34928ee22548d6d0a135db6d0b53209f7..6c0e320b9e5b90839594f777e6c31df6c3e2e1be 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/eplv10.html
  */
-package org.opendaylight.controller.yang.validator;
+package org.opendaylight.yangtools.yang.validator;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -16,8 +16,8 @@ import java.util.Set;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Module_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Submodule_stmtContext;
-import org.opendaylight.controller.yang.parser.util.ParserListenerUtils;
-import org.opendaylight.controller.yang.parser.util.YangValidationException;
+import org.opendaylight.yangtools.yang.parser.util.ParserListenerUtils;
+import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
 /**
  * Validation utilities
similarity index 98%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/validator/YangModelBasicValidationListener.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidationListener.java
index 7f270fe08e9c5139aafc66c74cfe038e05ee4c0d..de15c14183c6cccaefdea4568a5f58b7d6d6c980 100644 (file)
@@ -5,14 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.validator;
+package org.opendaylight.yangtools.yang.validator;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Set;
 
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.opendaylight.controller.antlrv4.code.gen.YangParser;
+import org.opendaylight.controller.antlrv4.code.gen.*;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Anyxml_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Argument_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Augment_stmtContext;
@@ -56,8 +56,7 @@ import org.opendaylight.controller.antlrv4.code.gen.YangParser.Typedef_stmtConte
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Unique_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Uses_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yin_element_argContext;
-import org.opendaylight.controller.antlrv4.code.gen.YangParserBaseListener;
-import org.opendaylight.controller.yang.parser.impl.YangParserListenerImpl;
+import org.opendaylight.yangtools.yang.parser.impl.YangParserListenerImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
similarity index 91%
rename from yang-parser-impl/src/main/java/org/opendaylight/controller/yang/validator/YangModelBasicValidator.java
rename to yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/validator/YangModelBasicValidator.java
index ac00bc1340893fdeabc0659b0bea0d1a0d9ad1f1..8c78e40580c27bfa9bb7c0a5645487eb6295997c 100644 (file)
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.validator;
+package org.opendaylight.yangtools.yang.validator;
 
 import java.util.List;
 
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
-import org.opendaylight.controller.yang.parser.util.YangValidationException;
+import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
 /**
  * Exposed basic yang validation.
similarity index 95%
rename from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/AugmentTest.java
rename to yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/AugmentTest.java
index d6f635650f470f7396121faaa9e7e59c708e1a81..9b86db341753f61df932bbe3be23a0bc3d6ac002 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.impl;
+package org.opendaylight.yangtools.yang.parser.impl;
 
 import static org.junit.Assert.*;
 
@@ -22,16 +22,16 @@ import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.AugmentationSchema;
-import org.opendaylight.controller.yang.model.api.ChoiceCaseNode;
-import org.opendaylight.controller.yang.model.api.ChoiceNode;
-import org.opendaylight.controller.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.LeafSchemaNode;
-import org.opendaylight.controller.yang.model.api.ListSchemaNode;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
+import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.controller.yang.model.util.ExtendedType;
 import org.opendaylight.controller.yang.model.util.Leafref;
 
similarity index 93%
rename from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/GroupingTest.java
rename to yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/GroupingTest.java
index e62fdb6f3728476d81784fed2b07f44406874422..cf150d72bdaa06ef65a9612dfa39c7d77ac9ad63 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.impl;
+package org.opendaylight.yangtools.yang.parser.impl;
 
 import static org.junit.Assert.*;
 
@@ -16,21 +16,21 @@ import java.util.Set;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.controller.yang.model.api.AnyXmlSchemaNode;
-import org.opendaylight.controller.yang.model.api.AugmentationSchema;
-import org.opendaylight.controller.yang.model.api.ChoiceNode;
-import org.opendaylight.controller.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.LeafSchemaNode;
-import org.opendaylight.controller.yang.model.api.ListSchemaNode;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.MustDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaNode;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.UsesNode;
+import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.MustDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
 import org.opendaylight.controller.yang.model.util.ExtendedType;
 
 public class GroupingTest {
similarity index 91%
rename from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/TestUtils.java
rename to yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TestUtils.java
index fed8cde9655c8dc2232cd068501b523ae69777fa..00a6b70b3a81a337b6c8b250b993bf462dae1739 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.impl;
+package org.opendaylight.yangtools.yang.parser.impl;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -23,12 +23,12 @@ import java.util.List;
 import java.util.Set;
 
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.ModuleImport;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.parser.api.YangModelParser;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.ModuleImport;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser;
 
 final class TestUtils {
 
similarity index 94%
rename from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/TypesResolutionTest.java
rename to yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/TypesResolutionTest.java
index d9f256caae1b7985023ff3d9bdf4d3b3c26481eb..98c05102c5acf9fd6c5b4745665788b1bdbf496f 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.impl;
+package org.opendaylight.yangtools.yang.parser.impl;
 
 import static org.junit.Assert.*;
 
@@ -17,16 +17,16 @@ import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.IdentitySchemaNode;
-import org.opendaylight.controller.yang.model.api.LeafSchemaNode;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.type.BitsTypeDefinition.Bit;
-import org.opendaylight.controller.yang.model.api.type.EnumTypeDefinition.EnumPair;
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
-import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
-import org.opendaylight.controller.yang.model.api.type.StringTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit;
+import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
 import org.opendaylight.controller.yang.model.util.BitsType;
 import org.opendaylight.controller.yang.model.util.EnumerationType;
 import org.opendaylight.controller.yang.model.util.ExtendedType;
similarity index 97%
rename from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/YangParserNegativeTest.java
rename to yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserNegativeTest.java
index 0f5a82ff483399ba96dec4bf2dd461dd4126fce0..29092530f54b259df303b1173bb94ff2071b5603 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.impl;
+package org.opendaylight.yangtools.yang.parser.impl;
 
 import static org.junit.Assert.*;
 
@@ -17,8 +17,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
-import org.opendaylight.controller.yang.parser.util.YangParseException;
-import org.opendaylight.controller.yang.parser.util.YangValidationException;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
+import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
 public class YangParserNegativeTest {
 
similarity index 95%
rename from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/YangParserTest.java
rename to yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java
index bc0ccbd730e9e8293bfc0962e92a04ff4b52b768..90d86c9b6b01eecda4accdca09bd1ad1e70d0ab9 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.impl;
+package org.opendaylight.yangtools.yang.parser.impl;
 
 import static org.junit.Assert.*;
 
@@ -22,31 +22,31 @@ import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.AnyXmlSchemaNode;
-import org.opendaylight.controller.yang.model.api.AugmentationSchema;
-import org.opendaylight.controller.yang.model.api.ChoiceCaseNode;
-import org.opendaylight.controller.yang.model.api.ChoiceNode;
-import org.opendaylight.controller.yang.model.api.ConstraintDefinition;
-import org.opendaylight.controller.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.Deviation;
-import org.opendaylight.controller.yang.model.api.Deviation.Deviate;
-import org.opendaylight.controller.yang.model.api.ExtensionDefinition;
-import org.opendaylight.controller.yang.model.api.FeatureDefinition;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.LeafSchemaNode;
-import org.opendaylight.controller.yang.model.api.ListSchemaNode;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.ModuleImport;
-import org.opendaylight.controller.yang.model.api.NotificationDefinition;
-import org.opendaylight.controller.yang.model.api.RpcDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.Status;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.type.LengthConstraint;
-import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
+import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
+import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Deviation;
+import org.opendaylight.yangtools.yang.model.api.Deviation.Deviate;
+import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition;
+import org.opendaylight.yangtools.yang.model.api.FeatureDefinition;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.ModuleImport;
+import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
+import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.Status;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 import org.opendaylight.controller.yang.model.util.Decimal64;
 import org.opendaylight.controller.yang.model.util.ExtendedType;
 import org.opendaylight.controller.yang.model.util.Int16;
similarity index 93%
rename from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/impl/YangParserWithContextTest.java
rename to yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java
index 846b09c339a37fa751671204d123f20271fade6a..412319b0a8c76d35f639a7fc005fe2acbafef5fd 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.impl;
+package org.opendaylight.yangtools.yang.parser.impl;
 
 import static org.junit.Assert.*;
 
@@ -22,25 +22,25 @@ import java.util.Set;
 
 import org.junit.Test;
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.AnyXmlSchemaNode;
-import org.opendaylight.controller.yang.model.api.ChoiceNode;
-import org.opendaylight.controller.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.controller.yang.model.api.DataSchemaNode;
-import org.opendaylight.controller.yang.model.api.Deviation;
-import org.opendaylight.controller.yang.model.api.Deviation.Deviate;
-import org.opendaylight.controller.yang.model.api.GroupingDefinition;
-import org.opendaylight.controller.yang.model.api.IdentitySchemaNode;
-import org.opendaylight.controller.yang.model.api.LeafSchemaNode;
-import org.opendaylight.controller.yang.model.api.ListSchemaNode;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.MustDefinition;
-import org.opendaylight.controller.yang.model.api.SchemaContext;
-import org.opendaylight.controller.yang.model.api.SchemaNode;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
-import org.opendaylight.controller.yang.model.api.TypeDefinition;
-import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.controller.yang.model.api.UsesNode;
-import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Deviation;
+import org.opendaylight.yangtools.yang.model.api.Deviation.Deviate;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.MustDefinition;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
+import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 import org.opendaylight.controller.yang.model.util.ExtendedType;
 
 import com.google.common.collect.Lists;
similarity index 93%
rename from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/util/ModuleDependencySortTest.java
rename to yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java
index 70bf40499632efb4a8b70cebe74e5661a2db5989..5f128f828077f8a6306303ceebef44af5a309569 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
 import static org.hamcrest.core.AnyOf.anyOf;
 import static org.hamcrest.core.Is.is;
@@ -22,12 +22,12 @@ import java.util.Set;
 
 import org.hamcrest.Matcher;
 import org.junit.Test;
-import org.opendaylight.controller.yang.model.api.Module;
-import org.opendaylight.controller.yang.model.api.ModuleImport;
-import org.opendaylight.controller.yang.parser.builder.impl.ModuleBuilder;
-import org.opendaylight.controller.yang.parser.impl.YangParserListenerImpl;
-import org.opendaylight.controller.yang.parser.util.ModuleDependencySort.ModuleNodeImpl;
-import org.opendaylight.controller.yang.parser.util.TopologicalSort.Edge;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.ModuleImport;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder;
+import org.opendaylight.yangtools.yang.parser.impl.YangParserListenerImpl;
+import org.opendaylight.yangtools.yang.parser.util.ModuleDependencySort.ModuleNodeImpl;
+import org.opendaylight.yangtools.yang.parser.util.TopologicalSort.Edge;
 
 import com.google.common.collect.Sets;
 
similarity index 90%
rename from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/parser/util/TopologicalSortTest.java
rename to yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java
index 1cd97bfcece5fe443d19f5add97cb4b6bbcbd2c5..7e154a6b09b354b5e493de6aa081b9972562715e 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.parser.util;
+package org.opendaylight.yangtools.yang.parser.util;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
@@ -14,8 +14,8 @@ import java.util.List;
 import java.util.Set;
 
 import org.junit.Test;
-import org.opendaylight.controller.yang.parser.util.TopologicalSort.Node;
-import org.opendaylight.controller.yang.parser.util.TopologicalSort.NodeImpl;
+import org.opendaylight.yangtools.yang.parser.util.TopologicalSort.Node;
+import org.opendaylight.yangtools.yang.parser.util.TopologicalSort.NodeImpl;
 
 import com.google.common.collect.Sets;
 
similarity index 97%
rename from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/validator/YangModelValidationListTest.java
rename to yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationListTest.java
index 1db855c1b1a629004570fe4a0de99e9967b3b8be..4c72b006a26a425aa4180c8d0a41d5bdea63a403 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.validator;
+package org.opendaylight.yangtools.yang.validator;
 
 import static org.junit.Assert.assertThat;
 import static org.junit.matchers.JUnitMatchers.containsString;
@@ -20,7 +20,7 @@ import org.opendaylight.controller.antlrv4.code.gen.YangParser.Mandatory_stmtCon
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Ordered_by_argContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Type_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Unique_stmtContext;
-import org.opendaylight.controller.yang.parser.util.YangValidationException;
+import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
 public class YangModelValidationListTest {
 
similarity index 98%
rename from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/validator/YangModelValidationModuleTest.java
rename to yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationModuleTest.java
index 3f9a53fe689a926a40b5af2344a38e453ff2753c..6a8bd9df2715b6f8c4eb436bd8b67c29add70575 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.validator;
+package org.opendaylight.yangtools.yang.validator;
 
 import static org.junit.Assert.assertThat;
 import static org.junit.matchers.JUnitMatchers.containsString;
@@ -19,7 +19,7 @@ import org.opendaylight.controller.antlrv4.code.gen.YangParser.Namespace_stmtCon
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Revision_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Revision_stmtsContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yang_version_stmtContext;
-import org.opendaylight.controller.yang.parser.util.YangValidationException;
+import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
 public class YangModelValidationModuleTest {
 
similarity index 95%
rename from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/validator/YangModelValidationSubModuleTest.java
rename to yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationSubModuleTest.java
index d3276fac250adcf0da8d3abf2bed2424503f1ed5..e6e0e3eb75353e6dd872c7a611d9e416b067f30a 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.validator;
+package org.opendaylight.yangtools.yang.validator;
 
 import static org.junit.Assert.assertThat;
 import static org.junit.matchers.JUnitMatchers.containsString;
@@ -17,7 +17,7 @@ import org.junit.Test;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Belongs_to_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Submodule_header_stmtsContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Submodule_stmtContext;
-import org.opendaylight.controller.yang.parser.util.YangValidationException;
+import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
 public class YangModelValidationSubModuleTest {
 
similarity index 97%
rename from yang-parser-impl/src/test/java/org/opendaylight/controller/yang/validator/YangModelValidationTest.java
rename to yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/validator/YangModelValidationTest.java
index d15a7a24f83a3c9e86cbe195d226d7f61690c517..114dd900f63045206739d4a9224a8ca5f276366a 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.yang.validator;
+package org.opendaylight.yangtools.yang.validator;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.*;
@@ -33,8 +33,8 @@ import org.opendaylight.controller.antlrv4.code.gen.YangParser.Prefix_stmtContex
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Revision_date_stmtContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Status_argContext;
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.StringContext;
-import org.opendaylight.controller.yang.parser.impl.YangParserListenerImpl;
-import org.opendaylight.controller.yang.parser.util.YangValidationException;
+import org.opendaylight.yangtools.yang.parser.impl.YangParserListenerImpl;
+import org.opendaylight.yangtools.yang.parser.util.YangValidationException;
 
 import com.google.common.collect.Sets;