Skip to content

Commit

Permalink
Rename burnet to kimchi
Browse files Browse the repository at this point in the history 
This patch was generated by running the following script on the source
tree.  This script was approved by several reviewers.  If any issues are
found, please send additional patches to resolve them.  Thanks for your
patience.  I know this will cause many headaches with patches needing to
be rebased.

Signed-off-by: Adam Litke <agl@linux.vnet.ibm.com>

git diff | grep -q 'diff'
if [ $? -eq 0 ]; then
    echo "Source tree is not clean.  Use git commit or git reset."
    exit 1
fi

echo "Renaming directories"
for i in `find ./ -type d | grep burnet`; do
    git mv -f $i `echo $i | sed 's/burnet/kimchi/'`
done

echo "Renaming files"
for i in `git ls-files |grep burnet`; do
    git  mv -f $i `echo $i | sed 's/burnet/kimchi/'`
done

echo "Replacing all occurrences of burnet"
git ls-files | xargs sed -i -e 's/burnet/kimchi/g'
git ls-files | xargs sed -i -e 's/Burnet/Kimchi/g'

echo "Changes complete"
git diff
  • Loading branch information
Adam Litke committed Jul 30, 2013
1 parent da6bc2c commit 91746b7
Show file tree
Hide file tree
Showing 105 changed files with 423 additions and 423 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ config.status
*.gmo
stamp-po
kimchi-*.tar.gz
src/burnetd
src/kimchid
po/POTFILES
*.orig
*.rej
4 changes: 2 additions & 2 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ AC_CONFIG_FILES([
Makefile
docs/Makefile
src/Makefile
src/burnet/Makefile
src/burnet/config.py
src/kimchi/Makefile
src/kimchi/config.py
ui/Makefile
ui/css/Makefile
ui/css/novnc/Makefile
Expand Down
2 changes: 1 addition & 1 deletion contrib/DEBIAN/control.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Architecture: all
Depends: python-cherrypy3, python-cheetah, libvirt-bin, python-libvirt, python-libxml2, python-imaging, qemu-kvm
Build-Depends: python-polib
Maintainer: Aline Manera <alinefm@br.ibm.com>
Description: Burnet web server
Description: Kimchi web server
2 changes: 1 addition & 1 deletion contrib/DEBIAN/postinst
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh -e
#
# Project Burnet
# Project Kimchi
#
# Copyright IBM, Corp. 2013
#
Expand Down
6 changes: 3 additions & 3 deletions contrib/DEBIAN/postrm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh -e
#
# Project Burnet
# Project Kimchi
#
# Copyright IBM, Corp. 2013
#
Expand All @@ -20,9 +20,9 @@

case "$1" in
remove)
rm -rf /var/log/burnet /var/run/burnet.pid
rm -rf /var/log/kimchi /var/run/kimchi.pid
;;
purge)
rm -rf /var/log/burnet /var/run/burnet.pid /usr/share/burnet/
rm -rf /var/log/kimchi /var/run/kimchi.pid /usr/share/kimchi/
;;
esac
60 changes: 30 additions & 30 deletions contrib/kimchi.spec.fedora.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,36 +93,36 @@ rm -rf $RPM_BUILD_ROOT

%files
%attr(-,root,root)
%{_bindir}/burnetd
%{python_sitelib}/burnet/*.py*
%{_datadir}/burnet/doc/API.md
%{_datadir}/burnet/doc/README.md
%{_datadir}/burnet/doc/kimchi-guest.png
%{_datadir}/burnet/doc/kimchi-templates.png
%{_datadir}/burnet/mo/*/LC_MESSAGES/kimchi.mo
%{_datadir}/burnet/ui/css/dev.*.css
%{_datadir}/burnet/ui/css/fonts/fontawesome-webfont.*
%{_datadir}/burnet/ui/css/fonts/novnc/Orbitron700.*
%{_datadir}/burnet/ui/css/novnc/base.css
%{_datadir}/burnet/ui/css/theme-default.min.css
%{_datadir}/burnet/ui/images/*.jpg
%{_datadir}/burnet/ui/images/*.png
%{_datadir}/burnet/ui/images/*.svg
%{_datadir}/burnet/ui/images/*.ico
%{_datadir}/burnet/ui/images/theme-default/*.png
%{_datadir}/burnet/ui/js/burnet.min.js
%{_datadir}/burnet/ui/js/dev.main.js
%{_datadir}/burnet/ui/js/jquery-ui.js
%{_datadir}/burnet/ui/js/jquery.min.js
%{_datadir}/burnet/ui/js/modernizr.custom.2.6.2.min.js
%{_datadir}/burnet/ui/js/novnc/*.js
%{_datadir}/burnet/ui/js/novnc/web-socket-js/WebSocketMain.swf
%{_datadir}/burnet/ui/js/novnc/web-socket-js/swfobject.js
%{_datadir}/burnet/ui/js/novnc/web-socket-js/web_socket.js
%{_datadir}/burnet/ui/libs/jquery-1.10.0.min.js
%{_datadir}/burnet/ui/libs/modernizr.custom.76777.js
%{_datadir}/burnet/ui/pages/*.html.tmpl
%{_sysconfdir}/burnet/burnet.conf
%{_bindir}/kimchid
%{python_sitelib}/kimchi/*.py*
%{_datadir}/kimchi/doc/API.md
%{_datadir}/kimchi/doc/README.md
%{_datadir}/kimchi/doc/kimchi-guest.png
%{_datadir}/kimchi/doc/kimchi-templates.png
%{_datadir}/kimchi/mo/*/LC_MESSAGES/kimchi.mo
%{_datadir}/kimchi/ui/css/dev.*.css
%{_datadir}/kimchi/ui/css/fonts/fontawesome-webfont.*
%{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.*
%{_datadir}/kimchi/ui/css/novnc/base.css
%{_datadir}/kimchi/ui/css/theme-default.min.css
%{_datadir}/kimchi/ui/images/*.jpg
%{_datadir}/kimchi/ui/images/*.png
%{_datadir}/kimchi/ui/images/*.svg
%{_datadir}/kimchi/ui/images/*.ico
%{_datadir}/kimchi/ui/images/theme-default/*.png
%{_datadir}/kimchi/ui/js/kimchi.min.js
%{_datadir}/kimchi/ui/js/dev.main.js
%{_datadir}/kimchi/ui/js/jquery-ui.js
%{_datadir}/kimchi/ui/js/jquery.min.js
%{_datadir}/kimchi/ui/js/modernizr.custom.2.6.2.min.js
%{_datadir}/kimchi/ui/js/novnc/*.js
%{_datadir}/kimchi/ui/js/novnc/web-socket-js/WebSocketMain.swf
%{_datadir}/kimchi/ui/js/novnc/web-socket-js/swfobject.js
%{_datadir}/kimchi/ui/js/novnc/web-socket-js/web_socket.js
%{_datadir}/kimchi/ui/libs/jquery-1.10.0.min.js
%{_datadir}/kimchi/ui/libs/modernizr.custom.76777.js
%{_datadir}/kimchi/ui/pages/*.html.tmpl
%{_sysconfdir}/kimchi/kimchi.conf
%if 0%{?with_systemd}
/lib/systemd/system/kimchid.service
%endif
Expand Down
60 changes: 30 additions & 30 deletions contrib/kimchi.spec.suse.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,36 +42,36 @@ rm -rf $RPM_BUILD_ROOT

%files
%attr(-,root,root)
%{_bindir}/burnetd
%{python_sitelib}/burnet/*.py*
%{_datadir}/burnet/doc/API.md
%{_datadir}/burnet/doc/README.md
%{_datadir}/burnet/doc/kimchi-guest.png
%{_datadir}/burnet/doc/kimchi-templates.png
%{_datadir}/burnet/mo/*/LC_MESSAGES/kimchi.mo
%{_datadir}/burnet/ui/css/dev.*.css
%{_datadir}/burnet/ui/css/fonts/fontawesome-webfont.*
%{_datadir}/burnet/ui/css/fonts/novnc/Orbitron700.*
%{_datadir}/burnet/ui/css/novnc/base.css
%{_datadir}/burnet/ui/css/theme-default.min.css
%{_datadir}/burnet/ui/images/*.jpg
%{_datadir}/burnet/ui/images/*.png
%{_datadir}/burnet/ui/images/*.svg
%{_datadir}/burnet/ui/images/*.ico
%{_datadir}/burnet/ui/images/theme-default/*.png
%{_datadir}/burnet/ui/js/burnet.min.js
%{_datadir}/burnet/ui/js/dev.main.js
%{_datadir}/burnet/ui/js/jquery-ui.js
%{_datadir}/burnet/ui/js/jquery.min.js
%{_datadir}/burnet/ui/js/modernizr.custom.2.6.2.min.js
%{_datadir}/burnet/ui/js/novnc/*.js
%{_datadir}/burnet/ui/js/novnc/web-socket-js/WebSocketMain.swf
%{_datadir}/burnet/ui/js/novnc/web-socket-js/swfobject.js
%{_datadir}/burnet/ui/js/novnc/web-socket-js/web_socket.js
%{_datadir}/burnet/ui/libs/jquery-1.10.0.min.js
%{_datadir}/burnet/ui/libs/modernizr.custom.76777.js
%{_datadir}/burnet/ui/pages/*.html.tmpl
%{_sysconfdir}/burnet/burnet.conf
%{_bindir}/kimchid
%{python_sitelib}/kimchi/*.py*
%{_datadir}/kimchi/doc/API.md
%{_datadir}/kimchi/doc/README.md
%{_datadir}/kimchi/doc/kimchi-guest.png
%{_datadir}/kimchi/doc/kimchi-templates.png
%{_datadir}/kimchi/mo/*/LC_MESSAGES/kimchi.mo
%{_datadir}/kimchi/ui/css/dev.*.css
%{_datadir}/kimchi/ui/css/fonts/fontawesome-webfont.*
%{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.*
%{_datadir}/kimchi/ui/css/novnc/base.css
%{_datadir}/kimchi/ui/css/theme-default.min.css
%{_datadir}/kimchi/ui/images/*.jpg
%{_datadir}/kimchi/ui/images/*.png
%{_datadir}/kimchi/ui/images/*.svg
%{_datadir}/kimchi/ui/images/*.ico
%{_datadir}/kimchi/ui/images/theme-default/*.png
%{_datadir}/kimchi/ui/js/kimchi.min.js
%{_datadir}/kimchi/ui/js/dev.main.js
%{_datadir}/kimchi/ui/js/jquery-ui.js
%{_datadir}/kimchi/ui/js/jquery.min.js
%{_datadir}/kimchi/ui/js/modernizr.custom.2.6.2.min.js
%{_datadir}/kimchi/ui/js/novnc/*.js
%{_datadir}/kimchi/ui/js/novnc/web-socket-js/WebSocketMain.swf
%{_datadir}/kimchi/ui/js/novnc/web-socket-js/swfobject.js
%{_datadir}/kimchi/ui/js/novnc/web-socket-js/web_socket.js
%{_datadir}/kimchi/ui/libs/jquery-1.10.0.min.js
%{_datadir}/kimchi/ui/libs/modernizr.custom.76777.js
%{_datadir}/kimchi/ui/pages/*.html.tmpl
%{_sysconfdir}/kimchi/kimchi.conf
%{_initrddir}/kimchid

%changelog
Expand Down
6 changes: 3 additions & 3 deletions contrib/kimchid-upstart.conf.debian
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# burnetd - Burnet Web Server
# kimchid - Kimchi Web Server
#
# Copyright IBM, Corp. 2013
#
Expand All @@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#

description "Burnet Web Server"
description "Kimchi Web Server"

start on started libvirt-bin
stop on stopped libvirt-bin
Expand All @@ -31,4 +31,4 @@ pre-start script
start libvirt-bin || exit 1
end script

exec /usr/bin/burnetd
exec /usr/bin/kimchid
6 changes: 3 additions & 3 deletions contrib/kimchid-upstart.conf.fedora
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# burnetd - Burnet Web Server
# kimchid - Kimchi Web Server
#
# Copyright IBM, Corp. 2013
#
Expand All @@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#

description "Burnet Web Server"
description "Kimchi Web Server"

start on stopped rc RUNLEVEL=[2345]

Expand All @@ -30,4 +30,4 @@ pre-start script
service libvirtd start || exit 1
end script

exec /usr/bin/burnetd
exec /usr/bin/kimchid
4 changes: 2 additions & 2 deletions contrib/kimchid.service.fedora
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ After=libvirtd.service

[Service]
Type=simple
ExecStart=/usr/bin/burnetd
ExecStart=/usr/bin/kimchid
ExecStop=/bin/kill -TERM $MAINPID
EnvironmentFile=/etc/burnet/burnet.conf
EnvironmentFile=/etc/kimchi/kimchi.conf

[Install]
WantedBy=multi-user.target
18 changes: 9 additions & 9 deletions contrib/kimchid.sysvinit
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
#
# burnetd Burnet Web Server
# kimchid Kimchi Web Server
#
# Copyright IBM, Corp. 2013
#
Expand All @@ -21,12 +21,12 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
### BEGIN INIT INFO
# Provides: burnetd
# Provides: kimchid
# Required-Start: libvirtd
# Required-Stop:
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Description: Start the burnetd daemon
# Description: Start the kimchid daemon
### END INIT INFO

. /etc/rc.status
Expand All @@ -45,21 +45,21 @@ rc_reset

case "$1" in
start)
echo -n "Starting burnetd daemon"
echo -n "Starting kimchid daemon"
## Start daemon with startproc(8). If this fails
## the echo return value is set appropriate.

startproc -f /usr/bin/burnetd > /dev/null 2>&1
startproc -f /usr/bin/kimchid > /dev/null 2>&1

# Remember status and be verbose
rc_status -v
;;
stop)
echo -n "Shutting down burnetd daemon"
echo -n "Shutting down kimchid daemon"
## Stop daemon with killproc(8) and if this fails
## set echo the echo return value.

killproc -TERM /usr/bin/burnetd
killproc -TERM /usr/bin/kimchid

# Remember status and be verbose
rc_status -v
Expand All @@ -82,7 +82,7 @@ case "$1" in
rc_status
;;
status)
echo -n "Checking for service burnetd "
echo -n "Checking for service kimchid "
## Check status with checkproc(8), if process is running
## checkproc will return with exit status 0.

Expand All @@ -92,7 +92,7 @@ case "$1" in
# 2 - service dead, but /var/lock/ lock file exists
# 3 - service not running

checkproc /usr/bin/burnetd
checkproc /usr/bin/kimchid

rc_status -v
;;
Expand Down
4 changes: 2 additions & 2 deletions docs/API.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Project Burnet REST API Specification
## Project Kimchi REST API Specification

The Burnet API provides all functionality to the application and may be used
The Kimchi API provides all functionality to the application and may be used
directly by external tools. In the following sections you will find the
specification of all Collections and Resource types that are supported and the
URIs where they can be accessed. In order to use the API effectively, please
Expand Down
2 changes: 1 addition & 1 deletion docs/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

docdir = $(datadir)/burnet/doc
docdir = $(datadir)/kimchi/doc

dist_doc_DATA = \
API.md \
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Build and Install
Run
---

$ sudo burnetd --host=0.0.0.0
$ sudo kimchid --host=0.0.0.0

Usage
-----
Expand Down
2 changes: 1 addition & 1 deletion po/Makefile.in.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
datarootdir = @datarootdir@
datadir = @datadir@
localedir = @datadir@/burnet/mo
localedir = @datadir@/kimchi/mo
gettextsrcdir = $(datadir)/gettext/po

INSTALL = @INSTALL@
Expand Down
2 changes: 1 addition & 1 deletion po/POTFILES.in
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# List of source files which contain translatable strings.
ui/pages/burnet-ui.html.tmpl
ui/pages/kimchi-ui.html.tmpl
ui/pages/dev-ui.html.tmpl
ui/pages/guest-add.html.tmpl
ui/pages/guest.html.tmpl
Expand Down
4 changes: 2 additions & 2 deletions po/en_US.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ msgid "SOS Report"
msgstr "SOS Report"

#: standard input:7
msgid "Project Burnet"
msgstr "Project Burnet"
msgid "Project Kimchi"
msgstr "Project Kimchi"

#: standard input:8
msgid "Language:"
Expand Down
2 changes: 1 addition & 1 deletion po/kimchi.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ msgid "SOS Report"
msgstr ""

#: standard input:7
msgid "Project Burnet"
msgid "Project Kimchi"
msgstr ""

#: standard input:8
Expand Down
6 changes: 3 additions & 3 deletions po/pt_BR.po
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# i18n portable object for burnet.
# i18n portable object for kimchi.
# Copyright (C) IBM, Corp. 2013
# ShaoHe Feng <shaohef@linux.vnet.ibm.com>, 2013-04-18.
#
Expand All @@ -18,7 +18,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: burnet 0.1\n"
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-30 09:11-0400\n"
"PO-Revision-Date: 2013-06-27 10:48+0000\n"
Expand Down Expand Up @@ -58,7 +58,7 @@ msgid "SOS Report"
msgstr ""

#: standard input:7
msgid "Project Burnet"
msgid "Project Kimchi"
msgstr ""

#: standard input:8
Expand Down

0 comments on commit 91746b7

Please sign in to comment.