From d468aa899138490996a46721cf4239ab790265f4 Mon Sep 17 00:00:00 2001 From: jensenzhang Date: Sun, 19 Mar 2017 19:29:24 +0800 Subject: [PATCH] Karaf4 Migration Reduce the pom dependencies and features in karaf3. Change-Id: Id4eec06e09ba6ace6a282d57259cefdc4352ee02 Signed-off-by: jensenzhang --- alto-release-features/features-alto/pom.xml | 373 ++++++++++++++++ .../src/main/features/features.xml | 19 - alto-release-features/features4-alto/pom.xml | 164 +++++++ .../odl-alto-auto-maps/pom.xml | 96 +++++ alto-release-features/odl-alto-basic/pom.xml | 57 +++ alto-release-features/odl-alto-core/pom.xml | 43 ++ .../odl-alto-extension/pom.xml | 87 ++++ alto-release-features/odl-alto-iupd/pom.xml | 30 ++ .../odl-alto-manual-maps/pom.xml | 83 ++++ .../src/main/feature/feature.xml | 6 + .../odl-alto-multicost/pom.xml | 30 ++ .../pom.xml | 30 ++ .../pom.xml | 30 ++ .../odl-alto-nonstandard-types/pom.xml | 30 ++ .../odl-alto-northbound/pom.xml | 82 ++++ .../odl-alto-release/pom.xml | 50 +++ .../odl-alto-resourcepool/pom.xml | 74 ++++ alto-release-features/odl-alto-rsabs/pom.xml | 30 ++ .../odl-alto-simpleecs/pom.xml | 59 +++ .../src/main/feature/feature.xml | 6 + .../odl-alto-simpleird/pom.xml | 82 ++++ .../src/main/feature/feature.xml | 6 + alto-release-features/odl-alto-spce/pom.xml | 111 +++++ .../src/main/feature/feature.xml | 7 + .../pom.xml | 84 ++++ .../pom.xml | 30 ++ .../odl-alto-standard-service-models/pom.xml | 85 ++++ .../odl-alto-standard-types/pom.xml | 46 ++ alto-release-features/pom.xml | 402 ++---------------- utils/migrate_karaf4.sh | 56 +++ 30 files changed, 1896 insertions(+), 392 deletions(-) create mode 100644 alto-release-features/features-alto/pom.xml rename alto-release-features/{ => features-alto}/src/main/features/features.xml (90%) create mode 100644 alto-release-features/features4-alto/pom.xml create mode 100644 alto-release-features/odl-alto-auto-maps/pom.xml create mode 100644 alto-release-features/odl-alto-basic/pom.xml create mode 100644 alto-release-features/odl-alto-core/pom.xml create mode 100644 alto-release-features/odl-alto-extension/pom.xml create mode 100644 alto-release-features/odl-alto-iupd/pom.xml create mode 100644 alto-release-features/odl-alto-manual-maps/pom.xml create mode 100644 alto-release-features/odl-alto-manual-maps/src/main/feature/feature.xml create mode 100644 alto-release-features/odl-alto-multicost/pom.xml create mode 100644 alto-release-features/odl-alto-nonstandard-northbound-route/pom.xml create mode 100644 alto-release-features/odl-alto-nonstandard-service-models/pom.xml create mode 100644 alto-release-features/odl-alto-nonstandard-types/pom.xml create mode 100644 alto-release-features/odl-alto-northbound/pom.xml create mode 100644 alto-release-features/odl-alto-release/pom.xml create mode 100644 alto-release-features/odl-alto-resourcepool/pom.xml create mode 100644 alto-release-features/odl-alto-rsabs/pom.xml create mode 100644 alto-release-features/odl-alto-simpleecs/pom.xml create mode 100644 alto-release-features/odl-alto-simpleecs/src/main/feature/feature.xml create mode 100644 alto-release-features/odl-alto-simpleird/pom.xml create mode 100644 alto-release-features/odl-alto-simpleird/src/main/feature/feature.xml create mode 100644 alto-release-features/odl-alto-spce/pom.xml create mode 100644 alto-release-features/odl-alto-spce/src/main/feature/feature.xml create mode 100644 alto-release-features/odl-alto-standard-northbound-route/pom.xml create mode 100644 alto-release-features/odl-alto-standard-resource-translator/pom.xml create mode 100644 alto-release-features/odl-alto-standard-service-models/pom.xml create mode 100644 alto-release-features/odl-alto-standard-types/pom.xml create mode 100755 utils/migrate_karaf4.sh diff --git a/alto-release-features/features-alto/pom.xml b/alto-release-features/features-alto/pom.xml new file mode 100644 index 00000000..6d2a107f --- /dev/null +++ b/alto-release-features/features-alto/pom.xml @@ -0,0 +1,373 @@ + + + + 4.0.0 + + org.opendaylight.odlparent + features-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + features-alto-release + 0.4.0-SNAPSHOT + OpenDaylight :: alto :: ${project.artifactId} + + + 0.10.0-SNAPSHOT + 1.5.0-SNAPSHOT + 1.5.0-SNAPSHOT + etc/opendaylight/karaf + 0.5.0-SNAPSHOT + 0.4.0-SNAPSHOT + + + + + + + org.opendaylight.alto + alto-parent + ${project.version} + pom + import + + + org.opendaylight.controller + mdsal-artifacts + ${mdsal.version} + pom + import + + + org.opendaylight.netconf + restconf-artifacts + ${restconf.version} + pom + import + + + + + + + org.opendaylight.mdsal.model + features-mdsal-model + ${mdsal.model.version} + features + xml + runtime + + + org.opendaylight.controller + features-mdsal + features + xml + runtime + + + org.opendaylight.netconf + features-restconf + features + xml + runtime + + + + org.opendaylight.alto.core + alto-basic-types + ${project.version} + + + + org.opendaylight.alto.core + alto-resourcepool-api + ${project.version} + + + + org.opendaylight.alto.core + alto-resourcepool-impl + ${project.version} + + + + org.opendaylight.alto.core + alto-northbound-api + ${project.version} + + + + org.opendaylight.alto.core + alto-northbound-impl + ${project.version} + + + + org.opendaylight.alto.core + alto-northbound-route-networkmap-api + ${project.version} + + + + org.opendaylight.alto.core + alto-northbound-route-networkmap-impl + ${project.version} + + + + org.opendaylight.alto.core + alto-northbound-route-costmap-api + ${project.version} + + + + org.opendaylight.alto.core + alto-northbound-route-costmap-impl + ${project.version} + + + + org.opendaylight.alto.core + alto-northbound-route-endpointcost-api + ${project.version} + + + + org.opendaylight.alto.core + alto-northbound-route-endpointcost-impl + ${project.version} + + + + org.opendaylight.alto.core + alto-northbound-route-endpointproperty-api + ${project.version} + + + + org.opendaylight.alto.core + alto-northbound-route-endpointproperty-impl + ${project.version} + + + + org.opendaylight.alto.core + alto-service-model-ird-api + ${project.version} + + + + org.opendaylight.alto.core + alto-service-model-base-api + ${project.version} + + + + org.opendaylight.alto.core + alto-service-model-networkmap-api + ${project.version} + + + + org.opendaylight.alto.core + alto-service-model-endpointcost-api + ${project.version} + + + + org.opendaylight.alto.core + alto-service-model-endpointproperty-api + ${project.version} + + + + org.opendaylight.alto.core + alto-service-model-costmap-api + ${project.version} + + + + org.opendaylight.alto.core + alto-service-model-config-api + ${project.version} + + + + org.opendaylight.alto.basic + alto-simple-ird-impl + ${project.version} + + + + org.opendaylight.alto.basic + alto-manual-maps-impl + ${project.version} + + + + org.opendaylight.alto.basic + alto-manual-maps-impl + ${project.version} + xml + config + + + + org.opendaylight.alto.basic + alto-manual-maps-api + ${project.version} + + + + org.opendaylight.alto.basic + alto-simple-ird-impl + ${project.version} + xml + config + + + + org.opendaylight.alto.basic + alto-simple-ird-api + ${project.version} + + + org.opendaylight.openflowplugin + features-openflowplugin + features + ${openflow.plugin.version} + xml + runtime + + + org.opendaylight.openflowplugin.model + model-flow-statistics + ${openflow.plugin.version} + jar + + + org.opendaylight.l2switch + features-l2switch + features + ${l2switch.version} + xml + runtime + + + org.opendaylight.alto.spce.network + network-tracker-config + ${project.version} + xml + config + + + org.opendaylight.alto.spce.network + network-tracker-impl + ${project.version} + runtime + + + org.opendaylight.alto.spce.network + network-tracker-impl + ${project.version} + xml + config + runtime + + + org.opendaylight.alto.spce.network + network-tracker-api + ${project.version} + runtime + + + org.opendaylight.alto.ext + alto-spce-impl + ${project.version} + + + org.opendaylight.alto.ext + alto-spce-impl + ${project.version} + xml + config + + + org.opendaylight.alto.ext + alto-spce-api + ${project.version} + + + + ${project.groupId}.basic + alto-simple-ecs-impl + ${project.version} + + + ${project.groupId}.basic + alto-simple-ecs-impl + ${project.version} + xml + config + + + ${project.groupId}.basic + alto-simple-ecs-api + ${project.version} + + + + org.opendaylight.alto.basic + alto-auto-maps-impl + ${project.version} + + + org.opendaylight.alto.basic + alto-auto-maps-api + ${project.version} + + + + org.opendaylight.alto + multicost-api + ${project.version} + + + + org.opendaylight.alto + multicost-impl + ${project.version} + + + + org.opendaylight.alto + incremental-update-api + ${project.version} + + + + org.opendaylight.alto + incremental-update-impl + ${project.version} + + + + org.opendaylight.alto + rsade-api + ${project.version} + + + + org.opendaylight.alto + rsade-impl + ${project.version} + + + diff --git a/alto-release-features/src/main/features/features.xml b/alto-release-features/features-alto/src/main/features/features.xml similarity index 90% rename from alto-release-features/src/main/features/features.xml rename to alto-release-features/features-alto/src/main/features/features.xml index a5bd60aa..8d05a79e 100644 --- a/alto-release-features/src/main/features/features.xml +++ b/alto-release-features/features-alto/src/main/features/features.xml @@ -11,10 +11,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features mvn:org.opendaylight.l2switch/features-l2switch/${l2switch.version}/xml/features mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflow.plugin.version}/xml/features @@ -27,18 +25,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - odl-alto-standard-types - odl-alto-resourcepool - odl-alto-northbound - odl-alto-standard-service-models odl-alto-standard-northbound-route odl-alto-standard-resource-translator - odl-alto-simpleird - odl-alto-manual-maps odl-alto-simpleecs odl-alto-auto-maps @@ -113,8 +105,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html odl-mdsal-models - - odl-alto-standard-types odl-alto-resourcepool mvn:org.opendaylight.alto.core/alto-service-model-base-api/${project.version} @@ -155,7 +145,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html odl-mdsal-broker odl-alto-northbound - odl-alto-resourcepool odl-alto-standard-service-models mvn:org.opendaylight.alto.basic/alto-simple-ird-api/${project.version} @@ -169,10 +158,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html description='OpenDaylight :: alto :: Manual-maps'> odl-mdsal-models odl-mdsal-broker - - odl-alto-northbound - odl-alto-resourcepool - odl-alto-standard-service-models odl-alto-simpleird mvn:org.opendaylight.alto.core/alto-northbound-route-networkmap-api/${project.version} @@ -202,10 +187,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html odl-mdsal-models odl-mdsal-broker odl-l2switch-hosttracker - - odl-alto-northbound - odl-alto-resourcepool - odl-alto-standard-service-models odl-alto-manual-maps mvn:org.opendaylight.alto.basic/alto-auto-maps-api/${project.version} diff --git a/alto-release-features/features4-alto/pom.xml b/alto-release-features/features4-alto/pom.xml new file mode 100644 index 00000000..7c3b22af --- /dev/null +++ b/alto-release-features/features4-alto/pom.xml @@ -0,0 +1,164 @@ + + + + 4.0.0 + + org.opendaylight.odlparent + feature-repo-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + features4-alto + 0.4.0-SNAPSHOT + feature + + + + ${project.groupId} + odl-alto-release + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-core + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-basic + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-extension + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-spce + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-resourcepool + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-northbound + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-standard-service-models + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-standard-northbound-route + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-standard-resource-translator + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-simpleird + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-manual-maps + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-simpleecs + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-auto-maps + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-nonstandard-types + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-nonstandard-service-models + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-nonstandard-northbound-route + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-multicost + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-iupd + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-rsabs + ${project.version} + xml + features + + + diff --git a/alto-release-features/odl-alto-auto-maps/pom.xml b/alto-release-features/odl-alto-auto-maps/pom.xml new file mode 100644 index 00000000..3ea87793 --- /dev/null +++ b/alto-release-features/odl-alto-auto-maps/pom.xml @@ -0,0 +1,96 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-auto-maps + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Auto-maps + + + org.opendaylight.mdsal.model + org.opendaylight.controller + org.opendaylight.l2switch + 0.10.0-SNAPSHOT + 1.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + + + + + + + org.opendaylight.alto + alto-parent + ${project.version} + pom + import + + + org.opendaylight.controller + mdsal-artifacts + ${mdsal.version} + pom + import + + + + + + + ${mdsal.model.groupId} + odl-mdsal-models + ${mdsal.model.version} + xml + features + + + ${mdsal.groupId} + odl-mdsal-broker + ${mdsal.version} + xml + features + + + ${l2switch.groupId} + odl-l2switch-hosttracker + ${l2switch.version} + xml + features + + + ${project.groupId} + odl-alto-manual-maps + ${project.version} + xml + features + + + org.opendaylight.alto.basic + alto-auto-maps-api + ${project.version} + + + org.opendaylight.alto.basic + alto-auto-maps-impl + ${project.version} + + + diff --git a/alto-release-features/odl-alto-basic/pom.xml b/alto-release-features/odl-alto-basic/pom.xml new file mode 100644 index 00000000..dde02676 --- /dev/null +++ b/alto-release-features/odl-alto-basic/pom.xml @@ -0,0 +1,57 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-basic + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Basic + + + + ${project.groupId} + odl-alto-simpleird + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-manual-maps + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-simpleecs + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-auto-maps + ${project.version} + xml + features + + + diff --git a/alto-release-features/odl-alto-core/pom.xml b/alto-release-features/odl-alto-core/pom.xml new file mode 100644 index 00000000..91821cfb --- /dev/null +++ b/alto-release-features/odl-alto-core/pom.xml @@ -0,0 +1,43 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-core + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Core + + + + ${project.groupId} + odl-alto-standard-northbound-route + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-standard-resource-translator + ${project.version} + xml + features + + + diff --git a/alto-release-features/odl-alto-extension/pom.xml b/alto-release-features/odl-alto-extension/pom.xml new file mode 100644 index 00000000..fa8ac5d2 --- /dev/null +++ b/alto-release-features/odl-alto-extension/pom.xml @@ -0,0 +1,87 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-extension + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Extension + + + + ${project.groupId} + odl-alto-nonstandard-types + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-nonstandard-service-models + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-nonstandard-northbound-route + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-spce + ${project.version} + xml + features + + + org.opendaylight.alto + multicost-api + ${project.version} + + + org.opendaylight.alto + multicost-impl + ${project.version} + + + org.opendaylight.alto + incremental-update-api + ${project.version} + + + org.opendaylight.alto + incremental-update-impl + ${project.version} + + + org.opendaylight.alto + rsade-api + ${project.version} + + + org.opendaylight.alto + rsade-impl + ${project.version} + + + diff --git a/alto-release-features/odl-alto-iupd/pom.xml b/alto-release-features/odl-alto-iupd/pom.xml new file mode 100644 index 00000000..aec2b5fe --- /dev/null +++ b/alto-release-features/odl-alto-iupd/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-iupd + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Incremental update + + + + + diff --git a/alto-release-features/odl-alto-manual-maps/pom.xml b/alto-release-features/odl-alto-manual-maps/pom.xml new file mode 100644 index 00000000..6427d07e --- /dev/null +++ b/alto-release-features/odl-alto-manual-maps/pom.xml @@ -0,0 +1,83 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-manual-maps + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Manual-maps + + + org.opendaylight.mdsal.model + org.opendaylight.controller + 0.10.0-SNAPSHOT + 1.5.0-SNAPSHOT + etc/opendaylight/karaf + + + + + ${mdsal.model.groupId} + odl-mdsal-models + ${mdsal.model.version} + xml + features + + + ${mdsal.groupId} + odl-mdsal-broker + ${mdsal.version} + xml + features + + + ${project.groupId} + odl-alto-simpleird + ${project.version} + xml + features + + + org.opendaylight.alto.core + alto-northbound-route-networkmap-api + ${project.version} + + + org.opendaylight.alto.core + alto-northbound-route-costmap-api + ${project.version} + + + org.opendaylight.alto.core + alto-service-model-config-api + ${project.version} + + + org.opendaylight.alto.basic + alto-manual-maps-api + ${project.version} + + + org.opendaylight.alto.basic + alto-manual-maps-impl + ${project.version} + + + diff --git a/alto-release-features/odl-alto-manual-maps/src/main/feature/feature.xml b/alto-release-features/odl-alto-manual-maps/src/main/feature/feature.xml new file mode 100644 index 00000000..4d175a16 --- /dev/null +++ b/alto-release-features/odl-alto-manual-maps/src/main/feature/feature.xml @@ -0,0 +1,6 @@ + + + + mvn:org.opendaylight.alto.basic/alto-manual-maps-impl/${project.version}/xml/config + + diff --git a/alto-release-features/odl-alto-multicost/pom.xml b/alto-release-features/odl-alto-multicost/pom.xml new file mode 100644 index 00000000..2823adb6 --- /dev/null +++ b/alto-release-features/odl-alto-multicost/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-multicost + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Mutlicost support + + + + + diff --git a/alto-release-features/odl-alto-nonstandard-northbound-route/pom.xml b/alto-release-features/odl-alto-nonstandard-northbound-route/pom.xml new file mode 100644 index 00000000..89f1b432 --- /dev/null +++ b/alto-release-features/odl-alto-nonstandard-northbound-route/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-nonstandard-northbound-route + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Nonstandard-northbound-route + + + + + diff --git a/alto-release-features/odl-alto-nonstandard-service-models/pom.xml b/alto-release-features/odl-alto-nonstandard-service-models/pom.xml new file mode 100644 index 00000000..0958dd5c --- /dev/null +++ b/alto-release-features/odl-alto-nonstandard-service-models/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-nonstandard-service-models + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Nonstandard-service-models + + + + + diff --git a/alto-release-features/odl-alto-nonstandard-types/pom.xml b/alto-release-features/odl-alto-nonstandard-types/pom.xml new file mode 100644 index 00000000..a7f16e1b --- /dev/null +++ b/alto-release-features/odl-alto-nonstandard-types/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-nonstandard-types + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Nonstandard-types + + + + + diff --git a/alto-release-features/odl-alto-northbound/pom.xml b/alto-release-features/odl-alto-northbound/pom.xml new file mode 100644 index 00000000..f2705e89 --- /dev/null +++ b/alto-release-features/odl-alto-northbound/pom.xml @@ -0,0 +1,82 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-northbound + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Northbound + + + org.opendaylight.mdsal.model + org.opendaylight.controller + org.opendaylight.netconf + 0.10.0-SNAPSHOT + 1.5.0-SNAPSHOT + 1.5.0-SNAPSHOT + 1.1.0-SNAPSHOT + + + + + + org.opendaylight.yangtools + yangtools-artifacts + ${yangtools.version} + pom + import + + + + + + + ${restconf.groupId} + odl-restconf + ${restconf.version} + xml + features + + + ${mdsal.model.groupId} + odl-mdsal-models + ${mdsal.model.version} + xml + features + + + ${mdsal.groupId} + odl-mdsal-broker + ${mdsal.version} + xml + features + + + org.opendaylight.alto.core + alto-northbound-api + ${project.version} + + + org.opendaylight.alto.core + alto-northbound-impl + ${project.version} + + + diff --git a/alto-release-features/odl-alto-release/pom.xml b/alto-release-features/odl-alto-release/pom.xml new file mode 100644 index 00000000..1f1f0587 --- /dev/null +++ b/alto-release-features/odl-alto-release/pom.xml @@ -0,0 +1,50 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-release + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Release + + + + ${project.groupId} + odl-alto-core + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-basic + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-extension + ${project.version} + xml + features + + + diff --git a/alto-release-features/odl-alto-resourcepool/pom.xml b/alto-release-features/odl-alto-resourcepool/pom.xml new file mode 100644 index 00000000..8ce9525b --- /dev/null +++ b/alto-release-features/odl-alto-resourcepool/pom.xml @@ -0,0 +1,74 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-resourcepool + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Resourcepool + + + org.opendaylight.mdsal.model + org.opendaylight.controller + 0.10.0-SNAPSHOT + 1.5.0-SNAPSHOT + + + + + ${mdsal.model.groupId} + odl-mdsal-models + ${mdsal.model.version} + xml + features + + + ${mdsal.groupId} + odl-mdsal-all + ${mdsal.version} + xml + features + + + ${mdsal.groupId} + odl-mdsal-broker + ${mdsal.version} + xml + features + + + ${project.groupId} + odl-alto-standard-types + ${project.version} + xml + features + + + org.opendaylight.alto.core + alto-resourcepool-api + ${project.version} + + + org.opendaylight.alto.core + alto-resourcepool-impl + ${project.version} + + + diff --git a/alto-release-features/odl-alto-rsabs/pom.xml b/alto-release-features/odl-alto-rsabs/pom.xml new file mode 100644 index 00000000..0bc81915 --- /dev/null +++ b/alto-release-features/odl-alto-rsabs/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-rsabs + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Routing state abstraction + + + + + diff --git a/alto-release-features/odl-alto-simpleecs/pom.xml b/alto-release-features/odl-alto-simpleecs/pom.xml new file mode 100644 index 00000000..72703a14 --- /dev/null +++ b/alto-release-features/odl-alto-simpleecs/pom.xml @@ -0,0 +1,59 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-simpleecs + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Simple-ECS + + + org.opendaylight.l2switch + etc/opendaylight/karaf + 0.5.0-SNAPSHOT + + + + + ${l2switch.groupId} + odl-l2switch-hosttracker + ${l2switch.version} + xml + features + + + ${project.groupId} + odl-alto-core + ${project.version} + xml + features + + + org.opendaylight.alto.basic + alto-simple-ecs-api + ${project.version} + + + org.opendaylight.alto.basic + alto-simple-ecs-impl + ${project.version} + + + diff --git a/alto-release-features/odl-alto-simpleecs/src/main/feature/feature.xml b/alto-release-features/odl-alto-simpleecs/src/main/feature/feature.xml new file mode 100644 index 00000000..93a73a83 --- /dev/null +++ b/alto-release-features/odl-alto-simpleecs/src/main/feature/feature.xml @@ -0,0 +1,6 @@ + + + + mvn:org.opendaylight.alto.basic/alto-simple-ecs-impl/${project.version}/xml/config + + diff --git a/alto-release-features/odl-alto-simpleird/pom.xml b/alto-release-features/odl-alto-simpleird/pom.xml new file mode 100644 index 00000000..5d8c5c47 --- /dev/null +++ b/alto-release-features/odl-alto-simpleird/pom.xml @@ -0,0 +1,82 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-simpleird + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Simple-IRD + + + org.opendaylight.mdsal.model + org.opendaylight.controller + 0.10.0-SNAPSHOT + 1.5.0-SNAPSHOT + etc/opendaylight/karaf + + + + + ${mdsal.model.groupId} + odl-mdsal-models + ${mdsal.model.version} + xml + features + + + ${mdsal.groupId} + odl-mdsal-broker + ${mdsal.version} + xml + features + + + ${project.groupId} + odl-alto-northbound + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-resourcepool + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-standard-service-models + ${project.version} + xml + features + + + org.opendaylight.alto.basic + alto-simple-ird-api + ${project.version} + + + org.opendaylight.alto.basic + alto-simple-ird-impl + ${project.version} + + + diff --git a/alto-release-features/odl-alto-simpleird/src/main/feature/feature.xml b/alto-release-features/odl-alto-simpleird/src/main/feature/feature.xml new file mode 100644 index 00000000..6ec2daeb --- /dev/null +++ b/alto-release-features/odl-alto-simpleird/src/main/feature/feature.xml @@ -0,0 +1,6 @@ + + + + mvn:org.opendaylight.alto.basic/alto-simple-ird-impl/${project.version}/xml/config + + diff --git a/alto-release-features/odl-alto-spce/pom.xml b/alto-release-features/odl-alto-spce/pom.xml new file mode 100644 index 00000000..dfdfef0f --- /dev/null +++ b/alto-release-features/odl-alto-spce/pom.xml @@ -0,0 +1,111 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-spce + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: SPCE + + + org.opendaylight.mdsal.model + org.opendaylight.controller + org.opendaylight.l2switch + org.opendaylight.openflowplugin + 0.10.0-SNAPSHOT + 1.5.0-SNAPSHOT + etc/opendaylight/karaf + 0.5.0-SNAPSHOT + 0.4.0-SNAPSHOT + + + + + ${mdsal.model.groupId} + odl-mdsal-models + ${mdsal.model.version} + xml + features + + + ${mdsal.groupId} + odl-mdsal-broker + ${mdsal.version} + xml + features + + + ${openflow.plugin.groupId} + odl-openflowplugin-flow-services + ${openflow.plugin.version} + xml + features + + + ${openflow.plugin.groupId} + odl-openflowplugin-southbound + ${openflow.plugin.version} + xml + features + + + ${l2switch.groupId} + odl-l2switch-loopremover + ${l2switch.version} + xml + features + + + ${l2switch.groupId} + odl-l2switch-hosttracker + ${l2switch.version} + xml + features + + + ${l2switch.groupId} + odl-l2switch-arphandler + ${l2switch.version} + xml + features + + + org.opendaylight.alto.spce.network + network-tracker-api + ${project.version} + + + org.opendaylight.alto.spce.network + network-tracker-impl + ${project.version} + + + org.opendaylight.alto.ext + alto-spce-api + ${project.version} + + + org.opendaylight.alto.ext + alto-spce-impl + ${project.version} + + + + diff --git a/alto-release-features/odl-alto-spce/src/main/feature/feature.xml b/alto-release-features/odl-alto-spce/src/main/feature/feature.xml new file mode 100644 index 00000000..1c7429e8 --- /dev/null +++ b/alto-release-features/odl-alto-spce/src/main/feature/feature.xml @@ -0,0 +1,7 @@ + + + + mvn:org.opendaylight.alto.spce.network/network-tracker-impl/${project.version}/xml/config + mvn:org.opendaylight.alto.ext/alto-spce-impl/${project.version}/xml/config + + diff --git a/alto-release-features/odl-alto-standard-northbound-route/pom.xml b/alto-release-features/odl-alto-standard-northbound-route/pom.xml new file mode 100644 index 00000000..295763b1 --- /dev/null +++ b/alto-release-features/odl-alto-standard-northbound-route/pom.xml @@ -0,0 +1,84 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-standard-northbound-route + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Standard-northbound-route + + + + + ${project.groupId} + odl-alto-standard-service-models + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-northbound + ${project.version} + xml + features + + + org.opendaylight.alto.core + alto-northbound-route-networkmap-api + ${project.version} + + + org.opendaylight.alto.core + alto-northbound-route-networkmap-impl + ${project.version} + + + org.opendaylight.alto.core + alto-northbound-route-costmap-api + ${project.version} + + + org.opendaylight.alto.core + alto-northbound-route-costmap-impl + ${project.version} + + + org.opendaylight.alto.core + alto-northbound-route-endpointcost-api + ${project.version} + + + org.opendaylight.alto.core + alto-northbound-route-endpointcost-impl + ${project.version} + + + org.opendaylight.alto.core + alto-northbound-route-endpointproperty-api + ${project.version} + + + org.opendaylight.alto.core + alto-northbound-route-endpointproperty-impl + ${project.version} + + + diff --git a/alto-release-features/odl-alto-standard-resource-translator/pom.xml b/alto-release-features/odl-alto-standard-resource-translator/pom.xml new file mode 100644 index 00000000..8d6a0d7b --- /dev/null +++ b/alto-release-features/odl-alto-standard-resource-translator/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-standard-resource-translator + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Standard-resource-translator + + + + + diff --git a/alto-release-features/odl-alto-standard-service-models/pom.xml b/alto-release-features/odl-alto-standard-service-models/pom.xml new file mode 100644 index 00000000..161d922e --- /dev/null +++ b/alto-release-features/odl-alto-standard-service-models/pom.xml @@ -0,0 +1,85 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-standard-service-models + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Standard-service-model + + + org.opendaylight.mdsal.model + 0.10.0-SNAPSHOT + + + + + ${mdsal.model.groupId} + odl-mdsal-models + ${mdsal.model.version} + xml + features + + + ${project.groupId} + odl-alto-standard-types + ${project.version} + xml + features + + + ${project.groupId} + odl-alto-resourcepool + ${project.version} + xml + features + + + org.opendaylight.alto.core + alto-service-model-base-api + ${project.version} + + + org.opendaylight.alto.core + alto-service-model-ird-api + ${project.version} + + + org.opendaylight.alto.core + alto-service-model-networkmap-api + ${project.version} + + + org.opendaylight.alto.core + alto-service-model-endpointcost-api + ${project.version} + + + org.opendaylight.alto.core + alto-service-model-costmap-api + ${project.version} + + + org.opendaylight.alto.core + alto-service-model-endpointproperty-api + ${project.version} + + + diff --git a/alto-release-features/odl-alto-standard-types/pom.xml b/alto-release-features/odl-alto-standard-types/pom.xml new file mode 100644 index 00000000..7878ef4b --- /dev/null +++ b/alto-release-features/odl-alto-standard-types/pom.xml @@ -0,0 +1,46 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + odl-alto-standard-types + 0.4.0-SNAPSHOT + feature + + OpenDaylight :: alto :: Standard-types + + + org.opendaylight.mdsal.model + 0.10.0-SNAPSHOT + + + + + ${mdsal.model.groupId} + odl-mdsal-models + ${mdsal.model.version} + xml + features + + + org.opendaylight.alto.core + alto-basic-types + ${project.version} + + + diff --git a/alto-release-features/pom.xml b/alto-release-features/pom.xml index ef0c8acb..c8f21556 100644 --- a/alto-release-features/pom.xml +++ b/alto-release-features/pom.xml @@ -9,383 +9,39 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 org.opendaylight.odlparent - features-parent + odlparent-lite 1.8.0-SNAPSHOT org.opendaylight.alto - features-alto-release + features-aggregator 0.4.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - - 0.10.0-SNAPSHOT - 1.5.0-SNAPSHOT - 1.5.0-SNAPSHOT - 1.1.0-SNAPSHOT - 0.5.0-SNAPSHOT - etc/opendaylight/karaf - 0.5.0-SNAPSHOT - 0.4.0-SNAPSHOT - - - - - - - org.opendaylight.alto - alto-parent - ${project.version} - pom - import - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - - - - - org.opendaylight.yangtools - features-yangtools - features - ${yangtools.version} - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - - org.opendaylight.alto.core - alto-basic-types - ${project.version} - - - - org.opendaylight.alto.core - alto-resourcepool-api - ${project.version} - - - - org.opendaylight.alto.core - alto-resourcepool-impl - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-api - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-impl - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-route-networkmap-api - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-route-networkmap-impl - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-route-costmap-api - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-route-costmap-impl - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-route-endpointcost-api - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-route-endpointcost-impl - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-route-endpointproperty-api - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-route-endpointproperty-impl - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-ird-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-base-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-networkmap-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-endpointcost-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-endpointproperty-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-costmap-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-config-api - ${project.version} - - - - org.opendaylight.alto.basic - alto-simple-ird-impl - ${project.version} - - - - org.opendaylight.alto.basic - alto-manual-maps-impl - ${project.version} - - - - org.opendaylight.alto.basic - alto-manual-maps-impl - ${project.version} - xml - config - - - - org.opendaylight.alto.basic - alto-manual-maps-api - ${project.version} - - - - org.opendaylight.alto.basic - alto-simple-ird-impl - ${project.version} - xml - config - - - - org.opendaylight.alto.basic - alto-simple-ird-api - ${project.version} - - - org.opendaylight.openflowplugin - features-openflowplugin - features - ${openflow.plugin.version} - xml - runtime - - - org.opendaylight.openflowplugin.model - model-flow-statistics - ${openflow.plugin.version} - jar - - - org.opendaylight.l2switch - features-l2switch - features - ${l2switch.version} - xml - runtime - - - org.opendaylight.alto.spce.network - network-tracker-config - ${project.version} - xml - config - - - org.opendaylight.alto.spce.network - network-tracker-impl - ${project.version} - runtime - - - org.opendaylight.alto.spce.network - network-tracker-impl - ${project.version} - xml - config - runtime - - - org.opendaylight.alto.spce.network - network-tracker-api - ${project.version} - runtime - - - org.opendaylight.alto.ext - alto-spce-impl - ${project.version} - - - org.opendaylight.alto.ext - alto-spce-impl - ${project.version} - xml - config - - - org.opendaylight.alto.ext - alto-spce-api - ${project.version} - - - - ${project.groupId}.basic - alto-simple-ecs-impl - ${project.version} - - - ${project.groupId}.basic - alto-simple-ecs-impl - ${project.version} - xml - config - - - ${project.groupId}.basic - alto-simple-ecs-api - ${project.version} - - - - org.opendaylight.alto.basic - alto-auto-maps-impl - ${project.version} - - - org.opendaylight.alto.basic - alto-auto-maps-api - ${project.version} - - - - org.opendaylight.alto - multicost-api - ${project.version} - - - - org.opendaylight.alto - multicost-impl - ${project.version} - - - - org.opendaylight.alto - incremental-update-api - ${project.version} - - - - org.opendaylight.alto - incremental-update-impl - ${project.version} - - - - org.opendaylight.alto - rsade-api - ${project.version} - - - - org.opendaylight.alto - rsade-impl - ${project.version} - - + pom + + + features-alto + features4-alto + odl-alto-release + odl-alto-core + odl-alto-basic + odl-alto-extension + odl-alto-spce + odl-alto-standard-types + odl-alto-resourcepool + odl-alto-northbound + odl-alto-standard-service-models + odl-alto-standard-northbound-route + odl-alto-standard-resource-translator + odl-alto-simpleird + odl-alto-manual-maps + odl-alto-simpleecs + odl-alto-auto-maps + odl-alto-nonstandard-types + odl-alto-nonstandard-service-models + odl-alto-nonstandard-northbound-route + odl-alto-multicost + odl-alto-iupd + odl-alto-rsabs + diff --git a/utils/migrate_karaf4.sh b/utils/migrate_karaf4.sh new file mode 100755 index 00000000..44699ce6 --- /dev/null +++ b/utils/migrate_karaf4.sh @@ -0,0 +1,56 @@ +#!/bin/bash + +FEATURES=$1 +DIR=$2 + +XMLSTAR_VERSION=$(xml --version) + +if [ -z "$XMLSTAR_VERSION" ] ; then + echo "xmlstarlet is REQUIRED to run this script." + exit -1 +fi + +feature_headless=$(sed -E 's/(xmlns|xsi)(:[a-zA-Z]+)?=".*"//g' $FEATURES) +modules=$(echo $feature_headless | xml sel -t -m 'features/feature' -v '@name' -n) +for module in $modules; do + # Generate feature pom for each module + echo ">>> Generate module $module" + module_content=$(echo $feature_headless | xml sel -t -c 'features/feature[@name="'$module'"]') + description=$(echo $module_content | xml sel -t -v 'feature/@description') + mkdir -p $DIR/$module + touch $DIR/$module/pom.xml + echo ' + + + 4.0.0 + + + org.opendaylight.odlparent + single-feature-parent + 1.8.0-SNAPSHOT + + + + org.opendaylight.alto + '$module' + 0.4.0-SNAPSHOT + feature + + '$description' +' > $DIR/$module/pom.xml + echo $module_content | sed ' + sX\([^<]*\)X${project.groupId}\2\1xmlfeaturesXg +sXmvn:\([^/]*\)/\([^/]*\)/Template:VERSIONX\1\2Xg +sXwrap:mvn:\([^/]*\)/\([^/]*\)/Template:VERSIONX\1\2Xg +sXmvn:\([^/]*\)/\([^/]*\)/\([^<]*\)X\1\2\3Xg +sXwrap:mvn:\([^/]*\)/\([^/]*\)/\([^<]*\)X\1\2\3Xg + ' | xml ed -O -d 'feature/@*' -r 'feature' -v 'dependencies' >> $DIR/$module/pom.xml + echo '' >> $DIR/$module/pom.xml +done -- 2.36.6