From d3ee1db2786e3d239c32d2bc983b5d926939e8b9 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Tue, 6 May 2014 09:57:45 -0500 Subject: [PATCH] Initial mdsal and config karaf features This loads cleanly into karaf :) Instructions for checking: cd controller/ mvn clean install cd opendaylight/distributions/opendaylight-karaf/target/assembly/bin sh karaf at the karaf prompt feature:install odl-mdsal-restconf feature:list -i (odl-mdsal-restconf will pull everything else through). PatchSet2: Fixed failure to use odl- prefix in features for -all Change-Id: Ib85347eaab7729d1b2723eb7ce59a3c18f2eef0e Signed-off-by: Ed Warnicke --- opendaylight/config/feature/pom.xml | 70 +++++++++++++++++++ .../feature/src/main/resources/features.xml | 27 +++++++ opendaylight/config/pom.xml | 1 + .../distribution/opendaylight-karaf/pom.xml | 18 ++++- opendaylight/md-sal/feature/pom.xml | 70 +++++++++++++++++++ .../feature/src/main/resources/features.xml | 49 +++++++++++++ opendaylight/md-sal/pom.xml | 4 ++ 7 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 opendaylight/config/feature/pom.xml create mode 100644 opendaylight/config/feature/src/main/resources/features.xml create mode 100644 opendaylight/md-sal/feature/pom.xml create mode 100644 opendaylight/md-sal/feature/src/main/resources/features.xml diff --git a/opendaylight/config/feature/pom.xml b/opendaylight/config/feature/pom.xml new file mode 100644 index 0000000000..aaf33ccc0f --- /dev/null +++ b/opendaylight/config/feature/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + org.opendaylight.controller + config-subsystem + 0.2.5-SNAPSHOT + + config-features + + pom + + + features.xml + + + + + + + + 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/opendaylight/config/feature/src/main/resources/features.xml b/opendaylight/config/feature/src/main/resources/features.xml new file mode 100644 index 0000000000..81972c3661 --- /dev/null +++ b/opendaylight/config/feature/src/main/resources/features.xml @@ -0,0 +1,27 @@ + + + + + odl-config-subsystem + + + + yangtools-concepts + yangtools-binding + yangtools-binding-generator + odl-mdsal-commons + mvn:org.opendaylight.controller/config-api/${project.version} + mvn:org.opendaylight.controller/config-manager/${project.version} + mvn:org.opendaylight.controller/yang-jmx-generator/${project.version} + 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/shutdown-api/${project.version} + mvn:org.opendaylight.controller/shutdown-impl/${project.version} + mvn:org.osgi/org.osgi.core/${osgi.core.version} + wrap:mvn:com.google.guava/guava/${guava.version} + mvn:org.javassist/javassist/${javassist.version} + + \ No newline at end of file diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index 20b1b411a4..9e0aef35f4 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -40,6 +40,7 @@ shutdown-impl netconf-config-dispatcher config-module-archetype + feature diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml index 77089850d6..1414fac2f3 100644 --- a/opendaylight/distribution/opendaylight-karaf/pom.xml +++ b/opendaylight/distribution/opendaylight-karaf/pom.xml @@ -22,6 +22,14 @@ ${karaf.version} kar + + org.opendaylight.controller + config-features + ${config.version} + features + xml + runtime + @@ -42,6 +50,15 @@ xml runtime + --> + + org.opendaylight.controller + mdsal-features + ${mdsal.version} + features + xml + runtime + org.opendaylight.yangtools features-file @@ -50,7 +67,6 @@ xml runtime - --> diff --git a/opendaylight/md-sal/feature/pom.xml b/opendaylight/md-sal/feature/pom.xml new file mode 100644 index 0000000000..c08c3e5606 --- /dev/null +++ b/opendaylight/md-sal/feature/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + org.opendaylight.controller + sal-parent + 1.1-SNAPSHOT + + mdsal-features + + pom + + + features.xml + + + + + + + + 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/opendaylight/md-sal/feature/src/main/resources/features.xml b/opendaylight/md-sal/feature/src/main/resources/features.xml new file mode 100644 index 0000000000..f816018519 --- /dev/null +++ b/opendaylight/md-sal/feature/src/main/resources/features.xml @@ -0,0 +1,49 @@ + + + + + odl-mdsal-commons + odl-mdsal-broker + odl-mdsal-restconf + + + yangtools-concepts + yangtools-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} + wrap:mvn:com.google.guava/guava/${guava.version} + wrap:mvn:org.eclipse.xtend/org.eclipse.xtend.lib/${xtend.version} + + + yangtools-concepts + yangtools-binding + odl-mdsal-commons + odl-config-subsystem + 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} + mvn:org.opendaylight.controller/sal-binding-api/${project.version} + mvn:org.opendaylight.controller/sal-binding-config/${project.version} + mvn:org.opendaylight.controller/sal-binding-broker-impl/${project.version} + mvn:org.opendaylight.controller/sal-binding-util/${project.version} + mvn:org.opendaylight.controller/sal-connector-api/${project.version} + + + odl-mdsal-broker + 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: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} + + \ No newline at end of file diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 451edfdf78..edc9bf0f22 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -61,6 +61,10 @@ --> sal-rest-docgen + + + feature + -- 2.36.6