From: Giovanni Meo <gmeo@cisco.com>
Date: Tue, 6 May 2014 19:12:42 +0000 (+0000)
Subject: Merge "Breaking up 6360: dummy console"
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~132
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=bba161ea7fb714c9d21abac4c13a0ae2975810e8;hp=fcf33e180f7df435bd63440f2218ed84806da7e4;p=controller.git

Merge "Breaking up 6360: dummy console"
---

diff --git a/opendaylight/dummy-console/README b/opendaylight/dummy-console/README
new file mode 100644
index 0000000000..09974d5e54
--- /dev/null
+++ b/opendaylight/dummy-console/README
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000000..68921ab79f
--- /dev/null
+++ b/opendaylight/dummy-console/pom.xml
@@ -0,0 +1,37 @@
+<?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
new file mode 100644
index 0000000000..29e9fc931b
--- /dev/null
+++ b/opendaylight/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandInterpreter.java
@@ -0,0 +1,12 @@
+/*
+ * 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
new file mode 100644
index 0000000000..a781f6f908
--- /dev/null
+++ b/opendaylight/dummy-console/src/main/java/org/eclipse/osgi/framework/console/CommandProvider.java
@@ -0,0 +1,12 @@
+/*
+ * 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 64ed6c7d80..3408c0513c 100644
--- 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>