Removed protocol_plugins from pom and associated values to fix failing build

Signed-off-by: nerdalert <brent.salisbury@gmail.com>

diff --git a/ovsdb/META-INF/MANIFEST.MF b/ovsdb/META-INF/MANIFEST.MF
index 13af7b0720a19968f615db526fa5112fd2b98ada..22c68cc9f91f6bb56ee202e8f8d70d8f854784bb 100755 (executable)
--- a/ovsdb/META-INF/MANIFEST.MF
+++ b/ovsdb/META-INF/MANIFEST.MF
@@ -1,14 +1,13 @@
 Manifest-Version: 1.0\r
-Bnd-LastModified: 1374523969530\r
-Build-Jdk: 1.7.0_21\r
-Built-By: evan\r
-Bundle-Activator: org.opendaylight.controller.protocol_plugin.ovsdb.inte\r
- rnal.Activator\r
+Bnd-LastModified: 1374549362684\r
+Build-Jdk: 1.7.0_25\r
+Built-By: brent\r
+Bundle-Activator: org.opendaylight.ovsdb.internal.Activator\r
 Bundle-ClassPath: .,jsonrpc4j-0.28.jar,httpclient-4.2.5.jar,commons-code\r
  c-1.4.jar,httpcore-nio-4.2.1.jar,javax.servlet-api-3.1-b06.jar\r
 Bundle-ManifestVersion: 2\r
-Bundle-Name: protocol_plugins.ovsdb\r
-Bundle-SymbolicName: org.opendaylight.controller.protocol_plugins.ovsdb\r
+Bundle-Name: ovsdb\r
+Bundle-SymbolicName: org.opendaylight.ovsdb\r
 Bundle-Version: 0.4.0.SNAPSHOT\r
 Created-By: Apache Maven Bundle Plugin\r
 Embed-Dependency: jsonrpc4j,httpclient,commons-codec,httpcore-nio,javax.\r
@@ -22,7 +21,10 @@ Embedded-Artifacts: jsonrpc4j-0.28.jar;g="com.googlecode";a="jsonrpc4j";
  vax.servlet-api";v="3.1-b06"\r
 Export-Package: org.opendaylight.ovsdb.database;uses:="com.fasterxml.jac\r
  kson.annotation";version="0.4.0.SNAPSHOT",org.opendaylight.ovsdb;versio\r
- n="0.4.0.SNAPSHOT"\r
+ n="0.4.0.SNAPSHOT",org.opendaylight.ovsdb.sal.configuration;uses:="org.\r
+ opendaylight.controller.sal.core";version="0.4.0.SNAPSHOT",org.opendayl\r
+ ight.ovsdb.sal.connection;uses:="org.opendaylight.controller.sal.core,o\r
+ rg.opendaylight.controller.sal.utils";version="0.4.0.SNAPSHOT"\r
 Import-Package: com.fasterxml.jackson.annotation;version="[2.0,3)",com.f\r
  asterxml.jackson.core;version="[2.0,3)",com.fasterxml.jackson.databind;\r
  version="[2.0,3)",com.fasterxml.jackson.databind.node;version="[2.0,3)"\r
@@ -40,25 +42,25 @@ Import-Package: com.fasterxml.jackson.annotation;version="[2.0,3)",com.f
  tional,org.apache.http.pool;resolution:=optional,org.apache.http.protoc\r
  ol;resolution:=optional,org.apache.http.util;resolution:=optional,org.e\r
  clipse.osgi.framework.console;version="[1.1,2)",org.ietf.jgss,org.opend\r
- aylight.controller.protocol_plugin.ovsdb.internal,org.opendaylight.cont\r
- roller.sal.action;version="[0.5,1)",org.opendaylight.controller.sal.con\r
- figuration,org.opendaylight.controller.sal.connection,org.opendaylight.\r
- controller.sal.core;version="[0.5,1)",org.opendaylight.controller.sal.d\r
- iscovery;version="[0.5,1)",org.opendaylight.controller.sal.flowprogramm\r
- er;version="[0.5,1)",org.opendaylight.controller.sal.inventory;version=\r
- "[0.5,1)",org.opendaylight.controller.sal.match;version="[0.5,1)",org.o\r
- pendaylight.controller.sal.packet;version="[0.5,1)",org.opendaylight.co\r
- ntroller.sal.reader;version="[0.5,1)",org.opendaylight.controller.sal.t\r
- opology;version="[0.5,1)",org.opendaylight.controller.sal.utils;version\r
- ="[0.5,1)",org.opendaylight.ovsdb.database,org.osgi.framework;version="\r
- [1.7,2)",org.slf4j;version="[1.7,2)",org.springframework.aop.framework;\r
- version="[3.1,4)",org.springframework.beans;version="[3.1,4)",org.sprin\r
- gframework.beans.factory;version="[3.1,4)",org.springframework.beans.fa\r
- ctory.config;version="[3.1,4)",org.springframework.beans.factory.suppor\r
- t;version="[3.1,4)",org.springframework.context;version="[3.1,4)",org.s\r
- pringframework.core.io;version="[3.1,4)",org.springframework.core.type;\r
- version="[3.1,4)",org.springframework.core.type.classreading;version="[\r
- 3.1,4)",org.springframework.remoting.support;version="[3.1,4)",org.spri\r
- ngframework.util;version="[3.1,4)",org.springframework.web;version="[3.\r
- 1,4)"\r
+ aylight.controller.sal.action;version="[0.5,1)",org.opendaylight.contro\r
+ ller.sal.configuration,org.opendaylight.controller.sal.connection,org.o\r
+ pendaylight.controller.sal.core;version="[0.5,1)",org.opendaylight.cont\r
+ roller.sal.discovery;version="[0.5,1)",org.opendaylight.controller.sal.\r
+ flowprogrammer;version="[0.5,1)",org.opendaylight.controller.sal.invent\r
+ ory;version="[0.5,1)",org.opendaylight.controller.sal.match;version="[0\r
+ .5,1)",org.opendaylight.controller.sal.packet;version="[0.5,1)",org.ope\r
+ ndaylight.controller.sal.reader;version="[0.5,1)",org.opendaylight.cont\r
+ roller.sal.topology;version="[0.5,1)",org.opendaylight.controller.sal.u\r
+ tils;version="[0.5,1)",org.opendaylight.ovsdb.database,org.opendaylight\r
+ .ovsdb.sal.configuration,org.opendaylight.ovsdb.sal.connection,org.osgi\r
+ .framework;version="[1.7,2)",org.slf4j;version="[1.7,2)",org.springfram\r
+ ework.aop.framework;version="[3.1,4)",org.springframework.beans;version\r
+ ="[3.1,4)",org.springframework.beans.factory;version="[3.1,4)",org.spri\r
+ ngframework.beans.factory.config;version="[3.1,4)",org.springframework.\r
+ beans.factory.support;version="[3.1,4)",org.springframework.context;ver\r
+ sion="[3.1,4)",org.springframework.core.io;version="[3.1,4)",org.spring\r
+ framework.core.type;version="[3.1,4)",org.springframework.core.type.cla\r
+ ssreading;version="[3.1,4)",org.springframework.remoting.support;versio\r
+ n="[3.1,4)",org.springframework.util;version="[3.1,4)",org.springframew\r
+ ork.web;version="[3.1,4)"\r
 Tool: Bnd-1.50.0\r

diff --git a/ovsdb/pom.xml b/ovsdb/pom.xml
index 88ef741cf1a87a48715c11613ede9cc6f30b65a2..fb8653f720cfc70d4d305135d648162dceafe40b 100755 (executable)
--- a/ovsdb/pom.xml
+++ b/ovsdb/pom.xml
@@ -2,13 +2,12 @@
 <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>
-    <version>1.4.0-SNAPSHOT</version>
-    <relativePath>../../commons/opendaylight</relativePath>
+    <groupId>org.opendaylight.ovsdb</groupId>
+    <artifactId>commons.ovsdb</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../commons/opendaylight</relativePath>
   </parent>
-
-  <artifactId>protocol_plugins.ovsdb</artifactId>
+  <artifactId>ovsdb</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
@@ -52,7 +51,7 @@
               true
             </Embed-Transitive>
             <Bundle-Activator>
-              org.opendaylight.controller.protocol_plugin.ovsdb.internal.Activator
+              org.opendaylight.ovsdb.internal.Activator
             </Bundle-Activator>
           </instructions>
           <manifestLocation>${project.basedir}/META-INF</manifestLocation>
@@ -211,4 +210,4 @@
                         </exclusions>
                 </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file