Set up top-level features

Patch set 2: remove local features which is used for testing

Change-Id: I691ce6afb4f034984aabfc8279a8fe3d2eabfd5a
Signed-off-by: Kai GAO <gaok12@mails.tsinghua.edu.cn>

diff --git a/alto-core/resourcepool/pom.xml b/alto-core/resourcepool/pom.xml
index b14e7eace1836e3a1d1ed29ca2a97751e7131274..35632ebd1cfa26925d9eeebf74a60e99021a0867 100644 (file)
--- a/alto-core/resourcepool/pom.xml
+++ b/alto-core/resourcepool/pom.xml
@@ -30,6 +30,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
+      <modules>
+        <module>api</module>
+        <module>impl</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>alto-dev</id>
       <modules>
         <module>api</module>
         <module>impl</module>

diff --git a/alto-release-features/pom.xml b/alto-release-features/pom.xml
index b894207db5964de4c99f40df1a47adf2b29a6030..4cf10be444035e1ee8643dfefd697e44962a4b20 100644 (file)
--- a/alto-release-features/pom.xml
+++ b/alto-release-features/pom.xml
@@ -20,7 +20,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>${project.artifactId}</name>
 
   <properties>
-    <features.file>features.xml</features.file>
+    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
+    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
+    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.3.0-SNAPSHOT</dlux.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
@@ -28,9 +32,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <dependencies>
       <!-- project specific dependencies -->
       <dependency>
-        <groupId>org.opendaylight.alto</groupId>
-        <artifactId>alto-parent</artifactId>
-        <version>${project.version}</version>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>${mdsal.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>restconf-artifacts</artifactId>
+        <version>${restconf.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -38,5 +49,133 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-yangtools</artifactId>
+      <classifier>features</classifier>
+      <version>${yangtools.version}</version>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>features-mdsal-model</artifactId>
+      <version>${mdsal.model.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>features-restconf</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>features-dlux</artifactId>
+      <classifier>features</classifier>
+      <version>${dlux.version}</version>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-basic-types</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-resourcepool-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-resourcepool-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-resourcepool-impl</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-northbound-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-northbound-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-northbound-impl</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-service-model-ird-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-service-model-base-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-service-model-networkmap-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.core</groupId>
+      <artifactId>alto-service-model-endpointcost-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.basic</groupId>
+      <artifactId>alto-simple-ird-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.basic</groupId>
+      <artifactId>alto-simple-ird-impl</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.alto.basic</groupId>
+      <artifactId>alto-simple-ird-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 </project>

diff --git a/alto-release-features/src/main/features/features.xml b/alto-release-features/src/main/features/features.xml
index daf89cc25d9bf99f2501fc22bbfc93a72534b60a..b94f185dc7130ef433c99df5715ea9c3514e9c57 100644 (file)
--- a/alto-release-features/src/main/features/features.xml
+++ b/alto-release-features/src/main/features/features.xml
@@ -10,7 +10,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   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">
 
-<feature name='odl-alto-release' version='${project.version}'
+  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
+
+  <!-- TODO add features repository for alto-core and alto-basic -->
+
+  <feature name='odl-alto-release' version='${project.version}'
           description='OpenDaylight :: alto :: Release'>
     <feature version='${project.version}'>odl-alto-core</feature>
     <feature version='${project.version}'>odl-alto-basic</feature>
@@ -21,14 +29,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version='${project.version}'>odl-alto-standard-types</feature>
     <feature version='${project.version}'>odl-alto-resourcepool</feature>
     <feature version='${project.version}'>odl-alto-northbound</feature>
-    <feature version='${project.version}'>odl-alto-standard-service-model</feature>
+    <feature version='${project.version}'>odl-alto-standard-service-models</feature>
     <feature version='${project.version}'>odl-alto-standard-northbound-route</feature>
     <feature version='${project.version}'>odl-alto-standard-resource-translator</feature>
   </feature>
 
   <feature name='odl-alto-basic' version='${project.version}'
             description='OpenDaylight :: alto :: Basic'>
-    <feature version='${project.version}'>odl-alto-ird</feature>
+    <feature version='${project.version}'>odl-alto-simpleird</feature>
     <feature version='${project.version}'>odl-alto-manual-maps</feature>
     <feature version='${project.version}'>odl-alto-hosttracker</feature>
   </feature>
@@ -36,56 +44,109 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <feature name='odl-alto-extension' version='${project.version}'
             description='OpenDaylight :: alto :: Extension'>
     <feature version='${project.version}'>odl-alto-nonstandard-types</feature>
-    <feature version='${project.version}'>odl-alto-nonstandard-service-model</feature>
+    <feature version='${project.version}'>odl-alto-nonstandard-service-models</feature>
     <feature version='${project.version}'>odl-alto-nonstandard-northbound-route</feature>
   </feature>
 
   <feature name='odl-alto-standard-types' version='${project.version}'
             description='OpenDaylight :: alto :: standard-types'>
+    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
+    <bundle>mvn:org.opendaylight.alto.core/alto-basic-types/${project.version}</bundle>
   </feature>
 
   <feature name='odl-alto-resourcepool' version='${project.version}'
             description='OpenDaylight :: alto :: resourcepool'>
+    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
+    <feature version='${mdsal.version}'>odl-mdsal-all</feature>
+    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+
+    <feature version='${project.version}'>odl-alto-standard-types</feature>
+
+    <bundle>mvn:org.opendaylight.alto.core/alto-resourcepool-api/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.alto.core/alto-resourcepool-impl/${project.version}</bundle>
+    <configfile finalname="${configfile.directory}/alto-resourcepool-impl.xml">
+      mvn:org.opendaylight.alto.core/alto-resourcepool-impl/${project.version}/xml/config
+    </configfile>
   </feature>
 
   <feature name='odl-alto-northbound' version='${project.version}'
             description='OpenDaylight :: alto :: northbound'>
+    <feature version="${restconf.version}">odl-restconf</feature>
+    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
+    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+
+    <bundle>mvn:org.opendaylight.alto.core/alto-northbound-api/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version}</bundle>
+    <configfile finalname="${configfile.directory}/alto-northbound.xml">
+      mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version}/xml/config
+    </configfile>
   </feature>
 
-  <feature name='odl-alto-standard-service-model' version='${project.version}'
+  <feature name='odl-alto-standard-service-models' version='${project.version}'
             description='OpenDaylight :: alto :: standard-service-model'>
+    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
+
+    <feature version='${project.version}'>odl-alto-standard-types</feature>
+    <feature version='${project.version}'>odl-alto-resourcepool</feature>
+
+    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-base-api/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-ird-api/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-networkmap-api/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-api/${project.version}</bundle>
+    <!--
+      TODO :: service models for cost map and endpoint property
+    -->
   </feature>
 
   <feature name='odl-alto-standard-northbound-route' version='${project.version}'
             description='OpenDaylight :: alto :: standard-northbound-route'>
+    <!-- TODO standard routes for network map/cost map/endpoint cost/endpoint property -->
   </feature>
 
   <feature name='odl-alto-standard-resource-translator' version='${project.version}'
             description='OpenDaylight :: alto :: standard-resource-translator'>
+    <!-- Empty in this release -->
   </feature>
 
-  <feature name='odl-alto-ird' version='${project.version}'
-            description='OpenDaylight :: alto :: ird'>
+  <feature name='odl-alto-simpleird' version='${project.version}'
+            description='OpenDaylight :: alto :: Simple IRD'>
+    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
+    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+
+    <feature version='${project.version}'>odl-alto-northbound</feature>
+    <feature version='${project.version}'>odl-alto-resourcepool</feature>
+    <feature version='${project.version}'>odl-alto-standard-service-models</feature>
+
+    <bundle>mvn:org.opendaylight.alto.basic/alto-simple-ird-api/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.alto.basic/alto-simple-ird-impl/${project.version}</bundle>
+    <configfile finalname="${configfile.directory}/alto-simple-ird.xml">
+      mvn:org.opendaylight.alto.basic/alto-simple-ird-impl/${project.version}/xml/config
+    </configfile>
   </feature>
 
   <feature name='odl-alto-manual-maps' version='${project.version}'
             description='OpenDaylight :: alto :: manual-maps'>
+    <!-- TODO -->
   </feature>
 
   <feature name='odl-alto-hosttracker' version='${project.version}'
             description='OpenDaylight :: alto :: hosttracker'>
+    <!-- TODO -->
   </feature>
 
   <feature name='odl-alto-nonstandard-types' version='${project.version}'
             description='OpenDaylight :: alto :: nonstandard-types'>
+    <!-- Empty in this release -->
   </feature>
 
-  <feature name='odl-alto-nonstandard-service-model' version='${project.version}'
-            description='OpenDaylight :: alto :: nonstandard-service-model'>
+  <feature name='odl-alto-nonstandard-service-models' version='${project.version}'
+            description='OpenDaylight :: alto :: nonstandard-service-models'>
+    <!-- Empty in this release -->
   </feature>
 
   <feature name='odl-alto-nonstandard-northbound-route' version='${project.version}'
             description='OpenDaylight :: alto :: nonstandard-northbound-route'>
+    <!-- Empty in this release -->
   </feature>
 
 </features>