From 96acf0a1dc9bbc194bb60eeb4a7cc6515fad7332 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Sun, 10 Aug 2014 23:56:11 -0500 Subject: [PATCH] Working md-sal features, including restconf, toaster, flow-services Note: DO NOT MERGE until https://git.opendaylight.org/gerrit/9847 (yangtools) is merged as it is needed for this change. Change-Id: Iad975cfb63b62930465edcd9e415856873b5acde Signed-off-by: Ed Warnicke --- features/config-netty/pom.xml | 28 ++- .../src/main/resources/features.xml | 4 +- features/config-persister/pom.xml | 50 ++++- .../src/main/resources/features.xml | 21 +- features/config/pom.xml | 70 +++++- .../config/src/main/resources/features.xml | 57 ++--- features/flow/pom.xml | 120 +++++++++++ features/flow/src/main/resources/features.xml | 26 +++ features/mdsal/pom.xml | 161 +++++++++++++- .../mdsal/src/main/resources/features.xml | 90 ++++---- features/netconf/pom.xml | 86 +++++++- .../netconf/src/main/resources/features.xml | 39 ++-- features/pom.xml | 1 + features/protocol-framework/pom.xml | 8 +- .../src/main/resources/features.xml | 6 +- opendaylight/commons/opendaylight/pom.xml | 60 +++++- .../distribution/opendaylight-karaf/pom.xml | 17 +- .../configuration/initial/00-netty.xml | 60 ------ .../configuration/initial/01-md-sal.xml | 203 ------------------ .../initial/03-toaster-sample.xml | 73 ------- .../src/main/resources/etc/custom.properties | 17 +- .../src/main/resources/etc/jre.properties | 9 +- .../md-sal/sal-rest-connector-config/pom.xml | 26 +++ .../resources/initial/10-rest-connector.xml | 2 +- 24 files changed, 753 insertions(+), 481 deletions(-) create mode 100644 features/flow/pom.xml create mode 100644 features/flow/src/main/resources/features.xml delete mode 100644 opendaylight/distribution/opendaylight-karaf/src/main/resources/configuration/initial/00-netty.xml delete mode 100644 opendaylight/distribution/opendaylight-karaf/src/main/resources/configuration/initial/01-md-sal.xml delete mode 100644 opendaylight/distribution/opendaylight-karaf/src/main/resources/configuration/initial/03-toaster-sample.xml diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml index 16fd975130..2f4b4b1e21 100644 --- a/features/config-netty/pom.xml +++ b/features/config-netty/pom.xml @@ -7,7 +7,7 @@ 0.2.5-SNAPSHOT ../../opendaylight/config/ - config-netty-features + features-config-netty pom @@ -18,11 +18,35 @@ org.opendaylight.controller - config-persister-features + features-config-persister features xml runtime + + org.opendaylight.controller + netty-event-executor-config + + + org.opendaylight.controller + netty-threadgroup-config + + + org.opendaylight.controller + netty-timer-config + + + org.opendaylight.controller + threadpool-config-api + + + org.opendaylight.controller + threadpool-config-impl + + + org.opendaylight.controller + config-netty-config + diff --git a/features/config-netty/src/main/resources/features.xml b/features/config-netty/src/main/resources/features.xml index f1b2d1f753..7f57d8cb84 100644 --- a/features/config-netty/src/main/resources/features.xml +++ b/features/config-netty/src/main/resources/features.xml @@ -3,7 +3,7 @@ - mvn:org.opendaylight.controller/config-persister-features/${config.version}/xml/features + mvn:org.opendaylight.controller/features-config-persister/${config.version}/xml/features odl-config-netty-config-api mvn:org.opendaylight.controller/netty-event-executor-config/${project.version} @@ -12,6 +12,6 @@ mvn:org.opendaylight.controller/threadpool-config-api/${project.version} mvn:org.opendaylight.controller/threadpool-config-impl/${project.version} odl-config-startup - mvn:org.opendaylight.controller/config-netty-config/${config.version}/xml/config + mvn:org.opendaylight.controller/config-netty-config/${config.version}/xml/config \ No newline at end of file diff --git a/features/config-persister/pom.xml b/features/config-persister/pom.xml index ec1520ed98..6dc8941345 100644 --- a/features/config-persister/pom.xml +++ b/features/config-persister/pom.xml @@ -7,7 +7,7 @@ 0.2.5-SNAPSHOT ../../opendaylight/config/ - config-persister-features + features-config-persister pom @@ -26,18 +26,62 @@ org.opendaylight.controller - netconf-features + features-netconf features xml runtime org.opendaylight.controller - config-features + features-config features xml runtime + + org.opendaylight.controller + config-persister-api + + + org.opendaylight.controller + config-persister-file-xml-adapter + + + org.opendaylight.controller + config-persister-impl + + + org.opendaylight.controller + config-persister-feature-adapter + + + org.opendaylight.controller + netconf-util + + + org.opendaylight.controller + netconf-mapping-api + + + com.google.guava + guava + + + commons-io + commons-io + + + org.apache.commons + commons-lang3 + + + org.eclipse.persistence + org.eclipse.persistence.core + + + org.eclipse.persistence + org.eclipse.persistence.moxy + diff --git a/features/config-persister/src/main/resources/features.xml b/features/config-persister/src/main/resources/features.xml index 2273a4a309..a3c005b3bd 100644 --- a/features/config-persister/src/main/resources/features.xml +++ b/features/config-persister/src/main/resources/features.xml @@ -4,22 +4,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/netconf-features/${netconf.version}/xml/features - mvn:org.opendaylight.controller/config-features/${config.version}/xml/features - - odl-config-netconf-connector + mvn:org.opendaylight.controller/features-netconf/${netconf.version}/xml/features + mvn:org.opendaylight.controller/features-config/${config.version}/xml/features + odl-config-persister - odl-netconf-impl + odl-config-startup odl-netconf-api odl-config-api - yangtools-binding-generator + odl-yangtools-binding-generator mvn:org.opendaylight.controller/config-persister-api/${project.version} mvn:org.opendaylight.controller/config-persister-file-xml-adapter/${project.version} - mvn:org.opendaylight.controller/config-persister-directory-xml-adapter/${project.version} mvn:org.opendaylight.controller/config-persister-impl/${project.version} - + mvn:org.opendaylight.controller/config-persister-feature-adapter/${project.version} mvn:org.opendaylight.controller/netconf-util/${netconf.version} mvn:org.opendaylight.controller/netconf-mapping-api/${netconf.version} @@ -29,4 +27,9 @@ mvn:org.eclipse.persistence/org.eclipse.persistence.core/${eclipse.persistence.version} mvn:org.eclipse.persistence/org.eclipse.persistence.moxy/${eclipse.persistence.version} - \ No newline at end of file + + odl-config-netconf-connector + odl-config-persister + odl-netconf-impl + + diff --git a/features/config/pom.xml b/features/config/pom.xml index 7e5dd6472b..c69e11bed2 100644 --- a/features/config/pom.xml +++ b/features/config/pom.xml @@ -7,7 +7,7 @@ 0.2.5-SNAPSHOT ../../opendaylight/config/ - config-features + features-config pom @@ -24,6 +24,74 @@ xml runtime + + org.opendaylight.controller + sal-common + + + org.opendaylight.controller + sal-common-api + + + org.opendaylight.controller + sal-common-impl + + + org.opendaylight.controller + sal-common-util + + + org.opendaylight.controller + config-api + + + org.opendaylight.controller + netty-config-api + + + io.netty + netty-transport + + + io.netty + netty-common + + + io.netty + netty-buffer + + + org.opendaylight.controller + config-util + + + org.opendaylight.controller + yang-jmx-generator + + + org.opendaylight.controller + shutdown-api + + + org.opendaylight.controller + shutdown-impl + + + org.osgi + org.osgi.core + + + com.google.guava + guava + + + org.javassist + javassist + + + org.opendaylight.controller + config-manager + diff --git a/features/config/src/main/resources/features.xml b/features/config/src/main/resources/features.xml index de5b198173..6c0d32427d 100644 --- a/features/config/src/main/resources/features.xml +++ b/features/config/src/main/resources/features.xml @@ -5,45 +5,52 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - - yangtools-concepts - yangtools-binding - yangtools-binding-generator - odl-mdsal-commons - odl-config-api - mvn:org.opendaylight.controller/config-util/${project.version} - mvn:org.opendaylight.controller/yang-jmx-generator/${project.version} - mvn:org.opendaylight.controller/shutdown-api/${project.version} - mvn:org.opendaylight.controller/shutdown-impl/${project.version} - mvn:org.osgi/org.osgi.core/${osgi.core.version} - mvn:com.google.guava/guava/${guava.version} - mvn:org.javassist/javassist/${javassist.version} + + odl-mdsal-common + odl-config-api + odl-config-netty-config-api + odl-config-core + odl-config-manager - - odl-config-core - mvn:org.opendaylight.controller/config-manager/${project.version} + + + odl-yangtools-data-binding + mvn:org.opendaylight.controller/sal-common/${mdsal.version} + mvn:org.opendaylight.controller/sal-common-api/${mdsal.version} + mvn:org.opendaylight.controller/sal-common-impl/${mdsal.version} + mvn:org.opendaylight.controller/sal-common-util/${mdsal.version} mvn:org.opendaylight.controller/config-api/${project.version} - - - yangtools-concepts - yangtools-binding + odl-yangtools-common + odl-yangtools-binding + odl-config-api mvn:org.opendaylight.controller/netty-config-api/${project.version} - - mvn:io.netty/netty-transport/${netty.version} mvn:io.netty/netty-common/${netty.version} mvn:io.netty/netty-buffer/${netty.version} + + + odl-yangtools-common + odl-yangtools-binding + odl-yangtools-binding-generator + odl-mdsal-common odl-config-api + mvn:org.opendaylight.controller/config-util/${project.version} + mvn:org.opendaylight.controller/yang-jmx-generator/${project.version} + mvn:org.opendaylight.controller/shutdown-api/${project.version} + mvn:org.opendaylight.controller/shutdown-impl/${project.version} + mvn:org.osgi/org.osgi.core/${osgi.core.version} + mvn:com.google.guava/guava/${guava.version} + mvn:org.javassist/javassist/${javassist.version} - - mvn:org.opendaylight.controller/netconf-config-dispatcher/${project.version} + + odl-config-core + mvn:org.opendaylight.controller/config-manager/${project.version} - \ No newline at end of file diff --git a/features/flow/pom.xml b/features/flow/pom.xml new file mode 100644 index 0000000000..09bb6c91e6 --- /dev/null +++ b/features/flow/pom.xml @@ -0,0 +1,120 @@ + + + 4.0.0 + + org.opendaylight.controller + sal-parent + 1.1-SNAPSHOT + ../../opendaylight/md-sal + + features-flow + + pom + + + features.xml + + + + + org.opendaylight.controller + features-mdsal + ${mdsal.version} + features + xml + runtime + + + org.opendaylight.controller.model + model-flow-base + + + org.opendaylight.controller.model + model-flow-service + + + org.opendaylight.controller.model + model-flow-statistics + + + org.opendaylight.controller.model + model-inventory + + + org.opendaylight.controller.model + model-topology + + + org.opendaylight.controller.md + topology-manager + + + org.opendaylight.controller.md + topology-lldp-discovery + + + org.opendaylight.controller.md + statistics-manager + + + org.opendaylight.controller.md + inventory-manager + + + org.opendaylight.controller.md + forwardingrules-manager + + + + + + + true + src/main/resources + + + + + org.apache.maven.plugins + maven-resources-plugin + + + filter + + resources + + generate-resources + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/${features.file} + xml + features + + + + + + + + + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + + diff --git a/features/flow/src/main/resources/features.xml b/features/flow/src/main/resources/features.xml new file mode 100644 index 0000000000..3f914be4ae --- /dev/null +++ b/features/flow/src/main/resources/features.xml @@ -0,0 +1,26 @@ + + + + mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features + + odl-yangtools-models + mvn:org.opendaylight.controller.model/model-flow-base/${project.version} + mvn:org.opendaylight.controller.model/model-flow-service/${project.version} + mvn:org.opendaylight.controller.model/model-flow-statistics/${project.version} + mvn:org.opendaylight.controller.model/model-inventory/${project.version} + mvn:org.opendaylight.controller.model/model-topology/${project.version} + + + odl-mdsal-broker + odl-flow-model + mvn:org.opendaylight.controller.md/topology-manager/${project.version} + mvn:org.opendaylight.controller.md/topology-lldp-discovery/${project.version} + mvn:org.opendaylight.controller.md/statistics-manager/${project.version} + mvn:org.opendaylight.controller.md/inventory-manager/${project.version} + mvn:org.opendaylight.controller.md/forwardingrules-manager/${project.version} + mvn:org.opendaylight.controller/liblldp/${sal.version} + + + diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml index 2983c5efab..4f1ba98e5c 100644 --- a/features/mdsal/pom.xml +++ b/features/mdsal/pom.xml @@ -7,7 +7,7 @@ 1.1-SNAPSHOT ../../opendaylight/md-sal - mdsal-features + features-mdsal pom @@ -15,7 +15,164 @@ features.xml - + + + org.opendaylight.yangtools + features-yangtools + features + xml + runtime + + + org.opendaylight.controller + features-config + features + xml + runtime + + + org.opendaylight.controller + features-config-persister + features + xml + runtime + + + org.opendaylight.controller + features-config-netty + features + xml + runtime + + + org.opendaylight.controller + sal-core-api + + + org.opendaylight.controller + sal-core-api + + + org.opendaylight.controller + sal-core-spi + + + org.opendaylight.controller + sal-broker-impl + + + org.opendaylight.controller + sal-binding-api + + + org.opendaylight.controller + sal-binding-config + + + org.opendaylight.controller + sal-binding-broker-impl + + + org.opendaylight.controller + sal-binding-util + + + org.opendaylight.controller + sal-connector-api + + + org.opendaylight.controller + sal-inmemory-datastore + + + org.opendaylight.controller + md-sal-config + + + org.opendaylight.controller + sal-netconf-connector + + + org.opendaylight.controller.model + model-inventory + + + org.opendaylight.controller + netconf-config-dispatcher + + + org.opendaylight.controller + netconf-connector-config + + + org.opendaylight.controller + sal-rest-connector + + + com.google.code.gson + gson + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-server + + + org.opendaylight.controller.thirdparty + com.sun.jersey.jersey-servlet + + + io.netty + netty-buffer + + + io.netty + netty-codec + + + io.netty + netty-codec-http + + + io.netty + netty-common + + + io.netty + netty-handler + + + io.netty + netty-transport + + + org.opendaylight.controller + sal-remote + + + org.opendaylight.controller + sal-rest-connector-config + + + org.opendaylight.controller.samples + sample-toaster + + + org.opendaylight.controller.samples + sample-toaster-provider + + + org.opendaylight.controller.samples + sample-toaster-consumer + + + org.opendaylight.controller.samples + toaster-config + + diff --git a/features/mdsal/src/main/resources/features.xml b/features/mdsal/src/main/resources/features.xml index 7d393bc64c..a3d7ed0f83 100644 --- a/features/mdsal/src/main/resources/features.xml +++ b/features/mdsal/src/main/resources/features.xml @@ -1,28 +1,24 @@ - + mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features + mvn:org.opendaylight.controller/features-config/${config.version}/xml/features + mvn:org.opendaylight.controller/features-config-persister/${config.version}/xml/features + mvn:org.opendaylight.controller/features-config-netty/${config.version}/xml/features - odl-mdsal-commons odl-mdsal-broker - odl-mdsal-restconf - - - yangtools-data-binding - mvn:org.opendaylight.controller/sal-common/${project.version} - mvn:org.opendaylight.controller/sal-common-api/${project.version} - mvn:org.opendaylight.controller/sal-common-impl/${project.version} - mvn:org.opendaylight.controller/sal-common-util/${project.version} + odl-mdsal-netconf-connector + odl-restconf + odl-toaster - yangtools-concepts - yangtools-binding - odl-mdsal-commons - odl-config-core - odl-config-manager - odl-config-api - odl-config-persister + odl-yangtools-common + odl-yangtools-binding + odl-mdsal-common + odl-config-startup + odl-config-netty mvn:org.opendaylight.controller/sal-core-api/${project.version} mvn:org.opendaylight.controller/sal-core-spi/${project.version} mvn:org.opendaylight.controller/sal-broker-impl/${project.version} @@ -32,47 +28,41 @@ mvn:org.opendaylight.controller/sal-binding-util/${project.version} mvn:org.opendaylight.controller/sal-connector-api/${project.version} mvn:org.opendaylight.controller/sal-inmemory-datastore/${project.version} + mvn:org.opendaylight.controller/md-sal-config/${mdsal.version}/xml/config + + + odl-mdsal-broker + odl-netconf-client + odl-yangtools-models + mvn:org.opendaylight.controller/sal-netconf-connector/${project.version} + mvn:org.opendaylight.controller.model/model-inventory/${project.version} + mvn:org.opendaylight.controller/netconf-config-dispatcher/${config.version} + mvn:org.opendaylight.controller/netconf-connector-config/${netconf.version}/xml/config - + odl-mdsal-broker + war mvn:org.opendaylight.controller/sal-rest-connector/${project.version} - wrap:mvn:com.google.code.gson/gson/${gson.version} - wrap:mvn:com.sun.jersey/jersey-core/${jersey.version} - wrap:mvn:com.sun.jersey/jersey-server/${jersey.version} + mvn:com.google.code.gson/gson/${gson.version} + mvn:com.sun.jersey/jersey-core/${jersey.version} + mvn:com.sun.jersey/jersey-server/${jersey.version} mvn:org.opendaylight.controller.thirdparty/com.sun.jersey.jersey-servlet/${jersey.version} - wrap:mvn:io.netty/netty-buffer/${netty.version} - wrap:mvn:io.netty/netty-codec/${netty.version} - wrap:mvn:io.netty/netty-codec-http/${netty.version} - wrap:mvn:io.netty/netty-common/${netty.version} - wrap:mvn:io.netty/netty-handler/${netty.version} - wrap:mvn:io.netty/netty-transport/${netty.version} - - - mvn:org.opendaylight.controller.model/model-flow-base/${project.version} - mvn:org.opendaylight.controller.model/model-flow-management/${project.version} - mvn:org.opendaylight.controller.model/model-flow-service/${project.version} - mvn:org.opendaylight.controller.model/model-flow-statistics/${project.version} - mvn:org.opendaylight.controller.model/model-inventory/${project.version} - mvn:org.opendaylight.controller.model/model-topology/${project.version} + mvn:io.netty/netty-buffer/${netty.version} + mvn:io.netty/netty-codec/${netty.version} + mvn:io.netty/netty-codec-http/${netty.version} + mvn:io.netty/netty-common/${netty.version} + mvn:io.netty/netty-handler/${netty.version} + mvn:io.netty/netty-transport/${netty.version} + mvn:org.opendaylight.controller/sal-remote/${project.version} + mvn:org.opendaylight.controller/sal-rest-connector-config/${mdsal.version}/xml/config - - yangtools-concepts - yangtools-binding + + odl-yangtools-common + odl-yangtools-binding odl-mdsal-broker - odl-mdsal-all mvn:org.opendaylight.controller.samples/sample-toaster/${project.version} mvn:org.opendaylight.controller.samples/sample-toaster-consumer/${project.version} mvn:org.opendaylight.controller.samples/sample-toaster-provider/${project.version} + mvn:org.opendaylight.controller.samples/toaster-config/${project.version}/xml/config - - mvn:org.opendaylight.controller/sal-netconf-connector/${project.version} - mvn:org.opendaylight.controller/sal-restconf-broker/${project.version} - mvn:org.opendaylight.controller/sal-remote/${project.version} - mvn:org.opendaylight.controller.md/topology-manager/${project.version} - mvn:org.opendaylight.controller.md/topology-lldp-discovery/${project.version} - mvn:org.opendaylight.controller.md/statistics-manager/${project.version} - mvn:org.opendaylight.controller.md/inventory-manager/${project.version} - mvn:org.opendaylight.controller.md/forwardingrules-manager/${project.version} - - diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml index 856557c1e8..956a67e28b 100644 --- a/features/netconf/pom.xml +++ b/features/netconf/pom.xml @@ -7,7 +7,7 @@ 0.2.5-SNAPSHOT ../../opendaylight/netconf - netconf-features + features-netconf pom @@ -18,18 +18,98 @@ org.opendaylight.controller - config-features + features-config features xml runtime org.opendaylight.controller - features-odl-protocol-framework + features-protocol-framework features xml runtime + + org.opendaylight.controller + netconf-api + + + org.opendaylight.controller + ietf-netconf-monitoring + + + org.opendaylight.controller + ietf-netconf-monitoring-extension + + + org.opendaylight.yangtools.model + ietf-inet-types + + + org.opendaylight.yangtools.model + ietf-yang-types + + + org.opendaylight.controller + netconf-mapping-api + + + org.opendaylight.controller + netconf-util + + + org.opendaylight.controller + netconf-impl + + + org.opendaylight.controller + config-netconf-connector + + + org.opendaylight.controller + netconf-netty-util + + + org.opendaylight.controller.thirdparty + ganymed + + + org.openexi + nagasena + + + io.netty + netty-codec + + + io.netty + netty-handler + + + io.netty + netty-common + + + io.netty + netty-buffer + + + io.netty + netty-transport + + + org.opendaylight.controller + netconf-client + + + org.opendaylight.controller + netconf-config + + + org.opendaylight.controller + netconf-monitoring + diff --git a/features/netconf/src/main/resources/features.xml b/features/netconf/src/main/resources/features.xml index 50a537b50a..0033b0d83c 100644 --- a/features/netconf/src/main/resources/features.xml +++ b/features/netconf/src/main/resources/features.xml @@ -3,14 +3,24 @@ - mvn:org.opendaylight.controller/features-odl-protocol-framework/${protocol-framework.version}/xml/features - mvn:org.opendaylight.controller/config-features/${config.version}/xml/features + mvn:org.opendaylight.controller/features-protocol-framework/${protocol-framework.version}/xml/features + mvn:org.opendaylight.controller/features-config/${config.version}/xml/features + + odl-netconf-api + odl-netconf-mapping-api + odl-netconf-util + odl-netconf-impl + odl-config-netconf-connector + odl-netconf-netty-util + odl-netconf-client + odl-netconf-monitoring + + odl-protocol-framework mvn:org.opendaylight.controller/netconf-api/${project.version} mvn:org.opendaylight.controller/ietf-netconf-monitoring/${project.version} mvn:org.opendaylight.controller/ietf-netconf-monitoring-extension/${project.version} - odl-protocol-framework mvn:org.opendaylight.yangtools.model/ietf-inet-types/${ietf-inet-types.version} mvn:org.opendaylight.yangtools.model/ietf-yang-types/${ietf-yang-types.version} @@ -22,26 +32,25 @@ odl-netconf-mapping-api mvn:org.opendaylight.controller/netconf-util/${project.version} - - odl-config-manager - mvn:org.opendaylight.controller/config-netconf-connector/${project.version} + odl-netconf-api odl-netconf-mapping-api odl-netconf-util - - - + odl-netconf-netty-util mvn:org.opendaylight.controller/netconf-impl/${project.version} + + + odl-config-manager odl-netconf-api odl-netconf-mapping-api odl-netconf-util - odl-netconf-netty-util + mvn:org.opendaylight.controller/config-netconf-connector/${project.version} - mvn:org.opendaylight.controller/netconf-netty-util/${project.version} odl-netconf-api odl-netconf-mapping-api odl-netconf-util + mvn:org.opendaylight.controller/netconf-netty-util/${project.version} mvn:org.opendaylight.controller.thirdparty/ganymed/${ganymed.version} mvn:org.openexi/nagasena/${exi.nagasena.version} mvn:io.netty/netty-codec/${netty.version} @@ -50,10 +59,14 @@ mvn:io.netty/netty-buffer/${netty.version} mvn:io.netty/netty-transport/${netty.version} - + + odl-netconf-netty-util mvn:org.opendaylight.controller/netconf-client/${project.version} + mvn:org.opendaylight.controller/netconf-config/${netconf.version}/xml/config + + + odl-netconf-util mvn:org.opendaylight.controller/netconf-monitoring/${project.version} - mvn:org.opendaylight.controller/netconf-tcp/${project.version} \ No newline at end of file diff --git a/features/pom.xml b/features/pom.xml index f69190cebd..88ed7491a7 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -22,6 +22,7 @@ config-persister config-netty mdsal + flow netconf protocol-framework diff --git a/features/protocol-framework/pom.xml b/features/protocol-framework/pom.xml index ba5dd18fc2..97836be455 100644 --- a/features/protocol-framework/pom.xml +++ b/features/protocol-framework/pom.xml @@ -7,7 +7,7 @@ 1.4.2-SNAPSHOT ../../opendaylight/commons/opendaylight - features-odl-protocol-framework + features-protocol-framework ${protocol-framework.version} pom @@ -18,11 +18,15 @@ org.opendaylight.controller - config-features + features-config features xml runtime + + org.opendaylight.controller + protocol-framework + diff --git a/features/protocol-framework/src/main/resources/features.xml b/features/protocol-framework/src/main/resources/features.xml index d2560f5cb0..6daa3432c1 100644 --- a/features/protocol-framework/src/main/resources/features.xml +++ b/features/protocol-framework/src/main/resources/features.xml @@ -3,10 +3,10 @@ - mvn:org.opendaylight.controller/config-features/${config.version}/xml/features + mvn:org.opendaylight.controller/features-config/${config.version}/xml/features + odl-config-api + odl-config-netty-config-api mvn:org.opendaylight.controller/protocol-framework/${protocol-framework.version} - odl-config-api - odl-config-netty-config-api \ No newline at end of file diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 3f2c4dacef..66a403560e 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -64,6 +64,13 @@ 0.5.2-SNAPSHOT 1.4 0.2.5-SNAPSHOT + etc/opendaylight/karaf + 00-netty.xml + 01-mdsal.xml + 01-netconf.xml + 03-toaster-sample.xml + 10-rest-connector.xml + 99-netconf-connector.xml 0.4.3-SNAPSHOT 0.4.3-SNAPSHOT 0.1.2-SNAPSHOT @@ -83,6 +90,7 @@ 0000.0002.0038.0 + 1.6.0 1.4.2-SNAPSHOT 2.4.0 0.4.2-SNAPSHOT @@ -850,6 +858,11 @@ config-persister-file-xml-adapter ${config.version} + + org.opendaylight.controller + config-persister-feature-adapter + ${config.version} + org.opendaylight.controller config-persister-impl @@ -1214,6 +1227,11 @@ sal-common-util ${mdsal.version} + + org.opendaylight.controller + sal-inmemory-datastore + ${mdsal.version} + org.opendaylight.controller sal-compatibility @@ -1552,6 +1570,38 @@ toaster-config ${mdsal.version} + + org.opendaylight.yangtools + features-yangtools + ${yangtools.version} + features + xml + runtime + + + org.opendaylight.controller.samples + features-toaster + ${mdsal.version} + features + xml + runtime + + + org.opendaylight.controller + features-config-netty + ${config.version} + features + xml + runtime + + + org.opendaylight.controller + features-flow + ${mdsal.version} + features + xml + runtime + org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet @@ -1814,7 +1864,7 @@ org.opendaylight.controller - config-features + features-config ${config.version} features xml @@ -1822,7 +1872,7 @@ org.opendaylight.controller - features-odl-protocol-framework + features-protocol-framework ${protocol-framework.version} features xml @@ -1830,7 +1880,7 @@ org.opendaylight.controller - netconf-features + features-netconf ${netconf.version} features xml @@ -1838,7 +1888,7 @@ org.opendaylight.controller - config-persister-features + features-config-persister ${config.version} features xml @@ -1862,7 +1912,7 @@ org.opendaylight.controller - mdsal-features + features-mdsal ${mdsal.version} features xml diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml index 5effbb09fc..b3c3f20ba8 100644 --- a/opendaylight/distribution/opendaylight-karaf/pom.xml +++ b/opendaylight/distribution/opendaylight-karaf/pom.xml @@ -61,14 +61,6 @@ kar runtime - - org.opendaylight.controller - config-netty-features - features - xml - runtime - - org.opendaylight.controller @@ -89,7 +81,14 @@ org.opendaylight.controller - mdsal-features + features-mdsal + features + xml + runtime + + + org.opendaylight.controller + features-flow features xml runtime diff --git a/opendaylight/distribution/opendaylight-karaf/src/main/resources/configuration/initial/00-netty.xml b/opendaylight/distribution/opendaylight-karaf/src/main/resources/configuration/initial/00-netty.xml deleted file mode 100644 index 2365c700f9..0000000000 --- a/opendaylight/distribution/opendaylight-karaf/src/main/resources/configuration/initial/00-netty.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&revision=2013-11-19 - urn:opendaylight:params:xml:ns:yang:controller:netty:eventexecutor?module=netty-event-executor&revision=2013-11-12 - urn:opendaylight:params:xml:ns:yang:controller:netty:threadgroup?module=threadgroup&revision=2013-11-07 - urn:opendaylight:params:xml:ns:yang:controller:netty:timer?module=netty-timer&revision=2013-11-19 - - - - - - - netty:netty-threadgroup-fixed - global-boss-group - - - netty:netty-threadgroup-fixed - global-worker-group - - - netty:netty-hashed-wheel-timer - global-timer - - - netty:netty-global-event-executor - singleton - - - - - - netty:netty-threadgroup - - global-boss-group - /modules/module[type='netty-threadgroup-fixed'][name='global-boss-group'] - - - global-worker-group - /modules/module[type='netty-threadgroup-fixed'][name='global-worker-group'] - - - - netty:netty-event-executor - - global-event-executor - /modules/module[type='netty-global-event-executor'][name='singleton'] - - - - netty:netty-timer - - global-timer - /modules/module[type='netty-hashed-wheel-timer'][name='global-timer'] - - - - - - - diff --git a/opendaylight/distribution/opendaylight-karaf/src/main/resources/configuration/initial/01-md-sal.xml b/opendaylight/distribution/opendaylight-karaf/src/main/resources/configuration/initial/01-md-sal.xml deleted file mode 100644 index 619ab06d8d..0000000000 --- a/opendaylight/distribution/opendaylight-karaf/src/main/resources/configuration/initial/01-md-sal.xml +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - prefix:schema-service-singleton - yang-schema-service - - - - - prefix:hash-map-data-store - hash-map-data-store - - - - - - - prefix:dom-broker-impl - dom-broker - - - dom:dom-data-store - - hash-map-data-store - - - - - - - - - prefix:binding-broker-impl - binding-broker-impl - - binding:binding-notification-service - binding-notification-broker - - - binding:binding-data-broker - binding-data-broker - - - - prefix:runtime-generated-mapping - runtime-mapping-singleton - - - prefix:binding-notification-broker - binding-notification-broker - - - - prefix:binding-data-broker - binding-data-broker - - dom:dom-broker-osgi-registry - dom-broker - - - binding:binding-dom-mapping-service - runtime-mapping-singleton - - - - - - - - - - dom:schema-service - - yang-schema-service - /modules/module[type='schema-service-singleton'][name='yang-schema-service'] - - - - binding:binding-notification-service - - binding-notification-broker - /modules/module[type='binding-notification-broker'][name='binding-notification-broker'] - - - - - dom:dom-data-store - - hash-map-data-store - /modules/module[type='hash-map-data-store'][name='hash-map-data-store'] - - - - - - - - binding:binding-broker-osgi-registry - - binding-osgi-broker - /modules/module[type='binding-broker-impl'][name='binding-broker-impl'] - - - - binding:binding-rpc-registry - - binding-rpc-broker - /modules/module[type='binding-broker-impl'][name='binding-broker-impl'] - - - - binding-impl:binding-dom-mapping-service - - runtime-mapping-singleton - /modules/module[type='runtime-generated-mapping'][name='runtime-mapping-singleton'] - - - - dom:dom-broker-osgi-registry - - dom-broker - /modules/module[type='dom-broker-impl'][name='dom-broker'] - - - - - binding:binding-data-broker - - binding-data-broker - - /modules/module[type='binding-data-broker'][name='binding-data-broker'] - - - - - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:netty:eventexecutor?module=netty-event-executor&revision=2013-11-12 - urn:opendaylight:params:xml:ns:yang:controller:threadpool?module=threadpool&revision=2013-04-09 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom?module=opendaylight-md-sal-dom&revision=2013-10-28 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl?module=opendaylight-sal-binding-broker-impl&revision=2013-10-28 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl?module=opendaylight-sal-dom-broker-impl&revision=2013-10-28 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:common?module=opendaylight-md-sal-common&revision=2013-10-28 - - diff --git a/opendaylight/distribution/opendaylight-karaf/src/main/resources/configuration/initial/03-toaster-sample.xml b/opendaylight/distribution/opendaylight-karaf/src/main/resources/configuration/initial/03-toaster-sample.xml deleted file mode 100644 index c481485c92..0000000000 --- a/opendaylight/distribution/opendaylight-karaf/src/main/resources/configuration/initial/03-toaster-sample.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - prefix:toaster-provider-impl - - toaster-provider-impl - - - binding:binding-rpc-registry - binding-rpc-broker - - - - - binding:binding-notification-service - - binding-notification-broker - - - - - - prefix:toaster-consumer-impl - - toaster-consumer-impl - - - binding:binding-rpc-registry - binding-rpc-broker - - - - - binding:binding-notification-service - - binding-notification-broker - - - - - - - toaster:toaster-provider - - toaster-provider - /modules/module[type='toaster-provider-impl'][name='toaster-provider-impl'] - - - - toaster:toaster-consumer - - toaster-consumer - /modules/module[type='toaster-consumer-impl'][name='toaster-consumer-impl'] - - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - urn:opendaylight:params:xml:ns:yang:controller:config:toaster-consumer?module=toaster-consumer&revision=2014-01-31 - urn:opendaylight:params:xml:ns:yang:controller:config:toaster-consumer:impl?module=toaster-consumer-impl&revision=2014-01-31 - urn:opendaylight:params:xml:ns:yang:controller:config:toaster-provider?module=toaster-provider&revision=2014-01-31 - urn:opendaylight:params:xml:ns:yang:controller:config:toaster-provider:impl?module=toaster-provider-impl&revision=2014-01-31 - - - - diff --git a/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/custom.properties b/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/custom.properties index 6c1ca421c2..e9a6992521 100644 --- a/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/custom.properties +++ b/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/custom.properties @@ -25,18 +25,11 @@ netconf.ssh.port=1830 netconf.ssh.pk.path = ./configuration/RSA.pk -netconf.config.persister.active=1,2 -# read startup configuration -netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.xml.XmlDirectoryStorageAdapter -netconf.config.persister.1.properties.directoryStorage=configuration/initial/ - -# include only xml files, files with other extensions will be skipped, multiple extensions are permitted e.g. netconf.config.persister.1.properties.includeExtensions=xml,cfg,config -netconf.config.persister.1.properties.includeExtensions=xml -netconf.config.persister.1.readonly=true - -netconf.config.persister.2.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.xml.XmlFileStorageAdapter -netconf.config.persister.2.properties.fileStorage=configuration/current/controller.currentconfig.xml -netconf.config.persister.2.properties.numberOfBackups=1 +netconf.config.persister.active=1 + +netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.xml.XmlFileStorageAdapter +netconf.config.persister.1.properties.fileStorage=etc/opendaylight/current/controller.currentconfig.xml +netconf.config.persister.1.properties.numberOfBackups=1 # logback configuration logback.configurationFile=configuration/logback.xml diff --git a/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/jre.properties b/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/jre.properties index e91da89970..a98956e98d 100644 --- a/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/jre.properties +++ b/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/jre.properties @@ -180,7 +180,8 @@ jre-1.6= \ org.w3c.dom.xpath, \ org.xml.sax, \ org.xml.sax.ext, \ - org.xml.sax.helpers + org.xml.sax.helpers, \ + javax.annotation.processing # Standard package set. Note that: # - javax.transaction* is exported with a mandatory attribute @@ -341,7 +342,8 @@ jre-1.7= \ org.w3c.dom.xpath, \ org.xml.sax, \ org.xml.sax.ext, \ - org.xml.sax.helpers + org.xml.sax.helpers, \ + javax.annotation.processing jre-1.8= \ javax.accessibility, \ @@ -500,4 +502,5 @@ jre-1.8= \ org.w3c.dom.xpath, \ org.xml.sax, \ org.xml.sax.ext, \ - org.xml.sax.helpers + org.xml.sax.helpers, \ + javax.annotation.processing diff --git a/opendaylight/md-sal/sal-rest-connector-config/pom.xml b/opendaylight/md-sal/sal-rest-connector-config/pom.xml index 6d050cf425..fa91f0398d 100644 --- a/opendaylight/md-sal/sal-rest-connector-config/pom.xml +++ b/opendaylight/md-sal/sal-rest-connector-config/pom.xml @@ -17,4 +17,30 @@ sal-rest-connector-config Configuration files for sal-rest-connector jar + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/initial/10-rest-connector.xml + xml + config + + + + + + + + diff --git a/opendaylight/md-sal/sal-rest-connector-config/src/main/resources/initial/10-rest-connector.xml b/opendaylight/md-sal/sal-rest-connector-config/src/main/resources/initial/10-rest-connector.xml index 2fdc8c7d1e..438906bd9a 100644 --- a/opendaylight/md-sal/sal-rest-connector-config/src/main/resources/initial/10-rest-connector.xml +++ b/opendaylight/md-sal/sal-rest-connector-config/src/main/resources/initial/10-rest-connector.xml @@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html rest:rest-connector-impl rest-connector-default-impl - 8181 + 8185 dom:dom-broker-osgi-registry dom-broker -- 2.36.6