From: Alessandro Boch Date: Thu, 11 Jul 2013 14:40:53 +0000 (+0000) Subject: Merge "- Adding hashCode() and equals() method for v6Match - Fixing mac settings... X-Git-Tag: releasepom-0.1.0~291 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=53161de9c847ebedc0d663c552517c5ea181b940;hp=61bf002e8751667a0fa2c248edef94d862ed9456 Merge "- Adding hashCode() and equals() method for v6Match - Fixing mac settings in copy constructor" --- diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-api/pom.xml b/opendaylight/sal/yang-prototype/code-generator/binding-generator-api/pom.xml index be718c00a9..979dc56550 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-api/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-api/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller binding-generator - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT binding-generator-api @@ -16,4 +16,4 @@ yang-model-api - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/pom.xml b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/pom.xml index 57fbd2c67b..3d1a29a265 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller binding-generator - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT binding-generator-impl @@ -33,4 +33,4 @@ 2.1 - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-spi/pom.xml b/opendaylight/sal/yang-prototype/code-generator/binding-generator-spi/pom.xml index 35cda9e2e3..3acae11f81 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-spi/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-spi/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller binding-generator - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT binding-generator-spi @@ -16,4 +16,4 @@ yang-model-api - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/pom.xml b/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/pom.xml index 944f3dde65..44e38c6885 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller binding-generator - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT binding-generator-util @@ -24,4 +24,4 @@ yang-binding - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/pom.xml index a26444b202..fad725b1f8 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/pom.xml @@ -1,29 +1,29 @@ - 4.0.0 - - org.opendaylight.controller - binding-generator - 0.5.3-SNAPSHOT - - binding-java-api-generator - - - org.opendaylight.controller - binding-model-api - - - org.opendaylight.controller - binding-generator-impl - test - - - org.opendaylight.controller - binding-generator-util - - - junit - junit - - - \ No newline at end of file + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.opendaylight.controller + binding-generator + 0.5.4-SNAPSHOT + + binding-java-api-generator + + + org.opendaylight.controller + binding-model-api + + + org.opendaylight.controller + binding-generator-impl + test + + + org.opendaylight.controller + binding-generator-util + + + junit + junit + + + diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-model-api/pom.xml b/opendaylight/sal/yang-prototype/code-generator/binding-model-api/pom.xml index 203b5bda94..f9f4c8398b 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-model-api/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/binding-model-api/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller binding-generator - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT binding-model-api - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-sal-api-gen-plugin/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-sal-api-gen-plugin/pom.xml index 757b41735d..266da1b173 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-sal-api-gen-plugin/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-sal-api-gen-plugin/pom.xml @@ -4,7 +4,7 @@ binding-generator org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT maven-sal-api-gen-plugin diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml index a90b6045dc..0fb693380a 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml @@ -4,7 +4,7 @@ yang org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT ../../yang/pom.xml yang-maven-plugin-it @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/AdditionalConfig/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/AdditionalConfig/pom.xml index 2f732834be..c871bb1334 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/AdditionalConfig/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/AdditionalConfig/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test org.opendaylight.controller yang-maven-plugin-spi - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -19,7 +19,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -56,7 +56,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml index bb478d566c..1deb2020a9 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test org.opendaylight.controller yang-maven-plugin-spi - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -19,7 +19,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -43,7 +43,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml index 77d0b7fac2..5842b0bdaa 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml @@ -4,14 +4,14 @@ org.opendaylight.controller generator-test1 - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT org.opendaylight.controller yang-maven-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -35,7 +35,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml index a645bd0323..501fd1d903 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT generator-test2 @@ -11,9 +11,9 @@ org.opendaylight.controller generator-test1 - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT system - ${project.basedir}/../GenerateTest1/target/generator-test1-0.5.3-SNAPSHOT.jar + ${project.basedir}/../GenerateTest1/target/generator-test1-0.5.4-SNAPSHOT.jar @@ -22,7 +22,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -49,7 +49,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml index a837cf0ed2..b33abb3ed0 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml @@ -4,7 +4,7 @@ binding-generator org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test @@ -13,7 +13,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -40,11 +40,11 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test-jar - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/MissingYangInDep/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/MissingYangInDep/pom.xml index 64c66de30e..6e25e48958 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/MissingYangInDep/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/MissingYangInDep/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT generator-test2 @@ -12,7 +12,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -49,7 +49,7 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml index 85c06d0969..5349154f2b 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test @@ -11,7 +11,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -39,11 +39,11 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test-jar - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml index 4db73b913c..b73a53e30c 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test @@ -12,7 +12,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -36,11 +36,11 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test-jar - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml index 6355fbd29e..df7519ece7 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test @@ -12,7 +12,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -39,11 +39,11 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test-jar - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml index 8a30f4a1b7..e8b6ecac6e 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test @@ -12,7 +12,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -47,11 +47,11 @@ org.opendaylight.controller yang-maven-plugin-spi - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test-jar - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml index 858a4535fd..af11a69f10 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT test @@ -12,7 +12,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml index 33689b1315..8fa00dd665 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml @@ -4,7 +4,7 @@ yang org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT ../../yang/pom.xml diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml index e24ee525e7..a8a45519ac 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml @@ -4,7 +4,7 @@ yang org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT ../../yang/pom.xml yang-maven-plugin-spi @@ -43,4 +43,4 @@ - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/pom.xml index fea095c494..8776bd98ab 100644 --- a/opendaylight/sal/yang-prototype/code-generator/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/pom.xml @@ -8,7 +8,7 @@ yang-prototype 0.5-SNAPSHOT - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT binding-generator pom @@ -17,7 +17,7 @@ UTF-8 - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT diff --git a/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/pom.xml b/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/pom.xml index 135d7c85a3..2bdc38358f 100644 --- a/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/pom.xml @@ -4,7 +4,7 @@ binding-generator org.opendaylight.controller - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT maven-code-gen-sample @@ -13,7 +13,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -40,7 +40,7 @@ org.opendaylight.controller maven-sal-api-gen-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT jar @@ -65,48 +65,49 @@ - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.opendaylight.controller - - - yang-maven-plugin - - - [0.5,) - - - - generate-sources - - - - - - - - - - - - + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.opendaylight.controller + + + yang-maven-plugin + + + [0.5,) + + + + generate-sources + + + + + + + + + + + + - - org.opendaylight.controller - yang-binding - 0.5.3-SNAPSHOT - + + org.opendaylight.controller + yang-binding + 0.5.4-SNAPSHOT + - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/pom.xml b/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/pom.xml index 32dffb2e63..1e91f7099b 100644 --- a/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/samples/modeling-sample/pom.xml @@ -1,116 +1,116 @@ - 4.0.0 - - binding-generator - org.opendaylight.controller - 0.5.3-SNAPSHOT - - modeling-sample + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + binding-generator + org.opendaylight.controller + 0.5.4-SNAPSHOT + + modeling-sample - - - - org.opendaylight.controller - yang-maven-plugin - 0.5.3-SNAPSHOT - - - - generate-sources - - - src/main/yang - - - - org.opendaylight.controller.maven.sal.api.gen.plugin.CodeGeneratorImpl - - - target/generated-sources/sal - - - - false - - - + + + + org.opendaylight.controller + yang-maven-plugin + 0.5.4-SNAPSHOT + + + + generate-sources + + + src/main/yang + + + + org.opendaylight.controller.maven.sal.api.gen.plugin.CodeGeneratorImpl + + + target/generated-sources/sal + + + + false + + + - - - org.opendaylight.controller - maven-sal-api-gen-plugin - 0.5.3-SNAPSHOT - jar - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - generate-sources - - add-source - - - - target/generated-sources/sal - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.opendaylight.controller - - - yang-maven-plugin - - - [0.5,) - - - - generate-sources - - - - - - - - - - - - - - - - - org.opendaylight.controller - yang-binding - - - org.opendaylight.controller - yang-common - - + + + org.opendaylight.controller + maven-sal-api-gen-plugin + 0.5.4-SNAPSHOT + jar + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + generate-sources + + add-source + + + + target/generated-sources/sal + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.opendaylight.controller + + + yang-maven-plugin + + + [0.5,) + + + + generate-sources + + + + + + + + + + + + + + + + + org.opendaylight.controller + yang-binding + + + org.opendaylight.controller + yang-common + + \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml index 1c27737465..c796f34f55 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT ../../yang/pom.xml yang-model-parser-api @@ -13,4 +13,4 @@ yang-model-api - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml index 451f3447a9..f0ba0d2981 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml @@ -1,123 +1,125 @@ - 4.0.0 - - org.opendaylight.controller - yang - 0.5.3-SNAPSHOT - ../../yang/pom.xml - - yang-model-parser-impl - - - org.opendaylight.controller - yang-common - - - org.opendaylight.controller - yang-model-api - - - org.opendaylight.controller - yang-model-parser-api - - - org.opendaylight.controller - yang-model-util - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - org.antlr - antlr4 - 4.0 - - - org.slf4j - slf4j-simple - 1.7.2 - - - org.mockito - mockito-all - 1.8.4 - + + org.opendaylight.controller + yang + 0.5.4-SNAPSHOT + ../../yang/pom.xml + + + 4.0.0 + yang-model-parser-impl + + - com.google.guava - guava - 14.0.1 + org.opendaylight.controller + yang-common + + + org.opendaylight.controller + yang-model-api + + + org.opendaylight.controller + yang-model-parser-api + + + org.opendaylight.controller + yang-model-util - - junit - junit + org.antlr + antlr4 + 4.0 - - - - - org.antlr - antlr4-maven-plugin - 4.0 - - - - antlr4 - - - - - src/main/antlr - target/generated-sources/parser/org/opendaylight/controller/antlrv4/code/gen - true - true - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - generate-sources - - add-source - - - - target/generated-sources/parser - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.antlr - antlr4-maven-plugin - [4.0,) - - antlr4 - - - - - - - - - - - - - + + org.slf4j + slf4j-simple + 1.7.2 + + + org.mockito + mockito-all + 1.8.4 + + + com.google.guava + guava + 14.0.1 + + + junit + junit + + + + + + + org.antlr + antlr4-maven-plugin + 4.0 + + + + antlr4 + + + + + src/main/antlr + target/generated-sources/parser/org/opendaylight/controller/antlrv4/code/gen + true + true + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + generate-sources + + add-source + + + + target/generated-sources/parser + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.antlr + antlr4-maven-plugin + [4.0,) + + antlr4 + + + + + + + + + + + + + diff --git a/opendaylight/sal/yang-prototype/concepts-lang/pom.xml b/opendaylight/sal/yang-prototype/concepts-lang/pom.xml new file mode 100644 index 0000000000..68fe50d238 --- /dev/null +++ b/opendaylight/sal/yang-prototype/concepts-lang/pom.xml @@ -0,0 +1,11 @@ + + 4.0.0 + + yang-prototype + org.opendaylight.controller + 0.5-SNAPSHOT + + concepts-lang + jar + \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/Acceptor.java b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/Acceptor.java new file mode 100644 index 0000000000..43b14bb7b1 --- /dev/null +++ b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/Acceptor.java @@ -0,0 +1,20 @@ + +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.controller.concepts.lang; + +public interface Acceptor { + + /** + * + * @param input + * @return true if input is accepted. + */ + boolean isAcceptable(I input); +} diff --git a/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/AggregateTransformer.java b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/AggregateTransformer.java new file mode 100644 index 0000000000..3a60894715 --- /dev/null +++ b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/AggregateTransformer.java @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.controller.concepts.lang; +import java.util.Collection; +/** + * + * @author Tony Tkacik + * + * @param + * @param

+ */ +public interface AggregateTransformer extends Transformer { + + Collection

transformAll(Collection inputs); +} diff --git a/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/CompositeClassBasedTransformer.java b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/CompositeClassBasedTransformer.java new file mode 100644 index 0000000000..253ac85c68 --- /dev/null +++ b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/CompositeClassBasedTransformer.java @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.controller.concepts.lang; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + + +/** + * Transformer which aggregates multiple implementations of + * {@link InputClassBasedTransformer}. + * + * The transformation process is driven by {@link Class} of input. The selection + * of used {@link InputClassBasedTransformer} is done by using the {@link Class} + * of input as a key to select the transformer. + * + * This approach provides quick resolution of transformer, but does not support + * registering a super type of input to provide transformation support for all + * subclasses, one must register a new instance of transformer for each valid + * input class. + * + * If you need more flexible selection of transformation consider using + * {@link CompositeConditionalTransformer} which is slower but most flexible or + * {@link RuleBasedTransformer} which provides declarative approach for + * transformation. + * + * See {@link #transform(Object)} for more information about tranformation + * process. + * + * @author Tony Tkacik + * + * @param + * Input super-type + * @param

+ * Product + */ +public abstract class CompositeClassBasedTransformer implements + InputClassBasedTransformer, + AggregateTransformer { + + private Map, InputClassBasedTransformer> transformers = new ConcurrentHashMap, InputClassBasedTransformer>(); + + /** + * Transforms an input into instance of Product class. + * + * The final registered transformer is the one which match following + * condition: + * + * input.getClass() == transformer.getInputClass() + * + * This means that transformers are not resolved by class hierarchy, only + * selected based on final class of the input. If you need more flexible + * selection of transformation consider using + * {@link CompositeConditionalTransformer} which is slower but more + * flexible. + * + */ + @Override + public P transform(I input) { + @SuppressWarnings("unchecked") + InputClassBasedTransformer transformer = (InputClassBasedTransformer) transformers + .get(input.getClass()); + if (transformer == null) + throw new IllegalArgumentException("Transformation of: " + input + + " is not supported"); + return transformer.transform(input); + } + + /** + * Registers a new transformer. + * + * The transformer is registered for class returned by + * {@link InputClassBasedTransformer#getInputClass()}. Only one transformer + * can be registered for particular input class. + * + */ + public void addTransformer( + InputClassBasedTransformer transformer) + throws IllegalStateException { + if (transformer == null) + throw new IllegalArgumentException("Transformer should not be null"); + if (transformer.getInputClass() == null) + throw new IllegalArgumentException( + "Transformer should specify input class."); + transformers.put(transformer.getInputClass(), transformer); + } + + /** + * Removes an registered transformer. + * + * Note: Removal is currently unsupported. + * + * @param transformer + * Tranformer to be removed. + * @throws IllegalArgumentException + * If the provided transformer is null or is not registered. + */ + public void removeTransformer( + InputClassBasedTransformer transformer) + throws IllegalArgumentException { + throw new UnsupportedOperationException("Not implemented yet"); + } + + @Override + public Collection

transformAll(Collection inputs) { + Collection

ret = new ArrayList

(); + for (I i : inputs) { + ret.add(transform(i)); + } + return ret; + } + +} diff --git a/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/CompositeConditionalTransformer.java b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/CompositeConditionalTransformer.java new file mode 100644 index 0000000000..4bbd629920 --- /dev/null +++ b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/CompositeConditionalTransformer.java @@ -0,0 +1,156 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.controller.concepts.lang; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.Set; +import java.util.TreeSet; + +/** + * Composite transformer which aggregates multiple implementation and selects + * the one which accepts the input. + * + * + * @author Tony Tkacik + * + * @param + * Input class for transformation + * @param

+ * Product of transformation + */ +public class CompositeConditionalTransformer implements + SimpleConditionalTransformer, + AggregateTransformer { + + private final Comparator> comparator = new Comparator>() { + + @Override + public int compare(TransformerWithPriority o1, + TransformerWithPriority o2) { + return Integer.valueOf(o1.priority).compareTo(Integer.valueOf(o2.priority)); + } + + }; + private final Set> transformers; + + public CompositeConditionalTransformer() { + // FIXME: Add Ordering + transformers = new TreeSet>(comparator); + } + + @Override + public boolean isAcceptable(I input) { + for (SimpleConditionalTransformer trans : transformers) { + if (trans.isAcceptable(input)) { + return true; + } + } + return false; + } + + @Override + public P transform(I input) { + for (SimpleConditionalTransformer trans : transformers) { + if (trans.isAcceptable(input)) { + return trans.transform(input); + } + } + throw new IllegalStateException( + "Transformer for provided input is not available."); + } + + public void addTransformer(SimpleConditionalTransformer transformer, + int priority) throws IllegalStateException { + if (transformer == null) { + throw new IllegalArgumentException( + "transformer should not be null."); + } + TransformerWithPriority withPriority = new TransformerWithPriority( + transformer, priority); + if (false == transformers.add(withPriority)) { + throw new IllegalStateException("transformer " + transformer + + "already registered"); + } + } + + public void removeTransformer(SimpleConditionalTransformer transformer) + throws IllegalArgumentException { + if (transformer == null) { + throw new IllegalArgumentException( + "transformer should not be null."); + } + if (false == transformers.remove(transformer)) { + throw new IllegalStateException("transformer " + transformer + + "already registered"); + } + } + + @Override + public Collection

transformAll(Collection inputs) { + Collection

ret = new ArrayList

(); + for (I i : inputs) { + ret.add(transform(i)); + } + return ret; + } + + private static class TransformerWithPriority implements + SimpleConditionalTransformer { + final int priority; + final SimpleConditionalTransformer transformer; + + public TransformerWithPriority( + SimpleConditionalTransformer transformer, int priority) { + this.priority = priority; + this.transformer = transformer; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ((transformer == null) ? 0 : transformer.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + TransformerWithPriority other = (TransformerWithPriority) obj; + if (transformer == null) { + if (other.transformer != null) + return false; + } else if (!transformer.equals(other.transformer)) + return false; + return true; + } + + @Override + public boolean isAcceptable(I input) { + return transformer.isAcceptable(input); + } + + @Override + public P transform(I input) { + return transformer.transform(input); + } + + + + + + } +} diff --git a/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/InputClassBasedTransformer.java b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/InputClassBasedTransformer.java new file mode 100644 index 0000000000..e6a1024b7c --- /dev/null +++ b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/InputClassBasedTransformer.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.controller.concepts.lang; +/** + * Input class based transformer + * + * {@link Transformer} which accepts / transforms only specific classes of + * input, and is useful if the selection of transformer should be based on the + * class of the input and there is one-to-one mapping between input class and + * transformer. + * + * + * @author Tony Tkacik + * + * @param + * Common supertype of input + * @param + * Concrete type of input + * @param

+ * Product + */ +public interface InputClassBasedTransformer extends + Transformer { + + /** + * Returns an {@link Class} of input which is acceptable for transformation. + * + * @return {@link Class} of input which is acceptable for transformation. + */ + Class getInputClass(); +} diff --git a/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/RuleBasedTransformer.java b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/RuleBasedTransformer.java new file mode 100644 index 0000000000..12c793c6c8 --- /dev/null +++ b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/RuleBasedTransformer.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.controller.concepts.lang; +import java.util.Set; + +/** + * Transformer with set of acceptance rules + * + * The transformer provides a set of {@link Acceptor}s, which could be used to + * verify if the input will produce result using the transformer. + * + * The transormer is able to produce result if ANY of associated + * {@link Acceptor}s accepted result. + * + * @author Tony Tkacik + * + * @param + * Input class for transformation + * @param

+ * Product of transformation + */ +public interface RuleBasedTransformer extends Transformer { + + /** + * Set of {@link Acceptor}, which could be used to verify if the input is + * usable by transformer. + * + * The transformer is able to produce result if ANY of associated + * {@link Acceptor}s accepted result. + * + * @return Set of input acceptance rules associated to this transformer. + */ + Set> getRules(); + +} diff --git a/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/SimpleConditionalTransformer.java b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/SimpleConditionalTransformer.java new file mode 100644 index 0000000000..d5146677a9 --- /dev/null +++ b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/SimpleConditionalTransformer.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.controller.concepts.lang; +/** + * Simple condition-based transformer + * + * The transformer provides {@link #isAcceptable(Object)} method, + * which could be used to query transformer if the input will produce + * result. + * + * This interface is simplified version of {@link RuleBasedTransformer} - does not + * provide decoupling of Acceptance rule from transformer, and should be used only + * for simple use-cases. + * + * @author Tony Tkacik + * + * @param Input class for transformation + * @param

Product of transformation + */ +public interface SimpleConditionalTransformer extends Transformer, Acceptor { + + + /** + * Checks if the input is acceptable + * for processing by the transformer. + * + * @return true it the input is acceptable for processing by transformer. + */ + @Override + public boolean isAcceptable(I input); +} diff --git a/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/Transformer.java b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/Transformer.java new file mode 100644 index 0000000000..23f2d6ac9f --- /dev/null +++ b/opendaylight/sal/yang-prototype/concepts-lang/src/main/java/org/opendaylight/controller/concepts/lang/Transformer.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.controller.concepts.lang; +/** + * Factory which produces product based on input object + * + * @author Tony Tkacik + * + * @param Input + * @param

Product + */ +public interface Transformer { + /** + * Transforms input into instance of product. + * + * @param input Input which drives transformation + * @return Instance of product which was created from supplied input. + */ + P transform(I input); +} diff --git a/opendaylight/sal/yang-prototype/model/pom.xml b/opendaylight/sal/yang-prototype/model/pom.xml index d5a806a7b3..44f59bc36b 100644 --- a/opendaylight/sal/yang-prototype/model/pom.xml +++ b/opendaylight/sal/yang-prototype/model/pom.xml @@ -20,7 +20,7 @@ org.opendaylight.controller yang-maven-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT @@ -46,7 +46,7 @@ org.opendaylight.controller maven-sal-api-gen-plugin - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT jar @@ -112,12 +112,12 @@ org.opendaylight.controller yang-binding - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT org.opendaylight.controller yang-common - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/pom.xml b/opendaylight/sal/yang-prototype/pom.xml index 7df5bfef6e..741e2177ff 100644 --- a/opendaylight/sal/yang-prototype/pom.xml +++ b/opendaylight/sal/yang-prototype/pom.xml @@ -6,6 +6,7 @@ 0.5-SNAPSHOT pom + concepts-lang yang code-generator model diff --git a/opendaylight/sal/yang-prototype/sal/pom.xml b/opendaylight/sal/yang-prototype/sal/pom.xml index 2604a45acf..8af01c1a16 100644 --- a/opendaylight/sal/yang-prototype/sal/pom.xml +++ b/opendaylight/sal/yang-prototype/sal/pom.xml @@ -1,107 +1,136 @@ - 4.0.0 - org.opendaylight.controller - sal - 1.0-SNAPSHOT - pom + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + org.opendaylight.controller + sal + 1.0-SNAPSHOT + pom - - sal-common - sal-common-util - sal-core-api - sal-data-api - sal-binding-api - sal-binding-spi - sal-binding-broker-impl - sal-schema-repository-api - sal-core-spi - sal-broker-impl - sal-core-demo - + + sal-common + sal-common-util + sal-core-api + sal-data-api + sal-binding-api + sal-binding-spi + sal-binding-broker-impl + sal-schema-repository-api + sal-core-spi + sal-broker-impl + - - - - com.google.guava - guava - 14.0.1 - jar - - - org.slf4j - slf4j-api - 1.7.2 - - - junit - junit - 4.10 - - - + + 0.5.4-SNAPSHOT + - - - junit - junit - test - true - - - org.mockito - mockito-all - 1.9.5 - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - true - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - maven - - - - - aggregate - - site - - - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.4.0 - - Max - Low - site - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - - \ No newline at end of file + + + + com.google.guava + guava + 14.0.1 + jar + + + org.slf4j + slf4j-api + 1.7.2 + + + junit + junit + 4.10 + + + org.opendaylight.controller + yang-binding + ${yang.version} + + + org.opendaylight.controller + yang-common + ${yang.version} + + + org.opendaylight.controller + yang-data-api + ${yang.version} + + + org.opendaylight.controller + yang-model-api + ${yang.version} + + + org.opendaylight.controller + yang-data-util + ${yang.version} + + + + + + + + junit + junit + test + true + + + org.mockito + mockito-all + 1.9.5 + test + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0 + true + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8.1 + + maven + + + + + aggregate + + site + + + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.4.0 + + Max + Low + site + + + + org.codehaus.mojo + jdepend-maven-plugin + 2.0-beta-2 + + + + diff --git a/opendaylight/sal/yang-prototype/sal/sal-binding-api/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-binding-api/pom.xml index b339e30070..92cfc3ba7a 100644 --- a/opendaylight/sal/yang-prototype/sal/sal-binding-api/pom.xml +++ b/opendaylight/sal/yang-prototype/sal/sal-binding-api/pom.xml @@ -1,27 +1,28 @@ - - 4.0.0 - - org.opendaylight.controller - sal - 1.0-SNAPSHOT - - sal-binding-api - - - - org.opendaylight.controller - yang-common - 1.0 - - - org.opendaylight.controller - yang-binding - 1.0 - - - org.opendaylight.controller - sal-common - 1.0-SNAPSHOT - - + + 4.0.0 + + org.opendaylight.controller + sal + 1.0-SNAPSHOT + + sal-binding-api + + + + org.opendaylight.controller + yang-common + + + + org.opendaylight.controller + yang-binding + + + + org.opendaylight.controller + sal-common + 1.0-SNAPSHOT + + \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml index 2d427cb61f..3073bec988 100644 --- a/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml +++ b/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml @@ -1,46 +1,46 @@ - 4.0.0 - - org.opendaylight.controller - sal - 1.0-SNAPSHOT - - sal-binding-broker-impl + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.opendaylight.controller + sal + 1.0-SNAPSHOT + + sal-binding-broker-impl - - - org.opendaylight.controller - sal-common-util - 1.0-SNAPSHOT - - - org.opendaylight.controller - sal-binding-api - 1.0-SNAPSHOT - - - org.opendaylight.controller - sal-binding-spi - 1.0-SNAPSHOT - - - org.opendaylight.controller - sal-core-api - 1.0-SNAPSHOT - + + + org.opendaylight.controller + sal-common-util + 1.0-SNAPSHOT + + + org.opendaylight.controller + sal-binding-api + 1.0-SNAPSHOT + + + org.opendaylight.controller + sal-binding-spi + 1.0-SNAPSHOT + + + org.opendaylight.controller + sal-core-api + 1.0-SNAPSHOT + - - org.slf4j - slf4j-api - + + org.slf4j + slf4j-api + - - com.google.guava - guava - jar - - + + com.google.guava + guava + jar + + \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/sal/sal-binding-spi/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-binding-spi/pom.xml index 720d1e91c3..fd7fad6f14 100644 --- a/opendaylight/sal/yang-prototype/sal/sal-binding-spi/pom.xml +++ b/opendaylight/sal/yang-prototype/sal/sal-binding-spi/pom.xml @@ -1,22 +1,28 @@ - - 4.0.0 - - org.opendaylight.controller - sal - 1.0-SNAPSHOT - - sal-binding-spi - - - - org.opendaylight.controller - sal-binding-api - 1.0-SNAPSHOT - - - org.opendaylight.controller - sal-core-api - 1.0-SNAPSHOT - - + + 4.0.0 + + org.opendaylight.controller + sal + 1.0-SNAPSHOT + + sal-binding-spi + + + + org.opendaylight.controller + sal-binding-api + 1.0-SNAPSHOT + + + org.opendaylight.controller + sal-core-api + 1.0-SNAPSHOT + + + org.opendaylight.controller + concepts-lang + 0.5-SNAPSHOT + + \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/DataDomToJavaTransformer.java b/opendaylight/sal/yang-prototype/sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/DataDomToJavaTransformer.java new file mode 100644 index 0000000000..db35de1ab7 --- /dev/null +++ b/opendaylight/sal/yang-prototype/sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/DataDomToJavaTransformer.java @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.sal.binding.spi; + +import org.opendaylight.controller.concepts.lang.Transformer; +import org.opendaylight.controller.yang.binding.DataObject; +import org.opendaylight.controller.yang.common.QName; +import org.opendaylight.controller.yang.data.api.CompositeNode; + +public interface DataDomToJavaTransformer

extends Transformer { + + /** + * Returns a QName of valid input composite node. + * + * @return + */ + QName getQName(); +} diff --git a/opendaylight/sal/yang-prototype/sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/JavaToDataDomTransformer.java b/opendaylight/sal/yang-prototype/sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/JavaToDataDomTransformer.java new file mode 100644 index 0000000000..3c4d486012 --- /dev/null +++ b/opendaylight/sal/yang-prototype/sal/sal-binding-spi/src/main/java/org/opendaylight/controller/sal/binding/spi/JavaToDataDomTransformer.java @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.sal.binding.spi; + +import org.opendaylight.controller.concepts.lang.InputClassBasedTransformer; +import org.opendaylight.controller.yang.binding.DataObject; +import org.opendaylight.controller.yang.data.api.CompositeNode; + +public interface JavaToDataDomTransformer extends + InputClassBasedTransformer { +} diff --git a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-broker-impl/pom.xml index c195fe4ae2..779a6dc6ab 100644 --- a/opendaylight/sal/yang-prototype/sal/sal-broker-impl/pom.xml +++ b/opendaylight/sal/yang-prototype/sal/sal-broker-impl/pom.xml @@ -1,36 +1,36 @@ - 4.0.0 - - org.opendaylight.controller - sal - 1.0-SNAPSHOT - - sal-broker-impl - - - org.opendaylight.controller - sal-core-api - 1.0-SNAPSHOT - - - org.opendaylight.controller - sal-common-util - 1.0-SNAPSHOT - - - org.opendaylight.controller - sal-core-spi - 1.0-SNAPSHOT - - - org.slf4j - slf4j-api - - - com.google.guava - guava - jar - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.opendaylight.controller + sal + 1.0-SNAPSHOT + + sal-broker-impl + + + org.opendaylight.controller + sal-core-api + 1.0-SNAPSHOT + + + org.opendaylight.controller + sal-common-util + 1.0-SNAPSHOT + + + org.opendaylight.controller + sal-core-spi + 1.0-SNAPSHOT + + + org.slf4j + slf4j-api + + + com.google.guava + guava + jar + + \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/sal/sal-common-util/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-common-util/pom.xml index b8be514c02..fedd6d12f0 100644 --- a/opendaylight/sal/yang-prototype/sal/sal-common-util/pom.xml +++ b/opendaylight/sal/yang-prototype/sal/sal-common-util/pom.xml @@ -1,24 +1,23 @@ - 4.0.0 - - org.opendaylight.controller - sal - 1.0-SNAPSHOT - - sal-common-util + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.opendaylight.controller + sal + 1.0-SNAPSHOT + + sal-common-util - - - org.opendaylight.controller - yang-common - 1.0 - - - org.opendaylight.controller - sal-common - 1.0-SNAPSHOT - - + + + org.opendaylight.controller + yang-common + + + org.opendaylight.controller + sal-common + 1.0-SNAPSHOT + + \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/sal/sal-common/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-common/pom.xml index a144b542da..89cf5207ed 100644 --- a/opendaylight/sal/yang-prototype/sal/sal-common/pom.xml +++ b/opendaylight/sal/yang-prototype/sal/sal-common/pom.xml @@ -1,14 +1,14 @@ - 4.0.0 - - org.opendaylight.controller - sal - 1.0-SNAPSHOT - - sal-common + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.opendaylight.controller + sal + 1.0-SNAPSHOT + + sal-common - - + + \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/sal/sal-core-api/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-core-api/pom.xml index 7ced1746fc..e82392d24a 100644 --- a/opendaylight/sal/yang-prototype/sal/sal-core-api/pom.xml +++ b/opendaylight/sal/yang-prototype/sal/sal-core-api/pom.xml @@ -1,29 +1,27 @@ - 4.0.0 - - org.opendaylight.controller - sal - 1.0-SNAPSHOT - - sal-core-api + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.opendaylight.controller + sal + 1.0-SNAPSHOT + + sal-core-api - - - org.opendaylight.controller - sal-common - 1.0-SNAPSHOT - + + + org.opendaylight.controller + sal-common + 1.0-SNAPSHOT + - - org.opendaylight.controller - yang-data-api - 1.0 - - - org.opendaylight.controller - yang-model-api - 1.0 - - + + org.opendaylight.controller + yang-data-api + + + org.opendaylight.controller + yang-model-api + + \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/sal/sal-core-demo/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-core-demo/pom.xml index a162f52d69..96af32bc7a 100644 --- a/opendaylight/sal/yang-prototype/sal/sal-core-demo/pom.xml +++ b/opendaylight/sal/yang-prototype/sal/sal-core-demo/pom.xml @@ -18,7 +18,6 @@ org.opendaylight.controller yang-data-util - 1.0 org.slf4j diff --git a/opendaylight/sal/yang-prototype/sal/sal-schema-repository-api/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-schema-repository-api/pom.xml index db0ee84c47..b67529ac35 100644 --- a/opendaylight/sal/yang-prototype/sal/sal-schema-repository-api/pom.xml +++ b/opendaylight/sal/yang-prototype/sal/sal-schema-repository-api/pom.xml @@ -10,7 +10,6 @@ org.opendaylight.controller yang-model-api - 1.0 \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/yang/pom.xml b/opendaylight/sal/yang-prototype/yang/pom.xml index 3076a6fd67..fc50604994 100644 --- a/opendaylight/sal/yang-prototype/yang/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/pom.xml @@ -1,34 +1,37 @@ - 4.0.0 - - org.opendaylight.controller - yang-prototype - 0.5-SNAPSHOT - - 0.5.3-SNAPSHOT - yang - pom + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + + org.opendaylight.controller + yang-prototype + 0.5-SNAPSHOT + + + 4.0.0 + 0.5.4-SNAPSHOT + yang + pom UTF-8 - - yang-common - yang-data-api - yang-data-util + + yang-common + yang-data-api + yang-data-util yang-data-impl - yang-model-api - yang-model-util - yang-binding - ../code-generator/yang-model-parser-api - ../code-generator/yang-model-parser-impl - ../code-generator/maven-yang - ../code-generator/maven-yang-plugin - ../code-generator/maven-yang-plugin-it - + yang-model-api + yang-model-util + yang-binding + yang-ext + ../code-generator/yang-model-parser-api + ../code-generator/yang-model-parser-impl + ../code-generator/maven-yang + ../code-generator/maven-yang-plugin + ../code-generator/maven-yang-plugin-it + @@ -86,53 +89,53 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - true - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - maven - - - - - aggregate - - site - - - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.4.0 - - Max - Low - site - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0 + true + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8.1 + + maven + + + + + aggregate + + site + + + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.4.0 + + Max + Low + site + + + + org.codehaus.mojo + jdepend-maven-plugin + 2.0-beta-2 + + + diff --git a/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml index 2eab3bb756..79add78254 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT yang-binding - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml index fa78e89474..a94013b288 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT yang-common @@ -13,4 +13,4 @@ ${slf4j.version} - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml index 903ea36404..28f25946ba 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml @@ -1,16 +1,17 @@ - - 4.0.0 - - org.opendaylight.controller - yang - 0.5.3-SNAPSHOT - - yang-data-api - - - - org.opendaylight.controller - yang-common - - + + 4.0.0 + + org.opendaylight.controller + yang + 0.5.4-SNAPSHOT + + yang-data-api + + + + org.opendaylight.controller + yang-common + + \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/yang/yang-data-impl/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-data-impl/pom.xml index 5843de1af2..41fd1139ae 100755 --- a/opendaylight/sal/yang-prototype/yang/yang-data-impl/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-data-impl/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller yang - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT yang-data-impl @@ -69,4 +69,4 @@ test - \ No newline at end of file + diff --git a/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml index ea03a19a16..722a379aa3 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml @@ -1,15 +1,16 @@ - - 4.0.0 - - org.opendaylight.controller - yang - 0.5.3-SNAPSHOT - - yang-data-util - - - org.opendaylight.controller - yang-data-api - - + + 4.0.0 + + org.opendaylight.controller + yang + 0.5.4-SNAPSHOT + + yang-data-util + + + org.opendaylight.controller + yang-data-api + + \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/yang/yang-ext/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-ext/pom.xml new file mode 100644 index 0000000000..85ecb91b33 --- /dev/null +++ b/opendaylight/sal/yang-prototype/yang/yang-ext/pom.xml @@ -0,0 +1,100 @@ + + 4.0.0 + + org.opendaylight.controller + yang + 0.5.4-SNAPSHOT + + yang-ext + 2013.09.07-SNAPSHOT + + + + + org.opendaylight.controller + yang-maven-plugin + 0.5.4-SNAPSHOT + + + + generate-sources + + + src/main/yang + + + false + + + + + + org.opendaylight.controller + maven-sal-api-gen-plugin + 0.5.4-SNAPSHOT + jar + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + generate-sources + + add-source + + + + target/generated-sources/sal + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.opendaylight.controller + + + yang-maven-plugin + + + [0.5,) + + + + generate-sources + + + + + + + + + + + + + + + diff --git a/opendaylight/sal/yang-prototype/yang/yang-ext/src/main/yang/yang-ext.yang b/opendaylight/sal/yang-prototype/yang/yang-ext/src/main/yang/yang-ext.yang new file mode 100644 index 0000000000..22aa48adba --- /dev/null +++ b/opendaylight/sal/yang-prototype/yang/yang-ext/src/main/yang/yang-ext.yang @@ -0,0 +1,60 @@ +module yang-ext { + yang-version 1; + namespace "urn:opendaylight:params:ns:yang:extension:yang-ext"; + prefix "ext"; + + contact "Anton Tkacik "; + + revision "2013-07-09" { + description ""; + } + + // Augmentation name + + extension "augment-identifier" { + description + "YANG language extension which assigns an identifier to + augmentation. Augment identifier is used to identify + specific augment statement by name. + + The identifier syntax is defined formally defined by the rule + 'identifier' in Section 12 of RFC 6020. + + All augment identifiers defined in a namespace MUST be unique. + The namespace of augment identifiers is shared by module and + its submodules. + "; + /* + Discussion: + This extension allows for ease of development / debug + of YANG modules and it is suitable for code generation, + where each augment statement is nicely identified by + unique name instead of combination of augment target + and when condition. + */ + argument "identifier"; + } + + + // Context-aware RPCs + + grouping rpc-context-ref { + description + "A reference to RPC context."; + leaf context-instance { + type instance-identifier; + description "Pointer to the context. "; + } + } + + extension "rpc-context-instance" { + description + "YANG language extension which defines enclosing (parent) + schema node as referencable context for RPCs. + + The argument is identity which is used to identify RPC context + type."; + + argument "context-type"; + } +} \ No newline at end of file diff --git a/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml index a90c6276d0..8c4cb35196 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml @@ -1,15 +1,16 @@ - - 4.0.0 - - org.opendaylight.controller - yang - 0.5.3-SNAPSHOT - - yang-model-api - - - org.opendaylight.controller - yang-common - - - \ No newline at end of file + + 4.0.0 + + org.opendaylight.controller + yang + 0.5.4-SNAPSHOT + + yang-model-api + + + org.opendaylight.controller + yang-common + + + diff --git a/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml index e2caca8e8a..b865ebe015 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT yang-model-util