From d1330dffe7bf98b194074af18f359720da55e365 Mon Sep 17 00:00:00 2001 From: Mathieu Lemay Date: Tue, 6 May 2014 12:49:40 -0400 Subject: [PATCH] Added karaf branding. Change-Id: I05da9b3cc3804c5c5328004f3f814b44687d9467 Signed-off-by: Arash Eghtesadi Signed-off-by: Mathieu Lemay --- opendaylight/commons/opendaylight/pom.xml | 11 ++++-- .../distribution/opendaylight-karaf/pom.xml | 7 ++-- .../src/main/resources/etc/custom.properties | 4 +-- opendaylight/karaf-branding/pom.xml | 34 +++++++++++++++++++ .../apache/karaf/branding/branding.properties | 14 ++++++++ pom.xml | 1 + 6 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 opendaylight/karaf-branding/pom.xml create mode 100644 opendaylight/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 80be29570d..927c8a3fd2 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -101,6 +101,7 @@ 1.1.1 2.0 4.8.1 + 1.0.0-SNAPSHOT 3.0.1 1.0.9 0.4.2-SNAPSHOT @@ -882,6 +883,12 @@ jolokia-bridge 0.0.2-SNAPSHOT + + + org.opendaylight.controller + karaf.branding + ${karaf.branding.version} + org.opendaylight.controller logback-config @@ -1008,14 +1015,12 @@ osgi-brandfragment.web ${osgi-brandfragment.web.version} - + org.opendaylight.controller protocol-framework ${protocol-framework.version} - - org.opendaylight.controller protocol_plugins.openflow diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml index 31cdedd572..ade9070445 100644 --- a/opendaylight/distribution/opendaylight-karaf/pom.xml +++ b/opendaylight/distribution/opendaylight-karaf/pom.xml @@ -22,6 +22,11 @@ ${karaf.version} kar + + org.opendaylight.controller + karaf.branding + compile + @@ -34,8 +39,6 @@ runtime - org.opendaylight.controller base-features ${project.version} diff --git a/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/custom.properties b/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/custom.properties index 9a86866080..6c1ca421c2 100644 --- a/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/custom.properties +++ b/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/custom.properties @@ -1,5 +1,5 @@ # Extra packages to import from the boot class loader -org.osgi.framework.system.packages.extra=sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch +org.osgi.framework.system.packages.extra=org.apache.karaf.branding,sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=325578 # Extend the framework to avoid the resources to be presented with @@ -111,4 +111,4 @@ org.jolokia.listenForHttpService=false java.util.logging.config.file=configuration/tomcat-logging.properties #Hosttracker hostsdb key scheme setting -hosttracker.keyscheme=IP \ No newline at end of file +hosttracker.keyscheme=IP diff --git a/opendaylight/karaf-branding/pom.xml b/opendaylight/karaf-branding/pom.xml new file mode 100644 index 0000000000..727f224fa1 --- /dev/null +++ b/opendaylight/karaf-branding/pom.xml @@ -0,0 +1,34 @@ + + + + 4.0.0 + + org.opendaylight.controller + karaf.branding + 1.0.0-SNAPSHOT + bundle + OpenDaylight :: Karaf :: Branding + + + + + org.apache.felix + maven-bundle-plugin + 2.4.0 + true + + + ${project.artifactId} + * + !* + + org.apache.karaf.branding + + *;public-context:=false + + + + + + + diff --git a/opendaylight/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties b/opendaylight/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties new file mode 100644 index 0000000000..cf081c674a --- /dev/null +++ b/opendaylight/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties @@ -0,0 +1,14 @@ +welcome = \ +\u001B[33m \r\n\ +\u001B[33m ________ ________ .__ .__ .__ __ \r\n\ +\u001B[33m \\_____ \\ ______ ____ ____ \\______ \\ _____ ___.__.| | |__| ____ | |___/ |_ \r\n\ +\u001B[33m / | \\\\____ \\_/ __ \\ / \\ | | \\\\__ \\< | || | | |/ ___\\| | \\ __\\ \r\n\ +\u001B[33m / | \\ |_> > ___/| | \\| ` \\/ __ \\\\___ || |_| / /_/ > Y \\ | \r\n\ +\u001B[33m \\_______ / __/ \\___ >___| /_______ (____ / ____||____/__\\___ /|___| /__| \r\n\ +\u001B[33m \\/|__| \\/ \\/ \\/ \\/\\/ /_____/ \\/ \r\n\ +\u001B[33m \r\n\ +\r\n\ +Hit '\u001B[1m\u001B[0m' for a list of available commands\r\n\ + and '\u001B[1m[cmd] --help\u001B[0m' for help on a specific command.\r\n\ +Hit '\u001B[1m\u001B[0m' or type '\u001B[1msystem:shutdown\u001B[0m' or '\u001B[1mlogout\u001B[0m' to shutdown OpenDaylight.\r\n +prompt = \u001B[36mopendaylight-user\u001B[0m\u001B[1m@\u001B[0m\u001B[34m${APPLICATION}\u001B[0m> diff --git a/pom.xml b/pom.xml index 3a3c3dcfb4..2a9da6c1ec 100644 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,7 @@ features/base opendaylight/dummy-console + opendaylight/karaf-branding opendaylight/distribution/opendaylight-karaf -- 2.36.6