Bug 4202: Migration to use mdsal project

author Tony Tkacik <ttkacik@cisco.com>

Mon, 7 Sep 2015 10:30:22 +0000 (12:30 +0200)

committer Gerrit Code Review <gerrit@opendaylight.org>

Thu, 17 Sep 2015 15:54:00 +0000 (15:54 +0000)
author Tony Tkacik <ttkacik@cisco.com>
Mon, 7 Sep 2015 10:30:22 +0000 (12:30 +0200)
committer Gerrit Code Review <gerrit@opendaylight.org>
Thu, 17 Sep 2015 15:54:00 +0000 (15:54 +0000)
diff --git a/features/akka/src/main/resources/features.xml b/features/akka/src/main/resources/features.xml

index cc62e36f07a4fe8cc7e72fe910fdc19a8d29effe..6a9b5888f2d1c9ad2eb660ac2d8cabcedab9321e 100644 (file)
--- a/features/akka/src/main/resources/features.xml
+++ b/features/akka/src/main/resources/features.xml
@@ -14,14 +14,6 @@
          Necessary TODO: Please read the features guidelines:
          https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Best_Practices
      -->
-    <!--
-    Necessary TODO: Add repo entries for the repositories of features you refer to
-        in this feature file but do not define here.
-        Examples:
-            <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.8.0-SNAPSHOT/xml/features</repository>
-            <repository>mvn:org.opendaylight.controller/features-mdsal/1.3.0-SNAPSHOT/xml/features</repository>
-            <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.2.0-SNAPSHOT/xml/features</repository>
-    -->
      <feature name='odl-akka-all' version='${project.version}' description='OpenDaylight :: Akka :: All'>
          <!--
              Necessary TODO:
@@ -47,41 +39,6 @@
              a) Prefixing names with 'odl-': https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Naming
              b) Descriptions: https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description
              c) Avoid start-levels: https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Avoid_start-levels
-
-        It's also nice to list inside a feature, first the features it needs, then the bundles it needs, then the configfiles.
-        Examples:
-
-        * Basic MD-SAL Provider
-        <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider '>
-            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
-            <feature version='${project.version}'>odl-controller-model</feature>
-            <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
-            ... whatever other bundles you need
-        </feature>
-
-        * Basic MD-SAL Model feature
-        <feature name='odl-controller-model' version='${project.version}' description='OpenDaylight :: controller :: Model'>
-            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-binding</feature>
-            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-models</feature>
-            <bundle>mvn:org.opendaylight.controller/controller-model/${project.version}</bundle>
-            ... whatever other bundles you need
-        </feature>
-
-        * Config Subsystem example - the config file is your config subsystem configuration
-        <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider'>
-            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
-            <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
-            <configfile finalname="etc/opendaylight/karaf/80-controller.xml">mvn:org.opendaylight.controller/controller-config/${project.version}/xml/config</configfile>
-            ... whatever other bundles you need
-        </feature>
-
-        * Basic MD-SAL Provider that uses openflowplugin-flow-services (which brings along odl-mdsal-broker)
-        <feature name='odl-controller-provider' version='${project.version}' description='OpenDaylight :: controller :: Provider'>
-            <feature version='0.2.0-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
-            <bundle>mvn:org.opendaylight.controller/controller-provider/${project.version}</bundle>
-            ... whatever other bundles you need
-        </feature>
-
      -->
      <feature name="odl-akka-scala" description="Scala Runtime for OpenDaylight" version="${scala.version}">
          <bundle>mvn:org.scala-lang/scala-library/${scala.version}.${scala.micro.version}</bundle>
@@ -112,6 +69,4 @@
          <bundle>mvn:com.typesafe.akka/akka-persistence-experimental_${scala.version}/${akka.version}</bundle>
          <bundle>wrap:mvn:com.google.protobuf/protobuf-java/${protobuf.version}$overwrite=merge&amp;DynamicImport-Package=org.opendaylight.controller.protobuff.messages.*;org.opendaylight.controller.cluster.raft.protobuff.client.messages.*</bundle>
      </feature>
-    <!-- Optional TODO: Remove TODO Comments -->
-
  </features>
diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml

index f703b48c0fcda4aaa4de48e83cd9890cbc5268fa..f5aa4c1c173d7eba469d5208afcd9013709073c2 100644 (file)
--- a/features/config-netty/pom.xml
+++ b/features/config-netty/pom.xml
@@ -2,19 +2,33 @@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-subsystem</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <relativePath>../../opendaylight/config/</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>features-parent</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+    <relativePath/>
    </parent>
-  <artifactId>features-config-netty</artifactId>
  
+  <groupId>org.opendaylight.controller</groupId>
+  <artifactId>features-config-netty</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
    <packaging>jar</packaging>
  
    <properties>
-    <features.file>features.xml</features.file>
+    <config.version>0.4.0-SNAPSHOT</config.version>
    </properties>
  
+  <dependencyManagement>
+    <dependencies>
+       <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>config-artifacts</artifactId>
+        <version>${config.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
    <dependencies>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
@@ -54,72 +68,9 @@
        <type>xml</type>
        <classifier>config</classifier>
      </dependency>
-    <!-- test to validate features.xml -->
-    <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>features-test</artifactId>
-    </dependency>
    </dependencies>
  
-  <build>
-    <resources>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/${features.file}</file>
-                  <type>xml</type>
-                  <classifier>features</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
-          </systemPropertyVariables>
-          <dependenciesToScan>
-           <dependency>org.opendaylight.odlparent:features-test</dependency>
-          </dependenciesToScan>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+
    <scm>
      <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
diff --git a/features/config-netty/src/main/resources/features.xml b/features/config-netty/src/main/features/features.xml

similarity index 100%

rename from features/config-netty/src/main/resources/features.xml

rename to features/config-netty/src/main/features/features.xml
diff --git a/features/config-persister/pom.xml b/features/config-persister/pom.xml

index 3a0f9f49d35d77a8f0a4e0c3aa59d7a55b5e4ac7..5c98382791bf5f951455b38c3e5979542cb5bab6 100644 (file)
--- a/features/config-persister/pom.xml
+++ b/features/config-persister/pom.xml
@@ -2,24 +2,47 @@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-subsystem</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <relativePath>../../opendaylight/config/</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>features-parent</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+    <relativePath/>
    </parent>
-  <artifactId>features-config-persister</artifactId>
  
+  <groupId>org.opendaylight.controller</groupId>
+  <artifactId>features-config-persister</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
    <packaging>jar</packaging>
  
    <properties>
+    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
+    <config.version>0.4.0-SNAPSHOT</config.version>
      <features.file>features.xml</features.file>
    </properties>
  
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>${mdsal.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+       <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>config-artifacts</artifactId>
+        <version>${config.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
    <dependencies>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <version>${yangtools.version}</version>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <version>${mdsal.version}</version>
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
@@ -73,72 +96,9 @@
        <groupId>org.eclipse.persistence</groupId>
        <artifactId>org.eclipse.persistence.moxy</artifactId>
      </dependency>
-    <!-- test to validate features.xml -->
-    <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>features-test</artifactId>
-    </dependency>
+
    </dependencies>
  
-  <build>
-    <resources>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/${features.file}</file>
-                  <type>xml</type>
-                  <classifier>features</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
-          </systemPropertyVariables>
-          <dependenciesToScan>
-           <dependency>org.opendaylight.odlparent:features-test</dependency>
-          </dependenciesToScan>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
    <scm>
      <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
diff --git a/features/config-persister/src/main/resources/features.xml b/features/config-persister/src/main/features/features.xml

similarity index 66%

rename from features/config-persister/src/main/resources/features.xml

rename to features/config-persister/src/main/features/features.xml

index 59b498b07dd2cff0f709c47ae5931eb887b926a3..6243cbdb02425c36f823edb3b985190a7730c863 100644 (file)
--- a/features/config-persister/src/main/resources/features.xml
+++ b/features/config-persister/src/main/features/features.xml
@@ -3,8 +3,8 @@
  <features name="odl-config-persister-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
            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">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-config/${config.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
    <feature name='odl-config-persister-all' version='${project.version}' description="OpenDaylight :: Config Persister:: All">
      <feature version='${project.version}'>odl-config-persister</feature>
      <feature version='${project.version}'>odl-config-startup</feature>
@@ -13,26 +13,26 @@
      <feature version='${project.version}'>odl-config-api</feature>
      <feature version='${project.version}'>odl-config-core</feature>
      <feature version='${project.version}'>odl-config-manager</feature>
-    <feature version='${yangtools.version}'>odl-yangtools-binding-generator</feature>
-    <bundle>mvn:org.opendaylight.controller/yang-jmx-generator/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/config-persister-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/config-util/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/config-manager-facade-xml/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/config-persister-file-xml-adapter/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/config-persister-impl/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/config-persister-feature-adapter/${project.version}</bundle>
+    <feature version='${mdsal.version}'>odl-mdsal-binding-runtime</feature>
+    <bundle>mvn:org.opendaylight.controller/yang-jmx-generator/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.controller/config-persister-api/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.controller/config-util/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.controller/config-manager-facade-xml/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.controller/config-persister-file-xml-adapter/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.controller/config-persister-impl/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.controller/config-persister-feature-adapter/{{VERSION}}</bundle>
  
-    <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
-    <bundle>mvn:commons-io/commons-io/${commons.io.version}</bundle>
-    <bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
-    <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.core/${eclipse.persistence.version}</bundle>
-    <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.moxy/${eclipse.persistence.version}</bundle>
+    <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
+    <bundle>mvn:commons-io/commons-io/{{VERSION}}</bundle>
+    <bundle>mvn:org.apache.commons/commons-lang3/{{VERSION}}</bundle>
+    <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.core/{{VERSION}}</bundle>
+    <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.moxy/{{VERSION}}</bundle>
    </feature>
    <feature name='odl-config-startup' version='${project.version}' description="OpenDaylight :: Config Persister:: Config Startup">
      <feature version='${project.version}'>odl-config-persister</feature>
    </feature>
    <feature name='odl-config-manager-facade-xml' version='${project.version}' description="Opendaylight :: Config Persister:: Mapping for Config Subsystem">
      <feature version='${project.version}'>odl-config-core</feature>
-    <bundle>mvn:org.opendaylight.controller/config-manager-facade-xml/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.controller/config-manager-facade-xml/{{VERSION}}</bundle>
    </feature>
  </features>
diff --git a/features/config/pom.xml b/features/config/pom.xml

index b850d65be377f1d10ec1f0ae77177c473af21bb4..e6d9426a82d4f131c9a6f876fd20d3ba33e65804 100644 (file)
--- a/features/config/pom.xml
+++ b/features/config/pom.xml
@@ -2,35 +2,69 @@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-subsystem</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <relativePath>../../opendaylight/config/</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>features-parent</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+    <relativePath/>
    </parent>
-  <artifactId>features-config</artifactId>
  
+  <groupId>org.opendaylight.controller</groupId>
+  <artifactId>features-config</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
    <packaging>jar</packaging>
  
    <properties>
+    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
+    <config.version>0.4.0-SNAPSHOT</config.version>
      <features.file>features.xml</features.file>
    </properties>
  
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>${yangtools.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>${mdsal.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+       <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>config-artifacts</artifactId>
+        <version>${config.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+
    <dependencies>
-    <!-- dependency for opendaylight-karaf-empty for use by testing -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>1.6.0-SNAPSHOT</version>
-      <type>zip</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Required features repositories -->
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>features-yangtools</artifactId>
-      <version>${yangtools.version}</version>
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+
+    <!-- Config artifacts -->
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>config-api</artifactId>
@@ -47,6 +81,14 @@
        <groupId>io.netty</groupId>
        <artifactId>netty-common</artifactId>
      </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-handler</artifactId>
+    </dependency>
      <dependency>
        <groupId>io.netty</groupId>
        <artifactId>netty-buffer</artifactId>
@@ -83,72 +125,8 @@
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>config-manager</artifactId>
      </dependency>
-    <!-- test the features.xml -->
-    <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>features-test</artifactId>
-    </dependency>
    </dependencies>
  
-  <build>
-    <resources>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/${features.file}</file>
-                  <type>xml</type>
-                  <classifier>features</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
-          </systemPropertyVariables>
-          <dependenciesToScan>
-           <dependency>org.opendaylight.odlparent:features-test</dependency>
-          </dependenciesToScan>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
    <scm>
      <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
diff --git a/features/config/src/main/features/features.xml b/features/config/src/main/features/features.xml

new file mode 100644 (file)

index 0000000..e23d5f5
--- /dev/null
+++ b/features/config/src/main/features/features.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<features name="odl-config-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+          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">
+
+  <repository>mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features</repository>
+
+  <feature name='odl-config-all' version='${project.version}' description="OpenDaylight :: Config :: All">
+      <feature version='${project.version}'>odl-config-api</feature>
+      <feature version='${project.version}'>odl-config-netty-config-api</feature>
+      <feature version='${project.version}'>odl-config-core</feature>
+      <feature version='${project.version}'>odl-config-manager</feature>
+  </feature>
+
+  <feature name='odl-config-api' version='${project.version}' description="OpenDaylight :: Config :: API">
+    <feature version='${mdsal.version}'>odl-mdsal-binding-base</feature>
+    <bundle>mvn:org.opendaylight.controller/config-api/{{VERSION}}</bundle>
+  </feature>
+
+  <feature name='odl-config-netty-config-api' version='${project.version}' description="OpenDaylight :: Config :: Netty Config API">
+    <feature version='${project.version}'>odl-config-api</feature>
+    <bundle>mvn:org.opendaylight.controller/netty-config-api/{{VERSION}}</bundle>
+    <bundle>mvn:io.netty/netty-transport/{{VERSION}}</bundle>
+    <bundle>mvn:io.netty/netty-common/{{VERSION}}</bundle>
+    <bundle>mvn:io.netty/netty-buffer/{{VERSION}}</bundle>
+    <bundle>mvn:io.netty/netty-codec/{{VERSION}}</bundle>
+    <bundle>mvn:io.netty/netty-handler/{{VERSION}}</bundle>
+  </feature>
+
+  <feature name='odl-config-core' version='${project.version}' description="OpenDaylight :: Config :: Core">
+    <feature version='${yangtools.version}'>odl-yangtools-common</feature>
+    <!-- FIXME: Bug 4202: Switch to MD-SAL provided odl-mdsal-binding-runtime -->
+    <feature version='${mdsal.version}'>odl-mdsal-binding-runtime</feature>
+    <feature version='${project.version}'>odl-config-api</feature>
+    <bundle>mvn:org.opendaylight.controller/config-util/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.controller/yang-jmx-generator/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.controller/shutdown-api/{{VERSION}}</bundle>
+    <bundle>mvn:org.opendaylight.controller/shutdown-impl/{{VERSION}}</bundle>
+  </feature>
+  <feature name='odl-config-manager' version='${project.version}' description="OpenDaylight :: Config :: Manager">
+    <feature version='${project.version}'>odl-config-core</feature>
+    <bundle>mvn:org.opendaylight.controller/config-manager/{{VERSION}}</bundle>
+  </feature>
+</features>
diff --git a/features/config/src/main/resources/features.xml b/features/config/src/main/resources/features.xml

deleted file mode 100644 (file)

index 0b7e464..0000000
--- a/features/config/src/main/resources/features.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<features name="odl-config-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-          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">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-
-  <feature name='odl-config-all' version='${project.version}' description="OpenDaylight :: Config :: All">
-      <feature version='${project.version}'>odl-config-api</feature>
-      <feature version='${project.version}'>odl-config-netty-config-api</feature>
-      <feature version='${project.version}'>odl-config-core</feature>
-      <feature version='${project.version}'>odl-config-manager</feature>
-  </feature>
-
-  <feature name='odl-config-api' version='${project.version}' description="OpenDaylight :: Config :: API">
-    <bundle>mvn:org.opendaylight.controller/config-api/${project.version}</bundle>
-    <feature version='${yangtools.version}'>odl-yangtools-common</feature>
-    <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
-  </feature>
-
-  <feature name='odl-config-netty-config-api' version='${project.version}' description="OpenDaylight :: Config :: Netty Config API">
-    <feature version='${project.version}'>odl-config-api</feature>
-    <bundle>mvn:org.opendaylight.controller/netty-config-api/${project.version}</bundle>
-    <bundle>mvn:io.netty/netty-transport/${netty.version}</bundle>
-    <bundle>mvn:io.netty/netty-common/${netty.version}</bundle>
-    <bundle>mvn:io.netty/netty-buffer/${netty.version}</bundle>
-    <bundle>mvn:io.netty/netty-codec/${netty.version}</bundle>
-    <bundle>mvn:io.netty/netty-handler/${netty.version}</bundle>
-  </feature>
-
-  <feature name='odl-config-core' version='${project.version}' description="OpenDaylight :: Config :: Core">
-    <feature version='${yangtools.version}'>odl-yangtools-common</feature>
-    <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
-    <feature version='${yangtools.version}'>odl-yangtools-binding-generator</feature>
-    <feature version='${project.version}'>odl-config-api</feature>
-    <bundle>mvn:org.opendaylight.yangtools/yang-model-api/${yangtools.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/config-util/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/yang-jmx-generator/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/shutdown-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/shutdown-impl/${project.version}</bundle>
-    <bundle>mvn:org.osgi/org.osgi.core/${osgi.core.version}</bundle>
-    <bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
-    <bundle>mvn:org.javassist/javassist/${javassist.version}</bundle>
-  </feature>
-  <feature name='odl-config-manager' version='${project.version}' description="OpenDaylight :: Config :: Manager">
-    <feature version='${project.version}'>odl-config-core</feature>
-    <bundle>mvn:org.opendaylight.controller/config-manager/${project.version}</bundle>
-  </feature>
-</features>
diff --git a/features/extras/pom.xml b/features/extras/pom.xml

index 3586477ef8c09dbaaaf1d783a60a2176c2dbed40..563f1281b852a3fa1323726444a17d76c2d17119 100644 (file)
--- a/features/extras/pom.xml
+++ b/features/extras/pom.xml
@@ -8,103 +8,29 @@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
      <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>commons.opendaylight</artifactId>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>features-parent</artifactId>
          <version>1.6.0-SNAPSHOT</version>
-        <relativePath>../../opendaylight/commons/opendaylight</relativePath>
+        <relativePath/>
      </parent>
-    <artifactId>features-extras</artifactId>
+
      <groupId>org.opendaylight.controller</groupId>
+    <artifactId>features-extras</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
      <packaging>jar</packaging>
      <properties>
-        <features.file>features.xml</features.file>
-        <!-- Optional TODO: Move these properties to your parent pom and possibly
-              DependencyManagement section of your parent pom -->
-        <branding.version>1.2.0-SNAPSHOT</branding.version>
-        <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
-        <karaf.version>3.0.3</karaf.version>
-        <karaf.empty.version>1.6.0-SNAPSHOT</karaf.empty.version>
-        <surefire.version>2.16</surefire.version>
+        <jolokia-bridge.version>0.2.0-SNAPSHOT</jolokia-bridge.version>
+        <jolokia.version>1.1.4</jolokia.version>
      </properties>
+
      <dependencies>
          <dependency>
              <groupId>org.jolokia</groupId>
              <artifactId>jolokia-osgi</artifactId>
              <version>${jolokia.version}</version>
          </dependency>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- dependency for opendaylight-karaf-empty for use by testing -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>opendaylight-karaf-empty</artifactId>
-            <version>${karaf.empty.version}</version>
-            <type>zip</type>
-        </dependency>
      </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>filter</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/classes/${features.file}</file>
-                                    <type>xml</type>
-                                    <classifier>features</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-                <configuration>
-                    <systemPropertyVariables>
-                        <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-                        <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-                        <karaf.distro.version>${karaf.empty.version}</karaf.distro.version>
-                    </systemPropertyVariables>
-                    <dependenciesToScan>
-                        <dependency>org.opendaylight.odlparent:features-test</dependency>
-                    </dependenciesToScan>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+
      <scm>
          <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
          <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
diff --git a/features/extras/src/main/resources/features.xml b/features/extras/src/main/features/features.xml

similarity index 94%

rename from features/extras/src/main/resources/features.xml

rename to features/extras/src/main/features/features.xml

index e7423ea17e2bfb231094a4b6c639695a41b4905f..d83b378f98c61313c1da3414a1862acd35515b7f 100644 (file)
--- a/features/extras/src/main/resources/features.xml
+++ b/features/extras/src/main/features/features.xml
@@ -20,6 +20,6 @@
      </feature>
      <feature name="odl-jolokia" version="${project.version}" description="Jolokia JMX/HTTP bridge">
          <feature>http</feature>
-        <bundle>mvn:org.jolokia/jolokia-osgi/${jolokia.version}</bundle>
+        <bundle>mvn:org.jolokia/jolokia-osgi/{{VERSION}}</bundle>
      </feature>
  </features>
diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml

index 182ee268e3a773f0888170d9a79dce3e48d3a9b0..ca5b0b2514e199a3fcb48dfab722c37efaa8b869 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -2,104 +2,85 @@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>sal-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
-    <relativePath>../../opendaylight/md-sal</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>features-parent</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+    <relativePath/>
    </parent>
+
+  <groupId>org.opendaylight.controller</groupId>
    <artifactId>features-mdsal</artifactId>
+  <version>1.3.0-SNAPSHOT</version>
  
    <packaging>jar</packaging>
  
    <properties>
+    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
+    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
+    <config.version>0.4.0-SNAPSHOT</config.version>
+    <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
+    <akka.version>2.3.10</akka.version>
      <features.file>features.xml</features.file>
      <org.json.version>20131018</org.json.version>
    </properties>
  
-  <dependencies>
-    <!-- Java -->
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-    </dependency>
-
-    <!-- Google -->
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>${yangtools.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>${mdsal.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+       <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>config-artifacts</artifactId>
+        <version>${config.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>${controller.mdsal.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
  
-    <!-- Jackson -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-json-org</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-jaxb-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-base</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-json-provider</artifactId>
-    </dependency>
-
-    <!-- Jersey -->
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-servlet</artifactId>
-    </dependency>
+  <dependencies>
  
-    <!-- Netty -->
+    <!-- Required features repositories -->
      <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec-http</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-yangtools</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
      </dependency>
      <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-handler</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
      </dependency>
      <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>features-mdsal-model</artifactId>
+      <classifier>features</classifier>
+      <version>${mdsal.model.version}</version>
+      <type>xml</type>
      </dependency>
-
-    <!-- OpenDaylight -->
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>features-akka</artifactId>
@@ -126,10 +107,11 @@
        <type>xml</type>
      </dependency>
  
+
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>md-sal-config</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
        <type>xml</type>
        <classifier>config</classifier>
      </dependency>
@@ -137,7 +119,7 @@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-akka-raft</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
@@ -204,42 +186,42 @@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-clustering-config</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
        <type>xml</type>
        <classifier>moduleshardconf</classifier>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-clustering-config</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
        <type>xml</type>
        <classifier>moduleconf</classifier>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-clustering-config</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
        <type>xml</type>
        <classifier>akkaconf</classifier>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-clustering-config</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
        <type>xml</type>
        <classifier>config</classifier>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-clustering-config</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
        <type>xml</type>
        <classifier>entityownershipconfig</classifier>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-clustering-config</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
        <type>cfg</type>
        <classifier>datastore</classifier>
      </dependency>
@@ -260,7 +242,7 @@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>messagebus-config</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
        <type>xml</type>
        <classifier>config</classifier>
      </dependency>
@@ -269,10 +251,6 @@
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-inmemory-datastore</artifactId>
      </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-remote</artifactId>
-    </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-remoterpc-connector</artifactId>
@@ -286,33 +264,33 @@
      <dependency>
        <groupId>org.opendaylight.controller.samples</groupId>
        <artifactId>clustering-it-config</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
        <type>xml</type>
        <classifier>config</classifier>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller.samples</groupId>
        <artifactId>clustering-it-config</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
        <type>xml</type>
        <classifier>testmoduleconf</classifier>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller.samples</groupId>
        <artifactId>clustering-it-config</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
        <type>xml</type>
        <classifier>testmoduleshardconf</classifier>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller.samples</groupId>
        <artifactId>clustering-it-model</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller.samples</groupId>
        <artifactId>clustering-it-provider</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
      </dependency>
  
  
@@ -332,106 +310,13 @@
      <dependency>
        <groupId>org.opendaylight.controller.samples</groupId>
        <artifactId>toaster-config</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
        <type>xml</type>
        <classifier>config</classifier>
      </dependency>
  
-    <!-- yang -->
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-
-    <!-- test to validate features.xml -->
-    <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>features-test</artifactId>
-    </dependency>
    </dependencies>
  
-  <build>
-    <resources>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/${features.file}</file>
-                  <type>xml</type>
-                  <classifier>features</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
-          </systemPropertyVariables>
-          <dependenciesToScan>
-           <dependency>org.opendaylight.odlparent:features-test</dependency>
-          </dependenciesToScan>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.8</version>
-        <executions>
-          <execution>
-            <id>unpack-static-documentation</id>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <phase>generate-resources</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/generated-resources/swagger-api-documentation</outputDirectory>
-              <includeArtifactIds>sal-rest-docgen</includeArtifactIds>
-              <includes>**/explorer/css/**/*, **/explorer/images/**/*, **/explorer/lib/**/*, **/explorer/static/**/*,</includes>
-              <excludeTransitive>true</excludeTransitive>
-              <ignorePermissions>false</ignorePermissions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
    <scm>
      <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
diff --git a/features/mdsal/src/main/resources/features.xml b/features/mdsal/src/main/features/features.xml

similarity index 69%

rename from features/mdsal/src/main/resources/features.xml

rename to features/mdsal/src/main/features/features.xml

index 410ef80b710e540aa56606581ae1ac8c1774f8bb..dfe39c4ed28aa5fa275a8c682bea84abc0461565 100644 (file)
--- a/features/mdsal/src/main/resources/features.xml
+++ b/features/mdsal/src/main/features/features.xml
@@ -3,81 +3,89 @@
  <features name="odl-mdsal-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
     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">
-    <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-config/${config.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-config-persister/${config.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-config-netty/${config.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-akka/${commons.opendaylight.version}/xml/features</repository>
+
+    <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
+
+    <repository>mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
+
+    <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-config-persister/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-config-netty/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-akka/{{VERSION}}/xml/features</repository>
      <feature name='odl-mdsal-all' version='${project.version}' description="OpenDaylight :: MDSAL :: All">
          <feature version='${project.version}'>odl-mdsal-broker</feature>
          <feature version='${project.version}'>odl-mdsal-broker-local</feature>
          <feature version='${project.version}'>odl-mdsal-xsql</feature>
          <feature version='${project.version}'>odl-toaster</feature>
      </feature>
-    <feature name='odl-mdsal-common' version='${mdsal.version}' description="OpenDaylight :: Config :: All">
-      <feature version='${yangtools.version}'>odl-yangtools-data-binding</feature>
+    <feature name='odl-mdsal-common' version='${project.version}' description="OpenDaylight :: Config :: All">
+      <feature version='${yangtools.version}'>odl-yangtools-yang-data</feature>
        <feature version='${config.version}'>odl-config-api</feature>
-      <bundle>mvn:org.opendaylight.controller/sal-common-api/${mdsal.version}</bundle>
-      <bundle>mvn:org.opendaylight.controller/sal-common-impl/${mdsal.version}</bundle>
-      <bundle>mvn:org.opendaylight.controller/sal-common-util/${mdsal.version}</bundle>
+      <feature version='${mdsal.version}'>odl-mdsal-binding-runtime</feature>
+      <bundle>mvn:org.opendaylight.controller/sal-common-api/{{VERSION}}</bundle>
+      <bundle>mvn:org.opendaylight.controller/sal-common-impl/{{VERSION}}</bundle>
+      <bundle>mvn:org.opendaylight.controller/sal-common-util/{{VERSION}}</bundle>
      </feature>
  
      <feature name='odl-mdsal-broker-local' version='${project.version}' description="OpenDaylight :: MDSAL :: Broker">
          <feature version='${yangtools.version}'>odl-yangtools-common</feature>
-        <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
-        <feature version='${yangtools.version}'>odl-yangtools-models</feature>
-        <feature version='${mdsal.version}'>odl-mdsal-common</feature>
+        <feature version='${mdsal.version}'>odl-mdsal-binding-runtime</feature>
+        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
+        <feature version='${project.version}'>odl-mdsal-common</feature>
          <feature version='${config.version}'>odl-config-startup</feature>
          <feature version='${config.version}'>odl-config-netty</feature>
-        <bundle>mvn:com.lmax/disruptor/${lmax.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-core-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-core-spi/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-broker-impl/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-binding-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-binding-broker-impl/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-binding-util/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-connector-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-dom-config/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-binding-config/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-inmemory-datastore/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-dom-broker-config/${project.version}</bundle>
-        <configfile finalname="${config.configfile.directory}/${config.mdsal.configfile}">mvn:org.opendaylight.controller/md-sal-config/${mdsal.version}/xml/config</configfile>
+        <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-binding-adapter -->
+        <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-dom-broker -->
+        <bundle>mvn:com.lmax/disruptor/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-core-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-core-spi/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-broker-impl/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-binding-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-binding-broker-impl/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-binding-util/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-connector-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-dom-config/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-binding-config/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-inmemory-datastore/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-dom-broker-config/{{VERSION}}</bundle>
+        <configfile finalname="${config.configfile.directory}/${config.mdsal.configfile}">mvn:org.opendaylight.controller/md-sal-config/{{VERSION}}/xml/config</configfile>
      </feature>
      <feature name='odl-toaster' version='${project.version}' description="OpenDaylight :: Toaster">
          <feature version='${yangtools.version}'>odl-yangtools-common</feature>
          <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
          <feature version='${project.version}'>odl-mdsal-broker</feature>
-        <bundle>mvn:org.opendaylight.controller.samples/sample-toaster/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller.samples/sample-toaster-consumer/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller.samples/sample-toaster-provider/${project.version}</bundle>
-        <configfile finalname="${config.configfile.directory}/${config.toaster.configfile}">mvn:org.opendaylight.controller.samples/toaster-config/${project.version}/xml/config</configfile>
+        <bundle>mvn:org.opendaylight.controller.samples/sample-toaster/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller.samples/sample-toaster-consumer/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller.samples/sample-toaster-provider/{{VERSION}}</bundle>
+        <configfile finalname="${config.configfile.directory}/${config.toaster.configfile}">mvn:org.opendaylight.controller.samples/toaster-config/{{VERSION}}/xml/config</configfile>
      </feature>
      <feature name ='odl-mdsal-xsql' version='${project.version}'>
          <feature version='${project.version}'>odl-mdsal-broker</feature>
-        <bundle>mvn:org.opendaylight.controller/sal-dom-xsql/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-karaf-xsql/${project.version}</bundle>
-        <configfile finalname="${config.configfile.directory}/${config.xsql.configfile}">mvn:org.opendaylight.controller/sal-dom-xsql-config/${project.version}/xml/config</configfile>
+        <bundle>mvn:org.opendaylight.controller/sal-dom-xsql/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-karaf-xsql/{{VERSION}}</bundle>
+        <configfile finalname="${config.configfile.directory}/${config.xsql.configfile}">mvn:org.opendaylight.controller/sal-dom-xsql-config/{{VERSION}}/xml/config</configfile>
      </feature>
      <feature name ='odl-mdsal-clustering-commons' version='${project.version}'>
          <feature version='${project.version}'>odl-mdsal-broker-local</feature>
          <feature version='${akka.version}'>odl-akka-system</feature>
          <feature version='${akka.version}'>odl-akka-persistence</feature>
-        <bundle>mvn:org.opendaylight.controller/sal-clustering-commons/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/sal-akka-raft/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-clustering-commons/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-akka-raft/{{VERSION}}</bundle>
          <bundle>mvn:com.codahale.metrics/metrics-core/3.0.1</bundle>
      </feature>
      <feature name ='odl-mdsal-distributed-datastore' version='${project.version}'>
          <feature version='${project.version}'>odl-mdsal-broker-local</feature>
          <feature version='${project.version}'>odl-mdsal-clustering-commons</feature>
          <feature version='${akka.version}'>odl-akka-clustering</feature>
-        <bundle>mvn:org.opendaylight.controller/sal-distributed-datastore/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-distributed-datastore/{{VERSION}}</bundle>
      </feature>
      <feature name ='odl-mdsal-remoterpc-connector' version='${project.version}'>
          <feature version='${project.version}'>odl-mdsal-broker-local</feature>
          <feature version='${project.version}'>odl-mdsal-clustering-commons</feature>
          <feature version='${akka.version}'>odl-akka-clustering</feature>
          <feature version='0.7'>odl-akka-leveldb</feature>
-        <bundle>mvn:org.opendaylight.controller/sal-remoterpc-connector/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal-remoterpc-connector/{{VERSION}}</bundle>
      </feature>
      <feature name ='odl-mdsal-broker' version='${project.version}'>
          <feature version='${project.version}'>odl-mdsal-remoterpc-connector</feature>
@@ -93,20 +101,21 @@
        <feature version='${project.version}'>odl-mdsal-broker</feature>
      </feature>
      <feature name='odl-clustering-test-app' version='${project.version}'>
-        <feature version='${yangtools.version}'>odl-yangtools-models</feature>
+        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
          <feature version='${project.version}'>odl-mdsal-broker</feature>
-        <bundle>mvn:org.opendaylight.controller.samples/clustering-it-model/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller.samples/clustering-it-provider/${project.version}</bundle>
-        <configfile finalname="${config.configfile.directory}/20-clustering-test-app.xml">mvn:org.opendaylight.controller.samples/clustering-it-config/${project.version}/xml/config</configfile>
+        <bundle>mvn:org.opendaylight.controller.samples/clustering-it-model/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller.samples/clustering-it-provider/{{VERSION}}</bundle>
+        <configfile finalname="${config.configfile.directory}/20-clustering-test-app.xml">mvn:org.opendaylight.controller.samples/clustering-it-config/{{VERSION}}/xml/config</configfile>
      </feature>
  
      <feature name='odl-message-bus-collector' version='${project.version}'>
-        <bundle>mvn:org.opendaylight.controller.model/model-inventory/${mdsal.version}</bundle>
+        <!-- FIXME: Bug 4202: Switch to MD-SAL provided odl-mdsal-binding-base -->
+        <bundle>mvn:org.opendaylight.controller.model/model-inventory/{{VERSION}}</bundle>
          <feature version='${project.version}'>odl-mdsal-broker</feature>
-        <bundle>mvn:org.opendaylight.controller/messagebus-api/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/messagebus-spi/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/messagebus-util/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/messagebus-impl/${project.version}</bundle>
-        <configfile finalname="${config.configfile.directory}/05-message-bus.xml">mvn:org.opendaylight.controller/messagebus-config/${project.version}/xml/config</configfile>
+        <bundle>mvn:org.opendaylight.controller/messagebus-api/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/messagebus-spi/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/messagebus-util/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.controller/messagebus-impl/{{VERSION}}</bundle>
+        <configfile finalname="${config.configfile.directory}/05-message-bus.xml">mvn:org.opendaylight.controller/messagebus-config/{{VERSION}}/xml/config</configfile>
      </feature>
  </features>
diff --git a/features/protocol-framework/pom.xml b/features/protocol-framework/pom.xml

index fc486e7f571755b30b6e38eee410d1cbdea9a7a3..170e0e9ad127b4ff9c1f72d2ec2a2c4d9e181248 100644 (file)
--- a/features/protocol-framework/pom.xml
+++ b/features/protocol-framework/pom.xml
@@ -2,17 +2,19 @@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>commons.opendaylight</artifactId>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>features-parent</artifactId>
      <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../../opendaylight/commons/opendaylight</relativePath>
+    <relativePath/>
    </parent>
+
+  <groupId>org.opendaylight.controller</groupId>
    <artifactId>features-protocol-framework</artifactId>
-  <version>${protocol-framework.version}</version>
+  <version>0.7.0-SNAPSHOT</version>
    <packaging>jar</packaging>
  
    <properties>
-    <features.file>features.xml</features.file>
+    <config.version>0.4.0-SNAPSHOT</config.version>
    </properties>
  
    <dependencies>
@@ -20,78 +22,22 @@
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>features-config</artifactId>
        <classifier>features</classifier>
+      <version>${config.version}</version>
        <type>xml</type>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
-      <artifactId>protocol-framework</artifactId>
+      <artifactId>features-config-netty</artifactId>
+      <version>${config.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
      </dependency>
-    <!-- test to validate features.xml -->
      <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>features-test</artifactId>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>protocol-framework</artifactId>
+      <version>${project.version}</version>
      </dependency>
    </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/classes/${features.file}</file>
-                  <type>xml</type>
-                  <classifier>features</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
-          </systemPropertyVariables>
-          <dependenciesToScan>
-           <dependency>org.opendaylight.odlparent:features-test</dependency>
-          </dependenciesToScan>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
    <scm>
      <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
diff --git a/features/protocol-framework/src/main/resources/features.xml b/features/protocol-framework/src/main/features/features.xml

similarity index 67%

rename from features/protocol-framework/src/main/resources/features.xml

rename to features/protocol-framework/src/main/features/features.xml

index 46510bca469805cd190222787693fe50d9492e33..25d19220cc6f27c839b16c2dd5d552c17382c00b 100644 (file)
--- a/features/protocol-framework/src/main/resources/features.xml
+++ b/features/protocol-framework/src/main/features/features.xml
@@ -3,10 +3,11 @@
  <features name="odl-protocol-framework-${protocol-framework.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
            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">
-  <repository>mvn:org.opendaylight.controller/features-config/${config.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.controller/features-config-netty/{{VERSION}}/xml/features</repository>
    <feature name='odl-protocol-framework' version='${project.version}' description="OpenDaylight :: Protocol Framework">
      <feature version='${config.version}'>odl-config-api</feature>
      <feature version='${config.version}'>odl-config-netty-config-api</feature>
-    <bundle>mvn:org.opendaylight.controller/protocol-framework/${protocol-framework.version}</bundle>
+    <bundle>mvn:org.opendaylight.controller/protocol-framework/{{VERSION}}</bundle>
    </feature>
  </features>
 \ No newline at end of file
diff --git a/karaf/opendaylight-karaf/pom.xml b/karaf/opendaylight-karaf/pom.xml

index 831108accd3ff66a85891766c3c0616b55cfe393..fb57e25afd1f564af1ec0b94fd0a00cf8c7a1e8d 100644 (file)
--- a/karaf/opendaylight-karaf/pom.xml
+++ b/karaf/opendaylight-karaf/pom.xml
@@ -66,13 +66,22 @@
            <scope>runtime</scope>
        </dependency>
      <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-restconf</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>features-mdsal-model</artifactId>
+      <version>0.8.0-SNAPSHOT</version>
        <classifier>features</classifier>
        <type>xml</type>
        <scope>runtime</scope>
      </dependency>
+
      <!-- Netconf connector features. When this is included, users can test the netconf connector using netconf-testtool -->
  <!--     <dependency>
        <groupId>org.opendaylight.controller</groupId>
diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml

index 69d7b4c80701ddbb79cda0ad1c4769006868c195..3d09797942dfc832e251898dc92ac556d41b76d9 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml
@@ -18,6 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <repository>mvn:org.opendaylight.netconf/features-restconf/${symbol_dollar}{restconf.version}/xml/features</repository>
    <repository>mvn:org.opendaylight.dlux/features-dlux/${symbol_dollar}{dlux.version}/xml/features</repository>
    <feature name='odl-${artifactId}-api' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${artifactId} :: api'>
+    <!-- FIXME: Bug 4202: Switch to MD-SAL provided odl-mdsal-models-base -->
      <feature version='${symbol_dollar}{yangtools.version}'>odl-yangtools-models</feature>
      <bundle>mvn:${groupId}/${artifactId}-api/${symbol_dollar}{project.version}</bundle>
    </feature>
diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml

index 1256e0b3a46c5f9e78497e7600efa09368e219ac..cb2ea5cc29c7ae34cf11b7d83c6bc0d6bf0c13a9 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -14,7 +14,8 @@
    <packaging>pom</packaging>
  
    <properties>
-
+    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
      <akka.version>2.3.10</akka.version>
      <appauth.version>0.6.0-SNAPSHOT</appauth.version>
      <archetype-app-northbound>0.2.0-SNAPSHOT</archetype-app-northbound>
@@ -190,6 +191,44 @@
    <dependencyManagement>
      <dependencies>
  
+
+
+      <!-- yangtools artifacts -->
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>${yangtools.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+
+      <!-- mdsal artifacts -->
+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+        <!-- mdsal artifacts -->
+        <dependency>
+          <groupId>org.opendaylight.mdsal.model</groupId>
+          <artifactId>mdsal-model-artifacts</artifactId>
+          <version>${mdsal.model.version}</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>config-artifacts</artifactId>
+        <version>${config.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
         <!-- project specific dependencies -->
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
@@ -1196,14 +1235,6 @@
          <version>1.0.2</version>
        </dependency>
  
-      <!-- yangtools artifacts -->
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools-artifacts</artifactId>
-        <version>${yangtools.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
  
        <dependency>
          <groupId>openexi</groupId>
@@ -1611,9 +1642,9 @@
            <version>${yangtools.version}</version>
            <dependencies>
              <dependency>
-              <groupId>org.opendaylight.yangtools</groupId>
+              <groupId>org.opendaylight.mdsal</groupId>
                <artifactId>maven-sal-api-gen-plugin</artifactId>
-              <version>${yangtools.version}</version>
+              <version>0.8.0-SNAPSHOT</version>
                <type>jar</type>
              </dependency>
              <dependency>
diff --git a/opendaylight/commons/protocol-framework/pom.xml b/opendaylight/commons/protocol-framework/pom.xml

index a39791710d17e0395b66d5929d9ebd52accf214c..6a3ba8378f47a84d9a3c02830a1d472979b08557 100644 (file)
--- a/opendaylight/commons/protocol-framework/pom.xml
+++ b/opendaylight/commons/protocol-framework/pom.xml
@@ -148,7 +148,7 @@
              <version>${config.version}</version>
            </dependency>
            <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
              <artifactId>maven-sal-api-gen-plugin</artifactId>
              <version>${yangtools.version}</version>
            </dependency>
diff --git a/opendaylight/config/config-api/pom.xml b/opendaylight/config/config-api/pom.xml

index 163cb57b28579bad35882287a1586ee50bf1523e..89c1db0001b9d660f4e25b542ef278ccc4d5f356 100644 (file)
--- a/opendaylight/config/config-api/pom.xml
+++ b/opendaylight/config/config-api/pom.xml
@@ -7,7 +7,7 @@
      <artifactId>config-subsystem</artifactId>
      <version>0.4.0-SNAPSHOT</version>
    </parent>
-
+  <!-- FIXME Use org.opendaylight.mdsal:binding-parent -->
    <artifactId>config-api</artifactId>
    <packaging>bundle</packaging>
    <name>${project.artifactId}</name>
@@ -18,7 +18,7 @@
        <artifactId>jsr305</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
        <artifactId>yang-binding</artifactId>
      </dependency>
      <dependency>
diff --git a/opendaylight/config/config-manager-facade-xml/pom.xml b/opendaylight/config/config-manager-facade-xml/pom.xml

index 44770521022a6d16727aa42227456df0d46dcaf3..e1c32d67040b97c9c5047cc9286ef2df6ebfaeff 100644 (file)
--- a/opendaylight/config/config-manager-facade-xml/pom.xml
+++ b/opendaylight/config/config-manager-facade-xml/pom.xml
@@ -26,8 +26,8 @@
              <artifactId>yang-data-api</artifactId>
          </dependency>
          <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>binding-generator-impl</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-generator-impl</artifactId>
          </dependency>
          <dependency>
              <groupId>org.slf4j</groupId>
diff --git a/opendaylight/config/config-manager/pom.xml b/opendaylight/config/config-manager/pom.xml

index 0bc068083f7fc34755dc4f45ab12676cbb3e873f..d90cd0fe219a3f0c44b7d9318542c331ddbd38bc 100644 (file)
--- a/opendaylight/config/config-manager/pom.xml
+++ b/opendaylight/config/config-manager/pom.xml
@@ -28,8 +28,8 @@
  
      <!--Dependencies regardign RuntimeGeneratedMappingService-->
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-generator-impl</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator-impl</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
diff --git a/opendaylight/config/config-parent/pom.xml b/opendaylight/config/config-parent/pom.xml

index fa8a4385e300d0b995a0b66627ce89cdea94840c..52b5ca28e2bf17dc180eee29c4eb9591c0168004 100644 (file)
--- a/opendaylight/config/config-parent/pom.xml
+++ b/opendaylight/config/config-parent/pom.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-    <groupId>org.opendaylight.yangtools</groupId>
+    <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
      <version>0.8.0-SNAPSHOT</version>
      <relativePath/>
@@ -53,6 +53,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
          <type>pom</type>
          <scope>import</scope>
        </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
      </dependencies>
    </dependencyManagement>
  
diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml

index 0b0c760e38c0444146a26c7499b416fb58b73bca..8f8998c3bf56a5c457dd0d09c95d7affe1963c0c 100644 (file)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -109,9 +109,9 @@
            <version>${yangtools.version}</version>
            <dependencies>
              <dependency>
-              <groupId>org.opendaylight.yangtools</groupId>
+              <groupId>org.opendaylight.mdsal</groupId>
                <artifactId>maven-sal-api-gen-plugin</artifactId>
-              <version>${yangtools.version}</version>
+              <version>0.8.0-SNAPSHOT</version>
                <type>jar</type>
              </dependency>
            </dependencies>
diff --git a/opendaylight/config/yang-jmx-generator-plugin/pom.xml b/opendaylight/config/yang-jmx-generator-plugin/pom.xml

index 7e1a7c52fa580e566b9423608a4539aa403a6f66..5a1390610d50bc36185ce09f5fa24d4616bd107e 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-plugin/pom.xml
+++ b/opendaylight/config/yang-jmx-generator-plugin/pom.xml
@@ -32,8 +32,8 @@
      </dependency>
  
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-type-provider</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator-impl</artifactId>
      </dependency>
  
      <dependency>
diff --git a/opendaylight/config/yang-jmx-generator/pom.xml b/opendaylight/config/yang-jmx-generator/pom.xml

index 1b3397dbd399b9f52536f08025fab308273c3666..49cf5e5e06f6b42fe0bbdb1914028828e19f28e5 100644 (file)
--- a/opendaylight/config/yang-jmx-generator/pom.xml
+++ b/opendaylight/config/yang-jmx-generator/pom.xml
@@ -21,18 +21,9 @@
        <groupId>com.google.guava</groupId>
        <artifactId>guava</artifactId>
      </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-generator-spi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-generator-util</artifactId>
-    </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-type-provider</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator-impl</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
@@ -52,11 +43,6 @@
        <artifactId>commons-lang3</artifactId>
        <scope>test</scope>
      </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-generator-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>yang-parser-impl</artifactId>
diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml

index 687e35fb25ed18e4261b054dd5cc5dab613c626e..b8cec8ee13502943e7bf201bfe4395ce89908a90 100644 (file)
--- a/opendaylight/config/yang-test/pom.xml
+++ b/opendaylight/config/yang-test/pom.xml
@@ -25,7 +25,7 @@
        <artifactId>mockito-configuration</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
        <artifactId>ietf-inet-types</artifactId>
      </dependency>
      <dependency>
diff --git a/opendaylight/md-sal/messagebus-api/pom.xml b/opendaylight/md-sal/messagebus-api/pom.xml

index d3586fb8ed6682cd4058e2712ceccff9216f91b3..d367c5f9b8f07fecc7f14ee8427c61a5702add44 100644 (file)
--- a/opendaylight/md-sal/messagebus-api/pom.xml
+++ b/opendaylight/md-sal/messagebus-api/pom.xml
@@ -28,11 +28,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
              <artifactId>model-inventory</artifactId>
          </dependency>
          <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
              <artifactId>yang-ext</artifactId>
          </dependency>
          <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
              <artifactId>ietf-topology</artifactId>
          </dependency>
      </dependencies>
diff --git a/opendaylight/md-sal/sal-binding-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml

index c70115e7e351ef9f8768e14910e81239d87cbde9..52843cf23a009b889c3fce8c6bbdbd50be810563 100644 (file)
--- a/opendaylight/md-sal/sal-binding-api/pom.xml
+++ b/opendaylight/md-sal/sal-binding-api/pom.xml
@@ -23,7 +23,7 @@
        <artifactId>concepts</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
        <artifactId>yang-binding</artifactId>
      </dependency>
      <dependency>
diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml

index e0714eb151b65d36eac64007cb1e2a5377deedee..616df49b8f6ac717ce0376d627afa09a8a005a09 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -44,12 +44,12 @@
        <artifactId>sal-core-api</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-generator-impl</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator-impl</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-data-codec</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec</artifactId>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
@@ -59,10 +59,6 @@
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>yang-model-util</artifactId>
      </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-inet-types</artifactId>
-    </dependency>
      <dependency>
        <groupId>org.slf4j</groupId>
        <artifactId>slf4j-api</artifactId>
@@ -87,13 +83,7 @@
        <artifactId>yang-parser-impl</artifactId>
        <scope>test</scope>
      </dependency>
-    <!-- FIXME : Delete this
-    <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-      <scope>test</scope>
-    </dependency>
-    -->
+
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-test-model</artifactId>
diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml

index ae9b92431feef59fa71779a5193c890fe1cfd411..854a6a49e0b52aff91b18d657670db55bcded868 100644 (file)
--- a/opendaylight/md-sal/sal-binding-config/pom.xml
+++ b/opendaylight/md-sal/sal-binding-config/pom.xml
@@ -27,8 +27,12 @@
        <artifactId>sal-binding-broker-impl</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-data-codec</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-dom-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-yang-types</artifactId>
      </dependency>
    </dependencies>
  
diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml

index 88e9c1a9c6fde22116cc24f8d4696fa320b46255..2c5e9e4adfdbaf00337d303061091cc93f9f9c50 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
@@ -15,7 +15,7 @@
        <artifactId>junit</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
        <artifactId>yang-binding</artifactId>
      </dependency>
      <dependency>
@@ -49,7 +49,7 @@
        <artifactId>sal-test-model</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
        <artifactId>opendaylight-l2-types</artifactId>
      </dependency>
    </dependencies>
diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml

index c5c03f706000e639aaeab2b30e65bfb8b39c6529..04283e75c3962360c6af4256d770346f94bfe95d 100644 (file)
--- a/opendaylight/md-sal/sal-binding-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-it/pom.xml
@@ -129,7 +129,15 @@
        <version>${mdsal.version}</version>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-yang-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
        <artifactId>opendaylight-l2-types</artifactId>
      </dependency>
    </dependencies>
diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java

index f810d6240b1649995bdaff299571095169679bfb..6647711dcee13994b2d64530658672da2a75f368 100644 (file)
--- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
+++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
@@ -19,16 +19,17 @@ import org.ops4j.pax.exam.util.PathUtils;
  public class TestHelper {
  
      public static final String CONTROLLER = "org.opendaylight.controller";
+    public static final String MDSAL = "org.opendaylight.mdsal";
      public static final String YANGTOOLS = "org.opendaylight.yangtools";
  
      public static final String CONTROLLER_MODELS = "org.opendaylight.controller.model";
-    public static final String YANGTOOLS_MODELS = "org.opendaylight.yangtools.model";
+    public static final String MDSAL_MODELS = "org.opendaylight.mdsal.model";
  
      public static Option mdSalCoreBundles() {
          return new DefaultCompositeOption( //
                  mavenBundle(YANGTOOLS, "concepts").versionAsInProject(), // //
                  mavenBundle(YANGTOOLS, "util").versionAsInProject(), // //
-                mavenBundle(YANGTOOLS, "yang-binding").versionAsInProject(), // //
+                mavenBundle(MDSAL, "yang-binding").versionAsInProject(), // //
                  mavenBundle(YANGTOOLS, "yang-common").versionAsInProject(), // //
                  mavenBundle(YANGTOOLS, "object-cache-api").versionAsInProject(), // //
                  mavenBundle(YANGTOOLS, "object-cache-guava").versionAsInProject(), // //
@@ -80,16 +81,11 @@ public class TestHelper {
                  mavenBundle(YANGTOOLS, "yang-model-api").versionAsInProject(), // //
                  mavenBundle(YANGTOOLS, "yang-model-util").versionAsInProject(), // //
                  mavenBundle(YANGTOOLS, "yang-parser-api").versionAsInProject(), //
-                mavenBundle(YANGTOOLS, "yang-parser-impl").versionAsInProject(),
-                mavenBundle(YANGTOOLS, "binding-generator-spi").versionAsInProject(), // //
-                mavenBundle(YANGTOOLS, "binding-model-api").versionAsInProject(), // //
-                mavenBundle(YANGTOOLS, "binding-generator-util").versionAsInProject(), //
                  mavenBundle(YANGTOOLS, "yang-parser-impl").versionAsInProject(), //
-                mavenBundle(YANGTOOLS, "binding-type-provider").versionAsInProject(), //
-                mavenBundle(YANGTOOLS, "binding-generator-api").versionAsInProject(), mavenBundle(YANGTOOLS,
-                        "binding-generator-spi").versionAsInProject(), //
-                mavenBundle(YANGTOOLS, "binding-generator-impl").versionAsInProject(),
-                mavenBundle(YANGTOOLS, "binding-data-codec").versionAsInProject(),
+                mavenBundle(MDSAL, "mdsal-binding-generator-api").versionAsInProject(), //
+                mavenBundle(MDSAL, "mdsal-binding-generator-util").versionAsInProject(), //
+                mavenBundle(MDSAL, "mdsal-binding-generator-impl").versionAsInProject(),
+                mavenBundle(MDSAL, "mdsal-binding-dom-codec").versionAsInProject(),
                  mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject(), // //
  
                  mavenBundle(CONTROLLER, "sal-binding-util").versionAsInProject(), //
@@ -161,10 +157,10 @@ public class TestHelper {
  
      public static Option baseModelBundles() {
          return new DefaultCompositeOption( //
-                mavenBundle(YANGTOOLS_MODELS, "yang-ext").versionAsInProject(), // //
-                mavenBundle(YANGTOOLS_MODELS, "ietf-inet-types").versionAsInProject(), // //
-                mavenBundle(YANGTOOLS_MODELS, "ietf-yang-types").versionAsInProject(), // //
-                mavenBundle(YANGTOOLS_MODELS, "opendaylight-l2-types").versionAsInProject() // //
+                mavenBundle(MDSAL+".model", "yang-ext").versionAsInProject(), // //
+                mavenBundle(MDSAL_MODELS, "ietf-inet-types").versionAsInProject(), // //
+                mavenBundle(MDSAL_MODELS, "ietf-yang-types").versionAsInProject(), // //
+                mavenBundle(MDSAL_MODELS, "opendaylight-l2-types").versionAsInProject() // //
                  );
      }
  
diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml

index 485a7470bd4e8fed7da76b63863dfe7f080bfc33..8a32507ada77109a9e1d9ee434954be7a6bb0f98 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml
@@ -106,10 +106,6 @@
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>util</artifactId>
      </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yang-binding</artifactId>
-    </dependency>
      <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>yang-common</artifactId>
diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml

index f25423f1c22f919738f185fe96dc7319772c5b51..e89f759e4caaa108d3957b464ec5edb0a77a8226 100644 (file)
--- a/opendaylight/md-sal/sal-connector-api/pom.xml
+++ b/opendaylight/md-sal/sal-connector-api/pom.xml
@@ -16,7 +16,7 @@
        <artifactId>sal-core-api</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
        <artifactId>yang-binding</artifactId>
      </dependency>
      <dependency>
diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml

index 14f530213b0c3c4b91920f6bde6af00261be53cc..cdf8325aa25f53e3f74c9d96c430812a2999d77e 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@ -143,7 +143,7 @@
        <artifactId>concepts</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
        <artifactId>yang-binding</artifactId>
      </dependency>
      <dependency>
diff --git a/opendaylight/md-sal/sal-dom-broker-config/pom.xml b/opendaylight/md-sal/sal-dom-broker-config/pom.xml

index 601743b5cf28495432b911ce287ffc2eb7a5af57..c044e9b722457c7c2a8f85236e0cdfde400960b5 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker-config/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker-config/pom.xml
@@ -22,6 +22,10 @@
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-broker-impl</artifactId>
      </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-yang-types</artifactId>
+    </dependency>
    </dependencies>
  
    <build>
diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml

index 3a02107f0a7a458f59f01e529a8a67c52aff1212..9487a6b732d8b7bd688c197d32736ee351329cf0 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -51,11 +51,6 @@
        <artifactId>yang-parser-impl</artifactId>
      </dependency>
  
-    <dependency>
-        <groupId>org.opendaylight.yangtools.model</groupId>
-        <artifactId>ietf-yang-types</artifactId>
-    </dependency>
-
      <dependency>
        <groupId>junit</groupId>
        <artifactId>junit</artifactId>
diff --git a/opendaylight/md-sal/sal-dom-xsql/pom.xml b/opendaylight/md-sal/sal-dom-xsql/pom.xml

index 665c0a1c20a9f27972cc5aec6016323fd2ca7a09..61e6b3e19a62cdfccd47d9978ffe1c748b1c52b6 100644 (file)
--- a/opendaylight/md-sal/sal-dom-xsql/pom.xml
+++ b/opendaylight/md-sal/sal-dom-xsql/pom.xml
@@ -6,6 +6,7 @@
      <artifactId>sal-parent</artifactId>
      <version>1.3.0-SNAPSHOT</version>
    </parent>
+  <!-- FIXME Use org.opendaylight.mdsal:binding-parent -->
    <artifactId>sal-dom-xsql</artifactId>
    <packaging>bundle</packaging>
    <name>sal-dom-xsql</name>
@@ -37,7 +38,7 @@
        <artifactId>yang-jmx-generator-plugin</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
        <artifactId>yang-binding</artifactId>
      </dependency>
      <dependency>
@@ -64,9 +65,9 @@
          <artifactId>yang-maven-plugin</artifactId>
          <dependencies>
            <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
              <artifactId>maven-sal-api-gen-plugin</artifactId>
-            <version>${yangtools.version}</version>
+            <version>0.8.0-SNAPSHOT</version>
              <type>jar</type>
            </dependency>
          </dependencies>
diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml

index a1ba2ecdd6d2cae66d0e60c99b8e8fd67104f6f3..6fd9070a7c01ad97092387d3bfaecae4f03578c7 100644 (file)
--- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
@@ -59,7 +59,7 @@
      </dependency>
  
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
        <artifactId>yang-binding</artifactId>
      </dependency>
  
@@ -108,8 +108,8 @@
        <scope>test</scope>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>binding-generator-impl</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-generator-impl</artifactId>
        <scope>test</scope>
      </dependency>
      <dependency>
diff --git a/opendaylight/md-sal/sal-remote/pom.xml b/opendaylight/md-sal/sal-remote/pom.xml

index e32f703dcfd6802e11335ce7557313aaba8c9d16..1af1fdabca446e42c63b67fee840b8c3baa81a30 100644 (file)
--- a/opendaylight/md-sal/sal-remote/pom.xml
+++ b/opendaylight/md-sal/sal-remote/pom.xml
@@ -26,7 +26,7 @@
          <artifactId>yang-maven-plugin</artifactId>
          <dependencies>
            <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
              <artifactId>maven-sal-api-gen-plugin</artifactId>
              <version>${yangtools.version}</version>
              <type>jar</type>
diff --git a/opendaylight/md-sal/sal-test-model/pom.xml b/opendaylight/md-sal/sal-test-model/pom.xml

index 446e16715594eff58b26ae175a98fe97905bd977..854fdf1f7ae21fed8f1a5d20d4d850a3504bd7b1 100644 (file)
--- a/opendaylight/md-sal/sal-test-model/pom.xml
+++ b/opendaylight/md-sal/sal-test-model/pom.xml
@@ -14,11 +14,11 @@
  
      <dependencies>
          <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
              <artifactId>yang-binding</artifactId>
          </dependency>
          <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
              <artifactId>yang-ext</artifactId>
          </dependency>
      </dependencies>
@@ -80,4 +80,4 @@
          <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
      </scm>
  
-</project>
-\ No newline at end of file
+</project>
diff --git a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml

index 7fbff152e6a3f4d0203d3b82d07a33a42409421a..f4271ab05ec58bac65727c7f0ab12fda97ca49d0 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
@@ -6,6 +6,7 @@
          <groupId>org.opendaylight.controller.samples</groupId>
          <version>1.3.0-SNAPSHOT</version>
      </parent>
+    <!-- FIXME Use org.opendaylight.mdsal:binding-parent -->
      <artifactId>clustering-it-model</artifactId>
      <packaging>bundle</packaging>
  
@@ -46,9 +47,9 @@
                  </executions>
                  <dependencies>
                      <dependency>
-                        <groupId>org.opendaylight.yangtools</groupId>
+                        <groupId>org.opendaylight.mdsal</groupId>
                          <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${yangtools.version}</version>
+                        <version>0.8.0-SNAPSHOT</version>
                          <type>jar</type>
                      </dependency>
                  </dependencies>
@@ -87,7 +88,7 @@
      </build>
      <dependencies>
          <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
              <artifactId>yang-binding</artifactId>
              <version>${yangtools.version}</version>
          </dependency>
@@ -97,17 +98,17 @@
              <version>${yangtools.version}</version>
          </dependency>
          <dependency>
-       <groupId>org.opendaylight.yangtools.model</groupId>
+       <groupId>org.opendaylight.mdsal.model</groupId>
         <artifactId>ietf-inet-types</artifactId>
         <version>${ietf-inet-types.version}</version>
        </dependency>
        <dependency>
-       <groupId>org.opendaylight.yangtools.model</groupId>
+       <groupId>org.opendaylight.mdsal.model</groupId>
         <artifactId>ietf-yang-types</artifactId>
         <version>${ietf-yang-types.version}</version>
        </dependency>
          <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
              <artifactId>yang-ext</artifactId>
              <version>${yang-ext.version}</version>
          </dependency>
diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml

index 850160e8ba2427536a71fa60b6d59768eebf860e..210da1426907d75d60d0d44ea2954d013e58f974 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
@@ -6,6 +6,7 @@
          <groupId>org.opendaylight.controller.samples</groupId>
          <version>1.3.0-SNAPSHOT</version>
      </parent>
+    <!-- FIXME Use org.opendaylight.controller:config-parent -->
      <artifactId>clustering-it-provider</artifactId>
      <packaging>bundle</packaging>
  
@@ -58,7 +59,7 @@
                          <version>${config.version}</version>
                      </dependency>
                      <dependency>
-                        <groupId>org.opendaylight.yangtools</groupId>
+                        <groupId>org.opendaylight.mdsal</groupId>
                          <artifactId>maven-sal-api-gen-plugin</artifactId>
                          <version>${yangtools.version}</version>
                      </dependency>
diff --git a/opendaylight/md-sal/samples/toaster-it/pom.xml b/opendaylight/md-sal/samples/toaster-it/pom.xml

index 3aa1e4ca59e97794e83c3c884856357de1cf70d1..e8ddc8ba9a6b88fb7de5838d1a105850cb63ed12 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-it/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-it/pom.xml
@@ -27,7 +27,7 @@
        <artifactId>sample-toaster-consumer</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
        <artifactId>yang-ext</artifactId>
      </dependency>
  
diff --git a/opendaylight/md-sal/samples/toaster-provider/pom.xml b/opendaylight/md-sal/samples/toaster-provider/pom.xml

index 0a8428a8f43638f6cc0a9385136595dfb8ff965b..a60ec1c0023a26b3e96a628805b5cf5e0b899ee1 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-provider/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-provider/pom.xml
@@ -69,19 +69,19 @@
        <artifactId>guava</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
        <artifactId>yang-binding</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
        <artifactId>yang-ext</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
        <artifactId>ietf-yang-types</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
        <artifactId>opendaylight-l2-types</artifactId>
      </dependency>
  
diff --git a/opendaylight/md-sal/samples/toaster/pom.xml b/opendaylight/md-sal/samples/toaster/pom.xml

index 7a3a742c45df4fb0cd9c8af2a2dbca840fcbe9dd..bfdc8eef23269150c8d4a279182e0fb54b9f92b1 100644 (file)
--- a/opendaylight/md-sal/samples/toaster/pom.xml
+++ b/opendaylight/md-sal/samples/toaster/pom.xml
@@ -6,11 +6,12 @@
      <artifactId>sal-samples</artifactId>
      <version>1.3.0-SNAPSHOT</version>
    </parent>
+  <!-- FIXME Use org.opendaylight.mdsal:binding-parent -->
    <artifactId>sample-toaster</artifactId>
    <packaging>bundle</packaging>
    <dependencies>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
        <artifactId>yang-binding</artifactId>
      </dependency>
      <dependency>
@@ -26,9 +27,9 @@
          <artifactId>yang-maven-plugin</artifactId>
          <dependencies>
            <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
              <artifactId>maven-sal-api-gen-plugin</artifactId>
-            <version>${yangtools.version}</version>
+            <version>0.8.0-SNAPSHOT</version>
              <type>jar</type>
            </dependency>
          </dependencies>
diff --git a/opendaylight/model/model-topology/pom.xml b/opendaylight/model/model-topology/pom.xml

index 0763a04f550ba34290989d8b267925452d28bfb8..4ef527f2155802f99c8470f4689d3b58438e56c2 100644 (file)
--- a/opendaylight/model/model-topology/pom.xml
+++ b/opendaylight/model/model-topology/pom.xml
@@ -18,7 +18,7 @@
        <version>${project.version}</version>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
        <artifactId>ietf-topology</artifactId>
      </dependency>
    </dependencies>
diff --git a/opendaylight/model/pom.xml b/opendaylight/model/pom.xml

index df0b87f14761f2c920e426b3853f4d6421fcbbee..db68c4f5bb91140f9ecef66214698c8ff29a48cb 100644 (file)
--- a/opendaylight/model/pom.xml
+++ b/opendaylight/model/pom.xml
@@ -4,7 +4,7 @@
    <modelVersion>4.0.0</modelVersion>
  
    <parent>
-    <groupId>org.opendaylight.yangtools</groupId>
+    <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
      <version>0.8.0-SNAPSHOT</version>
      <relativePath/>
@@ -14,19 +14,43 @@
    <version>1.3.0-SNAPSHOT</version>
    <packaging>pom</packaging>
  
-  <modules>
-    <module>model-inventory</module>
-    <module>model-topology</module>
-  </modules>
  
    <properties>
-    <bundle.plugin.version>2.4.0</bundle.plugin.version>
+    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
  
+
+  <dependencyManagement>
+    <!-- mdsal artifacts -->
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>${mdsal.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <!-- mdsal artifacts -->
+      <dependency>
+        <groupId>org.opendaylight.mdsal.model</groupId>
+        <artifactId>mdsal-model-artifacts</artifactId>
+        <version>${mdsal.model.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <modules>
+    <module>model-inventory</module>
+    <module>model-topology</module>
+  </modules>
+
    <dependencies>
      <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
        <artifactId>yang-binding</artifactId>
      </dependency>
      <dependency>
@@ -34,15 +58,15 @@
        <artifactId>yang-common</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
        <artifactId>ietf-inet-types</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
        <artifactId>ietf-yang-types</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
        <artifactId>yang-ext</artifactId>
      </dependency>
    </dependencies>
author	Tony Tkacik <ttkacik@cisco.com>
	Mon, 7 Sep 2015 10:30:22 +0000 (12:30 +0200)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Thu, 17 Sep 2015 15:54:00 +0000 (15:54 +0000)
features/akka/src/main/resources/features.xml		patch \| blob \| history
features/config-netty/pom.xml		patch \| blob \| history
features/config-netty/src/main/features/features.xml	[moved from features/config-netty/src/main/resources/features.xml with 100% similarity]	patch \| blob \| history
features/config-persister/pom.xml		patch \| blob \| history
features/config-persister/src/main/features/features.xml	[moved from features/config-persister/src/main/resources/features.xml with 66% similarity]	patch \| blob \| history
features/config/pom.xml		patch \| blob \| history
features/config/src/main/features/features.xml	[new file with mode: 0644]	patch \| blob
features/config/src/main/resources/features.xml	[deleted file]	patch \| blob \| history
features/extras/pom.xml		patch \| blob \| history
features/extras/src/main/features/features.xml	[moved from features/extras/src/main/resources/features.xml with 94% similarity]	patch \| blob \| history
features/mdsal/pom.xml		patch \| blob \| history
features/mdsal/src/main/features/features.xml	[moved from features/mdsal/src/main/resources/features.xml with 69% similarity]	patch \| blob \| history
features/protocol-framework/pom.xml		patch \| blob \| history
features/protocol-framework/src/main/features/features.xml	[moved from features/protocol-framework/src/main/resources/features.xml with 67% similarity]	patch \| blob \| history
karaf/opendaylight-karaf/pom.xml		patch \| blob \| history
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml		patch \| blob \| history
opendaylight/commons/opendaylight/pom.xml		patch \| blob \| history
opendaylight/commons/protocol-framework/pom.xml		patch \| blob \| history
opendaylight/config/config-api/pom.xml		patch \| blob \| history
opendaylight/config/config-manager-facade-xml/pom.xml		patch \| blob \| history
opendaylight/config/config-manager/pom.xml		patch \| blob \| history
opendaylight/config/config-parent/pom.xml		patch \| blob \| history
opendaylight/config/pom.xml		patch \| blob \| history
opendaylight/config/yang-jmx-generator-plugin/pom.xml		patch \| blob \| history
opendaylight/config/yang-jmx-generator/pom.xml		patch \| blob \| history
opendaylight/config/yang-test/pom.xml		patch \| blob \| history
opendaylight/md-sal/messagebus-api/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-binding-api/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-binding-broker/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-binding-config/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-binding-dom-it/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-binding-it/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java		patch \| blob \| history
opendaylight/md-sal/sal-clustering-commons/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-connector-api/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-distributed-datastore/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-dom-broker-config/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-dom-broker/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-dom-xsql/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-inmemory-datastore/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-remote/pom.xml		patch \| blob \| history
opendaylight/md-sal/sal-test-model/pom.xml		patch \| blob \| history
opendaylight/md-sal/samples/clustering-test-app/model/pom.xml		patch \| blob \| history
opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml		patch \| blob \| history
opendaylight/md-sal/samples/toaster-it/pom.xml		patch \| blob \| history
opendaylight/md-sal/samples/toaster-provider/pom.xml		patch \| blob \| history
opendaylight/md-sal/samples/toaster/pom.xml		patch \| blob \| history
opendaylight/model/model-topology/pom.xml		patch \| blob \| history
opendaylight/model/pom.xml		patch \| blob \| history