FELIX-1116: remove some remaining references to servicemix
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@771229 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/gshell/gshell-admin/pom.xml b/karaf/gshell/gshell-admin/pom.xml
index fd50615..36faa9d 100644
--- a/karaf/gshell/gshell-admin/pom.xml
+++ b/karaf/gshell/gshell-admin/pom.xml
@@ -43,11 +43,11 @@
org.apache.geronimo.gshell*,
</gshell.osgi.import>
<gshell.osgi.export>
- org.apache.servicemix.jpm
+ org.apache.felix.karaf.jpm
</gshell.osgi.export>
<gshell.osgi.private>
org.apache.felix.karaf.gshell.admin.*,
- org.apache.servicemix.jpm.impl
+ org.apache.feix.karaf.jpm.impl
</gshell.osgi.private>
</properties>
diff --git a/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/org.apache.servicemix.features.cfg b/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/org.apache.felix.karaf.features.cfg
similarity index 100%
rename from karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/org.apache.servicemix.features.cfg
rename to karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/org.apache.felix.karaf.features.cfg
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java
index 002c6c9..48d03b4 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java
@@ -79,7 +79,7 @@
}
instances = newInstances;
} catch (Exception e) {
- LOGGER.warn("Unable to reload ServiceMix instance list", e);
+ LOGGER.warn("Unable to reload Karaf instance list", e);
}
}
@@ -117,7 +117,7 @@
mkdir(serviceMixBase, "data");
copyResourceToDir(serviceMixBase, "etc/config.properties", true);
- copyResourceToDir(serviceMixBase, "etc/org.apache.servicemix.features.cfg", true);
+ copyResourceToDir(serviceMixBase, "etc/org.apache.felix.karaf.features.cfg", true);
copyResourceToDir(serviceMixBase, "etc/users.properties", true);
copyResourceToDir(serviceMixBase, "etc/org.ops4j.pax.logging.cfg", true);
copyResourceToDir(serviceMixBase, "etc/org.ops4j.pax.url.mvn.cfg", true);
@@ -131,10 +131,10 @@
copyFilteredResourceToDir(serviceMixBase, "etc/system.properties", props);
copyFilteredResourceToDir(serviceMixBase, "etc/org.apache.felix.karaf.shell.cfg", props);
if( System.getProperty("os.name").startsWith("Win") ) {
- copyFilteredResourceToDir(serviceMixBase, "bin/servicemix.bat", props);
+ copyFilteredResourceToDir(serviceMixBase, "bin/karaf.bat", props);
} else {
- copyFilteredResourceToDir(serviceMixBase, "bin/servicemix", props);
- chmod(new File(serviceMixBase, "bin/servicemix"), "a+x");
+ copyFilteredResourceToDir(serviceMixBase, "bin/karaf", props);
+ chmod(new File(serviceMixBase, "bin/karaf"), "a+x");
}
Instance instance = new InstanceImpl(this, name, serviceMixBase.toString());
instances.put(name, instance);
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java
index f255530..2bc1309 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java
@@ -20,7 +20,7 @@
import org.apache.geronimo.gshell.clp.Option;
/**
- * Creates a new servicemix instance
+ * Creates a new Karaf instance
*
* @version $Rev: 679826 $ $Date: 2008-07-25 17:00:12 +0200 (Fri, 25 Jul 2008) $
*/
@@ -32,7 +32,7 @@
@Option(name = "-l", aliases = { "--location"}, description = "Location of the new instance on the file system")
private String location;
- @Argument(index=0, required=true, description="Name of the new ServiceMix instance")
+ @Argument(index=0, required=true, description="Name of the new Karaf instance")
private String instance = null;
protected Object doExecute() throws Exception {
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java
index 8f0235f..b41dd8c 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java
@@ -19,13 +19,13 @@
import org.apache.geronimo.gshell.clp.Argument;
/**
- * Creates a new servicemix instance
+ * Destroy an existing Karaf instance
*
* @version $Rev: 679826 $ $Date: 2008-07-25 17:00:12 +0200 (Fri, 25 Jul 2008) $
*/
public class DestroyCommand extends AdminCommandSupport
{
- @Argument(index=0, required=true, description="The name of the ServiceMix instance to destroy")
+ @Argument(index=0, required=true, description="The name of the Karaf instance to destroy")
private String instance = null;
protected Object doExecute() throws Exception {
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/org.ops4j.pax.logging.cfg b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/org.ops4j.pax.logging.cfg
index fcc4ea9..eca5c0e 100644
--- a/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/org.ops4j.pax.logging.cfg
+++ b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/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=${karaf.base}/data/log/servicemix.log
+log4j.appender.out.file=${karaf.base}/data/log/karaf.log
log4j.appender.out.append=true