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/itests/src/test/java/org/apache/felix/karaf/gshell/itests/AbstractIntegrationTest.java b/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/AbstractIntegrationTest.java
index 5f7ca48..74e731a 100644
--- a/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/AbstractIntegrationTest.java
+++ b/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/AbstractIntegrationTest.java
@@ -114,10 +114,10 @@
// this is how you set the default log level when using pax logging (logProfile)
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
- systemProperty("servicemix.name").value("root"),
- systemProperty("servicemix.base").value("target/smx.base"),
- systemProperty("servicemix.startLocalConsole").value("false"),
- systemProperty("servicemix.startRemoteShell").value("false"),
+ systemProperty("karaf.name").value("root"),
+ systemProperty("karaf.base").value("target/smx.base"),
+ systemProperty("karaf.startLocalConsole").value("false"),
+ systemProperty("karaf.startRemoteShell").value("false"),
// hack system packages
systemPackages("org.apache.felix.karaf.main.spi;version=1.0.0", "org.apache.felix.karaf.jaas.boot"),
diff --git a/karaf/itests/src/test/resources/log4j.properties b/karaf/itests/src/test/resources/log4j.properties
index 8cc85f8..0ca7b6a 100644
--- a/karaf/itests/src/test/resources/log4j.properties
+++ b/karaf/itests/src/test/resources/log4j.properties
@@ -29,5 +29,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