karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject [30/59] [abbrv] git commit: [KARAF-2852] Merge instance/core and instance/command
Date Thu, 10 Apr 2014 14:15:52 GMT
[KARAF-2852] Merge instance/core and instance/command

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7c2db062
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7c2db062
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7c2db062

Branch: refs/heads/master
Commit: 7c2db062584b2b15afc5bf1727e2f477feac2877
Parents: d33e095
Author: Guillaume Nodet <gnodet@gmail.com>
Authored: Wed Apr 9 22:17:39 2014 +0200
Committer: Guillaume Nodet <gnodet@gmail.com>
Committed: Thu Apr 10 16:00:16 2014 +0200

----------------------------------------------------------------------
 .../standard/src/main/feature/feature.xml       |    1 -
 instance/NOTICE                                 |   71 ++
 instance/command/NOTICE                         |   71 --
 instance/command/pom.xml                        |  129 --
 .../instance/command/ChangeOptsCommand.java     |   41 -
 .../command/ChangeRmiRegistryPortCommand.java   |   41 -
 .../command/ChangeRmiServerPortCommand.java     |   41 -
 .../instance/command/ChangeSshPortCommand.java  |   41 -
 .../karaf/instance/command/CloneCommand.java    |   66 -
 .../karaf/instance/command/ConnectCommand.java  |   78 --
 .../karaf/instance/command/CreateCommand.java   |   74 --
 .../karaf/instance/command/DestroyCommand.java  |   41 -
 .../command/InstanceCommandSupport.java         |   51 -
 .../karaf/instance/command/ListCommand.java     |   81 --
 .../karaf/instance/command/RenameCommand.java   |   45 -
 .../karaf/instance/command/StartCommand.java    |   76 --
 .../karaf/instance/command/StatusCommand.java   |   40 -
 .../karaf/instance/command/StopCommand.java     |   38 -
 .../command/completers/InstanceCompleter.java   |   52 -
 .../org/apache/karaf/instance/main/Execute.java |  171 ---
 .../services/org/apache/karaf/shell/commands    |   30 -
 .../src/main/resources/OSGI-INF/bundle.info     |   29 -
 .../instance/command/CreateCommandTest.java     |   57 -
 .../apache/karaf/instance/main/ExecuteTest.java |  126 --
 instance/core/NOTICE                            |   71 --
 instance/core/pom.xml                           |  181 ---
 .../apache/karaf/instance/core/Instance.java    |   66 -
 .../karaf/instance/core/InstanceService.java    |   33 -
 .../karaf/instance/core/InstanceSettings.java   |   97 --
 .../karaf/instance/core/InstancesMBean.java     |   55 -
 .../instance/core/internal/InstanceImpl.java    |  110 --
 .../core/internal/InstanceServiceImpl.java      | 1166 ------------------
 .../core/internal/InstanceToTableMapper.java    |   83 --
 .../core/internal/InstancesMBeanImpl.java       |  224 ----
 .../instance/core/internal/osgi/Activator.java  |   35 -
 .../main/java/org/apache/karaf/jpm/Process.java |   47 -
 .../org/apache/karaf/jpm/ProcessBuilder.java    |   59 -
 .../apache/karaf/jpm/ProcessBuilderFactory.java |   25 -
 .../jpm/impl/ProcessBuilderFactoryImpl.java     |   27 -
 .../karaf/jpm/impl/ProcessBuilderImpl.java      |   48 -
 .../org/apache/karaf/jpm/impl/ProcessImpl.java  |  155 ---
 .../org/apache/karaf/jpm/impl/ScriptUtils.java  |  128 --
 .../src/main/resources/OSGI-INF/bundle.info     |   36 -
 .../apache/karaf/instance/resources/bin/karaf   |   25 -
 .../karaf/instance/resources/bin/karaf.bat      |   25 -
 .../apache/karaf/instance/resources/bin/start   |   25 -
 .../karaf/instance/resources/bin/start.bat      |   24 -
 .../apache/karaf/instance/resources/bin/stop    |   25 -
 .../karaf/instance/resources/bin/stop.bat       |   24 -
 .../etc/org.apache.karaf.management.cfg         |   63 -
 .../resources/etc/org.apache.karaf.shell.cfg    |   75 --
 .../instance/resources/etc/system.properties    |  120 --
 .../org/apache/karaf/jpm/impl/unix/start.sh     |   29 -
 .../apache/karaf/jpm/impl/windows/destroy.vbs   |   27 -
 .../apache/karaf/jpm/impl/windows/running.vbs   |   26 -
 .../org/apache/karaf/jpm/impl/windows/start.vbs |   34 -
 .../instance/core/InstanceSettingsTest.java     |   58 -
 .../core/internal/InstanceServiceImplTest.java  |  187 ---
 .../internal/InstanceServiceMBeanImplTest.java  |  239 ----
 .../internal/InstanceToTableMapperTest.java     |   90 --
 .../java/org/apache/karaf/jpm/MainTest.java     |   24 -
 .../java/org/apache/karaf/jpm/ProcessTest.java  |   69 --
 .../src/test/resources/etc/startup.properties   |   20 -
 instance/pom.xml                                |  175 ++-
 .../instance/command/ChangeOptsCommand.java     |   41 +
 .../command/ChangeRmiRegistryPortCommand.java   |   41 +
 .../command/ChangeRmiServerPortCommand.java     |   41 +
 .../instance/command/ChangeSshPortCommand.java  |   41 +
 .../karaf/instance/command/CloneCommand.java    |   66 +
 .../karaf/instance/command/ConnectCommand.java  |   78 ++
 .../karaf/instance/command/CreateCommand.java   |   74 ++
 .../karaf/instance/command/DestroyCommand.java  |   41 +
 .../command/InstanceCommandSupport.java         |   51 +
 .../karaf/instance/command/ListCommand.java     |   81 ++
 .../karaf/instance/command/RenameCommand.java   |   45 +
 .../karaf/instance/command/StartCommand.java    |   76 ++
 .../karaf/instance/command/StatusCommand.java   |   40 +
 .../karaf/instance/command/StopCommand.java     |   38 +
 .../command/completers/InstanceCompleter.java   |   52 +
 .../apache/karaf/instance/core/Instance.java    |   66 +
 .../karaf/instance/core/InstanceService.java    |   33 +
 .../karaf/instance/core/InstanceSettings.java   |   97 ++
 .../karaf/instance/core/InstancesMBean.java     |   55 +
 .../instance/core/internal/InstanceImpl.java    |  110 ++
 .../core/internal/InstanceServiceImpl.java      | 1166 ++++++++++++++++++
 .../core/internal/InstanceToTableMapper.java    |   83 ++
 .../core/internal/InstancesMBeanImpl.java       |  224 ++++
 .../instance/core/internal/osgi/Activator.java  |   35 +
 .../org/apache/karaf/instance/main/Execute.java |  171 +++
 .../main/java/org/apache/karaf/jpm/Process.java |   47 +
 .../org/apache/karaf/jpm/ProcessBuilder.java    |   59 +
 .../apache/karaf/jpm/ProcessBuilderFactory.java |   25 +
 .../jpm/impl/ProcessBuilderFactoryImpl.java     |   27 +
 .../karaf/jpm/impl/ProcessBuilderImpl.java      |   48 +
 .../org/apache/karaf/jpm/impl/ProcessImpl.java  |  155 +++
 .../org/apache/karaf/jpm/impl/ScriptUtils.java  |  128 ++
 .../services/org/apache/karaf/shell/commands    |   30 +
 .../src/main/resources/OSGI-INF/bundle.info     |   36 +
 .../apache/karaf/instance/resources/bin/karaf   |   25 +
 .../karaf/instance/resources/bin/karaf.bat      |   25 +
 .../apache/karaf/instance/resources/bin/start   |   25 +
 .../karaf/instance/resources/bin/start.bat      |   24 +
 .../apache/karaf/instance/resources/bin/stop    |   25 +
 .../karaf/instance/resources/bin/stop.bat       |   24 +
 .../etc/org.apache.karaf.management.cfg         |   63 +
 .../resources/etc/org.apache.karaf.shell.cfg    |   75 ++
 .../instance/resources/etc/system.properties    |  120 ++
 .../org/apache/karaf/jpm/impl/unix/start.sh     |   29 +
 .../apache/karaf/jpm/impl/windows/destroy.vbs   |   27 +
 .../apache/karaf/jpm/impl/windows/running.vbs   |   26 +
 .../org/apache/karaf/jpm/impl/windows/start.vbs |   34 +
 .../instance/command/CreateCommandTest.java     |   57 +
 .../instance/core/InstanceSettingsTest.java     |   58 +
 .../core/internal/InstanceServiceImplTest.java  |  187 +++
 .../internal/InstanceServiceMBeanImplTest.java  |  239 ++++
 .../internal/InstanceToTableMapperTest.java     |   90 ++
 .../apache/karaf/instance/main/ExecuteTest.java |  126 ++
 .../java/org/apache/karaf/jpm/MainTest.java     |   24 +
 .../java/org/apache/karaf/jpm/ProcessTest.java  |   69 ++
 .../src/test/resources/etc/startup.properties   |   20 +
 120 files changed, 5031 insertions(+), 5283 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 1c67ca7..830ba9d 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -134,7 +134,6 @@
 
     <feature name="instance" description="Provide Instance support" version="${project.version}">
         <bundle start-level="30" start="true">mvn:org.apache.karaf.instance/org.apache.karaf.instance.core/${project.version}</bundle>
-        <bundle start-level="30" start="true">mvn:org.apache.karaf.instance/org.apache.karaf.instance.command/${project.version}</bundle>
     </feature>
 
     <feature name="jaas" description="Provide JAAS support" version="${project.version}">

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/NOTICE
----------------------------------------------------------------------
diff --git a/instance/NOTICE b/instance/NOTICE
new file mode 100644
index 0000000..b70f1f9
--- /dev/null
+++ b/instance/NOTICE
@@ -0,0 +1,71 @@
+Apache Karaf
+Copyright 2010-2014 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+OW2 (http://www.ow2.org/).
+Licensed under the BSD License.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the EPL.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+AOP Alliance (http://aopalliance.sourceforge.net/).
+Licensed under the Public Domain.
+
+This product uses software developed at
+Tanuki Software (http://www.tanukisoftware.com/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Jasypt (http://jasypt.sourceforge.net/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product uses software developed at
+SpringSource (http://www.springsource.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0
+- BSD License
+- EPL License
+- MIT License

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/NOTICE
----------------------------------------------------------------------
diff --git a/instance/command/NOTICE b/instance/command/NOTICE
deleted file mode 100644
index b70f1f9..0000000
--- a/instance/command/NOTICE
+++ /dev/null
@@ -1,71 +0,0 @@
-Apache Karaf
-Copyright 2010-2014 The Apache Software Foundation
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-OW2 (http://www.ow2.org/).
-Licensed under the BSD License.
-
-This product includes software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-Eclipse Foundation (http://www.eclipse.org/).
-Licensed under the EPL.
-
-This product includes software written by
-Antony Lesuisse.
-Licensed under Public Domain.
-
-
-II. Used Software
-
-This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-AOP Alliance (http://aopalliance.sourceforge.net/).
-Licensed under the Public Domain.
-
-This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Jasypt (http://jasypt.sourceforge.net/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-JLine (http://jline.sourceforge.net).
-Licensed under the BSD License.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-This product uses software developed at
-SpringSource (http://www.springsource.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software from http://www.json.org.
-Copyright (c) 2002 JSON.org
-
-
-III. License Summary
-- Apache License 2.0
-- BSD License
-- EPL License
-- MIT License

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/pom.xml
----------------------------------------------------------------------
diff --git a/instance/command/pom.xml b/instance/command/pom.xml
deleted file mode 100644
index d9741ca..0000000
--- a/instance/command/pom.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.karaf.instance</groupId>
-        <artifactId>instance</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>org.apache.karaf.instance.command</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache Karaf :: Instance :: Command</name>
-    <description>Instance shell commands to manipulate Karaf child instances.</description>
-
-    <properties>
-        <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.karaf.instance</groupId>
-            <artifactId>org.apache.karaf.instance.core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
-            <artifactId>org.apache.karaf.features.command</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <version>${easymock.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-     </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*.info</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Export-Package>
-                        	!*
-                        </Export-Package>
-                        <!-- We have to avoid importing instance.core.internal and jansi
-                             as Execute.java accesses the InstanceServiceImpl and jansi
-                             (but only outside OSGi) -->
-                        <Import-Package>
-                        	!org.apache.karaf.shell.impl.action.command,
-                            !org.apache.karaf.instance.core.internal,
-                            !org.fusesource.jansi,
-                        	*
-                        </Import-Package>
-                        <Private-Package>
-                            org.apache.karaf.instance.main,
-                            org.apache.karaf.instance.command,
-                            org.apache.karaf.instance.command.completers
-                        </Private-Package>
-                        <Karaf-Commands>org.apache.karaf.instance.command.*</Karaf-Commands>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeOptsCommand.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeOptsCommand.java b/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeOptsCommand.java
deleted file mode 100644
index c526c07..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeOptsCommand.java
+++ /dev/null
@@ -1,41 +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.karaf.instance.command;
-
-import org.apache.karaf.instance.command.completers.InstanceCompleter;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "instance", name = "opts-change", description = "Changes the Java options of an existing container instance.")
-@Service
-public class ChangeOptsCommand extends InstanceCommandSupport {
-
-    @Argument(index = 0, name = "name", description="The name of the container instance", required = true, multiValued = false)
-    @Completion(InstanceCompleter.class)
-    private String instance = null;
-
-    @Argument(index = 1, name = "javaOpts", description = "The new Java options to set", required = true, multiValued = false)
-    private String javaOpts;
-
-    protected Object doExecute() throws Exception {
-        getExistingInstance(instance).changeJavaOpts(javaOpts);
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiRegistryPortCommand.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiRegistryPortCommand.java b/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiRegistryPortCommand.java
deleted file mode 100644
index de5bfaf..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiRegistryPortCommand.java
+++ /dev/null
@@ -1,41 +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.karaf.instance.command;
-
-import org.apache.karaf.instance.command.completers.InstanceCompleter;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "instance", name = "rmi-registry-port-change", description = "Changes the RMI registry port (used by management layer) of an existing container instance.")
-@Service
-public class ChangeRmiRegistryPortCommand extends InstanceCommandSupport {
-
-    @Argument(index = 0, name = "name", description = "The name of the container instance", required = true, multiValued = false)
-    @Completion(InstanceCompleter.class)
-    private String instance = null;
-
-    @Argument(index = 1, name = "port", description = "The new RMI registry port to set", required = true, multiValued = false)
-    private int port = 0;
-
-    protected Object doExecute() throws Exception {
-        getExistingInstance(instance).changeRmiRegistryPort(port);
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiServerPortCommand.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiServerPortCommand.java b/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiServerPortCommand.java
deleted file mode 100644
index 0ac2cf7..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeRmiServerPortCommand.java
+++ /dev/null
@@ -1,41 +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.karaf.instance.command;
-
-import org.apache.karaf.instance.command.completers.InstanceCompleter;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "instance", name = "rmi-server-port-change", description = "Changes the RMI server port (used by management layer) of an existing instance.")
-@Service
-public class ChangeRmiServerPortCommand extends InstanceCommandSupport {
-
-    @Argument(index = 0, name = "name", description = "The name of the container instance", required = true, multiValued = false)
-    @Completion(InstanceCompleter.class)
-    private String instance = null;
-
-    @Argument(index = 1, name = "port", description = "The new RMI server port to set", required = true, multiValued = false)
-    private int port = 0;
-
-    protected Object doExecute() throws Exception {
-        getExistingInstance(instance).changeRmiServerPort(port);
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeSshPortCommand.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeSshPortCommand.java b/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeSshPortCommand.java
deleted file mode 100644
index 17ad26c..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/ChangeSshPortCommand.java
+++ /dev/null
@@ -1,41 +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.karaf.instance.command;
-
-import org.apache.karaf.instance.command.completers.InstanceCompleter;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "instance", name = "ssh-port-change", description = "Changes the secure shell port of an existing container instance.")
-@Service
-public class ChangeSshPortCommand extends InstanceCommandSupport {
-
-    @Argument(index = 0, name = "name", description="The name of the container instance", required = true, multiValued = false)
-    @Completion(InstanceCompleter.class)
-    private String instance = null;
-
-    @Argument(index = 1, name = "port", description = "The new secure shell port to set", required = true, multiValued = false)
-    private int port = 0;
-
-    protected Object doExecute() throws Exception {
-        getExistingInstance(instance).changeSshPort(port);
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java b/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java
deleted file mode 100644
index e4f28c5..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/CloneCommand.java
+++ /dev/null
@@ -1,66 +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.karaf.instance.command;
-
-import org.apache.karaf.instance.command.completers.InstanceCompleter;
-import org.apache.karaf.instance.core.InstanceSettings;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.Option;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-/**
- * Clone an existing instance.
- */
-@Command(scope = "instance", name = "clone", description = "Clones an existing container instance.")
-@Service
-public class CloneCommand extends InstanceCommandSupport {
-
-    @Option(name = "-s", aliases = {"--ssh-port"}, description = "Port number for remote secure shell connection", required = false, multiValued = false)
-    int sshPort = 0;
-
-    @Option(name = "-r", aliases = {"-rr", "--rmi-port", "--rmi-registry-port"}, description = "Port number for RMI registry connection", required = false, multiValued = false)
-    int rmiRegistryPort = 0;
-
-    @Option(name = "-rs", aliases = {"--rmi-server-port"}, description = "Port number for RMI server connection", required = false, multiValued = false)
-    int rmiServerPort = 0;
-
-    @Option(name = "-l", aliases = {"--location"}, description = "Location of the cloned container instance in the file system", required = false, multiValued = false)
-    String location;
-
-    @Option(name = "-o", aliases = {"--java-opts"}, description = "JVM options to use when launching the cloned instance", required = false, multiValued = false)
-    String javaOpts;
-
-    @Option(name = "-v", aliases = {"--verbose"}, description = "Display actions performed by the command (disabled by default)", required = false, multiValued = false)
-    boolean verbose = false;
-
-    @Argument(index = 0, name = "name", description = "The name of the source container instance", required = true, multiValued = false)
-    @Completion(InstanceCompleter.class)
-    String name;
-
-    @Argument(index = 1, name = "cloneName", description = "The name of the cloned container instance", required = true, multiValued = false)
-    String cloneName;
-
-
-    protected Object doExecute() throws Exception {
-        InstanceSettings settings = new InstanceSettings(sshPort, rmiRegistryPort, rmiServerPort, location, javaOpts, null, null);
-        getInstanceService().cloneInstance(name, cloneName, settings, verbose);
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/ConnectCommand.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/ConnectCommand.java b/instance/command/src/main/java/org/apache/karaf/instance/command/ConnectCommand.java
deleted file mode 100644
index c81a3eb..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/ConnectCommand.java
+++ /dev/null
@@ -1,78 +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.karaf.instance.command;
-
-import java.util.List;
-
-import org.apache.karaf.instance.command.completers.InstanceCompleter;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.Option;
-import org.apache.karaf.shell.api.action.lifecycle.Reference;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.apache.karaf.shell.api.console.Session;
-
-@Command(scope = "instance", name = "connect", description = "Connects to an existing container instance.")
-@Service
-public class ConnectCommand extends InstanceCommandSupport {
-
-    @Option(name="-u", aliases={"--username"}, description="Remote user name", required = false, multiValued = false)
-    private String username;
-
-    @Option(name = "-p", aliases = {"--password"}, description = "Remote password", required = false, multiValued = false)
-    private String password;
-
-    @Argument(index = 0, name="name", description="The name of the container instance", required = true, multiValued = false)
-    @Completion(InstanceCompleter.class)
-    private String instance = null;
-
-    @Argument(index = 1, name = "command", description = "Optional command to execute", required = false, multiValued = true)
-    private List<String> command;
-
-    @Reference
-    Session session;
-
-    protected Object doExecute() throws Exception {
-        String cmdStr = "";
-        if (command != null) {
-            StringBuilder sb = new StringBuilder();
-            for (String cmd : command) {
-                if (sb.length() > 0) {
-                    sb.append(' ');
-                }
-                sb.append(cmd);
-            }
-            cmdStr = "'" + sb.toString().replaceAll("'", "\\'") + "'";
-        }
-
-        int port = getExistingInstance(instance).getSshPort();
-        if (username != null) {
-            if (password == null) {
-                session.execute("ssh:ssh -q -l " + username + " -p " + port + " localhost " + cmdStr);
-            } else {
-                session.execute("ssh:ssh -q -l " + username + " -P " + password + " -p " + port + " localhost " + cmdStr);
-            }
-        } else {
-            session.execute("ssh:ssh -q -p " + port + " localhost " + cmdStr);
-        }
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java b/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java
deleted file mode 100644
index 0dcc3ac..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/CreateCommand.java
+++ /dev/null
@@ -1,74 +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.karaf.instance.command;
-
-import java.util.List;
-
-import org.apache.karaf.features.command.completers.AllFeatureCompleter;
-import org.apache.karaf.features.command.completers.InstalledRepoUriCompleter;
-import org.apache.karaf.instance.core.InstanceSettings;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.Option;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-/**
- * Creates a new instance.
- */
-@Command(scope = "instance", name = "create", description = "Creates a new container instance.")
-@Service
-public class CreateCommand extends InstanceCommandSupport
-{
-    @Option(name = "-s", aliases = {"--ssh-port"}, description = "Port number for remote secure shell connection", required = false, multiValued = false)
-    int sshPort = 0;
-
-    @Option(name = "-r", aliases = {"-rr", "--rmi-port", "--rmi-registry-port"}, description = "Port number for RMI registry connection", required = false, multiValued = false)
-    int rmiRegistryPort = 0;
-
-    @Option(name = "-rs", aliases = {"--rmi-server-port"}, description = "Port number for RMI server connection", required = false, multiValued = false)
-    int rmiServerPort = 0;
-
-    @Option(name = "-l", aliases = {"--location"}, description = "Location of the new container instance in the file system", required = false, multiValued = false)
-    String location;
-
-    @Option(name = "-o", aliases = {"--java-opts"}, description = "JVM options to use when launching the instance", required = false, multiValued = false)
-    String javaOpts;
-    
-    @Option(name = "-f", aliases = {"--feature"},
-            description = "Initial features. This option can be specified multiple times to enable multiple initial features", required = false, multiValued = true)
-    @Completion(AllFeatureCompleter.class)
-    List<String> features;
-    
-    @Option(name = "-furl", aliases = {"--featureURL"}, 
-            description = "Additional feature descriptor URLs. This option can be specified multiple times to add multiple URLs", required = false, multiValued = true)
-    @Completion(InstalledRepoUriCompleter.class)
-    List<String> featureURLs;
-
-    @Option(name = "-v", aliases = {"--verbose"}, description = "Display actions performed by the command (disabled by default)", required = false, multiValued = false)
-    boolean verbose = false;
-
-    @Argument(index = 0, name = "name", description="The name of the new container instance", required = true, multiValued = false)
-    String instance = null;
-
-    protected Object doExecute() throws Exception {
-        InstanceSettings settings = new InstanceSettings(sshPort, rmiRegistryPort, rmiServerPort, location, javaOpts, featureURLs, features);
-        getInstanceService().createInstance(instance, settings, verbose);
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/DestroyCommand.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/DestroyCommand.java b/instance/command/src/main/java/org/apache/karaf/instance/command/DestroyCommand.java
deleted file mode 100644
index fb2964f..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/DestroyCommand.java
+++ /dev/null
@@ -1,41 +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.karaf.instance.command;
-
-import org.apache.karaf.instance.command.completers.InstanceCompleter;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-/**
- * Destroy an existing instance.
- */
-@Command(scope = "instance", name = "destroy", description = "Destroys an existing container instance.")
-@Service
-public class DestroyCommand extends InstanceCommandSupport
-{
-    @Argument(index = 0, name = "name", description= "The name of the container instance to destroy", required = true, multiValued = false)
-    @Completion(InstanceCompleter.class)
-    private String instance = null;
-
-    protected Object doExecute() throws Exception {
-        getExistingInstance(instance).destroy();
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/InstanceCommandSupport.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/InstanceCommandSupport.java b/instance/command/src/main/java/org/apache/karaf/instance/command/InstanceCommandSupport.java
deleted file mode 100644
index 3b0b535..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/InstanceCommandSupport.java
+++ /dev/null
@@ -1,51 +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.karaf.instance.command;
-
-import org.apache.karaf.instance.core.Instance;
-import org.apache.karaf.instance.core.InstanceService;
-import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.action.lifecycle.Reference;
-
-public abstract class InstanceCommandSupport implements Action {
-
-    @Reference
-    private InstanceService instanceService;
-
-    public InstanceService getInstanceService() {
-        return instanceService;
-    }
-
-    public void setInstanceService(InstanceService instanceService) {
-        this.instanceService = instanceService;
-    }
-
-    protected Instance getExistingInstance(String name) {
-        Instance i = instanceService.getInstance(name);
-        if (i == null) {
-            throw new IllegalArgumentException("Instances '" + name + "' does not exist");
-        }
-        return i;
-    }
-
-    @Override
-    public Object execute() throws Exception {
-        return doExecute();
-    }
-
-    protected abstract Object doExecute() throws Exception;
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/ListCommand.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/ListCommand.java b/instance/command/src/main/java/org/apache/karaf/instance/command/ListCommand.java
deleted file mode 100644
index fe571a8..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/ListCommand.java
+++ /dev/null
@@ -1,81 +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.karaf.instance.command;
-
-import org.apache.karaf.instance.core.Instance;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Option;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.apache.karaf.shell.support.table.ShellTable;
-
-@Command(scope = "instance", name = "list", description = "Lists all existing container instances.")
-@Service
-public class ListCommand extends InstanceCommandSupport {
-
-    @Option(name = "-l", aliases = { "--location" }, description = "Displays the location of the container instances", required = false, multiValued = false)
-    boolean location;
-
-    @Option(name = "-o", aliases = { "--java-opts" }, description = "Displays the Java options used to launch the JVM", required = false, multiValued = false)
-    boolean javaOpts;
-
-    @Option(name = "--no-color", description = "Disable table rendered output", required = false, multiValued = false)
-    boolean noFormat;
-
-    protected Object doExecute() throws Exception {
-        getInstanceService().refreshInstance();
-        Instance[] instances = getInstanceService().getInstances();
-        ShellTable table = new ShellTable();
-        table.column("SSH Port").alignRight();
-        table.column("RMI Registry").alignRight();
-        table.column("RMI Server").alignRight();
-        table.column("State");
-        table.column("PID");
-        table.column(getRightColumnHeader());
-        for (Instance instance : instances) {
-            table.addRow().addContent(
-                    instance.getSshPort(),
-                    instance.getRmiRegistryPort(),
-                    instance.getRmiServerPort(),
-                    instance.getState(),
-                    instance.getPid(),
-                    getRightColumnValue(instance));
-        }
-        table.print(System.out, !noFormat);
-        return null;
-    }
-
-    private String getRightColumnHeader() {
-        if (javaOpts) {
-            return "JavaOpts";
-        } else if (location) {
-            return "Location";
-        } else {
-            return "Name";
-        }
-    }
-
-    private String getRightColumnValue(Instance instance) {
-        if (javaOpts) {
-            return instance.getJavaOpts();
-        } else if (location) {
-            return instance.getLocation();
-        } else {
-            return instance.getName();
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java b/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java
deleted file mode 100644
index ef68400..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/RenameCommand.java
+++ /dev/null
@@ -1,45 +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.karaf.instance.command;
-
-import org.apache.karaf.instance.command.completers.InstanceCompleter;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.Option;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "instance", name = "rename", description = "Rename an existing container instance.")
-@Service
-public class RenameCommand extends InstanceCommandSupport {
-
-    @Option(name = "-v", aliases = {"--verbose"}, description = "Display actions performed by the command (disabled by default)", required = false, multiValued = false)
-    boolean verbose = false;
-
-    @Argument(index = 0, name = "name", description = "The name of the container instance to rename", required = true, multiValued = false)
-    @Completion(InstanceCompleter.class)
-    String instance = null;
-
-    @Argument(index = 1, name = "new-name", description = "The new name of the container instance", required = true, multiValued = false)
-    String newName = null;
-
-    protected Object doExecute() throws Exception {
-        getInstanceService().renameInstance(instance, newName, verbose);
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/StartCommand.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/StartCommand.java b/instance/command/src/main/java/org/apache/karaf/instance/command/StartCommand.java
deleted file mode 100644
index 8c52d5e..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/StartCommand.java
+++ /dev/null
@@ -1,76 +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.karaf.instance.command;
-
-import org.apache.karaf.instance.command.completers.InstanceCompleter;
-import org.apache.karaf.instance.core.Instance;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.Option;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "instance", name = "start", description = "Start an existing container instance.")
-@Service
-public class StartCommand extends InstanceCommandSupport {
-                      
-    @Option(name = "-d", aliases = { "--debug"}, description = "Start the instance in debug mode", required = false, multiValued = false)
-    private boolean debug; 
-    
-    @Option(name = "-o", aliases = { "--java-opts"}, description = "Java options when launching the instance", required = false, multiValued = false)
-    private String javaOpts;
-
-    @Option(name = "-w", aliases = { "--wait"}, description = "Wait for the instance to be fully started", required = false, multiValued = false)
-    private boolean wait;
-
-    @Argument(index = 0, name = "name", description = "The name of the container instance", required = true, multiValued = false)
-    @Completion(InstanceCompleter.class)
-    private String instance = null;
-
-    static final String DEBUG_OPTS = " -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005";
-    static final String DEFAULT_OPTS = "-server -Xmx512M -Dcom.sun.management.jmxremote";
-
-    protected Object doExecute() throws Exception {
-        Instance child = getExistingInstance(instance);
-        String opts = javaOpts;
-        if (opts == null) {
-            opts = child.getJavaOpts();
-        }
-        if (opts == null) {
-            opts = DEFAULT_OPTS;
-        }
-        if (debug) {
-            opts += DEBUG_OPTS;
-        }
-        if (wait) {
-            String state = child.getState();
-            if (Instance.STOPPED.equals(state)) {
-                child.start(opts);
-            }
-            if (!Instance.STARTED.equals(state)) {
-                do {
-                    Thread.sleep(500);
-                    state = child.getState();
-                } while (Instance.STARTING.equals(state));
-            }
-        } else {
-            child.start(opts);
-        }
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/StatusCommand.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/StatusCommand.java b/instance/command/src/main/java/org/apache/karaf/instance/command/StatusCommand.java
deleted file mode 100644
index 82100e1..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/StatusCommand.java
+++ /dev/null
@@ -1,40 +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.karaf.instance.command;
-
-import org.apache.karaf.instance.command.completers.InstanceCompleter;
-import org.apache.karaf.instance.core.Instance;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "instance", name = "status", description = "Check the current status of an instance.")
-@Service
-public class StatusCommand extends InstanceCommandSupport {
-
-    @Argument(index = 0, name = "name", description = "The name of the instance", required = true, multiValued = false)
-    @Completion(InstanceCompleter.class)
-    private String name;
-
-    protected Object doExecute() throws Exception {
-        Instance instance = getExistingInstance(name);
-        System.out.println(instance.getState());
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/StopCommand.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/StopCommand.java b/instance/command/src/main/java/org/apache/karaf/instance/command/StopCommand.java
deleted file mode 100644
index 6c8de10..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/StopCommand.java
+++ /dev/null
@@ -1,38 +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.karaf.instance.command;
-
-import org.apache.karaf.instance.command.completers.InstanceCompleter;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "instance", name = "stop", description = "Stop an existing container instance.")
-@Service
-public class StopCommand extends InstanceCommandSupport {
-
-    @Argument(index = 0, name = "name", description = "The name of the container instance", required = true, multiValued = false)
-    @Completion(InstanceCompleter.class)
-    private String instance = null;
-
-    protected Object doExecute() throws Exception {
-        getExistingInstance(instance).stop();
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/command/completers/InstanceCompleter.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/command/completers/InstanceCompleter.java b/instance/command/src/main/java/org/apache/karaf/instance/command/completers/InstanceCompleter.java
deleted file mode 100644
index 4468374..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/command/completers/InstanceCompleter.java
+++ /dev/null
@@ -1,52 +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.karaf.instance.command.completers;
-
-import java.util.List;
-
-import org.apache.karaf.instance.core.Instance;
-import org.apache.karaf.instance.core.InstanceService;
-import org.apache.karaf.shell.api.action.lifecycle.Reference;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.apache.karaf.shell.api.console.CommandLine;
-import org.apache.karaf.shell.api.console.Completer;
-import org.apache.karaf.shell.api.console.Session;
-import org.apache.karaf.shell.support.completers.StringsCompleter;
-
-/**
- * Displays a list of configured server instances for the instance commands.
- *
- */
-@Service
-public class InstanceCompleter implements Completer {
-
-    @Reference
-    private InstanceService instanceService;
-
-    public void setInstanceService(InstanceService instanceService) {
-        this.instanceService = instanceService;
-    }
-
-    public int complete(Session session, CommandLine commandLine, List<String> candidates) {
-        StringsCompleter delegate = new StringsCompleter();
-        for (Instance instance : instanceService.getInstances()) {
-            delegate.getStrings().add(instance.getName());
-        }
-        return delegate.complete(session, commandLine, candidates);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/java/org/apache/karaf/instance/main/Execute.java
----------------------------------------------------------------------
diff --git a/instance/command/src/main/java/org/apache/karaf/instance/main/Execute.java b/instance/command/src/main/java/org/apache/karaf/instance/main/Execute.java
deleted file mode 100644
index 591873e..0000000
--- a/instance/command/src/main/java/org/apache/karaf/instance/main/Execute.java
+++ /dev/null
@@ -1,171 +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.karaf.instance.main;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.karaf.instance.command.ChangeOptsCommand;
-import org.apache.karaf.instance.command.ChangeRmiRegistryPortCommand;
-import org.apache.karaf.instance.command.ChangeRmiServerPortCommand;
-import org.apache.karaf.instance.command.ChangeSshPortCommand;
-import org.apache.karaf.instance.command.CloneCommand;
-import org.apache.karaf.instance.command.CreateCommand;
-import org.apache.karaf.instance.command.DestroyCommand;
-import org.apache.karaf.instance.command.InstanceCommandSupport;
-import org.apache.karaf.instance.command.ListCommand;
-import org.apache.karaf.instance.command.RenameCommand;
-import org.apache.karaf.instance.command.StartCommand;
-import org.apache.karaf.instance.command.StatusCommand;
-import org.apache.karaf.instance.command.StopCommand;
-import org.apache.karaf.instance.core.internal.InstanceServiceImpl;
-import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.impl.action.command.DefaultActionPreparator;
-import org.fusesource.jansi.AnsiConsole;
-
-public class Execute {
-    static Class<? extends Action> x = CreateCommand.class;
-    private static final Class<?>[] COMMAND_CLASSES = new Class[]{
-            ChangeOptsCommand.class,
-            ChangeRmiRegistryPortCommand.class,
-            ChangeRmiServerPortCommand.class,
-            ChangeSshPortCommand.class,
-            CloneCommand.class,
-            CreateCommand.class,
-            DestroyCommand.class,
-            ListCommand.class,
-            RenameCommand.class,
-            StartCommand.class,
-            StatusCommand.class,
-            StopCommand.class};
-    private static final Map<String, Class<?>> COMMANDS = new TreeMap<String, Class<?>>();
-
-    static {
-        for (Class<?> c : COMMAND_CLASSES) {
-            Command ann = c.getAnnotation(Command.class);
-            if (ann == null) {
-                continue;
-            }
-            COMMANDS.put(ann.name(), c);
-        }
-    }
-
-    // For testing
-    static boolean exitAllowed = true;
-
-    /**
-     * Environment variable for specifying extra options to the Karaf instance
-     * process kicked off from this Java process.
-     */
-    private static final String ENV_KARAF_OPTS = "KARAF_OPTS";
-
-    /**
-     * System property for specifying extra options to the Karaf instance
-     * process kicked off from this Java process.
-     */
-    private static final String PROP_KARAF_OPTS = "karaf.opts";
-
-    public static void main(String[] args) throws Exception {
-        AnsiConsole.systemInstall();
-
-        if (args.length == 0) {
-            listCommands();
-            exit(0);
-        }
-        String commandName = args[0];
-        Class<?> cls = COMMANDS.get(commandName);
-        if (cls == null) {
-            System.err.println("Command not found: " + commandName);
-            exit(-1);
-        }
-
-        String storage = System.getProperty("karaf.instances");
-        if (storage == null) {
-            System.err.println("System property 'karaf.instances' is not set. \n" +
-                    "This property needs to be set to the full path of the instance.properties file.");
-            exit(-2);
-        }
-        File storageFile = new File(storage);
-        System.setProperty("user.dir", storageFile.getParentFile().getParentFile().getCanonicalPath());
-
-        try {
-            String karafOpts = System.getenv(ENV_KARAF_OPTS);
-            if (karafOpts != null) {
-                System.setProperty(PROP_KARAF_OPTS, karafOpts);
-            }
-        } catch (Exception e) {
-            System.err.println("Could not read KARAF_OPTS environment variable: " + e.getMessage());
-            if (System.getProperty("karaf.showStackTrace") != null) {
-                throw e;
-            }
-        }
-
-        Object command = cls.newInstance();
-        if (command instanceof InstanceCommandSupport) {
-            try {
-                execute((InstanceCommandSupport) command, storageFile, args);
-            } catch (Exception e) {
-                System.err.println("Error execution command '" + commandName + "': " + e.getMessage());
-                if (System.getProperty("karaf.showStackTrace") != null) {
-                    throw e;
-                }
-            }
-        } else {
-            System.err.println("Not an instance command: " + commandName);
-            exit(-3);
-        }
-    }
-
-    static void execute(InstanceCommandSupport command, File storageFile, String[] args) throws Exception {
-        DefaultActionPreparator dap = new DefaultActionPreparator();
-        List<Object> params = new ArrayList<Object>(Arrays.asList(args));
-        params.remove(0); // this is the actual command name
-
-        if (!dap.prepare(command, null, params)) {
-            return;
-        }
-
-        InstanceServiceImpl instanceService = new InstanceServiceImpl();
-        instanceService.setStorageLocation(storageFile);
-        command.setInstanceService(instanceService);
-        command.execute();
-    }
-
-    private static void listCommands() {
-        System.out.println("Available commands:");
-        for (Map.Entry<String, Class<?>> entry : COMMANDS.entrySet()) {
-            Command ann = entry.getValue().getAnnotation(Command.class);
-            System.out.printf("  %s - %s\n", entry.getKey(), ann.description());
-        }
-
-        System.out.println("Type 'command --help' for more help on the specified command.");
-    }
-
-    private static void exit(int rc) {
-        if (exitAllowed) {
-            System.exit(rc);
-        } else {
-            throw new RuntimeException("" + rc);
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
----------------------------------------------------------------------
diff --git a/instance/command/src/main/resources/META-INF/services/org/apache/karaf/shell/commands b/instance/command/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
deleted file mode 100644
index 92245c7..0000000
--- a/instance/command/src/main/resources/META-INF/services/org/apache/karaf/shell/commands
+++ /dev/null
@@ -1,30 +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.
-##---------------------------------------------------------------------------
-org.apache.karaf.instance.core.internal.InstanceServiceImpl
-org.apache.karaf.instance.command.ChangeOptsCommand
-org.apache.karaf.instance.command.ChangeRmiRegistryPortCommand
-org.apache.karaf.instance.command.ChangeRmiServerPortCommand
-org.apache.karaf.instance.command.ChangeSshPortCommand
-org.apache.karaf.instance.command.CloneCommand
-org.apache.karaf.instance.command.ConnectCommand
-org.apache.karaf.instance.command.CreateCommand
-org.apache.karaf.instance.command.DestroyCommand
-org.apache.karaf.instance.command.ListCommand
-org.apache.karaf.instance.command.RenameCommand
-org.apache.karaf.instance.command.StartCommand
-org.apache.karaf.instance.command.StatusCommand
-org.apache.karaf.instance.command.StopCommand

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/instance/command/src/main/resources/OSGI-INF/bundle.info b/instance/command/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index afeac5e..0000000
--- a/instance/command/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,29 +0,0 @@
-h1. Synopsis
-
-${project.name}
-
-${project.description}
-
-Maven URL:
-[mvn:${project.groupId}/${project.artifactId}/${project.version}]
-
-h1. Description
-
-This bundle contains all Karaf shell commands related to the instance feature.
-
-The following commands are available:
-* instance:create - Creates a new container instance.
-* instance:connect - Connects to an existing container instance.
-* instance:list - Lists all existing container instances.
-* instance:start - Starts an existing container instance.
-* instance:stop - Stops an existing container instance.
-* instance:destroy - Destroys an existing container instance.
-* instance:rename - Renames an existing container instance.
-* instance:change-ssh-port - Changes the secure shell port of an existing container instance.
-* instance:change-rmi-registry-port - Changes the RMI registry port (used by management layer) of an existing container instance.
-* instance:change-rmi-server-port - Changes the RMI server port (used by management layer) of an existing container instance.
-* instance:change-opts - Changes the java options of an existing container instance.
-
-h1. See also
-
-Commands - section of the Karaf User Guide.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java
----------------------------------------------------------------------
diff --git a/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java b/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java
deleted file mode 100644
index 359a183..0000000
--- a/instance/command/src/test/java/org/apache/karaf/instance/command/CreateCommandTest.java
+++ /dev/null
@@ -1,57 +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.karaf.instance.command;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import junit.framework.TestCase;
-
-import org.apache.karaf.instance.core.InstanceService;
-import org.apache.karaf.instance.core.InstanceSettings;
-import org.easymock.EasyMock;
-
-public class CreateCommandTest extends TestCase {
-
-    public void testCreateCommandExecute() throws Exception {
-        InstanceService instanceService = EasyMock.createMock(InstanceService.class);
-        EasyMock.replay(instanceService);
-        
-        CreateCommand cc = new CreateCommand();
-        cc.setInstanceService(instanceService);
-        cc.sshPort = 9941;
-        cc.rmiRegistryPort = 1122;
-        cc.rmiServerPort = 44444;
-        cc.location = "top";
-        cc.javaOpts = "foo";
-        cc.features = Arrays.asList("abc", "def");
-        cc.featureURLs = Collections.singletonList("http://something");
-        cc.instance = "myInstance";
-        cc.verbose = true;
-        
-        EasyMock.verify(instanceService); // check precondition
-        EasyMock.reset(instanceService);
-        InstanceSettings expectedIS =
-            new InstanceSettings(9941, 1122, 44444, "top", "foo", Collections.singletonList("http://something"), Arrays.asList("abc", "def"));
-        EasyMock.expect(instanceService.createInstance("myInstance", expectedIS, true)).andReturn(null);
-        EasyMock.replay(instanceService);
-        
-        cc.doExecute();
-        EasyMock.verify(instanceService);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/command/src/test/java/org/apache/karaf/instance/main/ExecuteTest.java
----------------------------------------------------------------------
diff --git a/instance/command/src/test/java/org/apache/karaf/instance/main/ExecuteTest.java b/instance/command/src/test/java/org/apache/karaf/instance/main/ExecuteTest.java
deleted file mode 100644
index 1e49a88..0000000
--- a/instance/command/src/test/java/org/apache/karaf/instance/main/ExecuteTest.java
+++ /dev/null
@@ -1,126 +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.karaf.instance.main;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.PrintStream;
-import java.io.IOException;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-public class ExecuteTest extends TestCase {
-    private String userDir;
-    
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        Execute.exitAllowed = false;
-        userDir = System.getProperty("user.dir");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        Execute.exitAllowed = true;
-        System.setProperty("user.dir", userDir);
-    }
-
-    public void testListCommands() throws Exception {
-        PrintStream oldOut = System.out;
-        
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        PrintStream capturedOut = new PrintStream(baos); 
-        System.setOut(capturedOut);
-
-        try {
-            Execute.main(new String [] {});            
-        } catch (RuntimeException re) {
-            assertEquals("0", re.getMessage());
-
-            String s = new String(baos.toByteArray());            
-            assertTrue(s.contains("list"));
-            assertTrue(s.contains("create"));
-            assertTrue(s.contains("destroy"));
-        } finally {
-            System.setOut(oldOut);
-        }
-    }
-    
-    public void testNonexistingCommand() throws Exception {
-        try {
-            Execute.main(new String [] {"bheuaark"});
-        } catch (RuntimeException re) {
-            assertEquals("-1", re.getMessage());
-        }
-    }
-    
-    public void testNoStorageFile() throws Exception {
-        PrintStream oldErr = System.err;
-        
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        PrintStream capturedErr = new PrintStream(baos); 
-        System.setErr(capturedErr);
-
-        try {
-            Execute.main(new String [] {"create"});            
-        } catch (RuntimeException re) {
-            assertEquals("-2", re.getMessage());
-            
-            String s = new String(baos.toByteArray());            
-            assertTrue(s.contains("karaf.instances"));
-            assertTrue(s.contains("instance.properties"));
-        } finally {
-            System.setErr(oldErr);
-        } 
-    }
-    
-    public void testSetDir() throws Exception {
-        Properties oldProps = (Properties) System.getProperties().clone();
-        final File tempFile = createTempDir(getName());
-        assertFalse("Precondition failed", 
-            tempFile.getParentFile().getParentFile().getCanonicalPath().equals(System.getProperty("user.dir")));
-
-        System.setProperty("karaf.instances", tempFile.getCanonicalPath());
-        try {
-            Execute.main(new String [] {"list"});            
-            assertTrue(tempFile.getParentFile().getParentFile().getCanonicalPath().equals(System.getProperty("user.dir")));
-        } finally {
-            System.setProperties(oldProps);
-            assertNull("Postcondition failed", System.getProperty("karaf.instances"));
-            delete(tempFile);
-        }        
-    }
-    
-    private static File createTempDir(String name) throws IOException {
-        final File tempFile = File.createTempFile(name, null);
-        tempFile.delete();
-        tempFile.mkdirs();
-        return tempFile.getCanonicalFile();
-    }
-
-    private static void delete(File tmp) {
-        if (tmp.isDirectory()) {
-            for (File f : tmp.listFiles()) {
-                delete(f);
-            }
-        }
-        tmp.delete();
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/karaf/blob/7c2db062/instance/core/NOTICE
----------------------------------------------------------------------
diff --git a/instance/core/NOTICE b/instance/core/NOTICE
deleted file mode 100644
index b70f1f9..0000000
--- a/instance/core/NOTICE
+++ /dev/null
@@ -1,71 +0,0 @@
-Apache Karaf
-Copyright 2010-2014 The Apache Software Foundation
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-OW2 (http://www.ow2.org/).
-Licensed under the BSD License.
-
-This product includes software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-Eclipse Foundation (http://www.eclipse.org/).
-Licensed under the EPL.
-
-This product includes software written by
-Antony Lesuisse.
-Licensed under Public Domain.
-
-
-II. Used Software
-
-This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-AOP Alliance (http://aopalliance.sourceforge.net/).
-Licensed under the Public Domain.
-
-This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Jasypt (http://jasypt.sourceforge.net/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-JLine (http://jline.sourceforge.net).
-Licensed under the BSD License.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-This product uses software developed at
-SpringSource (http://www.springsource.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software from http://www.json.org.
-Copyright (c) 2002 JSON.org
-
-
-III. License Summary
-- Apache License 2.0
-- BSD License
-- EPL License
-- MIT License


Mime
View raw message