From 678b2e0c2cf9f7b149bad013bcce5845fd521ebf Mon Sep 17 00:00:00 2001 From: Ryan Goulding Date: Fri, 22 Jul 2016 03:52:08 -0400 Subject: [PATCH] Bug 6278: Copy karaf-parent from controller to odlparent As discussed in the MD-SAL call, there is an architectural need to move karaf-parent from the controller project to the odlparent project. This is particularly useful for karaf upgrades, since right now a bump in karaf version within odlparent requires a rebuild of controller to reflect the change in karaf-parent, and our build jobs are not set up to support such a process. The move process will be handled in multiple steps: 1) Copy karaf-parent, karaf-branding and opendaylight-karaf-resources to odlparent. All three of these should belong in odlparent. All three must be moved since karaf-parent depends on the latter two artifacts. Since controller depends on odlparent (and not the other way around), they must be moved upstream to odlparent. 2) Have controller's karaf-parent derive from odlparent's karaf-parent. This preserves the ability for downstream consumers to derive from the controller karaf-parent in the interim, while allowing changes to odlparent's karaf-parent to be recognized since controller does not need to be rebuilt. [THIS PATCH] This also involves removing karaf-branding and opendaylight-karaf-resources from the controller project, since they are no longer needed. There are two consumers that need to be patched: lispflowmapping: https://git.opendaylight.org/gerrit/42647 vtn: https://git.opendaylight.org/gerrit/42648 3) Change all downstream projects to utilize odlparent's karaf-parent. This is future work and will be done in several patches. 4) Remove controller's karaf-parent once we feel all downstream consumers are using the odlparent's karaf-parent. Change-Id: Ib42ff5212bbfb93883346a19855544df4fb06d61 Signed-off-by: Ryan Goulding --- karaf/karaf-branding/.gitignore | 1 - karaf/karaf-branding/pom.xml | 36 -- .../apache/karaf/branding/branding.properties | 14 - karaf/karaf-parent/pom.xml | 438 +------------- karaf/opendaylight-karaf-resources/pom.xml | 79 --- .../assembly/etc/org.ops4j.pax.url.mvn.cfg | 106 ---- .../src/main/resources/bin/instance | 372 ------------ .../src/main/resources/bin/instance.bat | 160 ----- .../src/main/resources/bin/karaf | 429 -------------- .../src/main/resources/bin/karaf.bat | 339 ----------- .../src/main/resources/bin/setenv | 56 -- .../src/main/resources/bin/setenv.bat | 66 --- .../main/resources/configuration/context.xml | 1 - .../main/resources/configuration/logback.xml | 101 ---- .../configuration/tomcat-logging.properties | 42 -- .../resources/configuration/tomcat-server.xml | 60 -- .../src/main/resources/etc/custom.properties | 105 ---- .../src/main/resources/etc/jetty.xml | 106 ---- .../src/main/resources/etc/jre.properties | 548 ------------------ .../src/main/resources/etc/odl.java.security | 6 - .../resources/etc/org.ops4j.pax.logging.cfg | 51 -- .../src/main/resources/version.properties | 6 - karaf/pom.xml | 2 - opendaylight/commons/opendaylight/pom.xml | 4 +- 24 files changed, 3 insertions(+), 3125 deletions(-) delete mode 100644 karaf/karaf-branding/.gitignore delete mode 100644 karaf/karaf-branding/pom.xml delete mode 100644 karaf/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties delete mode 100644 karaf/opendaylight-karaf-resources/pom.xml delete mode 100644 karaf/opendaylight-karaf-resources/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg delete mode 100755 karaf/opendaylight-karaf-resources/src/main/resources/bin/instance delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/bin/instance.bat delete mode 100755 karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/configuration/context.xml delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/configuration/logback.xml delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-logging.properties delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-server.xml delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/etc/jetty.xml delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/etc/jre.properties delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/etc/odl.java.security delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/etc/org.ops4j.pax.logging.cfg delete mode 100644 karaf/opendaylight-karaf-resources/src/main/resources/version.properties diff --git a/karaf/karaf-branding/.gitignore b/karaf/karaf-branding/.gitignore deleted file mode 100644 index b83d22266a..0000000000 --- a/karaf/karaf-branding/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/karaf/karaf-branding/pom.xml b/karaf/karaf-branding/pom.xml deleted file mode 100644 index e05afcf229..0000000000 --- a/karaf/karaf-branding/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - - org.opendaylight.controller - releasepom - 0.4.0-SNAPSHOT - ../.. - - karaf.branding - 1.3.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/karaf/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties b/karaf/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties deleted file mode 100644 index cf081c674a..0000000000 --- a/karaf/karaf-branding/src/main/resources/org/apache/karaf/branding/branding.properties +++ /dev/null @@ -1,14 +0,0 @@ -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/karaf/karaf-parent/pom.xml b/karaf/karaf-parent/pom.xml index 30a8ed6a7d..a2f091fc35 100644 --- a/karaf/karaf-parent/pom.xml +++ b/karaf/karaf-parent/pom.xml @@ -10,9 +10,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.opendaylight.odlparent - odlparent + karaf-parent 1.7.0-SNAPSHOT - 4.0.0 org.opendaylight.controller @@ -20,439 +19,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${project.artifactId} pom - - 1.3.0-SNAPSHOT - 1.7.0-SNAPSHOT - standard - - 3.0.1 - true - true - - - - - - org.apache.karaf.features - framework - ${karaf.version} - kar - - - org.osgi - org.osgi.core - - - org.apache.sshd - sshd-core - - - - org.apache.aries.proxy - org.apache.aries.proxy.impl - - - - - - - - - org.apache.karaf.features - standard - ${karaf.version} - xml - features - runtime - - - - org.apache.karaf.region - org.apache.karaf.region.persist - ${karaf.version} - runtime - - - - org.opendaylight.controller - karaf.branding - ${branding.version} - compile - - - - - org.opendaylight.controller - opendaylight-karaf-resources - ${karaf.resources.version} - - - - - - org.apache.aries.proxy - org.apache.aries.proxy.impl - 1.0.5 - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.felix - maven-bundle-plugin - [0,) - - cleanVersions - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [0,) - - copy - unpack - - - - - - - - - org.apache.karaf.tooling - karaf-maven-plugin - [0,) - - commands-generate-help - features-add-to-repository - install-kars - - - - - - - - - org.fusesource.scalate - maven-scalate-plugin - [0,) - - sitegen - - - - - - - - - org.apache.servicemix.tooling - depends-maven-plugin - [0,) - - generate-depends-file - - - - - - - - - - - - - maven-resources-plugin - - - copy-resources - - prepare-package - - copy-resources - - - ${basedir}/target/assembly - - - src/main/assembly - - - true - - - - - - org.apache.karaf.tooling - karaf-maven-plugin - ${karaf.maven.version} - true - - - - eventadmin - - - standard - ${karaf.localFeature} - - - - - - populate-system - generate-resources - - features-add-to-repository - - - - mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features - - - standard - config - package - kar - ssh - management - war - - target/assembly/system - - - - process-resources - - install-kars - - process-resources - - - package - - instance-create-archive - - - ${karaf.archiveTarGz} - ${karaf.archiveZip} - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${checkstyle.version} - - **\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/ - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - - copy - - - generate-resources - - - - org.opendaylight.controller - karaf.branding - ${karaf.branding.version} - target/assembly/lib - karaf.branding-${branding.version}.jar - - - - - - unpack-karaf-resources - - unpack-dependencies - - prepare-package - - ${project.build.directory}/assembly - org.opendaylight.controller - opendaylight-karaf-resources - META-INF\/** - true - false - - - - org.ops4j.pax.url.mvn.cfg - - copy - - prepare-package - - - - org.opendaylight.controller - opendaylight-karaf-resources - properties - config - true - ${project.build.directory}/assembly/etc/ - org.ops4j.pax.url.mvn.cfg - - - true - true - - - - copy-dependencies - prepare-package - - copy-dependencies - - - ${project.build.directory}/assembly/system - distribution.vtn-coordinator - false - true - true - true - true - true - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - prepare-package - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${enforcer.version} - - - enforce-maven - - enforce - - - - - 3.1.1 - - - - - - - - maven-resources-plugin - - - org.apache.karaf.tooling - karaf-maven-plugin - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - org.apache.maven.plugins - maven-dependency-plugin - - - org.apache.maven.plugins - maven-antrun-plugin - - - - diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml deleted file mode 100644 index 260fb55e8d..0000000000 --- a/karaf/opendaylight-karaf-resources/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.7.0-SNAPSHOT - ../../opendaylight/commons/opendaylight - - opendaylight-karaf-resources - Resources for opendaylight-karaf - jar - - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - - copy - - - generate-resources - - - - - org.bouncycastle - bcprov-jdk15on - ${bouncycastle.version} - target/classes/lib/ext - bcprov-jdk15on-${bouncycastle.version}.jar - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg - properties - config - - - - - - - - - diff --git a/karaf/opendaylight-karaf-resources/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg b/karaf/opendaylight-karaf-resources/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg deleted file mode 100644 index 9ee45e4dc4..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg +++ /dev/null @@ -1,106 +0,0 @@ -################################################################################ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -################################################################################ - -# -# If set to true, the following property will not allow any certificate to be used -# when accessing Maven repositories through SSL -# -#org.ops4j.pax.url.mvn.certificateCheck= - -# -# Path to the local Maven settings file. -# The repositories defined in this file will be automatically added to the list -# of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property -# below is not set. -# The following locations are checked for the existence of the settings.xml file -# * 1. looks for the specified url -# * 2. if not found looks for ${user.home}/.m2/settings.xml -# * 3. if not found looks for ${maven.home}/conf/settings.xml -# * 4. if not found looks for ${M2_HOME}/conf/settings.xml -# -#org.ops4j.pax.url.mvn.settings= - -# -# Path to the local Maven repository which is used to avoid downloading -# artifacts when they already exist locally. -# The value of this property will be extracted from the settings.xml file -# above, or defaulted to: -# System.getProperty( "user.home" ) + "/.m2/repository" -# -org.ops4j.pax.url.mvn.localRepository=${karaf.home}/${karaf.default.repository} - -# -# Default this to false. It's just weird to use undocumented repos -# -org.ops4j.pax.url.mvn.useFallbackRepositories=false - -# -# Uncomment if you don't wanna use the proxy settings -# from the Maven conf/settings.xml file -# -# org.ops4j.pax.url.mvn.proxySupport=false - -# -# Disable aether support by default. This ensure that the defaultRepositories -# below will be used -# -#org.ops4j.pax.url.mvn.disableAether=true - -# -# Comma separated list of repositories scanned when resolving an artifact. -# Those repositories will be checked before iterating through the -# below list of repositories and even before the local repository -# A repository url can be appended with zero or more of the following flags: -# @snapshots : the repository contains snaphots -# @noreleases : the repository does not contain any released artifacts -# -# The following property value will add the system folder as a repo. -# -#org.ops4j.pax.url.mvn.defaultRepositories= - -# Use the default local repo (e.g.~/.m2/repository) as a "remote" repo -org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false - -# -# Comma separated list of repositories scanned when resolving an artifact. -# The default list includes the following repositories containing releases: -# http://repo1.maven.org/maven2 -# http://repository.apache.org/content/groups/snapshots-group -# http://svn.apache.org/repos/asf/servicemix/m2-repo -# http://repository.springsource.com/maven/bundles/release -# http://repository.springsource.com/maven/bundles/external -# To add repositories to the default ones, prepend '+' to the list of repositories -# to add. -# A repository url can be appended with zero or more of the following flags: -# @snapshots : the repository contains snaphots -# @noreleases : the repository does not contain any released artifacts -# @id=reponid : the id for the repository, just like in the settings.xml this is optional but recomendet -# -# The default list doesn't contain any repository containing snapshots as it can impact the artifacts resolution. -# You may want to add the following repositories containing snapshots: -# http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases -# http://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@norelease -# http://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases -# -org.ops4j.pax.url.mvn.repositories= \ - file:${karaf.home}/${karaf.default.repository}@id=system.repository, \ - file:${karaf.data}/kar@id=kar.repository@multi, \ - http://repo1.maven.org/maven2@id=central, \ - http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, \ - http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance b/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance deleted file mode 100755 index d7a344c483..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance +++ /dev/null @@ -1,372 +0,0 @@ -#!/bin/bash -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -REALNAME=`readlink -e "$0"` -if [ $? != 0 ]; then - REALNAME=$0 -fi -DIRNAME=`dirname "$REALNAME"` -PROGNAME=`basename "$REALNAME"` - -# -# Sourcing environment settings for karaf similar to tomcats setenv -# -KARAF_SCRIPT="instance" -export KARAF_SCRIPT -if [ -f "$DIRNAME/setenv" ]; then - . "$DIRNAME/setenv" -fi - -# -# Check/Set up some easily accessible MIN/MAX params for JVM mem usage -# -if [ "x$JAVA_MIN_MEM" = "x" ]; then - JAVA_MIN_MEM=128M - export JAVA_MIN_MEM -fi -if [ "x$JAVA_MAX_MEM" = "x" ]; then - JAVA_MAX_MEM=512M - export JAVA_MAX_MEM -fi - -warn() { - echo "${PROGNAME}: $*" -} - -die() { - warn "$*" - exit 1 -} - -detectOS() { - # OS specific support (must be 'true' or 'false'). - cygwin=false; - darwin=false; - aix=false; - os400=false; - case "`uname`" in - CYGWIN*) - cygwin=true - ;; - Darwin*) - darwin=true - ;; - AIX*) - aix=true - ;; - OS400*) - os400=true - ;; - esac - # For AIX, set an environment variable - if $aix; then - export LDR_CNTRL=MAXDATA=0xB0000000@DSA - echo $LDR_CNTRL - fi -} - -unlimitFD() { - # Use the maximum available, or set MAX_FD != -1 to use that - if [ "x$MAX_FD" = "x" ]; then - MAX_FD="maximum" - fi - - # Increase the maximum file descriptors if we can - if [ "$os400" = "false" ] && [ "$cygwin" = "false" ]; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ "$MAX_FD_LIMIT" != 'unlimited' ]; then - if [ $? -eq 0 ]; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then - # use the system max - MAX_FD="$MAX_FD_LIMIT" - fi - - ulimit -n $MAX_FD > /dev/null - # echo "ulimit -n" `ulimit -n` - if [ $? -ne 0 ]; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" - fi - fi - fi -} - -locateHome() { - if [ "x$KARAF_HOME" != "x" ]; then - warn "Ignoring predefined value for KARAF_HOME" - fi - - # In POSIX shells, CDPATH may cause cd to write to stdout - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - KARAF_HOME=`cd "$DIRNAME/.."; pwd` - if [ ! -d "$KARAF_HOME" ]; then - die "KARAF_HOME is not valid: $KARAF_HOME" - fi -} - -locateBase() { - if [ "x$KARAF_BASE" != "x" ]; then - if [ ! -d "$KARAF_BASE" ]; then - die "KARAF_BASE is not valid: $KARAF_BASE" - fi - else - KARAF_BASE=$KARAF_HOME - fi -} - -locateData() { - if [ "x$KARAF_DATA" != "x" ]; then - if [ ! -d "$KARAF_DATA" ]; then - die "KARAF_DATA is not valid: $KARAF_DATA" - fi - else - KARAF_DATA=$KARAF_BASE/data - fi -} - -locateEtc() { - if [ "x$KARAF_ETC" != "x" ]; then - if [ ! -d "$KARAF_ETC" ]; then - die "KARAF_ETC is not valid: $KARAF_ETC" - fi - else - KARAF_ETC=$KARAF_BASE/etc - fi -} - -setupNativePath() { - # Support for loading native libraries - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$KARAF_BASE/lib:$KARAF_HOME/lib" - - # For Cygwin, set PATH from LD_LIBRARY_PATH - if $cygwin; then - LD_LIBRARY_PATH=`cygpath --path --windows "$LD_LIBRARY_PATH"` - PATH="$PATH;$LD_LIBRARY_PATH" - export PATH - fi - export LD_LIBRARY_PATH -} - -pathCanonical() { - dst="${1}" - while [ -h "${dst}" ] ; do - ls=`ls -ld "${dst}"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - dst="$link" - else - dst="`dirname "${dst}"`/$link" - fi - done - bas=`basename "${dst}"` - dir=`dirname "${dst}"` - if [ "$bas" != "$dir" ]; then - dst="`pathCanonical "$dir"`/$bas" - fi - echo "${dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g' -} - -locateJava() { - # Setup the Java Virtual Machine - if $cygwin ; then - [ -n "$JAVA" ] && JAVA=`cygpath --unix "$JAVA"` - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - fi - - if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then - JAVA_HOME="$(/usr/libexec/java_home -v 1.7)" - fi - if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi - if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - if [ ! -d "$JAVA_HOME" ]; then - die "JAVA_HOME is not valid: $JAVA_HOME" - fi - JAVA="$JAVA_HOME/bin/java" - else - warn "JAVA_HOME not set; results may vary" - JAVA=`type java` - JAVA=`expr "$JAVA" : '.* \(/.*\)$'` - if [ "x$JAVA" = "x" ]; then - die "java command not found" - fi - fi - fi - if [ "x$JAVA_HOME" = "x" ]; then - JAVA_HOME="$(dirname $(dirname $(pathCanonical "$JAVA")))" - fi -} - -detectJVM() { - #echo "`$JAVA -version`" - # This service should call `java -version`, - # read stdout, and look for hints - if $JAVA -version 2>&1 | grep "^IBM" ; then - JVM_VENDOR="IBM" - # on OS/400, java -version does not contain IBM explicitly - elif $os400; then - JVM_VENDOR="IBM" - else - JVM_VENDOR="SUN" - fi - # echo "JVM vendor is $JVM_VENDOR" -} - -setupDebugOptions() { - if [ "x$JAVA_OPTS" = "x" ]; then - JAVA_OPTS="$DEFAULT_JAVA_OPTS" - fi - export JAVA_OPTS - - if [ "x$EXTRA_JAVA_OPTS" != "x" ]; then - JAVA_OPTS="$JAVA_OPTS $EXTRA_JAVA_OPTS" - fi - - # Set Debug options if enabled - if [ "x$KARAF_DEBUG" != "x" ]; then - # Use the defaults if JAVA_DEBUG_OPTS was not set - if [ "x$JAVA_DEBUG_OPTS" = "x" ]; then - JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS" - fi - - JAVA_OPTS="$JAVA_DEBUG_OPTS $JAVA_OPTS" - warn "Enabling Java debug options: $JAVA_DEBUG_OPTS" - fi -} - -setupDefaults() { - DEFAULT_JAVA_OPTS="-Xms$JAVA_MIN_MEM -Xmx$JAVA_MAX_MEM " - - #Set the JVM_VENDOR specific JVM flags - if [ "$JVM_VENDOR" = "SUN" ]; then - # permgen was removed in Java 8 - VERSION=`$JAVA -version 2>&1 | egrep '"([0-9].[0-9]\..*[0-9]).*"' | awk '{print substr($3,2,length($3)-2)}' | awk '{print substr($1, 3, 3)}' | sed -e 's;\.;;g'` - if [ "$VERSION" -lt "80" ]; then - # Check some easily accessible MIN/MAX params for JVM mem usage - if [ "x$JAVA_PERM_MEM" != "x" ]; then - DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:PermSize=$JAVA_PERM_MEM" - fi - if [ "x$JAVA_MAX_PERM_MEM" != "x" ]; then - DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:MaxPermSize=$JAVA_MAX_PERM_MEM" - fi - fi - DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS -Dcom.sun.management.jmxremote" - elif [ "$JVM_VENDOR" = "IBM" ]; then - if $os400; then - DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS" - elif $aix; then - DEFAULT_JAVA_OPTS="-Xverify:none -Xdump:heap -Xlp $DEFAULT_JAVA_OPTS" - else - DEFAULT_JAVA_OPTS="-Xverify:none $DEFAULT_JAVA_OPTS" - fi - fi - - # Add default security file option - if [ "x$ODL_JAVA_SECURITY_PROPERTIES" != "x" ]; then - DEFAULT_JAVA_OPTS="-Djava.security.properties="${ODL_JAVA_SECURITY_PROPERTIES}" $DEFAULT_JAVA_OPTS" - else - DEFAULT_JAVA_OPTS="-Djava.security.properties="${KARAF_ETC}/odl.java.security" $DEFAULT_JAVA_OPTS" - fi - - # Add the jars in the lib dir - for file in "$KARAF_HOME"/lib/*.jar - do - if [ -z "$CLASSPATH" ]; then - CLASSPATH="$file" - else - CLASSPATH="$CLASSPATH:$file" - fi - done - - DEFAULT_JAVA_DEBUG_PORT="5005" - if [ "x$JAVA_DEBUG_PORT" = "x" ]; then - JAVA_DEBUG_PORT="$DEFAULT_JAVA_DEBUG_PORT" - fi - DEFAULT_JAVA_DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$JAVA_DEBUG_PORT" - - ## - ## TODO: Move to conf/profiler/yourkit.{sh|cmd} - ## - # Uncomment to enable YourKit profiling - #DEFAULT_JAVA_DEBUG_OPTS="-Xrunyjpagent" -} - -init() { - # Determine if there is special OS handling we must perform - detectOS - - # Unlimit the number of file descriptors if possible - unlimitFD - - # Locate the Karaf home directory - locateHome - - # Locate the Karaf base directory - locateBase - - # Locate the Karaf data directory - locateData - - # Locate the Karaf etc directory - locateEtc - - # Setup the native library path - setupNativePath - - # Locate the Java VM to execute - locateJava - - # Determine the JVM vendor - detectJVM - - # Setup default options - setupDefaults - - # Install debug options - setupDebugOptions - -} - -run() { - - CLASSPATH="${KARAF_HOME}/system/org/apache/karaf/instance/org.apache.karaf.instance.command/${karaf.version}/org.apache.karaf.instance.command-${karaf.version}.jar:${KARAF_HOME}/system/org/apache/karaf/instance/org.apache.karaf.instance.core/${karaf.version}/org.apache.karaf.instance.core-${karaf.version}.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${karaf.version}/org.apache.karaf.shell.console-${karaf.version}.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.table/${karaf.version}/org.apache.karaf.shell.table-${karaf.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}/org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}/org.apache.aries.blueprint.core-${aries.blueprint.core.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}/org.apache.aries.blueprint.cm-${aries.blueprint.cm.version}.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar:${KARAF_HOME}/system/jline/jline/${jline.version}/jline-${jline.version}.jar:$CLASSPATH" - - if $cygwin; then - KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"` - KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"` - KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"` - KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"` - if [ ! -z "$CLASSPATH" ]; then - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - fi - fi - - exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.etc="$KARAF_ETC" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.instance.main.Execute "$@" -} - -main() { - init - run "$@" -} - -main "$@" diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance.bat b/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance.bat deleted file mode 100644 index 0f62455622..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance.bat +++ /dev/null @@ -1,160 +0,0 @@ -@echo off -rem -rem -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. -rem - -if not "%ECHO%" == "" echo %ECHO% - -setlocal -set DIRNAME=%~dp0% -set PROGNAME=%~nx0% -set ARGS=%* - -rem Sourcing environment settings for karaf similar to tomcats setenv -SET KARAF_SCRIPT="instance.bat" -if exist "%DIRNAME%setenv.bat" ( - call "%DIRNAME%setenv.bat" -) - -rem Check console window title. Set to Karaf by default -if not "%KARAF_TITLE%" == "" ( - title %KARAF_TITLE% -) else ( - title Karaf -) - -rem Check/Set up some easily accessible MIN/MAX params for JVM mem usage -if "%JAVA_MIN_MEM%" == "" ( - set JAVA_MIN_MEM=128M -) -if "%JAVA_MAX_MEM%" == "" ( - set JAVA_MAX_MEM=512M -) - -goto BEGIN - -:warn - echo %PROGNAME%: %* -goto :EOF - -:BEGIN - -rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # - -if not "%KARAF_HOME%" == "" ( - call :warn Ignoring predefined value for KARAF_HOME -) -set KARAF_HOME=%DIRNAME%.. -if not exist "%KARAF_HOME%" ( - call :warn KARAF_HOME is not valid: "%KARAF_HOME%" - goto END -) - -if not "%KARAF_BASE%" == "" ( - if not exist "%KARAF_BASE%" ( - call :warn KARAF_BASE is not valid: "%KARAF_BASE%" - goto END - ) -) -if "%KARAF_BASE%" == "" ( - set "KARAF_BASE=%KARAF_HOME%" -) - -if not "%KARAF_DATA%" == "" ( - if not exist "%KARAF_DATA%" ( - call :warn KARAF_DATA is not valid: "%KARAF_DATA%" - goto END - ) -) -if "%KARAF_DATA%" == "" ( - set "KARAF_DATA=%KARAF_BASE%\data" -) - -if not "%KARAF_ETC%" == "" ( - if not exist "%KARAF_ETC%" ( - call :warn KARAF_ETC is not valid: "%KARAF_ETC%" - goto END - ) -) -if "%KARAF_ETC%" == "" ( - set "KARAF_ETC=%KARAF_BASE%\etc" -) - -set DEFAULT_JAVA_OPTS= -if not "%ODL_JAVA_SECURITY_PROPERTIES%" == "" ( - set DEFAULT_JAVA_OPTS=-Djava.security.properties="%ODL_JAVA_SECURITY_PROPERTIES%" %DEFAULT_JAVA_OPTS% -) else ( - set DEFAULT_JAVA_OPTS=-Djava.security.properties="%KARAF_ETC%\odl.java.security" %DEFAULT_JAVA_OPTS% -) - -set DEFAULT_JAVA_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 - -rem Support for loading native libraries -set PATH=%PATH%;%KARAF_BASE%\lib;%KARAF_HOME%\lib - -rem Setup the Java Virtual Machine -if not "%JAVA%" == "" goto :Check_JAVA_END - set JAVA=java - if "%JAVA_HOME%" == "" call :warn JAVA_HOME not set; results may vary - if not "%JAVA_HOME%" == "" set JAVA=%JAVA_HOME%\bin\java - if not exist "%JAVA_HOME%" ( - call :warn JAVA_HOME is not valid: "%JAVA_HOME%" - goto END - ) -:Check_JAVA_END - -if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS% - -if "%EXTRA_JAVA_OPTS%" == "" goto :KARAF_EXTRA_JAVA_OPTS_END - set JAVA_OPTS="%JAVA_OPTS% %EXTRA_JAVA_OPTS%" -:KARAF_EXTRA_JAVA_OPTS_END - -if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END - rem Use the defaults if JAVA_DEBUG_OPTS was not set - if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS% - - set JAVA_OPTS="%JAVA_DEBUG_OPTS% %JAVA_OPTS%" - call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS% -:KARAF_DEBUG_END - -rem Setup the classpath -pushd "%KARAF_HOME%\lib" -for %%G in (karaf*.jar) do call:APPEND_TO_CLASSPATH %%G -popd -goto CLASSPATH_END - -: APPEND_TO_CLASSPATH -set filename=%~1 -set suffix=%filename:~-4% -if %suffix% equ .jar set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\lib\%filename% -goto :EOF - -:CLASSPATH_END - -set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\instance\org.apache.karaf.instance.command\${karaf.version}\org.apache.karaf.instance.command-${karaf.version}.jar;%KARAF_HOME%\system\org\apache\karaf\instance\org.apache.karaf.instance.core\${karaf.version}\org.apache.karaf.instance.core-${karaf.version}.jar;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.console\${karaf.version}\org.apache.karaf.shell.console-${karaf.version}.jar;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.table\${karaf.version}\org.apache.karaf.shell.table-${karaf.version}.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.api\${aries.blueprint.api.version}\org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.core\${aries.blueprint.core.version}\org.apache.aries.blueprint.core-${aries.blueprint.core.version}.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint.cm\${aries.blueprint.cm.version}\org.apache.aries.blueprint.cm-${aries.blueprint.cm.version}.jar;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\${pax.logging.version}\pax-logging-api-${pax.logging.version}.jar;%KARAF_HOME%\system\org\apache\felix\org.apache.felix.framework\${felix.framework.version}\org.apache.felix.framework-${felix.framework.version}.jar;%KARAF_HOME%\system\jline\jline\${jline.version}\jline-${jline.version}.jar;%CLASSPATH% - -:EXECUTE - if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8 - if not "%SHIFT%" == "true" SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8 - rem Execute the Java Virtual Machine - "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Dkaraf.etc="%KARAF_ETC%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% org.apache.karaf.instance.main.Execute %ARGS% - -rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # - -:END - -endlocal diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf deleted file mode 100755 index 99eddab1eb..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf +++ /dev/null @@ -1,429 +0,0 @@ -#!/bin/bash -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -REALNAME=`readlink -e "$0"` -if [ $? != 0 ]; then - REALNAME=$0 -fi -DIRNAME=`dirname "$REALNAME"` -PROGNAME=`basename "$REALNAME"` - -# -# Sourcing environment settings for karaf similar to tomcats setenv -# -KARAF_SCRIPT="karaf" -export KARAF_SCRIPT -if [ -f "$DIRNAME/setenv" ]; then - . "$DIRNAME/setenv" -fi - -# -# Set up some easily accessible MIN/MAX params for JVM mem usage -# -if [ "x$JAVA_MIN_MEM" = "x" ]; then - JAVA_MIN_MEM=128M - export JAVA_MIN_MEM -fi -if [ "x$JAVA_MAX_MEM" = "x" ]; then - JAVA_MAX_MEM=512M - export JAVA_MAX_MEM -fi - -# -# Check the mode that initiated the script -# -if [ "x$1" != "x" ]; then - MODE=$1 -fi - -warn() { - echo "${PROGNAME}: $*" -} - -die() { - warn "$*" - exit 1 -} - -detectOS() { - # OS specific support (must be 'true' or 'false'). - cygwin=false; - darwin=false; - aix=false; - os400=false; - case "`uname`" in - CYGWIN*) - cygwin=true - ;; - Darwin*) - darwin=true - ;; - AIX*) - aix=true - ;; - OS400*) - os400=true - ;; - esac - # For AIX, set an environment variable - if $aix; then - export LDR_CNTRL=MAXDATA=0xB0000000@DSA - echo $LDR_CNTRL - fi -} - -unlimitFD() { - # Use the maximum available, or set MAX_FD != -1 to use that - if [ "x$MAX_FD" = "x" ]; then - MAX_FD="maximum" - fi - - # Increase the maximum file descriptors if we can - if [ "$os400" = "false" ] && [ "$cygwin" = "false" ]; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ "$MAX_FD_LIMIT" != 'unlimited' ]; then - if [ $? -eq 0 ]; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then - # use the system max - MAX_FD="$MAX_FD_LIMIT" - fi - - ulimit -n $MAX_FD > /dev/null - # echo "ulimit -n" `ulimit -n` - if [ $? -ne 0 ]; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" - fi - fi - fi -} - -locateHome() { - if [ "x$KARAF_HOME" != "x" ]; then - warn "Ignoring predefined value for KARAF_HOME" - fi - - # In POSIX shells, CDPATH may cause cd to write to stdout - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - KARAF_HOME=`cd "$DIRNAME/.."; pwd` - if [ ! -d "$KARAF_HOME" ]; then - die "KARAF_HOME is not valid: $KARAF_HOME" - fi -} - -locateBase() { - if [ "x$KARAF_BASE" != "x" ]; then - if [ ! -d "$KARAF_BASE" ]; then - die "KARAF_BASE is not valid: $KARAF_BASE" - fi - else - KARAF_BASE=$KARAF_HOME - fi -} - -locateData() { - if [ "x$KARAF_DATA" != "x" ]; then - if [ ! -d "$KARAF_DATA" ]; then - die "KARAF_DATA is not valid: $KARAF_DATA" - fi - else - KARAF_DATA=$KARAF_BASE/data - fi -} - -locateEtc() { - if [ "x$KARAF_ETC" != "x" ]; then - if [ ! -d "$KARAF_ETC" ]; then - die "KARAF_ETC is not valid: $KARAF_ETC" - fi - else - KARAF_ETC=$KARAF_BASE/etc - fi -} - -setupNativePath() { - # Support for loading native libraries - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$KARAF_BASE/lib:$KARAF_HOME/lib" - - # For Cygwin, set PATH from LD_LIBRARY_PATH - if $cygwin; then - LD_LIBRARY_PATH=`cygpath --path --windows "$LD_LIBRARY_PATH"` - PATH="$PATH;$LD_LIBRARY_PATH" - export PATH - fi - export LD_LIBRARY_PATH -} - -pathCanonical() { - dst="${1}" - while [ -h "${dst}" ] ; do - ls=`ls -ld "${dst}"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - dst="$link" - else - dst="`dirname "${dst}"`/$link" - fi - done - bas=`basename "${dst}"` - dir=`dirname "${dst}"` - if [ "$bas" != "$dir" ]; then - dst="`pathCanonical "$dir"`/$bas" - fi - echo "${dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g' -} - -locateJava() { - # Setup the Java Virtual Machine - if $cygwin ; then - [ -n "$JAVA" ] && JAVA=`cygpath --unix "$JAVA"` - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - fi - - if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then - JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" - fi - if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi - if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - if [ ! -d "$JAVA_HOME" ]; then - die "JAVA_HOME is not valid: $JAVA_HOME" - fi - JAVA="$JAVA_HOME/bin/java" - else - warn "JAVA_HOME not set; results may vary" - JAVA=`type java` - JAVA=`expr "$JAVA" : '.* \(/.*\)$'` - if [ "x$JAVA" = "x" ]; then - die "java command not found" - fi - fi - fi - if [ "x$JAVA_HOME" = "x" ]; then - JAVA_HOME="$(dirname $(dirname $(pathCanonical "$JAVA")))" - fi -} - -detectJVM() { - #echo "`$JAVA -version`" - # This service should call `java -version`, - # read stdout, and look for hints - if $JAVA -version 2>&1 | grep "^IBM" ; then - JVM_VENDOR="IBM" - # on OS/400, java -version does not contain IBM explicitly - elif $os400; then - JVM_VENDOR="IBM" - else - JVM_VENDOR="SUN" - fi - # echo "JVM vendor is $JVM_VENDOR" -} - -checkJvmVersion() { - # echo "`$JAVA -version`" - VERSION=`"$JAVA" -version 2>&1 | egrep '"([0-9].[0-9]\..*[0-9]).*"' | awk '{print substr($3,2,length($3)-2)}' | awk '{print substr($1, 3, 3)}' | sed -e 's;\.;;g'` - # echo $VERSION - if [ "$VERSION" -lt "80" ]; then - echo "JVM must be 1.8.0 or greater" - exit 1; - fi -} - -setupDebugOptions() { - if [ "x$JAVA_OPTS" = "x" ]; then - JAVA_OPTS="$DEFAULT_JAVA_OPTS" - fi - export JAVA_OPTS - - if [ "x$EXTRA_JAVA_OPTS" != "x" ]; then - JAVA_OPTS="$JAVA_OPTS $EXTRA_JAVA_OPTS" - fi - - # Set Debug options if enabled - if [ "x$KARAF_DEBUG" != "x" ]; then - # Ignore DEBUG in case of stop or client mode - if [ "x$MODE" = "xstop" ]; then - return - fi - if [ "x$MODE" = "xclient" ]; then - return - fi - # Use the defaults if JAVA_DEBUG_OPTS was not set - if [ "x$JAVA_DEBUG_OPTS" = "x" ]; then - JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS" - fi - - JAVA_OPTS="$JAVA_DEBUG_OPTS $JAVA_OPTS" - warn "Enabling Java debug options: $JAVA_DEBUG_OPTS" - fi -} - -setupDefaults() { - DEFAULT_JAVA_OPTS="-Xms$JAVA_MIN_MEM -Xmx$JAVA_MAX_MEM -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+HeapDumpOnOutOfMemoryError" - - #Set the JVM_VENDOR specific JVM flags - if [ "$JVM_VENDOR" = "SUN" ]; then - DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS -Dcom.sun.management.jmxremote" - elif [ "$JVM_VENDOR" = "IBM" ]; then - if $os400; then - DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS" - elif $aix; then - DEFAULT_JAVA_OPTS="-Xverify:none -Xdump:heap -Xlp $DEFAULT_JAVA_OPTS" - else - DEFAULT_JAVA_OPTS="-Xverify:none $DEFAULT_JAVA_OPTS" - fi - fi - - # Add default security file option - if [ "x$ODL_JAVA_SECURITY_PROPERTIES" != "x" ]; then - DEFAULT_JAVA_OPTS="-Djava.security.properties="${ODL_JAVA_SECURITY_PROPERTIES}" $DEFAULT_JAVA_OPTS" - else - DEFAULT_JAVA_OPTS="-Djava.security.properties="${KARAF_ETC}/odl.java.security" $DEFAULT_JAVA_OPTS" - fi - - # Add the jars in the lib dir - for file in "$KARAF_HOME"/lib/karaf*.jar - do - if [ -z "$CLASSPATH" ]; then - CLASSPATH="$file" - else - CLASSPATH="$CLASSPATH:$file" - fi - done - - DEFAULT_JAVA_DEBUG_PORT="5005" - if [ "x$JAVA_DEBUG_PORT" = "x" ]; then - JAVA_DEBUG_PORT="$DEFAULT_JAVA_DEBUG_PORT" - fi - DEFAULT_JAVA_DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$JAVA_DEBUG_PORT" - - ## - ## TODO: Move to conf/profiler/yourkit.{sh|cmd} - ## - # Uncomment to enable YourKit profiling - #DEFAULT_JAVA_DEBUG_OPTS="-Xrunyjpagent" -} - -init() { - # Determine if there is special OS handling we must perform - detectOS - - # Unlimit the number of file descriptors if possible - unlimitFD - - # Locate the Karaf home directory - locateHome - - # Locate the Karaf base directory - locateBase - - # Locate the Karaf data directory - locateData - - # Locate the Karaf etc directory - locateEtc - - # Setup the native library path - setupNativePath - - # Locate the Java VM to execute - locateJava - - # Determine the JVM vendor - detectJVM - - # Determine the JVM version >= 1.8 - checkJvmVersion - - # Setup default options - setupDefaults - - # Install debug options - setupDebugOptions - -} - -run() { - OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true" - MAIN=org.apache.karaf.main.Main - while [ "$1" != "" ]; do - case $1 in - 'clean') - rm -Rf "$KARAF_DATA" - shift - ;; - 'debug') - if [ "x$JAVA_DEBUG_OPTS" = "x" ]; then - JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS" - fi - JAVA_OPTS="$JAVA_DEBUG_OPTS $JAVA_OPTS" - shift - ;; - 'status') - MAIN=org.apache.karaf.main.Status - shift - ;; - 'stop') - MAIN=org.apache.karaf.main.Stop - shift - ;; - 'console') - shift - ;; - 'server') - OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true" - shift - ;; - 'client') - OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=false" - shift - ;; - *) - break - ;; - esac - done - - JAVA_ENDORSED_DIRS="${JAVA_HOME}/jre/lib/endorsed:${JAVA_HOME}/lib/endorsed:${KARAF_HOME}/lib/endorsed" - JAVA_EXT_DIRS="${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext:${KARAF_HOME}/lib/ext" - if $cygwin; then - KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"` - KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"` - KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"` - KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"` - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` - JAVA_EXT_DIRS=`cygpath --path --windows "$JAVA_EXT_DIRS"` - fi - cd "$KARAF_BASE" - - exec "$JAVA" $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" -Djava.ext.dirs="${JAVA_EXT_DIRS}" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Dkaraf.etc="$KARAF_ETC" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" $MAIN "$@" -} - -main() { - init - run "$@" -} - -main "$@" diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat deleted file mode 100644 index 6627eb4889..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat +++ /dev/null @@ -1,339 +0,0 @@ -@echo off -rem -rem -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. -rem - -if not "%ECHO%" == "" echo %ECHO% - -setlocal -set DIRNAME=%~dp0% -set PROGNAME=%~nx0% -set ARGS=%* - -rem Sourcing environment settings for karaf similar to tomcats setenv -SET KARAF_SCRIPT="karaf.bat" -if exist "%DIRNAME%setenv.bat" ( - call "%DIRNAME%setenv.bat" -) - -rem Check console window title. Set to Karaf by default -if not "%KARAF_TITLE%" == "" ( - title %KARAF_TITLE% -) else ( - title Karaf -) - -rem Check/Set up some easily accessible MIN/MAX params for JVM mem usage -if "%JAVA_MIN_MEM%" == "" ( - set JAVA_MIN_MEM=128M -) -if "%JAVA_MAX_MEM%" == "" ( - set JAVA_MAX_MEM=512M -) - -goto BEGIN - -:warn - echo %PROGNAME%: %* -goto :EOF - -:BEGIN - -rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # - -if not "%KARAF_HOME%" == "" ( - call :warn Ignoring predefined value for KARAF_HOME -) -set KARAF_HOME=%DIRNAME%.. -if not exist "%KARAF_HOME%" ( - call :warn KARAF_HOME is not valid: "%KARAF_HOME%" - goto END -) - -if not "%KARAF_BASE%" == "" ( - if not exist "%KARAF_BASE%" ( - call :warn KARAF_BASE is not valid: "%KARAF_BASE%" - goto END - ) -) -if "%KARAF_BASE%" == "" ( - set "KARAF_BASE=%KARAF_HOME%" -) - -if not "%KARAF_DATA%" == "" ( - if not exist "%KARAF_DATA%" ( - call :warn KARAF_DATA is not valid: "%KARAF_DATA%" - goto END - ) -) -if "%KARAF_DATA%" == "" ( - set "KARAF_DATA=%KARAF_BASE%\data" -) - -if not "%KARAF_ETC%" == "" ( - if not exist "%KARAF_ETC%" ( - call :warn KARAF_ETC is not valid: "%KARAF_ETC%" - goto END - ) -) -if "%KARAF_ETC%" == "" ( - set "KARAF_ETC=%KARAF_BASE%\etc" -) - -set LOCAL_CLASSPATH=%CLASSPATH% -set JAVA_MODE=-server - -set CLASSPATH=%LOCAL_CLASSPATH%;%KARAF_BASE%\conf -set DEFAULT_JAVA_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 - -if "%LOCAL_CLASSPATH%" == "" goto :KARAF_CLASSPATH_EMPTY - set CLASSPATH=%LOCAL_CLASSPATH%;%KARAF_BASE%\conf - goto :KARAF_CLASSPATH_END -:KARAF_CLASSPATH_EMPTY - set CLASSPATH=%KARAF_BASE%\conf -:KARAF_CLASSPATH_END - -rem Setup Karaf Home -if exist "%KARAF_HOME%\conf\karaf-rc.cmd" call %KARAF_HOME%\conf\karaf-rc.cmd -if exist "%HOME%\karaf-rc.cmd" call %HOME%\karaf-rc.cmd - -rem Support for loading native libraries -set PATH=%PATH%;%KARAF_BASE%\lib;%KARAF_HOME%\lib - -rem Setup the Java Virtual Machine -if not "%JAVA%" == "" goto :Check_JAVA_END - if not "%JAVA_HOME%" == "" goto :TryJDKEnd - call :warn JAVA_HOME not set; results may vary -:TryJRE - start /w regedit /e __reg1.txt "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment" - if not exist __reg1.txt goto :TryJDK - type __reg1.txt | find "CurrentVersion" > __reg2.txt - if errorlevel 1 goto :TryJDK - for /f "tokens=2 delims==" %%x in (__reg2.txt) do set JavaTemp=%%~x - if errorlevel 1 goto :TryJDK - set JavaTemp=%JavaTemp%## - set JavaTemp=%JavaTemp: ##=##% - set JavaTemp=%JavaTemp: ##=##% - set JavaTemp=%JavaTemp: ##=##% - set JavaTemp=%JavaTemp: ##=##% - set JavaTemp=%JavaTemp: ##=##% - set JavaTemp=%JavaTemp:##=% - del __reg1.txt - del __reg2.txt - start /w regedit /e __reg1.txt "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment\%JavaTemp%" - if not exist __reg1.txt goto :TryJDK - type __reg1.txt | find "JavaHome" > __reg2.txt - if errorlevel 1 goto :TryJDK - for /f "tokens=2 delims==" %%x in (__reg2.txt) do set JAVA_HOME=%%~x - if errorlevel 1 goto :TryJDK - del __reg1.txt - del __reg2.txt - goto TryJDKEnd -:TryJDK - start /w regedit /e __reg1.txt "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit" - if not exist __reg1.txt ( - goto TryRegJRE - ) - type __reg1.txt | find "CurrentVersion" > __reg2.txt - if errorlevel 1 ( - goto TryRegJRE - ) - for /f "tokens=2 delims==" %%x in (__reg2.txt) do set JavaTemp=%%~x - if errorlevel 1 ( - goto TryRegJRE - ) - set JavaTemp=%JavaTemp%## - set JavaTemp=%JavaTemp: ##=##% - set JavaTemp=%JavaTemp: ##=##% - set JavaTemp=%JavaTemp: ##=##% - set JavaTemp=%JavaTemp: ##=##% - set JavaTemp=%JavaTemp: ##=##% - set JavaTemp=%JavaTemp:##=% - del __reg1.txt - del __reg2.txt - start /w regedit /e __reg1.txt "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit\%JavaTemp%" - if not exist __reg1.txt ( - goto TryRegJRE - ) - type __reg1.txt | find "JavaHome" > __reg2.txt - if errorlevel 1 ( - goto TryRegJRE - ) - for /f "tokens=2 delims==" %%x in (__reg2.txt) do set JAVA_HOME=%%~x - if errorlevel 1 ( - goto TryRegJRE - ) - del __reg1.txt - del __reg2.txt -:TryRegJRE - rem try getting the JAVA_HOME from registry - FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKLM\Software\JavaSoft\Java Runtime Environment" /v CurrentVersion`) DO ( - set JAVA_VERSION=%%A - ) - FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKLM\Software\JavaSoft\Java Runtime Environment\%JAVA_VERSION%" /v JavaHome`) DO ( - set JAVA_HOME=%%A %%B - ) - if not exist "%JAVA_HOME%" ( - goto TryRegJDK - ) - goto TryJDKEnd -:TryRegJDK - rem try getting the JAVA_HOME from registry - FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKLM\Software\JavaSoft\Java Development Kit" /v CurrentVersion`) DO ( - set JAVA_VERSION=%%A - ) - FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKLM\Software\JavaSoft\Java Development Kit\%JAVA_VERSION%" /v JavaHome`) DO ( - set JAVA_HOME=%%A %%B - ) - if not exist "%JAVA_HOME%" ( - call :warn Unable to retrieve JAVA_HOME from Registry - ) - goto TryJDKEnd -:TryJDKEnd - if not exist "%JAVA_HOME%" ( - call :warn JAVA_HOME is not valid: "%JAVA_HOME%" - goto END - ) - set JAVA=%JAVA_HOME%\bin\java -:Check_JAVA_END - -if not exist "%JAVA_HOME%\bin\server\jvm.dll" ( - if not exist "%JAVA_HOME%\jre\bin\server\jvm.dll" ( - echo WARNING: Running Karaf on a Java HotSpot Client VM because server-mode is not available. - echo Install Java Developer Kit to fix this. - echo For more details see http://java.sun.com/products/hotspot/whitepaper.html#client - set JAVA_MODE=-client - ) -) - -set DEFAULT_JAVA_OPTS=%JAVA_MODE% -Xms%JAVA_MIN_MEM% -Xmx%JAVA_MAX_MEM% -Dderby.system.home="%KARAF_DATA%\derby" -Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass - -if not "%ODL_JAVA_SECURITY_PROPERTIES%" == "" ( - set DEFAULT_JAVA_OPTS=-Djava.security.properties="%ODL_JAVA_SECURITY_PROPERTIES%" %DEFAULT_JAVA_OPTS% -) else ( - set DEFAULT_JAVA_OPTS=-Djava.security.properties="%KARAF_ETC%\odl.java.security" %DEFAULT_JAVA_OPTS% -) - -if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS% - -if "%EXTRA_JAVA_OPTS%" == "" goto :KARAF_EXTRA_JAVA_OPTS_END - set JAVA_OPTS=%JAVA_OPTS% %EXTRA_JAVA_OPTS% -:KARAF_EXTRA_JAVA_OPTS_END - -if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END - if "%1" == "stop" goto :KARAF_DEBUG_END - if "%1" == "client" goto :KARAF_DEBUG_END - rem Use the defaults if JAVA_DEBUG_OPTS was not set - if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS% - - set JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS% - call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS% -:KARAF_DEBUG_END - -if "%KARAF_PROFILER%" == "" goto :KARAF_PROFILER_END - set KARAF_PROFILER_SCRIPT=%KARAF_HOME%\conf\profiler\%KARAF_PROFILER%.cmd - - if exist "%KARAF_PROFILER_SCRIPT%" goto :KARAF_PROFILER_END - call :warn Missing configuration for profiler '%KARAF_PROFILER%': %KARAF_PROFILER_SCRIPT% - goto END -:KARAF_PROFILER_END - -rem Setup the classpath -pushd "%KARAF_HOME%\lib" -for %%G in (karaf*.jar) do call:APPEND_TO_CLASSPATH %%G -popd -goto CLASSPATH_END - -: APPEND_TO_CLASSPATH -set filename=%~1 -set suffix=%filename:~-4% -if %suffix% equ .jar set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\lib\%filename% -goto :EOF - -:CLASSPATH_END - -rem Execute the JVM or the load the profiler -if "%KARAF_PROFILER%" == "" goto :RUN - rem Execute the profiler if it has been configured - call :warn Loading profiler script: %KARAF_PROFILER_SCRIPT% - call %KARAF_PROFILER_SCRIPT% - -:RUN - SET OPTS=-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true - SET MAIN=org.apache.karaf.main.Main - SET SHIFT=false - -:RUN_LOOP - if "%1" == "stop" goto :EXECUTE_STOP - if "%1" == "status" goto :EXECUTE_STATUS - if "%1" == "console" goto :EXECUTE_CONSOLE - if "%1" == "server" goto :EXECUTE_SERVER - if "%1" == "client" goto :EXECUTE_CLIENT - if "%1" == "clean" goto :EXECUTE_CLEAN - if "%1" == "debug" goto :EXECUTE_DEBUG - goto :EXECUTE - -:EXECUTE_STOP - SET MAIN=org.apache.karaf.main.Stop - shift - goto :RUN_LOOP - -:EXECUTE_STATUS - SET MAIN=org.apache.karaf.main.Status - shift - goto :RUN_LOOP - -:EXECUTE_CONSOLE - shift - goto :RUN_LOOP - -:EXECUTE_SERVER - SET OPTS=-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true - shift - goto :RUN_LOOP - -:EXECUTE_CLIENT - SET OPTS=-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=false - shift - goto :RUN_LOOP - -:EXECUTE_CLEAN - rmdir /S /Q "%KARAF_DATA%" - shift - goto :RUN_LOOP - -:EXECUTE_DEBUG - if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS% - set JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS% - shift - goto :RUN_LOOP - -:EXECUTE - SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8 - rem Execute the Java Virtual Machine - cd "%KARAF_BASE%" - "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Djava.endorsed.dirs="%JAVA_HOME%\jre\lib\endorsed;%JAVA_HOME%\lib\endorsed;%KARAF_HOME%\lib\endorsed" -Djava.ext.dirs="%JAVA_HOME%\jre\lib\ext;%JAVA_HOME%\lib\ext;%KARAF_HOME%\lib\ext" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Dkaraf.etc="%KARAF_ETC%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Dkaraf.data="%KARAF_DATA%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% %MAIN% %ARGS% - -rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # - -:END - -endlocal - -if not "%PAUSE%" == "" pause - -:END_NO_PAUSE diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv b/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv deleted file mode 100644 index d81e6fdb91..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# -# handle specific scripts; the SCRIPT_NAME is exactly the name of the Karaf -# script: client, instance, shell, start, status, stop, karaf -# -# if [ "$KARAF_SCRIPT" == "SCRIPT_NAME" ]; then -# Actions go here... -# fi - -# -# general settings which should be applied for all scripts go here; please keep -# in mind that it is possible that scripts might be executed more than once, e.g. -# in example of the start script where the start script is executed first and the -# karaf script afterwards. -# - -# -# The following section shows the possible configuration options for the default -# karaf scripts -# -# export JAVA_HOME # Location of Java installation -# export JAVA_MIN_MEM # Minimum memory for the JVM -# export JAVA_MAX_MEM # Maximum memory for the JVM -# export JAVA_PERM_MEM # Minimum perm memory for the JVM -# export JAVA_MAX_PERM_MEM # Maximum perm memory for the JVM -# export EXTRA_JAVA_OPTS # Additional JVM options -# export KARAF_HOME # Karaf home folder -# export KARAF_DATA # Karaf data folder -# export KARAF_BASE # Karaf base folder -# export KARAF_ETC # Karaf etc folder -# export KARAF_OPTS # Additional available Karaf options -# export KARAF_DEBUG # Enable debug mode -# export KARAF_REDIRECT # Enable/set the std/err redirection when using bin/start -if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then - export JAVA_MAX_PERM_MEM="512m" -fi -if [ "x$JAVA_MAX_MEM" = "x" ]; then - export JAVA_MAX_MEM="2048m" -fi diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat b/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat deleted file mode 100644 index 66a25a3a84..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/setenv.bat +++ /dev/null @@ -1,66 +0,0 @@ -@echo off -rem -rem -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. -rem - -rem -rem handle specific scripts; the SCRIPT_NAME is exactly the name of the Karaf -rem script; for example karaf.bat, start.bat, stop.bat, admin.bat, client.bat, ... -rem -rem if "%KARAF_SCRIPT%" == "SCRIPT_NAME" ( -rem Actions go here... -rem ) - -rem -rem general settings which should be applied for all scripts go here; please keep -rem in mind that it is possible that scripts might be executed more than once, e.g. -rem in example of the start script where the start script is executed first and the -rem karaf script afterwards. -rem - -rem -rem The following section shows the possible configuration options for the default -rem karaf scripts -rem -rem Window name of the windows console -rem SET KARAF_TITLE -rem Location of Java installation -rem SET JAVA_HOME -rem Minimum memory for the JVM -rem SET JAVA_MIN_MEM -rem Maximum memory for the JVM -rem SET JAVA_MAX_MEM -rem Minimum perm memory for the JVM -rem SET JAVA_PERM_MEM -rem Maximum perm memory for the JVM -rem SET JAVA_MAX_PERM_MEM -rem Additional JVM options -rem SET EXTRA_JAVA_OPTS -rem Karaf home folder -rem SET KARAF_HOME -rem Karaf data folder -rem SET KARAF_DATA -rem Karaf base folder -rem SET KARAF_BASE -rem Karaf etc folder -rem SET KARAF_ETC -rem Additional available Karaf options -rem SET KARAF_OPTS -rem Enable debug mode -rem SET KARAF_DEBUG -IF "%JAVA_MAX_PERM_MEM%"=="" SET JAVA_MAX_PERM_MEM=512m -IF "%JAVA_MAX_MEM%"=="" SET JAVA_MAX_MEM=2048m diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/configuration/context.xml b/karaf/opendaylight-karaf-resources/src/main/resources/configuration/context.xml deleted file mode 100644 index 90b9ddf1c8..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/configuration/context.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/configuration/logback.xml b/karaf/opendaylight-karaf-resources/src/main/resources/configuration/logback.xml deleted file mode 100644 index ed659bf603..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/configuration/logback.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - %date{"yyyy-MM-dd HH:mm:ss.SSS z"} [%thread] %-5level %logger{36} %X{akkaSource} - %msg%n - - - - logs/opendaylight.log - - - logs/opendaylight.%d.log.zip - 1 - - - - 10MB - - - - %date{"yyyy-MM-dd HH:mm:ss.SSS z"} [%thread] %-5level %logger{35} - %msg%n - - - - logs/audit.log - true - - %date{"yyyy-MM-dd HH:mm:ss.SSS z"} %msg %n - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-logging.properties b/karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-logging.properties deleted file mode 100644 index 3dbd9921b3..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-logging.properties +++ /dev/null @@ -1,42 +0,0 @@ -############################################################ -# Configuration file for tomcat logging -############################################################ -# Handlers: -# "handlers" specifies a comma separated list of log Handler -# classes. These handlers will be installed during VM startup. -# Note that these classes must be on the system classpath. -# Following line configures a ConsoleHandler and a FileHandler - -handlers= java.util.logging.FileHandler,java.util.logging.ConsoleHandler - -############################################################ -# Handler specific properties -# Describes specific configuration info for Handlers -# JUL does not support rolling file handler based on date -# For now we will keep count of files to 5 with rolling size of 10MB -############################################################ - -java.util.logging.FileHandler.pattern = logs/tomcat%g.log -java.util.logging.FileHandler.limit = 104857600 -java.util.logging.FileHandler.count = 5 -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter -java.util.logging.FileHandler.append = true -java.util.logging.FileHandler.level = INFO - -# Limit the message that are printed on the console to SEVERE and above. -java.util.logging.ConsoleHandler.level = WARNING -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - -# SimpleFormatter output format to print one-line log message like this: -# --
:: [] > -# -java.util.logging.SimpleFormatter.format=%1$tF %1$tT %1$tZ [%3$s] %4$s %2$s %5$s%6$s%n - -############################################################ -# Facility specific properties. -# Provides extra control for each logger. -############################################################ - -# For example, set the com.xyz.foo logger to only log SEVERE -# messages -#org.apache.catalina = SEVERE diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-server.xml b/karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-server.xml deleted file mode 100644 index 5092a5eee1..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-server.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties b/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties deleted file mode 100644 index 3eddcf38b3..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties +++ /dev/null @@ -1,105 +0,0 @@ -# Extra packages to import from the boot class loader -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 -# a URL of type bundleresource: but to be presented as file: -osgi.hook.configurators.include=org.eclipse.virgo.kernel.equinox.extensions.hooks.ExtensionsHookConfigurator - -# Embedded Tomcat configuration File -org.eclipse.gemini.web.tomcat.config.path=configuration/tomcat-server.xml -org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true - -# Use Equinox as default OSGi Framework Implementation -karaf.framework=equinox - -# Show a progress bar on startup and start the console when all bundles are up and running. -# (If you are in a hurry you can still type enter to start the shell faster.) -karaf.delay.console=true - -# Set security provider to BouncyCastle -org.apache.karaf.security.providers = org.bouncycastle.jce.provider.BouncyCastleProvider - -# We set this to false to disable the Aries BlueprintExtender from doing its orderly container -# shutdown so we can do it after the CSS has shut down all its modules. Otherwise Aries will -# shutdown blueprint containers when the karaf framework starts shutdown (ie when bundle 0 is -# stopped) which can cause failures on CSS module shutdown due to the core blueprint containers -# and services already being shut down. This setting can be removed when/if CSS is removed -# completely from ODL. -org.apache.aries.blueprint.preemptiveShutdown=false - -netconf.config.persister.active=1 - -netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.xml.XmlFileStorageAdapter -netconf.config.persister.1.properties.fileStorage=etc/opendaylight/current/controller.currentconfig.xml -netconf.config.persister.1.properties.numberOfBackups=1 - -# logback configuration -logback.configurationFile=configuration/logback.xml - -# Container configuration -container.profile = Container - -# Connection manager configuration -connection.scheme = ANY_CONTROLLER_ONE_MASTER - -# OVSDB configuration -# ovsdb plugin supports both active and passive connections. It listens on port 6640 by default for Active connections. -ovsdb.listenPort=6640 - -# ovsdb creates Openflow nodes/bridges. This configuration configures the bridge's Openflow version. -# default Openflow version = 1.0, we also support 1.3. -# ovsdb.of.version=1.3 - -# ovsdb can be configured with ml2 to perform l3 forwarding. The config below enables that functionality, which is -# disabled by default. -# ovsdb.l3.fwd.enabled=yes - -# ovsdb can be configured with ml2 to perform arp responder, enabled by default. -ovsdb.l3.arp.responder.disabled=no - -# ovsdb can be configured with ml2 to perform l3 forwarding. When used in that scenario, the mac address of the default -# gateway --on the external subnet-- is expected to be resolved from its inet address. The config below overrides that -# specific arp/neighDiscovery lookup. -# ovsdb.l3gateway.mac=00:00:5E:00:02:01 - -# TLS configuration -# To enable TLS, set secureChannelEnabled=true and specify the location of controller Java KeyStore and TrustStore files. -# The Java KeyStore contains controller's private key and certificate. The Java TrustStore contains the trusted certificate -# entries, including switches' Certification Authority (CA) certificates. For example, -# secureChannelEnabled=true -# controllerKeyStore=./configuration/ctlKeyStore -# controllerKeyStorePassword=xxxxxxxx (this password should match the password used for KeyStore generation and at least 6 characters) -# controllerTrustStore=./configuration/ctlTrustStore -# controllerTrustStorePassword=xxxxxxxx (this password should match the password used for TrustStore generation and at least 6 characters) - -secureChannelEnabled=false -controllerKeyStore= -controllerKeyStorePassword= -controllerTrustStore= -controllerTrustStorePassword= - -# User Manager configurations -enableStrongPasswordCheck = false - -#Jolokia configurations -#org.jolokia.listenForHttpService=false - -# Logging configuration for Tomcat-JUL logging -java.util.logging.config.file=configuration/tomcat-logging.properties - -#Hosttracker hostsdb key scheme setting -hosttracker.keyscheme=IP - -# LISP Flow Mapping configuration -# Map-Register messages overwrite existing RLOC sets in EID-to-RLOC mappings (default: true) -lisp.mappingOverwrite = true -# Enable the Solicit-Map-Request (SMR) mechanism (default: true) -lisp.smr = true -# Choose policy for Explicit Locator Path (ELP) handling -# There are three options: -# default: don't add or remove locator records, return mapping as-is -# both: keep the ELP, but add the next hop as a standalone non-LCAF locator with a lower priority -# replace: remove the ELP, add the next hop as a standalone non-LCAF locator -lisp.elpPolicy = default - diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/etc/jetty.xml b/karaf/opendaylight-karaf-resources/src/main/resources/etc/jetty.xml deleted file mode 100644 index 064e8a898b..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/etc/jetty.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - 300000 - 2 - false - 8543 - 20000 - 5000 - - - - - - - - - - - - - 300000 - 2 - false - 8443 - 20000 - 5000 - - - - - - - - - - - - - - - karaf - karaf - - - org.apache.karaf.jaas.boot.principal.RolePrincipal - - - - - - - - - - default - karaf - - - org.apache.karaf.jaas.boot.principal.RolePrincipal - - - - - - - - diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/etc/jre.properties b/karaf/opendaylight-karaf-resources/src/main/resources/etc/jre.properties deleted file mode 100644 index f6e78ce822..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/etc/jre.properties +++ /dev/null @@ -1,548 +0,0 @@ -################################################################################ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -################################################################################ - -# -# Java platform package export properties. -# - -# Standard package set. Note that: -# - javax.transaction* is exported with a mandatory attribute -jre-1.6= \ - javax.accessibility, \ - javax.activation;version="1.1", \ - javax.activity, \ - javax.annotation;version="1.0", \ - javax.annotation.processing;version="1.6", \ - javax.crypto, \ - javax.crypto.interfaces, \ - javax.crypto.spec, \ - javax.imageio, \ - javax.imageio.event, \ - javax.imageio.metadata, \ - javax.imageio.plugins.bmp, \ - javax.imageio.plugins.jpeg, \ - javax.imageio.spi, \ - javax.imageio.stream, \ - javax.jws, \ - javax.jws.soap, \ - javax.lang.model, \ - javax.lang.model.element, \ - javax.lang.model.type, \ - javax.lang.model.util, \ - javax.management, \ - javax.management.loading, \ - javax.management.modelmbean, \ - javax.management.monitor, \ - javax.management.openmbean, \ - javax.management.relation, \ - javax.management.remote, \ - javax.management.remote.rmi, \ - javax.management.timer, \ - javax.naming, \ - javax.naming.directory, \ - javax.naming.event, \ - javax.naming.ldap, \ - javax.naming.spi, \ - javax.net, \ - javax.net.ssl, \ - javax.print, \ - javax.print.attribute, \ - javax.print.attribute.standard, \ - javax.print.event, \ - javax.rmi, \ - javax.rmi.CORBA, \ - javax.rmi.ssl, \ - javax.script, \ - javax.security.auth, \ - javax.security.auth.callback, \ - javax.security.auth.kerberos, \ - javax.security.auth.login, \ - javax.security.auth.spi, \ - javax.security.auth.x500, \ - javax.security.cert, \ - javax.security.sasl, \ - javax.sound.midi, \ - javax.sound.midi.spi, \ - javax.sound.sampled, \ - javax.sound.sampled.spi, \ - javax.sql, \ - javax.sql.rowset, \ - javax.sql.rowset.serial, \ - javax.sql.rowset.spi, \ - javax.swing, \ - javax.swing.border, \ - javax.swing.colorchooser, \ - javax.swing.event, \ - javax.swing.filechooser, \ - javax.swing.plaf, \ - javax.swing.plaf.basic, \ - javax.swing.plaf.metal, \ - javax.swing.plaf.multi, \ - javax.swing.plaf.synth, \ - javax.swing.table, \ - javax.swing.text, \ - javax.swing.text.html, \ - javax.swing.text.html.parser, \ - javax.swing.text.rtf, \ - javax.swing.tree, \ - javax.swing.undo, \ - javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ - javax.xml, \ - javax.xml.bind;version="2.2.1", \ - javax.xml.bind.annotation;version="2.2.1", \ - javax.xml.bind.annotation.adapters;version="2.2.1", \ - javax.xml.bind.attachment;version="2.2.1", \ - javax.xml.bind.helpers;version="2.2.1", \ - javax.xml.bind.util;version="2.2.1", \ - javax.xml.crypto, \ - javax.xml.crypto.dom, \ - javax.xml.crypto.dsig, \ - javax.xml.crypto.dsig.dom, \ - javax.xml.crypto.dsig.keyinfo, \ - javax.xml.crypto.dsig.spec, \ - javax.xml.datatype, \ - javax.xml.namespace, \ - javax.xml.parsers, \ - javax.xml.soap;version="1.3", \ - javax.xml.stream;version="1.2", \ - javax.xml.stream.events;version="1.2", \ - javax.xml.stream.util;version="1.2", \ - javax.xml.transform, \ - javax.xml.transform.dom, \ - javax.xml.transform.sax, \ - javax.xml.transform.stax, \ - javax.xml.transform.stream, \ - javax.xml.validation, \ - javax.xml.ws;version="2.2", \ - javax.xml.ws.handler;version="2.2", \ - javax.xml.ws.handler.soap;version="2.2", \ - javax.xml.ws.http;version="2.2", \ - javax.xml.ws.soap;version="2.2", \ - javax.xml.ws.spi;version="2.2", \ - javax.xml.ws.wsaddressing;version="2.2", \ - javax.xml.ws.spi.http;version="2.2", \ - javax.xml.xpath, \ - org.ietf.jgss, \ - org.omg.CORBA, \ - org.omg.CORBA_2_3, \ - org.omg.CORBA_2_3.portable, \ - org.omg.CORBA.DynAnyPackage, \ - org.omg.CORBA.ORBPackage, \ - org.omg.CORBA.portable, \ - org.omg.CORBA.TypeCodePackage, \ - org.omg.CosNaming, \ - org.omg.CosNaming.NamingContextExtPackage, \ - org.omg.CosNaming.NamingContextPackage, \ - org.omg.Dynamic, \ - org.omg.DynamicAny, \ - org.omg.DynamicAny.DynAnyFactoryPackage, \ - org.omg.DynamicAny.DynAnyPackage, \ - org.omg.IOP, \ - org.omg.IOP.CodecFactoryPackage, \ - org.omg.IOP.CodecPackage, \ - org.omg.Messaging, \ - org.omg.PortableInterceptor, \ - org.omg.PortableInterceptor.ORBInitInfoPackage, \ - org.omg.PortableServer, \ - org.omg.PortableServer.CurrentPackage, \ - org.omg.PortableServer.POAManagerPackage, \ - org.omg.PortableServer.POAPackage, \ - org.omg.PortableServer.portable, \ - org.omg.PortableServer.ServantLocatorPackage, \ - org.omg.SendingContext, \ - org.omg.stub.java.rmi, \ - org.omg.stub.javax.management.remote.rmi, \ - org.w3c.dom, \ - org.w3c.dom.bootstrap, \ - org.w3c.dom.css, \ - org.w3c.dom.events, \ - org.w3c.dom.html, \ - org.w3c.dom.ls, \ - org.w3c.dom.ranges, \ - org.w3c.dom.stylesheets, \ - org.w3c.dom.traversal, \ - org.w3c.dom.views, \ - org.w3c.dom.xpath, \ - org.xml.sax, \ - org.xml.sax.ext, \ - org.xml.sax.helpers, \ - sun.misc, \ - sun.reflect - -# Standard package set. Note that: -# - javax.transaction* is exported with a mandatory attribute -jre-1.7= \ - javax.accessibility, \ - javax.activation;version="1.1", \ - javax.activity, \ - javax.annotation;version="1.0", \ - javax.annotation.processing;version="1.6", \ - javax.crypto, \ - javax.crypto.interfaces, \ - javax.crypto.spec, \ - javax.imageio, \ - javax.imageio.event, \ - javax.imageio.metadata, \ - javax.imageio.plugins.bmp, \ - javax.imageio.plugins.jpeg, \ - javax.imageio.spi, \ - javax.imageio.stream, \ - javax.jws, \ - javax.jws.soap, \ - javax.lang.model, \ - javax.lang.model.element, \ - javax.lang.model.type, \ - javax.lang.model.util, \ - javax.management, \ - javax.management.loading, \ - javax.management.modelmbean, \ - javax.management.monitor, \ - javax.management.openmbean, \ - javax.management.relation, \ - javax.management.remote, \ - javax.management.remote.rmi, \ - javax.management.timer, \ - javax.naming, \ - javax.naming.directory, \ - javax.naming.event, \ - javax.naming.ldap, \ - javax.naming.spi, \ - javax.net, \ - javax.net.ssl, \ - javax.print, \ - javax.print.attribute, \ - javax.print.attribute.standard, \ - javax.print.event, \ - javax.rmi, \ - javax.rmi.CORBA, \ - javax.rmi.ssl, \ - javax.script, \ - javax.security.auth, \ - javax.security.auth.callback, \ - javax.security.auth.kerberos, \ - javax.security.auth.login, \ - javax.security.auth.spi, \ - javax.security.auth.x500, \ - javax.security.cert, \ - javax.security.sasl, \ - javax.sound.midi, \ - javax.sound.midi.spi, \ - javax.sound.sampled, \ - javax.sound.sampled.spi, \ - javax.sql, \ - javax.sql.rowset, \ - javax.sql.rowset.serial, \ - javax.sql.rowset.spi, \ - javax.swing, \ - javax.swing.border, \ - javax.swing.colorchooser, \ - javax.swing.event, \ - javax.swing.filechooser, \ - javax.swing.plaf, \ - javax.swing.plaf.basic, \ - javax.swing.plaf.metal, \ - javax.swing.plaf.multi, \ - javax.swing.plaf.synth, \ - javax.swing.table, \ - javax.swing.text, \ - javax.swing.text.html, \ - javax.swing.text.html.parser, \ - javax.swing.text.rtf, \ - javax.swing.tree, \ - javax.swing.undo, \ - javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ - javax.xml, \ - javax.xml.bind;version="2.2.1", \ - javax.xml.bind.annotation;version="2.2.1", \ - javax.xml.bind.annotation.adapters;version="2.2.1", \ - javax.xml.bind.attachment;version="2.2.1", \ - javax.xml.bind.helpers;version="2.2.1", \ - javax.xml.bind.util;version="2.2.1", \ - javax.xml.crypto, \ - javax.xml.crypto.dom, \ - javax.xml.crypto.dsig, \ - javax.xml.crypto.dsig.dom, \ - javax.xml.crypto.dsig.keyinfo, \ - javax.xml.crypto.dsig.spec, \ - javax.xml.datatype, \ - javax.xml.namespace, \ - javax.xml.parsers, \ - javax.xml.soap;version="1.3", \ - javax.xml.stream;version="1.2", \ - javax.xml.stream.events;version="1.2", \ - javax.xml.stream.util;version="1.2", \ - javax.xml.transform, \ - javax.xml.transform.dom, \ - javax.xml.transform.sax, \ - javax.xml.transform.stax, \ - javax.xml.transform.stream, \ - javax.xml.validation, \ - javax.xml.ws;version="2.2", \ - javax.xml.ws.handler;version="2.2", \ - javax.xml.ws.handler.soap;version="2.2", \ - javax.xml.ws.http;version="2.2", \ - javax.xml.ws.soap;version="2.2", \ - javax.xml.ws.spi;version="2.2", \ - javax.xml.ws.wsaddressing;version="2.2", \ - javax.xml.ws.spi.http;version="2.2", \ - javax.xml.xpath, \ - org.ietf.jgss, \ - org.omg.CORBA, \ - org.omg.CORBA_2_3, \ - org.omg.CORBA_2_3.portable, \ - org.omg.CORBA.DynAnyPackage, \ - org.omg.CORBA.ORBPackage, \ - org.omg.CORBA.portable, \ - org.omg.CORBA.TypeCodePackage, \ - org.omg.CosNaming, \ - org.omg.CosNaming.NamingContextExtPackage, \ - org.omg.CosNaming.NamingContextPackage, \ - org.omg.Dynamic, \ - org.omg.DynamicAny, \ - org.omg.DynamicAny.DynAnyFactoryPackage, \ - org.omg.DynamicAny.DynAnyPackage, \ - org.omg.IOP, \ - org.omg.IOP.CodecFactoryPackage, \ - org.omg.IOP.CodecPackage, \ - org.omg.Messaging, \ - org.omg.PortableInterceptor, \ - org.omg.PortableInterceptor.ORBInitInfoPackage, \ - org.omg.PortableServer, \ - org.omg.PortableServer.CurrentPackage, \ - org.omg.PortableServer.POAManagerPackage, \ - org.omg.PortableServer.POAPackage, \ - org.omg.PortableServer.portable, \ - org.omg.PortableServer.ServantLocatorPackage, \ - org.omg.SendingContext, \ - org.omg.stub.java.rmi, \ - org.omg.stub.javax.management.remote.rmi, \ - org.w3c.dom, \ - org.w3c.dom.bootstrap, \ - org.w3c.dom.css, \ - org.w3c.dom.events, \ - org.w3c.dom.html, \ - org.w3c.dom.ls, \ - org.w3c.dom.ranges, \ - org.w3c.dom.stylesheets, \ - org.w3c.dom.traversal, \ - org.w3c.dom.views, \ - org.w3c.dom.xpath, \ - org.xml.sax, \ - org.xml.sax.ext, \ - org.xml.sax.helpers, \ - sun.misc, \ - sun.reflect - -jre-1.8= \ - javax.accessibility, \ - javax.activation;version="1.1", \ - javax.activity, \ - javax.annotation;version="1.0", \ - javax.annotation.processing;version="1.6", \ - javax.crypto, \ - javax.crypto.interfaces, \ - javax.crypto.spec, \ - javax.imageio, \ - javax.imageio.event, \ - javax.imageio.metadata, \ - javax.imageio.plugins.bmp, \ - javax.imageio.plugins.jpeg, \ - javax.imageio.spi, \ - javax.imageio.stream, \ - javax.jws, \ - javax.jws.soap, \ - javax.lang.model, \ - javax.lang.model.element, \ - javax.lang.model.type, \ - javax.lang.model.util, \ - javax.management, \ - javax.management.loading, \ - javax.management.modelmbean, \ - javax.management.monitor, \ - javax.management.openmbean, \ - javax.management.relation, \ - javax.management.remote, \ - javax.management.remote.rmi, \ - javax.management.timer, \ - javax.naming, \ - javax.naming.directory, \ - javax.naming.event, \ - javax.naming.ldap, \ - javax.naming.spi, \ - javax.net, \ - javax.net.ssl, \ - javax.print, \ - javax.print.attribute, \ - javax.print.attribute.standard, \ - javax.print.event, \ - javax.rmi, \ - javax.rmi.CORBA, \ - javax.rmi.ssl, \ - javax.script, \ - javax.security.auth, \ - javax.security.auth.callback, \ - javax.security.auth.kerberos, \ - javax.security.auth.login, \ - javax.security.auth.spi, \ - javax.security.auth.x500, \ - javax.security.cert, \ - javax.security.sasl, \ - javax.sound.midi, \ - javax.sound.midi.spi, \ - javax.sound.sampled, \ - javax.sound.sampled.spi, \ - javax.sql, \ - javax.sql.rowset, \ - javax.sql.rowset.serial, \ - javax.sql.rowset.spi, \ - javax.swing, \ - javax.swing.border, \ - javax.swing.colorchooser, \ - javax.swing.event, \ - javax.swing.filechooser, \ - javax.swing.plaf, \ - javax.swing.plaf.basic, \ - javax.swing.plaf.metal, \ - javax.swing.plaf.multi, \ - javax.swing.plaf.synth, \ - javax.swing.table, \ - javax.swing.text, \ - javax.swing.text.html, \ - javax.swing.text.html.parser, \ - javax.swing.text.rtf, \ - javax.swing.tree, \ - javax.swing.undo, \ - javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ - javax.xml, \ - javax.xml.bind;version="2.2.1", \ - javax.xml.bind.annotation;version="2.2.1", \ - javax.xml.bind.annotation.adapters;version="2.2.1", \ - javax.xml.bind.attachment;version="2.2.1", \ - javax.xml.bind.helpers;version="2.2.1", \ - javax.xml.bind.util;version="2.2.1", \ - javax.xml.crypto, \ - javax.xml.crypto.dom, \ - javax.xml.crypto.dsig, \ - javax.xml.crypto.dsig.dom, \ - javax.xml.crypto.dsig.keyinfo, \ - javax.xml.crypto.dsig.spec, \ - javax.xml.datatype, \ - javax.xml.namespace, \ - javax.xml.parsers, \ - javax.xml.soap;version="1.3", \ - javax.xml.stream;version="1.2", \ - javax.xml.stream.events;version="1.2", \ - javax.xml.stream.util;version="1.2", \ - javax.xml.transform, \ - javax.xml.transform.dom, \ - javax.xml.transform.sax, \ - javax.xml.transform.stax, \ - javax.xml.transform.stream, \ - javax.xml.validation, \ - javax.xml.ws;version="2.2", \ - javax.xml.ws.handler;version="2.2", \ - javax.xml.ws.handler.soap;version="2.2", \ - javax.xml.ws.http;version="2.2", \ - javax.xml.ws.soap;version="2.2", \ - javax.xml.ws.spi;version="2.2", \ - javax.xml.ws.wsaddressing;version="2.2", \ - javax.xml.ws.spi.http;version="2.2", \ - javax.xml.xpath, \ - javafx.animation, \ - javafx.application, \ - javafx.beans, \ - javafx.beans.binding, \ - javafx.beans.property, \ - javafx.beans.property.adapter, \ - javafx.beans.value, \ - javafx.collections, \ - javafx.concurrent, \ - javafx.css, \ - javafx.embed.swing, \ - javafx.embed.swt, \ - javafx.event, \ - javafx.fxml, \ - javafx.geometry, \ - javafx.scene, \ - javafx.scene.canvas, \ - javafx.scene.chart, \ - javafx.scene.control, \ - javafx.scene.control.cell, \ - javafx.scene.effect, \ - javafx.scene.image, \ - javafx.scene.input, \ - javafx.scene.layout, \ - javafx.scene.media, \ - javafx.scene.paint, \ - javafx.scene.shape, \ - javafx.scene.text, \ - javafx.scene.transform, \ - javafx.scene.web, \ - javafx.stage, \ - javafx.util, \ - javafx.util.converter, \ - org.ietf.jgss, \ - org.omg.CORBA, \ - org.omg.CORBA_2_3, \ - org.omg.CORBA_2_3.portable, \ - org.omg.CORBA.DynAnyPackage, \ - org.omg.CORBA.ORBPackage, \ - org.omg.CORBA.portable, \ - org.omg.CORBA.TypeCodePackage, \ - org.omg.CosNaming, \ - org.omg.CosNaming.NamingContextExtPackage, \ - org.omg.CosNaming.NamingContextPackage, \ - org.omg.Dynamic, \ - org.omg.DynamicAny, \ - org.omg.DynamicAny.DynAnyFactoryPackage, \ - org.omg.DynamicAny.DynAnyPackage, \ - org.omg.IOP, \ - org.omg.IOP.CodecFactoryPackage, \ - org.omg.IOP.CodecPackage, \ - org.omg.Messaging, \ - org.omg.PortableInterceptor, \ - org.omg.PortableInterceptor.ORBInitInfoPackage, \ - org.omg.PortableServer, \ - org.omg.PortableServer.CurrentPackage, \ - org.omg.PortableServer.POAManagerPackage, \ - org.omg.PortableServer.POAPackage, \ - org.omg.PortableServer.portable, \ - org.omg.PortableServer.ServantLocatorPackage, \ - org.omg.SendingContext, \ - org.omg.stub.java.rmi, \ - org.omg.stub.javax.management.remote.rmi, \ - org.w3c.dom, \ - org.w3c.dom.bootstrap, \ - org.w3c.dom.css, \ - org.w3c.dom.events, \ - org.w3c.dom.html, \ - org.w3c.dom.ls, \ - org.w3c.dom.ranges, \ - org.w3c.dom.stylesheets, \ - org.w3c.dom.traversal, \ - org.w3c.dom.views, \ - org.w3c.dom.xpath, \ - org.xml.sax, \ - org.xml.sax.ext, \ - org.xml.sax.helpers, \ - sun.misc, \ - sun.reflect diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/etc/odl.java.security b/karaf/opendaylight-karaf-resources/src/main/resources/etc/odl.java.security deleted file mode 100644 index 715c847610..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/etc/odl.java.security +++ /dev/null @@ -1,6 +0,0 @@ -# Custom java.security config file for odl. This file augmnets the defult java.security config file provided by the JRE itself -# Documentation: https://docs.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html#DisabledAlgorithms -# Additional information can also be found in the default java.security file: JAVA_HOME/jre/lib/security/java.security - -# Disable weak ciphers and ciphers vulnerable to the Logjam exploit, more information can be found here https://bugs.opendaylight.org/show_bug.cgi?id=3552 -jdk.tls.disabledAlgorithms=EXPORT, RC4, SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA, SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA, SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA, SSL_RSA_EXPORT_WITH_DES40_CBC_SHA, TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5, TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA, anon \ No newline at end of file diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/etc/org.ops4j.pax.logging.cfg b/karaf/opendaylight-karaf-resources/src/main/resources/etc/org.ops4j.pax.logging.cfg deleted file mode 100644 index 1f7de32909..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/etc/org.ops4j.pax.logging.cfg +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -################################################################################ - -# Root logger -log4j.rootLogger=INFO, async, osgi:* -log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n - -# Async appender forwarding to file appender -log4j.appender.async=org.apache.log4j.AsyncAppender -log4j.appender.async.appenders=out - -# File appender -log4j.appender.out=org.apache.log4j.RollingFileAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n -log4j.appender.out.file=${karaf.data}/log/karaf.log -log4j.appender.out.append=true -log4j.appender.out.maxFileSize=1MB -log4j.appender.out.maxBackupIndex=10 - -# Sift appender -log4j.appender.sift=org.apache.log4j.sift.MDCSiftingAppender -log4j.appender.sift.key=bundle.name -log4j.appender.sift.default=karaf -log4j.appender.sift.appender=org.apache.log4j.FileAppender -log4j.appender.sift.appender.layout=org.apache.log4j.PatternLayout -log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %m%n -log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log -log4j.appender.sift.appender.append=true - diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/version.properties b/karaf/opendaylight-karaf-resources/src/main/resources/version.properties deleted file mode 100644 index 90af49dfc2..0000000000 --- a/karaf/opendaylight-karaf-resources/src/main/resources/version.properties +++ /dev/null @@ -1,6 +0,0 @@ -org.opendaylight.controller.version = 0.1 -org.opendaylight.controller.build.scm.version = ${buildNumber} -org.opendaylight.controller.build.user = ${env.USER} -org.opendaylight.controller.build.workspace = ********** -org.opendaylight.controller.build.timestamp = ${timestamp} -org.opendaylight.controller.build.machine = ********** diff --git a/karaf/pom.xml b/karaf/pom.xml index c932a43512..fde465924e 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -20,10 +20,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 1.3.0-SNAPSHOT pom - karaf-branding karaf-parent opendaylight-karaf opendaylight-karaf-empty - opendaylight-karaf-resources diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 16eb5cbb9e..38d9ac2ce1 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -90,7 +90,7 @@ target/generated-sources/config-binding 0.3.0-SNAPSHOT - 1.3.0-SNAPSHOT + 1.7.0-SNAPSHOT ${karaf.version} 1.0.0 0.7.0-SNAPSHOT @@ -442,7 +442,7 @@ - org.opendaylight.controller + org.opendaylight.odlparent karaf.branding ${karaf.branding.version} -- 2.36.6