FELIX-1118 - Update shell scripts
- Updated shell scripts, env vars, and other misc items from servicemix to karaf.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@771188 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/src/main/distribution/text/etc/org.apache.servicemix.shell.cfg b/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
similarity index 94%
rename from karaf/assembly/src/main/distribution/text/etc/org.apache.servicemix.shell.cfg
rename to karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
index 98bbd57..0a2eafe 100644
--- a/karaf/assembly/src/main/distribution/text/etc/org.apache.servicemix.shell.cfg
+++ b/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
@@ -19,5 +19,5 @@
#
sshPort=8101
-sshRealm=servicemix
-hostKey=${servicemix.base}/etc/host.key
+sshRealm=karaf
+hostKey=${karaf.base}/etc/host.key
diff --git a/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg b/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
index 24ddea5..eca5c0e 100644
--- a/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
+++ b/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
@@ -32,5 +32,5 @@
log4j.appender.out=org.apache.log4j.FileAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
-log4j.appender.out.file=${servicemix.base}/data/log/servicemix.log
+log4j.appender.out.file=${karaf.base}/data/log/karaf.log
log4j.appender.out.append=true
diff --git a/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg b/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
index 6e50c3e..5615941 100644
--- a/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
+++ b/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
@@ -55,7 +55,7 @@
#
# The following property value will add the system folder as a repo.
#
-org.ops4j.pax.url.mvn.defaultRepositories=file:${servicemix.home}/system@snapshots
+org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/system@snapshots
#
# Comma separated list of repositories scanned when resolving an artifact.
diff --git a/karaf/assembly/src/main/distribution/text/etc/system.properties b/karaf/assembly/src/main/distribution/text/etc/system.properties
index d82ce7c..42f026f 100644
--- a/karaf/assembly/src/main/distribution/text/etc/system.properties
+++ b/karaf/assembly/src/main/distribution/text/etc/system.properties
@@ -18,5 +18,5 @@
################################################################################
org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
-servicemix.name=root
+karaf.name=root
xml.catalog.files=