From b6df9bf6f58b8a71e46e7133820bfa3272d797f6 Mon Sep 17 00:00:00 2001 From: Hideyuki Tai Date: Sat, 14 Jan 2017 00:14:16 +0000 Subject: [PATCH] Bug 7652: karaf 4 migration This patch creates VTN features for Karaf 4. This is the result of https://wiki.opendaylight.org/view/Karaf_4_migration Change-Id: I35669a3e0fe83e0b835be5331ef1dfab66bc315c Signed-off-by: Hideyuki Tai --- manager/features/features-vtn-manager/pom.xml | 189 ++++++++++++++++++ .../src/main/features/features.xml | 0 .../features/features4-vtn-manager/pom.xml | 62 ++++++ .../features/odl-vtn-manager-neutron/pom.xml | 90 +++++++++ manager/features/odl-vtn-manager-rest/pom.xml | 57 ++++++ manager/features/odl-vtn-manager/pom.xml | 128 ++++++++++++ .../src/main/feature/feature.xml | 21 ++ manager/features/pom.xml | 161 ++------------- 8 files changed, 559 insertions(+), 149 deletions(-) create mode 100644 manager/features/features-vtn-manager/pom.xml rename manager/features/{ => features-vtn-manager}/src/main/features/features.xml (100%) create mode 100644 manager/features/features4-vtn-manager/pom.xml create mode 100644 manager/features/odl-vtn-manager-neutron/pom.xml create mode 100644 manager/features/odl-vtn-manager-rest/pom.xml create mode 100644 manager/features/odl-vtn-manager/pom.xml create mode 100644 manager/features/odl-vtn-manager/src/main/feature/feature.xml diff --git a/manager/features/features-vtn-manager/pom.xml b/manager/features/features-vtn-manager/pom.xml new file mode 100644 index 00000000..5456d675 --- /dev/null +++ b/manager/features/features-vtn-manager/pom.xml @@ -0,0 +1,189 @@ + + + + + + 4.0.0 + + + org.opendaylight.odlparent + features-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.vtn + features-vtn-manager + 0.6.0-SNAPSHOT + jar + VTN Manager's Karaf features. + + + + 1.5.0-SNAPSHOT + 0.10.0-SNAPSHOT + 1.5.0-SNAPSHOT + 0.4.0-SNAPSHOT + 0.8.0-SNAPSHOT + 1.4.0-SNAPSHOT + + + + + skip-features-test + + false + + + + vtn.karaf.skip + true + + + + true + + + + + + scm:git:https://git.opendaylight.org/gerrit/p/vtn.git + scm:git:ssh://git.opendaylight.org:29418/vtn.git + https://wiki.opendaylight.org/view/OpenDaylight_Virtual_Tenant_Network_%28VTN%29:Main + HEAD + + + + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${odl.mdsal.model.version} + pom + import + + + + + org.opendaylight.openflowplugin + openflowplugin-artifacts + ${odl.openflowplugin.version} + pom + import + + + + + + + + org.opendaylight.vtn + manager + ${project.version} + + + + org.opendaylight.vtn + manager.model + ${project.version} + + + + org.opendaylight.vtn + manager.implementation + ${project.version} + + + + org.opendaylight.vtn + manager.implementation + ${project.version} + config + xml + + + + org.opendaylight.vtn + manager.neutron + ${project.version} + + + + + org.opendaylight.controller + features-mdsal + features + xml + + + + + org.opendaylight.mdsal.model + features-mdsal-model + features + xml + + + + + org.opendaylight.netconf + features-restconf + ${odl.netconf.version} + features + xml + + + + + org.opendaylight.openflowplugin + features-openflowplugin + features + xml + + + + + org.opendaylight.neutron + features-neutron + ${odl.neutron.version} + features + xml + + + + + org.opendaylight.ovsdb + southbound-features + ${odl.ovsdb.version} + features + xml + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + diff --git a/manager/features/src/main/features/features.xml b/manager/features/features-vtn-manager/src/main/features/features.xml similarity index 100% rename from manager/features/src/main/features/features.xml rename to manager/features/features-vtn-manager/src/main/features/features.xml diff --git a/manager/features/features4-vtn-manager/pom.xml b/manager/features/features4-vtn-manager/pom.xml new file mode 100644 index 00000000..a66df749 --- /dev/null +++ b/manager/features/features4-vtn-manager/pom.xml @@ -0,0 +1,62 @@ + + + + + 4.0.0 + + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.vtn + features4-vtn-manager + 0.6.0-SNAPSHOT + feature + + + + ${project.groupId} + odl-vtn-manager + ${project.version} + xml + features + + + + ${project.groupId} + odl-vtn-manager-neutron + ${project.version} + xml + features + + + + ${project.groupId} + odl-vtn-manager-rest + ${project.version} + xml + features + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + diff --git a/manager/features/odl-vtn-manager-neutron/pom.xml b/manager/features/odl-vtn-manager-neutron/pom.xml new file mode 100644 index 00000000..d84afc1c --- /dev/null +++ b/manager/features/odl-vtn-manager-neutron/pom.xml @@ -0,0 +1,90 @@ + + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.vtn + odl-vtn-manager-neutron + 0.6.0-SNAPSHOT + feature + + OpenDaylight :: VTN Manager :: Neutron Interface + + + + + org.opendaylight.controller + mdsal-artifacts + 1.5.0-SNAPSHOT + pom + import + + + + + + + ${project.groupId} + manager.neutron + ${project.version} + + + + ${project.groupId} + odl-vtn-manager + ${project.version} + xml + features + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + + org.opendaylight.neutron + odl-neutron-service + 0.8.0-SNAPSHOT + xml + features + + + + org.opendaylight.ovsdb + odl-ovsdb-southbound-impl + 1.4.0-SNAPSHOT + xml + features + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + diff --git a/manager/features/odl-vtn-manager-rest/pom.xml b/manager/features/odl-vtn-manager-rest/pom.xml new file mode 100644 index 00000000..014b5484 --- /dev/null +++ b/manager/features/odl-vtn-manager-rest/pom.xml @@ -0,0 +1,57 @@ + + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.vtn + odl-vtn-manager-rest + 0.6.0-SNAPSHOT + feature + + OpenDaylight :: VTN Manager :: REST API + + + + ${project.groupId} + odl-vtn-manager + ${project.version} + xml + features + + + + org.opendaylight.netconf + odl-restconf + 1.5.0-SNAPSHOT + xml + features + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + diff --git a/manager/features/odl-vtn-manager/pom.xml b/manager/features/odl-vtn-manager/pom.xml new file mode 100644 index 00000000..c24d81c8 --- /dev/null +++ b/manager/features/odl-vtn-manager/pom.xml @@ -0,0 +1,128 @@ + + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.vtn + odl-vtn-manager + 0.6.0-SNAPSHOT + feature + + OpenDaylight :: VTN Manager :: Java API + + + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.10.0-SNAPSHOT + pom + import + + + + org.opendaylight.controller + mdsal-artifacts + 1.5.0-SNAPSHOT + pom + import + + + + + + + + ${project.groupId} + manager + ${project.version} + + + + ${project.groupId} + manager.implementation + ${project.version} + + + + org.opendaylight.vtn + manager.implementation + ${project.version} + config + xml + + + + ${project.groupId} + manager.model + ${project.version} + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + + + org.opendaylight.controller.thirdparty + net.sf.jung2 + 2.0.1 + + + + + org.opendaylight.mdsal.model + odl-mdsal-models + xml + features + + + + + org.opendaylight.openflowplugin + odl-openflowplugin-flow-services + 0.4.0-SNAPSHOT + xml + features + + + + org.opendaylight.openflowplugin + odl-openflowplugin-nsf-model + 0.4.0-SNAPSHOT + xml + features + + + + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ + + + + opendaylight-site + ${nexus.site.url}/${project.artifactId}/ + + + + diff --git a/manager/features/odl-vtn-manager/src/main/feature/feature.xml b/manager/features/odl-vtn-manager/src/main/feature/feature.xml new file mode 100644 index 00000000..46ffc145 --- /dev/null +++ b/manager/features/odl-vtn-manager/src/main/feature/feature.xml @@ -0,0 +1,21 @@ + + + + + + + + mvn:org.opendaylight.vtn/manager.implementation/${project.version}/xml/config + + diff --git a/manager/features/pom.xml b/manager/features/pom.xml index 96180101..183511c6 100644 --- a/manager/features/pom.xml +++ b/manager/features/pom.xml @@ -2,7 +2,7 @@ ODL :: vtn :: ${project.artifactId} - - - - 1.5.0-SNAPSHOT - 0.10.0-SNAPSHOT - 1.5.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.8.0-SNAPSHOT - 1.4.0-SNAPSHOT - - - - - skip-features-test - - false - - - - vtn.karaf.skip - true - - - - true - - - + pom + VTN Manager's feature aggregator scm:git:https://git.opendaylight.org/gerrit/p/vtn.git @@ -65,122 +37,13 @@ HEAD - - - - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - - - org.opendaylight.openflowplugin - openflowplugin-artifacts - ${odl.openflowplugin.version} - pom - import - - - - - - - - org.opendaylight.vtn - manager - ${project.version} - - - - org.opendaylight.vtn - manager.model - ${project.version} - - - - org.opendaylight.vtn - manager.implementation - ${project.version} - - - - org.opendaylight.vtn - manager.implementation - ${project.version} - config - xml - - - - org.opendaylight.vtn - manager.neutron - ${project.version} - - - - - org.opendaylight.controller - features-mdsal - features - xml - - - - - org.opendaylight.mdsal.model - features-mdsal-model - features - xml - - - - - org.opendaylight.netconf - features-restconf - ${odl.netconf.version} - features - xml - - - - - org.opendaylight.openflowplugin - features-openflowplugin - features - xml - - - - - org.opendaylight.neutron - features-neutron - ${odl.neutron.version} - features - xml - - - - - org.opendaylight.ovsdb - southbound-features - ${odl.ovsdb.version} - features - xml - - + + features-vtn-manager + features4-vtn-manager + odl-vtn-manager + odl-vtn-manager-neutron + odl-vtn-manager-rest + ${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/ -- 2.36.6