diff options
author | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-12-12 10:35:10 -0500 |
---|---|---|
committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-12-12 10:35:10 -0500 |
commit | 4ec03269604e3bd897207552127f94b4d1f30850 (patch) | |
tree | 0adb7564f221e3cda64811df850c48dbeed5e05e /opendaylight/neon/neon-karaf/src | |
parent | aeff1a04d07b6b2dea436189036a9bde1719d456 (diff) |
Update to use ONAP specific ODL distro
Updated CCSDK dockers to use ONAP-specific OpenDaylight Neon SR1
distribution.
Change-Id: I602ace48c00b78ac6e2b5e80a9403330790e3487
Issue-ID: CCSDK-1753
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'opendaylight/neon/neon-karaf/src')
-rw-r--r-- | opendaylight/neon/neon-karaf/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg | 96 | ||||
-rw-r--r-- | opendaylight/neon/neon-karaf/src/main/assembly/etc/shell.init.script | 66 |
2 files changed, 0 insertions, 162 deletions
diff --git a/opendaylight/neon/neon-karaf/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg b/opendaylight/neon/neon-karaf/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg deleted file mode 100644 index cdd58378..00000000 --- a/opendaylight/neon/neon-karaf/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg +++ /dev/null @@ -1,96 +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 - -# -# 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=\ - file:${karaf.home}/${karaf.default.repository}@id=system.repository@snapshots,\ - file:${karaf.data}/kar@id=kar.repository@multi@snapshots,\ - file:${karaf.base}/${karaf.default.repository}@id=child.system.repository@snapshots - -# 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: -# http://repo1.maven.org/maven2@id=central -# http://repository.springsource.com/maven/bundles/release@id=spring.ebr -# http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external -# http://zodiac.springsource.com/maven/bundles/release@id=gemini -# http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases -# https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases -# https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases -# 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 snapshots -# @noreleases : the repository does not contain any released artifacts -# @id=repository.id : the id for the repository, just like in the settings.xml this is optional but recommended -# -org.ops4j.pax.url.mvn.repositories= - -### ^^^ No remote repositories. This is the only ODL change compared to Karaf defaults.
\ No newline at end of file diff --git a/opendaylight/neon/neon-karaf/src/main/assembly/etc/shell.init.script b/opendaylight/neon/neon-karaf/src/main/assembly/etc/shell.init.script deleted file mode 100644 index ccc9d2a7..00000000 --- a/opendaylight/neon/neon-karaf/src/main/assembly/etc/shell.init.script +++ /dev/null @@ -1,66 +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. -// -// This script is run each time a shell is created. -// You can define here closures or variables that will be available -// in each session. -// -ld = { log:display $args } ; -lde = { log:exception-display $args } ; -la = { bundle:list -t 0 $args } ; -ls = { service:list $args } ; -cl = { config:list "(service.pid=$args)" } ; -halt = { system:shutdown -h -f $args } ; -help = { *:help $args | more } ; -man = { help $args } ; -log:list = { log:get ALL } ; -service:get = { $.context getService ($.context getServiceReference $args) }; - -env = { shell:set $args } -edit = { shell:nano $args } -more = { shell:less -F $args } - -// \#prompt = { "[1m${USER}[0m@${APPLICATION}(${SUBSHELL})> "?}; - -__load_class = { - (($.reader class) classLoader) loadClass $1 -} - -// make sure that we catch exceptions -// as they do occur if the session is headless / non-interactive -jlineReader = $.reader -if { %(jlineReader != null) } { - - # On 256 colors terminal, add a right prompt - max_colors = ($.jline.terminal getNumericCapability max_colors) - if { %(max_colors >= 256) } { - __rprompt_formatter = (((__load_class java.text.SimpleDateFormat) getConstructor (__load_class java.lang.String)) newInstance \'$'\u001B\[90m'\'HH:mm:ss) - __date_class = (__load_class java.util.Date) -// Do not use right prompt by default -// \#rprompt = { $__rprompt_formatter format ($__date_class newInstance) } - } - - setopt group - setopt auto-fresh-line - unsetopt insert-tab - keymap "^[OA" up-line-or-search - keymap "^[[A" up-line-or-search - keymap "^[OB" down-line-or-search - keymap "^[[B" down-line-or-search - -} |