From c5e8ae7c630984f7e9d19f07912cf371f9a8be10 Mon Sep 17 00:00:00 2001
From: Madhu Venugopal <mavenugo@gmail.com>
Date: Thu, 14 Aug 2014 05:41:05 -0700
Subject: [PATCH] Removed some unused files and dependencies.

Change-Id: I58312ab8f683fc7c81bdbf89811bee0a806ac0d9
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
---
 .../ovsdb/lib/schema/temp/Reference.java          | 15 ---------------
 of-extension/nx-ofjava/pom.xml                    |  2 +-
 plugin/pom.xml                                    |  7 +------
 .../plugin/api/OvsVswitchdSchemaConstants.java    |  4 ++++
 utils/mdsal-openflow/pom.xml                      |  2 +-
 5 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 library/src/test/java/org/opendaylight/ovsdb/lib/schema/temp/Reference.java

diff --git a/library/src/test/java/org/opendaylight/ovsdb/lib/schema/temp/Reference.java b/library/src/test/java/org/opendaylight/ovsdb/lib/schema/temp/Reference.java
deleted file mode 100644
index eafb3117f..000000000
--- a/library/src/test/java/org/opendaylight/ovsdb/lib/schema/temp/Reference.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (C) 2014 EBay Software Foundation
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Authors : Ashwin Raveendran
- */
-package org.opendaylight.ovsdb.lib.schema.temp;
-
-
-public class Reference {
-
-}
diff --git a/of-extension/nx-ofjava/pom.xml b/of-extension/nx-ofjava/pom.xml
index f8cacbb20..7d73616ba 100644
--- a/of-extension/nx-ofjava/pom.xml
+++ b/of-extension/nx-ofjava/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>of-extension.nx-ofjava</artifactId>
     <version>${ovsdb.ofextension.version}</version>
     <packaging>bundle</packaging>
-    <name>Opendaylight OVS NX Extensions for OpenflowJava Flow Models</name>
+    <name>Opendaylight OVS NX for OpenflowJava Models</name>
 
     <dependencies>
         <dependency>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 52a65a9a8..5cd001a8b 100755
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -72,11 +72,6 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore-nio</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>clustering.services</artifactId>
@@ -154,7 +149,7 @@
               javax.net.ssl,
               *
             </Import-Package>
-            <Embed-Dependency>httpclient,commons-codec,httpcore-nio,javax.servlet-api,portlet-api,commons-collections;type=!pom;inline=false</Embed-Dependency>
+            <Embed-Dependency>commons-codec,javax.servlet-api,portlet-api,commons-collections;type=!pom;inline=false</Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
             <Bundle-Activator>org.opendaylight.ovsdb.plugin.internal.Activator</Bundle-Activator>
             <Private-Package>
diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsVswitchdSchemaConstants.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsVswitchdSchemaConstants.java
index 3155ce614..65efc8334 100644
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsVswitchdSchemaConstants.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsVswitchdSchemaConstants.java
@@ -48,6 +48,10 @@ public final class OvsVswitchdSchemaConstants {
             autoConfigureController = Boolean.getBoolean(OVSDB_AUTOCONFIGURECONTROLLER);
     }
 
+    public static void setAutoConfigureController(boolean autoConfigure) {
+        autoConfigureController = autoConfigure;
+    }
+
     public static boolean shouldConfigureController (String databaseName, String tableName) {
         if (autoConfigureController && databaseName.equals(DATABASE_NAME) && tableName.equals("Bridge")) return true;
         return false;
diff --git a/utils/mdsal-openflow/pom.xml b/utils/mdsal-openflow/pom.xml
index 861f47fdf..b630240ee 100644
--- a/utils/mdsal-openflow/pom.xml
+++ b/utils/mdsal-openflow/pom.xml
@@ -11,7 +11,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>utils.mdsal-openflow</artifactId>
-  <name>OpenDaylight OVSDB utility to program Openflow rules using MD_SAL</name>
+  <name>OpenDaylight OVS utility for md-sal based OpenFlow</name>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-- 
2.36.6