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/assembly/pom.xml b/karaf/assembly/pom.xml
index 20c26c3..baf5bec 100644
--- a/karaf/assembly/pom.xml
+++ b/karaf/assembly/pom.xml
@@ -22,89 +22,89 @@
<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>apache-servicemix-kernel</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>apache-felix-karaf</artifactId>
<packaging>pom</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: Assembly</name>
+ <name>Apache Felix Karaf :: Assembly</name>
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.main</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.main</artifactId>
</dependency>
<dependency>
- <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>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.filemonitor</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.spring</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.spring</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.blueprint</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.blueprint</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.features</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.features</artifactId>
</dependency>
<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>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.admin</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.admin</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.obr</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.obr</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.osgi</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.osgi</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.log</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.log</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.features</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.features</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.config</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.config</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.packages</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.packages</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.boot</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.config</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.config</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.modules</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.modules</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.management</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.management</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
@@ -268,20 +268,20 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.main</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.main</artifactId>
<outputDirectory>target/dependencies</outputDirectory>
<destFileName>servicemix.jar</destFileName>
</artifactItem>
<artifactItem>
- <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>
<outputDirectory>target/dependencies</outputDirectory>
<destFileName>servicemix-client.jar</destFileName>
</artifactItem>
<artifactItem>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.boot</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
<outputDirectory>target/dependencies</outputDirectory>
<destFileName>servicemix-jaas-boot.jar</destFileName>
</artifactItem>
diff --git a/karaf/assembly/src/main/descriptors/unix-bin.xml b/karaf/assembly/src/main/descriptors/unix-bin.xml
index f8490a7..5363a46 100644
--- a/karaf/assembly/src/main/descriptors/unix-bin.xml
+++ b/karaf/assembly/src/main/descriptors/unix-bin.xml
@@ -91,13 +91,6 @@
<files>
<file>
- <source>${basedir}/../etc/config.properties</source>
- <outputDirectory>/etc/</outputDirectory>
- <destName>config.properties</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- <file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
<outputDirectory>/</outputDirectory>
<destName>LICENSE.txt</destName>
@@ -113,8 +106,8 @@
</file>
<file>
<source>${basedir}/target/classes/features.xml</source>
- <outputDirectory>/system/org/apache/servicemix/kernel/apache-servicemix-kernel/${version}</outputDirectory>
- <destName>apache-servicemix-kernel-${version}-features.xml</destName>
+ <outputDirectory>/system/org/apache/felix/karaf/apache-felix-karaf/${version}</outputDirectory>
+ <destName>apache-felix-karaf-${version}-features.xml</destName>
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
@@ -216,46 +209,46 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/servicemix/kernel/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/felix/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.management</include>
+ <include>org.apache.felix.karaf:org.apache.felix.karaf.management</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/servicemix/kernel/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/felix/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.filemonitor</include>
- <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.spring</include>
- <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.blueprint</include>
- <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.features</include>
+ <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.filemonitor</include>
+ <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.spring</include>
+ <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.blueprint</include>
+ <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.features</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/servicemix/kernel/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/felix/karaf/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.admin</include>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.log</include>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.config</include>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.packages</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.core</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.admin</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.osgi</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.log</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.features</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.config</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.packages</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/servicemix/kernel/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/felix/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.config</include>
- <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.modules</include>
+ <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.config</include>
+ <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.modules</include>
</includes>
</dependencySet>
<dependencySet>
diff --git a/karaf/assembly/src/main/descriptors/windows-bin.xml b/karaf/assembly/src/main/descriptors/windows-bin.xml
index 9509f54..59e1068 100644
--- a/karaf/assembly/src/main/descriptors/windows-bin.xml
+++ b/karaf/assembly/src/main/descriptors/windows-bin.xml
@@ -83,13 +83,6 @@
<files>
<file>
- <source>${basedir}/../etc/config.properties</source>
- <outputDirectory>/etc/</outputDirectory>
- <destName>config.properties</destName>
- <fileMode>0644</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
- <file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
<outputDirectory>/</outputDirectory>
<destName>LICENSE.txt</destName>
@@ -105,8 +98,8 @@
</file>
<file>
<source>${basedir}/target/classes/features.xml</source>
- <outputDirectory>/system/org/apache/servicemix/kernel/apache-servicemix-kernel/${version}</outputDirectory>
- <destName>apache-servicemix-kernel-${version}-features.xml</destName>
+ <outputDirectory>/system/org/apache/felix/karaf/apache-felix-karaf/${version}</outputDirectory>
+ <destName>apache-felix-karaf-${version}-features.xml</destName>
<fileMode>0644</fileMode>
<lineEnding>dos</lineEnding>
</file>
@@ -208,46 +201,46 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/servicemix/kernel/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/felix/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.management</include>
+ <include>org.apache.felix.karaf:org.apache.felix.karaf.management</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/servicemix/kernel/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/felix/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.filemonitor</include>
- <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.spring</include>
- <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.blueprint</include>
- <include>org.apache.servicemix.kernel.deployer:org.apache.servicemix.kernel.deployer.features</include>
+ <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.filemonitor</include>
+ <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.spring</include>
+ <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.blueprint</include>
+ <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.features</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/servicemix/kernel/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/felix/karaf/gshell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.admin</include>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.log</include>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.config</include>
- <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.packages</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.core</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.admin</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.osgi</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.log</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.features</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.config</include>
+ <include>org.apache.felix.karaf.gshell:org.apache.felix.karaf.gshell.packages</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/servicemix/kernel/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/felix/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.config</include>
- <include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.modules</include>
+ <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.config</include>
+ <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.modules</include>
</includes>
</dependencySet>
<dependencySet>
diff --git a/karaf/assembly/src/main/distribution/unix-shell/bin/servicemix b/karaf/assembly/src/main/distribution/unix-shell/bin/servicemix
index 6f5d30d..b92e7ef 100755
--- a/karaf/assembly/src/main/distribution/unix-shell/bin/servicemix
+++ b/karaf/assembly/src/main/distribution/unix-shell/bin/servicemix
@@ -281,7 +281,7 @@
SERVICEMIX_HOME=`cygpath --path --windows "$SERVICEMIX_HOME"`
SERVICEMIX_BASE=`cygpath --path --windows "$SERVICEMIX_BASE"`
fi
- exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -Dservicemix.base="$SERVICEMIX_BASE" -Djava.util.logging.config.file=$SERVICEMIX_BASE/etc/java.util.logging.properties $OPTS -classpath "$CLASSPATH" org.apache.servicemix.kernel.main.Main $*
+ exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -Dservicemix.base="$SERVICEMIX_BASE" -Djava.util.logging.config.file=$SERVICEMIX_BASE/etc/java.util.logging.properties $OPTS -classpath "$CLASSPATH" org.apache.felix.karaf.main.Main $*
}
main() {
diff --git a/karaf/assembly/src/main/distribution/windows-text/bin/servicemix.bat b/karaf/assembly/src/main/distribution/windows-text/bin/servicemix.bat
index f7aa2d1..e41f784 100755
--- a/karaf/assembly/src/main/distribution/windows-text/bin/servicemix.bat
+++ b/karaf/assembly/src/main/distribution/windows-text/bin/servicemix.bat
@@ -152,7 +152,7 @@
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8
if not "%SHIFT%" == "true" SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8
rem Execute the Java Virtual Machine
- "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dservicemix.home="%SERVICEMIX_HOME%" -Dservicemix.base="%SERVICEMIX_BASE%" -Djava.util.logging.config.file=%SERVICEMIX_BASE%\etc\java.util.logging.properties org.apache.servicemix.kernel.main.Main %ARGS%
+ "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dservicemix.home="%SERVICEMIX_HOME%" -Dservicemix.base="%SERVICEMIX_BASE%" -Djava.util.logging.config.file=%SERVICEMIX_BASE%\etc\java.util.logging.properties org.apache.felix.karaf.main.Main %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
diff --git a/karaf/etc/config.properties b/karaf/assembly/src/main/filtered-resources/etc/config.properties
similarity index 97%
rename from karaf/etc/config.properties
rename to karaf/assembly/src/main/filtered-resources/etc/config.properties
index dfe0abb..abdabca 100644
--- a/karaf/etc/config.properties
+++ b/karaf/assembly/src/main/filtered-resources/etc/config.properties
@@ -25,10 +25,10 @@
org.osgi.service.packageadmin; version=1.2.0, \
org.osgi.service.startlevel; version=1.1.0, \
org.osgi.service.url; version=1.0.0, \
- org.apache.servicemix.kernel.main.spi; version=1.0.0, \
- org.apache.servicemix.kernel.jaas.boot, \
+ org.apache.felix.karaf.main.spi, \
+ org.apache.felix.karaf.jaas.boot, \
org.osgi.util.tracker; version=1.3.3, \
- org.apache.servicemix.kernel.version, \
+ org.apache.felix.karaf.version, \
${jre-${java.specification.version}}
org.osgi.framework.bootdelegation=sun.*,com.sun.management*
diff --git a/karaf/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg b/karaf/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
index 2e22aec..74e733d 100644
--- a/karaf/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
+++ b/karaf/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
@@ -20,7 +20,7 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.servicemix.kernel/apache-servicemix-kernel/${version}/xml/features
+featuresRepositories=mvn:org.apache.felix.karaf/apache-felix-karaf/${version}/xml/features
#
# Comma separated list of features to install at startup
diff --git a/karaf/assembly/src/main/filtered-resources/etc/startup.properties b/karaf/assembly/src/main/filtered-resources/etc/startup.properties
index fe1b9b8..103d45a 100644
--- a/karaf/assembly/src/main/filtered-resources/etc/startup.properties
+++ b/karaf/assembly/src/main/filtered-resources/etc/startup.properties
@@ -34,7 +34,7 @@
org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
org/apache/geronimo/specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}/geronimo-annotation_1.0_spec-${geronimo.annotation.version}.jar=10
org/apache/felix/org.apache.felix.prefs/${felix.prefs.version}/org.apache.felix.prefs-${felix.prefs.version}.jar=10
-org/apache/servicemix/kernel/deployer/org.apache.servicemix.kernel.deployer.filemonitor/${pom.version}/org.apache.servicemix.kernel.deployer.filemonitor-${pom.version}.jar=15
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.filemonitor/${pom.version}/org.apache.felix.karaf.deployer.filemonitor-${pom.version}.jar=15
#
# The rest of the services..
@@ -54,18 +54,18 @@
org/springframework/osgi/spring-osgi-core/${spring.osgi.version}/spring-osgi-core-${spring.osgi.version}.jar=30
org/springframework/osgi/spring-osgi-extender/${spring.osgi.version}/spring-osgi-extender-${spring.osgi.version}.jar=30
org/springframework/osgi/spring-osgi-io/${spring.osgi.version}/spring-osgi-io-${spring.osgi.version}.jar=30
-org/apache/servicemix/kernel/deployer/org.apache.servicemix.kernel.deployer.spring/${pom.version}/org.apache.servicemix.kernel.deployer.spring-${pom.version}.jar=30
-org/apache/servicemix/kernel/deployer/org.apache.servicemix.kernel.deployer.blueprint/${pom.version}/org.apache.servicemix.kernel.deployer.blueprint-${pom.version}.jar=30
-org/apache/servicemix/kernel/deployer/org.apache.servicemix.kernel.deployer.features/${pom.version}/org.apache.servicemix.kernel.deployer.features-${pom.version}.jar=30
-org/apache/servicemix/kernel/org.apache.servicemix.kernel.management/${pom.version}/org.apache.servicemix.kernel.management-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.admin/${pom.version}/org.apache.servicemix.kernel.gshell.admin-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.osgi/${pom.version}/org.apache.servicemix.kernel.gshell.osgi-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.features/${pom.version}/org.apache.servicemix.kernel.gshell.features-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.log/${pom.version}/org.apache.servicemix.kernel.gshell.log-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.config/${pom.version}/org.apache.servicemix.kernel.gshell.config-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.packages/${pom.version}/org.apache.servicemix.kernel.gshell.packages-${pom.version}.jar=30
-org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.config/${pom.version}/org.apache.servicemix.kernel.jaas.config-${pom.version}.jar=30
-org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.modules/${pom.version}/org.apache.servicemix.kernel.jaas.modules-${pom.version}.jar=30
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.spring/${pom.version}/org.apache.felix.karaf.deployer.spring-${pom.version}.jar=30
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.blueprint/${pom.version}/org.apache.felix.karaf.deployer.blueprint-${pom.version}.jar=30
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.features/${pom.version}/org.apache.felix.karaf.deployer.features-${pom.version}.jar=30
+org/apache/felix/karaf/org.apache.felix.karaf.management/${pom.version}/org.apache.felix.karaf.management-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.admin/${pom.version}/org.apache.felix.karaf.gshell.admin-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.osgi/${pom.version}/org.apache.felix.karaf.gshell.osgi-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.features/${pom.version}/org.apache.felix.karaf.gshell.features-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.log/${pom.version}/org.apache.felix.karaf.gshell.log-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.config/${pom.version}/org.apache.felix.karaf.gshell.config-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.packages/${pom.version}/org.apache.felix.karaf.gshell.packages-${pom.version}.jar=30
+org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.config/${pom.version}/org.apache.felix.karaf.jaas.config-${pom.version}.jar=30
+org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.modules/${pom.version}/org.apache.felix.karaf.jaas.modules-${pom.version}.jar=30
org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30
org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30
org/osgi/jmx/${osgi.jmx.version}/jmx-${osgi.jmx.version}.jar=30
@@ -74,5 +74,5 @@
#
# Start console last
#
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.core/${pom.version}/org.apache.servicemix.kernel.gshell.core-${pom.version}.jar=40
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.core/${pom.version}/org.apache.felix.karaf.gshell.core-${pom.version}.jar=40
diff --git a/karaf/assembly/src/main/filtered-resources/features.xml b/karaf/assembly/src/main/filtered-resources/features.xml
index 8316b3f..dbce2f9 100644
--- a/karaf/assembly/src/main/filtered-resources/features.xml
+++ b/karaf/assembly/src/main/filtered-resources/features.xml
@@ -18,10 +18,10 @@
-->
<features>
<feature name="wrapper" version="${version}">
- <bundle>mvn:org.apache.servicemix.kernel.gshell/org.apache.servicemix.kernel.gshell.wrapper/${version}</bundle>
+ <bundle>mvn:org.apache.felix.karaf.gshell/org.apache.felix.karaf.gshell.wrapper/${version}</bundle>
</feature>
<feature name="obr" version="${version}">
<bundle>mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
- <bundle>mvn:org.apache.servicemix.kernel.gshell/org.apache.servicemix.kernel.gshell.obr/${version}</bundle>
+ <bundle>mvn:org.apache.felix.karaf.gshell/org.apache.felix.karaf.gshell.obr/${version}</bundle>
</feature>
</features>
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");
diff --git a/karaf/demos/pom.xml b/karaf/demos/pom.xml
index 9665c6c..97aac13 100644
--- a/karaf/demos/pom.xml
+++ b/karaf/demos/pom.xml
@@ -22,16 +22,16 @@
<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.demos</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.demos</artifactId>
<packaging>pom</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: Demos</name>
+ <name>Apache Felix Karaf :: Demos</name>
<modules>
<module>smx4web</module>
diff --git a/karaf/demos/smx4web/pom.xml b/karaf/demos/smx4web/pom.xml
index ae8a45a..b3b6789 100644
--- a/karaf/demos/smx4web/pom.xml
+++ b/karaf/demos/smx4web/pom.xml
@@ -22,15 +22,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.demos</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.demos</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.demos</groupId>
+ <groupId>org.apache.felix.karaf.demos</groupId>
<artifactId>smx4web</artifactId>
<packaging>war</packaging>
- <name>Apache ServiceMix Kernel :: Demos :: smx4web</name>
+ <name>Apache Felix Karaf :: Demos :: smx4web</name>
<properties>
<jetty.port>8080</jetty.port>
@@ -40,65 +40,65 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.main</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.main</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>apache-servicemix-kernel</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>apache-felix-karaf</artifactId>
<type>zip</type>
<exclusions>
<exclusion>
- <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>
</exclusion>
<exclusion>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.filemonitor</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.filemonitor</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.spring</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.spring</artifactId>
</exclusion>
<exclusion>
- <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>
</exclusion>
<exclusion>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.admin</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.admin</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.obr</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.obr</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.osgi</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.osgi</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.log</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.log</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.features</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.features</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.config</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.config</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.packages</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.packages</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.config</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.config</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.keystore</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.keystore</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.osgi</groupId>
@@ -244,8 +244,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>apache-servicemix-kernel</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>apache-felix-karaf</artifactId>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/kernel/WEB-INF</outputDirectory>
@@ -270,7 +270,7 @@
<configuration>
<tasks>
<move todir="${project.build.directory}/kernel/WEB-INF/servicemix">
- <fileset dir="${project.build.directory}/kernel/WEB-INF/apache-servicemix-kernel-${pom.version}"/>
+ <fileset dir="${project.build.directory}/kernel/WEB-INF/apache-felix-karaf-${pom.version}"/>
</move>
</tasks>
</configuration>
diff --git a/karaf/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java b/karaf/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java
index 11e9bbb..b183b64 100644
--- a/karaf/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java
+++ b/karaf/demos/smx4web/src/main/java/org/apache/servicemix/smx4webex/WebAppListener.java
@@ -21,7 +21,7 @@
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import org.apache.servicemix.kernel.main.Main;
+import org.apache.felix.karaf.main.Main;
public class WebAppListener implements ServletContextListener {
diff --git a/karaf/deployer/blueprint/pom.xml b/karaf/deployer/blueprint/pom.xml
index 2b0bcf5..7ff297e 100644
--- a/karaf/deployer/blueprint/pom.xml
+++ b/karaf/deployer/blueprint/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
<artifactId>deployer</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.blueprint</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.blueprint</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: Blueprint Deployer</name>
+ <name>Apache Felix Karaf :: Blueprint Deployer</name>
<description>This deployer transforms a plain blueprint xml file to a deployable bundle</description>
@@ -46,8 +46,8 @@
<artifactId>spring-osgi-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.filemonitor</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -63,7 +63,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Private-Package>org.apache.servicemix.kernel.deployer.blueprint</Private-Package>
+ <Private-Package>org.apache.felix.karaf.deployer.blueprint</Private-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
</configuration>
@@ -71,4 +71,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/deployer/blueprint/src/main/java/org/apache/servicemix/kernel/deployer/blueprint/BlueprintDeploymentListener.java b/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListener.java
similarity index 95%
rename from karaf/deployer/blueprint/src/main/java/org/apache/servicemix/kernel/deployer/blueprint/BlueprintDeploymentListener.java
rename to karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListener.java
index 13ef072..602f072 100644
--- a/karaf/deployer/blueprint/src/main/java/org/apache/servicemix/kernel/deployer/blueprint/BlueprintDeploymentListener.java
+++ b/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListener.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.blueprint;
+package org.apache.felix.karaf.deployer.blueprint;
import java.io.File;
import java.io.FileOutputStream;
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.kernel.deployer.filemonitor.DeploymentListener;
+import org.apache.felix.karaf.deployer.filemonitor.DeploymentListener;
/**
* A deployment listener that listens for spring xml applications
diff --git a/karaf/deployer/blueprint/src/main/java/org/apache/servicemix/kernel/deployer/blueprint/BlueprintTransformer.java b/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintTransformer.java
similarity index 99%
rename from karaf/deployer/blueprint/src/main/java/org/apache/servicemix/kernel/deployer/blueprint/BlueprintTransformer.java
rename to karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintTransformer.java
index f466527..8e9de70 100644
--- a/karaf/deployer/blueprint/src/main/java/org/apache/servicemix/kernel/deployer/blueprint/BlueprintTransformer.java
+++ b/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintTransformer.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.blueprint;
+package org.apache.felix.karaf.deployer.blueprint;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
diff --git a/karaf/deployer/blueprint/src/main/java/org/apache/servicemix/kernel/deployer/blueprint/BlueprintURLHandler.java b/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintURLHandler.java
similarity index 97%
rename from karaf/deployer/blueprint/src/main/java/org/apache/servicemix/kernel/deployer/blueprint/BlueprintURLHandler.java
rename to karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintURLHandler.java
index a03ecae..176a380 100644
--- a/karaf/deployer/blueprint/src/main/java/org/apache/servicemix/kernel/deployer/blueprint/BlueprintURLHandler.java
+++ b/karaf/deployer/blueprint/src/main/java/org/apache/felix/karaf/deployer/blueprint/BlueprintURLHandler.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.blueprint;
+package org.apache.felix.karaf.deployer.blueprint;
import java.io.File;
import java.io.FileInputStream;
diff --git a/karaf/deployer/blueprint/src/main/resources/META-INF/spring/blueprint-deployer.xml b/karaf/deployer/blueprint/src/main/resources/META-INF/spring/blueprint-deployer.xml
index bb3e430..338547c 100644
--- a/karaf/deployer/blueprint/src/main/resources/META-INF/spring/blueprint-deployer.xml
+++ b/karaf/deployer/blueprint/src/main/resources/META-INF/spring/blueprint-deployer.xml
@@ -29,17 +29,17 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <bean id="blueprintDeploymentListener" class="org.apache.servicemix.kernel.deployer.blueprint.BlueprintDeploymentListener">
+ <bean id="blueprintDeploymentListener" class="org.apache.felix.karaf.deployer.blueprint.BlueprintDeploymentListener">
</bean>
<osgi:service ref="blueprintDeploymentListener">
<osgi:interfaces>
- <value>org.apache.servicemix.kernel.deployer.filemonitor.DeploymentListener</value>
+ <value>org.apache.felix.karaf.deployer.filemonitor.DeploymentListener</value>
</osgi:interfaces>
</osgi:service>
- <bean id="blueprintHandler" class="org.apache.servicemix.kernel.deployer.blueprint.BlueprintURLHandler" />
+ <bean id="blueprintHandler" class="org.apache.felix.karaf.deployer.blueprint.BlueprintURLHandler" />
<osgi:service ref="blueprintHandler" interface="org.osgi.service.url.URLStreamHandlerService">
<osgi:service-properties>
@@ -47,4 +47,4 @@
</osgi:service-properties>
</osgi:service>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/deployer/blueprint/src/main/resources/org/apache/servicemix/kernel/deployer/blueprint/extract.xsl b/karaf/deployer/blueprint/src/main/resources/org/apache/felix/karaf/deployer/blueprint/extract.xsl
similarity index 100%
rename from karaf/deployer/blueprint/src/main/resources/org/apache/servicemix/kernel/deployer/blueprint/extract.xsl
rename to karaf/deployer/blueprint/src/main/resources/org/apache/felix/karaf/deployer/blueprint/extract.xsl
diff --git a/karaf/deployer/blueprint/src/test/java/org/apache/servicemix/kernel/deployer/blueprint/BlueprintDeploymentListenerTest.java b/karaf/deployer/blueprint/src/test/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListenerTest.java
similarity index 98%
rename from karaf/deployer/blueprint/src/test/java/org/apache/servicemix/kernel/deployer/blueprint/BlueprintDeploymentListenerTest.java
rename to karaf/deployer/blueprint/src/test/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListenerTest.java
index 6ab2c33..88865b9 100644
--- a/karaf/deployer/blueprint/src/test/java/org/apache/servicemix/kernel/deployer/blueprint/BlueprintDeploymentListenerTest.java
+++ b/karaf/deployer/blueprint/src/test/java/org/apache/felix/karaf/deployer/blueprint/BlueprintDeploymentListenerTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.blueprint;
+package org.apache.felix.karaf.deployer.blueprint;
import java.io.File;
import java.io.FileInputStream;
diff --git a/karaf/deployer/features/pom.xml b/karaf/deployer/features/pom.xml
index 738126e..8c1e711 100644
--- a/karaf/deployer/features/pom.xml
+++ b/karaf/deployer/features/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
<artifactId>deployer</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.features</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.features</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: Features Deployer</name>
+ <name>Apache Felix Karaf :: Features Deployer</name>
<description>This deployer can deploy features descriptor on the fly</description>
@@ -46,12 +46,12 @@
<artifactId>spring-osgi-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.features</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.features</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.filemonitor</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -67,7 +67,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Private-Package>org.apache.servicemix.kernel.deployer.blueprint</Private-Package>
+ <Private-Package>org.apache.felix.karaf.deployer.blueprint</Private-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
</configuration>
@@ -75,4 +75,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/deployer/features/src/main/java/org/apache/servicemix/kernel/deployer/features/FeatureDeploymentListener.java b/karaf/deployer/features/src/main/java/org/apache/felix/karaf/deployer/features/FeatureDeploymentListener.java
similarity index 96%
rename from karaf/deployer/features/src/main/java/org/apache/servicemix/kernel/deployer/features/FeatureDeploymentListener.java
rename to karaf/deployer/features/src/main/java/org/apache/felix/karaf/deployer/features/FeatureDeploymentListener.java
index b26d548..1ccead5 100644
--- a/karaf/deployer/features/src/main/java/org/apache/servicemix/kernel/deployer/features/FeatureDeploymentListener.java
+++ b/karaf/deployer/features/src/main/java/org/apache/felix/karaf/deployer/features/FeatureDeploymentListener.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.features;
+package org.apache.felix.karaf.deployer.features;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -40,10 +40,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.kernel.gshell.features.Feature;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
-import org.apache.servicemix.kernel.gshell.features.Repository;
-import org.apache.servicemix.kernel.deployer.filemonitor.DeploymentListener;
+import org.apache.felix.karaf.gshell.features.Feature;
+import org.apache.felix.karaf.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.features.Repository;
+import org.apache.felix.karaf.deployer.filemonitor.DeploymentListener;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
@@ -59,7 +59,7 @@
public class FeatureDeploymentListener implements DeploymentListener, SynchronousBundleListener, BundleContextAware,
InitializingBean, DisposableBean {
- public static final String FEATURE_PATH = "org.apache.servicemix.kernel.gshell.features";
+ public static final String FEATURE_PATH = "org.apache.felix.karaf.gshell.features";
private static final Log LOGGER = LogFactory.getLog(FeatureDeploymentListener.class);
diff --git a/karaf/deployer/features/src/main/resources/META-INF/spring/features-deployer.xml b/karaf/deployer/features/src/main/resources/META-INF/spring/features-deployer.xml
index 54b1913..ee66d1c 100644
--- a/karaf/deployer/features/src/main/resources/META-INF/spring/features-deployer.xml
+++ b/karaf/deployer/features/src/main/resources/META-INF/spring/features-deployer.xml
@@ -38,12 +38,12 @@
http://servicemix.apache.org/schema/servicemix-gshell
http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
- <osgi:reference id="featuresService" interface="org.apache.servicemix.kernel.gshell.features.FeaturesService" cardinality="1..1"/>
+ <osgi:reference id="featuresService" interface="org.apache.felix.karaf.gshell.features.FeaturesService" cardinality="1..1"/>
- <bean id="featureDeploymentListener" class="org.apache.servicemix.kernel.deployer.features.FeatureDeploymentListener">
+ <bean id="featureDeploymentListener" class="org.apache.felix.karaf.deployer.features.FeatureDeploymentListener">
<property name="featuresService" ref="featuresService" />
</bean>
- <osgi:service ref="featureDeploymentListener" interface="org.apache.servicemix.kernel.deployer.filemonitor.DeploymentListener" />
+ <osgi:service ref="featureDeploymentListener" interface="org.apache.felix.karaf.deployer.filemonitor.DeploymentListener" />
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/deployer/filemonitor/pom.xml b/karaf/deployer/filemonitor/pom.xml
index 7817bc2..7a46dc8 100644
--- a/karaf/deployer/filemonitor/pom.xml
+++ b/karaf/deployer/filemonitor/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
<artifactId>deployer</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.filemonitor</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: File Monitor</name>
+ <name>Apache Felix Karaf :: File Monitor</name>
<description>This bundle monitors the deploy directory for new OSGi bundles in jar form, expanded form or for
configuration file changes and undeploys/redeploys them
@@ -75,7 +75,7 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}</Export-Package>
- <Bundle-Activator>org.apache.servicemix.kernel.deployer.filemonitor.FileMonitorActivator
+ <Bundle-Activator>org.apache.felix.karaf.deployer.filemonitor.FileMonitorActivator
</Bundle-Activator>
</instructions>
</configuration>
@@ -83,4 +83,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/DeploymentListener.java b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/DeploymentListener.java
similarity index 94%
rename from karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/DeploymentListener.java
rename to karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/DeploymentListener.java
index 18486c9..f0098af 100644
--- a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/DeploymentListener.java
+++ b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/DeploymentListener.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.filemonitor;
+package org.apache.felix.karaf.deployer.filemonitor;
import java.io.File;
diff --git a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitor.java b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java
similarity index 99%
rename from karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitor.java
rename to karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java
index 2a08990..ac00c45 100644
--- a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitor.java
+++ b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.filemonitor;
+package org.apache.felix.karaf.deployer.filemonitor;
import java.io.Closeable;
import java.io.File;
diff --git a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitorActivator.java b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorActivator.java
similarity index 97%
rename from karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitorActivator.java
rename to karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorActivator.java
index a700523..8ce5eee 100644
--- a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitorActivator.java
+++ b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorActivator.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.filemonitor;
+package org.apache.felix.karaf.deployer.filemonitor;
import java.util.Collection;
import java.util.Dictionary;
@@ -94,7 +94,7 @@
// ManagedServiceFactory interface
// -------------------------------------------------------------------------
public String getName() {
- return "org.apache.servicemix.kernel.deployer.filemonitor.FileMonitor";
+ return "org.apache.felix.karaf.deployer.filemonitor.FileMonitor";
}
public void updated(String pid, Dictionary properties) throws ConfigurationException {
diff --git a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/JarUtil.java b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/JarUtil.java
similarity index 98%
rename from karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/JarUtil.java
rename to karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/JarUtil.java
index dff9e5c..ecf5bb9 100644
--- a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/JarUtil.java
+++ b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/JarUtil.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.filemonitor;
+package org.apache.felix.karaf.deployer.filemonitor;
import java.io.BufferedOutputStream;
import java.io.File;
diff --git a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/Scanner.java b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/Scanner.java
similarity index 99%
rename from karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/Scanner.java
rename to karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/Scanner.java
index 239a1a8..0c109a0 100644
--- a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/Scanner.java
+++ b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/Scanner.java
@@ -12,7 +12,7 @@
//See the License for the specific language governing permissions and
//limitations under the License.
//========================================================================
-package org.apache.servicemix.kernel.deployer.filemonitor;
+package org.apache.felix.karaf.deployer.filemonitor;
import java.io.File;
import java.io.FilenameFilter;
diff --git a/karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/deployer/filemonitor/BundlePackerTest.java b/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/BundlePackerTest.java
similarity index 95%
rename from karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/deployer/filemonitor/BundlePackerTest.java
rename to karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/BundlePackerTest.java
index 83109ed..b710a30 100644
--- a/karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/deployer/filemonitor/BundlePackerTest.java
+++ b/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/BundlePackerTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.filemonitor;
+package org.apache.felix.karaf.deployer.filemonitor;
import java.io.File;
diff --git a/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorTest.java b/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorTest.java
new file mode 100644
index 0000000..0db1953
--- /dev/null
+++ b/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorTest.java
@@ -0,0 +1,100 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.felix.karaf.deployer.filemonitor;
+
+import junit.framework.TestCase;
+import org.apache.felix.karaf.deployer.filemonitor.FileMonitor;
+
+/**
+ * FileMonitor Tester.
+ *
+ * @author <Authors name>
+ * @version 1.0
+ * @since <pre>07/02/2008</pre>
+ */
+public class FileMonitorTest extends TestCase {
+
+ public FileMonitorTest(String name) {
+ super(name);
+ }
+
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testFilePathsMatch() throws Exception {
+ assertTrue(FileMonitor.filePathsMatch(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt"));
+
+ assertTrue(FileMonitor.filePathsMatch(
+ "C:\\Apps\\apache-felix-karaf-1.0.0-rc1\\src\\README.txt",
+ "C:\\Apps\\apache-felix-karaf-1.0.0-rc1\\src\\README.txt"));
+
+ assertTrue(FileMonitor.filePathsMatch(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ "C:\\Apps\\apache-felix-karaf-1.0.0-rc1\\src\\README.txt"));
+
+ assertTrue(FileMonitor.filePathsMatch(
+ "file:/C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ "C:\\Apps\\apache-felix-karaf-1.0.0-rc1\\src\\README.txt"));
+
+ assertTrue(FileMonitor.filePathsMatch(
+ "file://C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ "C:\\Apps\\apache-felix-karaf-1.0.0-rc1\\src\\README.txt"));
+ }
+
+ public void testNormalizeFilePath() throws Exception {
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("C:/Apps//apache-felix-karaf-1.0.0-rc1////src/////README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("C:\\Apps\\apache-felix-karaf-1.0.0-rc1\\src\\README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("C:\\\\Apps\\\\apache-felix-karaf-1.0.0-rc1\\\\src\\\\README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("C:\\Apps\\//apache-felix-karaf-1.0.0-rc1\\/\\src///\\\\README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("file:C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("file:/C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("file://C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt"));
+ }
+
+}
diff --git a/karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitorTest.java b/karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitorTest.java
deleted file mode 100644
index 998ca84..0000000
--- a/karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitorTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.kernel.deployer.filemonitor;
-
-import junit.framework.TestCase;
-import org.apache.servicemix.kernel.deployer.filemonitor.FileMonitor;
-
-/**
- * FileMonitor Tester.
- *
- * @author <Authors name>
- * @version 1.0
- * @since <pre>07/02/2008</pre>
- */
-public class FileMonitorTest extends TestCase {
-
- public FileMonitorTest(String name) {
- super(name);
- }
-
- public void setUp() throws Exception {
- super.setUp();
- }
-
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
- public void testFilePathsMatch() throws Exception {
- assertTrue(FileMonitor.filePathsMatch(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt"));
-
- assertTrue(FileMonitor.filePathsMatch(
- "C:\\Apps\\apache-servicemix-kernel-1.0.0-rc1\\src\\README.txt",
- "C:\\Apps\\apache-servicemix-kernel-1.0.0-rc1\\src\\README.txt"));
-
- assertTrue(FileMonitor.filePathsMatch(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- "C:\\Apps\\apache-servicemix-kernel-1.0.0-rc1\\src\\README.txt"));
-
- assertTrue(FileMonitor.filePathsMatch(
- "file:/C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- "C:\\Apps\\apache-servicemix-kernel-1.0.0-rc1\\src\\README.txt"));
-
- assertTrue(FileMonitor.filePathsMatch(
- "file://C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- "C:\\Apps\\apache-servicemix-kernel-1.0.0-rc1\\src\\README.txt"));
- }
-
- public void testNormalizeFilePath() throws Exception {
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("C:/Apps//apache-servicemix-kernel-1.0.0-rc1////src/////README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("C:\\Apps\\apache-servicemix-kernel-1.0.0-rc1\\src\\README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("C:\\\\Apps\\\\apache-servicemix-kernel-1.0.0-rc1\\\\src\\\\README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("C:\\Apps\\//apache-servicemix-kernel-1.0.0-rc1\\/\\src///\\\\README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("file:C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("file:/C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("file://C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt"));
- }
-
-}
diff --git a/karaf/deployer/pom.xml b/karaf/deployer/pom.xml
index 7e2810f..b347046 100644
--- a/karaf/deployer/pom.xml
+++ b/karaf/deployer/pom.xml
@@ -22,16 +22,16 @@
<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.deployer</groupId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
<artifactId>deployer</artifactId>
<packaging>pom</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: Deployer</name>
+ <name>Apache Felix Karaf :: Deployer</name>
<modules>
<module>filemonitor</module>
@@ -40,4 +40,4 @@
<module>features</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/deployer/spring/pom.xml b/karaf/deployer/spring/pom.xml
index 2a16e20..275b400 100644
--- a/karaf/deployer/spring/pom.xml
+++ b/karaf/deployer/spring/pom.xml
@@ -22,16 +22,16 @@
<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.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.spring</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.spring</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: Spring Deployer</name>
+ <name>Apache Felix Karaf :: Spring Deployer</name>
<description>This deployer transforms a plain spring xml file to a deployable bundle</description>
@@ -46,8 +46,8 @@
<artifactId>spring-osgi-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.filemonitor</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -63,7 +63,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Private-Package>org.apache.servicemix.kernel.deployer.spring</Private-Package>
+ <Private-Package>org.apache.felix.karaf.deployer.spring</Private-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
</configuration>
@@ -71,4 +71,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/deployer/spring/src/main/java/org/apache/servicemix/kernel/deployer/spring/SpringDeploymentListener.java b/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListener.java
similarity index 95%
rename from karaf/deployer/spring/src/main/java/org/apache/servicemix/kernel/deployer/spring/SpringDeploymentListener.java
rename to karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListener.java
index 11c394f..7551f99 100644
--- a/karaf/deployer/spring/src/main/java/org/apache/servicemix/kernel/deployer/spring/SpringDeploymentListener.java
+++ b/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListener.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.spring;
+package org.apache.felix.karaf.deployer.spring;
import java.io.File;
import java.io.FileOutputStream;
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.kernel.deployer.filemonitor.DeploymentListener;
+import org.apache.felix.karaf.deployer.filemonitor.DeploymentListener;
/**
* A deployment listener that listens for spring xml applications
diff --git a/karaf/deployer/spring/src/main/java/org/apache/servicemix/kernel/deployer/spring/SpringTransformer.java b/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringTransformer.java
similarity index 99%
rename from karaf/deployer/spring/src/main/java/org/apache/servicemix/kernel/deployer/spring/SpringTransformer.java
rename to karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringTransformer.java
index 91d8b2a..fe5ec5e 100644
--- a/karaf/deployer/spring/src/main/java/org/apache/servicemix/kernel/deployer/spring/SpringTransformer.java
+++ b/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringTransformer.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.spring;
+package org.apache.felix.karaf.deployer.spring;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
diff --git a/karaf/deployer/spring/src/main/java/org/apache/servicemix/kernel/deployer/spring/SpringURLHandler.java b/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringURLHandler.java
similarity index 98%
rename from karaf/deployer/spring/src/main/java/org/apache/servicemix/kernel/deployer/spring/SpringURLHandler.java
rename to karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringURLHandler.java
index fce7913..943f0fe 100644
--- a/karaf/deployer/spring/src/main/java/org/apache/servicemix/kernel/deployer/spring/SpringURLHandler.java
+++ b/karaf/deployer/spring/src/main/java/org/apache/felix/karaf/deployer/spring/SpringURLHandler.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.spring;
+package org.apache.felix.karaf.deployer.spring;
import java.io.File;
import java.io.FileInputStream;
diff --git a/karaf/deployer/spring/src/main/resources/META-INF/spring/spring-deployer.xml b/karaf/deployer/spring/src/main/resources/META-INF/spring/spring-deployer.xml
index af2921a..6ece1f2 100644
--- a/karaf/deployer/spring/src/main/resources/META-INF/spring/spring-deployer.xml
+++ b/karaf/deployer/spring/src/main/resources/META-INF/spring/spring-deployer.xml
@@ -29,17 +29,17 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <bean id="springDeploymentListener" class="org.apache.servicemix.kernel.deployer.spring.SpringDeploymentListener">
+ <bean id="springDeploymentListener" class="org.apache.felix.karaf.deployer.spring.SpringDeploymentListener">
</bean>
<osgi:service ref="springDeploymentListener">
<osgi:interfaces>
- <value>org.apache.servicemix.kernel.deployer.filemonitor.DeploymentListener</value>
+ <value>org.apache.felix.karaf.deployer.filemonitor.DeploymentListener</value>
</osgi:interfaces>
</osgi:service>
- <bean id="springHandler" class="org.apache.servicemix.kernel.deployer.spring.SpringURLHandler" />
+ <bean id="springHandler" class="org.apache.felix.karaf.deployer.spring.SpringURLHandler" />
<osgi:service ref="springHandler" interface="org.osgi.service.url.URLStreamHandlerService">
<osgi:service-properties>
@@ -47,4 +47,4 @@
</osgi:service-properties>
</osgi:service>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/deployer/spring/src/main/resources/org/apache/servicemix/kernel/deployer/spring/extract.xsl b/karaf/deployer/spring/src/main/resources/org/apache/felix/karaf/deployer/spring/extract.xsl
similarity index 100%
rename from karaf/deployer/spring/src/main/resources/org/apache/servicemix/kernel/deployer/spring/extract.xsl
rename to karaf/deployer/spring/src/main/resources/org/apache/felix/karaf/deployer/spring/extract.xsl
diff --git a/karaf/deployer/spring/src/test/java/org/apache/servicemix/kernel/deployer/spring/SpringDeploymentListenerTest.java b/karaf/deployer/spring/src/test/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListenerTest.java
similarity index 92%
rename from karaf/deployer/spring/src/test/java/org/apache/servicemix/kernel/deployer/spring/SpringDeploymentListenerTest.java
rename to karaf/deployer/spring/src/test/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListenerTest.java
index 9a70dd0..7921282 100644
--- a/karaf/deployer/spring/src/test/java/org/apache/servicemix/kernel/deployer/spring/SpringDeploymentListenerTest.java
+++ b/karaf/deployer/spring/src/test/java/org/apache/felix/karaf/deployer/spring/SpringDeploymentListenerTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.spring;
+package org.apache.felix.karaf.deployer.spring;
import java.io.File;
import java.io.FileInputStream;
@@ -29,8 +29,8 @@
import javax.xml.transform.dom.DOMSource;
import junit.framework.TestCase;
-import org.apache.servicemix.kernel.deployer.spring.SpringDeploymentListener;
-import org.apache.servicemix.kernel.deployer.spring.SpringTransformer;
+import org.apache.felix.karaf.deployer.spring.SpringDeploymentListener;
+import org.apache.felix.karaf.deployer.spring.SpringTransformer;
public class SpringDeploymentListenerTest extends TestCase {
@@ -41,7 +41,7 @@
assertNotNull(pkgs);
assertEquals(2, pkgs.size());
Iterator<String> it = pkgs.iterator();
- assertEquals("org.apache.servicemix.kernel.deployer.spring", it.next());
+ assertEquals("org.apache.felix.karaf.deployer.spring", it.next());
assertEquals("org.osgi.service.url", it.next());
}
diff --git a/karaf/deployer/spring/src/test/resources/test.xml b/karaf/deployer/spring/src/test/resources/test.xml
index 31dca21..b47596e 100644
--- a/karaf/deployer/spring/src/test/resources/test.xml
+++ b/karaf/deployer/spring/src/test/resources/test.xml
@@ -34,17 +34,17 @@
Header=value
</manifest>
- <bean id="springDeploymentListener" class="org.apache.servicemix.kernel.deployer.spring.SpringDeploymentListener">
+ <bean id="springDeploymentListener" class="org.apache.felix.karaf.deployer.spring.SpringDeploymentListener">
</bean>
<osgi:service ref="springDeploymentListener">
<osgi:interfaces>
- <value>org.apache.servicemix.kernel.deployer.filemonitor.DeploymentListener</value>
+ <value>org.apache.felix.karaf.deployer.filemonitor.DeploymentListener</value>
</osgi:interfaces>
</osgi:service>
- <bean id="springHandler" class="org.apache.servicemix.kernel.deployer.spring.SpringURLHandler" />
+ <bean id="springHandler" class="org.apache.felix.karaf.deployer.spring.SpringURLHandler" />
<osgi:service ref="springHandler" interface="org.osgi.service.url.URLStreamHandlerService">
<osgi:service-properties>
@@ -52,4 +52,4 @@
</osgi:service-properties>
</osgi:service>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-admin/pom.xml b/karaf/gshell/gshell-admin/pom.xml
index 0a6a2a4..9c2aecd 100644
--- a/karaf/gshell/gshell-admin/pom.xml
+++ b/karaf/gshell/gshell-admin/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
<artifactId>gshell</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.admin</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.admin</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: GShell Admin</name>
+ <name>Apache Felix Karaf :: GShell Admin</name>
<description>
Provides administration commands
@@ -39,22 +39,22 @@
<properties>
<gshell.osgi.import>
- org.apache.servicemix.kernel.main.spi.*;resolution:=optional,
+ org.apache.felix.karaf.main.spi.*;resolution:=optional,
org.apache.geronimo.gshell*,
</gshell.osgi.import>
<gshell.osgi.export>
org.apache.servicemix.jpm
</gshell.osgi.export>
<gshell.osgi.private>
- org.apache.servicemix.kernel.gshell.admin.*,
+ org.apache.felix.karaf.gshell.admin.*,
org.apache.servicemix.jpm.impl
</gshell.osgi.private>
</properties>
<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>
</dependency>
<dependency>
@@ -110,7 +110,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/classes/org/apache/servicemix/kernel/gshell/admin/etc</outputDirectory>
+ <outputDirectory>${basedir}/target/classes/org/apache/felix/karaf/gshell/admin/etc</outputDirectory>
<resources>
<resource>
<directory>../../${config.location}</directory>
@@ -136,12 +136,12 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.servicemix.kernel.gshell.admin.*;version=${project.version}
+ <Export-Package>org.apache.felix.karaf.gshell.admin.*;version=${project.version}
</Export-Package>
<Import-Package>
org.apache.geronimo.gshell.wisdom.command,
org.apache.geronimo.gshell.wisdom.registry,
- org.apache.servicemix.kernel.gshell.core,
+ org.apache.felix.karaf.gshell.core,
*
</Import-Package>
<Private-Package>org.apache.servicemix.jpm.*</Private-Package>
diff --git a/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/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.servicemix.features.cfg
similarity index 91%
rename from karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/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.servicemix.features.cfg
index 2e22aec..74e733d 100644
--- a/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/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.servicemix.features.cfg
@@ -20,7 +20,7 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.servicemix.kernel/apache-servicemix-kernel/${version}/xml/features
+featuresRepositories=mvn:org.apache.felix.karaf/apache-felix-karaf/${version}/xml/features
#
# Comma separated list of features to install at startup
diff --git a/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties b/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/startup.properties
similarity index 68%
rename from karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties
rename to karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/startup.properties
index fe1b9b8..103d45a 100644
--- a/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties
+++ b/karaf/gshell/gshell-admin/src/main/filtered-resources/org/apache/felix/karaf/gshell/admin/etc/startup.properties
@@ -34,7 +34,7 @@
org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
org/apache/geronimo/specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}/geronimo-annotation_1.0_spec-${geronimo.annotation.version}.jar=10
org/apache/felix/org.apache.felix.prefs/${felix.prefs.version}/org.apache.felix.prefs-${felix.prefs.version}.jar=10
-org/apache/servicemix/kernel/deployer/org.apache.servicemix.kernel.deployer.filemonitor/${pom.version}/org.apache.servicemix.kernel.deployer.filemonitor-${pom.version}.jar=15
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.filemonitor/${pom.version}/org.apache.felix.karaf.deployer.filemonitor-${pom.version}.jar=15
#
# The rest of the services..
@@ -54,18 +54,18 @@
org/springframework/osgi/spring-osgi-core/${spring.osgi.version}/spring-osgi-core-${spring.osgi.version}.jar=30
org/springframework/osgi/spring-osgi-extender/${spring.osgi.version}/spring-osgi-extender-${spring.osgi.version}.jar=30
org/springframework/osgi/spring-osgi-io/${spring.osgi.version}/spring-osgi-io-${spring.osgi.version}.jar=30
-org/apache/servicemix/kernel/deployer/org.apache.servicemix.kernel.deployer.spring/${pom.version}/org.apache.servicemix.kernel.deployer.spring-${pom.version}.jar=30
-org/apache/servicemix/kernel/deployer/org.apache.servicemix.kernel.deployer.blueprint/${pom.version}/org.apache.servicemix.kernel.deployer.blueprint-${pom.version}.jar=30
-org/apache/servicemix/kernel/deployer/org.apache.servicemix.kernel.deployer.features/${pom.version}/org.apache.servicemix.kernel.deployer.features-${pom.version}.jar=30
-org/apache/servicemix/kernel/org.apache.servicemix.kernel.management/${pom.version}/org.apache.servicemix.kernel.management-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.admin/${pom.version}/org.apache.servicemix.kernel.gshell.admin-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.osgi/${pom.version}/org.apache.servicemix.kernel.gshell.osgi-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.features/${pom.version}/org.apache.servicemix.kernel.gshell.features-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.log/${pom.version}/org.apache.servicemix.kernel.gshell.log-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.config/${pom.version}/org.apache.servicemix.kernel.gshell.config-${pom.version}.jar=30
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.packages/${pom.version}/org.apache.servicemix.kernel.gshell.packages-${pom.version}.jar=30
-org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.config/${pom.version}/org.apache.servicemix.kernel.jaas.config-${pom.version}.jar=30
-org/apache/servicemix/kernel/jaas/org.apache.servicemix.kernel.jaas.modules/${pom.version}/org.apache.servicemix.kernel.jaas.modules-${pom.version}.jar=30
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.spring/${pom.version}/org.apache.felix.karaf.deployer.spring-${pom.version}.jar=30
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.blueprint/${pom.version}/org.apache.felix.karaf.deployer.blueprint-${pom.version}.jar=30
+org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.features/${pom.version}/org.apache.felix.karaf.deployer.features-${pom.version}.jar=30
+org/apache/felix/karaf/org.apache.felix.karaf.management/${pom.version}/org.apache.felix.karaf.management-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.admin/${pom.version}/org.apache.felix.karaf.gshell.admin-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.osgi/${pom.version}/org.apache.felix.karaf.gshell.osgi-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.features/${pom.version}/org.apache.felix.karaf.gshell.features-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.log/${pom.version}/org.apache.felix.karaf.gshell.log-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.config/${pom.version}/org.apache.felix.karaf.gshell.config-${pom.version}.jar=30
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.packages/${pom.version}/org.apache.felix.karaf.gshell.packages-${pom.version}.jar=30
+org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.config/${pom.version}/org.apache.felix.karaf.jaas.config-${pom.version}.jar=30
+org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.modules/${pom.version}/org.apache.felix.karaf.jaas.modules-${pom.version}.jar=30
org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30
org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30
org/osgi/jmx/${osgi.jmx.version}/jmx-${osgi.jmx.version}.jar=30
@@ -74,5 +74,5 @@
#
# Start console last
#
-org/apache/servicemix/kernel/gshell/org.apache.servicemix.kernel.gshell.core/${pom.version}/org.apache.servicemix.kernel.gshell.core-${pom.version}.jar=40
+org/apache/felix/karaf/gshell/org.apache.felix.karaf.gshell.core/${pom.version}/org.apache.felix.karaf.gshell.core-${pom.version}.jar=40
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/AdminService.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminService.java
similarity index 94%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/AdminService.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminService.java
index cbf7181..1721ca3 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/AdminService.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin;
+package org.apache.felix.karaf.gshell.admin;
public interface AdminService {
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/AdminServiceMBean.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminServiceMBean.java
similarity index 95%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/AdminServiceMBean.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminServiceMBean.java
index 8a68d2d..8e3f8ae 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/AdminServiceMBean.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/AdminServiceMBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin;
+package org.apache.felix.karaf.gshell.admin;
public interface AdminServiceMBean {
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/Instance.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/Instance.java
similarity index 95%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/Instance.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/Instance.java
index 07612aa..e60485d 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/Instance.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/Instance.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin;
+package org.apache.felix.karaf.gshell.admin;
public interface Instance {
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java
similarity index 96%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java
index 54283a8..6e39bfd 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin.internal;
+package org.apache.felix.karaf.gshell.admin.internal;
import java.io.File;
import java.io.FileOutputStream;
@@ -31,8 +31,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gshell.shell.ShellContext;
import org.apache.geronimo.gshell.shell.ShellContextHolder;
-import org.apache.servicemix.kernel.gshell.admin.AdminService;
-import org.apache.servicemix.kernel.gshell.admin.Instance;
+import org.apache.felix.karaf.gshell.admin.AdminService;
+import org.apache.felix.karaf.gshell.admin.Instance;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
import org.osgi.service.prefs.PreferencesService;
@@ -174,7 +174,7 @@
File outFile = new File(target, resource);
if( !outFile.exists() ) {
println("Creating file: @|bold " + outFile.getPath() + "|");
- InputStream is = getClass().getClassLoader().getResourceAsStream("/org/apache/servicemix/kernel/gshell/admin/" + resource);
+ InputStream is = getClass().getClassLoader().getResourceAsStream("/org/apache/felix/karaf/gshell/admin/" + resource);
try {
if( text ) {
// Read it line at a time so that we can use the platform line ending when we write it out.
@@ -219,7 +219,7 @@
File outFile = new File(target, resource);
if( !outFile.exists() ) {
println("Creating file: @|bold "+outFile.getPath()+"|");
- InputStream is = getClass().getClassLoader().getResourceAsStream("/org/apache/servicemix/kernel/gshell/admin/" + resource);
+ InputStream is = getClass().getClassLoader().getResourceAsStream("/org/apache/felix/karaf/gshell/admin/" + resource);
try {
// Read it line at a time so that we can use the platform line ending when we write it out.
PrintStream out = new PrintStream(new FileOutputStream(outFile));
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceMBeanImpl.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceMBeanImpl.java
similarity index 90%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceMBeanImpl.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceMBeanImpl.java
index a53b663..afa3d83 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceMBeanImpl.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceMBeanImpl.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin.internal;
+package org.apache.felix.karaf.gshell.admin.internal;
-import org.apache.servicemix.kernel.gshell.admin.AdminService;
-import org.apache.servicemix.kernel.gshell.admin.AdminServiceMBean;
-import org.apache.servicemix.kernel.gshell.admin.Instance;
+import org.apache.felix.karaf.gshell.admin.AdminService;
+import org.apache.felix.karaf.gshell.admin.AdminServiceMBean;
+import org.apache.felix.karaf.gshell.admin.Instance;
public class AdminServiceMBeanImpl implements AdminServiceMBean {
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/InstanceImpl.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/InstanceImpl.java
similarity index 97%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/InstanceImpl.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/InstanceImpl.java
index 3815ca5..9981e67 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/InstanceImpl.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/InstanceImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin.internal;
+package org.apache.felix.karaf.gshell.admin.internal;
import java.io.File;
import java.io.FileInputStream;
@@ -31,7 +31,7 @@
import org.apache.servicemix.jpm.Process;
import org.apache.servicemix.jpm.ProcessBuilderFactory;
import org.apache.servicemix.jpm.impl.ScriptUtils;
-import org.apache.servicemix.kernel.gshell.admin.Instance;
+import org.apache.felix.karaf.gshell.admin.Instance;
public class InstanceImpl implements Instance {
@@ -135,7 +135,7 @@
+ " -Dservicemix.startLocalConsole=false"
+ " -Dservicemix.startRemoteShell=true"
+ " -classpath " + classpath.toString()
- + " org.apache.servicemix.kernel.main.Main";
+ + " org.apache.felix.karaf.main.Main";
LOG.debug("Starting instance with command: " + command);
this.process = ProcessBuilderFactory.newInstance().newBuilder()
.directory(new File(location))
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/AdminCommandSupport.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/AdminCommandSupport.java
similarity index 83%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/AdminCommandSupport.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/AdminCommandSupport.java
index 9da97b4..6880560 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/AdminCommandSupport.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/AdminCommandSupport.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin.internal.commands;
+package org.apache.felix.karaf.gshell.admin.internal.commands;
-import org.apache.servicemix.kernel.gshell.admin.AdminService;
-import org.apache.servicemix.kernel.gshell.admin.Instance;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.admin.AdminService;
+import org.apache.felix.karaf.gshell.admin.Instance;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
public abstract class AdminCommandSupport extends OsgiCommandSupport {
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ChangePortCommand.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.java
similarity index 94%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ChangePortCommand.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.java
index adbf2f6..02d9bd9 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ChangePortCommand.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin.internal.commands;
+package org.apache.felix.karaf.gshell.admin.internal.commands;
import org.apache.geronimo.gshell.clp.Argument;
@@ -30,4 +30,4 @@
getExistingInstance(instance).changePort(port);
return Result.SUCCESS;
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.java
similarity index 95%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.java
index 244b9f8..83caa55 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin.internal.commands;
+package org.apache.felix.karaf.gshell.admin.internal.commands;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/CreateCommand.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java
similarity index 95%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/CreateCommand.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java
index d13c381..f255530 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/CreateCommand.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin.internal.commands;
+package org.apache.felix.karaf.gshell.admin.internal.commands;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java
similarity index 94%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java
index 6084caa..8f0235f 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin.internal.commands;
+package org.apache.felix.karaf.gshell.admin.internal.commands;
import org.apache.geronimo.gshell.clp.Argument;
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ListCommand.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.java
similarity index 94%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ListCommand.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.java
index 61f3afb..62c0c22 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ListCommand.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin.internal.commands;
+package org.apache.felix.karaf.gshell.admin.internal.commands;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.servicemix.kernel.gshell.admin.Instance;
+import org.apache.felix.karaf.gshell.admin.Instance;
/**
* List available instances
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/StartCommand.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.java
similarity index 94%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/StartCommand.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.java
index 77afa91..f701797 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/StartCommand.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin.internal.commands;
+package org.apache.felix.karaf.gshell.admin.internal.commands;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/StopCommand.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.java
similarity index 94%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/StopCommand.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.java
index c449387..0d1e65e 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/StopCommand.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin.internal.commands;
+package org.apache.felix.karaf.gshell.admin.internal.commands;
import org.apache.geronimo.gshell.clp.Argument;
@@ -27,4 +27,4 @@
getExistingInstance(instance).stop();
return Result.SUCCESS;
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/completers/InstanceCompleter.java b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/completers/InstanceCompleter.java
similarity index 89%
rename from karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/completers/InstanceCompleter.java
rename to karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/completers/InstanceCompleter.java
index cfcb95a..b202d3d 100644
--- a/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/completers/InstanceCompleter.java
+++ b/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/completers/InstanceCompleter.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.admin.internal.completers;
+package org.apache.felix.karaf.gshell.admin.internal.completers;
import java.util.List;
-import org.apache.servicemix.kernel.gshell.admin.AdminService;
-import org.apache.servicemix.kernel.gshell.admin.Instance;
+import org.apache.felix.karaf.gshell.admin.AdminService;
+import org.apache.felix.karaf.gshell.admin.Instance;
import org.apache.geronimo.gshell.console.completer.StringsCompleter;
import jline.Completor;
diff --git a/karaf/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml b/karaf/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml
index 5f05513..9e0877f 100644
--- a/karaf/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml
+++ b/karaf/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml
@@ -35,7 +35,7 @@
http://servicemix.apache.org/schema/servicemix-gshell
http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
- <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
+ <import resource="classpath:org/apache/felix/karaf/gshell/core/commands.xml" />
<bean id="adminCommandBundleSupport" scope="prototype">
<property name="adminService" ref="adminService" />
@@ -43,11 +43,11 @@
<gshell:command-bundle>
<gshell:command name="admin/create">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.CreateCommand"
+ <gshell:action class="org.apache.felix.karaf.gshell.admin.internal.commands.CreateCommand"
parent="adminCommandBundleSupport" />
</gshell:command>
<gshell:command name="admin/connect">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.ConnectCommand"
+ <gshell:action class="org.apache.felix.karaf.gshell.admin.internal.commands.ConnectCommand"
parent="adminCommandBundleSupport" />
<gshell:completers>
<ref bean="instanceCompleter" />
@@ -55,11 +55,11 @@
</gshell:completers>
</gshell:command>
<gshell:command name="admin/list">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.ListCommand"
+ <gshell:action class="org.apache.felix.karaf.gshell.admin.internal.commands.ListCommand"
parent="adminCommandBundleSupport" />
</gshell:command>
<gshell:command name="admin/start">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.StartCommand"
+ <gshell:action class="org.apache.felix.karaf.gshell.admin.internal.commands.StartCommand"
parent="adminCommandBundleSupport" />
<gshell:completers>
<ref bean="instanceCompleter" />
@@ -67,7 +67,7 @@
</gshell:completers>
</gshell:command>
<gshell:command name="admin/stop">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.StopCommand"
+ <gshell:action class="org.apache.felix.karaf.gshell.admin.internal.commands.StopCommand"
parent="adminCommandBundleSupport" />
<gshell:completers>
<ref bean="instanceCompleter" />
@@ -75,7 +75,7 @@
</gshell:completers>
</gshell:command>
<gshell:command name="admin/destroy">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.DestroyCommand"
+ <gshell:action class="org.apache.felix.karaf.gshell.admin.internal.commands.DestroyCommand"
parent="adminCommandBundleSupport" />
<gshell:completers>
<ref bean="instanceCompleter" />
@@ -83,7 +83,7 @@
</gshell:completers>
</gshell:command>
<gshell:command name="admin/change-port">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.ChangePortCommand"
+ <gshell:action class="org.apache.felix.karaf.gshell.admin.internal.commands.ChangePortCommand"
parent="adminCommandBundleSupport" />
<gshell:completers>
<ref bean="instanceCompleter" />
@@ -94,13 +94,13 @@
<osgi:reference id="preferences" interface="org.osgi.service.prefs.PreferencesService" cardinality="0..1" />
- <bean id="adminService" class="org.apache.servicemix.kernel.gshell.admin.internal.AdminServiceImpl">
+ <bean id="adminService" class="org.apache.felix.karaf.gshell.admin.internal.AdminServiceImpl">
<property name="preferences" ref="preferences" />
</bean>
- <bean id="instanceCompleter" class="org.apache.servicemix.kernel.gshell.admin.internal.completers.InstanceCompleter">
+ <bean id="instanceCompleter" class="org.apache.felix.karaf.gshell.admin.internal.completers.InstanceCompleter">
<property name="adminService" ref="adminService" />
</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/bin/servicemix b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/servicemix
similarity index 99%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/bin/servicemix
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/servicemix
index 20a33e6..e52bc53 100644
--- a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/bin/servicemix
+++ b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/servicemix
@@ -22,4 +22,4 @@
SERVICEMIX_BASE=${servicemix.base}
export SERVICEMIX_BASE
-${SERVICEMIX_HOME}/bin/servicemix "$*"
\ No newline at end of file
+${SERVICEMIX_HOME}/bin/servicemix "$*"
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/bin/servicemix.bat b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/servicemix.bat
similarity index 100%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/bin/servicemix.bat
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/bin/servicemix.bat
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/org.apache.servicemix.shell.cfg b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/org.apache.servicemix.shell.cfg
similarity index 100%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/org.apache.servicemix.shell.cfg
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/org.apache.servicemix.shell.cfg
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/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
similarity index 100%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/org.ops4j.pax.logging.cfg
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/org.ops4j.pax.logging.cfg
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/org.ops4j.pax.url.mvn.cfg b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/org.ops4j.pax.url.mvn.cfg
similarity index 100%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/org.ops4j.pax.url.mvn.cfg
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/org.ops4j.pax.url.mvn.cfg
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/system.properties b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/system.properties
similarity index 99%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/system.properties
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/system.properties
index 255295e..a53a6d0 100644
--- a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/system.properties
+++ b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/system.properties
@@ -18,4 +18,4 @@
################################################################################
org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
-servicemix.name=${servicemix.name}
\ No newline at end of file
+servicemix.name=${servicemix.name}
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/users.properties b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/users.properties
similarity index 100%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/users.properties
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/etc/users.properties
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ChangePortCommand.properties b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ChangePortCommand.properties
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.properties
index 6a7edbf..f3d9a09 100644
--- a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ChangePortCommand.properties
+++ b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ChangePortCommand.properties
@@ -24,4 +24,4 @@
command.description=Change the port of an existing instance.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.properties b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.properties
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.properties
index 1c78a34..9c022ac 100644
--- a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.properties
+++ b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ConnectCommand.properties
@@ -24,4 +24,4 @@
command.description=Connect to an existing instance.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/CreateCommand.properties b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/CreateCommand.properties
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.properties
index 532ada2..12e0f3b 100644
--- a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/CreateCommand.properties
+++ b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/CreateCommand.properties
@@ -24,4 +24,4 @@
command.description=Create a new instance.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.properties b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.properties
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.properties
index cb0581c..68a1568 100644
--- a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.properties
+++ b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/DestroyCommand.properties
@@ -24,4 +24,4 @@
command.description=Destroy an existing instance.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ListCommand.properties b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ListCommand.properties
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.properties
index c473471..08ad892 100644
--- a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ListCommand.properties
+++ b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/ListCommand.properties
@@ -24,4 +24,4 @@
command.description=List existing instances.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StartCommand.properties b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StartCommand.properties
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.properties
index dfb4046..1da68f1 100644
--- a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StartCommand.properties
+++ b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/StartCommand.properties
@@ -24,4 +24,4 @@
command.description=Start an existing instance.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StopCommand.properties b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StopCommand.properties
rename to karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.properties
index 0cd3acd..3c324d8 100644
--- a/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StopCommand.properties
+++ b/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/gshell/admin/internal/commands/StopCommand.properties
@@ -24,4 +24,4 @@
command.description=Stop an existing instance.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-config/pom.xml b/karaf/gshell/gshell-config/pom.xml
index 8bab513..74c0e3c 100644
--- a/karaf/gshell/gshell-config/pom.xml
+++ b/karaf/gshell/gshell-config/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
<artifactId>gshell</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.config</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.config</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: GShell ConfigAdmin Commands</name>
+ <name>Apache Felix Karaf :: GShell ConfigAdmin Commands</name>
<description>
Provides the ConfigAdmin GShell commands
@@ -39,8 +39,8 @@
<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>
</dependency>
<dependency>
@@ -75,12 +75,12 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.servicemix.kernel.gshell.config*;version=${project.version};-split-package:=merge-first
+ org.apache.felix.karaf.gshell.config*;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
org.apache.geronimo.gshell.wisdom.command,
org.apache.geronimo.gshell.wisdom.registry,
- org.apache.servicemix.kernel.gshell.core,
+ org.apache.felix.karaf.gshell.core,
*
</Import-Package>
<Private-Package>!*</Private-Package>
diff --git a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/CancelCommand.java b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/CancelCommand.java
similarity index 95%
rename from karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/CancelCommand.java
rename to karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/CancelCommand.java
index e31ccfb..93a3630 100644
--- a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/CancelCommand.java
+++ b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/CancelCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.config;
+package org.apache.felix.karaf.gshell.config;
import org.osgi.service.cm.ConfigurationAdmin;
diff --git a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/ConfigCommandSupport.java b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ConfigCommandSupport.java
similarity index 94%
rename from karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/ConfigCommandSupport.java
rename to karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ConfigCommandSupport.java
index 5a28289..8d4e64b 100644
--- a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/ConfigCommandSupport.java
+++ b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ConfigCommandSupport.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.config;
+package org.apache.felix.karaf.gshell.config;
import java.util.Dictionary;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.ConfigurationAdmin;
diff --git a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/EditCommand.java b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/EditCommand.java
similarity index 96%
rename from karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/EditCommand.java
rename to karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/EditCommand.java
index f041da3..c32029a 100644
--- a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/EditCommand.java
+++ b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/EditCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.config;
+package org.apache.felix.karaf.gshell.config;
import java.util.Dictionary;
diff --git a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/ListCommand.java b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ListCommand.java
similarity index 97%
rename from karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/ListCommand.java
rename to karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ListCommand.java
index 7657d6b..51a41f0 100644
--- a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/ListCommand.java
+++ b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/ListCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.config;
+package org.apache.felix.karaf.gshell.config;
import java.util.Dictionary;
import java.util.Enumeration;
diff --git a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropDelCommand.java b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropDelCommand.java
similarity index 96%
rename from karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropDelCommand.java
rename to karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropDelCommand.java
index 8e87dc7..b8eb07d 100644
--- a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropDelCommand.java
+++ b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropDelCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.config;
+package org.apache.felix.karaf.gshell.config;
import java.util.Dictionary;
diff --git a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropListCommand.java b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropListCommand.java
similarity index 96%
rename from karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropListCommand.java
rename to karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropListCommand.java
index 2f7a446..9f09229 100644
--- a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropListCommand.java
+++ b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropListCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.config;
+package org.apache.felix.karaf.gshell.config;
import java.util.Dictionary;
import java.util.Enumeration;
diff --git a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropSetCommand.java b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropSetCommand.java
similarity index 96%
rename from karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropSetCommand.java
rename to karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropSetCommand.java
index a0c3112..0d60b31 100644
--- a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/PropSetCommand.java
+++ b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/PropSetCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.config;
+package org.apache.felix.karaf.gshell.config;
import java.util.Dictionary;
diff --git a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/UpdateCommand.java b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/UpdateCommand.java
similarity index 96%
rename from karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/UpdateCommand.java
rename to karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/UpdateCommand.java
index 1c6683f..8def27d 100644
--- a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/UpdateCommand.java
+++ b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/UpdateCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.config;
+package org.apache.felix.karaf.gshell.config;
import java.util.Dictionary;
diff --git a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/completers/ConfigurationCompleter.java b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationCompleter.java
similarity index 97%
rename from karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/completers/ConfigurationCompleter.java
rename to karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationCompleter.java
index 7b63351..4bd5efd 100644
--- a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/completers/ConfigurationCompleter.java
+++ b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationCompleter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.config.completers;
+package org.apache.felix.karaf.gshell.config.completers;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/completers/ConfigurationPropertyCompleter.java b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationPropertyCompleter.java
similarity index 93%
rename from karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/completers/ConfigurationPropertyCompleter.java
rename to karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationPropertyCompleter.java
index e21a8e3..b44c00e 100644
--- a/karaf/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/completers/ConfigurationPropertyCompleter.java
+++ b/karaf/gshell/gshell-config/src/main/java/org/apache/felix/karaf/gshell/config/completers/ConfigurationPropertyCompleter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.config.completers;
+package org.apache.felix.karaf.gshell.config.completers;
import java.util.Dictionary;
import java.util.Enumeration;
@@ -27,7 +27,7 @@
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.console.completer.StringsCompleter;
import org.apache.geronimo.gshell.shell.ShellContextHolder;
-import org.apache.servicemix.kernel.gshell.config.ConfigCommandSupport;
+import org.apache.felix.karaf.gshell.config.ConfigCommandSupport;
/**
* {@link jline.Completor} for Configuration Admin properties.
@@ -53,4 +53,4 @@
return delegate.complete(buffer, cursor, candidates);
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-config/src/main/resources/META-INF/spring/gshell-config.xml b/karaf/gshell/gshell-config/src/main/resources/META-INF/spring/gshell-config.xml
index e5c9d6d..2aeaffd 100644
--- a/karaf/gshell/gshell-config/src/main/resources/META-INF/spring/gshell-config.xml
+++ b/karaf/gshell/gshell-config/src/main/resources/META-INF/spring/gshell-config.xml
@@ -35,52 +35,52 @@
http://servicemix.apache.org/schema/servicemix-gshell
http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
- <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
+ <import resource="classpath:org/apache/felix/karaf/gshell/core/commands.xml" />
<gshell:command-bundle>
<gshell:command name="config/cancel">
- <gshell:action class="org.apache.servicemix.kernel.gshell.config.CancelCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.config.CancelCommand" />
</gshell:command>
<gshell:command name="config/edit">
- <gshell:action class="org.apache.servicemix.kernel.gshell.config.EditCommand"/>
+ <gshell:action class="org.apache.felix.karaf.gshell.config.EditCommand"/>
<gshell:completers>
<ref bean="configCompleter" />
<null/>
</gshell:completers>
</gshell:command>
<gshell:command name="config/list">
- <gshell:action class="org.apache.servicemix.kernel.gshell.config.ListCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.config.ListCommand" />
</gshell:command>
<gshell:command name="config/propdel">
- <gshell:action class="org.apache.servicemix.kernel.gshell.config.PropDelCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.config.PropDelCommand" />
<gshell:completers>
<ref bean="configPropertyCompleter" />
<null/>
</gshell:completers>
</gshell:command>
<gshell:command name="config/proplist">
- <gshell:action class="org.apache.servicemix.kernel.gshell.config.PropListCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.config.PropListCommand" />
</gshell:command>
<gshell:command name="config/propset">
- <gshell:action class="org.apache.servicemix.kernel.gshell.config.PropSetCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.config.PropSetCommand" />
<gshell:completers>
<ref bean="configPropertyCompleter" />
<null/>
</gshell:completers>
</gshell:command>
<gshell:command name="config/update">
- <gshell:action class="org.apache.servicemix.kernel.gshell.config.UpdateCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.config.UpdateCommand" />
</gshell:command>
</gshell:command-bundle>
- <bean id="configCompleter" class="org.apache.servicemix.kernel.gshell.config.completers.ConfigurationCompleter" init-method="init">
+ <bean id="configCompleter" class="org.apache.felix.karaf.gshell.config.completers.ConfigurationCompleter" init-method="init">
<property name="admin" ref="configAdmin"/>
</bean>
- <bean id="configPropertyCompleter" class="org.apache.servicemix.kernel.gshell.config.completers.ConfigurationPropertyCompleter" />
+ <bean id="configPropertyCompleter" class="org.apache.felix.karaf.gshell.config.completers.ConfigurationPropertyCompleter" />
<osgi:reference id="configAdmin" interface="org.osgi.service.cm.ConfigurationAdmin" />
<osgi:service ref="configCompleter" interface="org.osgi.service.cm.ConfigurationListener" />
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/CancelCommand.properties b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/CancelCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/CancelCommand.properties
rename to karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/CancelCommand.properties
index 1bc5226..fd8147a 100644
--- a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/CancelCommand.properties
+++ b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/CancelCommand.properties
@@ -24,4 +24,4 @@
command.description=Change the changes to the configuration being edited.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/EditCommand.properties b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/EditCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/EditCommand.properties
rename to karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/EditCommand.properties
index ca2f8e6..c8b769e 100644
--- a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/EditCommand.properties
+++ b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/EditCommand.properties
@@ -24,4 +24,4 @@
command.description=Create or edit a configuration.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/ListCommand.properties b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/ListCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/ListCommand.properties
rename to karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/ListCommand.properties
index a5d2c31..410eadd 100644
--- a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/ListCommand.properties
+++ b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/ListCommand.properties
@@ -24,4 +24,4 @@
command.description=List existing configurations.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/PropDelCommand.properties b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropDelCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/PropDelCommand.properties
rename to karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropDelCommand.properties
index 9e76af6..9bc63f0 100644
--- a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/PropDelCommand.properties
+++ b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropDelCommand.properties
@@ -24,4 +24,4 @@
command.description=Delete a property from the edited configuration.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/PropListCommand.properties b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropListCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/PropListCommand.properties
rename to karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropListCommand.properties
index 9dab240..dd609ad 100644
--- a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/PropListCommand.properties
+++ b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropListCommand.properties
@@ -24,4 +24,4 @@
command.description=List properties from the edited configuration.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/PropSetCommand.properties b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropSetCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/PropSetCommand.properties
rename to karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropSetCommand.properties
index df4a2dc..0cf9a23 100644
--- a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/PropSetCommand.properties
+++ b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/PropSetCommand.properties
@@ -24,4 +24,4 @@
command.description=Set a property on the edited configuration.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/UpdateCommand.properties b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/UpdateCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/UpdateCommand.properties
rename to karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/UpdateCommand.properties
index 810f08f..9ab3558 100644
--- a/karaf/gshell/gshell-config/src/main/resources/org/apache/servicemix/kernel/gshell/config/UpdateCommand.properties
+++ b/karaf/gshell/gshell-config/src/main/resources/org/apache/felix/karaf/gshell/config/UpdateCommand.properties
@@ -24,4 +24,4 @@
command.description=Save and propagate changes from the configuration being edited.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-core/pom.xml b/karaf/gshell/gshell-core/pom.xml
index 19e9a27..8747936 100644
--- a/karaf/gshell/gshell-core/pom.xml
+++ b/karaf/gshell/gshell-core/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
<artifactId>gshell</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <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>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: GShell Core</name>
+ <name>Apache Felix Karaf :: GShell Core</name>
<description>
Provides the OSGi GShell integration
@@ -48,9 +48,9 @@
org.apache.commons.vfs.provider.temp,
org.apache.commons.vfs.provider.ram,
jline*,
- org.apache.servicemix.kernel.jaas.config;resolution:=optional,
- org.apache.servicemix.kernel.version;resolution:=optional,
- org.apache.servicemix.kernel.main.spi;resolution:=optional;version="1.0.0",
+ org.apache.felix.karaf.jaas.config;resolution:=optional,
+ org.apache.felix.karaf.version;resolution:=optional,
+ org.apache.felix.karaf.main.spi;resolution:=optional;version="1.0.0",
org.codehaus.plexus*;resolution:=optional,
org.apache.sshd.server.keyprovider,
org.apache.sshd.server.jaas,
@@ -60,7 +60,7 @@
<!-- TODO: remove plexus util package -->
<gshell.osgi.export>
org.apache.geronimo.gshell*;version="1.0.0.alpha-2-SNAPSHOT";-split-package:=merge-first,
- org.apache.servicemix.kernel.gshell.core*,
+ org.apache.felix.karaf.gshell.core*,
org.codehaus.plexus.interpolation*;-split-package:=merge-first,
org.codehaus.plexus.util;-split-package:=merge-first
</gshell.osgi.export>
@@ -68,12 +68,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.main</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.main</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.config</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.config</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
diff --git a/karaf/gshell/gshell-core/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/core/servicemix-version.properties b/karaf/gshell/gshell-core/src/main/filtered-resources/org/apache/felix/karaf/gshell/core/servicemix-version.properties
similarity index 100%
rename from karaf/gshell/gshell-core/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/core/servicemix-version.properties
rename to karaf/gshell/gshell-core/src/main/filtered-resources/org/apache/felix/karaf/gshell/core/servicemix-version.properties
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationImpl.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ApplicationImpl.java
similarity index 94%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationImpl.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ApplicationImpl.java
index 350fd63..5593a43 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationImpl.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ApplicationImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.core;
+package org.apache.felix.karaf.gshell.core;
import java.io.File;
import java.io.IOException;
@@ -32,8 +32,8 @@
public class ApplicationImpl implements Application, InitializingBean {
- private static final String EMBEDDED_PROPS = "org/apache/servicemix/kernel/version/embedded.properties";
- private static final String SERVICEMIX_VERSION ="org/apache/servicemix/kernel/gshell/core/servicemix-version.properties";
+ private static final String EMBEDDED_PROPS = "org/apache/felix/karaf/version/embedded.properties";
+ private static final String SERVICEMIX_VERSION ="org/apache/felix/karaf/gshell/core/servicemix-version.properties";
private static final String VERSION_PROPERTY = "version";
private String id;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationManagerImpl.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ApplicationManagerImpl.java
similarity index 98%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationManagerImpl.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ApplicationManagerImpl.java
index 7465900..9e5f722 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ApplicationManagerImpl.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ApplicationManagerImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.core;
+package org.apache.felix.karaf.gshell.core;
import org.apache.geronimo.gshell.application.Application;
import org.apache.geronimo.gshell.application.ApplicationConfiguration;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerAwareProcessor.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/BeanContainerAwareProcessor.java
similarity index 97%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerAwareProcessor.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/BeanContainerAwareProcessor.java
index 7deacb1..fdd3783 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerAwareProcessor.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/BeanContainerAwareProcessor.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core;
+package org.apache.felix.karaf.gshell.core;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerAware;
@@ -52,4 +52,4 @@
public Object postProcessAfterInitialization(final Object bean, final String beanName) throws BeansException {
return bean;
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerWrapper.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/BeanContainerWrapper.java
similarity index 98%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerWrapper.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/BeanContainerWrapper.java
index edc15d7..d5226ac 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/BeanContainerWrapper.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/BeanContainerWrapper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core;
+package org.apache.felix.karaf.gshell.core;
import java.net.URL;
import java.util.Arrays;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/CommandBundle.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/CommandBundle.java
similarity index 98%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/CommandBundle.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/CommandBundle.java
index 2111072..b44014e 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/CommandBundle.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/CommandBundle.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core;
+package org.apache.felix.karaf.gshell.core;
import java.util.ArrayList;
import java.util.Dictionary;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/LocalConsole.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/LocalConsole.java
similarity index 97%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/LocalConsole.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/LocalConsole.java
index 6f9a8ee..bfac6ea 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/LocalConsole.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/LocalConsole.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core;
+package org.apache.felix.karaf.gshell.core;
import java.util.Arrays;
import java.util.concurrent.CountDownLatch;
@@ -73,7 +73,7 @@
}
public void init() {
- mainServiceTracker = new ServiceTracker(bundleContext, "org.apache.servicemix.kernel.main.spi.MainService", null);
+ mainServiceTracker = new ServiceTracker(bundleContext, "org.apache.felix.karaf.main.spi.MainService", null);
mainServiceTracker.open();
shell.getContext().getVariables().set("gshell.username", "smx");
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiAliasRegistry.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiAliasRegistry.java
similarity index 96%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiAliasRegistry.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiAliasRegistry.java
index a09ce0b..4e632a1 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiAliasRegistry.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiAliasRegistry.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core;
+package org.apache.felix.karaf.gshell.core;
import java.util.Map;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandRegistry.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiCommandRegistry.java
similarity index 97%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandRegistry.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiCommandRegistry.java
index c6817e8..78097b3 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandRegistry.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiCommandRegistry.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core;
+package org.apache.felix.karaf.gshell.core;
import java.util.Map;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandSupport.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiCommandSupport.java
similarity index 98%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandSupport.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiCommandSupport.java
index e13940a..7844711 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandSupport.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/OsgiCommandSupport.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core;
+package org.apache.felix.karaf.gshell.core;
import java.util.ArrayList;
import java.util.List;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ServiceMixBranding.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ServiceMixBranding.java
similarity index 98%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ServiceMixBranding.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ServiceMixBranding.java
index 803b511..b0bcc0f 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ServiceMixBranding.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ServiceMixBranding.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.core;
+package org.apache.felix.karaf.gshell.core;
import java.io.FileNotFoundException;
import java.io.IOException;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ShellWrapper.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ShellWrapper.java
similarity index 97%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ShellWrapper.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ShellWrapper.java
index ae86534..3a0b3c6 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ShellWrapper.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ShellWrapper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.core;
+package org.apache.felix.karaf.gshell.core;
import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.shell.ShellContext;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/WorkAroundAliasCommand.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/WorkAroundAliasCommand.java
similarity index 98%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/WorkAroundAliasCommand.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/WorkAroundAliasCommand.java
index 1e52177..bf7bc49 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/WorkAroundAliasCommand.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/WorkAroundAliasCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.core;
+package org.apache.felix.karaf.gshell.core;
import java.util.Iterator;
import java.util.List;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/commands/InfoAction.java
similarity index 98%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/commands/InfoAction.java
index 8f3b580..b8ebb56 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/commands/InfoAction.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core.commands;
+package org.apache.felix.karaf.gshell.core.commands;
import java.lang.management.ClassLoadingMXBean;
import java.lang.management.GarbageCollectorMXBean;
@@ -36,7 +36,7 @@
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
import org.apache.geronimo.gshell.io.IO;
-import org.apache.servicemix.kernel.gshell.core.ServiceMixBranding;
+import org.apache.felix.karaf.gshell.core.ServiceMixBranding;
import org.codehaus.plexus.util.StringUtils;
public class InfoAction implements CommandAction {
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/CommandParser.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/CommandParser.java
similarity index 98%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/CommandParser.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/CommandParser.java
index 45d9d7d..f1efa60 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/CommandParser.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/CommandParser.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core.config;
+package org.apache.felix.karaf.gshell.core.config;
import java.util.ArrayList;
import java.util.List;
@@ -29,7 +29,7 @@
import org.apache.geronimo.gshell.wisdom.command.ConfigurableCommandCompleter;
import org.apache.geronimo.gshell.wisdom.command.LinkImpl;
import org.apache.geronimo.gshell.wisdom.registry.CommandLocationImpl;
-import org.apache.servicemix.kernel.gshell.core.CommandBundle;
+import org.apache.felix.karaf.gshell.core.CommandBundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanDefinitionStoreException;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/NamespaceHandler.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/NamespaceHandler.java
similarity index 94%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/NamespaceHandler.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/NamespaceHandler.java
index 3e464d3..e2c7913 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/NamespaceHandler.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/NamespaceHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core.config;
+package org.apache.felix.karaf.gshell.core.config;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/BogusPasswordAuthenticator.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/sshd/BogusPasswordAuthenticator.java
similarity index 94%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/BogusPasswordAuthenticator.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/sshd/BogusPasswordAuthenticator.java
index 34e2527..f6b19e0 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/BogusPasswordAuthenticator.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/sshd/BogusPasswordAuthenticator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core.sshd;
+package org.apache.felix.karaf.gshell.core.sshd;
import org.apache.sshd.server.PasswordAuthenticator;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/SshServerFactory.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/sshd/SshServerFactory.java
similarity index 96%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/SshServerFactory.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/sshd/SshServerFactory.java
index fbf9041..1e8a946 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/sshd/SshServerFactory.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/sshd/SshServerFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core.sshd;
+package org.apache.felix.karaf.gshell.core.sshd;
import org.apache.sshd.SshServer;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileObject.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/vfs/mvn/MvnFileObject.java
similarity index 96%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileObject.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/vfs/mvn/MvnFileObject.java
index 41a2bb8..a3635e6 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileObject.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/vfs/mvn/MvnFileObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core.vfs.mvn;
+package org.apache.felix.karaf.gshell.core.vfs.mvn;
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileProvider.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/vfs/mvn/MvnFileProvider.java
similarity index 97%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileProvider.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/vfs/mvn/MvnFileProvider.java
index 7d88cd6..35f541e 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileProvider.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/vfs/mvn/MvnFileProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core.vfs.mvn;
+package org.apache.felix.karaf.gshell.core.vfs.mvn;
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileSystem.java b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/vfs/mvn/MvnFileSystem.java
similarity index 95%
rename from karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileSystem.java
rename to karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/vfs/mvn/MvnFileSystem.java
index 7583eb5..9f34267 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileSystem.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/vfs/mvn/MvnFileSystem.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.core.vfs.mvn;
+package org.apache.felix.karaf.gshell.core.vfs.mvn;
import org.apache.commons.vfs.FileName;
import org.apache.commons.vfs.FileObject;
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/shell/FindAction.java b/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/shell/FindAction.java
index 203e340..99bfc2d 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/shell/FindAction.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/shell/FindAction.java
@@ -205,4 +205,4 @@
return true;
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java b/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java
index 7e71328..610e31a 100644
--- a/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java
+++ b/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaFileObject.java
@@ -141,4 +141,4 @@
super.getContent();
return content;
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring.handlers b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring.handlers
index 2315764..a495c4d 100644
--- a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring.handlers
+++ b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring.handlers
@@ -21,4 +21,4 @@
## $Rev: 697807 $ $Date: 2008-09-22 20:12:04 +0700 (Mon, 22 Sep 2008) $
##
-http\://servicemix.apache.org/schema/servicemix-gshell=org.apache.servicemix.kernel.gshell.core.config.NamespaceHandler
\ No newline at end of file
+http\://servicemix.apache.org/schema/servicemix-gshell=org.apache.felix.karaf.gshell.core.config.NamespaceHandler
diff --git a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring.schemas b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring.schemas
index 67eca68..e959892 100644
--- a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring.schemas
+++ b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring.schemas
@@ -21,4 +21,4 @@
## $Rev: 697807 $ $Date: 2008-09-22 20:12:04 +0700 (Mon, 22 Sep 2008) $
##
-http\://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd=org/apache/servicemix/kernel/gshell/core/servicemix-gshell.xsd
+http\://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd=org/apache/felix/karaf/gshell/core/servicemix-gshell.xsd
diff --git a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
index dbcafd3..c4fe003 100644
--- a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
+++ b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
@@ -33,7 +33,7 @@
default-init-method="init"
default-destroy-method="destroy">
- <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
+ <import resource="classpath:org/apache/felix/karaf/gshell/core/commands.xml" />
<bean id="vfsCommandActionTemplate" abstract="true">
<property name="fileSystemAccess" ref="fileSystemAccess"/>
@@ -121,7 +121,7 @@
</gshell:command>
<gshell:command name="info">
- <gshell:action class="org.apache.servicemix.kernel.gshell.core.commands.InfoAction">
+ <gshell:action class="org.apache.felix.karaf.gshell.core.commands.InfoAction">
<constructor-arg ref="branding" />
</gshell:action>
</gshell:command>
diff --git a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
index 4c4b23f..54abea9 100644
--- a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
+++ b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
@@ -35,13 +35,13 @@
<bean id="localShellWrapped" parent="shell" init-method="init" destroy-method="close"/>
- <bean id="localShell" class="org.apache.servicemix.kernel.gshell.core.ShellWrapper">
+ <bean id="localShell" class="org.apache.felix.karaf.gshell.core.ShellWrapper">
<constructor-arg ref="localShellWrapped" />
</bean>
- <bean id="localConsole" class="org.apache.servicemix.kernel.gshell.core.LocalConsole">
+ <bean id="localConsole" class="org.apache.felix.karaf.gshell.core.LocalConsole">
<property name="createLocalShell" value="${servicemix.startLocalConsole}"/>
<property name="shell" ref="localShell"/>
</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
index b99626a..292b1c9 100644
--- a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
+++ b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
@@ -39,11 +39,11 @@
default-init-method="init"
default-destroy-method="destroy">
- <bean id="osgiCommandRegistry" class="org.apache.servicemix.kernel.gshell.core.OsgiCommandRegistry">
+ <bean id="osgiCommandRegistry" class="org.apache.felix.karaf.gshell.core.OsgiCommandRegistry">
<constructor-arg ref="commandRegistry" />
</bean>
- <bean id="osgiAliasRegistry" class="org.apache.servicemix.kernel.gshell.core.OsgiAliasRegistry">
+ <bean id="osgiAliasRegistry" class="org.apache.felix.karaf.gshell.core.OsgiAliasRegistry">
<constructor-arg ref="aliasRegistry" />
</bean>
@@ -73,4 +73,4 @@
<ctx:property-placeholder properties-ref="cmProps" />
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml
index d68ee51..76a989a 100644
--- a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml
+++ b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml
@@ -77,7 +77,7 @@
<property name="domain" value="${sshRealm}" />
</bean>
- <bean id="sshServerFactory" class="org.apache.servicemix.kernel.gshell.core.sshd.SshServerFactory" init-method="start" destroy-method="stop">
+ <bean id="sshServerFactory" class="org.apache.felix.karaf.gshell.core.sshd.SshServerFactory" init-method="start" destroy-method="stop">
<constructor-arg ref="sshServer" />
<property name="start" value="${servicemix.startRemoteShell}" />
</bean>
@@ -88,4 +88,4 @@
</jaas:config>
-->
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-vfs.xml b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-vfs.xml
index 3992f54..0f6dcd7 100644
--- a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-vfs.xml
+++ b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-vfs.xml
@@ -112,7 +112,7 @@
<property name="fileSystemManager" ref="fileSystemManager"/>
<property name="scheme" value="mvn"/>
<property name="provider">
- <bean class="org.apache.servicemix.kernel.gshell.core.vfs.mvn.MvnFileProvider"/>
+ <bean class="org.apache.felix.karaf.gshell.core.vfs.mvn.MvnFileProvider"/>
</property>
</bean>
@@ -130,4 +130,4 @@
</property>
</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml
index 8bc494e..174a43c 100644
--- a/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml
+++ b/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml
@@ -37,11 +37,11 @@
<property name="verbosity" value="DEBUG"/>
</bean>
- <bean id="branding" class="org.apache.servicemix.kernel.gshell.core.ServiceMixBranding">
+ <bean id="branding" class="org.apache.felix.karaf.gshell.core.ServiceMixBranding">
<property name="prompt" value="@|bold %{gshell.username}|@%{application.id}:@|bold %{gshell.group}|> " />
</bean>
- <bean id="application" class="org.apache.servicemix.kernel.gshell.core.ApplicationImpl">
+ <bean id="application" class="org.apache.felix.karaf.gshell.core.ApplicationImpl">
<property name="id" value="${servicemix.name}"/>
<property name="io" ref="io"/>
<property name="model">
@@ -56,7 +56,7 @@
<bean id="eventManager" class="org.apache.geronimo.gshell.event.EventManagerImpl"/>
- <bean id="applicationManager" class="org.apache.servicemix.kernel.gshell.core.ApplicationManagerImpl">
+ <bean id="applicationManager" class="org.apache.felix.karaf.gshell.core.ApplicationManagerImpl">
<constructor-arg ref="eventManager" />
<constructor-arg ref="application" />
</bean>
@@ -92,7 +92,7 @@
<constructor-arg ref="groupDirResolver"/>
</bean>
- <bean class="org.apache.servicemix.kernel.gshell.core.WorkAroundAliasCommand" scope="prototype">
+ <bean class="org.apache.felix.karaf.gshell.core.WorkAroundAliasCommand" scope="prototype">
<constructor-arg ref="commandLineExecutor"/>
</bean>
@@ -152,4 +152,4 @@
<bean id="variableNameCompleter" class="org.apache.geronimo.gshell.wisdom.completer.VariableNameCompleter" lazy-init="true">
</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/commands.xml b/karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/commands.xml
similarity index 95%
rename from karaf/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/commands.xml
rename to karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/commands.xml
index 8b91ee1..f2330cb 100644
--- a/karaf/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/commands.xml
+++ b/karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/commands.xml
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd">
- <bean class="org.apache.servicemix.kernel.gshell.core.BeanContainerAwareProcessor" />
+ <bean class="org.apache.felix.karaf.gshell.core.BeanContainerAwareProcessor" />
<bean id="statelessCommandTemplate" class="org.apache.geronimo.gshell.wisdom.command.StatelessCommand" abstract="true">
<property name="documenter">
@@ -48,4 +48,4 @@
</property>
</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.properties b/karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/commands/InfoAction.properties
similarity index 99%
rename from karaf/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.properties
rename to karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/commands/InfoAction.properties
index 755f0c8..6541173 100644
--- a/karaf/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.properties
+++ b/karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/commands/InfoAction.properties
@@ -24,4 +24,4 @@
command.description=Display JVM informations about the current application.
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/servicemix-gshell.xsd b/karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/servicemix-gshell.xsd
similarity index 98%
rename from karaf/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/servicemix-gshell.xsd
rename to karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/servicemix-gshell.xsd
index 36a1e1d..612d59d 100644
--- a/karaf/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/servicemix-gshell.xsd
+++ b/karaf/gshell/gshell-core/src/main/resources/org/apache/felix/karaf/gshell/core/servicemix-gshell.xsd
@@ -31,7 +31,7 @@
<xsd:annotation>
<xsd:documentation>
- Defines the configuration elements for Apache ServiceMix Kernel commands support.
+ Defines the configuration elements for Apache Felix Karaf commands support.
</xsd:documentation>
</xsd:annotation>
@@ -267,4 +267,4 @@
</xsd:complexType>
</xsd:element>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/karaf/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/commands/text/SortAction.properties b/karaf/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/commands/text/SortAction.properties
index e4e787d..094eda5 100644
--- a/karaf/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/commands/text/SortAction.properties
+++ b/karaf/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/commands/text/SortAction.properties
@@ -24,4 +24,4 @@
command.description=Sort lines of text.
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/gshell/core/Test.java b/karaf/gshell/gshell-core/src/test/java/org/apache/felix/karaf/gshell/core/Test.java
similarity index 86%
rename from karaf/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/gshell/core/Test.java
rename to karaf/gshell/gshell-core/src/test/java/org/apache/felix/karaf/gshell/core/Test.java
index 0983b12..90a61eb 100644
--- a/karaf/gshell/gshell-core/src/test/java/org/apache/servicemix/kernel/gshell/core/Test.java
+++ b/karaf/gshell/gshell-core/src/test/java/org/apache/felix/karaf/gshell/core/Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.core;
+package org.apache.felix.karaf.gshell.core;
import junit.framework.TestCase;
import org.apache.geronimo.gshell.application.ApplicationManager;
@@ -33,7 +33,7 @@
new String[] { "META-INF/spring/gshell.xml",
"META-INF/spring/gshell-vfs.xml",
"META-INF/spring/gshell-commands.xml",
- "org/apache/servicemix/kernel/gshell/core/gshell-test.xml" });
+ "org/apache/felix/karaf/gshell/core/gshell-test.xml" });
ApplicationManager appMgr = (ApplicationManager) context.getBean("applicationManager");
assertNotNull(appMgr);
Shell shell = appMgr.create();
@@ -56,7 +56,7 @@
new String[] { "META-INF/spring/gshell.xml",
"META-INF/spring/gshell-vfs.xml",
"META-INF/spring/gshell-commands.xml",
- "org/apache/servicemix/kernel/gshell/core/gshell-test.xml"});
+ "org/apache/felix/karaf/gshell/core/gshell-test.xml"});
ApplicationManager appMgr = (ApplicationManager) context.getBean("applicationManager");
assertNotNull(appMgr);
Shell shell = appMgr.create();
@@ -81,8 +81,8 @@
context = new ClassPathXmlApplicationContext(
new String[] { "META-INF/spring/gshell.xml",
"META-INF/spring/gshell-vfs.xml",
- "org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml",
- "org/apache/servicemix/kernel/gshell/core/gshell-test.xml"});
+ "org/apache/felix/karaf/gshell/core/gshell-test-commands.xml",
+ "org/apache/felix/karaf/gshell/core/gshell-test.xml"});
ApplicationManager appMgr = (ApplicationManager) context.getBean("applicationManager");
assertNotNull(appMgr);
Shell shell = appMgr.create();
@@ -107,8 +107,8 @@
context = new ClassPathXmlApplicationContext(
new String[] { "META-INF/spring/gshell.xml",
"META-INF/spring/gshell-vfs.xml",
- "org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml",
- "org/apache/servicemix/kernel/gshell/core/gshell-test.xml"});
+ "org/apache/felix/karaf/gshell/core/gshell-test-commands.xml",
+ "org/apache/felix/karaf/gshell/core/gshell-test.xml"});
ApplicationManager appMgr = (ApplicationManager) context.getBean("applicationManager");
assertNotNull(appMgr);
Shell shell = appMgr.create();
@@ -136,14 +136,14 @@
context = new ClassPathXmlApplicationContext(
new String[] { "META-INF/spring/gshell.xml",
"META-INF/spring/gshell-vfs.xml",
- "org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml",
- "org/apache/servicemix/kernel/gshell/core/gshell-test.xml"});
+ "org/apache/felix/karaf/gshell/core/gshell-test-commands.xml",
+ "org/apache/felix/karaf/gshell/core/gshell-test.xml"});
ApplicationManager appMgr = (ApplicationManager) context.getBean("applicationManager");
assertNotNull(appMgr);
Shell shell = appMgr.create();
assertNotNull(shell);
- shell.execute("optional/cat src/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test.xml");
- shell.execute("optional/find src/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test.xml");
+ shell.execute("optional/cat src/test/resources/org/apache/felix/karaf/gshell/core/gshell-test.xml");
+ shell.execute("optional/find src/test/resources/org/apache/felix/karaf/gshell/core/gshell-test.xml");
} finally {
if (context != null) {
context.destroy();
diff --git a/karaf/gshell/gshell-core/src/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml b/karaf/gshell/gshell-core/src/test/resources/org/apache/felix/karaf/gshell/core/gshell-test-commands.xml
similarity index 96%
rename from karaf/gshell/gshell-core/src/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml
rename to karaf/gshell/gshell-core/src/test/resources/org/apache/felix/karaf/gshell/core/gshell-test-commands.xml
index 25e4de1..2aa64a6 100644
--- a/karaf/gshell/gshell-core/src/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test-commands.xml
+++ b/karaf/gshell/gshell-core/src/test/resources/org/apache/felix/karaf/gshell/core/gshell-test-commands.xml
@@ -33,7 +33,7 @@
default-init-method="init"
default-destroy-method="destroy">
- <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
+ <import resource="classpath:org/apache/felix/karaf/gshell/core/commands.xml" />
<bean id="vfsCommandActionTemplate" abstract="true">
<property name="fileSystemAccess" ref="fileSystemAccess"/>
@@ -121,7 +121,7 @@
</gshell:command>
<gshell:command name="info">
- <gshell:action class="org.apache.servicemix.kernel.gshell.core.commands.InfoAction">
+ <gshell:action class="org.apache.felix.karaf.gshell.core.commands.InfoAction">
<constructor-arg ref="branding" />
</gshell:action>
</gshell:command>
diff --git a/karaf/gshell/gshell-core/src/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test.xml b/karaf/gshell/gshell-core/src/test/resources/org/apache/felix/karaf/gshell/core/gshell-test.xml
similarity index 99%
rename from karaf/gshell/gshell-core/src/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test.xml
rename to karaf/gshell/gshell-core/src/test/resources/org/apache/felix/karaf/gshell/core/gshell-test.xml
index 127543f..250c47e 100644
--- a/karaf/gshell/gshell-core/src/test/resources/org/apache/servicemix/kernel/gshell/core/gshell-test.xml
+++ b/karaf/gshell/gshell-core/src/test/resources/org/apache/felix/karaf/gshell/core/gshell-test.xml
@@ -31,4 +31,4 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-features/pom.xml b/karaf/gshell/gshell-features/pom.xml
index 1ebb64a..0d7c34d 100644
--- a/karaf/gshell/gshell-features/pom.xml
+++ b/karaf/gshell/gshell-features/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
<artifactId>gshell</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.features</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.features</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: GShell Features</name>
+ <name>Apache Felix Karaf :: GShell Features</name>
<description>
Provides Features in GShell
@@ -56,13 +56,13 @@
</dependency>
<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>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.obr</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.obr</artifactId>
</dependency>
<dependency>
@@ -90,11 +90,11 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.servicemix.kernel.gshell.features*;version=${project.version}
+ <Export-Package>org.apache.felix.karaf.gshell.features*;version=${project.version}
</Export-Package>
<Import-Package>
org.apache.geronimo.gshell.wisdom.command,
- org.apache.servicemix.kernel.gshell.core,
+ org.apache.felix.karaf.gshell.core,
org.apache.geronimo.gshell.wisdom.registry,
org.springframework.beans.factory.config,
*
@@ -106,4 +106,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/Feature.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/Feature.java
similarity index 95%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/Feature.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/Feature.java
index 45e8aa1..e393dfa 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/Feature.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/Feature.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features;
+package org.apache.felix.karaf.gshell.features;
import java.util.List;
import java.util.Map;
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/FeaturesRegistry.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/FeaturesRegistry.java
similarity index 95%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/FeaturesRegistry.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/FeaturesRegistry.java
index 33e1f6e..fcf8689 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/FeaturesRegistry.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/FeaturesRegistry.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features;
+package org.apache.felix.karaf.gshell.features;
/**
* Main interface for a Feature Registry which tracks available and installed features.
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/FeaturesService.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/FeaturesService.java
similarity index 96%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/FeaturesService.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/FeaturesService.java
index 1226016..0c5661c 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/FeaturesService.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/FeaturesService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features;
+package org.apache.felix.karaf.gshell.features;
import java.net.URI;
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/Repository.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/Repository.java
similarity index 94%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/Repository.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/Repository.java
index 2bfbc99..8cede6a 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/Repository.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/Repository.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features;
+package org.apache.felix.karaf.gshell.features;
import java.net.URI;
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.java
similarity index 90%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.java
index 213e1e5..b3ed032 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.commands;
+package org.apache.felix.karaf.gshell.features.commands;
import java.net.URI;
import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.features.FeaturesService;
public class AddUrlCommand extends FeaturesCommandSupport {
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/FeaturesCommandSupport.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/FeaturesCommandSupport.java
similarity index 89%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/FeaturesCommandSupport.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/FeaturesCommandSupport.java
index 06e0636..6e98730 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/FeaturesCommandSupport.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/FeaturesCommandSupport.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.commands;
+package org.apache.felix.karaf.gshell.features.commands;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.features.FeaturesService;
import org.osgi.framework.ServiceReference;
public abstract class FeaturesCommandSupport extends OsgiCommandSupport {
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/InstallFeatureCommand.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.java
similarity index 90%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/InstallFeatureCommand.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.java
index a170f3c..590a5fa 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/InstallFeatureCommand.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.commands;
+package org.apache.felix.karaf.gshell.features.commands;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.features.FeaturesService;
public class InstallFeatureCommand extends FeaturesCommandSupport {
@@ -33,4 +33,4 @@
admin.installFeature(name);
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.java
similarity index 92%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.java
index fba0475..e2f5120 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.commands;
+package org.apache.felix.karaf.gshell.features.commands;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.features.FeaturesService;
public class ListFeaturesCommand extends FeaturesCommandSupport {
@@ -45,4 +45,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListUrlCommand.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListUrlCommand.java
similarity index 86%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListUrlCommand.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListUrlCommand.java
index 4c84e09..58bc462 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListUrlCommand.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/ListUrlCommand.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.commands;
+package org.apache.felix.karaf.gshell.features.commands;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
-import org.apache.servicemix.kernel.gshell.features.Repository;
+import org.apache.felix.karaf.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.features.Repository;
public class ListUrlCommand extends FeaturesCommandSupport {
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RefreshUrlCommand.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.java
similarity index 88%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RefreshUrlCommand.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.java
index cd594b1..8451eb2 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RefreshUrlCommand.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.commands;
+package org.apache.felix.karaf.gshell.features.commands;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
-import org.apache.servicemix.kernel.gshell.features.Repository;
+import org.apache.felix.karaf.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.features.Repository;
public class RefreshUrlCommand extends FeaturesCommandSupport {
@@ -42,4 +42,4 @@
admin.addRepository(uri);
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RemoveUrlCommand.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.java
similarity index 90%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RemoveUrlCommand.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.java
index d7e6e01..7bf2153 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RemoveUrlCommand.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.commands;
+package org.apache.felix.karaf.gshell.features.commands;
import java.net.URI;
import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.features.FeaturesService;
public class RemoveUrlCommand extends FeaturesCommandSupport {
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/UninstallFeatureCommand.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.java
similarity index 90%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/UninstallFeatureCommand.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.java
index 522c721..8f62a6a 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/UninstallFeatureCommand.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.commands;
+package org.apache.felix.karaf.gshell.features.commands;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.features.FeaturesService;
public class UninstallFeatureCommand extends FeaturesCommandSupport {
@@ -33,4 +33,4 @@
admin.uninstallFeature(name );
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/AvailableFeatureCompleter.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/AvailableFeatureCompleter.java
similarity index 88%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/AvailableFeatureCompleter.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/AvailableFeatureCompleter.java
index 991ba59..718345b 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/AvailableFeatureCompleter.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/AvailableFeatureCompleter.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.completers;
+package org.apache.felix.karaf.gshell.features.completers;
import java.util.Collection;
import java.util.List;
import jline.Completor;
import org.apache.geronimo.gshell.console.completer.StringsCompleter;
-import org.apache.servicemix.kernel.gshell.features.management.ManagedFeature;
-import org.apache.servicemix.kernel.gshell.features.management.ManagedFeaturesRegistry;
+import org.apache.felix.karaf.gshell.features.management.ManagedFeature;
+import org.apache.felix.karaf.gshell.features.management.ManagedFeaturesRegistry;
/**
* {@link jline.Completor} for available features.
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/FeatureRepositoryCompleter.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/FeatureRepositoryCompleter.java
similarity index 90%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/FeatureRepositoryCompleter.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/FeatureRepositoryCompleter.java
index 461ca32..b89ba2c 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/FeatureRepositoryCompleter.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/FeatureRepositoryCompleter.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.completers;
+package org.apache.felix.karaf.gshell.features.completers;
import java.util.List;
import jline.Completor;
import org.apache.geronimo.gshell.console.completer.StringsCompleter;
-import org.apache.servicemix.kernel.gshell.features.management.ManagedFeaturesRegistry;
+import org.apache.felix.karaf.gshell.features.management.ManagedFeaturesRegistry;
/**
* {@link jline.Completor} for Feature Repository URLs.
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/InstalledFeatureCompleter.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/InstalledFeatureCompleter.java
similarity index 88%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/InstalledFeatureCompleter.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/InstalledFeatureCompleter.java
index 6a121a6..261f62a 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/InstalledFeatureCompleter.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/completers/InstalledFeatureCompleter.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.completers;
+package org.apache.felix.karaf.gshell.features.completers;
import java.util.Collection;
import java.util.List;
import jline.Completor;
import org.apache.geronimo.gshell.console.completer.StringsCompleter;
-import org.apache.servicemix.kernel.gshell.features.management.ManagedFeature;
-import org.apache.servicemix.kernel.gshell.features.management.ManagedFeaturesRegistry;
+import org.apache.felix.karaf.gshell.features.management.ManagedFeature;
+import org.apache.felix.karaf.gshell.features.management.ManagedFeaturesRegistry;
/**
* {@link jline.Completor} for installed features.
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeatureImpl.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeatureImpl.java
similarity index 96%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeatureImpl.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeatureImpl.java
index 07806d3..7c98877 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeatureImpl.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeatureImpl.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.internal;
+package org.apache.felix.karaf.gshell.features.internal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.servicemix.kernel.gshell.features.Feature;
+import org.apache.felix.karaf.gshell.features.Feature;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedResource;
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImpl.java
similarity index 98%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImpl.java
index 1c03515..59446b6 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.internal;
+package org.apache.felix.karaf.gshell.features.internal;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -38,10 +38,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.kernel.gshell.features.Feature;
-import org.apache.servicemix.kernel.gshell.features.FeaturesRegistry;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
-import org.apache.servicemix.kernel.gshell.features.Repository;
+import org.apache.felix.karaf.gshell.features.Feature;
+import org.apache.felix.karaf.gshell.features.FeaturesRegistry;
+import org.apache.felix.karaf.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.features.Repository;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/RepositoryImpl.java
similarity index 97%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/RepositoryImpl.java
index 485c3d4..9d5ade4 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/RepositoryImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.internal;
+package org.apache.felix.karaf.gshell.features.internal;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -37,8 +37,8 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.servicemix.kernel.gshell.features.Feature;
-import org.apache.servicemix.kernel.gshell.features.Repository;
+import org.apache.felix.karaf.gshell.features.Feature;
+import org.apache.felix.karaf.gshell.features.Repository;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedOperation;
import org.springframework.jmx.export.annotation.ManagedResource;
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/DefaultNamingStrategy.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/DefaultNamingStrategy.java
similarity index 95%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/DefaultNamingStrategy.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/DefaultNamingStrategy.java
index 6bee5fc..8902ed6 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/DefaultNamingStrategy.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/DefaultNamingStrategy.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.management;
+package org.apache.felix.karaf.gshell.features.management;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.apache.servicemix.kernel.gshell.features.FeaturesRegistry;
+import org.apache.felix.karaf.gshell.features.FeaturesRegistry;
/**
* Naming strategy for JMX MBeans.
@@ -81,4 +81,4 @@
}
return result;
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeature.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeature.java
similarity index 91%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeature.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeature.java
index 1da589b..cfcb0d3 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeature.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeature.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.management;
+package org.apache.felix.karaf.gshell.features.management;
import java.util.List;
-import org.apache.servicemix.kernel.gshell.features.Feature;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.features.Feature;
+import org.apache.felix.karaf.gshell.features.FeaturesService;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedOperation;
import org.springframework.jmx.export.annotation.ManagedResource;
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeaturesRegistry.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeaturesRegistry.java
similarity index 95%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeaturesRegistry.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeaturesRegistry.java
index 9fbdb46..a07fe61 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeaturesRegistry.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeaturesRegistry.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.management;
+package org.apache.felix.karaf.gshell.features.management;
import java.net.URI;
import java.util.Map;
@@ -24,10 +24,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.kernel.gshell.features.Feature;
-import org.apache.servicemix.kernel.gshell.features.FeaturesRegistry;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
-import org.apache.servicemix.kernel.gshell.features.Repository;
+import org.apache.felix.karaf.gshell.features.Feature;
+import org.apache.felix.karaf.gshell.features.FeaturesRegistry;
+import org.apache.felix.karaf.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.features.Repository;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.jmx.export.annotation.ManagedOperation;
import org.springframework.jmx.export.annotation.ManagedResource;
@@ -207,4 +207,4 @@
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedRepository.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedRepository.java
similarity index 87%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedRepository.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedRepository.java
index 2d3ae17..19734db 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedRepository.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedRepository.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.management;
+package org.apache.felix.karaf.gshell.features.management;
import java.net.URI;
-import org.apache.servicemix.kernel.gshell.features.Feature;
-import org.apache.servicemix.kernel.gshell.features.FeaturesService;
-import org.apache.servicemix.kernel.gshell.features.Repository;
+import org.apache.felix.karaf.gshell.features.Feature;
+import org.apache.felix.karaf.gshell.features.FeaturesService;
+import org.apache.felix.karaf.gshell.features.Repository;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedOperation;
import org.springframework.jmx.export.annotation.ManagedResource;
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagementAgent.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagementAgent.java
similarity index 98%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagementAgent.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagementAgent.java
index 611ec6b..e5b2720 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagementAgent.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagementAgent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.management;
+package org.apache.felix.karaf.gshell.features.management;
import java.util.HashSet;
import java.util.Set;
@@ -127,4 +127,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/NamingStrategy.java b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/NamingStrategy.java
similarity index 90%
rename from karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/NamingStrategy.java
rename to karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/NamingStrategy.java
index 7a03399..9b7ba47 100644
--- a/karaf/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/NamingStrategy.java
+++ b/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/NamingStrategy.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.management;
+package org.apache.felix.karaf.gshell.features.management;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.apache.servicemix.kernel.gshell.features.FeaturesRegistry;
+import org.apache.felix.karaf.gshell.features.FeaturesRegistry;
public interface NamingStrategy {
@@ -32,4 +32,4 @@
String getJmxDomainName();
ObjectName getObjectName(FeaturesRegistry features) throws MalformedObjectNameException;
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml b/karaf/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
index 3ad2736..271624a 100644
--- a/karaf/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
+++ b/karaf/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
@@ -38,7 +38,7 @@
http://servicemix.apache.org/schema/servicemix-gshell
http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
- <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
+ <import resource="classpath:org/apache/felix/karaf/gshell/core/commands.xml" />
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="file:${servicemix.home}/etc/org.apache.servicemix.features.cfg"/>
@@ -46,38 +46,38 @@
<gshell:command-bundle>
<gshell:command name="features/addUrl">
- <gshell:action class="org.apache.servicemix.kernel.gshell.features.commands.AddUrlCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.features.commands.AddUrlCommand" />
</gshell:command>
<gshell:command name="features/listUrl">
- <gshell:action class="org.apache.servicemix.kernel.gshell.features.commands.ListUrlCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.features.commands.ListUrlCommand" />
</gshell:command>
<gshell:command name="features/removeUrl">
- <gshell:action class="org.apache.servicemix.kernel.gshell.features.commands.RemoveUrlCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.features.commands.RemoveUrlCommand" />
<gshell:completers>
<ref bean="removeUrlCompleter" />
</gshell:completers>
</gshell:command>
<gshell:command name="features/refreshUrl">
- <gshell:action class="org.apache.servicemix.kernel.gshell.features.commands.RefreshUrlCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.features.commands.RefreshUrlCommand" />
</gshell:command>
<gshell:command name="features/install">
- <gshell:action class="org.apache.servicemix.kernel.gshell.features.commands.InstallFeatureCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.features.commands.InstallFeatureCommand" />
<gshell:completers>
<ref bean="installFeatureCompleter" />
</gshell:completers>
</gshell:command>
<gshell:command name="features/uninstall">
- <gshell:action class="org.apache.servicemix.kernel.gshell.features.commands.UninstallFeatureCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.features.commands.UninstallFeatureCommand" />
<gshell:completers>
<ref bean="uninstallFeatureCompleter" />
</gshell:completers>
</gshell:command>
<gshell:command name="features/list">
- <gshell:action class="org.apache.servicemix.kernel.gshell.features.commands.ListFeaturesCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.features.commands.ListFeaturesCommand" />
</gshell:command>
</gshell:command-bundle>
- <bean id="featuresService" class="org.apache.servicemix.kernel.gshell.features.internal.FeaturesServiceImpl" init-method="start" destroy-method="stop">
+ <bean id="featuresService" class="org.apache.felix.karaf.gshell.features.internal.FeaturesServiceImpl" init-method="start" destroy-method="stop">
<property name="urls" value="${featuresRepositories}" />
<property name="boot" value="${featuresBoot}" />
<property name="configAdmin" ref="configAdmin" />
@@ -85,15 +85,15 @@
<property name="featuresServiceRegistry" ref="featureServiceRegistry" />
</bean>
- <bean id="namingStrategy" class="org.apache.servicemix.kernel.gshell.features.management.DefaultNamingStrategy">
+ <bean id="namingStrategy" class="org.apache.felix.karaf.gshell.features.management.DefaultNamingStrategy">
<property name="jmxDomainName" value="org.apache.servicemix" />
</bean>
- <bean id="managementAgent" class="org.apache.servicemix.kernel.gshell.features.management.ManagementAgent">
+ <bean id="managementAgent" class="org.apache.felix.karaf.gshell.features.management.ManagementAgent">
<property name="mbeanServer" ref="mbeanServer" />
</bean>
- <bean id="featureServiceRegistry" class="org.apache.servicemix.kernel.gshell.features.management.ManagedFeaturesRegistry">
+ <bean id="featureServiceRegistry" class="org.apache.felix.karaf.gshell.features.management.ManagedFeaturesRegistry">
<property name="managementAgent" ref="managementAgent" />
<property name="namingStrategy" ref="namingStrategy" />
<property name="featuresService" ref="featuresService" />
@@ -103,7 +103,7 @@
<osgi:reference id="preferences" interface="org.osgi.service.prefs.PreferencesService" cardinality="0..1" />
- <osgi:service ref="featuresService" interface="org.apache.servicemix.kernel.gshell.features.FeaturesService" />
+ <osgi:service ref="featuresService" interface="org.apache.felix.karaf.gshell.features.FeaturesService" />
<osgix:cm-properties id="cmProps" persistent-id="org.apache.servicemix.features">
<prop key="featuresRepositories"></prop>
@@ -118,16 +118,16 @@
<osgi:listener ref="featureServiceRegistry" bind-method="registerMBeanServer" />
</osgi:reference>
- <bean id="installFeatureCompleter" class="org.apache.servicemix.kernel.gshell.features.completers.AvailableFeatureCompleter">
+ <bean id="installFeatureCompleter" class="org.apache.felix.karaf.gshell.features.completers.AvailableFeatureCompleter">
<property name="featuresRegistry" ref="featureServiceRegistry" />
</bean>
- <bean id="uninstallFeatureCompleter" class="org.apache.servicemix.kernel.gshell.features.completers.InstalledFeatureCompleter">
+ <bean id="uninstallFeatureCompleter" class="org.apache.felix.karaf.gshell.features.completers.InstalledFeatureCompleter">
<property name="featuresRegistry" ref="featureServiceRegistry" />
</bean>
- <bean id="removeUrlCompleter" class="org.apache.servicemix.kernel.gshell.features.completers.FeatureRepositoryCompleter">
+ <bean id="removeUrlCompleter" class="org.apache.felix.karaf.gshell.features.completers.FeatureRepositoryCompleter">
<property name="featuresRegistry" ref="featureServiceRegistry" />
</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.properties b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.properties
rename to karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.properties
index cf92ffe..b6f01a4 100644
--- a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.properties
+++ b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/AddUrlCommand.properties
@@ -24,4 +24,4 @@
command.description=Add a list of repository URLs to the features service.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/InstallFeatureCommand.properties b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/InstallFeatureCommand.properties
rename to karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.properties
index 97fcbe0..020d3df 100644
--- a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/InstallFeatureCommand.properties
+++ b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/InstallFeatureCommand.properties
@@ -24,4 +24,4 @@
command.description=Install a feature.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.properties b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.properties
rename to karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.properties
index 4c807af..6ce93e7 100644
--- a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.properties
+++ b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/ListFeaturesCommand.properties
@@ -24,4 +24,4 @@
command.description=List existing features.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/ListUrlCommand.properties b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/ListUrlCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/ListUrlCommand.properties
rename to karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/ListUrlCommand.properties
index a544da9..583b375 100644
--- a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/ListUrlCommand.properties
+++ b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/ListUrlCommand.properties
@@ -24,4 +24,4 @@
command.description=Display the repository URLs currently associated with the features service.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/RefreshUrlCommand.properties b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/RefreshUrlCommand.properties
rename to karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.properties
index 12687fd..aa02c8a 100644
--- a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/RefreshUrlCommand.properties
+++ b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/RefreshUrlCommand.properties
@@ -24,4 +24,4 @@
command.description=Reload the repositories to obtain a fresh list of features.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/RemoveUrlCommand.properties b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/RemoveUrlCommand.properties
rename to karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.properties
index 34c2126..565c681 100644
--- a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/RemoveUrlCommand.properties
+++ b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/RemoveUrlCommand.properties
@@ -24,4 +24,4 @@
command.description=Remove a list of repository URLs from the features service.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/UninstallFeatureCommand.properties b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/UninstallFeatureCommand.properties
rename to karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.properties
index ab3348e..2e21f21 100644
--- a/karaf/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/UninstallFeatureCommand.properties
+++ b/karaf/gshell/gshell-features/src/main/resources/org/apache/felix/karaf/gshell/features/commands/UninstallFeatureCommand.properties
@@ -24,4 +24,4 @@
command.description=Uninstall a feature.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeatureTest.java b/karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/FeatureTest.java
similarity index 90%
rename from karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeatureTest.java
rename to karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/FeatureTest.java
index 97d6332..808307d 100644
--- a/karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeatureTest.java
+++ b/karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/FeatureTest.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features;
+package org.apache.felix.karaf.gshell.features;
import junit.framework.TestCase;
-import org.apache.servicemix.kernel.gshell.features.internal.FeatureImpl;
+import org.apache.felix.karaf.gshell.features.internal.FeatureImpl;
public class FeatureTest extends TestCase {
diff --git a/karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java b/karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/FeaturesServiceTest.java
similarity index 98%
rename from karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java
rename to karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/FeaturesServiceTest.java
index 5909722..d68bcda 100644
--- a/karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/FeaturesServiceTest.java
+++ b/karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/FeaturesServiceTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features;
+package org.apache.felix.karaf.gshell.features;
import java.io.File;
import java.io.FileWriter;
@@ -23,9 +23,9 @@
import java.net.URI;
import junit.framework.TestCase;
-import org.apache.servicemix.kernel.gshell.features.internal.FeatureImpl;
-import org.apache.servicemix.kernel.gshell.features.internal.FeaturesServiceImpl;
-import org.apache.servicemix.kernel.gshell.features.management.ManagedFeaturesRegistry;
+import org.apache.felix.karaf.gshell.features.internal.FeatureImpl;
+import org.apache.felix.karaf.gshell.features.internal.FeaturesServiceImpl;
+import org.apache.felix.karaf.gshell.features.management.ManagedFeaturesRegistry;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
diff --git a/karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java b/karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/RepositoryTest.java
similarity index 90%
rename from karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java
rename to karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/RepositoryTest.java
index e8cfffd..d18d00f 100644
--- a/karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java
+++ b/karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/RepositoryTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features;
+package org.apache.felix.karaf.gshell.features;
import java.net.URI;
import junit.framework.TestCase;
-import org.apache.servicemix.kernel.gshell.features.internal.FeatureImpl;
-import org.apache.servicemix.kernel.gshell.features.internal.RepositoryImpl;
+import org.apache.felix.karaf.gshell.features.internal.FeatureImpl;
+import org.apache.felix.karaf.gshell.features.internal.RepositoryImpl;
public class RepositoryTest extends TestCase {
@@ -62,7 +62,7 @@
}
public void testShowWrongUriInException() throws Exception {
- String uri = "src/test/resources/org/apache/servicemix/kernel/gshell/features/repo1.xml";
+ String uri = "src/test/resources/org/apache/felix/karaf/gshell/features/repo1.xml";
RepositoryImpl r = new RepositoryImpl(new URI(uri));
try {
r.load();
diff --git a/karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImplTest.java b/karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImplTest.java
similarity index 96%
rename from karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImplTest.java
rename to karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImplTest.java
index 8ee87de..24100de 100644
--- a/karaf/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImplTest.java
+++ b/karaf/gshell/gshell-features/src/test/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImplTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.internal;
+package org.apache.felix.karaf.gshell.features.internal;
import java.util.HashMap;
import java.util.Map;
import junit.framework.TestCase;
-import org.apache.servicemix.kernel.gshell.features.Feature;
+import org.apache.felix.karaf.gshell.features.Feature;
/**
* Test cases for {@link FeaturesServiceImpl}
diff --git a/karaf/gshell/gshell-features/src/test/resources/org/apache/servicemix/kernel/gshell/features/repo1.xml b/karaf/gshell/gshell-features/src/test/resources/org/apache/felix/karaf/gshell/features/repo1.xml
similarity index 99%
rename from karaf/gshell/gshell-features/src/test/resources/org/apache/servicemix/kernel/gshell/features/repo1.xml
rename to karaf/gshell/gshell-features/src/test/resources/org/apache/felix/karaf/gshell/features/repo1.xml
index ea21df9..3284661 100644
--- a/karaf/gshell/gshell-features/src/test/resources/org/apache/servicemix/kernel/gshell/features/repo1.xml
+++ b/karaf/gshell/gshell-features/src/test/resources/org/apache/felix/karaf/gshell/features/repo1.xml
@@ -28,4 +28,4 @@
<feature>f1</feature>
<bundle>b3</bundle>
</feature>
-</features>
\ No newline at end of file
+</features>
diff --git a/karaf/gshell/gshell-log/pom.xml b/karaf/gshell/gshell-log/pom.xml
index 04ca7bd..6ed4fe1 100644
--- a/karaf/gshell/gshell-log/pom.xml
+++ b/karaf/gshell/gshell-log/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
<artifactId>gshell</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.log</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.log</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: GShell Log Commands</name>
+ <name>Apache Felix Karaf :: GShell Log Commands</name>
<description>
Provides the OSGi Log commands
@@ -39,8 +39,8 @@
<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>
</dependency>
<dependency>
@@ -76,12 +76,12 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.servicemix.kernel.gshell.log*;version=${project.version};-split-package:=merge-first
+ org.apache.felix.karaf.gshell.log*;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
org.apache.geronimo.gshell.wisdom.command,
org.apache.geronimo.gshell.wisdom.registry,
- org.apache.servicemix.kernel.gshell.core,
+ org.apache.felix.karaf.gshell.core,
org.ops4j.pax.logging,
*
</Import-Package>
@@ -92,4 +92,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayException.java b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java
similarity index 93%
rename from karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayException.java
rename to karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java
index 917e01c..bae8977 100644
--- a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayException.java
+++ b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayException.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.log;
+package org.apache.felix.karaf.gshell.log;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
public class DisplayException extends OsgiCommandSupport {
diff --git a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayLog.java b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayLog.java
similarity index 90%
rename from karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayLog.java
rename to karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayLog.java
index 3beff07..3a86f3b 100644
--- a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayLog.java
+++ b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/DisplayLog.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.log;
+package org.apache.felix.karaf.gshell.log;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
-import org.apache.servicemix.kernel.gshell.log.layout.PatternConverter;
-import org.apache.servicemix.kernel.gshell.log.layout.PatternParser;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.log.layout.PatternConverter;
+import org.apache.felix.karaf.gshell.log.layout.PatternParser;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
/**
diff --git a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/GetLogLevel.java b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java
similarity index 97%
rename from karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/GetLogLevel.java
rename to karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java
index cf93797..fb4884e 100644
--- a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/GetLogLevel.java
+++ b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/GetLogLevel.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.log;
+package org.apache.felix.karaf.gshell.log;
import java.util.Dictionary;
import java.util.Enumeration;
@@ -22,7 +22,7 @@
import java.util.TreeMap;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -114,4 +114,4 @@
return getService(ConfigurationAdmin.class, ref);
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/LruList.java
similarity index 98%
rename from karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java
rename to karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/LruList.java
index a214a17..8da08eb 100644
--- a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java
+++ b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/LruList.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.log;
+package org.apache.felix.karaf.gshell.log;
import java.util.Arrays;
diff --git a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java
similarity index 96%
rename from karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java
rename to karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java
index 7da0f7f..d855f87 100644
--- a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java
+++ b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/SetLogLevel.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.log;
+package org.apache.felix.karaf.gshell.log;
import java.util.Dictionary;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -116,4 +116,4 @@
return getService(ConfigurationAdmin.class, ref);
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/VmLogAppender.java b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/VmLogAppender.java
similarity index 96%
rename from karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/VmLogAppender.java
rename to karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/VmLogAppender.java
index a1607b4..38613e4 100644
--- a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/VmLogAppender.java
+++ b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/VmLogAppender.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.log;
+package org.apache.felix.karaf.gshell.log;
import org.ops4j.pax.logging.spi.PaxAppender;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
diff --git a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/AbsoluteTimeDateFormat.java
similarity index 98%
rename from karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java
rename to karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/AbsoluteTimeDateFormat.java
index 03b81ff..6b06e16 100644
--- a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java
+++ b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/AbsoluteTimeDateFormat.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.log.layout;
+package org.apache.felix.karaf.gshell.log.layout;
import java.text.DateFormat;
import java.text.FieldPosition;
diff --git a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/DateTimeDateFormat.java
similarity index 97%
rename from karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java
rename to karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/DateTimeDateFormat.java
index 0412ac8..aeb85bf 100644
--- a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java
+++ b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/DateTimeDateFormat.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.log.layout;
+package org.apache.felix.karaf.gshell.log.layout;
import java.text.DateFormatSymbols;
import java.text.FieldPosition;
diff --git a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/FormattingInfo.java b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/FormattingInfo.java
similarity index 95%
rename from karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/FormattingInfo.java
rename to karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/FormattingInfo.java
index b5d9dff..8c4c9b5 100644
--- a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/FormattingInfo.java
+++ b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/FormattingInfo.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.log.layout;
+package org.apache.felix.karaf.gshell.log.layout;
/**
diff --git a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/ISO8601DateFormat.java
similarity index 98%
rename from karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java
rename to karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/ISO8601DateFormat.java
index f19b8bd..c2177f5 100644
--- a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java
+++ b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/ISO8601DateFormat.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.log.layout;
+package org.apache.felix.karaf.gshell.log.layout;
import java.text.FieldPosition;
import java.text.ParsePosition;
diff --git a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternConverter.java b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternConverter.java
similarity index 97%
rename from karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternConverter.java
rename to karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternConverter.java
index 1652d57..f5af299 100644
--- a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternConverter.java
+++ b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternConverter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.log.layout;
+package org.apache.felix.karaf.gshell.log.layout;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
diff --git a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternParser.java
similarity index 99%
rename from karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java
rename to karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternParser.java
index 4a74fd1..3d54334 100644
--- a/karaf/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java
+++ b/karaf/gshell/gshell-log/src/main/java/org/apache/felix/karaf/gshell/log/layout/PatternParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.log.layout;
+package org.apache.felix.karaf.gshell.log.layout;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
diff --git a/karaf/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml b/karaf/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml
index 2055fe4..1d96be4 100644
--- a/karaf/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml
+++ b/karaf/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml
@@ -38,38 +38,38 @@
http://servicemix.apache.org/schema/servicemix-gshell
http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
- <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
+ <import resource="classpath:org/apache/felix/karaf/gshell/core/commands.xml" />
<gshell:command-bundle>
<gshell:command name="log/display">
- <gshell:action class="org.apache.servicemix.kernel.gshell.log.DisplayLog">
+ <gshell:action class="org.apache.felix.karaf.gshell.log.DisplayLog">
<property name="events" ref="events" />
<property name="pattern" value="${pattern}" />
</gshell:action>
</gshell:command>
<gshell:link name="log/d" target="log/display" />
<gshell:command name="log/display-exception">
- <gshell:action class="org.apache.servicemix.kernel.gshell.log.DisplayException">
+ <gshell:action class="org.apache.felix.karaf.gshell.log.DisplayException">
<property name="events" ref="events" />
</gshell:action>
</gshell:command>
<gshell:link name="log/de" target="log/display-exception" />
<gshell:command name="log/get">
- <gshell:action class="org.apache.servicemix.kernel.gshell.log.GetLogLevel" />
+ <gshell:action class="org.apache.felix.karaf.gshell.log.GetLogLevel" />
</gshell:command>
<gshell:command name="log/set">
- <gshell:action class="org.apache.servicemix.kernel.gshell.log.SetLogLevel" />
+ <gshell:action class="org.apache.felix.karaf.gshell.log.SetLogLevel" />
</gshell:command>
<gshell:alias name="ld" alias="log/d" />
<gshell:alias name="lde" alias="log/de" />
</gshell:command-bundle>
- <bean id="vmLogAppender" class="org.apache.servicemix.kernel.gshell.log.VmLogAppender">
+ <bean id="vmLogAppender" class="org.apache.felix.karaf.gshell.log.VmLogAppender">
<property name="events" ref="events" />
</bean>
- <bean id="events" class="org.apache.servicemix.kernel.gshell.log.LruList">
+ <bean id="events" class="org.apache.felix.karaf.gshell.log.LruList">
<constructor-arg value="${size}" />
</bean>
@@ -89,4 +89,4 @@
<ctx:property-placeholder properties-ref="cmProps" />
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-log/src/main/resources/org/apache/servicemix/kernel/gshell/log/DisplayException.properties b/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/DisplayException.properties
similarity index 99%
rename from karaf/gshell/gshell-log/src/main/resources/org/apache/servicemix/kernel/gshell/log/DisplayException.properties
rename to karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/DisplayException.properties
index ff84091..99845f3 100644
--- a/karaf/gshell/gshell-log/src/main/resources/org/apache/servicemix/kernel/gshell/log/DisplayException.properties
+++ b/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/DisplayException.properties
@@ -24,4 +24,4 @@
command.description=Display the last exception from the log.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-log/src/main/resources/org/apache/servicemix/kernel/gshell/log/DisplayLog.properties b/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/DisplayLog.properties
similarity index 99%
rename from karaf/gshell/gshell-log/src/main/resources/org/apache/servicemix/kernel/gshell/log/DisplayLog.properties
rename to karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/DisplayLog.properties
index d360b1a..4e605b7 100644
--- a/karaf/gshell/gshell-log/src/main/resources/org/apache/servicemix/kernel/gshell/log/DisplayLog.properties
+++ b/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/DisplayLog.properties
@@ -24,4 +24,4 @@
command.description=Display log entries.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-log/src/main/resources/org/apache/servicemix/kernel/gshell/log/GetLogLevel.properties b/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/GetLogLevel.properties
similarity index 100%
rename from karaf/gshell/gshell-log/src/main/resources/org/apache/servicemix/kernel/gshell/log/GetLogLevel.properties
rename to karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/GetLogLevel.properties
diff --git a/karaf/gshell/gshell-log/src/main/resources/org/apache/servicemix/kernel/gshell/log/SetLogLevel.properties b/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/SetLogLevel.properties
similarity index 99%
rename from karaf/gshell/gshell-log/src/main/resources/org/apache/servicemix/kernel/gshell/log/SetLogLevel.properties
rename to karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/SetLogLevel.properties
index 511734b..7af3fdf 100644
--- a/karaf/gshell/gshell-log/src/main/resources/org/apache/servicemix/kernel/gshell/log/SetLogLevel.properties
+++ b/karaf/gshell/gshell-log/src/main/resources/org/apache/felix/karaf/gshell/log/SetLogLevel.properties
@@ -24,4 +24,4 @@
command.description=Set log level.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-obr/pom.xml b/karaf/gshell/gshell-obr/pom.xml
index 58cc9e8..497c0d6 100644
--- a/karaf/gshell/gshell-obr/pom.xml
+++ b/karaf/gshell/gshell-obr/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
<artifactId>gshell</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.obr</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.obr</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: GShell OBR Commands</name>
+ <name>Apache Felix Karaf :: GShell OBR Commands</name>
<description>
Provides the OBR GShell commands
@@ -50,8 +50,8 @@
</dependency>
<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>
</dependency>
<dependency>
@@ -68,11 +68,11 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.servicemix.kernel.gshell.obr*;version=${project.version}</Export-Package>
+ <Export-Package>org.apache.felix.karaf.gshell.obr*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.geronimo.gshell.wisdom.command,
org.apache.geronimo.gshell.wisdom.registry,
- org.apache.servicemix.kernel.gshell.core,
+ org.apache.felix.karaf.gshell.core,
*
</Import-Package>
<Private-Package>!*</Private-Package>
@@ -82,4 +82,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/AddUrlCommand.java b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java
similarity index 96%
rename from karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/AddUrlCommand.java
rename to karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java
index d416674..a8f5df3 100644
--- a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/AddUrlCommand.java
+++ b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/AddUrlCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.obr;
+package org.apache.felix.karaf.gshell.obr;
import java.net.URL;
import java.util.List;
diff --git a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/DeployCommand.java b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java
similarity index 95%
rename from karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/DeployCommand.java
rename to karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java
index 7bbd1dc..97d0edc 100644
--- a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/DeployCommand.java
+++ b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/DeployCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.obr;
+package org.apache.felix.karaf.gshell.obr;
import java.util.List;
@@ -30,4 +30,4 @@
doDeploy(admin, bundles, false);
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/FileUtil.java
similarity index 98%
rename from karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java
rename to karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/FileUtil.java
index 344e592..ddcc304 100644
--- a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java
+++ b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/FileUtil.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.obr;
+package org.apache.felix.karaf.gshell.obr;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -174,4 +174,4 @@
}
bos.close();
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/InfoCommand.java b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java
similarity index 98%
rename from karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/InfoCommand.java
rename to karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java
index 50ede86..2ca3dbf 100644
--- a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/InfoCommand.java
+++ b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/InfoCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.obr;
+package org.apache.felix.karaf.gshell.obr;
import java.io.PrintWriter;
import java.lang.reflect.Array;
@@ -101,4 +101,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListCommand.java b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java
similarity index 97%
rename from karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListCommand.java
rename to karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java
index 37ff08f..7a9aa7f 100644
--- a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListCommand.java
+++ b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.obr;
+package org.apache.felix.karaf.gshell.obr;
import java.util.List;
@@ -82,4 +82,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListUrlCommand.java b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java
similarity index 96%
rename from karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListUrlCommand.java
rename to karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java
index ae8eaa2..3f6f6db 100644
--- a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListUrlCommand.java
+++ b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ListUrlCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.obr;
+package org.apache.felix.karaf.gshell.obr;
import org.osgi.service.obr.Repository;
import org.osgi.service.obr.RepositoryAdmin;
@@ -32,4 +32,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ObrCommandSupport.java
similarity index 98%
rename from karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java
rename to karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ObrCommandSupport.java
index dd6af1a..56845c5 100644
--- a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java
+++ b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/ObrCommandSupport.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.obr;
+package org.apache.felix.karaf.gshell.obr;
import java.io.PrintWriter;
import java.util.List;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
diff --git a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RefreshUrlCommand.java b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java
similarity index 96%
rename from karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RefreshUrlCommand.java
rename to karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java
index 056d094..1a2e417 100644
--- a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RefreshUrlCommand.java
+++ b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.obr;
+package org.apache.felix.karaf.gshell.obr;
import java.net.URL;
import java.util.List;
@@ -46,4 +46,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RemoveUrlCommand.java b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java
similarity index 96%
rename from karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RemoveUrlCommand.java
rename to karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java
index d122706..8cfb209 100644
--- a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RemoveUrlCommand.java
+++ b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.obr;
+package org.apache.felix.karaf.gshell.obr;
import java.net.URL;
import java.util.List;
@@ -32,4 +32,4 @@
admin.removeRepository(new URL(url));
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java
similarity index 97%
rename from karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java
rename to karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java
index f15db46..159837d 100644
--- a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java
+++ b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/SourceCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.obr;
+package org.apache.felix.karaf.gshell.obr;
import java.net.URL;
import java.util.List;
@@ -58,4 +58,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/StartCommand.java b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/StartCommand.java
similarity index 95%
rename from karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/StartCommand.java
rename to karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/StartCommand.java
index 1a34e26..5e7ac8a 100644
--- a/karaf/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/StartCommand.java
+++ b/karaf/gshell/gshell-obr/src/main/java/org/apache/felix/karaf/gshell/obr/StartCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.obr;
+package org.apache.felix.karaf.gshell.obr;
import org.osgi.service.obr.RepositoryAdmin;
@@ -24,4 +24,4 @@
doDeploy(admin, bundles, true);
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml b/karaf/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml
index 250051f..aafca70 100644
--- a/karaf/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml
+++ b/karaf/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml
@@ -35,36 +35,36 @@
http://servicemix.apache.org/schema/servicemix-gshell
http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
- <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
+ <import resource="classpath:org/apache/felix/karaf/gshell/core/commands.xml" />
<gshell:command-bundle>
<gshell:command name="obr/addUrl">
- <gshell:action class="org.apache.servicemix.kernel.gshell.obr.AddUrlCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.obr.AddUrlCommand" />
</gshell:command>
<gshell:command name="obr/deploy">
- <gshell:action class="org.apache.servicemix.kernel.gshell.obr.DeployCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.obr.DeployCommand" />
</gshell:command>
<gshell:command name="obr/info">
- <gshell:action class="org.apache.servicemix.kernel.gshell.obr.InfoCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.obr.InfoCommand" />
</gshell:command>
<gshell:command name="obr/list">
- <gshell:action class="org.apache.servicemix.kernel.gshell.obr.ListCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.obr.ListCommand" />
</gshell:command>
<gshell:command name="obr/listUrl">
- <gshell:action class="org.apache.servicemix.kernel.gshell.obr.ListUrlCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.obr.ListUrlCommand" />
</gshell:command>
<gshell:command name="obr/removeUrl">
- <gshell:action class="org.apache.servicemix.kernel.gshell.obr.RemoveUrlCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.obr.RemoveUrlCommand" />
</gshell:command>
<gshell:command name="obr/refreshUrl">
- <gshell:action class="org.apache.servicemix.kernel.gshell.obr.RefreshUrlCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.obr.RefreshUrlCommand" />
</gshell:command>
<gshell:command name="obr/source">
- <gshell:action class="org.apache.servicemix.kernel.gshell.obr.SourceCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.obr.SourceCommand" />
</gshell:command>
<gshell:command name="obr/start">
- <gshell:action class="org.apache.servicemix.kernel.gshell.obr.StartCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.obr.StartCommand" />
</gshell:command>
</gshell:command-bundle>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/AddUrlCommand.properties b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/AddUrlCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/AddUrlCommand.properties
rename to karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/AddUrlCommand.properties
index acf1131..6663c08 100644
--- a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/AddUrlCommand.properties
+++ b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/AddUrlCommand.properties
@@ -24,4 +24,4 @@
command.description=Add a list of repository URLs to the OBR service.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/DeployCommand.properties b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/DeployCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/DeployCommand.properties
rename to karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/DeployCommand.properties
index d518148..500b938 100644
--- a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/DeployCommand.properties
+++ b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/DeployCommand.properties
@@ -24,4 +24,4 @@
command.description=Deploy a list of bundles using OBR
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/InfoCommand.properties b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/InfoCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/InfoCommand.properties
rename to karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/InfoCommand.properties
index 23a2f59..d9b4d59 100644
--- a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/InfoCommand.properties
+++ b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/InfoCommand.properties
@@ -24,4 +24,4 @@
command.description=Print informations about OBR bundles
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/ListCommand.properties b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/ListCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/ListCommand.properties
rename to karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/ListCommand.properties
index d73f3b7..fb2b3e1 100644
--- a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/ListCommand.properties
+++ b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/ListCommand.properties
@@ -24,4 +24,4 @@
command.description=List OBR bundles
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/ListUrlCommand.properties b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/ListUrlCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/ListUrlCommand.properties
rename to karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/ListUrlCommand.properties
index 40b9fc6..e552b1d 100644
--- a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/ListUrlCommand.properties
+++ b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/ListUrlCommand.properties
@@ -24,4 +24,4 @@
command.description=Display the repository URLs currently associated with the OBR service.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/RefreshUrlCommand.properties b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/RefreshUrlCommand.properties
rename to karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.properties
index 0a4553f..ac57fcd 100644
--- a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/RefreshUrlCommand.properties
+++ b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/RefreshUrlCommand.properties
@@ -24,4 +24,4 @@
command.description=Reload the repositories to obtain a fresh list of bundles.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/RemoveUrlCommand.properties b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/RemoveUrlCommand.properties
rename to karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.properties
index 259dfa1..b9dfa2c 100644
--- a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/RemoveUrlCommand.properties
+++ b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/RemoveUrlCommand.properties
@@ -24,4 +24,4 @@
command.description=Remove a list of repository URLs from the OBR service.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/SourceCommand.properties b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/SourceCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/SourceCommand.properties
rename to karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/SourceCommand.properties
index 76b6888..c8b7812 100644
--- a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/SourceCommand.properties
+++ b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/SourceCommand.properties
@@ -24,4 +24,4 @@
command.description=Download the sources for an OBR bundle
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/StartCommand.properties b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/StartCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/StartCommand.properties
rename to karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/StartCommand.properties
index 809ab4d..062ff85 100644
--- a/karaf/gshell/gshell-obr/src/main/resources/org/apache/servicemix/kernel/gshell/obr/StartCommand.properties
+++ b/karaf/gshell/gshell-obr/src/main/resources/org/apache/felix/karaf/gshell/obr/StartCommand.properties
@@ -24,4 +24,4 @@
command.description=Deploy and start a list of bundles using OBR
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-osgi/pom.xml b/karaf/gshell/gshell-osgi/pom.xml
index d232750..f4d460e 100644
--- a/karaf/gshell/gshell-osgi/pom.xml
+++ b/karaf/gshell/gshell-osgi/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
<artifactId>gshell</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.osgi</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.osgi</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: GShell OSGi Commands</name>
+ <name>Apache Felix Karaf :: GShell OSGi Commands</name>
<description>
Provides the OSGi GShell commands
@@ -39,8 +39,8 @@
<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>
</dependency>
<dependency>
@@ -69,12 +69,12 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.servicemix.kernel.gshell.osgi*;version=${project.version};-split-package:=merge-first
+ org.apache.felix.karaf.gshell.osgi*;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
org.apache.geronimo.gshell.wisdom.command,
org.apache.geronimo.gshell.wisdom.registry,
- org.apache.servicemix.kernel.gshell.core,
+ org.apache.felix.karaf.gshell.core,
*
</Import-Package>
<Private-Package>!*</Private-Package>
@@ -84,4 +84,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleCommand.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleCommand.java
similarity index 93%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleCommand.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleCommand.java
index 2a20dbf..019462e 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleCommand.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleCommand.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.Bundle;
public abstract class BundleCommand extends OsgiCommandSupport {
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleLevel.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java
similarity index 97%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleLevel.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java
index cf64476..1fe59f0 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundleLevel.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundleLevel.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import org.apache.geronimo.gshell.clp.Argument;
import org.osgi.framework.Bundle;
@@ -71,4 +71,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundlesCommand.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundlesCommand.java
similarity index 94%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundlesCommand.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundlesCommand.java
index 776009a..0dd52bf 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/BundlesCommand.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/BundlesCommand.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import java.util.ArrayList;
import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.Bundle;
public abstract class BundlesCommand extends OsgiCommandSupport {
@@ -51,4 +51,4 @@
}
protected abstract void doExecute(List<Bundle> bundles) throws Exception;
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/Headers.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java
similarity index 94%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/Headers.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java
index 0acf414..3b9b60a 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/Headers.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Headers.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.Bundle;
public class Headers extends OsgiCommandSupport {
@@ -64,4 +64,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/InstallBundle.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java
similarity index 95%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/InstallBundle.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java
index ad8d526..4cf58cd 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/InstallBundle.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/InstallBundle.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import java.io.PrintWriter;
import java.util.ArrayList;
@@ -22,7 +22,7 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListBundles.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListBundles.java
similarity index 98%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListBundles.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListBundles.java
index 00604f3..1360b7a 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListBundles.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListBundles.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListServices.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListServices.java
similarity index 98%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListServices.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListServices.java
index 3753e1a..8214de7 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ListServices.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ListServices.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.Command;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
@@ -171,4 +171,4 @@
return Result.SUCCESS;
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/RefreshBundle.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RefreshBundle.java
similarity index 94%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/RefreshBundle.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RefreshBundle.java
index e554b3c..84e6cd1 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/RefreshBundle.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RefreshBundle.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.PackageAdmin;
@@ -57,4 +57,4 @@
}
return Result.SUCCESS;
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ResolveBundle.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ResolveBundle.java
similarity index 96%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ResolveBundle.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ResolveBundle.java
index 607ef91..1af32e3 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/ResolveBundle.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/ResolveBundle.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
@@ -42,4 +42,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/RestartBundle.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RestartBundle.java
similarity index 95%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/RestartBundle.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RestartBundle.java
index 888dfa8..9f87d6c 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/RestartBundle.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/RestartBundle.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import java.util.List;
@@ -29,4 +29,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/Shutdown.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Shutdown.java
similarity index 91%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/Shutdown.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Shutdown.java
index 76e8081..97b4272 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/Shutdown.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Shutdown.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.Bundle;
/**
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/SpringApplicationListener.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/SpringApplicationListener.java
similarity index 98%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/SpringApplicationListener.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/SpringApplicationListener.java
index 240bd0a..26fdb2b 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/SpringApplicationListener.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/SpringApplicationListener.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartBundle.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartBundle.java
similarity index 95%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartBundle.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartBundle.java
index 38e33bd..28d931e 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartBundle.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartBundle.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import java.util.List;
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartLevel.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartLevel.java
similarity index 94%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartLevel.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartLevel.java
index a04a688..f139815 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StartLevel.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StartLevel.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
public class StartLevel extends OsgiCommandSupport {
@@ -52,4 +52,4 @@
return Result.SUCCESS;
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StopBundle.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StopBundle.java
similarity index 95%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StopBundle.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StopBundle.java
index 96fa466..72addaa 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/StopBundle.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/StopBundle.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import java.util.List;
@@ -29,4 +29,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/UninstallBundle.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UninstallBundle.java
similarity index 94%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/UninstallBundle.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UninstallBundle.java
index f92cc9b..ba704d4 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/UninstallBundle.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UninstallBundle.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import org.osgi.framework.Bundle;
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/UpdateBundle.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UpdateBundle.java
similarity index 95%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/UpdateBundle.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UpdateBundle.java
index 1e02e6f..272459d 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/UpdateBundle.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/UpdateBundle.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import java.io.InputStream;
import java.net.URL;
@@ -36,4 +36,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/Util.java b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Util.java
similarity index 98%
rename from karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/Util.java
rename to karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Util.java
index fbe2f4c..b43e720 100644
--- a/karaf/gshell/gshell-osgi/src/main/java/org/apache/servicemix/kernel/gshell/osgi/Util.java
+++ b/karaf/gshell/gshell-osgi/src/main/java/org/apache/felix/karaf/gshell/osgi/Util.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.gshell.osgi;
+package org.apache.felix.karaf.gshell.osgi;
import java.io.IOException;
@@ -169,4 +169,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml b/karaf/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml
index 7f06ebf..5aa6d12 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml
+++ b/karaf/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml
@@ -32,57 +32,57 @@
http://servicemix.apache.org/schema/servicemix-gshell
http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
- <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
+ <import resource="classpath:org/apache/felix/karaf/gshell/core/commands.xml" />
<gshell:command-bundle>
<gshell:command name="osgi/bundle-level">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.BundleLevel" />
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.BundleLevel" />
</gshell:command>
<gshell:command name="osgi/headers">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.Headers" />
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.Headers" />
</gshell:command>
<gshell:command name="osgi/install">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.InstallBundle" />
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.InstallBundle" />
</gshell:command>
<gshell:command name="osgi/list">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.ListBundles">
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.ListBundles">
<property name="springApplicationListener" ref="springApplicationListener" />
</gshell:action>
</gshell:command>
<gshell:command name="osgi/ls">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.ListServices" />
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.ListServices" />
</gshell:command>
<gshell:command name="osgi/refresh">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.RefreshBundle" />
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.RefreshBundle" />
</gshell:command>
<gshell:command name="osgi/update">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.UpdateBundle" />
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.UpdateBundle" />
</gshell:command>
<gshell:command name="osgi/resolve">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.ResolveBundle" />
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.ResolveBundle" />
</gshell:command>
<gshell:command name="osgi/restart">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.RestartBundle" />
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.RestartBundle" />
</gshell:command>
<gshell:command name="osgi/shutdown">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.Shutdown" />
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.Shutdown" />
</gshell:command>
<gshell:command name="osgi/start">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.StartBundle" />
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.StartBundle" />
</gshell:command>
<gshell:command name="osgi/start-level">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.StartLevel" />
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.StartLevel" />
</gshell:command>
<gshell:command name="osgi/stop">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.StopBundle" />
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.StopBundle" />
</gshell:command>
<gshell:command name="osgi/uninstall">
- <gshell:action class="org.apache.servicemix.kernel.gshell.osgi.UninstallBundle" />
+ <gshell:action class="org.apache.felix.karaf.gshell.osgi.UninstallBundle" />
</gshell:command>
</gshell:command-bundle>
- <bean id="springApplicationListener" class="org.apache.servicemix.kernel.gshell.osgi.SpringApplicationListener" />
+ <bean id="springApplicationListener" class="org.apache.felix.karaf.gshell.osgi.SpringApplicationListener" />
<osgi:service ref="springApplicationListener" interface="org.springframework.osgi.context.event.OsgiBundleApplicationContextListener" />
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/BundleLevel.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/BundleLevel.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/BundleLevel.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/BundleLevel.properties
index 9a9bee9..09fee29 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/BundleLevel.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/BundleLevel.properties
@@ -24,4 +24,4 @@
command.description=Get or set the start level of a given bundle
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/Headers.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/Headers.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/Headers.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/Headers.properties
index 7d53e5f..21e17aa 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/Headers.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/Headers.properties
@@ -24,4 +24,4 @@
command.description=Display OSGi headers
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/InstallBundle.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/InstallBundle.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/InstallBundle.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/InstallBundle.properties
index 85858db..2250838 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/InstallBundle.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/InstallBundle.properties
@@ -24,4 +24,4 @@
command.description=Install bundle
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/ListBundles.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ListBundles.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/ListBundles.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ListBundles.properties
index 204792a..7e504c1 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/ListBundles.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ListBundles.properties
@@ -24,4 +24,4 @@
command.description=List bundles
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/ListServices.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ListServices.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/ListServices.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ListServices.properties
index 1f8ccf9..13e13f1 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/ListServices.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ListServices.properties
@@ -24,4 +24,4 @@
command.description=List services
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/RefreshBundle.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/RefreshBundle.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/RefreshBundle.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/RefreshBundle.properties
index db60c15..b558333 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/RefreshBundle.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/RefreshBundle.properties
@@ -24,4 +24,4 @@
command.description=Refresh bundle
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/ResolveBundle.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ResolveBundle.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/ResolveBundle.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ResolveBundle.properties
index 9f5de69..75e64ee 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/ResolveBundle.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/ResolveBundle.properties
@@ -24,4 +24,4 @@
command.description=Resolve bundle
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/RestartBundle.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/RestartBundle.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/RestartBundle.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/RestartBundle.properties
index 762aa40..8a9c123 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/RestartBundle.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/RestartBundle.properties
@@ -24,4 +24,4 @@
command.description=Restart bundle
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/Shutdown.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/Shutdown.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/Shutdown.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/Shutdown.properties
index 940f5f6..ba6d840 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/Shutdown.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/Shutdown.properties
@@ -24,4 +24,4 @@
command.description=Shutdown OSGi
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/StartBundle.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StartBundle.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/StartBundle.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StartBundle.properties
index 7a6e7ae..85a761c 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/StartBundle.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StartBundle.properties
@@ -24,4 +24,4 @@
command.description=Start bundle
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/StartLevel.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StartLevel.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/StartLevel.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StartLevel.properties
index 1b9761f..8983ac7 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/StartLevel.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StartLevel.properties
@@ -24,4 +24,4 @@
command.description=Get or set the start level
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/StopBundle.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StopBundle.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/StopBundle.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StopBundle.properties
index 40fc360..756edfe 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/StopBundle.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/StopBundle.properties
@@ -24,4 +24,4 @@
command.description=Stop bundle
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/UninstallBundle.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/UninstallBundle.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/UninstallBundle.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/UninstallBundle.properties
index 36351ae..76575ed 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/UninstallBundle.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/UninstallBundle.properties
@@ -24,4 +24,4 @@
command.description=Uninstall bundle
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/UpdateBundle.properties b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/UpdateBundle.properties
similarity index 99%
rename from karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/UpdateBundle.properties
rename to karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/UpdateBundle.properties
index 9b07581..09508e5 100644
--- a/karaf/gshell/gshell-osgi/src/main/resources/org/apache/servicemix/kernel/gshell/osgi/UpdateBundle.properties
+++ b/karaf/gshell/gshell-osgi/src/main/resources/org/apache/felix/karaf/gshell/osgi/UpdateBundle.properties
@@ -24,4 +24,4 @@
command.description=Update bundle
command.manual=\
- TODO: about manual
\ No newline at end of file
+ TODO: about manual
diff --git a/karaf/gshell/gshell-packages/pom.xml b/karaf/gshell/gshell-packages/pom.xml
index e127f98..b8a90d6 100644
--- a/karaf/gshell/gshell-packages/pom.xml
+++ b/karaf/gshell/gshell-packages/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
<artifactId>gshell</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.packages</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.packages</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: GShell PackageAdmin Commands</name>
+ <name>Apache Felix Karaf :: GShell PackageAdmin Commands</name>
<description>
Provides the PackageAdmin GShell commands
@@ -39,8 +39,8 @@
<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>
</dependency>
<dependency>
@@ -70,12 +70,12 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.servicemix.kernel.gshell.packages*;version=${project.version};-split-package:=merge-first
+ org.apache.felix.karaf.gshell.packages*;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
org.apache.geronimo.gshell.wisdom.command,
org.apache.geronimo.gshell.wisdom.registry,
- org.apache.servicemix.kernel.gshell.core,
+ org.apache.felix.karaf.gshell.core,
*
</Import-Package>
<Private-Package>!*</Private-Package>
@@ -85,4 +85,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java b/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ExportsCommand.java
similarity index 98%
rename from karaf/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java
rename to karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ExportsCommand.java
index 7bb15f1..92d164f 100644
--- a/karaf/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java
+++ b/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ExportsCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.packages;
+package org.apache.felix.karaf.gshell.packages;
import java.io.PrintWriter;
import java.util.List;
diff --git a/karaf/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java b/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ImportsCommand.java
similarity index 98%
rename from karaf/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java
rename to karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ImportsCommand.java
index 7d109cb..7bddfbf 100644
--- a/karaf/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java
+++ b/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/ImportsCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.packages;
+package org.apache.felix.karaf.gshell.packages;
import java.io.PrintWriter;
import java.util.ArrayList;
@@ -90,4 +90,4 @@
return "[STALE BUNDLE]";
}
-}
\ No newline at end of file
+}
diff --git a/karaf/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/PackageCommandSupport.java b/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/PackageCommandSupport.java
similarity index 94%
rename from karaf/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/PackageCommandSupport.java
rename to karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/PackageCommandSupport.java
index ef99b94..7486601 100644
--- a/karaf/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/PackageCommandSupport.java
+++ b/karaf/gshell/gshell-packages/src/main/java/org/apache/felix/karaf/gshell/packages/PackageCommandSupport.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.packages;
+package org.apache.felix.karaf.gshell.packages;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.PackageAdmin;
diff --git a/karaf/gshell/gshell-packages/src/main/resources/META-INF/spring/gshell-packages.xml b/karaf/gshell/gshell-packages/src/main/resources/META-INF/spring/gshell-packages.xml
index 9e3060d..5b3c92b 100644
--- a/karaf/gshell/gshell-packages/src/main/resources/META-INF/spring/gshell-packages.xml
+++ b/karaf/gshell/gshell-packages/src/main/resources/META-INF/spring/gshell-packages.xml
@@ -32,14 +32,14 @@
http://servicemix.apache.org/schema/servicemix-gshell
http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
- <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
+ <import resource="classpath:org/apache/felix/karaf/gshell/core/commands.xml" />
<gshell:command-bundle>
<gshell:command name="packages/exports">
- <gshell:action class="org.apache.servicemix.kernel.gshell.packages.ExportsCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.packages.ExportsCommand" />
</gshell:command>
<gshell:command name="packages/imports">
- <gshell:action class="org.apache.servicemix.kernel.gshell.packages.ImportsCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.packages.ImportsCommand" />
</gshell:command>
</gshell:command-bundle>
diff --git a/karaf/gshell/gshell-packages/src/main/resources/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.properties b/karaf/gshell/gshell-packages/src/main/resources/org/apache/felix/karaf/gshell/packages/ExportsCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-packages/src/main/resources/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.properties
rename to karaf/gshell/gshell-packages/src/main/resources/org/apache/felix/karaf/gshell/packages/ExportsCommand.properties
index 9487118..9d8f52c 100644
--- a/karaf/gshell/gshell-packages/src/main/resources/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.properties
+++ b/karaf/gshell/gshell-packages/src/main/resources/org/apache/felix/karaf/gshell/packages/ExportsCommand.properties
@@ -24,4 +24,4 @@
command.description=Print exported packages.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-packages/src/main/resources/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.properties b/karaf/gshell/gshell-packages/src/main/resources/org/apache/felix/karaf/gshell/packages/ImportsCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-packages/src/main/resources/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.properties
rename to karaf/gshell/gshell-packages/src/main/resources/org/apache/felix/karaf/gshell/packages/ImportsCommand.properties
index 917d860..db64437 100644
--- a/karaf/gshell/gshell-packages/src/main/resources/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.properties
+++ b/karaf/gshell/gshell-packages/src/main/resources/org/apache/felix/karaf/gshell/packages/ImportsCommand.properties
@@ -24,4 +24,4 @@
command.description=Print imported packages.
command.manual=\
- TODO: date manual
\ No newline at end of file
+ TODO: date manual
diff --git a/karaf/gshell/gshell-wrapper/pom.xml b/karaf/gshell/gshell-wrapper/pom.xml
index 341e837..91d2d26 100644
--- a/karaf/gshell/gshell-wrapper/pom.xml
+++ b/karaf/gshell/gshell-wrapper/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
<artifactId>gshell</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.wrapper</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.wrapper</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: GShell Service Wrapper</name>
+ <name>Apache Felix Karaf :: GShell Service Wrapper</name>
<description>
Provides the Service Wrapper GShell integration
@@ -39,20 +39,20 @@
<properties>
<gshell.osgi.import>
- org.apache.servicemix.kernel.main.spi.*;resolution:=optional,
+ org.apache.felix.karaf.main.spi.*;resolution:=optional,
org.apache.geronimo.gshell*,
</gshell.osgi.import>
<gshell.osgi.export>
</gshell.osgi.export>
<gshell.osgi.private>
- org.apache.servicemix.kernel.gshell.wrapper.*,
+ org.apache.felix.karaf.gshell.wrapper.*,
</gshell.osgi.private>
</properties>
<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>
</dependency>
<dependency>
@@ -97,12 +97,12 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.servicemix.kernel.gshell.wrapper.*;version=${project.version}
+ <Export-Package>org.apache.felix.karaf.gshell.wrapper.*;version=${project.version}
</Export-Package>
<Import-Package>
org.apache.geronimo.gshell.wisdom.command,
org.apache.geronimo.gshell.wisdom.registry,
- org.apache.servicemix.kernel.gshell.core,
+ org.apache.felix.karaf.gshell.core,
*
</Import-Package>
<Private-Package>!*</Private-Package>
@@ -112,4 +112,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/kernel/gshell/wrapper/InstallCommand.java b/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/gshell/wrapper/InstallCommand.java
similarity index 98%
rename from karaf/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/kernel/gshell/wrapper/InstallCommand.java
rename to karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/gshell/wrapper/InstallCommand.java
index f58c3cc..2d8ec42 100644
--- a/karaf/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/kernel/gshell/wrapper/InstallCommand.java
+++ b/karaf/gshell/gshell-wrapper/src/main/java/org/apache/felix/karaf/gshell/wrapper/InstallCommand.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.wrapper;
+package org.apache.felix.karaf.gshell.wrapper;
import java.io.File;
import java.io.FileOutputStream;
@@ -28,7 +28,7 @@
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.io.PumpStreamHandler;
-import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
+import org.apache.felix.karaf.gshell.core.OsgiCommandSupport;
/**
* Installs this ServiceMix instance as a service in your operating systems.
diff --git a/karaf/gshell/gshell-wrapper/src/main/resources/META-INF/spring/gshell-wrapper.xml b/karaf/gshell/gshell-wrapper/src/main/resources/META-INF/spring/gshell-wrapper.xml
index 3eb5a60..02ad9a4 100644
--- a/karaf/gshell/gshell-wrapper/src/main/resources/META-INF/spring/gshell-wrapper.xml
+++ b/karaf/gshell/gshell-wrapper/src/main/resources/META-INF/spring/gshell-wrapper.xml
@@ -32,11 +32,11 @@
http://servicemix.apache.org/schema/servicemix-gshell
http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
- <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
+ <import resource="classpath:org/apache/felix/karaf/gshell/core/commands.xml" />
<gshell:command-bundle>
<gshell:command name="wrapper/install">
- <gshell:action class="org.apache.servicemix.kernel.gshell.wrapper.InstallCommand" />
+ <gshell:action class="org.apache.felix.karaf.gshell.wrapper.InstallCommand" />
</gshell:command>
</gshell:command-bundle>
diff --git a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/InstallCommand.properties b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/InstallCommand.properties
similarity index 99%
rename from karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/InstallCommand.properties
rename to karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/InstallCommand.properties
index e5a5cb8..785b4d8 100644
--- a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/InstallCommand.properties
+++ b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/InstallCommand.properties
@@ -24,4 +24,4 @@
command.description=Install ServiceMix Kernel as a system service in the OS.
command.manual=\
- TODO: install manual
\ No newline at end of file
+ TODO: install manual
diff --git a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/all/servicemix-wrapper.conf b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/all/servicemix-wrapper.conf
similarity index 98%
rename from karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/all/servicemix-wrapper.conf
rename to karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/all/servicemix-wrapper.conf
index 021872d..1095fbd 100644
--- a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/all/servicemix-wrapper.conf
+++ b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/all/servicemix-wrapper.conf
@@ -31,7 +31,7 @@
wrapper.java.library.path.1=%SERVICEMIX_BASE%/lib/
# Application Parameters. Add parameters as needed starting from 1
-wrapper.app.parameter.1=org.apache.servicemix.kernel.main.Main
+wrapper.app.parameter.1=org.apache.felix.karaf.main.Main
# JVM Parameters
# note that n is the parameter number starting from 1.
diff --git a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/all/servicemix-wrapper.jar b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/all/servicemix-wrapper.jar
similarity index 99%
rename from karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/all/servicemix-wrapper.jar
rename to karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/all/servicemix-wrapper.jar
index c766405..d374419 100755
--- a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/all/servicemix-wrapper.jar
+++ b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/all/servicemix-wrapper.jar
Binary files differ
diff --git a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/linux/libwrapper.so b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/linux/libwrapper.so
similarity index 99%
rename from karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/linux/libwrapper.so
rename to karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/linux/libwrapper.so
index df25ec6..3fb8a57 100644
--- a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/linux/libwrapper.so
+++ b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/linux/libwrapper.so
Binary files differ
diff --git a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/linux/servicemix-wrapper b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/linux/servicemix-wrapper
similarity index 99%
rename from karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/linux/servicemix-wrapper
rename to karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/linux/servicemix-wrapper
index c58d4f7..6338246 100644
--- a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/linux/servicemix-wrapper
+++ b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/linux/servicemix-wrapper
Binary files differ
diff --git a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/macosx/libwrapper.jnilib b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/macosx/libwrapper.jnilib
similarity index 99%
rename from karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/macosx/libwrapper.jnilib
rename to karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/macosx/libwrapper.jnilib
index ae5a14e..82033b0 100644
--- a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/macosx/libwrapper.jnilib
+++ b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/macosx/libwrapper.jnilib
Binary files differ
diff --git a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/macosx/servicemix-wrapper b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/macosx/servicemix-wrapper
similarity index 99%
rename from karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/macosx/servicemix-wrapper
rename to karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/macosx/servicemix-wrapper
index 8c281b9..cc6844a 100644
--- a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/macosx/servicemix-wrapper
+++ b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/macosx/servicemix-wrapper
Binary files differ
diff --git a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/unix/servicemix-service b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/unix/servicemix-service
similarity index 100%
rename from karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/unix/servicemix-service
rename to karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/unix/servicemix-service
diff --git a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/windows/servicemix-service.bat b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/servicemix-service.bat
similarity index 100%
rename from karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/windows/servicemix-service.bat
rename to karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/servicemix-service.bat
diff --git a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/windows/servicemix-wrapper.exe b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/servicemix-wrapper.exe
similarity index 99%
rename from karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/windows/servicemix-wrapper.exe
rename to karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/servicemix-wrapper.exe
index a46a2ac..d143c07 100644
--- a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/windows/servicemix-wrapper.exe
+++ b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/servicemix-wrapper.exe
Binary files differ
diff --git a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/windows/wrapper.dll b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/wrapper.dll
similarity index 99%
rename from karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/windows/wrapper.dll
rename to karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/wrapper.dll
index 37c4f33..feba0af 100644
--- a/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/servicemix/kernel/gshell/wrapper/windows/wrapper.dll
+++ b/karaf/gshell/gshell-wrapper/src/main/resources/org/apache/felix/karaf/gshell/wrapper/windows/wrapper.dll
Binary files differ
diff --git a/karaf/gshell/pom.xml b/karaf/gshell/pom.xml
index 87cd59f..a8ff648 100644
--- a/karaf/gshell/pom.xml
+++ b/karaf/gshell/pom.xml
@@ -22,16 +22,16 @@
<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.gshell</groupId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
<artifactId>gshell</artifactId>
<packaging>pom</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: GShell</name>
+ <name>Apache Felix Karaf :: GShell</name>
<modules>
<module>gshell-core</module>
@@ -45,4 +45,4 @@
<module>gshell-packages</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/itests/pom.xml b/karaf/itests/pom.xml
index 19247c5..006b543 100644
--- a/karaf/itests/pom.xml
+++ b/karaf/itests/pom.xml
@@ -22,16 +22,16 @@
<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>
+ <groupId>org.apache.felix.karaf</groupId>
<artifactId>itests</artifactId>
<packaging>jar</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: ITests</name>
+ <name>Apache Felix Karaf :: ITests</name>
<description>
Integration tests
@@ -55,8 +55,8 @@
<!-- The assembly and all the dependencies -->
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>apache-servicemix-kernel</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>apache-felix-karaf</artifactId>
<type>xml</type>
<classifier>features</classifier>
<scope>test</scope>
diff --git a/karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/AbstractIntegrationTest.java b/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/AbstractIntegrationTest.java
similarity index 85%
rename from karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/AbstractIntegrationTest.java
rename to karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/AbstractIntegrationTest.java
index e43e40c..5f7ca48 100644
--- a/karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/AbstractIntegrationTest.java
+++ b/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/AbstractIntegrationTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.itests;
+package org.apache.felix.karaf.gshell.itests;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Inject;
@@ -120,9 +120,9 @@
systemProperty("servicemix.startRemoteShell").value("false"),
// hack system packages
- systemPackages("org.apache.servicemix.kernel.main.spi;version=1.0.0", "org.apache.servicemix.kernel.jaas.boot"),
- bootClasspathLibrary(mavenBundle("org.apache.servicemix.kernel.jaas", "org.apache.servicemix.kernel.jaas.boot")).afterFramework(),
- bootClasspathLibrary(mavenBundle("org.apache.servicemix.kernel", "org.apache.servicemix.kernel.main")).afterFramework(),
+ systemPackages("org.apache.felix.karaf.main.spi;version=1.0.0", "org.apache.felix.karaf.jaas.boot"),
+ bootClasspathLibrary(mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.boot")).afterFramework(),
+ bootClasspathLibrary(mavenBundle("org.apache.felix.karaf", "org.apache.felix.karaf.main")).afterFramework(),
// Bundles
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jline"),
@@ -131,17 +131,17 @@
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-vfs"),
mavenBundle("org.apache.mina", "mina-core"),
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.oro"),
- mavenBundle("org.apache.servicemix.kernel.jaas", "org.apache.servicemix.kernel.jaas.config"),
+ mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.config"),
mavenBundle("org.apache.sshd", "sshd-core"),
- mavenBundle("org.apache.servicemix.kernel.gshell", "org.apache.servicemix.kernel.gshell.core"),
- mavenBundle("org.apache.servicemix.kernel.gshell", "org.apache.servicemix.kernel.gshell.osgi"),
- mavenBundle("org.apache.servicemix.kernel.gshell", "org.apache.servicemix.kernel.gshell.log").noStart(),
+ mavenBundle("org.apache.felix.karaf.gshell", "org.apache.felix.karaf.gshell.core"),
+ mavenBundle("org.apache.felix.karaf.gshell", "org.apache.felix.karaf.gshell.osgi"),
+ mavenBundle("org.apache.felix.karaf.gshell", "org.apache.felix.karaf.gshell.log").noStart(),
// mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
scanFeatures(
- maven().groupId("org.apache.servicemix.kernel").artifactId("apache-servicemix-kernel").type("xml").classifier("features").versionAsInProject(),
+ maven().groupId("org.apache.felix.karaf").artifactId("apache-felix-karaf").type("xml").classifier("features").versionAsInProject(),
"obr", "wrapper"
),
diff --git a/karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java b/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/CoreTest.java
similarity index 92%
rename from karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java
rename to karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/CoreTest.java
index 82f940e..e0cd93a 100644
--- a/karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/CoreTest.java
+++ b/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/CoreTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.itests;
+package org.apache.felix.karaf.gshell.itests;
import org.apache.geronimo.gshell.commandline.CommandLineExecutionFailed;
import org.apache.geronimo.gshell.registry.NoSuchCommandException;
@@ -50,7 +50,7 @@
assertTrue(e.getCause() instanceof NoSuchCommandException);
}
- Bundle b = getInstalledBundle("org.apache.servicemix.kernel.gshell.log");
+ Bundle b = getInstalledBundle("org.apache.felix.karaf.gshell.log");
b.start();
shell.execute("log/display");
@@ -76,7 +76,7 @@
@Test
public void testCommandGroupAfterInstall() throws Exception {
- Bundle b = getInstalledBundle("org.apache.servicemix.kernel.gshell.log");
+ Bundle b = getInstalledBundle("org.apache.felix.karaf.gshell.log");
b.start();
Shell shell = getOsgiService(Shell.class);
shell.execute("log");
diff --git a/karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/FeaturesTest.java b/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/FeaturesTest.java
similarity index 96%
rename from karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/FeaturesTest.java
rename to karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/FeaturesTest.java
index 738d4b7..2255846 100644
--- a/karaf/itests/src/test/java/org/apache/servicemix/kernel/gshell/itests/FeaturesTest.java
+++ b/karaf/itests/src/test/java/org/apache/felix/karaf/gshell/itests/FeaturesTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.itests;
+package org.apache.felix.karaf.gshell.itests;
import org.apache.geronimo.gshell.shell.Shell;
import org.junit.Test;
diff --git a/karaf/jaas/jaas-boot/pom.xml b/karaf/jaas/jaas-boot/pom.xml
index 4cf046e..022e6e3 100644
--- a/karaf/jaas/jaas-boot/pom.xml
+++ b/karaf/jaas/jaas-boot/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
<artifactId>jaas</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.boot</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: JAAS Boot</name>
+ <name>Apache Felix Karaf :: JAAS Boot</name>
<description>
Provides the JAAS Boot classes
@@ -53,7 +53,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.servicemix*;version=${project.version};-split-package:=merge-first
+ <Export-Package>${artifactId}*;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>!*</Private-Package>
@@ -62,4 +62,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/jaas/jaas-boot/src/main/java/org/apache/servicemix/kernel/jaas/boot/ProxyLoginModule.java b/karaf/jaas/jaas-boot/src/main/java/org/apache/felix/karaf/jaas/boot/ProxyLoginModule.java
similarity index 94%
rename from karaf/jaas/jaas-boot/src/main/java/org/apache/servicemix/kernel/jaas/boot/ProxyLoginModule.java
rename to karaf/jaas/jaas-boot/src/main/java/org/apache/felix/karaf/jaas/boot/ProxyLoginModule.java
index 3b3aed0..50b2dff 100644
--- a/karaf/jaas/jaas-boot/src/main/java/org/apache/servicemix/kernel/jaas/boot/ProxyLoginModule.java
+++ b/karaf/jaas/jaas-boot/src/main/java/org/apache/felix/karaf/jaas/boot/ProxyLoginModule.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.boot;
+package org.apache.felix.karaf.jaas.boot;
import java.util.HashMap;
import java.util.Map;
@@ -37,8 +37,8 @@
*/
public class ProxyLoginModule implements LoginModule {
- public static final String PROPERTY_MODULE = "org.apache.servicemix.kernel.jaas.module";
- public static final String PROPERTY_BUNDLE = "org.apache.servicemix.kernel.jaas.bundle";
+ public static final String PROPERTY_MODULE = "org.apache.felix.karaf.jaas.module";
+ public static final String PROPERTY_BUNDLE = "org.apache.felix.karaf.jaas.bundle";
private static BundleContext bundleContext = null;
diff --git a/karaf/jaas/jaas-config/pom.xml b/karaf/jaas/jaas-config/pom.xml
index bc47433..3c9c0b3 100644
--- a/karaf/jaas/jaas-config/pom.xml
+++ b/karaf/jaas/jaas-config/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
<artifactId>jaas</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.config</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.config</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: JAAS Config</name>
+ <name>Apache Felix Karaf :: JAAS Config</name>
<description>
Provides the JAAS Config
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.boot</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -92,4 +92,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/JaasRealm.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/JaasRealm.java
similarity index 94%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/JaasRealm.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/JaasRealm.java
index b5237d1..d1a40f5 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/JaasRealm.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/JaasRealm.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config;
+package org.apache.felix.karaf.jaas.config;
import javax.security.auth.login.AppConfigurationEntry;
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeyIsLocked.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeyIsLocked.java
similarity index 95%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeyIsLocked.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeyIsLocked.java
index 5ff4736..bfaaba2 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeyIsLocked.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeyIsLocked.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config;
+package org.apache.felix.karaf.jaas.config;
import java.security.GeneralSecurityException;
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreInstance.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreInstance.java
similarity index 97%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreInstance.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreInstance.java
index 022d95b..4f0890b 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreInstance.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreInstance.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config;
+package org.apache.felix.karaf.jaas.config;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreIsLocked.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreIsLocked.java
similarity index 95%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreIsLocked.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreIsLocked.java
index 34c9a2b..ae5efe6 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreIsLocked.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreIsLocked.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config;
+package org.apache.felix.karaf.jaas.config;
import java.security.GeneralSecurityException;
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreManager.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreManager.java
similarity index 98%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreManager.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreManager.java
index 74fa466..afa2adf 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/KeystoreManager.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/KeystoreManager.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config;
+package org.apache.felix.karaf.jaas.config;
import java.security.GeneralSecurityException;
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Config.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Config.java
similarity index 95%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Config.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Config.java
index 7ad0b04..5a6b809 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Config.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Config.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config.impl;
+package org.apache.felix.karaf.jaas.config.impl;
import java.util.HashMap;
import java.util.Map;
import javax.security.auth.login.AppConfigurationEntry;
-import org.apache.servicemix.kernel.jaas.boot.ProxyLoginModule;
-import org.apache.servicemix.kernel.jaas.config.JaasRealm;
+import org.apache.felix.karaf.jaas.boot.ProxyLoginModule;
+import org.apache.felix.karaf.jaas.config.JaasRealm;
import org.osgi.framework.BundleContext;
import org.springframework.osgi.context.BundleContextAware;
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ConfigParser.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ConfigParser.java
similarity index 96%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ConfigParser.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ConfigParser.java
index 5f8e16a..ec5d1e8 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ConfigParser.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ConfigParser.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config.impl;
+package org.apache.felix.karaf.jaas.config.impl;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -25,8 +25,8 @@
import org.w3c.dom.Element;
-import org.apache.servicemix.kernel.jaas.boot.ProxyLoginModule;
-import org.apache.servicemix.kernel.jaas.config.JaasRealm;
+import org.apache.felix.karaf.jaas.boot.ProxyLoginModule;
+import org.apache.felix.karaf.jaas.config.JaasRealm;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Module.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Module.java
similarity index 96%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Module.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Module.java
index 488f19a..baaa352 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/Module.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/Module.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config.impl;
+package org.apache.felix.karaf.jaas.config.impl;
import java.util.Map;
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/NamespaceHandler.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java
similarity index 95%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/NamespaceHandler.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java
index d1b8192..6129a37 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/NamespaceHandler.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config.impl;
+package org.apache.felix.karaf.jaas.config.impl;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiConfiguration.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiConfiguration.java
similarity index 94%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiConfiguration.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiConfiguration.java
index a2e6119..a5489d8 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiConfiguration.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config.impl;
+package org.apache.felix.karaf.jaas.config.impl;
import java.util.List;
import java.util.Map;
@@ -23,7 +23,7 @@
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
-import org.apache.servicemix.kernel.jaas.config.JaasRealm;
+import org.apache.felix.karaf.jaas.config.JaasRealm;
public class OsgiConfiguration extends Configuration {
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiKeystoreManager.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiKeystoreManager.java
similarity index 93%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiKeystoreManager.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiKeystoreManager.java
index 41135c2..bb75dce 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/OsgiKeystoreManager.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/OsgiKeystoreManager.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config.impl;
+package org.apache.felix.karaf.jaas.config.impl;
import java.security.GeneralSecurityException;
import java.security.SecureRandom;
@@ -26,9 +26,9 @@
import javax.net.ssl.SSLServerSocketFactory;
import javax.net.ssl.SSLSocketFactory;
-import org.apache.servicemix.kernel.jaas.config.KeystoreInstance;
-import org.apache.servicemix.kernel.jaas.config.KeystoreIsLocked;
-import org.apache.servicemix.kernel.jaas.config.KeystoreManager;
+import org.apache.felix.karaf.jaas.config.KeystoreInstance;
+import org.apache.felix.karaf.jaas.config.KeystoreIsLocked;
+import org.apache.felix.karaf.jaas.config.KeystoreManager;
/**
* Implementation of KeystoreManager
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ProxyLoginModuleInitializer.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ProxyLoginModuleInitializer.java
similarity index 91%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ProxyLoginModuleInitializer.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ProxyLoginModuleInitializer.java
index f2b8c32..da4380d 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ProxyLoginModuleInitializer.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ProxyLoginModuleInitializer.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config.impl;
+package org.apache.felix.karaf.jaas.config.impl;
-import org.apache.servicemix.kernel.jaas.boot.ProxyLoginModule;
+import org.apache.felix.karaf.jaas.boot.ProxyLoginModule;
import org.osgi.framework.BundleContext;
import org.springframework.osgi.context.BundleContextAware;
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstance.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstance.java
similarity index 97%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstance.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstance.java
index 7974ed6..7c79fb9 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstance.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstance.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config.impl;
+package org.apache.felix.karaf.jaas.config.impl;
import java.io.BufferedInputStream;
import java.io.File;
@@ -41,8 +41,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.kernel.jaas.config.KeystoreInstance;
-import org.apache.servicemix.kernel.jaas.config.KeystoreIsLocked;
+import org.apache.felix.karaf.jaas.config.KeystoreInstance;
+import org.apache.felix.karaf.jaas.config.KeystoreIsLocked;
import org.springframework.core.io.Resource;
/**
diff --git a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstanceParser.java b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstanceParser.java
similarity index 96%
rename from karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstanceParser.java
rename to karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstanceParser.java
index 01f3531..c818a46 100644
--- a/karaf/jaas/jaas-config/src/main/java/org/apache/servicemix/kernel/jaas/config/impl/ResourceKeystoreInstanceParser.java
+++ b/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/ResourceKeystoreInstanceParser.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config.impl;
+package org.apache.felix.karaf.jaas.config.impl;
import org.w3c.dom.Element;
-import org.apache.servicemix.kernel.jaas.config.KeystoreInstance;
+import org.apache.felix.karaf.jaas.config.KeystoreInstance;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
diff --git a/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.handlers b/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.handlers
index fe59e34..c8b49a7 100644
--- a/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.handlers
+++ b/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.handlers
@@ -16,5 +16,5 @@
# limitations under the License.
#
################################################################################
-http\://servicemix.apache.org/jaas = org.apache.servicemix.kernel.jaas.config.impl.NamespaceHandler
-
\ No newline at end of file
+http\://servicemix.apache.org/jaas = org.apache.felix.karaf.jaas.config.impl.NamespaceHandler
+
diff --git a/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.schemas b/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.schemas
index 3001be1..352002b 100644
--- a/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.schemas
+++ b/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.schemas
@@ -16,4 +16,4 @@
# limitations under the License.
#
################################################################################
-http\://servicemix.apache.org/schema/servicemix-jaas.xsd = org/apache/servicemix/kernel/jaas/config/servicemix-jaas.xsd
+http\://servicemix.apache.org/schema/servicemix-jaas.xsd = org/apache/felix/karaf/jaas/config/servicemix-jaas.xsd
diff --git a/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/servicemix-jaas.xml b/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/servicemix-jaas.xml
index eca5fbd..d878a3d 100644
--- a/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/servicemix-jaas.xml
+++ b/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/servicemix-jaas.xml
@@ -30,30 +30,30 @@
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
<bean id="config"
- class="org.apache.servicemix.kernel.jaas.config.impl.OsgiConfiguration"
+ class="org.apache.felix.karaf.jaas.config.impl.OsgiConfiguration"
init-method="init"
destroy-method="close"/>
<osgi:list id="realms"
- interface="org.apache.servicemix.kernel.jaas.config.JaasRealm"
+ interface="org.apache.felix.karaf.jaas.config.JaasRealm"
cardinality="0..N">
<osgi:listener ref="config" bind-method="register" unbind-method="unregister" />
</osgi:list>
<bean id="proxyLoginModuleInitializer"
- class="org.apache.servicemix.kernel.jaas.config.impl.ProxyLoginModuleInitializer"
+ class="org.apache.felix.karaf.jaas.config.impl.ProxyLoginModuleInitializer"
init-method="init"/>
<!-- Register the Straight-Through flow -->
- <bean id="keystoreManager" class="org.apache.servicemix.kernel.jaas.config.impl.OsgiKeystoreManager" />
+ <bean id="keystoreManager" class="org.apache.felix.karaf.jaas.config.impl.OsgiKeystoreManager" />
<osgi:service ref="keystoreManager">
<osgi:interfaces>
- <value>org.apache.servicemix.kernel.jaas.config.KeystoreManager</value>
+ <value>org.apache.felix.karaf.jaas.config.KeystoreManager</value>
</osgi:interfaces>
</osgi:service>
<osgi:list id="keystores"
- interface="org.apache.servicemix.kernel.jaas.config.KeystoreInstance"
+ interface="org.apache.felix.karaf.jaas.config.KeystoreInstance"
cardinality="0..N">
<osgi:listener ref="keystoreManager" bind-method="register" unbind-method="unregister" />
</osgi:list>
diff --git a/karaf/jaas/jaas-config/src/main/resources/org/apache/servicemix/kernel/jaas/config/servicemix-jaas.xsd b/karaf/jaas/jaas-config/src/main/resources/org/apache/felix/karaf/jaas/config/servicemix-jaas.xsd
similarity index 100%
rename from karaf/jaas/jaas-config/src/main/resources/org/apache/servicemix/kernel/jaas/config/servicemix-jaas.xsd
rename to karaf/jaas/jaas-config/src/main/resources/org/apache/felix/karaf/jaas/config/servicemix-jaas.xsd
diff --git a/karaf/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java b/karaf/jaas/jaas-config/src/test/java/org/apache/felix/karaf/jaas/config/NamespaceHandlerTest.java
similarity index 91%
rename from karaf/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java
rename to karaf/jaas/jaas-config/src/test/java/org/apache/felix/karaf/jaas/config/NamespaceHandlerTest.java
index fb282e9..c390fb9 100644
--- a/karaf/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java
+++ b/karaf/jaas/jaas-config/src/test/java/org/apache/felix/karaf/jaas/config/NamespaceHandlerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config;
+package org.apache.felix.karaf.jaas.config;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -23,8 +23,8 @@
import javax.security.auth.login.AppConfigurationEntry;
import junit.framework.TestCase;
-import org.apache.servicemix.kernel.jaas.boot.ProxyLoginModule;
-import org.apache.servicemix.kernel.jaas.config.impl.Config;
+import org.apache.felix.karaf.jaas.boot.ProxyLoginModule;
+import org.apache.felix.karaf.jaas.config.impl.Config;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.aryEq;
@@ -82,7 +82,7 @@
assertNotNull(cfg.getModules());
assertEquals(1, cfg.getModules().length);
assertNotNull(cfg.getModules()[0]);
- assertEquals("org.apache.servicemix.kernel.jaas.config.SimpleLoginModule", cfg.getModules()[0].getClassName());
+ assertEquals("org.apache.felix.karaf.jaas.config.SimpleLoginModule", cfg.getModules()[0].getClassName());
assertEquals("required", cfg.getModules()[0].getFlags());
assertNotNull(cfg.getModules()[0].getOptions());
assertEquals(1, cfg.getModules()[0].getOptions().size());
@@ -97,7 +97,7 @@
assertNotNull(options);
assertEquals(3, options.size());
assertEquals("value", options.get("key"));
- assertEquals("org.apache.servicemix.kernel.jaas.config.SimpleLoginModule", options.get(ProxyLoginModule.PROPERTY_MODULE));
+ assertEquals("org.apache.felix.karaf.jaas.config.SimpleLoginModule", options.get(ProxyLoginModule.PROPERTY_MODULE));
assertEquals("32", options.get(ProxyLoginModule.PROPERTY_BUNDLE));
// Test keystore
diff --git a/karaf/jaas/jaas-config/src/test/resources/config.xml b/karaf/jaas/jaas-config/src/test/resources/config.xml
index 868b7c7..9fe3042 100644
--- a/karaf/jaas/jaas-config/src/test/resources/config.xml
+++ b/karaf/jaas/jaas-config/src/test/resources/config.xml
@@ -33,7 +33,7 @@
http://servicemix.apache.org/schema/servicemix-jaas.xsd">
<jaas:config id="realm">
- <jaas:module className="org.apache.servicemix.kernel.jaas.config.SimpleLoginModule" flags="required">
+ <jaas:module className="org.apache.felix.karaf.jaas.config.SimpleLoginModule" flags="required">
key=value
</jaas:module>
</jaas:config>
diff --git a/karaf/jaas/jaas-config/src/test/resources/privatestore.jks b/karaf/jaas/jaas-config/src/test/resources/privatestore.jks
index 26fc0bc..80106c1 100644
--- a/karaf/jaas/jaas-config/src/test/resources/privatestore.jks
+++ b/karaf/jaas/jaas-config/src/test/resources/privatestore.jks
Binary files differ
diff --git a/karaf/jaas/jaas-modules/pom.xml b/karaf/jaas/jaas-modules/pom.xml
index b3d0300..07af5aa 100644
--- a/karaf/jaas/jaas-modules/pom.xml
+++ b/karaf/jaas/jaas-modules/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
<artifactId>jaas</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.modules</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.modules</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: JAAS Modules</name>
+ <name>Apache Felix Karaf :: JAAS Modules</name>
<description>
Provides the JAAS Config
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.config</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.config</artifactId>
</dependency>
<dependency>
@@ -75,10 +75,10 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.servicemix.kernel.jaas.modules*;version=${project.version};-split-package:=merge-first
+ org.apache.felix.karaf.jaas.modules*;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
- org.apache.servicemix.kernel.jaas.config,
+ org.apache.felix.karaf.jaas.config,
org.springframework.beans.factory.config,
*
</Import-Package>
@@ -89,4 +89,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/RolePrincipal.java b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java
similarity index 96%
rename from karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/RolePrincipal.java
rename to karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java
index 03da146..1e70880 100644
--- a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/RolePrincipal.java
+++ b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.modules;
+package org.apache.felix.karaf.jaas.modules;
import java.security.Principal;
diff --git a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/UserPrincipal.java b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java
similarity index 96%
rename from karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/UserPrincipal.java
rename to karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java
index 4978076..c791db9 100644
--- a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/UserPrincipal.java
+++ b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.modules;
+package org.apache.felix.karaf.jaas.modules;
import java.security.Principal;
diff --git a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/ConfigAdminHolder.java b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java
similarity index 95%
rename from karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/ConfigAdminHolder.java
rename to karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java
index ec93095..cef50a7 100644
--- a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/ConfigAdminHolder.java
+++ b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.modules.osgi;
+package org.apache.felix.karaf.jaas.modules.osgi;
import org.osgi.service.cm.ConfigurationAdmin;
diff --git a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
similarity index 95%
rename from karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java
rename to karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
index 2b48eb4..5e29485 100644
--- a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java
+++ b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.modules.osgi;
+package org.apache.felix.karaf.jaas.modules.osgi;
import java.io.IOException;
import java.security.Principal;
@@ -33,8 +33,8 @@
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import org.apache.servicemix.kernel.jaas.modules.RolePrincipal;
-import org.apache.servicemix.kernel.jaas.modules.UserPrincipal;
+import org.apache.felix.karaf.jaas.modules.RolePrincipal;
+import org.apache.felix.karaf.jaas.modules.UserPrincipal;
import org.osgi.service.cm.Configuration;
public class OsgiConfigLoginModule implements LoginModule {
diff --git a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java
similarity index 95%
rename from karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java
rename to karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java
index 5971745..2077903 100644
--- a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java
+++ b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.modules.properties;
+package org.apache.felix.karaf.jaas.modules.properties;
import java.io.File;
import java.io.IOException;
@@ -36,8 +36,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.kernel.jaas.modules.RolePrincipal;
-import org.apache.servicemix.kernel.jaas.modules.UserPrincipal;
+import org.apache.felix.karaf.jaas.modules.RolePrincipal;
+import org.apache.felix.karaf.jaas.modules.UserPrincipal;
/**
* JAAS Login module for user / password, based on two properties files.
diff --git a/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml b/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml
index e8acabe..8187e2b 100644
--- a/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml
+++ b/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml
@@ -35,14 +35,14 @@
- on this service, which means any bundle could access all the passwords.
-->
<!--
- <bean id="configAdminHolder" class="org.apache.servicemix.kernel.jaas.modules.osgi.ConfigAdminHolder">
+ <bean id="configAdminHolder" class="org.apache.felix.karaf.jaas.modules.osgi.ConfigAdminHolder">
<property name="service" ref="configAdmin" />
</bean>
<osgi:reference id="configAdmin" interface="org.osgi.service.cm.ConfigurationAdmin" />
<jaas:config id="servicemix">
- <jaas:module className="org.apache.servicemix.kernel.jaas.modules.osgi.OsgiConfigLoginModule" flags="required">
+ <jaas:module className="org.apache.felix.karaf.jaas.modules.osgi.OsgiConfigLoginModule" flags="required">
pid = org.apache.servicemix.users
</jaas:module>
</jaas:config>
@@ -52,9 +52,9 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
<jaas:config id="servicemix">
- <jaas:module className="org.apache.servicemix.kernel.jaas.modules.properties.PropertiesLoginModule" flags="required">
+ <jaas:module className="org.apache.felix.karaf.jaas.modules.properties.PropertiesLoginModule" flags="required">
users = ${servicemix.base}/etc/users.properties
</jaas:module>
</jaas:config>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/karaf/jaas/pom.xml b/karaf/jaas/pom.xml
index 5be1cd7..2dfd4bb 100644
--- a/karaf/jaas/pom.xml
+++ b/karaf/jaas/pom.xml
@@ -22,16 +22,16 @@
<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.jaas</groupId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
<artifactId>jaas</artifactId>
<packaging>pom</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: JAAS</name>
+ <name>Apache Felix Karaf :: JAAS</name>
<modules>
<module>jaas-boot</module>
@@ -39,4 +39,4 @@
<module>jaas-modules</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/main/pom.xml b/karaf/main/pom.xml
index 4166785..e69a59b 100644
--- a/karaf/main/pom.xml
+++ b/karaf/main/pom.xml
@@ -22,16 +22,16 @@
<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.main</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.main</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: Main</name>
+ <name>Apache Felix Karaf :: Main</name>
<dependencies>
<dependency>
@@ -56,13 +56,13 @@
<configuration>
<instructions>
<_donotcopy>(CVS|.svn|config.properties)</_donotcopy>
- <Main-Class>org.apache.servicemix.kernel.main.Main</Main-Class>
+ <Main-Class>org.apache.felix.karaf.main.Main</Main-Class>
<Bundle-Name>Apache ServiceMix</Bundle-Name>
<Bundle-Description>OSGi R4 framework.</Bundle-Description>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.servicemix.kernel.main.spi.*;version=${pom.version}</Export-Package>
+ <Export-Package>org.apache.felix.karaf.main.spi.*;version=${pom.version}</Export-Package>
<Private-Package>
- org.apache.servicemix.kernel.main;-split-package:=merge-first,
+ org.apache.felix.karaf.main;-split-package:=merge-first,
org.apache.felix.moduleloader.*;-split-package:=merge-first,
org.apache.felix.framework.*;-split-package:=merge-first,
org.osgi.framework.launch*,
diff --git a/karaf/main/src/main/java/org/apache/servicemix/kernel/main/DefaultJDBCLock.java b/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
similarity index 99%
rename from karaf/main/src/main/java/org/apache/servicemix/kernel/main/DefaultJDBCLock.java
rename to karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
index bf4bfba..adc1975 100644
--- a/karaf/main/src/main/java/org/apache/servicemix/kernel/main/DefaultJDBCLock.java
+++ b/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.main;
+package org.apache.felix.karaf.main;
import java.sql.Connection;
import java.sql.DriverManager;
diff --git a/karaf/main/src/main/java/org/apache/servicemix/kernel/main/Lock.java b/karaf/main/src/main/java/org/apache/felix/karaf/main/Lock.java
similarity index 95%
rename from karaf/main/src/main/java/org/apache/servicemix/kernel/main/Lock.java
rename to karaf/main/src/main/java/org/apache/felix/karaf/main/Lock.java
index f4e8ab8..02423a2 100644
--- a/karaf/main/src/main/java/org/apache/servicemix/kernel/main/Lock.java
+++ b/karaf/main/src/main/java/org/apache/felix/karaf/main/Lock.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.main;
+package org.apache.felix.karaf.main;
public interface Lock {
diff --git a/karaf/main/src/main/java/org/apache/servicemix/kernel/main/Main.java b/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
similarity index 99%
rename from karaf/main/src/main/java/org/apache/servicemix/kernel/main/Main.java
rename to karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
index d09a033..daa18a0 100644
--- a/karaf/main/src/main/java/org/apache/servicemix/kernel/main/Main.java
+++ b/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.main;
+package org.apache.felix.karaf.main;
import java.io.File;
import java.io.FileNotFoundException;
@@ -42,7 +42,7 @@
import org.apache.felix.framework.cache.BundleCache;
import org.apache.felix.framework.util.FelixConstants;
import org.apache.felix.framework.util.StringMap;
-import org.apache.servicemix.kernel.main.spi.MainService;
+import org.apache.felix.karaf.main.spi.MainService;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
diff --git a/karaf/main/src/main/java/org/apache/servicemix/kernel/main/SimpleFileLock.java b/karaf/main/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java
similarity index 98%
rename from karaf/main/src/main/java/org/apache/servicemix/kernel/main/SimpleFileLock.java
rename to karaf/main/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java
index c9791fd..b79c1c1 100644
--- a/karaf/main/src/main/java/org/apache/servicemix/kernel/main/SimpleFileLock.java
+++ b/karaf/main/src/main/java/org/apache/felix/karaf/main/SimpleFileLock.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.main;
+package org.apache.felix.karaf.main;
import java.io.File;
import java.io.IOException;
diff --git a/karaf/main/src/main/java/org/apache/servicemix/kernel/main/Statements.java b/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java
similarity index 98%
rename from karaf/main/src/main/java/org/apache/servicemix/kernel/main/Statements.java
rename to karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java
index 0681792..e382876 100644
--- a/karaf/main/src/main/java/org/apache/servicemix/kernel/main/Statements.java
+++ b/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.main;
+package org.apache.felix.karaf.main;
import java.sql.Connection;
import java.sql.ResultSet;
diff --git a/karaf/main/src/main/java/org/apache/servicemix/kernel/main/spi/MainService.java b/karaf/main/src/main/java/org/apache/felix/karaf/main/spi/MainService.java
similarity index 94%
rename from karaf/main/src/main/java/org/apache/servicemix/kernel/main/spi/MainService.java
rename to karaf/main/src/main/java/org/apache/felix/karaf/main/spi/MainService.java
index ab6a24b..f72c207 100644
--- a/karaf/main/src/main/java/org/apache/servicemix/kernel/main/spi/MainService.java
+++ b/karaf/main/src/main/java/org/apache/felix/karaf/main/spi/MainService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.kernel.main.spi;
+package org.apache.felix.karaf.main.spi;
public interface MainService {
@@ -24,4 +24,4 @@
public int getExitCode();
public void setExitCode(int exitCode);
-}
\ No newline at end of file
+}
diff --git a/karaf/management/pom.xml b/karaf/management/pom.xml
index ed0112b..dcdfbf4 100644
--- a/karaf/management/pom.xml
+++ b/karaf/management/pom.xml
@@ -22,16 +22,16 @@
<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.management</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.management</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: Management</name>
+ <name>Apache Felix Karaf :: Management</name>
<dependencies>
<dependency>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 0b5dec5..a107205 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -27,11 +27,11 @@
<version>2</version>
</parent>
- <groupId>org.apache.servicemix.kernel</groupId>
+ <groupId>org.apache.felix.karaf</groupId>
<artifactId>kernel</artifactId>
<packaging>pom</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel</name>
+ <name>Apache Felix Karaf</name>
<inceptionYear>2007</inceptionYear>
<modules>
@@ -181,119 +181,119 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.main</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.main</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <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>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.filemonitor</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.spring</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.spring</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.blueprint</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.blueprint</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.features</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.features</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.management</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.management</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>org.apache.servicemix.kernel.demos</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>org.apache.felix.karaf.demos</artifactId>
<version>${pom.version}</version>
</dependency>
<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>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.admin</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.admin</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.obr</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.obr</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.osgi</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.osgi</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.log</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.log</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.features</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.features</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.config</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.config</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.gshell</groupId>
- <artifactId>org.apache.servicemix.kernel.gshell.packages</artifactId>
+ <groupId>org.apache.felix.karaf.gshell</groupId>
+ <artifactId>org.apache.felix.karaf.gshell.packages</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.boot</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.config</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.config</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.modules</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.modules</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel.demos</groupId>
+ <groupId>org.apache.felix.karaf.demos</groupId>
<artifactId>smx4web</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>apache-servicemix-kernel</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>apache-felix-karaf</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>apache-servicemix-kernel</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>apache-felix-karaf</artifactId>
<type>zip</type>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.kernel</groupId>
- <artifactId>apache-servicemix-kernel</artifactId>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>apache-felix-karaf</artifactId>
<classifier>features</classifier>
<type>xml</type>
<version>${pom.version}</version>