Unfork the appropriate karaf bin files 46/45546/13
authorRyan Goulding <ryandgoulding@gmail.com>
Tue, 4 Oct 2016 04:22:29 +0000 (00:22 -0400)
committerStephen Kitt <skitt@redhat.com>
Tue, 25 Oct 2016 15:19:31 +0000 (15:19 +0000)
commit56371772f41e397a7db0f008a42c43378cbff76a
tree4787fd8cae57f72d016f20999386a4f1ae653984
parent6ddc042822f0c6257b127e49a5312c3bf4543f22
Unfork the appropriate karaf bin files

In Boron based OpenDaylight, karaf 3.0.7 was used.  Karaf 3.0.7 was susceptible
tot he following bugs:

KARAF-4564 - Can't start karaf using symbolic link
KARAF-4566 - "karaf" script invokes /bin/sh but requres /bin/bash functions

In order to avoid an entire container upgrade, the bin scripts were forked with
appropriate fixes to temporarily alleviate the aformentioned issues.

Karaf 3.0.8 fixed the aformenentioned issues.  This change removes the appropriate
forked scripts, as they should now be fixed in upstream karaf.

The following scripts were determined to be unnecessary forks:
* client, shell, start, status and stop

The following scripts were determined to be necessary forks:
* instance* (they load odl.java.security)
* karaf (enforces Java 8, enables heap-dumps on OOMs, loads odl.java.security)
* karaf.bat (includes a workaround for Equinox on Windows 10 and loads odl.java.security)
These five files will remain forked for the forseeable future.
* setenv* (set up java max memory to appropriate value for ODL)

Change-Id: I769b30b1661a1fb8daec4de8b7cf170d1edcba7c
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
karaf/opendaylight-karaf-resources/src/main/resources/bin/client [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/bin/shell [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/bin/start [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/bin/status [deleted file]
karaf/opendaylight-karaf-resources/src/main/resources/bin/stop [deleted file]