Revert "Breaking up 6360: dummy console"

This reverts commit 59fa31193e7e8b7bb807024ee65ac724434006b6.

Change-Id: I94c1348feaae8ba2da454692f8f581b7857f3bec
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/opendaylight/dummy-console/README b/opendaylight/dummy-console/README
deleted file mode 100644 (file)
index 09974d5..0000000
--- a/opendaylight/dummy-console/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This bundle is temporary only and should be removed as soon as possible
-it is only for compatibility layer in Karaf.

diff --git a/opendaylight/dummy-console/pom.xml b/opendaylight/dummy-console/pom.xml
deleted file mode 100644 (file)
index 68921ab..0000000
--- a/opendaylight/dummy-console/pom.xml
+++ /dev/null
@@ -1,37 +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>commons.opendaylight</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
-    <relativePath>../commons/opendaylight</relativePath>
-  </parent>
-  <artifactId>dummy-console</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-  <description>Dummy Console Interfaces for Equinox-specific CLI</description>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>${bundle.plugin.version}</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Import-Package>*</Import-Package>
-            <Export-Package>org.eclipse.osgi.framework.console</Export-Package>
-            <Bundle-Activator></Bundle-Activator>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/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:Main</url>
-  </scm>
-</project>

diff --git a/opendaylight/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandInterpreter.java b/opendaylight/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandInterpreter.java
deleted file mode 100644 (file)
index 29e9fc9..0000000
--- a/opendaylight/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandInterpreter.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright(c)2014 Inocybe Technologies, Inc. and others. All rights reserved.
- *
- * 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
- *
- */
-package org.eclipse.osgi.framework.console;
-
-/** Empty tag interface for Command Interpreter **/
-public interface CommandInterpreter {}

diff --git a/opendaylight/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandProvider.java b/opendaylight/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandProvider.java
deleted file mode 100644 (file)
index a781f6f..0000000
--- a/opendaylight/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandProvider.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright(c)2014 Inocybe Technologies, Inc. and others. All rights reserved.
- *
- * 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
- *
- */
-package org.eclipse.osgi.framework.console;
-
-/** Empty tag interface for Command Provider **/
-public interface CommandProvider {}

diff --git a/pom.xml b/pom.xml
index 3408c0513cb5229de9b4ae036263335a2fceb9b2..64ed6c7d80794a0e0030e67411d60ab0245d5ae3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -124,8 +124,8 @@
     <module>opendaylight/commons/logback_settings</module>
 
     <!-- Karaf Distribution 
-    <module>feature</module> -->
-    <module>opendaylight/dummy-console</module>
+    <module>feature</module>
+    <module>opendaylight/dummy-console</module> -->
     <module>opendaylight/distribution/opendaylight-karaf</module>
   </modules>
   <scm>