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/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>