FELIX-1116: Renaming packages and changing artifact/group ids in the POMs
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@770981 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/client/pom.xml b/karaf/client/pom.xml
index 13534f1..b9bc30c 100644
--- a/karaf/client/pom.xml
+++ b/karaf/client/pom.xml
@@ -22,21 +22,21 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel</groupId>
+ <groupId>org.apache.felix.karaf</groupId>
<artifactId>kernel</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.client</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.client</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: Client</name>
+ <name>Apache Felix Karaf :: Client</name>
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.core</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -61,19 +61,19 @@
<configuration>
<instructions>
<_donotcopy>(CVS|.svn|config.properties)</_donotcopy>
- <Main-Class>org.apache.servicemix.kernel.client.Main</Main-Class>
+ <Main-Class>org.apache.felix.karaf.client.Main</Main-Class>
<Class-Path>
../system/com/google/code/sshd/sshd/${sshd.version}/sshd-${sshd.version}.jar
- ../system/org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.core/${pom.version}/org.apache.servicemix.kernel.gshell.core-${pom.version}.jar
+ ../system/org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.core/${pom.version}/org.apache.felix.karaf.gshell.core-${pom.version}.jar
../system/org/apache/servicemix/bundles/org.apache.servicemix.bundles.mina/${mina.version}/org.apache.servicemix.bundles.mina-${mina.version}.jar
../system/org/apache/servicemix/bundles/org.apache.servicemix.bundles.jline/${jline.version}/org.apache.servicemix.bundles.jline-${jline.version}.jar
</Class-Path>
<Bundle-Name>Apache ServiceMix Shell Client</Bundle-Name>
- <Bundle-Description>Shell client bundle for Apache ServiceMix Kernel.</Bundle-Description>
+ <Bundle-Description>Shell client bundle for Apache Felix Karaf.</Bundle-Description>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.servicemix.kernel.client</Export-Package>
+ <Export-Package>org.apache.felix.karaf.client</Export-Package>
<Private-Package>
- org.apache.servicemix.kernel.client;-split-package:=merge-first,
+ org.apache.felix.karaf.client;-split-package:=merge-first,
org.slf4j;-split-package:=merge-first,
org.slf4j.spi;-split-package:=merge-first,
org.slf4j.helpers;-split-package:=merge-first,
diff --git a/karaf/client/src/main/java/org/apache/servicemix/kernel/client/Main.java b/karaf/client/src/main/java/org/apache/felix/karaf/client/Main.java
similarity index 96%
rename from karaf/client/src/main/java/org/apache/servicemix/kernel/client/Main.java
rename to karaf/client/src/main/java/org/apache/felix/karaf/client/Main.java
index 886acaf..910ef57 100644
--- a/karaf/client/src/main/java/org/apache/servicemix/kernel/client/Main.java
+++ b/karaf/client/src/main/java/org/apache/felix/karaf/client/Main.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.client;
+package org.apache.felix.karaf.client;
import org.apache.sshd.ClientChannel;
import org.apache.sshd.ClientSession;
@@ -46,7 +46,7 @@
} else if (args[i].equals("-p")) {
password = args[++i];
} else if (args[i].equals("--help")) {
- System.out.println("Apache ServiceMix Kernel client");
+ System.out.println("Apache Felix Karaf client");
System.out.println(" -a [port] specify the port to connect to");
System.out.println(" -h [host] specify the host to connect to");
System.out.println(" -u [user] specify the user name");