Bug 4035: Removed sal-common which is unused since Helium.

Change-Id: Ia6e15cc1e94fcf5794a56fbf61d260644dcb457b
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/features/config/pom.xml b/features/config/pom.xml
index f54af003a79e813a53886bec41136a7c35a1f4f6..1b7a3eff0e5f588ee0c5df2bf21b3065c6af36b0 100644 (file)
--- a/features/config/pom.xml
+++ b/features/config/pom.xml
@@ -30,10 +30,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>

-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-common</artifactId>
-    </dependency>

     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-api</artifactId>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-api</artifactId>

diff --git a/features/mdsal/src/main/resources/features.xml b/features/mdsal/src/main/resources/features.xml
index 31e1ab219647b3b955b0527970aaaec310833dd6..2a5e8f25fdacd2266e285b9499f7113f5c4ea0ed 100644 (file)
--- a/features/mdsal/src/main/resources/features.xml
+++ b/features/mdsal/src/main/resources/features.xml
@@ -16,7 +16,6 @@
     </feature>
     <feature name='odl-mdsal-common' version='${mdsal.version}' description="OpenDaylight :: Config :: All">
       <feature version='${yangtools.version}'>odl-yangtools-data-binding</feature>
     </feature>
     <feature name='odl-mdsal-common' version='${mdsal.version}' description="OpenDaylight :: Config :: All">
       <feature version='${yangtools.version}'>odl-yangtools-data-binding</feature>

-      <bundle>mvn:org.opendaylight.controller/sal-common/${mdsal.version}</bundle>

       <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>
       <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>

diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml
index 77513514fc13d5d3fba9be65c814cb658bb89026..3f64b777f17430138f97f80330165b5f526df522 100644 (file)
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml
@@ -18,11 +18,6 @@
     <dependencyManagement>
         <dependencies>
             <!-- Core API/implementation -->
     <dependencyManagement>
         <dependencies>
             <!-- Core API/implementation -->

-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-common</artifactId>
-                <version>${project.version}</version>
-            </dependency>

             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>sal-common-api</artifactId>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>sal-common-api</artifactId>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 8b003b2825cd5c1fe7fb3b32418c62422ad79b32..bab6bb9cc69b92cfb237fe847547d084749a1d3e 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -17,7 +17,6 @@
     <module>mdsal-artifacts</module>
 
     <!-- Common APIs & Implementation -->
     <module>mdsal-artifacts</module>
 
     <!-- Common APIs & Implementation -->

-    <module>sal-common</module>

     <module>sal-common-api</module>
     <module>sal-common-impl</module>
     <module>sal-common-util</module>
     <module>sal-common-api</module>
     <module>sal-common-impl</module>
     <module>sal-common-util</module>

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 cb9d6c3fa38466ca5bed7acaba301a95e94f3288..f810d6240b1649995bdaff299571095169679bfb 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
@@ -32,7 +32,6 @@ public class TestHelper {
                 mavenBundle(YANGTOOLS, "yang-common").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "object-cache-api").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "object-cache-guava").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "yang-common").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "object-cache-api").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "object-cache-guava").versionAsInProject(), // //

-                mavenBundle(CONTROLLER, "sal-common").versionAsInProject(), // //

                 mavenBundle(CONTROLLER, "sal-common-api").versionAsInProject(), // //
                 mavenBundle(CONTROLLER, "sal-common-impl").versionAsInProject(), // //
 
                 mavenBundle(CONTROLLER, "sal-common-api").versionAsInProject(), // //
                 mavenBundle(CONTROLLER, "sal-common-impl").versionAsInProject(), // //
 

diff --git a/opendaylight/md-sal/sal-common/pom.xml b/opendaylight/md-sal/sal-common/pom.xml
deleted file mode 100644 (file)
index b1ab0ae..0000000
--- a/opendaylight/md-sal/sal-common/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  </parent>
-  <artifactId>sal-common</artifactId>
-
-  <packaging>bundle</packaging>
-
-  <dependencies></dependencies>
-  <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-  </scm>
-</project>

diff --git a/opendaylight/md-sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/DataStoreIdentifier.java b/opendaylight/md-sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/DataStoreIdentifier.java
deleted file mode 100644 (file)
index 194045e..0000000
--- a/opendaylight/md-sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/DataStoreIdentifier.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*\r
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.\r
- *\r
- * This program and the accompanying materials are made available under the\r
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- * and is available at http://www.eclipse.org/legal/epl-v10.html\r
- */\r
-package org.opendaylight.controller.sal.common;\r
-\r
-public interface DataStoreIdentifier {\r
-\r
-    Object getIdentifier();\r
-\r
-    String getName();\r
-\r
-    @Override\r
-    public boolean equals(Object obj);\r
-\r
-    @Override\r
-    public int hashCode();\r
-}\r

diff --git a/opendaylight/md-sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/GlobalDataStore.java b/opendaylight/md-sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/GlobalDataStore.java
deleted file mode 100644 (file)
index 1c30238..0000000
--- a/opendaylight/md-sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/GlobalDataStore.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*\r
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.\r
- *\r
- * This program and the accompanying materials are made available under the\r
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- * and is available at http://www.eclipse.org/legal/epl-v10.html\r
- */\r
-package org.opendaylight.controller.sal.common;\r
-\r
-public enum GlobalDataStore implements DataStoreIdentifier {\r
-    RuntimeInfo("Runtime Info"), Configuration("Configuration");\r
-\r
-    private final String name;\r
-\r
-    GlobalDataStore(String name) {\r
-        this.name = name;\r
-    }\r
-\r
-    @Override\r
-    public Object getIdentifier() {\r
-        return this;\r
-    }\r
-\r
-    @Override\r
-    public String getName() {\r
-        return this.name;\r
-    }\r
-\r
-}\r

diff --git a/opendaylight/md-sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/package-info.java b/opendaylight/md-sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/package-info.java
deleted file mode 100644 (file)
index e28fa94..0000000
--- a/opendaylight/md-sal/sal-common/src/main/java/org/opendaylight/controller/sal/common/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/*\r
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.\r
- *\r
- * This program and the accompanying materials are made available under the\r
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- * and is available at http://www.eclipse.org/legal/epl-v10.html\r
- */\r
-package org.opendaylight.controller.sal.common;\r

diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml
index 4066a82bd8d12d2591d5b721576a280122750f3b..30a9c7d1b84a2bbd67f3a9731fc3de687718382c 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/pom.xml
+++ b/opendaylight/md-sal/sal-dom-api/pom.xml
@@ -13,10 +13,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-api</artifactId>
     </dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-api</artifactId>
     </dependency>

-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-common</artifactId>
-    </dependency>

     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-common-api</artifactId>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-common-api</artifactId>


@@ -55,41 +51,6 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
       </plugin>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
       </plugin>

-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate-sources</goal>
-            </goals>
-            <configuration>
-              <codeGenerators>
-                <generator>
-                  <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
-                  <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
-                  <additionalConfiguration>
-                    <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
-                  </additionalConfiguration>
-                </generator>
-                <generator>
-                  <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                  <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                </generator>
-                <generator>
-                  <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                  <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                </generator>
-                <generator>
-                  <codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
-                  <outputBaseDir>target/site/models</outputBaseDir>
-                </generator>
-              </codeGenerators>
-              <inspectDependencies>true</inspectDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>

     </plugins>
   </build>
   <scm>
     </plugins>
   </build>
   <scm>